Progmasoft Git

catch3

Progmasoft Catch3: an independently maintained C++17 test framework with a parallel runner, property checks, snapshots and structured results.

Clonegit clone https://git.progmasoft.com/catch3

All tests files have .tests.cpp suffix. Also moved tests out of TestMain.cpp and moved up a level

Commit
74d3dfd4cc45088f3f7ab82c2168dbfd43cb048c
Author
Phil Nash ·
Parents
e34754e4331e

Files · Download .tar.gz

Changes

 CMakeLists.txt                                     |   50 +-
 .../SelfTest/Baselines/console.std.approved.txt    |  380 +--
 .../SelfTest/Baselines/console.sw.approved.txt     | 2616 +++++++++----------
 .../SelfTest/Baselines/console.swa4.approved.txt   |   88 +-
 projects/SelfTest/Baselines/junit.sw.approved.txt  |  250 +-
 projects/SelfTest/Baselines/xml.sw.approved.txt    | 2724 ++++++++++----------
 .../{CmdLineTests.cpp => CmdLine.tests.cpp}        |  193 ++
 ...{PartTrackerTests.cpp => PartTracker.tests.cpp} |    0
 .../{StringRef.tests.cpp => String.tests.cpp}      |   33 +
 .../{TagAliasTests.cpp => TagAlias.tests.cpp}      |    0
 projects/SelfTest/IntrospectiveTests/TestMain.cpp  |  268 --
 .../{XmlTests.cpp => Xml.tests.cpp}                |    0
 projects/SelfTest/TestMain.cpp                     |   33 +
 .../{ApproxTests.cpp => Approx.tests.cpp}          |    0
 .../UsageTests/{BDDTests.cpp => BDD.tests.cpp}     |    0
 .../UsageTests/{ClassTests.cpp => Class.tests.cpp} |    0
 ...{CompilationTests.cpp => Compilation.tests.cpp} |    0
 .../{ConditionTests.cpp => Condition.tests.cpp}    |    0
 ...ompositionTests.cpp => Decomposition.tests.cpp} |    0
 .../{EnumToString.cpp => EnumToString.tests.cpp}   |    0
 .../{ExceptionTests.cpp => Exception.tests.cpp}    |    0
 .../{MatchersTests.cpp => Matchers.tests.cpp}      |    0
 .../{MessageTests.cpp => Message.tests.cpp}        |    0
 .../UsageTests/{MiscTests.cpp => Misc.tests.cpp}   |   10 +
 ...ToStringChrono.cpp => ToStringChrono.tests.cpp} |    0
 ...gGeneralTests.cpp => ToStringGeneral.tests.cpp} |    0
 .../{ToStringPair.cpp => ToStringPair.tests.cpp}   |    0
 .../{ToStringTuple.cpp => ToStringTuple.tests.cpp} |    0
 ...ToStringVector.cpp => ToStringVector.tests.cpp} |    0
 .../{ToStringWhich.cpp => ToStringWhich.tests.cpp} |    0
 .../{TrickyTests.cpp => Tricky.tests.cpp}          |    0
 ...dicMacrosTests.cpp => VariadicMacros.tests.cpp} |    0
 32 files changed, 3323 insertions(+), 3322 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a27b0aab..de1972a9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -47,32 +47,32 @@ endfunction()
 # define the sources of the self test
 # Please keep these ordered alphabetically
 set(TEST_SOURCES
-        ${SELF_TEST_DIR}/UsageTests/ApproxTests.cpp
-        ${SELF_TEST_DIR}/UsageTests/BDDTests.cpp
+        ${SELF_TEST_DIR}/TestMain.cpp
+        ${SELF_TEST_DIR}/IntrospectiveTests/CmdLine.tests.cpp
+        ${SELF_TEST_DIR}/IntrospectiveTests/PartTracker.tests.cpp
+        ${SELF_TEST_DIR}/IntrospectiveTests/TagAlias.tests.cpp
+        ${SELF_TEST_DIR}/IntrospectiveTests/String.tests.cpp
+        ${SELF_TEST_DIR}/IntrospectiveTests/Xml.tests.cpp
+        ${SELF_TEST_DIR}/UsageTests/Approx.tests.cpp
+        ${SELF_TEST_DIR}/UsageTests/BDD.tests.cpp
         ${SELF_TEST_DIR}/UsageTests/Benchmark.tests.cpp
-        ${SELF_TEST_DIR}/UsageTests/ClassTests.cpp
-        ${SELF_TEST_DIR}/IntrospectiveTests/CmdLineTests.cpp
-        ${SELF_TEST_DIR}/UsageTests/CompilationTests.cpp
-        ${SELF_TEST_DIR}/UsageTests/ConditionTests.cpp
-        ${SELF_TEST_DIR}/UsageTests/DecompositionTests.cpp
-        ${SELF_TEST_DIR}/UsageTests/EnumToString.cpp
-        ${SELF_TEST_DIR}/UsageTests/ExceptionTests.cpp
-        ${SELF_TEST_DIR}/UsageTests/MessageTests.cpp
-        ${SELF_TEST_DIR}/UsageTests/MiscTests.cpp
-        ${SELF_TEST_DIR}/IntrospectiveTests/PartTrackerTests.cpp
-        ${SELF_TEST_DIR}/IntrospectiveTests/TagAliasTests.cpp
-        ${SELF_TEST_DIR}/IntrospectiveTests/TestMain.cpp
-        ${SELF_TEST_DIR}/UsageTests/ToStringChrono.cpp
-        ${SELF_TEST_DIR}/UsageTests/ToStringGeneralTests.cpp
-        ${SELF_TEST_DIR}/UsageTests/ToStringPair.cpp
-        ${SELF_TEST_DIR}/UsageTests/ToStringTuple.cpp
-        ${SELF_TEST_DIR}/UsageTests/ToStringVector.cpp
-        ${SELF_TEST_DIR}/UsageTests/ToStringWhich.cpp
-        ${SELF_TEST_DIR}/UsageTests/TrickyTests.cpp
-        ${SELF_TEST_DIR}/UsageTests/VariadicMacrosTests.cpp
-        ${SELF_TEST_DIR}/UsageTests/MatchersTests.cpp
-        ${SELF_TEST_DIR}/IntrospectiveTests/StringRef.tests.cpp
-        ${SELF_TEST_DIR}/IntrospectiveTests/XmlTests.cpp
+        ${SELF_TEST_DIR}/UsageTests/Class.tests.cpp
+        ${SELF_TEST_DIR}/UsageTests/Compilation.tests.cpp
+        ${SELF_TEST_DIR}/UsageTests/Condition.tests.cpp
+        ${SELF_TEST_DIR}/UsageTests/Decomposition.tests.cpp
+        ${SELF_TEST_DIR}/UsageTests/EnumToString.tests.cpp
+        ${SELF_TEST_DIR}/UsageTests/Exception.tests.cpp
+        ${SELF_TEST_DIR}/UsageTests/Message.tests.cpp
+        ${SELF_TEST_DIR}/UsageTests/Misc.tests.cpp
+        ${SELF_TEST_DIR}/UsageTests/ToStringChrono.tests.cpp
+        ${SELF_TEST_DIR}/UsageTests/ToStringGeneral.tests.cpp
+        ${SELF_TEST_DIR}/UsageTests/ToStringPair.tests.cpp
+        ${SELF_TEST_DIR}/UsageTests/ToStringTuple.tests.cpp
+        ${SELF_TEST_DIR}/UsageTests/ToStringVector.tests.cpp
+        ${SELF_TEST_DIR}/UsageTests/ToStringWhich.tests.cpp
+        ${SELF_TEST_DIR}/UsageTests/Tricky.tests.cpp
+        ${SELF_TEST_DIR}/UsageTests/VariadicMacros.tests.cpp
+        ${SELF_TEST_DIR}/UsageTests/Matchers.tests.cpp
         )
 CheckFileList(TEST_SOURCES ${SELF_TEST_DIR})
 
diff --git a/projects/SelfTest/Baselines/console.std.approved.txt b/projects/SelfTest/Baselines/console.std.approved.txt
index 8fab7581..643f91da 100644
--- a/projects/SelfTest/Baselines/console.std.approved.txt
+++ b/projects/SelfTest/Baselines/console.std.approved.txt
@@ -7,10 +7,10 @@ Run with -? for options
 #748 - captures with unexpected exceptions
   outside assertions
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:<line number>
+Exception.tests.cpp:<line number>
 ...............................................................................
 
-ExceptionTests.cpp:<line number>: FAILED:
+Exception.tests.cpp:<line number>: FAILED:
 due to unexpected exception with messages:
   answer := 42
   expected exception
@@ -19,10 +19,10 @@ due to unexpected exception with messages:
 #748 - captures with unexpected exceptions
   inside REQUIRE_NOTHROW
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:<line number>
+Exception.tests.cpp:<line number>
 ...............................................................................
 
-ExceptionTests.cpp:<line number>: FAILED:
+Exception.tests.cpp:<line number>: FAILED:
   REQUIRE_NOTHROW( thisThrows() )
 due to unexpected exception with messages:
   answer := 42
@@ -31,10 +31,10 @@ due to unexpected exception with messages:
 -------------------------------------------------------------------------------
 #835 -- errno should not be touched by Catch
 -------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
+Misc.tests.cpp:<line number>
 ...............................................................................
 
-MiscTests.cpp:<line number>: FAILED:
+Misc.tests.cpp:<line number>: FAILED:
   CHECK( f() == 0 )
 with expansion:
   1 == 0
@@ -42,50 +42,50 @@ with expansion:
 -------------------------------------------------------------------------------
 'Not' checks that should fail
 -------------------------------------------------------------------------------
-ConditionTests.cpp:<line number>
+Condition.tests.cpp:<line number>
 ...............................................................................
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( false != false )
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( true != true )
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( !true )
 with expansion:
   false
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK_FALSE( true )
 with expansion:
   !true
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( !trueValue )
 with expansion:
   false
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK_FALSE( trueValue )
 with expansion:
   !true
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( !(1 == 1) )
 with expansion:
   false
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK_FALSE( 1 == 1 )
 
 -------------------------------------------------------------------------------
 A METHOD_AS_TEST_CASE based test run that fails
 -------------------------------------------------------------------------------
-ClassTests.cpp:<line number>
+Class.tests.cpp:<line number>
 ...............................................................................
 
-ClassTests.cpp:<line number>: FAILED:
+Class.tests.cpp:<line number>: FAILED:
   REQUIRE( s == "world" )
 with expansion:
   "hello" == "world"
@@ -93,10 +93,10 @@ with expansion:
 -------------------------------------------------------------------------------
 A TEST_CASE_METHOD based test run that fails
 -------------------------------------------------------------------------------
-ClassTests.cpp:<line number>
+Class.tests.cpp:<line number>
 ...............................................................................
 
-ClassTests.cpp:<line number>: FAILED:
+Class.tests.cpp:<line number>: FAILED:
   REQUIRE( m_a == 2 )
 with expansion:
   1 == 2
@@ -104,25 +104,25 @@ with expansion:
 -------------------------------------------------------------------------------
 A couple of nested sections followed by a failure
 -------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
+Misc.tests.cpp:<line number>
 ...............................................................................
 
-MiscTests.cpp:<line number>: FAILED:
+Misc.tests.cpp:<line number>: FAILED:
 explicitly with message:
   to infinity and beyond
 
 -------------------------------------------------------------------------------
 A failing expression with a non streamable type is still captured
 -------------------------------------------------------------------------------
-TrickyTests.cpp:<line number>
+Tricky.tests.cpp:<line number>
 ...............................................................................
 
-TrickyTests.cpp:<line number>: FAILED:
+Tricky.tests.cpp:<line number>: FAILED:
   CHECK( &o1 == &o2 )
 with expansion:
   0x<hex digits> == 0x<hex digits>
 
-TrickyTests.cpp:<line number>: FAILED:
+Tricky.tests.cpp:<line number>: FAILED:
   CHECK( o1 == o2 )
 with expansion:
   {?} == {?}
@@ -130,10 +130,10 @@ with expansion:
 -------------------------------------------------------------------------------
 An unchecked exception reports the line of the last assertion
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:<line number>
+Exception.tests.cpp:<line number>
 ...............................................................................
 
-ExceptionTests.cpp:<line number>: FAILED:
+Exception.tests.cpp:<line number>: FAILED:
   {Unknown expression after the reported line}
 due to unexpected exception with message:
   unexpected exception
@@ -141,16 +141,16 @@ due to unexpected exception with message:
 -------------------------------------------------------------------------------
 Contains string matcher
 -------------------------------------------------------------------------------
-MatchersTests.cpp:<line number>
+Matchers.tests.cpp:<line number>
 ...............................................................................
 
-MatchersTests.cpp:<line number>: FAILED:
+Matchers.tests.cpp:<line number>: FAILED:
   CHECK_THAT( testStringForMatching(), Contains( "not there", Catch::CaseSensitive::No ) )
 with expansion:
   "this string contains 'abc' as a substring" contains: "not there" (case
   insensitive)
 
-MatchersTests.cpp:<line number>: FAILED:
+Matchers.tests.cpp:<line number>: FAILED:
   CHECK_THAT( testStringForMatching(), Contains( "STRING" ) )
 with expansion:
   "this string contains 'abc' as a substring" contains: "STRING"
@@ -158,10 +158,10 @@ with expansion:
 -------------------------------------------------------------------------------
 Custom exceptions can be translated when testing for nothrow
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:<line number>
+Exception.tests.cpp:<line number>
 ...............................................................................
 
-ExceptionTests.cpp:<line number>: FAILED:
+Exception.tests.cpp:<line number>: FAILED:
   REQUIRE_NOTHROW( throwCustom() )
 due to unexpected exception with message:
   custom exception - not std
@@ -169,10 +169,10 @@ due to unexpected exception with message:
 -------------------------------------------------------------------------------
 Custom exceptions can be translated when testing for throwing as something else
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:<line number>
+Exception.tests.cpp:<line number>
 ...............................................................................
 
-ExceptionTests.cpp:<line number>: FAILED:
+Exception.tests.cpp:<line number>: FAILED:
   REQUIRE_THROWS_AS( throwCustom(), std::exception )
 due to unexpected exception with message:
   custom exception - not std
@@ -180,25 +180,25 @@ due to unexpected exception with message:
 -------------------------------------------------------------------------------
 Custom std-exceptions can be custom translated
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:<line number>
+Exception.tests.cpp:<line number>
 ...............................................................................
 
-ExceptionTests.cpp:<line number>: FAILED:
+Exception.tests.cpp:<line number>: FAILED:
 due to unexpected exception with message:
   custom std exception
 
 -------------------------------------------------------------------------------
 EndsWith string matcher
 -------------------------------------------------------------------------------
-MatchersTests.cpp:<line number>
+Matchers.tests.cpp:<line number>
 ...............................................................................
 
-MatchersTests.cpp:<line number>: FAILED:
+Matchers.tests.cpp:<line number>: FAILED:
   CHECK_THAT( testStringForMatching(), EndsWith( "Substring" ) )
 with expansion:
   "this string contains 'abc' as a substring" ends with: "Substring"
 
-MatchersTests.cpp:<line number>: FAILED:
+Matchers.tests.cpp:<line number>: FAILED:
   CHECK_THAT( testStringForMatching(), EndsWith( "this", Catch::CaseSensitive::No ) )
 with expansion:
   "this string contains 'abc' as a substring" ends with: "this" (case
@@ -207,70 +207,70 @@ with expansion:
 -------------------------------------------------------------------------------
 Equality checks that should fail
 -------------------------------------------------------------------------------
-ConditionTests.cpp:<line number>
+Condition.tests.cpp:<line number>
 ...............................................................................
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( data.int_seven == 6 )
 with expansion:
   7 == 6
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( data.int_seven == 8 )
 with expansion:
   7 == 8
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( data.int_seven == 0 )
 with expansion:
   7 == 0
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( data.float_nine_point_one == Approx( 9.11f ) )
 with expansion:
   9.1f == Approx( 9.1099996567 )
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( data.float_nine_point_one == Approx( 9.0f ) )
 with expansion:
   9.1f == Approx( 9.0 )
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( data.float_nine_point_one == Approx( 1 ) )
 with expansion:
   9.1f == Approx( 1.0 )
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( data.float_nine_point_one == Approx( 0 ) )
 with expansion:
   9.1f == Approx( 0.0 )
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( data.double_pi == Approx( 3.1415 ) )
 with expansion:
   3.1415926535 == Approx( 3.1415 )
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( data.str_hello == "goodbye" )
 with expansion:
   "hello" == "goodbye"
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( data.str_hello == "hell" )
 with expansion:
   "hello" == "hell"
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( data.str_hello == "hello1" )
 with expansion:
   "hello" == "hello1"
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( data.str_hello.size() == 6 )
 with expansion:
   5 == 6
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( x == Approx( 1.301 ) )
 with expansion:
   1.3 == Approx( 1.301 )
@@ -278,16 +278,16 @@ with expansion:
 -------------------------------------------------------------------------------
 Equals string matcher
 -------------------------------------------------------------------------------
-MatchersTests.cpp:<line number>
+Matchers.tests.cpp:<line number>
 ...............................................................................
 
-MatchersTests.cpp:<line number>: FAILED:
+Matchers.tests.cpp:<line number>: FAILED:
   CHECK_THAT( testStringForMatching(), Equals( "this string contains 'ABC' as a substring" ) )
 with expansion:
   "this string contains 'abc' as a substring" equals: "this string contains
   'ABC' as a substring"
 
-MatchersTests.cpp:<line number>: FAILED:
+Matchers.tests.cpp:<line number>: FAILED:
   CHECK_THAT( testStringForMatching(), Equals( "something else", Catch::CaseSensitive::No ) )
 with expansion:
   "this string contains 'abc' as a substring" equals: "something else" (case
@@ -297,14 +297,14 @@ with expansion:
 Exception matchers that fail
   No exception
 -------------------------------------------------------------------------------
-MatchersTests.cpp:<line number>
+Matchers.tests.cpp:<line number>
 ...............................................................................
 
-MatchersTests.cpp:<line number>: FAILED:
+Matchers.tests.cpp:<line number>: FAILED:
   CHECK_THROWS_MATCHES( doesNotThrow(), SpecialException, ExceptionMatcher{ 1 } )
 because no exception was thrown where one was expected:
 
-MatchersTests.cpp:<line number>: FAILED:
+Matchers.tests.cpp:<line number>: FAILED:
   REQUIRE_THROWS_MATCHES( doesNotThrow(), SpecialException, ExceptionMatcher{ 1 } )
 because no exception was thrown where one was expected:
 
@@ -312,15 +312,15 @@ because no exception was thrown where one was expected:
 Exception matchers that fail
   Type mismatch
 -------------------------------------------------------------------------------
-MatchersTests.cpp:<line number>
+Matchers.tests.cpp:<line number>
 ...............................................................................
 
-MatchersTests.cpp:<line number>: FAILED:
+Matchers.tests.cpp:<line number>: FAILED:
   CHECK_THROWS_MATCHES( throwsAsInt(1), SpecialException, ExceptionMatcher{ 1 } )
 due to unexpected exception with message:
   Unknown exception
 
-MatchersTests.cpp:<line number>: FAILED:
+Matchers.tests.cpp:<line number>: FAILED:
   REQUIRE_THROWS_MATCHES( throwsAsInt(1), SpecialException, ExceptionMatcher{ 1 } )
 due to unexpected exception with message:
   Unknown exception
@@ -329,15 +329,15 @@ due to unexpected exception with message:
 Exception matchers that fail
   Contents are wrong
 -------------------------------------------------------------------------------
-MatchersTests.cpp:<line number>
+Matchers.tests.cpp:<line number>
 ...............................................................................
 
-MatchersTests.cpp:<line number>: FAILED:
+Matchers.tests.cpp:<line number>: FAILED:
   CHECK_THROWS_MATCHES( throws(3), SpecialException, ExceptionMatcher{ 1 } )
 with expansion:
   {?} special exception has value of 1
 
-MatchersTests.cpp:<line number>: FAILED:
+Matchers.tests.cpp:<line number>: FAILED:
   REQUIRE_THROWS_MATCHES( throws(4), SpecialException, ExceptionMatcher{ 1 } )
 with expansion:
   {?} special exception has value of 1
@@ -345,19 +345,19 @@ with expansion:
 -------------------------------------------------------------------------------
 Expected exceptions that don't throw or unexpected exceptions fail the test
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:<line number>
+Exception.tests.cpp:<line number>
 ...............................................................................
 
-ExceptionTests.cpp:<line number>: FAILED:
+Exception.tests.cpp:<line number>: FAILED:
   CHECK_THROWS_AS( thisThrows(), std::string )
 due to unexpected exception with message:
   expected exception
 
-ExceptionTests.cpp:<line number>: FAILED:
+Exception.tests.cpp:<line number>: FAILED:
   CHECK_THROWS_AS( thisDoesntThrow(), std::domain_error )
 because no exception was thrown where one was expected:
 
-ExceptionTests.cpp:<line number>: FAILED:
+Exception.tests.cpp:<line number>: FAILED:
   CHECK_NOTHROW( thisThrows() )
 due to unexpected exception with message:
   expected exception
@@ -365,52 +365,52 @@ due to unexpected exception with message:
 -------------------------------------------------------------------------------
 FAIL aborts the test
 -------------------------------------------------------------------------------
-MessageTests.cpp:<line number>
+Message.tests.cpp:<line number>
 ...............................................................................
 
-MessageTests.cpp:<line number>: FAILED:
+Message.tests.cpp:<line number>: FAILED:
 explicitly with message:
   This is a failure
 
 -------------------------------------------------------------------------------
 FAIL does not require an argument
 -------------------------------------------------------------------------------
-MessageTests.cpp:<line number>
+Message.tests.cpp:<line number>
 ...............................................................................
 
-MessageTests.cpp:<line number>: FAILED:
+Message.tests.cpp:<line number>: FAILED:
 
 -------------------------------------------------------------------------------
 FAIL_CHECK does not abort the test
 -------------------------------------------------------------------------------
-MessageTests.cpp:<line number>
+Message.tests.cpp:<line number>
 ...............................................................................
 
-MessageTests.cpp:<line number>: FAILED:
+Message.tests.cpp:<line number>: FAILED:
 explicitly with message:
   This is a failure
 
-MessageTests.cpp:<line number>:
+Message.tests.cpp:<line number>:
 warning:
   This message appears in the output
 
 -------------------------------------------------------------------------------
 INFO and WARN do not abort tests
 -------------------------------------------------------------------------------
-MessageTests.cpp:<line number>
+Message.tests.cpp:<line number>
 ...............................................................................
 
-MessageTests.cpp:<line number>:
+Message.tests.cpp:<line number>:
 warning:
   this is a warning
 
 -------------------------------------------------------------------------------
 INFO gets logged on failure
 -------------------------------------------------------------------------------
-MessageTests.cpp:<line number>
+Message.tests.cpp:<line number>
 ...............................................................................
 
-MessageTests.cpp:<line number>: FAILED:
+Message.tests.cpp:<line number>: FAILED:
   REQUIRE( a == 1 )
 with expansion:
   2 == 1
@@ -421,10 +421,10 @@ with messages:
 -------------------------------------------------------------------------------
 INFO gets logged on failure, even if captured before successful assertions
 -------------------------------------------------------------------------------
-MessageTests.cpp:<line number>
+Message.tests.cpp:<line number>
 ...............................................................................
 
-MessageTests.cpp:<line number>: FAILED:
+Message.tests.cpp:<line number>: FAILED:
   CHECK( a == 1 )
 with expansion:
   2 == 1
@@ -432,7 +432,7 @@ with messages:
   this message may be logged later
   this message should be logged
 
-MessageTests.cpp:<line number>: FAILED:
+Message.tests.cpp:<line number>: FAILED:
   CHECK( a == 0 )
 with expansion:
   2 == 0
@@ -444,10 +444,10 @@ with messages:
 -------------------------------------------------------------------------------
 INFO is reset for each loop
 -------------------------------------------------------------------------------
-MessageTests.cpp:<line number>
+Message.tests.cpp:<line number>
 ...............................................................................
 
-MessageTests.cpp:<line number>: FAILED:
+Message.tests.cpp:<line number>: FAILED:
   REQUIRE( i < 10 )
 with expansion:
   10 < 10
@@ -458,30 +458,30 @@ with messages:
 -------------------------------------------------------------------------------
 Inequality checks that should fail
 -------------------------------------------------------------------------------
-ConditionTests.cpp:<line number>
+Condition.tests.cpp:<line number>
 ...............................................................................
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( data.int_seven != 7 )
 with expansion:
   7 != 7
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( data.float_nine_point_one != Approx( 9.1f ) )
 with expansion:
   9.1f != Approx( 9.1000003815 )
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( data.double_pi != Approx( 3.1415926535 ) )
 with expansion:
   3.1415926535 != Approx( 3.1415926535 )
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( data.str_hello != "hello" )
 with expansion:
   "hello" != "hello"
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( data.str_hello.size() != 5 )
 with expansion:
   5 != 5
@@ -489,10 +489,10 @@ with expansion:
 -------------------------------------------------------------------------------
 Matchers can be composed with both && and || - failing
 -------------------------------------------------------------------------------
-MatchersTests.cpp:<line number>
+Matchers.tests.cpp:<line number>
 ...............................................................................
 
-MatchersTests.cpp:<line number>: FAILED:
+Matchers.tests.cpp:<line number>: FAILED:
   CHECK_THAT( testStringForMatching(), ( Contains( "string" ) || Contains( "different" ) ) && Contains( "random" ) )
 with expansion:
   "this string contains 'abc' as a substring" ( ( contains: "string" or
@@ -501,10 +501,10 @@ with expansion:
 -------------------------------------------------------------------------------
 Matchers can be negated (Not) with the ! operator - failing
 -------------------------------------------------------------------------------
-MatchersTests.cpp:<line number>
+Matchers.tests.cpp:<line number>
 ...............................................................................
 
-MatchersTests.cpp:<line number>: FAILED:
+Matchers.tests.cpp:<line number>: FAILED:
   CHECK_THAT( testStringForMatching(), !Contains( "substring" ) )
 with expansion:
   "this string contains 'abc' as a substring" not contains: "substring"
@@ -512,10 +512,10 @@ with expansion:
 -------------------------------------------------------------------------------
 Mismatching exception messages failing the test
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:<line number>
+Exception.tests.cpp:<line number>
 ...............................................................................
 
-ExceptionTests.cpp:<line number>: FAILED:
+Exception.tests.cpp:<line number>: FAILED:
   REQUIRE_THROWS_WITH( thisThrows(), "should fail" )
 with expansion:
   "expected exception" equals: "should fail"
@@ -523,120 +523,120 @@ with expansion:
 -------------------------------------------------------------------------------
 Nice descriptive name
 -------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
+Misc.tests.cpp:<line number>
 ...............................................................................
 
-MiscTests.cpp:<line number>:
+Misc.tests.cpp:<line number>:
 warning:
   This one ran
 
 -------------------------------------------------------------------------------
 Non-std exceptions can be translated
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:<line number>
+Exception.tests.cpp:<line number>
 ...............................................................................
 
-ExceptionTests.cpp:<line number>: FAILED:
+Exception.tests.cpp:<line number>: FAILED:
 due to unexpected exception with message:
   custom exception
 
 -------------------------------------------------------------------------------
 Ordering comparison checks that should fail
 -------------------------------------------------------------------------------
-ConditionTests.cpp:<line number>
+Condition.tests.cpp:<line number>
 ...............................................................................
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( data.int_seven > 7 )
 with expansion:
   7 > 7
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( data.int_seven < 7 )
 with expansion:
   7 < 7
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( data.int_seven > 8 )
 with expansion:
   7 > 8
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( data.int_seven < 6 )
 with expansion:
   7 < 6
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( data.int_seven < 0 )
 with expansion:
   7 < 0
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( data.int_seven < -1 )
 with expansion:
   7 < -1
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( data.int_seven >= 8 )
 with expansion:
   7 >= 8
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( data.int_seven <= 6 )
 with expansion:
   7 <= 6
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( data.float_nine_point_one < 9 )
 with expansion:
   9.1f < 9
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( data.float_nine_point_one > 10 )
 with expansion:
   9.1f > 10
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( data.float_nine_point_one > 9.2 )
 with expansion:
   9.1f > 9.2
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( data.str_hello > "hello" )
 with expansion:
   "hello" > "hello"
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( data.str_hello < "hello" )
 with expansion:
   "hello" < "hello"
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( data.str_hello > "hellp" )
 with expansion:
   "hello" > "hellp"
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( data.str_hello > "z" )
 with expansion:
   "hello" > "z"
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( data.str_hello < "hellm" )
 with expansion:
   "hello" < "hellm"
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( data.str_hello < "a" )
 with expansion:
   "hello" < "a"
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( data.str_hello >= "z" )
 with expansion:
   "hello" >= "z"
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( data.str_hello <= "a" )
 with expansion:
   "hello" <= "a"
@@ -645,10 +645,10 @@ with expansion:
 Output from all sections is reported
   one
 -------------------------------------------------------------------------------
-MessageTests.cpp:<line number>
+Message.tests.cpp:<line number>
 ...............................................................................
 
-MessageTests.cpp:<line number>: FAILED:
+Message.tests.cpp:<line number>: FAILED:
 explicitly with message:
   Message from section one
 
@@ -656,20 +656,20 @@ explicitly with message:
 Output from all sections is reported
   two
 -------------------------------------------------------------------------------
-MessageTests.cpp:<line number>
+Message.tests.cpp:<line number>
 ...............................................................................
 
-MessageTests.cpp:<line number>: FAILED:
+Message.tests.cpp:<line number>: FAILED:
 explicitly with message:
   Message from section two
 
 -------------------------------------------------------------------------------
 Reconstruction should be based on stringification: #914
 -------------------------------------------------------------------------------
-DecompositionTests.cpp:<line number>
+Decomposition.tests.cpp:<line number>
 ...............................................................................
 
-DecompositionTests.cpp:<line number>: FAILED:
+Decomposition.tests.cpp:<line number>: FAILED:
   CHECK( truthy(false) )
 with expansion:
   Hey, its truthy!
@@ -677,22 +677,22 @@ with expansion:
 -------------------------------------------------------------------------------
 Regex string matcher
 -------------------------------------------------------------------------------
-MatchersTests.cpp:<line number>
+Matchers.tests.cpp:<line number>
 ...............................................................................
 
-MatchersTests.cpp:<line number>: FAILED:
+Matchers.tests.cpp:<line number>: FAILED:
   CHECK_THAT( testStringForMatching(), Matches("this STRING contains 'abc' as a substring") )
 with expansion:
   "this string contains 'abc' as a substring" matches "this STRING contains
   'abc' as a substring" case sensitively
 
-MatchersTests.cpp:<line number>: FAILED:
+Matchers.tests.cpp:<line number>: FAILED:
   CHECK_THAT( testStringForMatching(), Matches("contains 'abc' as a substring") )
 with expansion:
   "this string contains 'abc' as a substring" matches "contains 'abc' as a
   substring" case sensitively
 
-MatchersTests.cpp:<line number>: FAILED:
+Matchers.tests.cpp:<line number>: FAILED:
   CHECK_THAT( testStringForMatching(), Matches("this string contains 'abc' as a") )
 with expansion:
   "this string contains 'abc' as a substring" matches "this string contains
@@ -705,15 +705,15 @@ Message from section two
 -------------------------------------------------------------------------------
 StartsWith string matcher
 -------------------------------------------------------------------------------
-MatchersTests.cpp:<line number>
+Matchers.tests.cpp:<line number>
 ...............................................................................
 
-MatchersTests.cpp:<line number>: FAILED:
+Matchers.tests.cpp:<line number>: FAILED:
   CHECK_THAT( testStringForMatching(), StartsWith( "This String" ) )
 with expansion:
   "this string contains 'abc' as a substring" starts with: "This String"
 
-MatchersTests.cpp:<line number>: FAILED:
+Matchers.tests.cpp:<line number>: FAILED:
   CHECK_THAT( testStringForMatching(), StartsWith( "string", Catch::CaseSensitive::No ) )
 with expansion:
   "this string contains 'abc' as a substring" starts with: "string" (case
@@ -722,10 +722,10 @@ with expansion:
 -------------------------------------------------------------------------------
 Tabs and newlines show in output
 -------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
+Misc.tests.cpp:<line number>
 ...............................................................................
 
-MiscTests.cpp:<line number>: FAILED:
+Misc.tests.cpp:<line number>: FAILED:
   CHECK( s1 == s2 )
 with expansion:
   "if ($b == 10) {
@@ -740,10 +740,10 @@ with expansion:
 -------------------------------------------------------------------------------
 Unexpected exceptions can be translated
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:<line number>
+Exception.tests.cpp:<line number>
 ...............................................................................
 
-ExceptionTests.cpp:<line number>: FAILED:
+Exception.tests.cpp:<line number>: FAILED:
 due to unexpected exception with message:
   3.14
 
@@ -751,15 +751,15 @@ due to unexpected exception with message:
 Vector matchers that fail
   Contains (element)
 -------------------------------------------------------------------------------
-MatchersTests.cpp:<line number>
+Matchers.tests.cpp:<line number>
 ...............................................................................
 
-MatchersTests.cpp:<line number>: FAILED:
+Matchers.tests.cpp:<line number>: FAILED:
   CHECK_THAT( v, VectorContains( -1 ) )
 with expansion:
   { 1, 2, 3 } Contains: -1
 
-MatchersTests.cpp:<line number>: FAILED:
+Matchers.tests.cpp:<line number>: FAILED:
   CHECK_THAT( empty, VectorContains( 1 ) )
 with expansion:
   {  } Contains: 1
@@ -768,15 +768,15 @@ with expansion:
 Vector matchers that fail
   Contains (vector)
 -------------------------------------------------------------------------------
-MatchersTests.cpp:<line number>
+Matchers.tests.cpp:<line number>
 ...............................................................................
 
-MatchersTests.cpp:<line number>: FAILED:
+Matchers.tests.cpp:<line number>: FAILED:
   CHECK_THAT( empty, Contains( v) )
 with expansion:
   {  } Contains: { 1, 2, 3 }
 
-MatchersTests.cpp:<line number>: FAILED:
+Matchers.tests.cpp:<line number>: FAILED:
   CHECK_THAT( v, Contains( v2 ) )
 with expansion:
   { 1, 2, 3 } Contains: { 1, 2, 4 }
@@ -785,25 +785,25 @@ with expansion:
 Vector matchers that fail
   Equals
 -------------------------------------------------------------------------------
-MatchersTests.cpp:<line number>
+Matchers.tests.cpp:<line number>
 ...............................................................................
 
-MatchersTests.cpp:<line number>: FAILED:
+Matchers.tests.cpp:<line number>: FAILED:
   CHECK_THAT( v, Equals( v2 ) )
 with expansion:
   { 1, 2, 3 } Equals: { 1, 2 }
 
-MatchersTests.cpp:<line number>: FAILED:
+Matchers.tests.cpp:<line number>: FAILED:
   CHECK_THAT( v2, Equals( v ) )
 with expansion:
   { 1, 2 } Equals: { 1, 2, 3 }
 
-MatchersTests.cpp:<line number>: FAILED:
+Matchers.tests.cpp:<line number>: FAILED:
   CHECK_THAT( empty, Equals( v ) )
 with expansion:
   {  } Equals: { 1, 2, 3 }
 
-MatchersTests.cpp:<line number>: FAILED:
+Matchers.tests.cpp:<line number>: FAILED:
   CHECK_THAT( v, Equals( empty ) )
 with expansion:
   { 1, 2, 3 } Equals: {  }
@@ -811,20 +811,20 @@ with expansion:
 -------------------------------------------------------------------------------
 When unchecked exceptions are thrown directly they are always failures
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:<line number>
+Exception.tests.cpp:<line number>
 ...............................................................................
 
-ExceptionTests.cpp:<line number>: FAILED:
+Exception.tests.cpp:<line number>: FAILED:
 due to unexpected exception with message:
   unexpected exception
 
 -------------------------------------------------------------------------------
 When unchecked exceptions are thrown during a CHECK the test should continue
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:<line number>
+Exception.tests.cpp:<line number>
 ...............................................................................
 
-ExceptionTests.cpp:<line number>: FAILED:
+Exception.tests.cpp:<line number>: FAILED:
   CHECK( thisThrows() == 0 )
 due to unexpected exception with message:
   expected exception
@@ -833,10 +833,10 @@ due to unexpected exception with message:
 When unchecked exceptions are thrown during a REQUIRE the test should abort
 fail
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:<line number>
+Exception.tests.cpp:<line number>
 ...............................................................................
 
-ExceptionTests.cpp:<line number>: FAILED:
+Exception.tests.cpp:<line number>: FAILED:
   REQUIRE( thisThrows() == 0 )
 due to unexpected exception with message:
   expected exception
@@ -844,10 +844,10 @@ due to unexpected exception with message:
 -------------------------------------------------------------------------------
 When unchecked exceptions are thrown from functions they are always failures
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:<line number>
+Exception.tests.cpp:<line number>
 ...............................................................................
 
-ExceptionTests.cpp:<line number>: FAILED:
+Exception.tests.cpp:<line number>: FAILED:
   CHECK( thisThrows() == 0 )
 due to unexpected exception with message:
   expected exception
@@ -856,20 +856,20 @@ due to unexpected exception with message:
 When unchecked exceptions are thrown from sections they are always failures
   section name
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:<line number>
+Exception.tests.cpp:<line number>
 ...............................................................................
 
-ExceptionTests.cpp:<line number>: FAILED:
+Exception.tests.cpp:<line number>: FAILED:
 due to unexpected exception with message:
   unexpected exception
 
 -------------------------------------------------------------------------------
 Where the LHS is not a simple value
 -------------------------------------------------------------------------------
-TrickyTests.cpp:<line number>
+Tricky.tests.cpp:<line number>
 ...............................................................................
 
-TrickyTests.cpp:<line number>:
+Tricky.tests.cpp:<line number>:
 warning:
   Uncomment the code in this test to check that it gives a sensible compiler
   error
@@ -877,10 +877,10 @@ warning:
 -------------------------------------------------------------------------------
 Where there is more to the expression after the RHS
 -------------------------------------------------------------------------------
-TrickyTests.cpp:<line number>
+Tricky.tests.cpp:<line number>
 ...............................................................................
 
-TrickyTests.cpp:<line number>:
+Tricky.tests.cpp:<line number>:
 warning:
   Uncomment the code in this test to check that it gives a sensible compiler
   error
@@ -888,15 +888,15 @@ warning:
 -------------------------------------------------------------------------------
 checkedElse, failing
 -------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
+Misc.tests.cpp:<line number>
 ...............................................................................
 
-MiscTests.cpp:<line number>: FAILED:
+Misc.tests.cpp:<line number>: FAILED:
   CHECKED_ELSE( flag )
 with expansion:
   false
 
-MiscTests.cpp:<line number>: FAILED:
+Misc.tests.cpp:<line number>: FAILED:
   REQUIRE( testCheckedElse( false ) )
 with expansion:
   false
@@ -904,15 +904,15 @@ with expansion:
 -------------------------------------------------------------------------------
 checkedIf, failing
 -------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
+Misc.tests.cpp:<line number>
 ...............................................................................
 
-MiscTests.cpp:<line number>: FAILED:
+Misc.tests.cpp:<line number>: FAILED:
   CHECKED_IF( flag )
 with expansion:
   false
 
-MiscTests.cpp:<line number>: FAILED:
+Misc.tests.cpp:<line number>: FAILED:
   REQUIRE( testCheckedIf( false ) )
 with expansion:
   false
@@ -921,10 +921,10 @@ loose text artifact
 -------------------------------------------------------------------------------
 just failure
 -------------------------------------------------------------------------------
-MessageTests.cpp:<line number>
+Message.tests.cpp:<line number>
 ...............................................................................
 
-MessageTests.cpp:<line number>: FAILED:
+Message.tests.cpp:<line number>: FAILED:
 explicitly with message:
   Previous info should not be seen
 
@@ -932,10 +932,10 @@ explicitly with message:
 looped SECTION tests
   s1
 -------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
+Misc.tests.cpp:<line number>
 ...............................................................................
 
-MiscTests.cpp:<line number>: FAILED:
+Misc.tests.cpp:<line number>: FAILED:
   CHECK( b > a )
 with expansion:
   0 > 1
@@ -943,45 +943,45 @@ with expansion:
 -------------------------------------------------------------------------------
 looped tests
 -------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
+Misc.tests.cpp:<line number>
 ...............................................................................
 
-MiscTests.cpp:<line number>: FAILED:
+Misc.tests.cpp:<line number>: FAILED:
   CHECK( ( fib[i] % 2 ) == 0 )
 with expansion:
   1 == 0
 with message:
   Testing if fib[0] (1) is even
 
-MiscTests.cpp:<line number>: FAILED:
+Misc.tests.cpp:<line number>: FAILED:
   CHECK( ( fib[i] % 2 ) == 0 )
 with expansion:
   1 == 0
 with message:
   Testing if fib[1] (1) is even
 
-MiscTests.cpp:<line number>: FAILED:
+Misc.tests.cpp:<line number>: FAILED:
   CHECK( ( fib[i] % 2 ) == 0 )
 with expansion:
   1 == 0
 with message:
   Testing if fib[3] (3) is even
 
-MiscTests.cpp:<line number>: FAILED:
+Misc.tests.cpp:<line number>: FAILED:
   CHECK( ( fib[i] % 2 ) == 0 )
 with expansion:
   1 == 0
 with message:
   Testing if fib[4] (5) is even
 
-MiscTests.cpp:<line number>: FAILED:
+Misc.tests.cpp:<line number>: FAILED:
   CHECK( ( fib[i] % 2 ) == 0 )
 with expansion:
   1 == 0
 with message:
   Testing if fib[6] (13) is even
 
-MiscTests.cpp:<line number>: FAILED:
+Misc.tests.cpp:<line number>: FAILED:
   CHECK( ( fib[i] % 2 ) == 0 )
 with expansion:
   1 == 0
@@ -993,10 +993,10 @@ more nested SECTION tests
   s1
   s2
 -------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
+Misc.tests.cpp:<line number>
 ...............................................................................
 
-MiscTests.cpp:<line number>: FAILED:
+Misc.tests.cpp:<line number>: FAILED:
   REQUIRE( a == b )
 with expansion:
   1 == 2
@@ -1004,10 +1004,10 @@ with expansion:
 -------------------------------------------------------------------------------
 send a single char to INFO
 -------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
+Misc.tests.cpp:<line number>
 ...............................................................................
 
-MiscTests.cpp:<line number>: FAILED:
+Misc.tests.cpp:<line number>: FAILED:
   REQUIRE( false )
 with message:
   3
@@ -1015,10 +1015,10 @@ with message:
 -------------------------------------------------------------------------------
 sends information to INFO
 -------------------------------------------------------------------------------
-MessageTests.cpp:<line number>
+Message.tests.cpp:<line number>
 ...............................................................................
 
-MessageTests.cpp:<line number>: FAILED:
+Message.tests.cpp:<line number>: FAILED:
   REQUIRE( false )
 with messages:
   hi
@@ -1027,10 +1027,10 @@ with messages:
 -------------------------------------------------------------------------------
 string literals of different sizes can be compared
 -------------------------------------------------------------------------------
-TrickyTests.cpp:<line number>
+Tricky.tests.cpp:<line number>
 ...............................................................................
 
-TrickyTests.cpp:<line number>: FAILED:
+Tricky.tests.cpp:<line number>: FAILED:
   REQUIRE( std::string( "first" ) == "second" )
 with expansion:
   "first" == "second"
@@ -1038,15 +1038,15 @@ with expansion:
 -------------------------------------------------------------------------------
 toString(enum class)
 -------------------------------------------------------------------------------
-EnumToString.cpp:<line number>
+EnumToString.tests.cpp:<line number>
 ...............................................................................
 
-EnumToString.cpp:<line number>: FAILED:
+EnumToString.tests.cpp:<line number>: FAILED:
   CHECK( ::Catch::Detail::stringify(e0) == "0" )
 with expansion:
   "{?}" == "0"
 
-EnumToString.cpp:<line number>: FAILED:
+EnumToString.tests.cpp:<line number>: FAILED:
   CHECK( ::Catch::Detail::stringify(e1) == "1" )
 with expansion:
   "{?}" == "1"
diff --git a/projects/SelfTest/Baselines/console.sw.approved.txt b/projects/SelfTest/Baselines/console.sw.approved.txt
index 845ac8bd..fa7d62c9 100644
--- a/projects/SelfTest/Baselines/console.sw.approved.txt
+++ b/projects/SelfTest/Baselines/console.sw.approved.txt
@@ -6,10 +6,10 @@ Run with -? for options
 -------------------------------------------------------------------------------
 # A test name that starts with a #
 -------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
+Misc.tests.cpp:<line number>
 ...............................................................................
 
-MiscTests.cpp:<line number>:
+Misc.tests.cpp:<line number>:
 PASSED:
 with message:
   yay
@@ -18,16 +18,16 @@ with message:
 #1005: Comparing pointer to int and long (NULL can be either on various
        systems)
 -------------------------------------------------------------------------------
-DecompositionTests.cpp:<line number>
+Decomposition.tests.cpp:<line number>
 ...............................................................................
 
-DecompositionTests.cpp:<line number>:
+Decomposition.tests.cpp:<line number>:
 PASSED:
   REQUIRE( fptr == 0 )
 with expansion:
   0 == 0
 
-DecompositionTests.cpp:<line number>:
+Decomposition.tests.cpp:<line number>:
 PASSED:
   REQUIRE( fptr == 0l )
 with expansion:
@@ -36,16 +36,16 @@ with expansion:
 -------------------------------------------------------------------------------
 #1027
 -------------------------------------------------------------------------------
-CompilationTests.cpp:<line number>
+Compilation.tests.cpp:<line number>
 ...............................................................................
 
-CompilationTests.cpp:<line number>:
+Compilation.tests.cpp:<line number>:
 PASSED:
   REQUIRE( y.v == 0 )
 with expansion:
   0 == 0
 
-CompilationTests.cpp:<line number>:
+Compilation.tests.cpp:<line number>:
 PASSED:
   REQUIRE( 0 == y.v )
 with expansion:
@@ -55,10 +55,10 @@ with expansion:
 #748 - captures with unexpected exceptions
   outside assertions
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:<line number>
+Exception.tests.cpp:<line number>
 ...............................................................................
 
-ExceptionTests.cpp:<line number>: FAILED:
+Exception.tests.cpp:<line number>: FAILED:
 due to unexpected exception with messages:
   answer := 42
   expected exception
@@ -67,10 +67,10 @@ due to unexpected exception with messages:
 #748 - captures with unexpected exceptions
   inside REQUIRE_NOTHROW
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:<line number>
+Exception.tests.cpp:<line number>
 ...............................................................................
 
-ExceptionTests.cpp:<line number>: FAILED:
+Exception.tests.cpp:<line number>: FAILED:
   REQUIRE_NOTHROW( thisThrows() )
 due to unexpected exception with messages:
   answer := 42
@@ -80,10 +80,10 @@ due to unexpected exception with messages:
 #748 - captures with unexpected exceptions
   inside REQUIRE_THROWS
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:<line number>
+Exception.tests.cpp:<line number>
 ...............................................................................
 
-ExceptionTests.cpp:<line number>:
+Exception.tests.cpp:<line number>:
 PASSED:
   REQUIRE_THROWS( thisThrows() )
 with message:
@@ -92,10 +92,10 @@ with message:
 -------------------------------------------------------------------------------
 #809
 -------------------------------------------------------------------------------
-CompilationTests.cpp:<line number>
+Compilation.tests.cpp:<line number>
 ...............................................................................
 
-CompilationTests.cpp:<line number>:
+Compilation.tests.cpp:<line number>:
 PASSED:
   REQUIRE( 42 == f )
 with expansion:
@@ -104,40 +104,40 @@ with expansion:
 -------------------------------------------------------------------------------
 #833
 -------------------------------------------------------------------------------
-CompilationTests.cpp:<line number>
+Compilation.tests.cpp:<line number>
 ...............................................................................
 
-CompilationTests.cpp:<line number>:
+Compilation.tests.cpp:<line number>:
 PASSED:
   REQUIRE( a == t )
 with expansion:
   3 == 3
 
-CompilationTests.cpp:<line number>:
+Compilation.tests.cpp:<line number>:
 PASSED:
   CHECK( a == t )
 with expansion:
   3 == 3
 
-CompilationTests.cpp:<line number>:
+Compilation.tests.cpp:<line number>:
 PASSED:
   REQUIRE_THROWS( throws_int(true) )
 
-CompilationTests.cpp:<line number>:
+Compilation.tests.cpp:<line number>:
 PASSED:
   CHECK_THROWS_AS( throws_int(true), int )
 
-CompilationTests.cpp:<line number>:
+Compilation.tests.cpp:<line number>:
 PASSED:
   REQUIRE_NOTHROW( throws_int(false) )
 
-CompilationTests.cpp:<line number>:
+Compilation.tests.cpp:<line number>:
 PASSED:
   REQUIRE_THAT( "aaa", Catch::EndsWith("aaa") )
 with expansion:
   "aaa" ends with: "aaa"
 
-CompilationTests.cpp:<line number>:
+Compilation.tests.cpp:<line number>:
 PASSED:
   REQUIRE( templated_tests<int>(3) )
 with expansion:
@@ -146,15 +146,15 @@ with expansion:
 -------------------------------------------------------------------------------
 #835 -- errno should not be touched by Catch
 -------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
+Misc.tests.cpp:<line number>
 ...............................................................................
 
-MiscTests.cpp:<line number>: FAILED:
+Misc.tests.cpp:<line number>: FAILED:
   CHECK( f() == 0 )
 with expansion:
   1 == 0
 
-MiscTests.cpp:<line number>:
+Misc.tests.cpp:<line number>:
 PASSED:
   REQUIRE( errno == 1 )
 with expansion:
@@ -163,10 +163,10 @@ with expansion:
 -------------------------------------------------------------------------------
 #872
 -------------------------------------------------------------------------------
-CompilationTests.cpp:<line number>
+Compilation.tests.cpp:<line number>
 ...............................................................................
 
-CompilationTests.cpp:<line number>:
+Compilation.tests.cpp:<line number>:
 PASSED:
   REQUIRE( x == 4 )
 with expansion:
@@ -178,10 +178,10 @@ with message:
 #961 -- Dynamically created sections should all be reported
   Looped section 0
 -------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
+Misc.tests.cpp:<line number>
 ...............................................................................
 
-MiscTests.cpp:<line number>:
+Misc.tests.cpp:<line number>:
 PASSED:
 with message:
   Everything is OK
@@ -190,10 +190,10 @@ with message:
 #961 -- Dynamically created sections should all be reported
   Looped section 1
 -------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
+Misc.tests.cpp:<line number>
 ...............................................................................
 
-MiscTests.cpp:<line number>:
+Misc.tests.cpp:<line number>:
 PASSED:
 with message:
   Everything is OK
@@ -202,10 +202,10 @@ with message:
 #961 -- Dynamically created sections should all be reported
   Looped section 2
 -------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
+Misc.tests.cpp:<line number>
 ...............................................................................
 
-MiscTests.cpp:<line number>:
+Misc.tests.cpp:<line number>:
 PASSED:
 with message:
   Everything is OK
@@ -214,10 +214,10 @@ with message:
 #961 -- Dynamically created sections should all be reported
   Looped section 3
 -------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
+Misc.tests.cpp:<line number>
 ...............................................................................
 
-MiscTests.cpp:<line number>:
+Misc.tests.cpp:<line number>:
 PASSED:
 with message:
   Everything is OK
@@ -226,10 +226,10 @@ with message:
 #961 -- Dynamically created sections should all be reported
   Looped section 4
 -------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
+Misc.tests.cpp:<line number>
 ...............................................................................
 
-MiscTests.cpp:<line number>:
+Misc.tests.cpp:<line number>:
 PASSED:
 with message:
   Everything is OK
@@ -237,88 +237,88 @@ with message:
 -------------------------------------------------------------------------------
 'Not' checks that should fail
 -------------------------------------------------------------------------------
-ConditionTests.cpp:<line number>
+Condition.tests.cpp:<line number>
 ...............................................................................
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( false != false )
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( true != true )
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( !true )
 with expansion:
   false
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK_FALSE( true )
 with expansion:
   !true
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( !trueValue )
 with expansion:
   false
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK_FALSE( trueValue )
 with expansion:
   !true
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( !(1 == 1) )
 with expansion:
   false
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK_FALSE( 1 == 1 )
 
 -------------------------------------------------------------------------------
 'Not' checks that should succeed
 -------------------------------------------------------------------------------
-ConditionTests.cpp:<line number>
+Condition.tests.cpp:<line number>
 ...............................................................................
 
-ConditionTests.cpp:<line number>:
+Condition.tests.cpp:<line number>:
 PASSED:
   REQUIRE( false == false )
 
-ConditionTests.cpp:<line number>:
+Condition.tests.cpp:<line number>:
 PASSED:
   REQUIRE( true == true )
 
-ConditionTests.cpp:<line number>:
+Condition.tests.cpp:<line number>:
 PASSED:
   REQUIRE( !false )
 with expansion:
   true
 
-ConditionTests.cpp:<line number>:
+Condition.tests.cpp:<line number>:
 PASSED:
   REQUIRE_FALSE( false )
 with expansion:
   !false
 
-ConditionTests.cpp:<line number>:
+Condition.tests.cpp:<line number>:
 PASSED:
   REQUIRE( !falseValue )
 with expansion:
   true
 
-ConditionTests.cpp:<line number>:
+Condition.tests.cpp:<line number>:
 PASSED:
   REQUIRE_FALSE( falseValue )
 with expansion:
   !false
 
-ConditionTests.cpp:<line number>:
+Condition.tests.cpp:<line number>:
 PASSED:
   REQUIRE( !(1 == 2) )
 with expansion:
   true
 
-ConditionTests.cpp:<line number>:
+Condition.tests.cpp:<line number>:
 PASSED:
   REQUIRE_FALSE( 1 == 2 )
 
@@ -326,16 +326,16 @@ PASSED:
 (unimplemented) static bools can be evaluated
   compare to true
 -------------------------------------------------------------------------------
-TrickyTests.cpp:<line number>
+Tricky.tests.cpp:<line number>
 ...............................................................................
 
-TrickyTests.cpp:<line number>:
+Tricky.tests.cpp:<line number>:
 PASSED:
   REQUIRE( is_true<true>::value == true )
 with expansion:
   true == true
 
-TrickyTests.cpp:<line number>:
+Tricky.tests.cpp:<line number>:
 PASSED:
   REQUIRE( true == is_true<true>::value )
 with expansion:
@@ -345,16 +345,16 @@ with expansion:
 (unimplemented) static bools can be evaluated
   compare to false
 -------------------------------------------------------------------------------
-TrickyTests.cpp:<line number>
+Tricky.tests.cpp:<line number>
 ...............................................................................
 
-TrickyTests.cpp:<line number>:
+Tricky.tests.cpp:<line number>:
 PASSED:
   REQUIRE( is_true<false>::value == false )
 with expansion:
   false == false
 
-TrickyTests.cpp:<line number>:
+Tricky.tests.cpp:<line number>:
 PASSED:
   REQUIRE( false == is_true<false>::value )
 with expansion:
@@ -364,10 +364,10 @@ with expansion:
 (unimplemented) static bools can be evaluated
   negation
 -------------------------------------------------------------------------------
-TrickyTests.cpp:<line number>
+Tricky.tests.cpp:<line number>
 ...............................................................................
 
-TrickyTests.cpp:<line number>:
+Tricky.tests.cpp:<line number>:
 PASSED:
   REQUIRE( !is_true<false>::value )
 with expansion:
@@ -377,10 +377,10 @@ with expansion:
 (unimplemented) static bools can be evaluated
   double negation
 -------------------------------------------------------------------------------
-TrickyTests.cpp:<line number>
+Tricky.tests.cpp:<line number>
 ...............................................................................
 
-TrickyTests.cpp:<line number>:
+Tricky.tests.cpp:<line number>:
 PASSED:
   REQUIRE( !!is_true<true>::value )
 with expansion:
@@ -390,16 +390,16 @@ with expansion:
 (unimplemented) static bools can be evaluated
   direct
 -------------------------------------------------------------------------------
-TrickyTests.cpp:<line number>
+Tricky.tests.cpp:<line number>
 ...............................................................................
 
-TrickyTests.cpp:<line number>:
+Tricky.tests.cpp:<line number>:
 PASSED:
   REQUIRE( is_true<true>::value )
 with expansion:
   true
 
-TrickyTests.cpp:<line number>:
+Tricky.tests.cpp:<line number>:
 PASSED:
   REQUIRE_FALSE( is_true<false>::value )
 with expansion:
@@ -408,10 +408,10 @@ with expansion:
 -------------------------------------------------------------------------------
 A METHOD_AS_TEST_CASE based test run that fails
 -------------------------------------------------------------------------------
-ClassTests.cpp:<line number>
+Class.tests.cpp:<line number>
 ...............................................................................
 
-ClassTests.cpp:<line number>: FAILED:
+Class.tests.cpp:<line number>: FAILED:
   REQUIRE( s == "world" )
 with expansion:
   "hello" == "world"
@@ -419,10 +419,10 @@ with expansion:
 -------------------------------------------------------------------------------
 A METHOD_AS_TEST_CASE based test run that succeeds
 -------------------------------------------------------------------------------
-ClassTests.cpp:<line number>
+Class.tests.cpp:<line number>
 ...............................................................................
 
-ClassTests.cpp:<line number>:
+Class.tests.cpp:<line number>:
 PASSED:
   REQUIRE( s == "hello" )
 with expansion:
@@ -431,10 +431,10 @@ with expansion:
 -------------------------------------------------------------------------------
 A TEST_CASE_METHOD based test run that fails
 -------------------------------------------------------------------------------
-ClassTests.cpp:<line number>
+Class.tests.cpp:<line number>
 ...............................................................................
 
-ClassTests.cpp:<line number>: FAILED:
+Class.tests.cpp:<line number>: FAILED:
   REQUIRE( m_a == 2 )
 with expansion:
   1 == 2
@@ -442,10 +442,10 @@ with expansion:
 -------------------------------------------------------------------------------
 A TEST_CASE_METHOD based test run that succeeds
 -------------------------------------------------------------------------------
-ClassTests.cpp:<line number>
+Class.tests.cpp:<line number>
 ...............................................................................
 
-ClassTests.cpp:<line number>:
+Class.tests.cpp:<line number>:
 PASSED:
   REQUIRE( m_a == 1 )
 with expansion:
@@ -456,10 +456,10 @@ A couple of nested sections followed by a failure
   Outer
   Inner
 -------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
+Misc.tests.cpp:<line number>
 ...............................................................................
 
-MiscTests.cpp:<line number>:
+Misc.tests.cpp:<line number>:
 PASSED:
 with message:
   that's not flying - that's failing in style
@@ -467,25 +467,25 @@ with message:
 -------------------------------------------------------------------------------
 A couple of nested sections followed by a failure
 -------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
+Misc.tests.cpp:<line number>
 ...............................................................................
 
-MiscTests.cpp:<line number>: FAILED:
+Misc.tests.cpp:<line number>: FAILED:
 explicitly with message:
   to infinity and beyond
 
 -------------------------------------------------------------------------------
 A failing expression with a non streamable type is still captured
 -------------------------------------------------------------------------------
-TrickyTests.cpp:<line number>
+Tricky.tests.cpp:<line number>
 ...............................................................................
 
-TrickyTests.cpp:<line number>: FAILED:
+Tricky.tests.cpp:<line number>: FAILED:
   CHECK( &o1 == &o2 )
 with expansion:
   0x<hex digits> == 0x<hex digits>
 
-TrickyTests.cpp:<line number>: FAILED:
+Tricky.tests.cpp:<line number>: FAILED:
   CHECK( o1 == o2 )
 with expansion:
   {?} == {?}
@@ -493,40 +493,40 @@ with expansion:
 -------------------------------------------------------------------------------
 Absolute margin
 -------------------------------------------------------------------------------
-ApproxTests.cpp:<line number>
+Approx.tests.cpp:<line number>
 ...............................................................................
 
-ApproxTests.cpp:<line number>:
+Approx.tests.cpp:<line number>:
 PASSED:
   REQUIRE( 104.0 != Approx(100.0) )
 with expansion:
   104.0 != Approx( 100.0 )
 
-ApproxTests.cpp:<line number>:
+Approx.tests.cpp:<line number>:
 PASSED:
   REQUIRE( 104.0 == Approx(100.0).margin(5) )
 with expansion:
   104.0 == Approx( 100.0 )
 
-ApproxTests.cpp:<line number>:
+Approx.tests.cpp:<line number>:
 PASSED:
   REQUIRE( 104.0 == Approx(100.0).margin(4) )
 with expansion:
   104.0 == Approx( 100.0 )
 
-ApproxTests.cpp:<line number>:
+Approx.tests.cpp:<line number>:
 PASSED:
   REQUIRE( 104.0 != Approx(100.0).margin(3) )
 with expansion:
   104.0 != Approx( 100.0 )
 
-ApproxTests.cpp:<line number>:
+Approx.tests.cpp:<line number>:
 PASSED:
   REQUIRE( 100.3 != Approx(100.0) )
 with expansion:
   100.3 != Approx( 100.0 )
 
-ApproxTests.cpp:<line number>:
+Approx.tests.cpp:<line number>:
 PASSED:
   REQUIRE( 100.3 == Approx(100.0).margin(0.5) )
 with expansion:
@@ -535,16 +535,16 @@ with expansion:
 -------------------------------------------------------------------------------
 An expression with side-effects should only be evaluated once
 -------------------------------------------------------------------------------
-TrickyTests.cpp:<line number>
+Tricky.tests.cpp:<line number>
 ...............................................................................
 
-TrickyTests.cpp:<line number>:
+Tricky.tests.cpp:<line number>:
 PASSED:
   REQUIRE( i++ == 7 )
 with expansion:
   7 == 7
 
-TrickyTests.cpp:<line number>:
+Tricky.tests.cpp:<line number>:
 PASSED:
   REQUIRE( i++ == 8 )
 with expansion:
@@ -553,14 +553,14 @@ with expansion:
 -------------------------------------------------------------------------------
 An unchecked exception reports the line of the last assertion
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:<line number>
+Exception.tests.cpp:<line number>
 ...............................................................................
 
-ExceptionTests.cpp:<line number>:
+Exception.tests.cpp:<line number>:
 PASSED:
   CHECK( 1 == 1 )
 
-ExceptionTests.cpp:<line number>: FAILED:
+Exception.tests.cpp:<line number>: FAILED:
   {Unknown expression after the reported line}
 due to unexpected exception with message:
   unexpected exception
@@ -568,10 +568,10 @@ due to unexpected exception with message:
 -------------------------------------------------------------------------------
 Anonymous test case 1
 -------------------------------------------------------------------------------
-VariadicMacrosTests.cpp:<line number>
+VariadicMacros.tests.cpp:<line number>
 ...............................................................................
 
-VariadicMacrosTests.cpp:<line number>:
+VariadicMacros.tests.cpp:<line number>:
 PASSED:
 with message:
   anonymous test case
@@ -579,68 +579,68 @@ with message:
 -------------------------------------------------------------------------------
 Approx setters validate their arguments
 -------------------------------------------------------------------------------
-ApproxTests.cpp:<line number>
+Approx.tests.cpp:<line number>
 ...............................................................................
 
-ApproxTests.cpp:<line number>:
+Approx.tests.cpp:<line number>:
 PASSED:
   REQUIRE_NOTHROW( Approx(0).margin(0) )
 
-ApproxTests.cpp:<line number>:
+Approx.tests.cpp:<line number>:
 PASSED:
   REQUIRE_NOTHROW( Approx(0).margin(1234656) )
 
-ApproxTests.cpp:<line number>:
+Approx.tests.cpp:<line number>:
 PASSED:
   REQUIRE_THROWS_AS( Approx(0).margin(-2), std::domain_error )
 
-ApproxTests.cpp:<line number>:
+Approx.tests.cpp:<line number>:
 PASSED:
   REQUIRE_NOTHROW( Approx(0).epsilon(0) )
 
-ApproxTests.cpp:<line number>:
+Approx.tests.cpp:<line number>:
 PASSED:
   REQUIRE_NOTHROW( Approx(0).epsilon(1) )
 
-ApproxTests.cpp:<line number>:
+Approx.tests.cpp:<line number>:
 PASSED:
   REQUIRE_THROWS_AS( Approx(0).epsilon(-0.001), std::domain_error )
 
-ApproxTests.cpp:<line number>:
+Approx.tests.cpp:<line number>:
 PASSED:
   REQUIRE_THROWS_AS( Approx(0).epsilon(1.0001), std::domain_error )
 
 -------------------------------------------------------------------------------
 Approx with exactly-representable margin
 -------------------------------------------------------------------------------
-ApproxTests.cpp:<line number>
+Approx.tests.cpp:<line number>
 ...............................................................................
 
-ApproxTests.cpp:<line number>:
+Approx.tests.cpp:<line number>:
 PASSED:
   CHECK( 0.25f == Approx(0.0f).margin(0.25f) )
 with expansion:
   0.25f == Approx( 0.0 )
 
-ApproxTests.cpp:<line number>:
+Approx.tests.cpp:<line number>:
 PASSED:
   CHECK( 0.0f == Approx(0.25f).margin(0.25f) )
 with expansion:
   0.0f == Approx( 0.25 )
 
-ApproxTests.cpp:<line number>:
+Approx.tests.cpp:<line number>:
 PASSED:
   CHECK( 0.5f == Approx(0.25f).margin(0.25f) )
 with expansion:
   0.5f == Approx( 0.25 )
 
-ApproxTests.cpp:<line number>:
+Approx.tests.cpp:<line number>:
 PASSED:
   CHECK( 245.0f == Approx(245.25f).margin(0.25f) )
 with expansion:
   245.0f == Approx( 245.25 )
 
-ApproxTests.cpp:<line number>:
+Approx.tests.cpp:<line number>:
 PASSED:
   CHECK( 245.5f == Approx(245.25f).margin(0.25f) )
 with expansion:
@@ -649,16 +649,16 @@ with expansion:
 -------------------------------------------------------------------------------
 Approximate PI
 -------------------------------------------------------------------------------
-ApproxTests.cpp:<line number>
+Approx.tests.cpp:<line number>
 ...............................................................................
 
-ApproxTests.cpp:<line number>:
+Approx.tests.cpp:<line number>:
 PASSED:
   REQUIRE( divide( 22, 7 ) == Approx( 3.141 ).epsilon( 0.001 ) )
 with expansion:
   3.1428571429 == Approx( 3.141 )
 
-ApproxTests.cpp:<line number>:
+Approx.tests.cpp:<line number>:
 PASSED:
   REQUIRE( divide( 22, 7 ) != Approx( 3.141 ).epsilon( 0.0001 ) )
 with expansion:
@@ -667,16 +667,16 @@ with expansion:
 -------------------------------------------------------------------------------
 Approximate comparisons with different epsilons
 -------------------------------------------------------------------------------
-ApproxTests.cpp:<line number>
+Approx.tests.cpp:<line number>
 ...............................................................................
 
-ApproxTests.cpp:<line number>:
+Approx.tests.cpp:<line number>:
 PASSED:
   REQUIRE( d != Approx( 1.231 ) )
 with expansion:
   1.23 != Approx( 1.231 )
 
-ApproxTests.cpp:<line number>:
+Approx.tests.cpp:<line number>:
 PASSED:
   REQUIRE( d == Approx( 1.231 ).epsilon( 0.1 ) )
 with expansion:
@@ -685,16 +685,16 @@ with expansion:
 -------------------------------------------------------------------------------
 Approximate comparisons with floats
 -------------------------------------------------------------------------------
-ApproxTests.cpp:<line number>
+Approx.tests.cpp:<line number>
 ...............................................................................
 
-ApproxTests.cpp:<line number>:
+Approx.tests.cpp:<line number>:
 PASSED:
   REQUIRE( 1.23f == Approx( 1.23f ) )
 with expansion:
   1.23f == Approx( 1.2300000191 )
 
-ApproxTests.cpp:<line number>:
+Approx.tests.cpp:<line number>:
 PASSED:
   REQUIRE( 0.0f == Approx( 0.0f ) )
 with expansion:
@@ -703,16 +703,16 @@ with expansion:
 -------------------------------------------------------------------------------
 Approximate comparisons with ints
 -------------------------------------------------------------------------------
-ApproxTests.cpp:<line number>
+Approx.tests.cpp:<line number>
 ...............................................................................
 
-ApproxTests.cpp:<line number>:
+Approx.tests.cpp:<line number>:
 PASSED:
   REQUIRE( 1 == Approx( 1 ) )
 with expansion:
   1 == Approx( 1.0 )
 
-ApproxTests.cpp:<line number>:
+Approx.tests.cpp:<line number>:
 PASSED:
   REQUIRE( 0 == Approx( 0 ) )
 with expansion:
@@ -721,34 +721,34 @@ with expansion:
 -------------------------------------------------------------------------------
 Approximate comparisons with mixed numeric types
 -------------------------------------------------------------------------------
-ApproxTests.cpp:<line number>
+Approx.tests.cpp:<line number>
 ...............................................................................
 
-ApproxTests.cpp:<line number>:
+Approx.tests.cpp:<line number>:
 PASSED:
   REQUIRE( 1.0f == Approx( 1 ) )
 with expansion:
   1.0f == Approx( 1.0 )
 
-ApproxTests.cpp:<line number>:
+Approx.tests.cpp:<line number>:
 PASSED:
   REQUIRE( 0 == Approx( dZero) )
 with expansion:
   0 == Approx( 0.0 )
 
-ApproxTests.cpp:<line number>:
+Approx.tests.cpp:<line number>:
 PASSED:
   REQUIRE( 0 == Approx( dSmall ).margin( 0.001 ) )
 with expansion:
   0 == Approx( 0.00001 )
 
-ApproxTests.cpp:<line number>:
+Approx.tests.cpp:<line number>:
 PASSED:
   REQUIRE( 1.234f == Approx( dMedium ) )
 with expansion:
   1.234f == Approx( 1.234 )
 
-ApproxTests.cpp:<line number>:
+Approx.tests.cpp:<line number>:
 PASSED:
   REQUIRE( dMedium == Approx( 1.234f ) )
 with expansion:
@@ -757,10 +757,10 @@ with expansion:
 -------------------------------------------------------------------------------
 Assertions then sections
 -------------------------------------------------------------------------------
-TrickyTests.cpp:<line number>
+Tricky.tests.cpp:<line number>
 ...............................................................................
 
-TrickyTests.cpp:<line number>:
+Tricky.tests.cpp:<line number>:
 PASSED:
   REQUIRE( Catch::alwaysTrue() )
 with expansion:
@@ -770,10 +770,10 @@ with expansion:
 Assertions then sections
   A section
 -------------------------------------------------------------------------------
-TrickyTests.cpp:<line number>
+Tricky.tests.cpp:<line number>
 ...............................................................................
 
-TrickyTests.cpp:<line number>:
+Tricky.tests.cpp:<line number>:
 PASSED:
   REQUIRE( Catch::alwaysTrue() )
 with expansion:
@@ -784,10 +784,10 @@ Assertions then sections
   A section
   Another section
 -------------------------------------------------------------------------------
-TrickyTests.cpp:<line number>
+Tricky.tests.cpp:<line number>
 ...............................................................................
 
-TrickyTests.cpp:<line number>:
+Tricky.tests.cpp:<line number>:
 PASSED:
   REQUIRE( Catch::alwaysTrue() )
 with expansion:
@@ -796,10 +796,10 @@ with expansion:
 -------------------------------------------------------------------------------
 Assertions then sections
 -------------------------------------------------------------------------------
-TrickyTests.cpp:<line number>
+Tricky.tests.cpp:<line number>
 ...............................................................................
 
-TrickyTests.cpp:<line number>:
+Tricky.tests.cpp:<line number>:
 PASSED:
   REQUIRE( Catch::alwaysTrue() )
 with expansion:
@@ -809,10 +809,10 @@ with expansion:
 Assertions then sections
   A section
 -------------------------------------------------------------------------------
-TrickyTests.cpp:<line number>
+Tricky.tests.cpp:<line number>
 ...............................................................................
 
-TrickyTests.cpp:<line number>:
+Tricky.tests.cpp:<line number>:
 PASSED:
   REQUIRE( Catch::alwaysTrue() )
 with expansion:
@@ -823,10 +823,10 @@ Assertions then sections
   A section
   Another other section
 -------------------------------------------------------------------------------
-TrickyTests.cpp:<line number>
+Tricky.tests.cpp:<line number>
 ...............................................................................
 
-TrickyTests.cpp:<line number>:
+Tricky.tests.cpp:<line number>:
 PASSED:
   REQUIRE( Catch::alwaysTrue() )
 with expansion:
@@ -835,22 +835,22 @@ with expansion:
 -------------------------------------------------------------------------------
 Assorted miscellaneous tests
 -------------------------------------------------------------------------------
-ApproxTests.cpp:<line number>
+Approx.tests.cpp:<line number>
 ...............................................................................
 
-ApproxTests.cpp:<line number>:
+Approx.tests.cpp:<line number>:
 PASSED:
   REQUIRE( INFINITY == Approx(INFINITY) )
 with expansion:
   inff == Approx( inf )
 
-ApproxTests.cpp:<line number>:
+Approx.tests.cpp:<line number>:
 PASSED:
   REQUIRE( NAN != Approx(NAN) )
 with expansion:
   nanf != Approx( nan )
 
-ApproxTests.cpp:<line number>:
+Approx.tests.cpp:<line number>:
 PASSED:
   REQUIRE_FALSE( NAN == Approx(NAN) )
 with expansion:
@@ -859,16 +859,16 @@ with expansion:
 -------------------------------------------------------------------------------
 Bitfields can be captured (#1027)
 -------------------------------------------------------------------------------
-TrickyTests.cpp:<line number>
+Tricky.tests.cpp:<line number>
 ...............................................................................
 
-TrickyTests.cpp:<line number>:
+Tricky.tests.cpp:<line number>:
 PASSED:
   REQUIRE( y.v == 0 )
 with expansion:
   0 == 0
 
-TrickyTests.cpp:<line number>:
+Tricky.tests.cpp:<line number>:
 PASSED:
   REQUIRE( 0 == y.v )
 with expansion:
@@ -878,10 +878,10 @@ with expansion:
 Capture and info messages
   Capture should stringify like assertions
 -------------------------------------------------------------------------------
-ToStringGeneralTests.cpp:<line number>
+ToStringGeneral.tests.cpp:<line number>
 ...............................................................................
 
-ToStringGeneralTests.cpp:<line number>:
+ToStringGeneral.tests.cpp:<line number>:
 PASSED:
   REQUIRE( true )
 with message:
@@ -891,10 +891,10 @@ with message:
 Capture and info messages
   Info should NOT stringify the way assertions do
 -------------------------------------------------------------------------------
-ToStringGeneralTests.cpp:<line number>
+ToStringGeneral.tests.cpp:<line number>
 ...............................................................................
 
-ToStringGeneralTests.cpp:<line number>:
+ToStringGeneral.tests.cpp:<line number>:
 PASSED:
   REQUIRE( true )
 with message:
@@ -904,28 +904,28 @@ with message:
 Character pretty printing
   Specifically escaped
 -------------------------------------------------------------------------------
-ToStringGeneralTests.cpp:<line number>
+ToStringGeneral.tests.cpp:<line number>
 ...............................................................................
 
-ToStringGeneralTests.cpp:<line number>:
+ToStringGeneral.tests.cpp:<line number>:
 PASSED:
   CHECK( tab == '\t' )
 with expansion:
   '\t' == '\t'
 
-ToStringGeneralTests.cpp:<line number>:
+ToStringGeneral.tests.cpp:<line number>:
 PASSED:
   CHECK( newline == '\n' )
 with expansion:
   '\n' == '\n'
 
-ToStringGeneralTests.cpp:<line number>:
+ToStringGeneral.tests.cpp:<line number>:
 PASSED:
   CHECK( carr_return == '\r' )
 with expansion:
   '\r' == '\r'
 
-ToStringGeneralTests.cpp:<line number>:
+ToStringGeneral.tests.cpp:<line number>:
 PASSED:
   CHECK( form_feed == '\f' )
 with expansion:
@@ -935,34 +935,34 @@ with expansion:
 Character pretty printing
   General chars
 -------------------------------------------------------------------------------
-ToStringGeneralTests.cpp:<line number>
+ToStringGeneral.tests.cpp:<line number>
 ...............................................................................
 
-ToStringGeneralTests.cpp:<line number>:
+ToStringGeneral.tests.cpp:<line number>:
 PASSED:
   CHECK( space == ' ' )
 with expansion:
   ' ' == ' '
 
-ToStringGeneralTests.cpp:<line number>:
+ToStringGeneral.tests.cpp:<line number>:
 PASSED:
   REQUIRE( c == chars[i] )
 with expansion:
   'a' == 'a'
 
-ToStringGeneralTests.cpp:<line number>:
+ToStringGeneral.tests.cpp:<line number>:
 PASSED:
   REQUIRE( c == chars[i] )
 with expansion:
   'z' == 'z'
 
-ToStringGeneralTests.cpp:<line number>:
+ToStringGeneral.tests.cpp:<line number>:
 PASSED:
   REQUIRE( c == chars[i] )
 with expansion:
   'A' == 'A'
 
-ToStringGeneralTests.cpp:<line number>:
+ToStringGeneral.tests.cpp:<line number>:
 PASSED:
   REQUIRE( c == chars[i] )
 with expansion:
@@ -972,34 +972,34 @@ with expansion:
 Character pretty printing
   Low ASCII
 -------------------------------------------------------------------------------
-ToStringGeneralTests.cpp:<line number>
+ToStringGeneral.tests.cpp:<line number>
 ...............................................................................
 
-ToStringGeneralTests.cpp:<line number>:
+ToStringGeneral.tests.cpp:<line number>:
 PASSED:
   CHECK( null_terminator == '\0' )
 with expansion:
   0 == 0
 
-ToStringGeneralTests.cpp:<line number>:
+ToStringGeneral.tests.cpp:<line number>:
 PASSED:
   REQUIRE( c == i )
 with expansion:
   2 == 2
 
-ToStringGeneralTests.cpp:<line number>:
+ToStringGeneral.tests.cpp:<line number>:
 PASSED:
   REQUIRE( c == i )
 with expansion:
   3 == 3
 
-ToStringGeneralTests.cpp:<line number>:
+ToStringGeneral.tests.cpp:<line number>:
 PASSED:
   REQUIRE( c == i )
 with expansion:
   4 == 4
 
-ToStringGeneralTests.cpp:<line number>:
+ToStringGeneral.tests.cpp:<line number>:
 PASSED:
   REQUIRE( c == i )
 with expansion:
@@ -1008,66 +1008,66 @@ with expansion:
 -------------------------------------------------------------------------------
 Commas in various macros are allowed
 -------------------------------------------------------------------------------
-TrickyTests.cpp:<line number>
+Tricky.tests.cpp:<line number>
 ...............................................................................
 
-TrickyTests.cpp:<line number>:
+Tricky.tests.cpp:<line number>:
 PASSED:
   REQUIRE_THROWS( std::vector<constructor_throws>{constructor_throws{}, constructor_throws{}} )
 
-TrickyTests.cpp:<line number>:
+Tricky.tests.cpp:<line number>:
 PASSED:
   CHECK_THROWS( std::vector<constructor_throws>{constructor_throws{}, constructor_throws{}} )
 
-TrickyTests.cpp:<line number>:
+Tricky.tests.cpp:<line number>:
 PASSED:
   REQUIRE_NOTHROW( std::vector<int>{1, 2, 3} == std::vector<int>{1, 2, 3} )
 
-TrickyTests.cpp:<line number>:
+Tricky.tests.cpp:<line number>:
 PASSED:
   CHECK_NOTHROW( std::vector<int>{1, 2, 3} == std::vector<int>{1, 2, 3} )
 
-TrickyTests.cpp:<line number>:
+Tricky.tests.cpp:<line number>:
 PASSED:
   REQUIRE( std::vector<int>{1, 2} == std::vector<int>{1, 2} )
 with expansion:
   { 1, 2 } == { 1, 2 }
 
-TrickyTests.cpp:<line number>:
+Tricky.tests.cpp:<line number>:
 PASSED:
   CHECK( std::vector<int>{1, 2} == std::vector<int>{1, 2} )
 with expansion:
   { 1, 2 } == { 1, 2 }
 
-TrickyTests.cpp:<line number>:
+Tricky.tests.cpp:<line number>:
 PASSED:
   REQUIRE_FALSE( std::vector<int>{1, 2} == std::vector<int>{1, 2, 3} )
 with expansion:
   !({ 1, 2 } == { 1, 2, 3 })
 
-TrickyTests.cpp:<line number>:
+Tricky.tests.cpp:<line number>:
 PASSED:
   CHECK_FALSE( std::vector<int>{1, 2} == std::vector<int>{1, 2, 3} )
 with expansion:
   !({ 1, 2 } == { 1, 2, 3 })
 
-TrickyTests.cpp:<line number>:
+Tricky.tests.cpp:<line number>:
 PASSED:
   CHECK_NOFAIL( std::vector<int>{1, 2} == std::vector<int>{1, 2} )
 with expansion:
   { 1, 2 } == { 1, 2 }
 
-TrickyTests.cpp:<line number>:
+Tricky.tests.cpp:<line number>:
 PASSED:
   CHECKED_IF( std::vector<int>{1, 2} == std::vector<int>{1, 2} )
 with expansion:
   { 1, 2 } == { 1, 2 }
 
-TrickyTests.cpp:<line number>:
+Tricky.tests.cpp:<line number>:
 PASSED:
   REQUIRE( true )
 
-TrickyTests.cpp:<line number>:
+Tricky.tests.cpp:<line number>:
 PASSED:
   CHECKED_ELSE( std::vector<int>{1, 2} == std::vector<int>{1, 2} )
 with expansion:
@@ -1076,16 +1076,16 @@ with expansion:
 -------------------------------------------------------------------------------
 Comparing function pointers
 -------------------------------------------------------------------------------
-TrickyTests.cpp:<line number>
+Tricky.tests.cpp:<line number>
 ...............................................................................
 
-TrickyTests.cpp:<line number>:
+Tricky.tests.cpp:<line number>:
 PASSED:
   REQUIRE( a )
 with expansion:
   0x<hex digits>
 
-TrickyTests.cpp:<line number>:
+Tricky.tests.cpp:<line number>:
 PASSED:
   REQUIRE( a == &foo )
 with expansion:
@@ -1094,76 +1094,76 @@ with expansion:
 -------------------------------------------------------------------------------
 Comparison with explicitly convertible types
 -------------------------------------------------------------------------------
-ApproxTests.cpp:<line number>
+Approx.tests.cpp:<line number>
 ...............................................................................
 
-ApproxTests.cpp:<line number>:
+Approx.tests.cpp:<line number>:
 PASSED:
   REQUIRE( td == Approx(10.0) )
 with expansion:
   StrongDoubleTypedef(10) == Approx( 10.0 )
 
-ApproxTests.cpp:<line number>:
+Approx.tests.cpp:<line number>:
 PASSED:
   REQUIRE( Approx(10.0) == td )
 with expansion:
   Approx( 10.0 ) == StrongDoubleTypedef(10)
 
-ApproxTests.cpp:<line number>:
+Approx.tests.cpp:<line number>:
 PASSED:
   REQUIRE( td != Approx(11.0) )
 with expansion:
   StrongDoubleTypedef(10) != Approx( 11.0 )
 
-ApproxTests.cpp:<line number>:
+Approx.tests.cpp:<line number>:
 PASSED:
   REQUIRE( Approx(11.0) != td )
 with expansion:
   Approx( 11.0 ) != StrongDoubleTypedef(10)
 
-ApproxTests.cpp:<line number>:
+Approx.tests.cpp:<line number>:
 PASSED:
   REQUIRE( td <= Approx(10.0) )
 with expansion:
   StrongDoubleTypedef(10) <= Approx( 10.0 )
 
-ApproxTests.cpp:<line number>:
+Approx.tests.cpp:<line number>:
 PASSED:
   REQUIRE( td <= Approx(11.0) )
 with expansion:
   StrongDoubleTypedef(10) <= Approx( 11.0 )
 
-ApproxTests.cpp:<line number>:
+Approx.tests.cpp:<line number>:
 PASSED:
   REQUIRE( Approx(10.0) <= td )
 with expansion:
   Approx( 10.0 ) <= StrongDoubleTypedef(10)
 
-ApproxTests.cpp:<line number>:
+Approx.tests.cpp:<line number>:
 PASSED:
   REQUIRE( Approx(9.0) <= td )
 with expansion:
   Approx( 9.0 ) <= StrongDoubleTypedef(10)
 
-ApproxTests.cpp:<line number>:
+Approx.tests.cpp:<line number>:
 PASSED:
   REQUIRE( td >= Approx(9.0) )
 with expansion:
   StrongDoubleTypedef(10) >= Approx( 9.0 )
 
-ApproxTests.cpp:<line number>:
+Approx.tests.cpp:<line number>:
 PASSED:
   REQUIRE( td >= Approx(10.0) )
 with expansion:
   StrongDoubleTypedef(10) >= Approx( 10.0 )
 
-ApproxTests.cpp:<line number>:
+Approx.tests.cpp:<line number>:
 PASSED:
   REQUIRE( Approx(10.0) >= td )
 with expansion:
   Approx( 10.0 ) >= StrongDoubleTypedef(10)
 
-ApproxTests.cpp:<line number>:
+Approx.tests.cpp:<line number>:
 PASSED:
   REQUIRE( Approx(11.0) >= td )
 with expansion:
@@ -1172,10 +1172,10 @@ with expansion:
 -------------------------------------------------------------------------------
 Comparisons between ints where one side is computed
 -------------------------------------------------------------------------------
-ConditionTests.cpp:<line number>
+Condition.tests.cpp:<line number>
 ...............................................................................
 
-ConditionTests.cpp:<line number>:
+Condition.tests.cpp:<line number>:
 PASSED:
   CHECK( 54 == 6*9 )
 with expansion:
@@ -1185,40 +1185,40 @@ with expansion:
 Comparisons between unsigned ints and negative signed ints match c++ standard
 behaviour
 -------------------------------------------------------------------------------
-ConditionTests.cpp:<line number>
+Condition.tests.cpp:<line number>
 ...............................................................................
 
-ConditionTests.cpp:<line number>:
+Condition.tests.cpp:<line number>:
 PASSED:
   CHECK( ( -1 > 2u ) )
 with expansion:
   true
 
-ConditionTests.cpp:<line number>:
+Condition.tests.cpp:<line number>:
 PASSED:
   CHECK( -1 > 2u )
 with expansion:
   -1 > 2
 
-ConditionTests.cpp:<line number>:
+Condition.tests.cpp:<line number>:
 PASSED:
   CHECK( ( 2u < -1 ) )
 with expansion:
   true
 
-ConditionTests.cpp:<line number>:
+Condition.tests.cpp:<line number>:
 PASSED:
   CHECK( 2u < -1 )
 with expansion:
   2 < -1
 
-ConditionTests.cpp:<line number>:
+Condition.tests.cpp:<line number>:
 PASSED:
   CHECK( ( minInt > 2u ) )
 with expansion:
   true
 
-ConditionTests.cpp:<line number>:
+Condition.tests.cpp:<line number>:
 PASSED:
   CHECK( minInt > 2u )
 with expansion:
@@ -1227,82 +1227,82 @@ with expansion:
 -------------------------------------------------------------------------------
 Comparisons with int literals don't warn when mixing signed/ unsigned
 -------------------------------------------------------------------------------
-ConditionTests.cpp:<line number>
+Condition.tests.cpp:<line number>
 ...............................................................................
 
-ConditionTests.cpp:<line number>:
+Condition.tests.cpp:<line number>:
 PASSED:
   REQUIRE( i == 1 )
 with expansion:
   1 == 1
 
-ConditionTests.cpp:<line number>:
+Condition.tests.cpp:<line number>:
 PASSED:
   REQUIRE( ui == 2 )
 with expansion:
   2 == 2
 
-ConditionTests.cpp:<line number>:
+Condition.tests.cpp:<line number>:
 PASSED:
   REQUIRE( l == 3 )
 with expansion:
   3 == 3
 
-ConditionTests.cpp:<line number>:
+Condition.tests.cpp:<line number>:
 PASSED:
   REQUIRE( ul == 4 )
 with expansion:
   4 == 4
 
-ConditionTests.cpp:<line number>:
+Condition.tests.cpp:<line number>:
 PASSED:
   REQUIRE( c == 5 )
 with expansion:
   5 == 5
 
-ConditionTests.cpp:<line number>:
+Condition.tests.cpp:<line number>:
 PASSED:
   REQUIRE( uc == 6 )
 with expansion:
   6 == 6
 
-ConditionTests.cpp:<line number>:
+Condition.tests.cpp:<line number>:
 PASSED:
   REQUIRE( 1 == i )
 with expansion:
   1 == 1
 
-ConditionTests.cpp:<line number>:
+Condition.tests.cpp:<line number>:
 PASSED:
   REQUIRE( 2 == ui )
 with expansion:
   2 == 2
 
-ConditionTests.cpp:<line number>:
+Condition.tests.cpp:<line number>:
 PASSED:
   REQUIRE( 3 == l )
 with expansion:
   3 == 3
 
-ConditionTests.cpp:<line number>:
+Condition.tests.cpp:<line number>:
 PASSED:
   REQUIRE( 4 == ul )
 with expansion:
   4 == 4
 
-ConditionTests.cpp:<line number>:
+Condition.tests.cpp:<line number>:
 PASSED:
   REQUIRE( 5 == c )
 with expansion:
   5 == 5
 
-ConditionTests.cpp:<line number>:
+Condition.tests.cpp:<line number>:
 PASSED:
   REQUIRE( 6 == uc )
 with expansion:
   6 == 6
 
-ConditionTests.cpp:<line number>:
+Condition.tests.cpp:<line number>:
 PASSED:
   REQUIRE( (std::numeric_limits<uint32_t>::max)() > ul )
 with expansion:
@@ -1311,16 +1311,16 @@ with expansion:
 -------------------------------------------------------------------------------
 Contains string matcher
 -------------------------------------------------------------------------------
-MatchersTests.cpp:<line number>
+Matchers.tests.cpp:<line number>
 ...............................................................................
 
-MatchersTests.cpp:<line number>: FAILED:
+Matchers.tests.cpp:<line number>: FAILED:
   CHECK_THAT( testStringForMatching(), Contains( "not there", Catch::CaseSensitive::No ) )
 with expansion:
   "this string contains 'abc' as a substring" contains: "not there" (case
   insensitive)
 
-MatchersTests.cpp:<line number>: FAILED:
+Matchers.tests.cpp:<line number>: FAILED:
   CHECK_THAT( testStringForMatching(), Contains( "STRING" ) )
 with expansion:
   "this string contains 'abc' as a substring" contains: "STRING"
@@ -1328,10 +1328,10 @@ with expansion:
 -------------------------------------------------------------------------------
 Custom exceptions can be translated when testing for nothrow
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:<line number>
+Exception.tests.cpp:<line number>
 ...............................................................................
 
-ExceptionTests.cpp:<line number>: FAILED:
+Exception.tests.cpp:<line number>: FAILED:
   REQUIRE_NOTHROW( throwCustom() )
 due to unexpected exception with message:
   custom exception - not std
@@ -1339,10 +1339,10 @@ due to unexpected exception with message:
 -------------------------------------------------------------------------------
 Custom exceptions can be translated when testing for throwing as something else
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:<line number>
+Exception.tests.cpp:<line number>
 ...............................................................................
 
-ExceptionTests.cpp:<line number>: FAILED:
+Exception.tests.cpp:<line number>: FAILED:
   REQUIRE_THROWS_AS( throwCustom(), std::exception )
 due to unexpected exception with message:
   custom exception - not std
@@ -1350,26 +1350,26 @@ due to unexpected exception with message:
 -------------------------------------------------------------------------------
 Custom std-exceptions can be custom translated
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:<line number>
+Exception.tests.cpp:<line number>
 ...............................................................................
 
-ExceptionTests.cpp:<line number>: FAILED:
+Exception.tests.cpp:<line number>: FAILED:
 due to unexpected exception with message:
   custom std exception
 
 -------------------------------------------------------------------------------
 Default scale is invisible to comparison
 -------------------------------------------------------------------------------
-ApproxTests.cpp:<line number>
+Approx.tests.cpp:<line number>
 ...............................................................................
 
-ApproxTests.cpp:<line number>:
+Approx.tests.cpp:<line number>:
 PASSED:
   REQUIRE( 101.000001 != Approx(100).epsilon(0.01) )
 with expansion:
   101.000001 != Approx( 100.0 )
 
-ApproxTests.cpp:<line number>:
+Approx.tests.cpp:<line number>:
 PASSED:
   REQUIRE( std::pow(10, -5) != Approx(std::pow(10, -7)) )
 with expansion:
@@ -1378,15 +1378,15 @@ with expansion:
 -------------------------------------------------------------------------------
 EndsWith string matcher
 -------------------------------------------------------------------------------
-MatchersTests.cpp:<line number>
+Matchers.tests.cpp:<line number>
 ...............................................................................
 
-MatchersTests.cpp:<line number>: FAILED:
+Matchers.tests.cpp:<line number>: FAILED:
   CHECK_THAT( testStringForMatching(), EndsWith( "Substring" ) )
 with expansion:
   "this string contains 'abc' as a substring" ends with: "Substring"
 
-MatchersTests.cpp:<line number>: FAILED:
+Matchers.tests.cpp:<line number>: FAILED:
   CHECK_THAT( testStringForMatching(), EndsWith( "this", Catch::CaseSensitive::No ) )
 with expansion:
   "this string contains 'abc' as a substring" ends with: "this" (case
@@ -1395,10 +1395,10 @@ with expansion:
 -------------------------------------------------------------------------------
 Epsilon only applies to Approx's value
 -------------------------------------------------------------------------------
-ApproxTests.cpp:<line number>
+Approx.tests.cpp:<line number>
 ...............................................................................
 
-ApproxTests.cpp:<line number>:
+Approx.tests.cpp:<line number>:
 PASSED:
   REQUIRE( 101.01 != Approx(100).epsilon(0.01) )
 with expansion:
@@ -1407,70 +1407,70 @@ with expansion:
 -------------------------------------------------------------------------------
 Equality checks that should fail
 -------------------------------------------------------------------------------
-ConditionTests.cpp:<line number>
+Condition.tests.cpp:<line number>
 ...............................................................................
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( data.int_seven == 6 )
 with expansion:
   7 == 6
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( data.int_seven == 8 )
 with expansion:
   7 == 8
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( data.int_seven == 0 )
 with expansion:
   7 == 0
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( data.float_nine_point_one == Approx( 9.11f ) )
 with expansion:
   9.1f == Approx( 9.1099996567 )
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( data.float_nine_point_one == Approx( 9.0f ) )
 with expansion:
   9.1f == Approx( 9.0 )
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( data.float_nine_point_one == Approx( 1 ) )
 with expansion:
   9.1f == Approx( 1.0 )
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( data.float_nine_point_one == Approx( 0 ) )
 with expansion:
   9.1f == Approx( 0.0 )
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( data.double_pi == Approx( 3.1415 ) )
 with expansion:
   3.1415926535 == Approx( 3.1415 )
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( data.str_hello == "goodbye" )
 with expansion:
   "hello" == "goodbye"
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( data.str_hello == "hell" )
 with expansion:
   "hello" == "hell"
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( data.str_hello == "hello1" )
 with expansion:
   "hello" == "hello1"
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( data.str_hello.size() == 6 )
 with expansion:
   5 == 6
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( x == Approx( 1.301 ) )
 with expansion:
   1.3 == Approx( 1.301 )
@@ -1478,46 +1478,46 @@ with expansion:
 -------------------------------------------------------------------------------
 Equality checks that should succeed
 -------------------------------------------------------------------------------
-ConditionTests.cpp:<line number>
+Condition.tests.cpp:<line number>
 ...............................................................................
 
-ConditionTests.cpp:<line number>:
+Condition.tests.cpp:<line number>:
 PASSED:
   REQUIRE( data.int_seven == 7 )
 with expansion:
   7 == 7
 
-ConditionTests.cpp:<line number>:
+Condition.tests.cpp:<line number>:
 PASSED:
   REQUIRE( data.float_nine_point_one == Approx( 9.1f ) )
 with expansion:
   9.1f == Approx( 9.1000003815 )
 
-ConditionTests.cpp:<line number>:
+Condition.tests.cpp:<line number>:
 PASSED:
   REQUIRE( data.double_pi == Approx( 3.1415926535 ) )
 with expansion:
   3.1415926535 == Approx( 3.1415926535 )
 
-ConditionTests.cpp:<line number>:
+Condition.tests.cpp:<line number>:
 PASSED:
   REQUIRE( data.str_hello == "hello" )
 with expansion:
   "hello" == "hello"
 
-ConditionTests.cpp:<line number>:
+Condition.tests.cpp:<line number>:
 PASSED:
   REQUIRE( "hello" == data.str_hello )
 with expansion:
   "hello" == "hello"
 
-ConditionTests.cpp:<line number>:
+Condition.tests.cpp:<line number>:
 PASSED:
   REQUIRE( data.str_hello.size() == 5 )
 with expansion:
   5 == 5
 
-ConditionTests.cpp:<line number>:
+Condition.tests.cpp:<line number>:
 PASSED:
   REQUIRE( x == Approx( 1.3 ) )
 with expansion:
@@ -1526,17 +1526,17 @@ with expansion:
 -------------------------------------------------------------------------------
 Equals
 -------------------------------------------------------------------------------
-MatchersTests.cpp:<line number>
+Matchers.tests.cpp:<line number>
 ...............................................................................
 
-MatchersTests.cpp:<line number>:
+Matchers.tests.cpp:<line number>:
 PASSED:
   CHECK_THAT( testStringForMatching(), Equals( "this string contains 'abc' as a substring" ) )
 with expansion:
   "this string contains 'abc' as a substring" equals: "this string contains
   'abc' as a substring"
 
-MatchersTests.cpp:<line number>:
+Matchers.tests.cpp:<line number>:
 PASSED:
   CHECK_THAT( testStringForMatching(), Equals( "this string contains 'ABC' as a substring", Catch::CaseSensitive::No ) )
 with expansion:
@@ -1546,16 +1546,16 @@ with expansion:
 -------------------------------------------------------------------------------
 Equals string matcher
 -------------------------------------------------------------------------------
-MatchersTests.cpp:<line number>
+Matchers.tests.cpp:<line number>
 ...............................................................................
 
-MatchersTests.cpp:<line number>: FAILED:
+Matchers.tests.cpp:<line number>: FAILED:
   CHECK_THAT( testStringForMatching(), Equals( "this string contains 'ABC' as a substring" ) )
 with expansion:
   "this string contains 'abc' as a substring" equals: "this string contains
   'ABC' as a substring"
 
-MatchersTests.cpp:<line number>: FAILED:
+Matchers.tests.cpp:<line number>: FAILED:
   CHECK_THAT( testStringForMatching(), Equals( "something else", Catch::CaseSensitive::No ) )
 with expansion:
   "this string contains 'abc' as a substring" equals: "something else" (case
@@ -1565,14 +1565,14 @@ with expansion:
 Exception matchers that fail
   No exception
 -------------------------------------------------------------------------------
-MatchersTests.cpp:<line number>
+Matchers.tests.cpp:<line number>
 ...............................................................................
 
-MatchersTests.cpp:<line number>: FAILED:
+Matchers.tests.cpp:<line number>: FAILED:
   CHECK_THROWS_MATCHES( doesNotThrow(), SpecialException, ExceptionMatcher{ 1 } )
 because no exception was thrown where one was expected:
 
-MatchersTests.cpp:<line number>: FAILED:
+Matchers.tests.cpp:<line number>: FAILED:
   REQUIRE_THROWS_MATCHES( doesNotThrow(), SpecialException, ExceptionMatcher{ 1 } )
 because no exception was thrown where one was expected:
 
@@ -1580,15 +1580,15 @@ because no exception was thrown where one was expected:
 Exception matchers that fail
   Type mismatch
 -------------------------------------------------------------------------------
-MatchersTests.cpp:<line number>
+Matchers.tests.cpp:<line number>
 ...............................................................................
 
-MatchersTests.cpp:<line number>: FAILED:
+Matchers.tests.cpp:<line number>: FAILED:
   CHECK_THROWS_MATCHES( throwsAsInt(1), SpecialException, ExceptionMatcher{ 1 } )
 due to unexpected exception with message:
   Unknown exception
 
-MatchersTests.cpp:<line number>: FAILED:
+Matchers.tests.cpp:<line number>: FAILED:
   REQUIRE_THROWS_MATCHES( throwsAsInt(1), SpecialException, ExceptionMatcher{ 1 } )
 due to unexpected exception with message:
   Unknown exception
@@ -1597,15 +1597,15 @@ due to unexpected exception with message:
 Exception matchers that fail
   Contents are wrong
 -------------------------------------------------------------------------------
-MatchersTests.cpp:<line number>
+Matchers.tests.cpp:<line number>
 ...............................................................................
 
-MatchersTests.cpp:<line number>: FAILED:
+Matchers.tests.cpp:<line number>: FAILED:
   CHECK_THROWS_MATCHES( throws(3), SpecialException, ExceptionMatcher{ 1 } )
 with expansion:
   {?} special exception has value of 1
 
-MatchersTests.cpp:<line number>: FAILED:
+Matchers.tests.cpp:<line number>: FAILED:
   REQUIRE_THROWS_MATCHES( throws(4), SpecialException, ExceptionMatcher{ 1 } )
 with expansion:
   {?} special exception has value of 1
@@ -1613,16 +1613,16 @@ with expansion:
 -------------------------------------------------------------------------------
 Exception matchers that succeed
 -------------------------------------------------------------------------------
-MatchersTests.cpp:<line number>
+Matchers.tests.cpp:<line number>
 ...............................................................................
 
-MatchersTests.cpp:<line number>:
+Matchers.tests.cpp:<line number>:
 PASSED:
   CHECK_THROWS_MATCHES( throws(1), SpecialException, ExceptionMatcher{ 1 } )
 with expansion:
   {?} special exception has value of 1
 
-MatchersTests.cpp:<line number>:
+Matchers.tests.cpp:<line number>:
 PASSED:
   REQUIRE_THROWS_MATCHES( throws(2), SpecialException, ExceptionMatcher{ 2 } )
 with expansion:
@@ -1632,10 +1632,10 @@ with expansion:
 Exception messages can be tested for
   exact match
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:<line number>
+Exception.tests.cpp:<line number>
 ...............................................................................
 
-ExceptionTests.cpp:<line number>:
+Exception.tests.cpp:<line number>:
 PASSED:
   REQUIRE_THROWS_WITH( thisThrows(), "expected exception" )
 with expansion:
@@ -1645,10 +1645,10 @@ with expansion:
 Exception messages can be tested for
   different case
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:<line number>
+Exception.tests.cpp:<line number>
 ...............................................................................
 
-ExceptionTests.cpp:<line number>:
+Exception.tests.cpp:<line number>:
 PASSED:
   REQUIRE_THROWS_WITH( thisThrows(), Equals( "expecteD Exception", Catch::CaseSensitive::No ) )
 with expansion:
@@ -1658,28 +1658,28 @@ with expansion:
 Exception messages can be tested for
   wildcarded
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:<line number>
+Exception.tests.cpp:<line number>
 ...............................................................................
 
-ExceptionTests.cpp:<line number>:
+Exception.tests.cpp:<line number>:
 PASSED:
   REQUIRE_THROWS_WITH( thisThrows(), StartsWith( "expected" ) )
 with expansion:
   "expected exception" starts with: "expected"
 
-ExceptionTests.cpp:<line number>:
+Exception.tests.cpp:<line number>:
 PASSED:
   REQUIRE_THROWS_WITH( thisThrows(), EndsWith( "exception" ) )
 with expansion:
   "expected exception" ends with: "exception"
 
-ExceptionTests.cpp:<line number>:
+Exception.tests.cpp:<line number>:
 PASSED:
   REQUIRE_THROWS_WITH( thisThrows(), Contains( "except" ) )
 with expansion:
   "expected exception" contains: "except"
 
-ExceptionTests.cpp:<line number>:
+Exception.tests.cpp:<line number>:
 PASSED:
   REQUIRE_THROWS_WITH( thisThrows(), Contains( "exCept", Catch::CaseSensitive::No ) )
 with expansion:
@@ -1688,19 +1688,19 @@ with expansion:
 -------------------------------------------------------------------------------
 Expected exceptions that don't throw or unexpected exceptions fail the test
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:<line number>
+Exception.tests.cpp:<line number>
 ...............................................................................
 
-ExceptionTests.cpp:<line number>: FAILED:
+Exception.tests.cpp:<line number>: FAILED:
   CHECK_THROWS_AS( thisThrows(), std::string )
 due to unexpected exception with message:
   expected exception
 
-ExceptionTests.cpp:<line number>: FAILED:
+Exception.tests.cpp:<line number>: FAILED:
   CHECK_THROWS_AS( thisDoesntThrow(), std::domain_error )
 because no exception was thrown where one was expected:
 
-ExceptionTests.cpp:<line number>: FAILED:
+Exception.tests.cpp:<line number>: FAILED:
   CHECK_NOTHROW( thisThrows() )
 due to unexpected exception with message:
   expected exception
@@ -1708,66 +1708,66 @@ due to unexpected exception with message:
 -------------------------------------------------------------------------------
 FAIL aborts the test
 -------------------------------------------------------------------------------
-MessageTests.cpp:<line number>
+Message.tests.cpp:<line number>
 ...............................................................................
 
-MessageTests.cpp:<line number>: FAILED:
+Message.tests.cpp:<line number>: FAILED:
 explicitly with message:
   This is a failure
 
 -------------------------------------------------------------------------------
 FAIL does not require an argument
 -------------------------------------------------------------------------------
-MessageTests.cpp:<line number>
+Message.tests.cpp:<line number>
 ...............................................................................
 
-MessageTests.cpp:<line number>: FAILED:
+Message.tests.cpp:<line number>: FAILED:
 
 -------------------------------------------------------------------------------
 FAIL_CHECK does not abort the test
 -------------------------------------------------------------------------------
-MessageTests.cpp:<line number>
+Message.tests.cpp:<line number>
 ...............................................................................
 
-MessageTests.cpp:<line number>: FAILED:
+Message.tests.cpp:<line number>: FAILED:
 explicitly with message:
   This is a failure
 
-MessageTests.cpp:<line number>:
+Message.tests.cpp:<line number>:
 warning:
   This message appears in the output
 
 -------------------------------------------------------------------------------
 Factorials are computed
 -------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
+Misc.tests.cpp:<line number>
 ...............................................................................
 
-MiscTests.cpp:<line number>:
+Misc.tests.cpp:<line number>:
 PASSED:
   REQUIRE( Factorial(0) == 1 )
 with expansion:
   1 == 1
 
-MiscTests.cpp:<line number>:
+Misc.tests.cpp:<line number>:
 PASSED:
   REQUIRE( Factorial(1) == 1 )
 with expansion:
   1 == 1
 
-MiscTests.cpp:<line number>:
+Misc.tests.cpp:<line number>:
 PASSED:
   REQUIRE( Factorial(2) == 2 )
 with expansion:
   2 == 2
 
-MiscTests.cpp:<line number>:
+Misc.tests.cpp:<line number>:
 PASSED:
   REQUIRE( Factorial(3) == 6 )
 with expansion:
   6 == 6
 
-MiscTests.cpp:<line number>:
+Misc.tests.cpp:<line number>:
 PASSED:
   REQUIRE( Factorial(10) == 3628800 )
 with expansion:
@@ -1777,34 +1777,34 @@ with expansion:
 Floating point matchers: double
   Margin
 -------------------------------------------------------------------------------
-MatchersTests.cpp:<line number>
+Matchers.tests.cpp:<line number>
 ...............................................................................
 
-MatchersTests.cpp:<line number>:
+Matchers.tests.cpp:<line number>:
 PASSED:
   REQUIRE_THAT( 1., WithinAbs(1., 0) )
 with expansion:
   1.0 is within 0.0 of 1.0
 
-MatchersTests.cpp:<line number>:
+Matchers.tests.cpp:<line number>:
 PASSED:
   REQUIRE_THAT( 0., WithinAbs(1., 1) )
 with expansion:
   0.0 is within 1.0 of 1.0
 
-MatchersTests.cpp:<line number>:
+Matchers.tests.cpp:<line number>:
 PASSED:
   REQUIRE_THAT( 0., !WithinAbs(1., 0.99) )
 with expansion:
   0.0 not is within 0.99 of 1.0
 
-MatchersTests.cpp:<line number>:
+Matchers.tests.cpp:<line number>:
 PASSED:
   REQUIRE_THAT( 0., !WithinAbs(1., 0.99) )
 with expansion:
   0.0 not is within 0.99 of 1.0
 
-MatchersTests.cpp:<line number>:
+Matchers.tests.cpp:<line number>:
 PASSED:
   REQUIRE_THAT( NAN, !WithinAbs(NAN, 0) )
 with expansion:
@@ -1814,46 +1814,46 @@ with expansion:
 Floating point matchers: double
   ULPs
 -------------------------------------------------------------------------------
-MatchersTests.cpp:<line number>
+Matchers.tests.cpp:<line number>
 ...............................................................................
 
-MatchersTests.cpp:<line number>:
+Matchers.tests.cpp:<line number>:
 PASSED:
   REQUIRE_THAT( 1., WithinULP(1., 0) )
 with expansion:
   1.0 is within 0 ULPs of 1.0
 
-MatchersTests.cpp:<line number>:
+Matchers.tests.cpp:<line number>:
 PASSED:
   REQUIRE_THAT( std::nextafter(1., 2.), WithinULP(1., 1) )
 with expansion:
   1.0 is within 1 ULPs of 1.0
 
-MatchersTests.cpp:<line number>:
+Matchers.tests.cpp:<line number>:
 PASSED:
   REQUIRE_THAT( std::nextafter(1., 0.), WithinULP(1., 1) )
 with expansion:
   1.0 is within 1 ULPs of 1.0
 
-MatchersTests.cpp:<line number>:
+Matchers.tests.cpp:<line number>:
 PASSED:
   REQUIRE_THAT( std::nextafter(1., 2.), !WithinULP(1., 0) )
 with expansion:
   1.0 not is within 0 ULPs of 1.0
 
-MatchersTests.cpp:<line number>:
+Matchers.tests.cpp:<line number>:
 PASSED:
   REQUIRE_THAT( 1., WithinULP(1., 0) )
 with expansion:
   1.0 is within 0 ULPs of 1.0
 
-MatchersTests.cpp:<line number>:
+Matchers.tests.cpp:<line number>:
 PASSED:
   REQUIRE_THAT( -0., WithinULP(0., 0) )
 with expansion:
   -0.0 is within 0 ULPs of 0.0
 
-MatchersTests.cpp:<line number>:
+Matchers.tests.cpp:<line number>:
 PASSED:
   REQUIRE_THAT( NAN, !WithinULP(NAN, 123) )
 with expansion:
@@ -1863,22 +1863,22 @@ with expansion:
 Floating point matchers: double
   Composed
 -------------------------------------------------------------------------------
-MatchersTests.cpp:<line number>
+Matchers.tests.cpp:<line number>
 ...............................................................................
 
-MatchersTests.cpp:<line number>:
+Matchers.tests.cpp:<line number>:
 PASSED:
   REQUIRE_THAT( 1., WithinAbs(1., 0.5) || WithinULP(2., 1) )
 with expansion:
   1.0 ( is within 0.5 of 1.0 or is within 1 ULPs of 2.0 )
 
-MatchersTests.cpp:<line number>:
+Matchers.tests.cpp:<line number>:
 PASSED:
   REQUIRE_THAT( 1., WithinAbs(2., 0.5) || WithinULP(1., 0) )
 with expansion:
   1.0 ( is within 0.5 of 2.0 or is within 0 ULPs of 1.0 )
 
-MatchersTests.cpp:<line number>:
+Matchers.tests.cpp:<line number>:
 PASSED:
   REQUIRE_THAT( NAN, !(WithinAbs(NAN, 100) || WithinULP(NAN, 123)) )
 with expansion:
@@ -1888,40 +1888,40 @@ with expansion:
 Floating point matchers: float
   Margin
 -------------------------------------------------------------------------------
-MatchersTests.cpp:<line number>
+Matchers.tests.cpp:<line number>
 ...............................................................................
 
-MatchersTests.cpp:<line number>:
+Matchers.tests.cpp:<line number>:
 PASSED:
   REQUIRE_THAT( 1.f, WithinAbs(1.f, 0) )
 with expansion:
   1.0f is within 0.0 of 1.0
 
-MatchersTests.cpp:<line number>:
+Matchers.tests.cpp:<line number>:
 PASSED:
   REQUIRE_THAT( 0.f, WithinAbs(1.f, 1) )
 with expansion:
   0.0f is within 1.0 of 1.0
 
-MatchersTests.cpp:<line number>:
+Matchers.tests.cpp:<line number>:
 PASSED:
   REQUIRE_THAT( 0.f, !WithinAbs(1.f, 0.99f) )
 with expansion:
   0.0f not is within 0.9900000095 of 1.0
 
-MatchersTests.cpp:<line number>:
+Matchers.tests.cpp:<line number>:
 PASSED:
   REQUIRE_THAT( 0.f, !WithinAbs(1.f, 0.99f) )
 with expansion:
   0.0f not is within 0.9900000095 of 1.0
 
-MatchersTests.cpp:<line number>:
+Matchers.tests.cpp:<line number>:
 PASSED:
   REQUIRE_THAT( 0.f, WithinAbs(-0.f, 0) )
 with expansion:
   0.0f is within 0.0 of -0.0
 
-MatchersTests.cpp:<line number>:
+Matchers.tests.cpp:<line number>:
 PASSED:
   REQUIRE_THAT( NAN, !WithinAbs(NAN, 0) )
 with expansion:
@@ -1931,46 +1931,46 @@ with expansion:
 Floating point matchers: float
   ULPs
 -------------------------------------------------------------------------------
-MatchersTests.cpp:<line number>
+Matchers.tests.cpp:<line number>
 ...............................................................................
 
-MatchersTests.cpp:<line number>:
+Matchers.tests.cpp:<line number>:
 PASSED:
   REQUIRE_THAT( 1.f, WithinULP(1.f, 0) )
 with expansion:
   1.0f is within 0 ULPs of 1.0f
 
-MatchersTests.cpp:<line number>:
+Matchers.tests.cpp:<line number>:
 PASSED:
   REQUIRE_THAT( std::nextafter(1.f, 2.f), WithinULP(1.f, 1) )
 with expansion:
   1.0f is within 1 ULPs of 1.0f
 
-MatchersTests.cpp:<line number>:
+Matchers.tests.cpp:<line number>:
 PASSED:
   REQUIRE_THAT( std::nextafter(1.f, 0.f), WithinULP(1.f, 1) )
 with expansion:
   1.0f is within 1 ULPs of 1.0f
 
-MatchersTests.cpp:<line number>:
+Matchers.tests.cpp:<line number>:
 PASSED:
   REQUIRE_THAT( std::nextafter(1.f, 2.f), !WithinULP(1.f, 0) )
 with expansion:
   1.0f not is within 0 ULPs of 1.0f
 
-MatchersTests.cpp:<line number>:
+Matchers.tests.cpp:<line number>:
 PASSED:
   REQUIRE_THAT( 1.f, WithinULP(1.f, 0) )
 with expansion:
   1.0f is within 0 ULPs of 1.0f
 
-MatchersTests.cpp:<line number>:
+Matchers.tests.cpp:<line number>:
 PASSED:
   REQUIRE_THAT( -0.f, WithinULP(0.f, 0) )
 with expansion:
   -0.0f is within 0 ULPs of 0.0f
 
-MatchersTests.cpp:<line number>:
+Matchers.tests.cpp:<line number>:
 PASSED:
   REQUIRE_THAT( NAN, !WithinULP(NAN, 123) )
 with expansion:
@@ -1980,22 +1980,22 @@ with expansion:
 Floating point matchers: float
   Composed
 -------------------------------------------------------------------------------
-MatchersTests.cpp:<line number>
+Matchers.tests.cpp:<line number>
 ...............................................................................
 
-MatchersTests.cpp:<line number>:
+Matchers.tests.cpp:<line number>:
 PASSED:
   REQUIRE_THAT( 1.f, WithinAbs(1.f, 0.5) || WithinULP(1.f, 1) )
 with expansion:
   1.0f ( is within 0.5 of 1.0 or is within 1 ULPs of 1.0f )
 
-MatchersTests.cpp:<line number>:
+Matchers.tests.cpp:<line number>:
 PASSED:
   REQUIRE_THAT( 1.f, WithinAbs(2.f, 0.5) || WithinULP(1.f, 0) )
 with expansion:
   1.0f ( is within 0.5 of 2.0 or is within 0 ULPs of 1.0f )
 
-MatchersTests.cpp:<line number>:
+Matchers.tests.cpp:<line number>:
 PASSED:
   REQUIRE_THAT( NAN, !(WithinAbs(NAN, 100) || WithinULP(NAN, 123)) )
 with expansion:
@@ -2004,28 +2004,28 @@ with expansion:
 -------------------------------------------------------------------------------
 Greater-than inequalities with different epsilons
 -------------------------------------------------------------------------------
-ApproxTests.cpp:<line number>
+Approx.tests.cpp:<line number>
 ...............................................................................
 
-ApproxTests.cpp:<line number>:
+Approx.tests.cpp:<line number>:
 PASSED:
   REQUIRE( d >= Approx( 1.22 ) )
 with expansion:
   1.23 >= Approx( 1.22 )
 
-ApproxTests.cpp:<line number>:
+Approx.tests.cpp:<line number>:
 PASSED:
   REQUIRE( d >= Approx( 1.23 ) )
 with expansion:
   1.23 >= Approx( 1.23 )
 
-ApproxTests.cpp:<line number>:
+Approx.tests.cpp:<line number>:
 PASSED:
   REQUIRE_FALSE( d >= Approx( 1.24 ) )
 with expansion:
   !(1.23 >= Approx( 1.24 ))
 
-ApproxTests.cpp:<line number>:
+Approx.tests.cpp:<line number>:
 PASSED:
   REQUIRE( d >= Approx( 1.24 ).epsilon(0.1) )
 with expansion:
@@ -2034,10 +2034,10 @@ with expansion:
 -------------------------------------------------------------------------------
 INFO and WARN do not abort tests
 -------------------------------------------------------------------------------
-MessageTests.cpp:<line number>
+Message.tests.cpp:<line number>
 ...............................................................................
 
-MessageTests.cpp:<line number>:
+Message.tests.cpp:<line number>:
 warning:
   this is a message
   this is a warning
@@ -2045,10 +2045,10 @@ warning:
 -------------------------------------------------------------------------------
 INFO gets logged on failure
 -------------------------------------------------------------------------------
-MessageTests.cpp:<line number>
+Message.tests.cpp:<line number>
 ...............................................................................
 
-MessageTests.cpp:<line number>: FAILED:
+Message.tests.cpp:<line number>: FAILED:
   REQUIRE( a == 1 )
 with expansion:
   2 == 1
@@ -2059,10 +2059,10 @@ with messages:
 -------------------------------------------------------------------------------
 INFO gets logged on failure, even if captured before successful assertions
 -------------------------------------------------------------------------------
-MessageTests.cpp:<line number>
+Message.tests.cpp:<line number>
 ...............................................................................
 
-MessageTests.cpp:<line number>:
+Message.tests.cpp:<line number>:
 PASSED:
   CHECK( a == 2 )
 with expansion:
@@ -2070,7 +2070,7 @@ with expansion:
 with message:
   this message may be logged later
 
-MessageTests.cpp:<line number>: FAILED:
+Message.tests.cpp:<line number>: FAILED:
   CHECK( a == 1 )
 with expansion:
   2 == 1
@@ -2078,7 +2078,7 @@ with messages:
   this message may be logged later
   this message should be logged
 
-MessageTests.cpp:<line number>: FAILED:
+Message.tests.cpp:<line number>: FAILED:
   CHECK( a == 0 )
 with expansion:
   2 == 0
@@ -2087,7 +2087,7 @@ with messages:
   this message should be logged
   and this, but later
 
-MessageTests.cpp:<line number>:
+Message.tests.cpp:<line number>:
 PASSED:
   CHECK( a == 2 )
 with expansion:
@@ -2101,10 +2101,10 @@ with messages:
 -------------------------------------------------------------------------------
 INFO is reset for each loop
 -------------------------------------------------------------------------------
-MessageTests.cpp:<line number>
+Message.tests.cpp:<line number>
 ...............................................................................
 
-MessageTests.cpp:<line number>:
+Message.tests.cpp:<line number>:
 PASSED:
   REQUIRE( i < 10 )
 with expansion:
@@ -2113,7 +2113,7 @@ with messages:
   current counter 0
   i := 0
 
-MessageTests.cpp:<line number>:
+Message.tests.cpp:<line number>:
 PASSED:
   REQUIRE( i < 10 )
 with expansion:
@@ -2122,7 +2122,7 @@ with messages:
   current counter 1
   i := 1
 
-MessageTests.cpp:<line number>:
+Message.tests.cpp:<line number>:
 PASSED:
   REQUIRE( i < 10 )
 with expansion:
@@ -2131,7 +2131,7 @@ with messages:
   current counter 2
   i := 2
 
-MessageTests.cpp:<line number>:
+Message.tests.cpp:<line number>:
 PASSED:
   REQUIRE( i < 10 )
 with expansion:
@@ -2140,7 +2140,7 @@ with messages:
   current counter 3
   i := 3
 
-MessageTests.cpp:<line number>:
+Message.tests.cpp:<line number>:
 PASSED:
   REQUIRE( i < 10 )
 with expansion:
@@ -2149,7 +2149,7 @@ with messages:
   current counter 4
   i := 4
 
-MessageTests.cpp:<line number>:
+Message.tests.cpp:<line number>:
 PASSED:
   REQUIRE( i < 10 )
 with expansion:
@@ -2158,7 +2158,7 @@ with messages:
   current counter 5
   i := 5
 
-MessageTests.cpp:<line number>:
+Message.tests.cpp:<line number>:
 PASSED:
   REQUIRE( i < 10 )
 with expansion:
@@ -2167,7 +2167,7 @@ with messages:
   current counter 6
   i := 6
 
-MessageTests.cpp:<line number>:
+Message.tests.cpp:<line number>:
 PASSED:
   REQUIRE( i < 10 )
 with expansion:
@@ -2176,7 +2176,7 @@ with messages:
   current counter 7
   i := 7
 
-MessageTests.cpp:<line number>:
+Message.tests.cpp:<line number>:
 PASSED:
   REQUIRE( i < 10 )
 with expansion:
@@ -2185,7 +2185,7 @@ with messages:
   current counter 8
   i := 8
 
-MessageTests.cpp:<line number>:
+Message.tests.cpp:<line number>:
 PASSED:
   REQUIRE( i < 10 )
 with expansion:
@@ -2194,7 +2194,7 @@ with messages:
   current counter 9
   i := 9
 
-MessageTests.cpp:<line number>: FAILED:
+Message.tests.cpp:<line number>: FAILED:
   REQUIRE( i < 10 )
 with expansion:
   10 < 10
@@ -2205,30 +2205,30 @@ with messages:
 -------------------------------------------------------------------------------
 Inequality checks that should fail
 -------------------------------------------------------------------------------
-ConditionTests.cpp:<line number>
+Condition.tests.cpp:<line number>
 ...............................................................................
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( data.int_seven != 7 )
 with expansion:
   7 != 7
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( data.float_nine_point_one != Approx( 9.1f ) )
 with expansion:
   9.1f != Approx( 9.1000003815 )
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( data.double_pi != Approx( 3.1415926535 ) )
 with expansion:
   3.1415926535 != Approx( 3.1415926535 )
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( data.str_hello != "hello" )
 with expansion:
   "hello" != "hello"
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( data.str_hello.size() != 5 )
 with expansion:
   5 != 5
@@ -2236,70 +2236,70 @@ with expansion:
 -------------------------------------------------------------------------------
 Inequality checks that should succeed
 -------------------------------------------------------------------------------
-ConditionTests.cpp:<line number>
+Condition.tests.cpp:<line number>
 ...............................................................................
 
-ConditionTests.cpp:<line number>:
+Condition.tests.cpp:<line number>:
 PASSED:
   REQUIRE( data.int_seven != 6 )
 with expansion:
   7 != 6
 
-ConditionTests.cpp:<line number>:
+Condition.tests.cpp:<line number>:
 PASSED:
   REQUIRE( data.int_seven != 8 )
 with expansion:
   7 != 8
 
-ConditionTests.cpp:<line number>:
+Condition.tests.cpp:<line number>:
 PASSED:
   REQUIRE( data.float_nine_point_one != Approx( 9.11f ) )
 with expansion:
   9.1f != Approx( 9.1099996567 )
 
-ConditionTests.cpp:<line number>:
+Condition.tests.cpp:<line number>:
 PASSED:
   REQUIRE( data.float_nine_point_one != Approx( 9.0f ) )
 with expansion:
   9.1f != Approx( 9.0 )
 
-ConditionTests.cpp:<line number>:
+Condition.tests.cpp:<line number>:
 PASSED:
   REQUIRE( data.float_nine_point_one != Approx( 1 ) )
 with expansion:
   9.1f != Approx( 1.0 )
 
-ConditionTests.cpp:<line number>:
+Condition.tests.cpp:<line number>:
 PASSED:
   REQUIRE( data.float_nine_point_one != Approx( 0 ) )
 with expansion:
   9.1f != Approx( 0.0 )
 
-ConditionTests.cpp:<line number>:
+Condition.tests.cpp:<line number>:
 PASSED:
   REQUIRE( data.double_pi != Approx( 3.1415 ) )
 with expansion:
   3.1415926535 != Approx( 3.1415 )
 
-ConditionTests.cpp:<line number>:
+Condition.tests.cpp:<line number>:
 PASSED:
   REQUIRE( data.str_hello != "goodbye" )
 with expansion:
   "hello" != "goodbye"
 
-ConditionTests.cpp:<line number>:
+Condition.tests.cpp:<line number>:
 PASSED:
   REQUIRE( data.str_hello != "hell" )
 with expansion:
   "hello" != "hell"
 
-ConditionTests.cpp:<line number>:
+Condition.tests.cpp:<line number>:
 PASSED:
   REQUIRE( data.str_hello != "hello1" )
 with expansion:
   "hello" != "hello1"
 
-ConditionTests.cpp:<line number>:
+Condition.tests.cpp:<line number>:
 PASSED:
   REQUIRE( data.str_hello.size() != 6 )
 with expansion:
@@ -2308,28 +2308,28 @@ with expansion:
 -------------------------------------------------------------------------------
 Less-than inequalities with different epsilons
 -------------------------------------------------------------------------------
-ApproxTests.cpp:<line number>
+Approx.tests.cpp:<line number>
 ...............................................................................
 
-ApproxTests.cpp:<line number>:
+Approx.tests.cpp:<line number>:
 PASSED:
   REQUIRE( d <= Approx( 1.24 ) )
 with expansion:
   1.23 <= Approx( 1.24 )
 
-ApproxTests.cpp:<line number>:
+Approx.tests.cpp:<line number>:
 PASSED:
   REQUIRE( d <= Approx( 1.23 ) )
 with expansion:
   1.23 <= Approx( 1.23 )
 
-ApproxTests.cpp:<line number>:
+Approx.tests.cpp:<line number>:
 PASSED:
   REQUIRE_FALSE( d <= Approx( 1.22 ) )
 with expansion:
   !(1.23 <= Approx( 1.22 ))
 
-ApproxTests.cpp:<line number>:
+Approx.tests.cpp:<line number>:
 PASSED:
   REQUIRE( d <= Approx( 1.22 ).epsilon(0.1) )
 with expansion:
@@ -2338,10 +2338,10 @@ with expansion:
 -------------------------------------------------------------------------------
 ManuallyRegistered
 -------------------------------------------------------------------------------
-TestMain.cpp:<line number>
+Misc.tests.cpp:<line number>
 ...............................................................................
 
-TestMain.cpp:<line number>:
+Misc.tests.cpp:<line number>:
 PASSED:
 with message:
   was called
@@ -2349,10 +2349,10 @@ with message:
 -------------------------------------------------------------------------------
 Matchers can be (AllOf) composed with the && operator
 -------------------------------------------------------------------------------
-MatchersTests.cpp:<line number>
+Matchers.tests.cpp:<line number>
 ...............................................................................
 
-MatchersTests.cpp:<line number>:
+Matchers.tests.cpp:<line number>:
 PASSED:
   CHECK_THAT( testStringForMatching(), Contains( "string" ) && Contains( "abc" ) && Contains( "substring" ) && Contains( "contains" ) )
 with expansion:
@@ -2362,17 +2362,17 @@ with expansion:
 -------------------------------------------------------------------------------
 Matchers can be (AnyOf) composed with the || operator
 -------------------------------------------------------------------------------
-MatchersTests.cpp:<line number>
+Matchers.tests.cpp:<line number>
 ...............................................................................
 
-MatchersTests.cpp:<line number>:
+Matchers.tests.cpp:<line number>:
 PASSED:
   CHECK_THAT( testStringForMatching(), Contains( "string" ) || Contains( "different" ) || Contains( "random" ) )
 with expansion:
   "this string contains 'abc' as a substring" ( contains: "string" or contains:
   "different" or contains: "random" )
 
-MatchersTests.cpp:<line number>:
+Matchers.tests.cpp:<line number>:
 PASSED:
   CHECK_THAT( testStringForMatching2(), Contains( "string" ) || Contains( "different" ) || Contains( "random" ) )
 with expansion:
@@ -2382,10 +2382,10 @@ with expansion:
 -------------------------------------------------------------------------------
 Matchers can be composed with both && and ||
 -------------------------------------------------------------------------------
-MatchersTests.cpp:<line number>
+Matchers.tests.cpp:<line number>
 ...............................................................................
 
-MatchersTests.cpp:<line number>:
+Matchers.tests.cpp:<line number>:
 PASSED:
   CHECK_THAT( testStringForMatching(), ( Contains( "string" ) || Contains( "different" ) ) && Contains( "substring" ) )
 with expansion:
@@ -2395,10 +2395,10 @@ with expansion:
 -------------------------------------------------------------------------------
 Matchers can be composed with both && and || - failing
 -------------------------------------------------------------------------------
-MatchersTests.cpp:<line number>
+Matchers.tests.cpp:<line number>
 ...............................................................................
 
-MatchersTests.cpp:<line number>: FAILED:
+Matchers.tests.cpp:<line number>: FAILED:
   CHECK_THAT( testStringForMatching(), ( Contains( "string" ) || Contains( "different" ) ) && Contains( "random" ) )
 with expansion:
   "this string contains 'abc' as a substring" ( ( contains: "string" or
@@ -2407,10 +2407,10 @@ with expansion:
 -------------------------------------------------------------------------------
 Matchers can be negated (Not) with the ! operator
 -------------------------------------------------------------------------------
-MatchersTests.cpp:<line number>
+Matchers.tests.cpp:<line number>
 ...............................................................................
 
-MatchersTests.cpp:<line number>:
+Matchers.tests.cpp:<line number>:
 PASSED:
   CHECK_THAT( testStringForMatching(), !Contains( "different" ) )
 with expansion:
@@ -2419,10 +2419,10 @@ with expansion:
 -------------------------------------------------------------------------------
 Matchers can be negated (Not) with the ! operator - failing
 -------------------------------------------------------------------------------
-MatchersTests.cpp:<line number>
+Matchers.tests.cpp:<line number>
 ...............................................................................
 
-MatchersTests.cpp:<line number>: FAILED:
+Matchers.tests.cpp:<line number>: FAILED:
   CHECK_THAT( testStringForMatching(), !Contains( "substring" ) )
 with expansion:
   "this string contains 'abc' as a substring" not contains: "substring"
@@ -2430,16 +2430,16 @@ with expansion:
 -------------------------------------------------------------------------------
 Mismatching exception messages failing the test
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:<line number>
+Exception.tests.cpp:<line number>
 ...............................................................................
 
-ExceptionTests.cpp:<line number>:
+Exception.tests.cpp:<line number>:
 PASSED:
   REQUIRE_THROWS_WITH( thisThrows(), "expected exception" )
 with expansion:
   "expected exception" equals: "expected exception"
 
-ExceptionTests.cpp:<line number>: FAILED:
+Exception.tests.cpp:<line number>: FAILED:
   REQUIRE_THROWS_WITH( thisThrows(), "should fail" )
 with expansion:
   "expected exception" equals: "should fail"
@@ -2447,42 +2447,42 @@ with expansion:
 -------------------------------------------------------------------------------
 Nice descriptive name
 -------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
+Misc.tests.cpp:<line number>
 ...............................................................................
 
-MiscTests.cpp:<line number>:
+Misc.tests.cpp:<line number>:
 warning:
   This one ran
 
 -------------------------------------------------------------------------------
 Non-std exceptions can be translated
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:<line number>
+Exception.tests.cpp:<line number>
 ...............................................................................
 
-ExceptionTests.cpp:<line number>: FAILED:
+Exception.tests.cpp:<line number>: FAILED:
 due to unexpected exception with message:
   custom exception
 
 -------------------------------------------------------------------------------
 Objects that evaluated in boolean contexts can be checked
 -------------------------------------------------------------------------------
-TrickyTests.cpp:<line number>
+Tricky.tests.cpp:<line number>
 ...............................................................................
 
-TrickyTests.cpp:<line number>:
+Tricky.tests.cpp:<line number>:
 PASSED:
   CHECK( True )
 with expansion:
   {?}
 
-TrickyTests.cpp:<line number>:
+Tricky.tests.cpp:<line number>:
 PASSED:
   CHECK( !False )
 with expansion:
   true
 
-TrickyTests.cpp:<line number>:
+Tricky.tests.cpp:<line number>:
 PASSED:
   CHECK_FALSE( False )
 with expansion:
@@ -2491,100 +2491,100 @@ with expansion:
 -------------------------------------------------------------------------------
 Ordering comparison checks that should fail
 -------------------------------------------------------------------------------
-ConditionTests.cpp:<line number>
+Condition.tests.cpp:<line number>
 ...............................................................................
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( data.int_seven > 7 )
 with expansion:
   7 > 7
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( data.int_seven < 7 )
 with expansion:
   7 < 7
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( data.int_seven > 8 )
 with expansion:
   7 > 8
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( data.int_seven < 6 )
 with expansion:
   7 < 6
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( data.int_seven < 0 )
 with expansion:
   7 < 0
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( data.int_seven < -1 )
 with expansion:
   7 < -1
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( data.int_seven >= 8 )
 with expansion:
   7 >= 8
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( data.int_seven <= 6 )
 with expansion:
   7 <= 6
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( data.float_nine_point_one < 9 )
 with expansion:
   9.1f < 9
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( data.float_nine_point_one > 10 )
 with expansion:
   9.1f > 10
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( data.float_nine_point_one > 9.2 )
 with expansion:
   9.1f > 9.2
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( data.str_hello > "hello" )
 with expansion:
   "hello" > "hello"
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( data.str_hello < "hello" )
 with expansion:
   "hello" < "hello"
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( data.str_hello > "hellp" )
 with expansion:
   "hello" > "hellp"
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( data.str_hello > "z" )
 with expansion:
   "hello" > "z"
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( data.str_hello < "hellm" )
 with expansion:
   "hello" < "hellm"
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( data.str_hello < "a" )
 with expansion:
   "hello" < "a"
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( data.str_hello >= "z" )
 with expansion:
   "hello" >= "z"
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( data.str_hello <= "a" )
 with expansion:
   "hello" <= "a"
@@ -2592,106 +2592,106 @@ with expansion:
 -------------------------------------------------------------------------------
 Ordering comparison checks that should succeed
 -------------------------------------------------------------------------------
-ConditionTests.cpp:<line number>
+Condition.tests.cpp:<line number>
 ...............................................................................
 
-ConditionTests.cpp:<line number>:
+Condition.tests.cpp:<line number>:
 PASSED:
   REQUIRE( data.int_seven < 8 )
 with expansion:
   7 < 8
 
-ConditionTests.cpp:<line number>:
+Condition.tests.cpp:<line number>:
 PASSED:
   REQUIRE( data.int_seven > 6 )
 with expansion:
   7 > 6
 
-ConditionTests.cpp:<line number>:
+Condition.tests.cpp:<line number>:
 PASSED:
   REQUIRE( data.int_seven > 0 )
 with expansion:
   7 > 0
 
-ConditionTests.cpp:<line number>:
+Condition.tests.cpp:<line number>:
 PASSED:
   REQUIRE( data.int_seven > -1 )
 with expansion:
   7 > -1
 
-ConditionTests.cpp:<line number>:
+Condition.tests.cpp:<line number>:
 PASSED:
   REQUIRE( data.int_seven >= 7 )
 with expansion:
   7 >= 7
 
-ConditionTests.cpp:<line number>:
+Condition.tests.cpp:<line number>:
 PASSED:
   REQUIRE( data.int_seven >= 6 )
 with expansion:
   7 >= 6
 
-ConditionTests.cpp:<line number>:
+Condition.tests.cpp:<line number>:
 PASSED:
   REQUIRE( data.int_seven <= 7 )
 with expansion:
   7 <= 7
 
-ConditionTests.cpp:<line number>:
+Condition.tests.cpp:<line number>:
 PASSED:
   REQUIRE( data.int_seven <= 8 )
 with expansion:
   7 <= 8
 
-ConditionTests.cpp:<line number>:
+Condition.tests.cpp:<line number>:
 PASSED:
   REQUIRE( data.float_nine_point_one > 9 )
 with expansion:
   9.1f > 9
 
-ConditionTests.cpp:<line number>:
+Condition.tests.cpp:<line number>:
 PASSED:
   REQUIRE( data.float_nine_point_one < 10 )
 with expansion:
   9.1f < 10
 
-ConditionTests.cpp:<line number>:
+Condition.tests.cpp:<line number>:
 PASSED:
   REQUIRE( data.float_nine_point_one < 9.2 )
 with expansion:
   9.1f < 9.2
 
-ConditionTests.cpp:<line number>:
+Condition.tests.cpp:<line number>:
 PASSED:
   REQUIRE( data.str_hello <= "hello" )
 with expansion:
   "hello" <= "hello"
 
-ConditionTests.cpp:<line number>:
+Condition.tests.cpp:<line number>:
 PASSED:
   REQUIRE( data.str_hello >= "hello" )
 with expansion:
   "hello" >= "hello"
 
-ConditionTests.cpp:<line number>:
+Condition.tests.cpp:<line number>:
 PASSED:
   REQUIRE( data.str_hello < "hellp" )
 with expansion:
   "hello" < "hellp"
 
-ConditionTests.cpp:<line number>:
+Condition.tests.cpp:<line number>:
 PASSED:
   REQUIRE( data.str_hello < "zebra" )
 with expansion:
   "hello" < "zebra"
 
-ConditionTests.cpp:<line number>:
+Condition.tests.cpp:<line number>:
 PASSED:
   REQUIRE( data.str_hello > "hellm" )
 with expansion:
   "hello" > "hellm"
 
-ConditionTests.cpp:<line number>:
+Condition.tests.cpp:<line number>:
 PASSED:
   REQUIRE( data.str_hello > "a" )
 with expansion:
@@ -2701,10 +2701,10 @@ with expansion:
 Output from all sections is reported
   one
 -------------------------------------------------------------------------------
-MessageTests.cpp:<line number>
+Message.tests.cpp:<line number>
 ...............................................................................
 
-MessageTests.cpp:<line number>: FAILED:
+Message.tests.cpp:<line number>: FAILED:
 explicitly with message:
   Message from section one
 
@@ -2712,10 +2712,10 @@ explicitly with message:
 Output from all sections is reported
   two
 -------------------------------------------------------------------------------
-MessageTests.cpp:<line number>
+Message.tests.cpp:<line number>
 ...............................................................................
 
-MessageTests.cpp:<line number>: FAILED:
+Message.tests.cpp:<line number>: FAILED:
 explicitly with message:
   Message from section two
 
@@ -2723,22 +2723,22 @@ explicitly with message:
 Parse test names and tags
   Empty test spec should have no filters
 -------------------------------------------------------------------------------
-CmdLineTests.cpp:<line number>
+CmdLine.tests.cpp:<line number>
 ...............................................................................
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.hasFilters() == false )
 with expansion:
   false == false
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcA ) == false )
 with expansion:
   false == false
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcB ) == false )
 with expansion:
@@ -2748,22 +2748,22 @@ with expansion:
 Parse test names and tags
   Test spec from empty string should have no filters
 -------------------------------------------------------------------------------
-CmdLineTests.cpp:<line number>
+CmdLine.tests.cpp:<line number>
 ...............................................................................
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.hasFilters() == false )
 with expansion:
   false == false
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches(tcA ) == false )
 with expansion:
   false == false
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcB ) == false )
 with expansion:
@@ -2773,22 +2773,22 @@ with expansion:
 Parse test names and tags
   Test spec from just a comma should have no filters
 -------------------------------------------------------------------------------
-CmdLineTests.cpp:<line number>
+CmdLine.tests.cpp:<line number>
 ...............................................................................
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.hasFilters() == false )
 with expansion:
   false == false
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcA ) == false )
 with expansion:
   false == false
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcB ) == false )
 with expansion:
@@ -2798,22 +2798,22 @@ with expansion:
 Parse test names and tags
   Test spec from name should have one filter
 -------------------------------------------------------------------------------
-CmdLineTests.cpp:<line number>
+CmdLine.tests.cpp:<line number>
 ...............................................................................
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.hasFilters() == true )
 with expansion:
   true == true
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcA ) == false )
 with expansion:
   false == false
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcB ) == true )
 with expansion:
@@ -2823,22 +2823,22 @@ with expansion:
 Parse test names and tags
   Test spec from quoted name should have one filter
 -------------------------------------------------------------------------------
-CmdLineTests.cpp:<line number>
+CmdLine.tests.cpp:<line number>
 ...............................................................................
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.hasFilters() == true )
 with expansion:
   true == true
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcA ) == false )
 with expansion:
   false == false
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcB ) == true )
 with expansion:
@@ -2848,28 +2848,28 @@ with expansion:
 Parse test names and tags
   Test spec from name should have one filter
 -------------------------------------------------------------------------------
-CmdLineTests.cpp:<line number>
+CmdLine.tests.cpp:<line number>
 ...............................................................................
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.hasFilters() == true )
 with expansion:
   true == true
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcA ) == false )
 with expansion:
   false == false
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcB ) == true )
 with expansion:
   true == true
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcC ) == false )
 with expansion:
@@ -2879,40 +2879,40 @@ with expansion:
 Parse test names and tags
   Wildcard at the start
 -------------------------------------------------------------------------------
-CmdLineTests.cpp:<line number>
+CmdLine.tests.cpp:<line number>
 ...............................................................................
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.hasFilters() == true )
 with expansion:
   true == true
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcA ) == false )
 with expansion:
   false == false
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcB ) == false )
 with expansion:
   false == false
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcC ) == true )
 with expansion:
   true == true
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcD ) == false )
 with expansion:
   false == false
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( parseTestSpec( "*a" ).matches( tcA ) == true )
 with expansion:
@@ -2922,40 +2922,40 @@ with expansion:
 Parse test names and tags
   Wildcard at the end
 -------------------------------------------------------------------------------
-CmdLineTests.cpp:<line number>
+CmdLine.tests.cpp:<line number>
 ...............................................................................
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.hasFilters() == true )
 with expansion:
   true == true
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcA ) == false )
 with expansion:
   false == false
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcB ) == false )
 with expansion:
   false == false
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcC ) == true )
 with expansion:
   true == true
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcD ) == false )
 with expansion:
   false == false
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( parseTestSpec( "a*" ).matches( tcA ) == true )
 with expansion:
@@ -2965,40 +2965,40 @@ with expansion:
 Parse test names and tags
   Wildcard at both ends
 -------------------------------------------------------------------------------
-CmdLineTests.cpp:<line number>
+CmdLine.tests.cpp:<line number>
 ...............................................................................
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.hasFilters() == true )
 with expansion:
   true == true
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcA ) == false )
 with expansion:
   false == false
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcB ) == false )
 with expansion:
   false == false
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcC ) == true )
 with expansion:
   true == true
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcD ) == true )
 with expansion:
   true == true
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( parseTestSpec( "*a*" ).matches( tcA ) == true )
 with expansion:
@@ -3008,22 +3008,22 @@ with expansion:
 Parse test names and tags
   Redundant wildcard at the start
 -------------------------------------------------------------------------------
-CmdLineTests.cpp:<line number>
+CmdLine.tests.cpp:<line number>
 ...............................................................................
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.hasFilters() == true )
 with expansion:
   true == true
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcA ) == true )
 with expansion:
   true == true
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcB ) == false )
 with expansion:
@@ -3033,22 +3033,22 @@ with expansion:
 Parse test names and tags
   Redundant wildcard at the end
 -------------------------------------------------------------------------------
-CmdLineTests.cpp:<line number>
+CmdLine.tests.cpp:<line number>
 ...............................................................................
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.hasFilters() == true )
 with expansion:
   true == true
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcA ) == true )
 with expansion:
   true == true
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcB ) == false )
 with expansion:
@@ -3058,22 +3058,22 @@ with expansion:
 Parse test names and tags
   Redundant wildcard at both ends
 -------------------------------------------------------------------------------
-CmdLineTests.cpp:<line number>
+CmdLine.tests.cpp:<line number>
 ...............................................................................
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.hasFilters() == true )
 with expansion:
   true == true
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcA ) == true )
 with expansion:
   true == true
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcB ) == false )
 with expansion:
@@ -3083,34 +3083,34 @@ with expansion:
 Parse test names and tags
   Wildcard at both ends, redundant at start
 -------------------------------------------------------------------------------
-CmdLineTests.cpp:<line number>
+CmdLine.tests.cpp:<line number>
 ...............................................................................
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.hasFilters() == true )
 with expansion:
   true == true
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcA ) == false )
 with expansion:
   false == false
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcB ) == false )
 with expansion:
   false == false
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcC ) == true )
 with expansion:
   true == true
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcD ) == true )
 with expansion:
@@ -3120,34 +3120,34 @@ with expansion:
 Parse test names and tags
   Just wildcard
 -------------------------------------------------------------------------------
-CmdLineTests.cpp:<line number>
+CmdLine.tests.cpp:<line number>
 ...............................................................................
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.hasFilters() == true )
 with expansion:
   true == true
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcA ) == true )
 with expansion:
   true == true
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcB ) == true )
 with expansion:
   true == true
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcC ) == true )
 with expansion:
   true == true
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcD ) == true )
 with expansion:
@@ -3157,28 +3157,28 @@ with expansion:
 Parse test names and tags
   Single tag
 -------------------------------------------------------------------------------
-CmdLineTests.cpp:<line number>
+CmdLine.tests.cpp:<line number>
 ...............................................................................
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.hasFilters() == true )
 with expansion:
   true == true
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcA ) == false )
 with expansion:
   false == false
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcB ) == true )
 with expansion:
   true == true
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcC ) == false )
 with expansion:
@@ -3188,28 +3188,28 @@ with expansion:
 Parse test names and tags
   Single tag, two matches
 -------------------------------------------------------------------------------
-CmdLineTests.cpp:<line number>
+CmdLine.tests.cpp:<line number>
 ...............................................................................
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.hasFilters() == true )
 with expansion:
   true == true
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcA ) == false )
 with expansion:
   false == false
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcB ) == true )
 with expansion:
   true == true
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcC ) == true )
 with expansion:
@@ -3219,28 +3219,28 @@ with expansion:
 Parse test names and tags
   Two tags
 -------------------------------------------------------------------------------
-CmdLineTests.cpp:<line number>
+CmdLine.tests.cpp:<line number>
 ...............................................................................
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.hasFilters() == true )
 with expansion:
   true == true
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcA ) == false )
 with expansion:
   false == false
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcB ) == false )
 with expansion:
   false == false
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcC ) == true )
 with expansion:
@@ -3250,28 +3250,28 @@ with expansion:
 Parse test names and tags
   Two tags, spare separated
 -------------------------------------------------------------------------------
-CmdLineTests.cpp:<line number>
+CmdLine.tests.cpp:<line number>
 ...............................................................................
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.hasFilters() == true )
 with expansion:
   true == true
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcA ) == false )
 with expansion:
   false == false
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcB ) == false )
 with expansion:
   false == false
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcC ) == true )
 with expansion:
@@ -3281,34 +3281,34 @@ with expansion:
 Parse test names and tags
   Wildcarded name and tag
 -------------------------------------------------------------------------------
-CmdLineTests.cpp:<line number>
+CmdLine.tests.cpp:<line number>
 ...............................................................................
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.hasFilters() == true )
 with expansion:
   true == true
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcA ) == false )
 with expansion:
   false == false
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcB ) == false )
 with expansion:
   false == false
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcC ) == true )
 with expansion:
   true == true
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcD ) == false )
 with expansion:
@@ -3318,28 +3318,28 @@ with expansion:
 Parse test names and tags
   Single tag exclusion
 -------------------------------------------------------------------------------
-CmdLineTests.cpp:<line number>
+CmdLine.tests.cpp:<line number>
 ...............................................................................
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.hasFilters() == true )
 with expansion:
   true == true
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcA ) == true )
 with expansion:
   true == true
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcB ) == false )
 with expansion:
   false == false
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcC ) == true )
 with expansion:
@@ -3349,28 +3349,28 @@ with expansion:
 Parse test names and tags
   One tag exclusion and one tag inclusion
 -------------------------------------------------------------------------------
-CmdLineTests.cpp:<line number>
+CmdLine.tests.cpp:<line number>
 ...............................................................................
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.hasFilters() == true )
 with expansion:
   true == true
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcA ) == false )
 with expansion:
   false == false
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcB ) == true )
 with expansion:
   true == true
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcC ) == false )
 with expansion:
@@ -3380,34 +3380,34 @@ with expansion:
 Parse test names and tags
   One tag exclusion and one wldcarded name inclusion
 -------------------------------------------------------------------------------
-CmdLineTests.cpp:<line number>
+CmdLine.tests.cpp:<line number>
 ...............................................................................
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.hasFilters() == true )
 with expansion:
   true == true
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcA ) == false )
 with expansion:
   false == false
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcB ) == false )
 with expansion:
   false == false
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcC ) == false )
 with expansion:
   false == false
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcD ) == true )
 with expansion:
@@ -3417,34 +3417,34 @@ with expansion:
 Parse test names and tags
   One tag exclusion, using exclude:, and one wldcarded name inclusion
 -------------------------------------------------------------------------------
-CmdLineTests.cpp:<line number>
+CmdLine.tests.cpp:<line number>
 ...............................................................................
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.hasFilters() == true )
 with expansion:
   true == true
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcA ) == false )
 with expansion:
   false == false
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcB ) == false )
 with expansion:
   false == false
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcC ) == false )
 with expansion:
   false == false
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcD ) == true )
 with expansion:
@@ -3454,34 +3454,34 @@ with expansion:
 Parse test names and tags
   name exclusion
 -------------------------------------------------------------------------------
-CmdLineTests.cpp:<line number>
+CmdLine.tests.cpp:<line number>
 ...............................................................................
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.hasFilters() == true )
 with expansion:
   true == true
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcA ) == true )
 with expansion:
   true == true
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcB ) == false )
 with expansion:
   false == false
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcC ) == true )
 with expansion:
   true == true
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcD ) == true )
 with expansion:
@@ -3491,34 +3491,34 @@ with expansion:
 Parse test names and tags
   wildcarded name exclusion
 -------------------------------------------------------------------------------
-CmdLineTests.cpp:<line number>
+CmdLine.tests.cpp:<line number>
 ...............................................................................
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.hasFilters() == true )
 with expansion:
   true == true
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcA ) == true )
 with expansion:
   true == true
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcB ) == true )
 with expansion:
   true == true
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcC ) == false )
 with expansion:
   false == false
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcD ) == false )
 with expansion:
@@ -3528,34 +3528,34 @@ with expansion:
 Parse test names and tags
   wildcarded name exclusion with tag inclusion
 -------------------------------------------------------------------------------
-CmdLineTests.cpp:<line number>
+CmdLine.tests.cpp:<line number>
 ...............................................................................
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.hasFilters() == true )
 with expansion:
   true == true
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcA ) == true )
 with expansion:
   true == true
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcB ) == true )
 with expansion:
   true == true
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcC ) == true )
 with expansion:
   true == true
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcD ) == false )
 with expansion:
@@ -3565,34 +3565,34 @@ with expansion:
 Parse test names and tags
   wildcarded name exclusion, using exclude:, with tag inclusion
 -------------------------------------------------------------------------------
-CmdLineTests.cpp:<line number>
+CmdLine.tests.cpp:<line number>
 ...............................................................................
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.hasFilters() == true )
 with expansion:
   true == true
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcA ) == true )
 with expansion:
   true == true
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcB ) == true )
 with expansion:
   true == true
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcC ) == true )
 with expansion:
   true == true
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcD ) == false )
 with expansion:
@@ -3602,34 +3602,34 @@ with expansion:
 Parse test names and tags
   two wildcarded names
 -------------------------------------------------------------------------------
-CmdLineTests.cpp:<line number>
+CmdLine.tests.cpp:<line number>
 ...............................................................................
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.hasFilters() == true )
 with expansion:
   true == true
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcA ) == false )
 with expansion:
   false == false
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcB ) == false )
 with expansion:
   false == false
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcC ) == true )
 with expansion:
   true == true
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcD ) == false )
 with expansion:
@@ -3639,34 +3639,34 @@ with expansion:
 Parse test names and tags
   empty tag
 -------------------------------------------------------------------------------
-CmdLineTests.cpp:<line number>
+CmdLine.tests.cpp:<line number>
 ...............................................................................
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.hasFilters() == false )
 with expansion:
   false == false
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcA ) == false )
 with expansion:
   false == false
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcB ) == false )
 with expansion:
   false == false
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcC ) == false )
 with expansion:
   false == false
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcD ) == false )
 with expansion:
@@ -3676,34 +3676,34 @@ with expansion:
 Parse test names and tags
   empty quoted name
 -------------------------------------------------------------------------------
-CmdLineTests.cpp:<line number>
+CmdLine.tests.cpp:<line number>
 ...............................................................................
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.hasFilters() == false )
 with expansion:
   false == false
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcA ) == false )
 with expansion:
   false == false
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcB ) == false )
 with expansion:
   false == false
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcC ) == false )
 with expansion:
   false == false
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcD ) == false )
 with expansion:
@@ -3713,34 +3713,34 @@ with expansion:
 Parse test names and tags
   quoted string followed by tag exclusion
 -------------------------------------------------------------------------------
-CmdLineTests.cpp:<line number>
+CmdLine.tests.cpp:<line number>
 ...............................................................................
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.hasFilters() == true )
 with expansion:
   true == true
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcA ) == false )
 with expansion:
   false == false
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcB ) == false )
 with expansion:
   false == false
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcC ) == false )
 with expansion:
   false == false
 
-CmdLineTests.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( spec.matches( tcD ) == true )
 with expansion:
@@ -3749,10 +3749,10 @@ with expansion:
 -------------------------------------------------------------------------------
 Parsing a std::pair
 -------------------------------------------------------------------------------
-TrickyTests.cpp:<line number>
+Tricky.tests.cpp:<line number>
 ...............................................................................
 
-TrickyTests.cpp:<line number>:
+Tricky.tests.cpp:<line number>:
 PASSED:
   REQUIRE( (std::pair<int, int>( 1, 2 )) == aNicePair )
 with expansion:
@@ -3761,52 +3761,52 @@ with expansion:
 -------------------------------------------------------------------------------
 Pointers can be compared to null
 -------------------------------------------------------------------------------
-ConditionTests.cpp:<line number>
+Condition.tests.cpp:<line number>
 ...............................................................................
 
-ConditionTests.cpp:<line number>:
+Condition.tests.cpp:<line number>:
 PASSED:
   REQUIRE( p == 0 )
 with expansion:
   0 == 0
 
-ConditionTests.cpp:<line number>:
+Condition.tests.cpp:<line number>:
 PASSED:
   REQUIRE( p == pNULL )
 with expansion:
   0 == 0
 
-ConditionTests.cpp:<line number>:
+Condition.tests.cpp:<line number>:
 PASSED:
   REQUIRE( p != 0 )
 with expansion:
   0x<hex digits> != 0
 
-ConditionTests.cpp:<line number>:
+Condition.tests.cpp:<line number>:
 PASSED:
   REQUIRE( cp != 0 )
 with expansion:
   0x<hex digits> != 0
 
-ConditionTests.cpp:<line number>:
+Condition.tests.cpp:<line number>:
 PASSED:
   REQUIRE( cpc != 0 )
 with expansion:
   0x<hex digits> != 0
 
-ConditionTests.cpp:<line number>:
+Condition.tests.cpp:<line number>:
 PASSED:
   REQUIRE( returnsNull() == 0 )
 with expansion:
   {null string} == 0
 
-ConditionTests.cpp:<line number>:
+Condition.tests.cpp:<line number>:
 PASSED:
   REQUIRE( returnsConstNull() == 0 )
 with expansion:
   {null string} == 0
 
-ConditionTests.cpp:<line number>:
+Condition.tests.cpp:<line number>:
 PASSED:
   REQUIRE( 0 != p )
 with expansion:
@@ -3816,16 +3816,16 @@ with expansion:
 Process can be configured on command line
   empty args don't cause a crash
 -------------------------------------------------------------------------------
-TestMain.cpp:<line number>
+CmdLine.tests.cpp:<line number>
 ...............................................................................
 
-TestMain.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( result )
 with expansion:
   {?}
 
-TestMain.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( config.processName == "" )
 with expansion:
@@ -3835,40 +3835,40 @@ with expansion:
 Process can be configured on command line
   default - no arguments
 -------------------------------------------------------------------------------
-TestMain.cpp:<line number>
+CmdLine.tests.cpp:<line number>
 ...............................................................................
 
-TestMain.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( result )
 with expansion:
   {?}
 
-TestMain.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( config.processName == "test" )
 with expansion:
   "test" == "test"
 
-TestMain.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( config.shouldDebugBreak == false )
 with expansion:
   false == false
 
-TestMain.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( config.abortAfter == -1 )
 with expansion:
   -1 == -1
 
-TestMain.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( config.noThrow == false )
 with expansion:
   false == false
 
-TestMain.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( config.reporterNames.empty() )
 with expansion:
@@ -3879,22 +3879,22 @@ Process can be configured on command line
   test lists
   1 test
 -------------------------------------------------------------------------------
-TestMain.cpp:<line number>
+CmdLine.tests.cpp:<line number>
 ...............................................................................
 
-TestMain.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( result )
 with expansion:
   {?}
 
-TestMain.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   REQUIRE( cfg.testSpec().matches(fakeTestCase("notIncluded")) == false )
 with expansion:
   false == false
 
-TestMain.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   REQUIRE( cfg.testSpec().matches(fakeTestCase("test1")) )
 with expansion:
@@ -3905,22 +3905,22 @@ Process can be configured on command line
   test lists
   Specify one test case exclusion using exclude:
 -------------------------------------------------------------------------------
-TestMain.cpp:<line number>
+CmdLine.tests.cpp:<line number>
 ...............................................................................
 
-TestMain.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( result )
 with expansion:
   {?}
 
-TestMain.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   REQUIRE( cfg.testSpec().matches(fakeTestCase("test1")) == false )
 with expansion:
   false == false
 
-TestMain.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   REQUIRE( cfg.testSpec().matches(fakeTestCase("alwaysIncluded")) )
 with expansion:
@@ -3931,22 +3931,22 @@ Process can be configured on command line
   test lists
   Specify one test case exclusion using ~
 -------------------------------------------------------------------------------
-TestMain.cpp:<line number>
+CmdLine.tests.cpp:<line number>
 ...............................................................................
 
-TestMain.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( result )
 with expansion:
   {?}
 
-TestMain.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   REQUIRE( cfg.testSpec().matches(fakeTestCase("test1")) == false )
 with expansion:
   false == false
 
-TestMain.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   REQUIRE( cfg.testSpec().matches(fakeTestCase("alwaysIncluded")) )
 with expansion:
@@ -3957,16 +3957,16 @@ Process can be configured on command line
   reporter
   -r/console
 -------------------------------------------------------------------------------
-TestMain.cpp:<line number>
+CmdLine.tests.cpp:<line number>
 ...............................................................................
 
-TestMain.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( cli.parse({"test", "-r", "console"}) )
 with expansion:
   {?}
 
-TestMain.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   REQUIRE( config.reporterNames[0] == "console" )
 with expansion:
@@ -3977,16 +3977,16 @@ Process can be configured on command line
   reporter
   -r/xml
 -------------------------------------------------------------------------------
-TestMain.cpp:<line number>
+CmdLine.tests.cpp:<line number>
 ...............................................................................
 
-TestMain.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( cli.parse({"test", "-r", "xml"}) )
 with expansion:
   {?}
 
-TestMain.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   REQUIRE( config.reporterNames[0] == "xml" )
 with expansion:
@@ -3997,28 +3997,28 @@ Process can be configured on command line
   reporter
   -r xml and junit
 -------------------------------------------------------------------------------
-TestMain.cpp:<line number>
+CmdLine.tests.cpp:<line number>
 ...............................................................................
 
-TestMain.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( cli.parse({"test", "-r", "xml", "-r", "junit"}) )
 with expansion:
   {?}
 
-TestMain.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   REQUIRE( config.reporterNames.size() == 2 )
 with expansion:
   2 == 2
 
-TestMain.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   REQUIRE( config.reporterNames[0] == "xml" )
 with expansion:
   "xml" == "xml"
 
-TestMain.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   REQUIRE( config.reporterNames[1] == "junit" )
 with expansion:
@@ -4029,16 +4029,16 @@ Process can be configured on command line
   reporter
   --reporter/junit
 -------------------------------------------------------------------------------
-TestMain.cpp:<line number>
+CmdLine.tests.cpp:<line number>
 ...............................................................................
 
-TestMain.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( cli.parse({"test", "--reporter", "junit"}) )
 with expansion:
   {?}
 
-TestMain.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   REQUIRE( config.reporterNames[0] == "junit" )
 with expansion:
@@ -4049,16 +4049,16 @@ Process can be configured on command line
   debugger
   -b
 -------------------------------------------------------------------------------
-TestMain.cpp:<line number>
+CmdLine.tests.cpp:<line number>
 ...............................................................................
 
-TestMain.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( cli.parse({"test", "-b"}) )
 with expansion:
   {?}
 
-TestMain.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   REQUIRE( config.shouldDebugBreak == true )
 with expansion:
@@ -4069,16 +4069,16 @@ Process can be configured on command line
   debugger
   --break
 -------------------------------------------------------------------------------
-TestMain.cpp:<line number>
+CmdLine.tests.cpp:<line number>
 ...............................................................................
 
-TestMain.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( cli.parse({"test", "--break"}) )
 with expansion:
   {?}
 
-TestMain.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   REQUIRE( config.shouldDebugBreak )
 with expansion:
@@ -4089,16 +4089,16 @@ Process can be configured on command line
   abort
   -a aborts after first failure
 -------------------------------------------------------------------------------
-TestMain.cpp:<line number>
+CmdLine.tests.cpp:<line number>
 ...............................................................................
 
-TestMain.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( cli.parse({"test", "-a"}) )
 with expansion:
   {?}
 
-TestMain.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   REQUIRE( config.abortAfter == 1 )
 with expansion:
@@ -4109,16 +4109,16 @@ Process can be configured on command line
   abort
   -x 2 aborts after two failures
 -------------------------------------------------------------------------------
-TestMain.cpp:<line number>
+CmdLine.tests.cpp:<line number>
 ...............................................................................
 
-TestMain.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( cli.parse({"test", "-x", "2"}) )
 with expansion:
   {?}
 
-TestMain.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   REQUIRE( config.abortAfter == 2 )
 with expansion:
@@ -4129,16 +4129,16 @@ Process can be configured on command line
   abort
   -x must be numeric
 -------------------------------------------------------------------------------
-TestMain.cpp:<line number>
+CmdLine.tests.cpp:<line number>
 ...............................................................................
 
-TestMain.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( !result )
 with expansion:
   true
 
-TestMain.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   REQUIRE_THAT( result.errorMessage(), Contains("convert") && Contains("oops") )
 with expansion:
@@ -4150,16 +4150,16 @@ Process can be configured on command line
   nothrow
   -e
 -------------------------------------------------------------------------------
-TestMain.cpp:<line number>
+CmdLine.tests.cpp:<line number>
 ...............................................................................
 
-TestMain.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( cli.parse({"test", "-e"}) )
 with expansion:
   {?}
 
-TestMain.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   REQUIRE( config.noThrow )
 with expansion:
@@ -4170,16 +4170,16 @@ Process can be configured on command line
   nothrow
   --nothrow
 -------------------------------------------------------------------------------
-TestMain.cpp:<line number>
+CmdLine.tests.cpp:<line number>
 ...............................................................................
 
-TestMain.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( cli.parse({"test", "--nothrow"}) )
 with expansion:
   {?}
 
-TestMain.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   REQUIRE( config.noThrow )
 with expansion:
@@ -4190,16 +4190,16 @@ Process can be configured on command line
   output filename
   -o filename
 -------------------------------------------------------------------------------
-TestMain.cpp:<line number>
+CmdLine.tests.cpp:<line number>
 ...............................................................................
 
-TestMain.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( cli.parse({"test", "-o", "filename.ext"}) )
 with expansion:
   {?}
 
-TestMain.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   REQUIRE( config.outputFilename == "filename.ext" )
 with expansion:
@@ -4210,16 +4210,16 @@ Process can be configured on command line
   output filename
   --out
 -------------------------------------------------------------------------------
-TestMain.cpp:<line number>
+CmdLine.tests.cpp:<line number>
 ...............................................................................
 
-TestMain.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( cli.parse({"test", "--out", "filename.ext"}) )
 with expansion:
   {?}
 
-TestMain.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   REQUIRE( config.outputFilename == "filename.ext" )
 with expansion:
@@ -4230,28 +4230,28 @@ Process can be configured on command line
   combinations
   Single character flags can be combined
 -------------------------------------------------------------------------------
-TestMain.cpp:<line number>
+CmdLine.tests.cpp:<line number>
 ...............................................................................
 
-TestMain.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( cli.parse({"test", "-abe"}) )
 with expansion:
   {?}
 
-TestMain.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( config.abortAfter == 1 )
 with expansion:
   1 == 1
 
-TestMain.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( config.shouldDebugBreak )
 with expansion:
   true
 
-TestMain.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( config.noThrow == true )
 with expansion:
@@ -4262,16 +4262,16 @@ Process can be configured on command line
   use-colour
   without option
 -------------------------------------------------------------------------------
-TestMain.cpp:<line number>
+CmdLine.tests.cpp:<line number>
 ...............................................................................
 
-TestMain.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( cli.parse({"test"}) )
 with expansion:
   {?}
 
-TestMain.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   REQUIRE( config.useColour == UseColour::Auto )
 with expansion:
@@ -4282,16 +4282,16 @@ Process can be configured on command line
   use-colour
   auto
 -------------------------------------------------------------------------------
-TestMain.cpp:<line number>
+CmdLine.tests.cpp:<line number>
 ...............................................................................
 
-TestMain.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( cli.parse({"test", "--use-colour", "auto"}) )
 with expansion:
   {?}
 
-TestMain.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   REQUIRE( config.useColour == UseColour::Auto )
 with expansion:
@@ -4302,16 +4302,16 @@ Process can be configured on command line
   use-colour
   yes
 -------------------------------------------------------------------------------
-TestMain.cpp:<line number>
+CmdLine.tests.cpp:<line number>
 ...............................................................................
 
-TestMain.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( cli.parse({"test", "--use-colour", "yes"}) )
 with expansion:
   {?}
 
-TestMain.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   REQUIRE( config.useColour == UseColour::Yes )
 with expansion:
@@ -4322,16 +4322,16 @@ Process can be configured on command line
   use-colour
   no
 -------------------------------------------------------------------------------
-TestMain.cpp:<line number>
+CmdLine.tests.cpp:<line number>
 ...............................................................................
 
-TestMain.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( cli.parse({"test", "--use-colour", "no"}) )
 with expansion:
   {?}
 
-TestMain.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   REQUIRE( config.useColour == UseColour::No )
 with expansion:
@@ -4342,16 +4342,16 @@ Process can be configured on command line
   use-colour
   error
 -------------------------------------------------------------------------------
-TestMain.cpp:<line number>
+CmdLine.tests.cpp:<line number>
 ...............................................................................
 
-TestMain.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK( !result )
 with expansion:
   true
 
-TestMain.cpp:<line number>:
+CmdLine.tests.cpp:<line number>:
 PASSED:
   CHECK_THAT( result.errorMessage(), Contains( "colour mode must be one of" ) )
 with expansion:
@@ -4361,10 +4361,10 @@ with expansion:
 -------------------------------------------------------------------------------
 Reconstruction should be based on stringification: #914
 -------------------------------------------------------------------------------
-DecompositionTests.cpp:<line number>
+Decomposition.tests.cpp:<line number>
 ...............................................................................
 
-DecompositionTests.cpp:<line number>: FAILED:
+Decomposition.tests.cpp:<line number>: FAILED:
   CHECK( truthy(false) )
 with expansion:
   Hey, its truthy!
@@ -4372,22 +4372,22 @@ with expansion:
 -------------------------------------------------------------------------------
 Regex string matcher
 -------------------------------------------------------------------------------
-MatchersTests.cpp:<line number>
+Matchers.tests.cpp:<line number>
 ...............................................................................
 
-MatchersTests.cpp:<line number>: FAILED:
+Matchers.tests.cpp:<line number>: FAILED:
   CHECK_THAT( testStringForMatching(), Matches("this STRING contains 'abc' as a substring") )
 with expansion:
   "this string contains 'abc' as a substring" matches "this STRING contains
   'abc' as a substring" case sensitively
 
-MatchersTests.cpp:<line number>: FAILED:
+Matchers.tests.cpp:<line number>: FAILED:
   CHECK_THAT( testStringForMatching(), Matches("contains 'abc' as a substring") )
 with expansion:
   "this string contains 'abc' as a substring" matches "contains 'abc' as a
   substring" case sensitively
 
-MatchersTests.cpp:<line number>: FAILED:
+Matchers.tests.cpp:<line number>: FAILED:
   CHECK_THAT( testStringForMatching(), Matches("this string contains 'abc' as a") )
 with expansion:
   "this string contains 'abc' as a substring" matches "this string contains
@@ -4396,10 +4396,10 @@ with expansion:
 -------------------------------------------------------------------------------
 SUCCEED counts as a test pass
 -------------------------------------------------------------------------------
-MessageTests.cpp:<line number>
+Message.tests.cpp:<line number>
 ...............................................................................
 
-MessageTests.cpp:<line number>:
+Message.tests.cpp:<line number>:
 PASSED:
 with message:
   this is a success
@@ -4407,10 +4407,10 @@ with message:
 -------------------------------------------------------------------------------
 SUCCESS does not require an argument
 -------------------------------------------------------------------------------
-MessageTests.cpp:<line number>
+Message.tests.cpp:<line number>
 ...............................................................................
 
-MessageTests.cpp:<line number>:
+Message.tests.cpp:<line number>:
 PASSED:
 
 -------------------------------------------------------------------------------
@@ -4418,10 +4418,10 @@ Scenario: BDD tests requiring Fixtures to provide commonly-accessed data or
           methods
      Given: No operations precede me
 -------------------------------------------------------------------------------
-BDDTests.cpp:<line number>
+BDD.tests.cpp:<line number>
 ...............................................................................
 
-BDDTests.cpp:<line number>:
+BDD.tests.cpp:<line number>:
 PASSED:
   REQUIRE( before == 0 )
 with expansion:
@@ -4434,10 +4434,10 @@ Scenario: BDD tests requiring Fixtures to provide commonly-accessed data or
       When: We get the count
       Then: Subsequently values are higher
 -------------------------------------------------------------------------------
-BDDTests.cpp:<line number>
+BDD.tests.cpp:<line number>
 ...............................................................................
 
-BDDTests.cpp:<line number>:
+BDD.tests.cpp:<line number>:
 PASSED:
   REQUIRE( after > before )
 with expansion:
@@ -4449,10 +4449,10 @@ Scenario: Do that thing with the thing
       When: I do this
       Then: it should do this
 -------------------------------------------------------------------------------
-BDDTests.cpp:<line number>
+BDD.tests.cpp:<line number>
 ...............................................................................
 
-BDDTests.cpp:<line number>:
+BDD.tests.cpp:<line number>:
 PASSED:
   REQUIRE( itDoesThis() )
 with expansion:
@@ -4465,10 +4465,10 @@ Scenario: Do that thing with the thing
       Then: it should do this
        And: do that
 -------------------------------------------------------------------------------
-BDDTests.cpp:<line number>
+BDD.tests.cpp:<line number>
 ...............................................................................
 
-BDDTests.cpp:<line number>:
+BDD.tests.cpp:<line number>:
 PASSED:
   REQUIRE( itDoesThat() )
 with expansion:
@@ -4484,10 +4484,10 @@ Scenario: This is a really long scenario name to see how the list command deals
       Then: The, deliberately very long and overly verbose (you see what I did
             there?) section names must wrap, along with an indent
 -------------------------------------------------------------------------------
-BDDTests.cpp:<line number>
+BDD.tests.cpp:<line number>
 ...............................................................................
 
-BDDTests.cpp:<line number>:
+BDD.tests.cpp:<line number>:
 PASSED:
 with message:
   boo!
@@ -4496,10 +4496,10 @@ with message:
 Scenario: Vector resizing affects size and capacity
      Given: an empty vector
 -------------------------------------------------------------------------------
-BDDTests.cpp:<line number>
+BDD.tests.cpp:<line number>
 ...............................................................................
 
-BDDTests.cpp:<line number>:
+BDD.tests.cpp:<line number>:
 PASSED:
   REQUIRE( v.size() == 0 )
 with expansion:
@@ -4511,16 +4511,16 @@ Scenario: Vector resizing affects size and capacity
       When: it is made larger
       Then: the size and capacity go up
 -------------------------------------------------------------------------------
-BDDTests.cpp:<line number>
+BDD.tests.cpp:<line number>
 ...............................................................................
 
-BDDTests.cpp:<line number>:
+BDD.tests.cpp:<line number>:
 PASSED:
   REQUIRE( v.size() == 10 )
 with expansion:
   10 == 10
 
-BDDTests.cpp:<line number>:
+BDD.tests.cpp:<line number>:
 PASSED:
   REQUIRE( v.capacity() >= 10 )
 with expansion:
@@ -4534,16 +4534,16 @@ Scenario: Vector resizing affects size and capacity
   And when: it is made smaller again
       Then: the size goes down but the capacity stays the same
 -------------------------------------------------------------------------------
-BDDTests.cpp:<line number>
+BDD.tests.cpp:<line number>
 ...............................................................................
 
-BDDTests.cpp:<line number>:
+BDD.tests.cpp:<line number>:
 PASSED:
   REQUIRE( v.size() == 5 )
 with expansion:
   5 == 5
 
-BDDTests.cpp:<line number>:
+BDD.tests.cpp:<line number>:
 PASSED:
   REQUIRE( v.capacity() >= 10 )
 with expansion:
@@ -4553,10 +4553,10 @@ with expansion:
 Scenario: Vector resizing affects size and capacity
      Given: an empty vector
 -------------------------------------------------------------------------------
-BDDTests.cpp:<line number>
+BDD.tests.cpp:<line number>
 ...............................................................................
 
-BDDTests.cpp:<line number>:
+BDD.tests.cpp:<line number>:
 PASSED:
   REQUIRE( v.size() == 0 )
 with expansion:
@@ -4568,16 +4568,16 @@ Scenario: Vector resizing affects size and capacity
       When: we reserve more space
       Then: The capacity is increased but the size remains the same
 -------------------------------------------------------------------------------
-BDDTests.cpp:<line number>
+BDD.tests.cpp:<line number>
 ...............................................................................
 
-BDDTests.cpp:<line number>:
+BDD.tests.cpp:<line number>:
 PASSED:
   REQUIRE( v.capacity() >= 10 )
 with expansion:
   10 >= 10
 
-BDDTests.cpp:<line number>:
+BDD.tests.cpp:<line number>:
 PASSED:
   REQUIRE( v.size() == 0 )
 with expansion:
@@ -4588,46 +4588,46 @@ A string sent directly to stderr
 -------------------------------------------------------------------------------
 Some simple comparisons between doubles
 -------------------------------------------------------------------------------
-ApproxTests.cpp:<line number>
+Approx.tests.cpp:<line number>
 ...............................................................................
 
-ApproxTests.cpp:<line number>:
+Approx.tests.cpp:<line number>:
 PASSED:
   REQUIRE( d == Approx( 1.23 ) )
 with expansion:
   1.23 == Approx( 1.23 )
 
-ApproxTests.cpp:<line number>:
+Approx.tests.cpp:<line number>:
 PASSED:
   REQUIRE( d != Approx( 1.22 ) )
 with expansion:
   1.23 != Approx( 1.22 )
 
-ApproxTests.cpp:<line number>:
+Approx.tests.cpp:<line number>:
 PASSED:
   REQUIRE( d != Approx( 1.24 ) )
 with expansion:
   1.23 != Approx( 1.24 )
 
-ApproxTests.cpp:<line number>:
+Approx.tests.cpp:<line number>:
 PASSED:
   REQUIRE( Approx( d ) == 1.23 )
 with expansion:
   Approx( 1.23 ) == 1.23
 
-ApproxTests.cpp:<line number>:
+Approx.tests.cpp:<line number>:
 PASSED:
   REQUIRE( Approx( d ) != 1.22 )
 with expansion:
   Approx( 1.23 ) != 1.22
 
-ApproxTests.cpp:<line number>:
+Approx.tests.cpp:<line number>:
 PASSED:
   REQUIRE( Approx( d ) != 1.24 )
 with expansion:
   Approx( 1.23 ) != 1.24
 
-ApproxTests.cpp:<line number>:
+Approx.tests.cpp:<line number>:
 PASSED:
   REQUIRE( INFINITY == Approx(INFINITY) )
 with expansion:
@@ -4638,7 +4638,7 @@ Message from section one
 Standard output from all sections is reported
   one
 -------------------------------------------------------------------------------
-MessageTests.cpp:<line number>
+Message.tests.cpp:<line number>
 ...............................................................................
 
 
@@ -4649,7 +4649,7 @@ Message from section two
 Standard output from all sections is reported
   two
 -------------------------------------------------------------------------------
-MessageTests.cpp:<line number>
+Message.tests.cpp:<line number>
 ...............................................................................
 
 
@@ -4658,15 +4658,15 @@ No assertions in section 'two'
 -------------------------------------------------------------------------------
 StartsWith string matcher
 -------------------------------------------------------------------------------
-MatchersTests.cpp:<line number>
+Matchers.tests.cpp:<line number>
 ...............................................................................
 
-MatchersTests.cpp:<line number>: FAILED:
+Matchers.tests.cpp:<line number>: FAILED:
   CHECK_THAT( testStringForMatching(), StartsWith( "This String" ) )
 with expansion:
   "this string contains 'abc' as a substring" starts with: "This String"
 
-MatchersTests.cpp:<line number>: FAILED:
+Matchers.tests.cpp:<line number>: FAILED:
   CHECK_THAT( testStringForMatching(), StartsWith( "string", Catch::CaseSensitive::No ) )
 with expansion:
   "this string contains 'abc' as a substring" starts with: "string" (case
@@ -4675,90 +4675,90 @@ with expansion:
 -------------------------------------------------------------------------------
 String matchers
 -------------------------------------------------------------------------------
-MatchersTests.cpp:<line number>
+Matchers.tests.cpp:<line number>
 ...............................................................................
 
-MatchersTests.cpp:<line number>:
+Matchers.tests.cpp:<line number>:
 PASSED:
   REQUIRE_THAT( testStringForMatching(), Contains( "string" ) )
 with expansion:
   "this string contains 'abc' as a substring" contains: "string"
 
-MatchersTests.cpp:<line number>:
+Matchers.tests.cpp:<line number>:
 PASSED:
   REQUIRE_THAT( testStringForMatching(), Contains( "string", Catch::CaseSensitive::No ) )
 with expansion:
   "this string contains 'abc' as a substring" contains: "string" (case
   insensitive)
 
-MatchersTests.cpp:<line number>:
+Matchers.tests.cpp:<line number>:
 PASSED:
   CHECK_THAT( testStringForMatching(), Contains( "abc" ) )
 with expansion:
   "this string contains 'abc' as a substring" contains: "abc"
 
-MatchersTests.cpp:<line number>:
+Matchers.tests.cpp:<line number>:
 PASSED:
   CHECK_THAT( testStringForMatching(), Contains( "aBC", Catch::CaseSensitive::No ) )
 with expansion:
   "this string contains 'abc' as a substring" contains: "abc" (case insensitive)
   insensitive)
 
-MatchersTests.cpp:<line number>:
+Matchers.tests.cpp:<line number>:
 PASSED:
   CHECK_THAT( testStringForMatching(), StartsWith( "this" ) )
 with expansion:
   "this string contains 'abc' as a substring" starts with: "this"
 
-MatchersTests.cpp:<line number>:
+Matchers.tests.cpp:<line number>:
 PASSED:
   CHECK_THAT( testStringForMatching(), StartsWith( "THIS", Catch::CaseSensitive::No ) )
 with expansion:
   "this string contains 'abc' as a substring" starts with: "this" (case
   insensitive)
 
-MatchersTests.cpp:<line number>:
+Matchers.tests.cpp:<line number>:
 PASSED:
   CHECK_THAT( testStringForMatching(), EndsWith( "substring" ) )
 with expansion:
   "this string contains 'abc' as a substring" ends with: "substring"
 
-MatchersTests.cpp:<line number>:
+Matchers.tests.cpp:<line number>:
 PASSED:
   CHECK_THAT( testStringForMatching(), EndsWith(" SuBsTrInG", Catch::CaseSensitive::No ) )
 with expansion:
   "this string contains 'abc' as a substring" ends with: " substring" (case
   insensitive)
 
-MatchersTests.cpp:<line number>:
+Matchers.tests.cpp:<line number>:
 PASSED:
   REQUIRE_THAT( testStringForMatching(), Matches("this string contains 'abc' as a substring") )
 with expansion:
   "this string contains 'abc' as a substring" matches "this string contains
   'abc' as a substring" case sensitively
 
-MatchersTests.cpp:<line number>:
+Matchers.tests.cpp:<line number>:
 PASSED:
   REQUIRE_THAT( testStringForMatching(), Matches("this string CONTAINS 'abc' as a substring", Catch::CaseSensitive::No) )
 with expansion:
   "this string contains 'abc' as a substring" matches "this string CONTAINS
   'abc' as a substring" case insensitively
 
-MatchersTests.cpp:<line number>:
+Matchers.tests.cpp:<line number>:
 PASSED:
   REQUIRE_THAT( testStringForMatching(), Matches("^this string contains 'abc' as a substring$") )
 with expansion:
   "this string contains 'abc' as a substring" matches "^this string contains
   'abc' as a substring$" case sensitively
 
-MatchersTests.cpp:<line number>:
+Matchers.tests.cpp:<line number>:
 PASSED:
   REQUIRE_THAT( testStringForMatching(), Matches("^.* 'abc' .*$") )
 with expansion:
   "this string contains 'abc' as a substring" matches "^.* 'abc' .*$" case
   sensitively
 
-MatchersTests.cpp:<line number>:
+Matchers.tests.cpp:<line number>:
 PASSED:
   REQUIRE_THAT( testStringForMatching(), Matches("^.* 'ABC' .*$", Catch::CaseSensitive::No) )
 with expansion:
@@ -4769,22 +4769,22 @@ with expansion:
 StringRef
   Empty string
 -------------------------------------------------------------------------------
-StringRef.tests.cpp:<line number>
+String.tests.cpp:<line number>
 ...............................................................................
 
-StringRef.tests.cpp:<line number>:
+String.tests.cpp:<line number>:
 PASSED:
   REQUIRE( empty.empty() )
 with expansion:
   true
 
-StringRef.tests.cpp:<line number>:
+String.tests.cpp:<line number>:
 PASSED:
   REQUIRE( empty.size() == 0 )
 with expansion:
   0 == 0
 
-StringRef.tests.cpp:<line number>:
+String.tests.cpp:<line number>:
 PASSED:
   REQUIRE( std::strcmp( empty.c_str(), "" ) == 0 )
 with expansion:
@@ -4794,28 +4794,28 @@ with expansion:
 StringRef
   From string literal
 -------------------------------------------------------------------------------
-StringRef.tests.cpp:<line number>
+String.tests.cpp:<line number>
 ...............................................................................
 
-StringRef.tests.cpp:<line number>:
+String.tests.cpp:<line number>:
 PASSED:
   REQUIRE( s.empty() == false )
 with expansion:
   false == false
 
-StringRef.tests.cpp:<line number>:
+String.tests.cpp:<line number>:
 PASSED:
   REQUIRE( s.size() == 5 )
 with expansion:
   5 == 5
 
-StringRef.tests.cpp:<line number>:
+String.tests.cpp:<line number>:
 PASSED:
   REQUIRE( isSubstring( s ) == false )
 with expansion:
   false == false
 
-StringRef.tests.cpp:<line number>:
+String.tests.cpp:<line number>:
 PASSED:
   REQUIRE( std::strcmp( rawChars, "hello" ) == 0 )
 with expansion:
@@ -4826,22 +4826,22 @@ StringRef
   From string literal
   c_str() does not cause copy
 -------------------------------------------------------------------------------
-StringRef.tests.cpp:<line number>
+String.tests.cpp:<line number>
 ...............................................................................
 
-StringRef.tests.cpp:<line number>:
+String.tests.cpp:<line number>:
 PASSED:
   REQUIRE( isOwned( s ) == false )
 with expansion:
   false == false
 
-StringRef.tests.cpp:<line number>:
+String.tests.cpp:<line number>:
 PASSED:
   REQUIRE( s.c_str() == rawChars )
 with expansion:
   "hello" == "hello"
 
-StringRef.tests.cpp:<line number>:
+String.tests.cpp:<line number>:
 PASSED:
   REQUIRE( isOwned( s ) == false )
 with expansion:
@@ -4851,14 +4851,14 @@ with expansion:
 StringRef
   From sub-string
 -------------------------------------------------------------------------------
-StringRef.tests.cpp:<line number>
+String.tests.cpp:<line number>
 ...............................................................................
 
-StringRef.tests.cpp:<line number>:
+String.tests.cpp:<line number>:
 PASSED:
   REQUIRE( original == "original" )
 
-StringRef.tests.cpp:<line number>: FAILED:
+String.tests.cpp:<line number>: FAILED:
   REQUIRE( isSubstring( original ) )
 with expansion:
   false
@@ -4868,28 +4868,28 @@ StringRef
   Substrings
   zero-based substring
 -------------------------------------------------------------------------------
-StringRef.tests.cpp:<line number>
+String.tests.cpp:<line number>
 ...............................................................................
 
-StringRef.tests.cpp:<line number>:
+String.tests.cpp:<line number>:
 PASSED:
   REQUIRE( ss.empty() == false )
 with expansion:
   false == false
 
-StringRef.tests.cpp:<line number>:
+String.tests.cpp:<line number>:
 PASSED:
   REQUIRE( ss.size() == 5 )
 with expansion:
   5 == 5
 
-StringRef.tests.cpp:<line number>:
+String.tests.cpp:<line number>:
 PASSED:
   REQUIRE( std::strcmp( ss.c_str(), "hello" ) == 0 )
 with expansion:
   0 == 0
 
-StringRef.tests.cpp:<line number>:
+String.tests.cpp:<line number>:
 PASSED:
   REQUIRE( ss == "hello" )
 with expansion:
@@ -4900,46 +4900,46 @@ StringRef
   Substrings
   c_str() causes copy
 -------------------------------------------------------------------------------
-StringRef.tests.cpp:<line number>
+String.tests.cpp:<line number>
 ...............................................................................
 
-StringRef.tests.cpp:<line number>:
+String.tests.cpp:<line number>:
 PASSED:
   REQUIRE( isSubstring( ss ) )
 with expansion:
   true
 
-StringRef.tests.cpp:<line number>:
+String.tests.cpp:<line number>:
 PASSED:
   REQUIRE( isOwned( ss ) == false )
 with expansion:
   false == false
 
-StringRef.tests.cpp:<line number>:
+String.tests.cpp:<line number>:
 PASSED:
   REQUIRE( rawChars == data( s ) )
 with expansion:
   "hello world!" == "hello world!"
 
-StringRef.tests.cpp:<line number>:
+String.tests.cpp:<line number>:
 PASSED:
   REQUIRE( ss.c_str() != rawChars )
 with expansion:
   "hello" != "hello world!"
 
-StringRef.tests.cpp:<line number>:
+String.tests.cpp:<line number>:
 PASSED:
   REQUIRE( isSubstring( ss ) == false )
 with expansion:
   false == false
 
-StringRef.tests.cpp:<line number>:
+String.tests.cpp:<line number>:
 PASSED:
   REQUIRE( isOwned( ss ) )
 with expansion:
   true
 
-StringRef.tests.cpp:<line number>:
+String.tests.cpp:<line number>:
 PASSED:
   REQUIRE( data( ss ) != data( s ) )
 with expansion:
@@ -4950,16 +4950,16 @@ StringRef
   Substrings
   non-zero-based substring
 -------------------------------------------------------------------------------
-StringRef.tests.cpp:<line number>
+String.tests.cpp:<line number>
 ...............................................................................
 
-StringRef.tests.cpp:<line number>:
+String.tests.cpp:<line number>:
 PASSED:
   REQUIRE( ss.size() == 6 )
 with expansion:
   6 == 6
 
-StringRef.tests.cpp:<line number>:
+String.tests.cpp:<line number>:
 PASSED:
   REQUIRE( std::strcmp( ss.c_str(), "world!" ) == 0 )
 with expansion:
@@ -4970,10 +4970,10 @@ StringRef
   Substrings
   Pointer values of full refs should match
 -------------------------------------------------------------------------------
-StringRef.tests.cpp:<line number>
+String.tests.cpp:<line number>
 ...............................................................................
 
-StringRef.tests.cpp:<line number>:
+String.tests.cpp:<line number>:
 PASSED:
   REQUIRE( s.c_str() == s2.c_str() )
 with expansion:
@@ -4984,10 +4984,10 @@ StringRef
   Substrings
   Pointer values of substring refs should not match
 -------------------------------------------------------------------------------
-StringRef.tests.cpp:<line number>
+String.tests.cpp:<line number>
 ...............................................................................
 
-StringRef.tests.cpp:<line number>:
+String.tests.cpp:<line number>:
 PASSED:
   REQUIRE( s.c_str() != ss.c_str() )
 with expansion:
@@ -4997,16 +4997,16 @@ with expansion:
 StringRef
   Comparisons
 -------------------------------------------------------------------------------
-StringRef.tests.cpp:<line number>
+String.tests.cpp:<line number>
 ...............................................................................
 
-StringRef.tests.cpp:<line number>:
+String.tests.cpp:<line number>:
 PASSED:
   REQUIRE( StringRef("hello") == StringRef("hello") )
 with expansion:
   hello == hello
 
-StringRef.tests.cpp:<line number>:
+String.tests.cpp:<line number>:
 PASSED:
   REQUIRE( StringRef("hello") != StringRef("cello") )
 with expansion:
@@ -5017,16 +5017,16 @@ StringRef
   from std::string
   implicitly constructed
 -------------------------------------------------------------------------------
-StringRef.tests.cpp:<line number>
+String.tests.cpp:<line number>
 ...............................................................................
 
-StringRef.tests.cpp:<line number>:
+String.tests.cpp:<line number>:
 PASSED:
   REQUIRE( sr == "a standard string" )
 with expansion:
   a standard string == "a standard string"
 
-StringRef.tests.cpp:<line number>:
+String.tests.cpp:<line number>:
 PASSED:
   REQUIRE( sr.size() == stdStr.size() )
 with expansion:
@@ -5037,16 +5037,16 @@ StringRef
   from std::string
   explicitly constructed
 -------------------------------------------------------------------------------
-StringRef.tests.cpp:<line number>
+String.tests.cpp:<line number>
 ...............................................................................
 
-StringRef.tests.cpp:<line number>:
+String.tests.cpp:<line number>:
 PASSED:
   REQUIRE( sr == "a standard string" )
 with expansion:
   a standard string == "a standard string"
 
-StringRef.tests.cpp:<line number>:
+String.tests.cpp:<line number>:
 PASSED:
   REQUIRE( sr.size() == stdStr.size() )
 with expansion:
@@ -5057,16 +5057,16 @@ StringRef
   from std::string
   assigned
 -------------------------------------------------------------------------------
-StringRef.tests.cpp:<line number>
+String.tests.cpp:<line number>
 ...............................................................................
 
-StringRef.tests.cpp:<line number>:
+String.tests.cpp:<line number>:
 PASSED:
   REQUIRE( sr == "a standard string" )
 with expansion:
   a standard string == "a standard string"
 
-StringRef.tests.cpp:<line number>:
+String.tests.cpp:<line number>:
 PASSED:
   REQUIRE( sr.size() == stdStr.size() )
 with expansion:
@@ -5077,16 +5077,16 @@ StringRef
   to std::string
   implicitly constructed
 -------------------------------------------------------------------------------
-StringRef.tests.cpp:<line number>
+String.tests.cpp:<line number>
 ...............................................................................
 
-StringRef.tests.cpp:<line number>:
+String.tests.cpp:<line number>:
 PASSED:
   REQUIRE( stdStr == "a stringref" )
 with expansion:
   "a stringref" == "a stringref"
 
-StringRef.tests.cpp:<line number>:
+String.tests.cpp:<line number>:
 PASSED:
   REQUIRE( stdStr.size() == sr.size() )
 with expansion:
@@ -5097,16 +5097,16 @@ StringRef
   to std::string
   explicitly constructed
 -------------------------------------------------------------------------------
-StringRef.tests.cpp:<line number>
+String.tests.cpp:<line number>
 ...............................................................................
 
-StringRef.tests.cpp:<line number>:
+String.tests.cpp:<line number>:
 PASSED:
   REQUIRE( stdStr == "a stringref" )
 with expansion:
   "a stringref" == "a stringref"
 
-StringRef.tests.cpp:<line number>:
+String.tests.cpp:<line number>:
 PASSED:
   REQUIRE( stdStr.size() == sr.size() )
 with expansion:
@@ -5117,16 +5117,16 @@ StringRef
   to std::string
   assigned
 -------------------------------------------------------------------------------
-StringRef.tests.cpp:<line number>
+String.tests.cpp:<line number>
 ...............................................................................
 
-StringRef.tests.cpp:<line number>:
+String.tests.cpp:<line number>:
 PASSED:
   REQUIRE( stdStr == "a stringref" )
 with expansion:
   "a stringref" == "a stringref"
 
-StringRef.tests.cpp:<line number>:
+String.tests.cpp:<line number>:
 PASSED:
   REQUIRE( stdStr.size() == sr.size() )
 with expansion:
@@ -5135,28 +5135,28 @@ with expansion:
 -------------------------------------------------------------------------------
 Stringifying std::chrono::duration helpers
 -------------------------------------------------------------------------------
-ToStringChrono.cpp:<line number>
+ToStringChrono.tests.cpp:<line number>
 ...............................................................................
 
-ToStringChrono.cpp:<line number>:
+ToStringChrono.tests.cpp:<line number>:
 PASSED:
   REQUIRE( minute == seconds )
 with expansion:
   1 m == 60 s
 
-ToStringChrono.cpp:<line number>:
+ToStringChrono.tests.cpp:<line number>:
 PASSED:
   REQUIRE( hour != seconds )
 with expansion:
   1 h != 60 s
 
-ToStringChrono.cpp:<line number>:
+ToStringChrono.tests.cpp:<line number>:
 PASSED:
   REQUIRE( micro != milli )
 with expansion:
   1 us != 1 ms
 
-ToStringChrono.cpp:<line number>:
+ToStringChrono.tests.cpp:<line number>:
 PASSED:
   REQUIRE( nano != micro )
 with expansion:
@@ -5165,10 +5165,10 @@ with expansion:
 -------------------------------------------------------------------------------
 Stringifying std::chrono::duration with weird ratios
 -------------------------------------------------------------------------------
-ToStringChrono.cpp:<line number>
+ToStringChrono.tests.cpp:<line number>
 ...............................................................................
 
-ToStringChrono.cpp:<line number>:
+ToStringChrono.tests.cpp:<line number>:
 PASSED:
   REQUIRE( half_minute != femto_second )
 with expansion:
@@ -5177,10 +5177,10 @@ with expansion:
 -------------------------------------------------------------------------------
 Stringifying std::chrono::time_point<system_clock>
 -------------------------------------------------------------------------------
-ToStringChrono.cpp:<line number>
+ToStringChrono.tests.cpp:<line number>
 ...............................................................................
 
-ToStringChrono.cpp:<line number>:
+ToStringChrono.tests.cpp:<line number>:
 PASSED:
   REQUIRE( now != later )
 with expansion:
@@ -5191,10 +5191,10 @@ with expansion:
 -------------------------------------------------------------------------------
 Tabs and newlines show in output
 -------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
+Misc.tests.cpp:<line number>
 ...............................................................................
 
-MiscTests.cpp:<line number>: FAILED:
+Misc.tests.cpp:<line number>: FAILED:
   CHECK( s1 == s2 )
 with expansion:
   "if ($b == 10) {
@@ -5210,10 +5210,10 @@ with expansion:
 Tag alias can be registered against tag patterns
   The same tag alias can only be registered once
 -------------------------------------------------------------------------------
-TagAliasTests.cpp:<line number>
+TagAlias.tests.cpp:<line number>
 ...............................................................................
 
-TagAliasTests.cpp:<line number>:
+TagAlias.tests.cpp:<line number>:
 PASSED:
   CHECK_THAT( what, Contains( "[@zzz]" ) )
 with expansion:
@@ -5221,7 +5221,7 @@ with expansion:
   	First seen at: file:2
   	Redefined at: file:10" contains: "[@zzz]"
 
-TagAliasTests.cpp:<line number>:
+TagAlias.tests.cpp:<line number>:
 PASSED:
   CHECK_THAT( what, Contains( "file" ) )
 with expansion:
@@ -5229,7 +5229,7 @@ with expansion:
   	First seen at: file:2
   	Redefined at: file:10" contains: "file"
 
-TagAliasTests.cpp:<line number>:
+TagAlias.tests.cpp:<line number>:
 PASSED:
   CHECK_THAT( what, Contains( "2" ) )
 with expansion:
@@ -5237,7 +5237,7 @@ with expansion:
   	First seen at: file:2
   	Redefined at: file:10" contains: "2"
 
-TagAliasTests.cpp:<line number>:
+TagAlias.tests.cpp:<line number>:
 PASSED:
   CHECK_THAT( what, Contains( "10" ) )
 with expansion:
@@ -5249,32 +5249,32 @@ with expansion:
 Tag alias can be registered against tag patterns
   Tag aliases must be of the form [@name]
 -------------------------------------------------------------------------------
-TagAliasTests.cpp:<line number>
+TagAlias.tests.cpp:<line number>
 ...............................................................................
 
-TagAliasTests.cpp:<line number>:
+TagAlias.tests.cpp:<line number>:
 PASSED:
   CHECK_THROWS( registry.add( "[no ampersat]", "", Catch::SourceLineInfo( "file", 3 ) ) )
 
-TagAliasTests.cpp:<line number>:
+TagAlias.tests.cpp:<line number>:
 PASSED:
   CHECK_THROWS( registry.add( "[the @ is not at the start]", "", Catch::SourceLineInfo( "file", 3 ) ) )
 
-TagAliasTests.cpp:<line number>:
+TagAlias.tests.cpp:<line number>:
 PASSED:
   CHECK_THROWS( registry.add( "@no square bracket at start]", "", Catch::SourceLineInfo( "file", 3 ) ) )
 
-TagAliasTests.cpp:<line number>:
+TagAlias.tests.cpp:<line number>:
 PASSED:
   CHECK_THROWS( registry.add( "[@no square bracket at end", "", Catch::SourceLineInfo( "file", 3 ) ) )
 
 -------------------------------------------------------------------------------
 Test case with one argument
 -------------------------------------------------------------------------------
-VariadicMacrosTests.cpp:<line number>
+VariadicMacros.tests.cpp:<line number>
 ...............................................................................
 
-VariadicMacrosTests.cpp:<line number>:
+VariadicMacros.tests.cpp:<line number>:
 PASSED:
 with message:
   no assertions
@@ -5282,10 +5282,10 @@ with message:
 -------------------------------------------------------------------------------
 Test enum bit values
 -------------------------------------------------------------------------------
-TrickyTests.cpp:<line number>
+Tricky.tests.cpp:<line number>
 ...............................................................................
 
-TrickyTests.cpp:<line number>:
+Tricky.tests.cpp:<line number>:
 PASSED:
   REQUIRE( 0x<hex digits> == bit30and31 )
 with expansion:
@@ -5294,20 +5294,20 @@ with expansion:
 -------------------------------------------------------------------------------
 The NO_FAIL macro reports a failure but does not fail the test
 -------------------------------------------------------------------------------
-MessageTests.cpp:<line number>
+Message.tests.cpp:<line number>
 ...............................................................................
 
-MessageTests.cpp:<line number>:
+Message.tests.cpp:<line number>:
 FAILED - but was ok:
   CHECK_NOFAIL( 1 == 2 )
 
 -------------------------------------------------------------------------------
 This test 'should' fail but doesn't
 -------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
+Misc.tests.cpp:<line number>
 ...............................................................................
 
-MiscTests.cpp:<line number>:
+Misc.tests.cpp:<line number>:
 PASSED:
 with message:
   oops!
@@ -5315,16 +5315,16 @@ with message:
 -------------------------------------------------------------------------------
 Tracker
 -------------------------------------------------------------------------------
-PartTrackerTests.cpp:<line number>
+PartTracker.tests.cpp:<line number>
 ...............................................................................
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( testCase.isOpen() )
 with expansion:
   true
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( s1.isOpen() )
 with expansion:
@@ -5334,28 +5334,28 @@ with expansion:
 Tracker
   successfully close one section
 -------------------------------------------------------------------------------
-PartTrackerTests.cpp:<line number>
+PartTracker.tests.cpp:<line number>
 ...............................................................................
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( s1.isSuccessfullyCompleted() )
 with expansion:
   true
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( testCase.isComplete() == false )
 with expansion:
   false == false
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( ctx.completedCycle() )
 with expansion:
   true
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( testCase.isSuccessfullyCompleted() )
 with expansion:
@@ -5364,16 +5364,16 @@ with expansion:
 -------------------------------------------------------------------------------
 Tracker
 -------------------------------------------------------------------------------
-PartTrackerTests.cpp:<line number>
+PartTracker.tests.cpp:<line number>
 ...............................................................................
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( testCase.isOpen() )
 with expansion:
   true
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( s1.isOpen() )
 with expansion:
@@ -5383,34 +5383,34 @@ with expansion:
 Tracker
   fail one section
 -------------------------------------------------------------------------------
-PartTrackerTests.cpp:<line number>
+PartTracker.tests.cpp:<line number>
 ...............................................................................
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( s1.isComplete() )
 with expansion:
   true
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( s1.isSuccessfullyCompleted() == false )
 with expansion:
   false == false
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( testCase.isComplete() == false )
 with expansion:
   false == false
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( ctx.completedCycle() )
 with expansion:
   true
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( testCase.isSuccessfullyCompleted() == false )
 with expansion:
@@ -5421,34 +5421,34 @@ Tracker
   fail one section
   re-enter after failed section
 -------------------------------------------------------------------------------
-PartTrackerTests.cpp:<line number>
+PartTracker.tests.cpp:<line number>
 ...............................................................................
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( testCase2.isOpen() )
 with expansion:
   true
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( s1b.isOpen() == false )
 with expansion:
   false == false
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( ctx.completedCycle() )
 with expansion:
   true
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( testCase.isComplete() )
 with expansion:
   true
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( testCase.isSuccessfullyCompleted() )
 with expansion:
@@ -5457,16 +5457,16 @@ with expansion:
 -------------------------------------------------------------------------------
 Tracker
 -------------------------------------------------------------------------------
-PartTrackerTests.cpp:<line number>
+PartTracker.tests.cpp:<line number>
 ...............................................................................
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( testCase.isOpen() )
 with expansion:
   true
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( s1.isOpen() )
 with expansion:
@@ -5476,34 +5476,34 @@ with expansion:
 Tracker
   fail one section
 -------------------------------------------------------------------------------
-PartTrackerTests.cpp:<line number>
+PartTracker.tests.cpp:<line number>
 ...............................................................................
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( s1.isComplete() )
 with expansion:
   true
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( s1.isSuccessfullyCompleted() == false )
 with expansion:
   false == false
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( testCase.isComplete() == false )
 with expansion:
   false == false
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( ctx.completedCycle() )
 with expansion:
   true
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( testCase.isSuccessfullyCompleted() == false )
 with expansion:
@@ -5514,40 +5514,40 @@ Tracker
   fail one section
   re-enter after failed section and find next section
 -------------------------------------------------------------------------------
-PartTrackerTests.cpp:<line number>
+PartTracker.tests.cpp:<line number>
 ...............................................................................
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( testCase2.isOpen() )
 with expansion:
   true
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( s1b.isOpen() == false )
 with expansion:
   false == false
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( s2.isOpen() )
 with expansion:
   true
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( ctx.completedCycle() )
 with expansion:
   true
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( testCase.isComplete() )
 with expansion:
   true
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( testCase.isSuccessfullyCompleted() )
 with expansion:
@@ -5556,16 +5556,16 @@ with expansion:
 -------------------------------------------------------------------------------
 Tracker
 -------------------------------------------------------------------------------
-PartTrackerTests.cpp:<line number>
+PartTracker.tests.cpp:<line number>
 ...............................................................................
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( testCase.isOpen() )
 with expansion:
   true
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( s1.isOpen() )
 with expansion:
@@ -5575,16 +5575,16 @@ with expansion:
 Tracker
   successfully close one section, then find another
 -------------------------------------------------------------------------------
-PartTrackerTests.cpp:<line number>
+PartTracker.tests.cpp:<line number>
 ...............................................................................
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( s2.isOpen() == false )
 with expansion:
   false == false
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( testCase.isComplete() == false )
 with expansion:
@@ -5595,28 +5595,28 @@ Tracker
   successfully close one section, then find another
   Re-enter - skips S1 and enters S2
 -------------------------------------------------------------------------------
-PartTrackerTests.cpp:<line number>
+PartTracker.tests.cpp:<line number>
 ...............................................................................
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( testCase2.isOpen() )
 with expansion:
   true
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( s1b.isOpen() == false )
 with expansion:
   false == false
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( s2b.isOpen() )
 with expansion:
   true
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( ctx.completedCycle() == false )
 with expansion:
@@ -5628,28 +5628,28 @@ Tracker
   Re-enter - skips S1 and enters S2
   Successfully close S2
 -------------------------------------------------------------------------------
-PartTrackerTests.cpp:<line number>
+PartTracker.tests.cpp:<line number>
 ...............................................................................
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( ctx.completedCycle() )
 with expansion:
   true
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( s2b.isSuccessfullyCompleted() )
 with expansion:
   true
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( testCase2.isComplete() == false )
 with expansion:
   false == false
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( testCase2.isSuccessfullyCompleted() )
 with expansion:
@@ -5658,16 +5658,16 @@ with expansion:
 -------------------------------------------------------------------------------
 Tracker
 -------------------------------------------------------------------------------
-PartTrackerTests.cpp:<line number>
+PartTracker.tests.cpp:<line number>
 ...............................................................................
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( testCase.isOpen() )
 with expansion:
   true
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( s1.isOpen() )
 with expansion:
@@ -5677,16 +5677,16 @@ with expansion:
 Tracker
   successfully close one section, then find another
 -------------------------------------------------------------------------------
-PartTrackerTests.cpp:<line number>
+PartTracker.tests.cpp:<line number>
 ...............................................................................
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( s2.isOpen() == false )
 with expansion:
   false == false
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( testCase.isComplete() == false )
 with expansion:
@@ -5697,28 +5697,28 @@ Tracker
   successfully close one section, then find another
   Re-enter - skips S1 and enters S2
 -------------------------------------------------------------------------------
-PartTrackerTests.cpp:<line number>
+PartTracker.tests.cpp:<line number>
 ...............................................................................
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( testCase2.isOpen() )
 with expansion:
   true
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( s1b.isOpen() == false )
 with expansion:
   false == false
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( s2b.isOpen() )
 with expansion:
   true
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( ctx.completedCycle() == false )
 with expansion:
@@ -5730,52 +5730,52 @@ Tracker
   Re-enter - skips S1 and enters S2
   fail S2
 -------------------------------------------------------------------------------
-PartTrackerTests.cpp:<line number>
+PartTracker.tests.cpp:<line number>
 ...............................................................................
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( ctx.completedCycle() )
 with expansion:
   true
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( s2b.isComplete() )
 with expansion:
   true
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( s2b.isSuccessfullyCompleted() == false )
 with expansion:
   false == false
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( testCase2.isSuccessfullyCompleted() == false )
 with expansion:
   false == false
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( testCase3.isOpen() )
 with expansion:
   true
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( s1c.isOpen() == false )
 with expansion:
   false == false
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( s2c.isOpen() == false )
 with expansion:
   false == false
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( testCase3.isSuccessfullyCompleted() )
 with expansion:
@@ -5784,16 +5784,16 @@ with expansion:
 -------------------------------------------------------------------------------
 Tracker
 -------------------------------------------------------------------------------
-PartTrackerTests.cpp:<line number>
+PartTracker.tests.cpp:<line number>
 ...............................................................................
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( testCase.isOpen() )
 with expansion:
   true
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( s1.isOpen() )
 with expansion:
@@ -5803,40 +5803,40 @@ with expansion:
 Tracker
   open a nested section
 -------------------------------------------------------------------------------
-PartTrackerTests.cpp:<line number>
+PartTracker.tests.cpp:<line number>
 ...............................................................................
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( s2.isOpen() )
 with expansion:
   true
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( s2.isComplete() )
 with expansion:
   true
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( s1.isComplete() == false )
 with expansion:
   false == false
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( s1.isComplete() )
 with expansion:
   true
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( testCase.isComplete() == false )
 with expansion:
   false == false
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( testCase.isComplete() )
 with expansion:
@@ -5845,16 +5845,16 @@ with expansion:
 -------------------------------------------------------------------------------
 Tracker
 -------------------------------------------------------------------------------
-PartTrackerTests.cpp:<line number>
+PartTracker.tests.cpp:<line number>
 ...............................................................................
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( testCase.isOpen() )
 with expansion:
   true
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( s1.isOpen() )
 with expansion:
@@ -5864,28 +5864,28 @@ with expansion:
 Tracker
   start a generator
 -------------------------------------------------------------------------------
-PartTrackerTests.cpp:<line number>
+PartTracker.tests.cpp:<line number>
 ...............................................................................
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( g1.isOpen() )
 with expansion:
   true
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( g1.index() == 0 )
 with expansion:
   0 == 0
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( g1.isComplete() == false )
 with expansion:
   false == false
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( s1.isComplete() == false )
 with expansion:
@@ -5896,16 +5896,16 @@ Tracker
   start a generator
   close outer section
 -------------------------------------------------------------------------------
-PartTrackerTests.cpp:<line number>
+PartTracker.tests.cpp:<line number>
 ...............................................................................
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( s1.isComplete() == false )
 with expansion:
   false == false
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( testCase.isSuccessfullyCompleted() == false )
 with expansion:
@@ -5917,52 +5917,52 @@ Tracker
   close outer section
   Re-enter for second generation
 -------------------------------------------------------------------------------
-PartTrackerTests.cpp:<line number>
+PartTracker.tests.cpp:<line number>
 ...............................................................................
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( testCase2.isOpen() )
 with expansion:
   true
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( s1b.isOpen() )
 with expansion:
   true
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( g1b.isOpen() )
 with expansion:
   true
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( g1b.index() == 1 )
 with expansion:
   1 == 1
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( s1.isComplete() == false )
 with expansion:
   false == false
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( s1b.isComplete() )
 with expansion:
   true
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( g1b.isComplete() )
 with expansion:
   true
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( testCase2.isComplete() )
 with expansion:
@@ -5971,16 +5971,16 @@ with expansion:
 -------------------------------------------------------------------------------
 Tracker
 -------------------------------------------------------------------------------
-PartTrackerTests.cpp:<line number>
+PartTracker.tests.cpp:<line number>
 ...............................................................................
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( testCase.isOpen() )
 with expansion:
   true
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( s1.isOpen() )
 with expansion:
@@ -5990,28 +5990,28 @@ with expansion:
 Tracker
   start a generator
 -------------------------------------------------------------------------------
-PartTrackerTests.cpp:<line number>
+PartTracker.tests.cpp:<line number>
 ...............................................................................
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( g1.isOpen() )
 with expansion:
   true
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( g1.index() == 0 )
 with expansion:
   0 == 0
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( g1.isComplete() == false )
 with expansion:
   false == false
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( s1.isComplete() == false )
 with expansion:
@@ -6022,28 +6022,28 @@ Tracker
   start a generator
   Start a new inner section
 -------------------------------------------------------------------------------
-PartTrackerTests.cpp:<line number>
+PartTracker.tests.cpp:<line number>
 ...............................................................................
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( s2.isOpen() )
 with expansion:
   true
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( s2.isComplete() )
 with expansion:
   true
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( s1.isComplete() == false )
 with expansion:
   false == false
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( testCase.isComplete() == false )
 with expansion:
@@ -6055,58 +6055,58 @@ Tracker
   Start a new inner section
   Re-enter for second generation
 -------------------------------------------------------------------------------
-PartTrackerTests.cpp:<line number>
+PartTracker.tests.cpp:<line number>
 ...............................................................................
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( testCase2.isOpen() )
 with expansion:
   true
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( s1b.isOpen() )
 with expansion:
   true
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( g1b.isOpen() )
 with expansion:
   true
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( g1b.index() == 1 )
 with expansion:
   1 == 1
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( s2b.isOpen() )
 with expansion:
   true
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( s2b.isComplete() )
 with expansion:
   true
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( g1b.isComplete() )
 with expansion:
   true
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( s1b.isComplete() )
 with expansion:
   true
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( testCase2.isComplete() )
 with expansion:
@@ -6115,16 +6115,16 @@ with expansion:
 -------------------------------------------------------------------------------
 Tracker
 -------------------------------------------------------------------------------
-PartTrackerTests.cpp:<line number>
+PartTracker.tests.cpp:<line number>
 ...............................................................................
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( testCase.isOpen() )
 with expansion:
   true
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( s1.isOpen() )
 with expansion:
@@ -6134,28 +6134,28 @@ with expansion:
 Tracker
   start a generator
 -------------------------------------------------------------------------------
-PartTrackerTests.cpp:<line number>
+PartTracker.tests.cpp:<line number>
 ...............................................................................
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( g1.isOpen() )
 with expansion:
   true
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( g1.index() == 0 )
 with expansion:
   0 == 0
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( g1.isComplete() == false )
 with expansion:
   false == false
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( s1.isComplete() == false )
 with expansion:
@@ -6166,34 +6166,34 @@ Tracker
   start a generator
   Fail an inner section
 -------------------------------------------------------------------------------
-PartTrackerTests.cpp:<line number>
+PartTracker.tests.cpp:<line number>
 ...............................................................................
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( s2.isOpen() )
 with expansion:
   true
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( s2.isComplete() )
 with expansion:
   true
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( s2.isSuccessfullyCompleted() == false )
 with expansion:
   false == false
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( s1.isComplete() == false )
 with expansion:
   false == false
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( testCase.isComplete() == false )
 with expansion:
@@ -6205,106 +6205,106 @@ Tracker
   Fail an inner section
   Re-enter for second generation
 -------------------------------------------------------------------------------
-PartTrackerTests.cpp:<line number>
+PartTracker.tests.cpp:<line number>
 ...............................................................................
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( testCase2.isOpen() )
 with expansion:
   true
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( s1b.isOpen() )
 with expansion:
   true
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( g1b.isOpen() )
 with expansion:
   true
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( g1b.index() == 0 )
 with expansion:
   0 == 0
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( s2b.isOpen() == false )
 with expansion:
   false == false
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( g1b.isComplete() == false )
 with expansion:
   false == false
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( s1b.isComplete() == false )
 with expansion:
   false == false
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( testCase2.isComplete() == false )
 with expansion:
   false == false
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( testCase3.isOpen() )
 with expansion:
   true
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( s1c.isOpen() )
 with expansion:
   true
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( g1c.isOpen() )
 with expansion:
   true
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( g1c.index() == 1 )
 with expansion:
   1 == 1
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( s2c.isOpen() )
 with expansion:
   true
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( s2c.isComplete() )
 with expansion:
   true
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( g1c.isComplete() )
 with expansion:
   true
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( s1c.isComplete() )
 with expansion:
   true
 
-PartTrackerTests.cpp:<line number>:
+PartTracker.tests.cpp:<line number>:
 PASSED:
   REQUIRE( testCase3.isComplete() )
 with expansion:
@@ -6313,62 +6313,62 @@ with expansion:
 -------------------------------------------------------------------------------
 Unexpected exceptions can be translated
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:<line number>
+Exception.tests.cpp:<line number>
 ...............................................................................
 
-ExceptionTests.cpp:<line number>: FAILED:
+Exception.tests.cpp:<line number>: FAILED:
 due to unexpected exception with message:
   3.14
 
 -------------------------------------------------------------------------------
 Use a custom approx
 -------------------------------------------------------------------------------
-ApproxTests.cpp:<line number>
+Approx.tests.cpp:<line number>
 ...............................................................................
 
-ApproxTests.cpp:<line number>:
+Approx.tests.cpp:<line number>:
 PASSED:
   REQUIRE( d == approx( 1.23 ) )
 with expansion:
   1.23 == Approx( 1.23 )
 
-ApproxTests.cpp:<line number>:
+Approx.tests.cpp:<line number>:
 PASSED:
   REQUIRE( d == approx( 1.22 ) )
 with expansion:
   1.23 == Approx( 1.22 )
 
-ApproxTests.cpp:<line number>:
+Approx.tests.cpp:<line number>:
 PASSED:
   REQUIRE( d == approx( 1.24 ) )
 with expansion:
   1.23 == Approx( 1.24 )
 
-ApproxTests.cpp:<line number>:
+Approx.tests.cpp:<line number>:
 PASSED:
   REQUIRE( d != approx( 1.25 ) )
 with expansion:
   1.23 != Approx( 1.25 )
 
-ApproxTests.cpp:<line number>:
+Approx.tests.cpp:<line number>:
 PASSED:
   REQUIRE( approx( d ) == 1.23 )
 with expansion:
   Approx( 1.23 ) == 1.23
 
-ApproxTests.cpp:<line number>:
+Approx.tests.cpp:<line number>:
 PASSED:
   REQUIRE( approx( d ) == 1.22 )
 with expansion:
   Approx( 1.23 ) == 1.22
 
-ApproxTests.cpp:<line number>:
+Approx.tests.cpp:<line number>:
 PASSED:
   REQUIRE( approx( d ) == 1.24 )
 with expansion:
   Approx( 1.23 ) == 1.24
 
-ApproxTests.cpp:<line number>:
+Approx.tests.cpp:<line number>:
 PASSED:
   REQUIRE( approx( d ) != 1.25 )
 with expansion:
@@ -6378,10 +6378,10 @@ with expansion:
 Variadic macros
   Section with one argument
 -------------------------------------------------------------------------------
-VariadicMacrosTests.cpp:<line number>
+VariadicMacros.tests.cpp:<line number>
 ...............................................................................
 
-VariadicMacrosTests.cpp:<line number>:
+VariadicMacros.tests.cpp:<line number>:
 PASSED:
 with message:
   no assertions
@@ -6390,16 +6390,16 @@ with message:
 Vector matchers
   Contains (element)
 -------------------------------------------------------------------------------
-MatchersTests.cpp:<line number>
+Matchers.tests.cpp:<line number>
 ...............................................................................
 
-MatchersTests.cpp:<line number>:
+Matchers.tests.cpp:<line number>:
 PASSED:
   CHECK_THAT( v, VectorContains( 1 ) )
 with expansion:
   { 1, 2, 3 } Contains: 1
 
-MatchersTests.cpp:<line number>:
+Matchers.tests.cpp:<line number>:
 PASSED:
   CHECK_THAT( v, VectorContains( 2 ) )
 with expansion:
@@ -6409,28 +6409,28 @@ with expansion:
 Vector matchers
   Contains (vector)
 -------------------------------------------------------------------------------
-MatchersTests.cpp:<line number>
+Matchers.tests.cpp:<line number>
 ...............................................................................
 
-MatchersTests.cpp:<line number>:
+Matchers.tests.cpp:<line number>:
 PASSED:
   CHECK_THAT( v, Contains( v2 ) )
 with expansion:
   { 1, 2, 3 } Contains: { 1, 2 }
 
-MatchersTests.cpp:<line number>:
+Matchers.tests.cpp:<line number>:
 PASSED:
   CHECK_THAT( v, Contains( v2 ) )
 with expansion:
   { 1, 2, 3 } Contains: { 1, 2, 3 }
 
-MatchersTests.cpp:<line number>:
+Matchers.tests.cpp:<line number>:
 PASSED:
   CHECK_THAT( v, Contains( empty) )
 with expansion:
   { 1, 2, 3 } Contains: {  }
 
-MatchersTests.cpp:<line number>:
+Matchers.tests.cpp:<line number>:
 PASSED:
   CHECK_THAT( empty, Contains( empty) )
 with expansion:
@@ -6440,10 +6440,10 @@ with expansion:
 Vector matchers
   Contains (element), composed
 -------------------------------------------------------------------------------
-MatchersTests.cpp:<line number>
+Matchers.tests.cpp:<line number>
 ...............................................................................
 
-MatchersTests.cpp:<line number>:
+Matchers.tests.cpp:<line number>:
 PASSED:
   CHECK_THAT( v, VectorContains( 1 ) && VectorContains( 2 ) )
 with expansion:
@@ -6453,22 +6453,22 @@ with expansion:
 Vector matchers
   Equals
 -------------------------------------------------------------------------------
-MatchersTests.cpp:<line number>
+Matchers.tests.cpp:<line number>
 ...............................................................................
 
-MatchersTests.cpp:<line number>:
+Matchers.tests.cpp:<line number>:
 PASSED:
   CHECK_THAT( v, Equals( v ) )
 with expansion:
   { 1, 2, 3 } Equals: { 1, 2, 3 }
 
-MatchersTests.cpp:<line number>:
+Matchers.tests.cpp:<line number>:
 PASSED:
   CHECK_THAT( empty, Equals( empty ) )
 with expansion:
   {  } Equals: {  }
 
-MatchersTests.cpp:<line number>:
+Matchers.tests.cpp:<line number>:
 PASSED:
   CHECK_THAT( v, Equals( v2 ) )
 with expansion:
@@ -6478,15 +6478,15 @@ with expansion:
 Vector matchers that fail
   Contains (element)
 -------------------------------------------------------------------------------
-MatchersTests.cpp:<line number>
+Matchers.tests.cpp:<line number>
 ...............................................................................
 
-MatchersTests.cpp:<line number>: FAILED:
+Matchers.tests.cpp:<line number>: FAILED:
   CHECK_THAT( v, VectorContains( -1 ) )
 with expansion:
   { 1, 2, 3 } Contains: -1
 
-MatchersTests.cpp:<line number>: FAILED:
+Matchers.tests.cpp:<line number>: FAILED:
   CHECK_THAT( empty, VectorContains( 1 ) )
 with expansion:
   {  } Contains: 1
@@ -6495,15 +6495,15 @@ with expansion:
 Vector matchers that fail
   Contains (vector)
 -------------------------------------------------------------------------------
-MatchersTests.cpp:<line number>
+Matchers.tests.cpp:<line number>
 ...............................................................................
 
-MatchersTests.cpp:<line number>: FAILED:
+Matchers.tests.cpp:<line number>: FAILED:
   CHECK_THAT( empty, Contains( v) )
 with expansion:
   {  } Contains: { 1, 2, 3 }
 
-MatchersTests.cpp:<line number>: FAILED:
+Matchers.tests.cpp:<line number>: FAILED:
   CHECK_THAT( v, Contains( v2 ) )
 with expansion:
   { 1, 2, 3 } Contains: { 1, 2, 4 }
@@ -6512,25 +6512,25 @@ with expansion:
 Vector matchers that fail
   Equals
 -------------------------------------------------------------------------------
-MatchersTests.cpp:<line number>
+Matchers.tests.cpp:<line number>
 ...............................................................................
 
-MatchersTests.cpp:<line number>: FAILED:
+Matchers.tests.cpp:<line number>: FAILED:
   CHECK_THAT( v, Equals( v2 ) )
 with expansion:
   { 1, 2, 3 } Equals: { 1, 2 }
 
-MatchersTests.cpp:<line number>: FAILED:
+Matchers.tests.cpp:<line number>: FAILED:
   CHECK_THAT( v2, Equals( v ) )
 with expansion:
   { 1, 2 } Equals: { 1, 2, 3 }
 
-MatchersTests.cpp:<line number>: FAILED:
+Matchers.tests.cpp:<line number>: FAILED:
   CHECK_THAT( empty, Equals( v ) )
 with expansion:
   {  } Equals: { 1, 2, 3 }
 
-MatchersTests.cpp:<line number>: FAILED:
+Matchers.tests.cpp:<line number>: FAILED:
   CHECK_THAT( v, Equals( empty ) )
 with expansion:
   { 1, 2, 3 } Equals: {  }
@@ -6538,38 +6538,38 @@ with expansion:
 -------------------------------------------------------------------------------
 When checked exceptions are thrown they can be expected or unexpected
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:<line number>
+Exception.tests.cpp:<line number>
 ...............................................................................
 
-ExceptionTests.cpp:<line number>:
+Exception.tests.cpp:<line number>:
 PASSED:
   REQUIRE_THROWS_AS( thisThrows(), std::domain_error )
 
-ExceptionTests.cpp:<line number>:
+Exception.tests.cpp:<line number>:
 PASSED:
   REQUIRE_NOTHROW( thisDoesntThrow() )
 
-ExceptionTests.cpp:<line number>:
+Exception.tests.cpp:<line number>:
 PASSED:
   REQUIRE_THROWS( thisThrows() )
 
 -------------------------------------------------------------------------------
 When unchecked exceptions are thrown directly they are always failures
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:<line number>
+Exception.tests.cpp:<line number>
 ...............................................................................
 
-ExceptionTests.cpp:<line number>: FAILED:
+Exception.tests.cpp:<line number>: FAILED:
 due to unexpected exception with message:
   unexpected exception
 
 -------------------------------------------------------------------------------
 When unchecked exceptions are thrown during a CHECK the test should continue
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:<line number>
+Exception.tests.cpp:<line number>
 ...............................................................................
 
-ExceptionTests.cpp:<line number>: FAILED:
+Exception.tests.cpp:<line number>: FAILED:
   CHECK( thisThrows() == 0 )
 due to unexpected exception with message:
   expected exception
@@ -6578,10 +6578,10 @@ due to unexpected exception with message:
 When unchecked exceptions are thrown during a REQUIRE the test should abort
 fail
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:<line number>
+Exception.tests.cpp:<line number>
 ...............................................................................
 
-ExceptionTests.cpp:<line number>: FAILED:
+Exception.tests.cpp:<line number>: FAILED:
   REQUIRE( thisThrows() == 0 )
 due to unexpected exception with message:
   expected exception
@@ -6589,10 +6589,10 @@ due to unexpected exception with message:
 -------------------------------------------------------------------------------
 When unchecked exceptions are thrown from functions they are always failures
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:<line number>
+Exception.tests.cpp:<line number>
 ...............................................................................
 
-ExceptionTests.cpp:<line number>: FAILED:
+Exception.tests.cpp:<line number>: FAILED:
   CHECK( thisThrows() == 0 )
 due to unexpected exception with message:
   expected exception
@@ -6601,20 +6601,20 @@ due to unexpected exception with message:
 When unchecked exceptions are thrown from sections they are always failures
   section name
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:<line number>
+Exception.tests.cpp:<line number>
 ...............................................................................
 
-ExceptionTests.cpp:<line number>: FAILED:
+Exception.tests.cpp:<line number>: FAILED:
 due to unexpected exception with message:
   unexpected exception
 
 -------------------------------------------------------------------------------
 Where the LHS is not a simple value
 -------------------------------------------------------------------------------
-TrickyTests.cpp:<line number>
+Tricky.tests.cpp:<line number>
 ...............................................................................
 
-TrickyTests.cpp:<line number>:
+Tricky.tests.cpp:<line number>:
 warning:
   Uncomment the code in this test to check that it gives a sensible compiler
   error
@@ -6622,10 +6622,10 @@ warning:
 -------------------------------------------------------------------------------
 Where there is more to the expression after the RHS
 -------------------------------------------------------------------------------
-TrickyTests.cpp:<line number>
+Tricky.tests.cpp:<line number>
 ...............................................................................
 
-TrickyTests.cpp:<line number>:
+Tricky.tests.cpp:<line number>:
 warning:
   Uncomment the code in this test to check that it gives a sensible compiler
   error
@@ -6633,47 +6633,47 @@ warning:
 -------------------------------------------------------------------------------
 X/level/0/a
 -------------------------------------------------------------------------------
-TrickyTests.cpp:<line number>
+Tricky.tests.cpp:<line number>
 ...............................................................................
 
-TrickyTests.cpp:<line number>:
+Tricky.tests.cpp:<line number>:
 PASSED:
 
 -------------------------------------------------------------------------------
 X/level/0/b
 -------------------------------------------------------------------------------
-TrickyTests.cpp:<line number>
+Tricky.tests.cpp:<line number>
 ...............................................................................
 
-TrickyTests.cpp:<line number>:
+Tricky.tests.cpp:<line number>:
 PASSED:
 
 -------------------------------------------------------------------------------
 X/level/1/a
 -------------------------------------------------------------------------------
-TrickyTests.cpp:<line number>
+Tricky.tests.cpp:<line number>
 ...............................................................................
 
-TrickyTests.cpp:<line number>:
+Tricky.tests.cpp:<line number>:
 PASSED:
 
 -------------------------------------------------------------------------------
 X/level/1/b
 -------------------------------------------------------------------------------
-TrickyTests.cpp:<line number>
+Tricky.tests.cpp:<line number>
 ...............................................................................
 
-TrickyTests.cpp:<line number>:
+Tricky.tests.cpp:<line number>:
 PASSED:
 
 -------------------------------------------------------------------------------
 XmlEncode
   normal string
 -------------------------------------------------------------------------------
-XmlTests.cpp:<line number>
+Xml.tests.cpp:<line number>
 ...............................................................................
 
-XmlTests.cpp:<line number>:
+Xml.tests.cpp:<line number>:
 PASSED:
   REQUIRE( encode( "normal string" ) == "normal string" )
 with expansion:
@@ -6683,10 +6683,10 @@ with expansion:
 XmlEncode
   empty string
 -------------------------------------------------------------------------------
-XmlTests.cpp:<line number>
+Xml.tests.cpp:<line number>
 ...............................................................................
 
-XmlTests.cpp:<line number>:
+Xml.tests.cpp:<line number>:
 PASSED:
   REQUIRE( encode( "" ) == "" )
 with expansion:
@@ -6696,10 +6696,10 @@ with expansion:
 XmlEncode
   string with ampersand
 -------------------------------------------------------------------------------
-XmlTests.cpp:<line number>
+Xml.tests.cpp:<line number>
 ...............................................................................
 
-XmlTests.cpp:<line number>:
+Xml.tests.cpp:<line number>:
 PASSED:
   REQUIRE( encode( "smith & jones" ) == "smith &amp; jones" )
 with expansion:
@@ -6709,10 +6709,10 @@ with expansion:
 XmlEncode
   string with less-than
 -------------------------------------------------------------------------------
-XmlTests.cpp:<line number>
+Xml.tests.cpp:<line number>
 ...............................................................................
 
-XmlTests.cpp:<line number>:
+Xml.tests.cpp:<line number>:
 PASSED:
   REQUIRE( encode( "smith < jones" ) == "smith &lt; jones" )
 with expansion:
@@ -6722,16 +6722,16 @@ with expansion:
 XmlEncode
   string with greater-than
 -------------------------------------------------------------------------------
-XmlTests.cpp:<line number>
+Xml.tests.cpp:<line number>
 ...............................................................................
 
-XmlTests.cpp:<line number>:
+Xml.tests.cpp:<line number>:
 PASSED:
   REQUIRE( encode( "smith > jones" ) == "smith > jones" )
 with expansion:
   "smith > jones" == "smith > jones"
 
-XmlTests.cpp:<line number>:
+Xml.tests.cpp:<line number>:
 PASSED:
   REQUIRE( encode( "smith ]]> jones" ) == "smith ]]&gt; jones" )
 with expansion:
@@ -6743,10 +6743,10 @@ with expansion:
 XmlEncode
   string with quotes
 -------------------------------------------------------------------------------
-XmlTests.cpp:<line number>
+Xml.tests.cpp:<line number>
 ...............................................................................
 
-XmlTests.cpp:<line number>:
+Xml.tests.cpp:<line number>:
 PASSED:
   REQUIRE( encode( stringWithQuotes ) == stringWithQuotes )
 with expansion:
@@ -6754,7 +6754,7 @@ with expansion:
   ==
   "don't "quote" me on that"
 
-XmlTests.cpp:<line number>:
+Xml.tests.cpp:<line number>:
 PASSED:
   REQUIRE( encode( stringWithQuotes, Catch::XmlEncode::ForAttributes ) == "don't &quot;quote&quot; me on that" )
 with expansion:
@@ -6766,10 +6766,10 @@ with expansion:
 XmlEncode
   string with control char (1)
 -------------------------------------------------------------------------------
-XmlTests.cpp:<line number>
+Xml.tests.cpp:<line number>
 ...............................................................................
 
-XmlTests.cpp:<line number>:
+Xml.tests.cpp:<line number>:
 PASSED:
   REQUIRE( encode( "[\x01]" ) == "[\\x01]" )
 with expansion:
@@ -6779,10 +6779,10 @@ with expansion:
 XmlEncode
   string with control char (x7F)
 -------------------------------------------------------------------------------
-XmlTests.cpp:<line number>
+Xml.tests.cpp:<line number>
 ...............................................................................
 
-XmlTests.cpp:<line number>:
+Xml.tests.cpp:<line number>:
 PASSED:
   REQUIRE( encode( "[\x7F]" ) == "[\\x7F]" )
 with expansion:
@@ -6791,10 +6791,10 @@ with expansion:
 -------------------------------------------------------------------------------
 atomic if
 -------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
+Misc.tests.cpp:<line number>
 ...............................................................................
 
-MiscTests.cpp:<line number>:
+Misc.tests.cpp:<line number>:
 PASSED:
   REQUIRE( x == 0 )
 with expansion:
@@ -6803,10 +6803,10 @@ with expansion:
 -------------------------------------------------------------------------------
 boolean member
 -------------------------------------------------------------------------------
-TrickyTests.cpp:<line number>
+Tricky.tests.cpp:<line number>
 ...............................................................................
 
-TrickyTests.cpp:<line number>:
+Tricky.tests.cpp:<line number>:
 PASSED:
   REQUIRE( obj.prop != 0 )
 with expansion:
@@ -6815,16 +6815,16 @@ with expansion:
 -------------------------------------------------------------------------------
 checkedElse
 -------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
+Misc.tests.cpp:<line number>
 ...............................................................................
 
-MiscTests.cpp:<line number>:
+Misc.tests.cpp:<line number>:
 PASSED:
   CHECKED_ELSE( flag )
 with expansion:
   true
 
-MiscTests.cpp:<line number>:
+Misc.tests.cpp:<line number>:
 PASSED:
   REQUIRE( testCheckedElse( true ) )
 with expansion:
@@ -6833,15 +6833,15 @@ with expansion:
 -------------------------------------------------------------------------------
 checkedElse, failing
 -------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
+Misc.tests.cpp:<line number>
 ...............................................................................
 
-MiscTests.cpp:<line number>: FAILED:
+Misc.tests.cpp:<line number>: FAILED:
   CHECKED_ELSE( flag )
 with expansion:
   false
 
-MiscTests.cpp:<line number>: FAILED:
+Misc.tests.cpp:<line number>: FAILED:
   REQUIRE( testCheckedElse( false ) )
 with expansion:
   false
@@ -6849,16 +6849,16 @@ with expansion:
 -------------------------------------------------------------------------------
 checkedIf
 -------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
+Misc.tests.cpp:<line number>
 ...............................................................................
 
-MiscTests.cpp:<line number>:
+Misc.tests.cpp:<line number>:
 PASSED:
   CHECKED_IF( flag )
 with expansion:
   true
 
-MiscTests.cpp:<line number>:
+Misc.tests.cpp:<line number>:
 PASSED:
   REQUIRE( testCheckedIf( true ) )
 with expansion:
@@ -6867,15 +6867,15 @@ with expansion:
 -------------------------------------------------------------------------------
 checkedIf, failing
 -------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
+Misc.tests.cpp:<line number>
 ...............................................................................
 
-MiscTests.cpp:<line number>: FAILED:
+Misc.tests.cpp:<line number>: FAILED:
   CHECKED_IF( flag )
 with expansion:
   false
 
-MiscTests.cpp:<line number>: FAILED:
+Misc.tests.cpp:<line number>: FAILED:
   REQUIRE( testCheckedIf( false ) )
 with expansion:
   false
@@ -6883,28 +6883,28 @@ with expansion:
 -------------------------------------------------------------------------------
 comparisons between const int variables
 -------------------------------------------------------------------------------
-ConditionTests.cpp:<line number>
+Condition.tests.cpp:<line number>
 ...............................................................................
 
-ConditionTests.cpp:<line number>:
+Condition.tests.cpp:<line number>:
 PASSED:
   REQUIRE( unsigned_char_var == 1 )
 with expansion:
   1 == 1
 
-ConditionTests.cpp:<line number>:
+Condition.tests.cpp:<line number>:
 PASSED:
   REQUIRE( unsigned_short_var == 1 )
 with expansion:
   1 == 1
 
-ConditionTests.cpp:<line number>:
+Condition.tests.cpp:<line number>:
 PASSED:
   REQUIRE( unsigned_int_var == 1 )
 with expansion:
   1 == 1
 
-ConditionTests.cpp:<line number>:
+Condition.tests.cpp:<line number>:
 PASSED:
   REQUIRE( unsigned_long_var == 1 )
 with expansion:
@@ -6913,28 +6913,28 @@ with expansion:
 -------------------------------------------------------------------------------
 comparisons between int variables
 -------------------------------------------------------------------------------
-ConditionTests.cpp:<line number>
+Condition.tests.cpp:<line number>
 ...............................................................................
 
-ConditionTests.cpp:<line number>:
+Condition.tests.cpp:<line number>:
 PASSED:
   REQUIRE( long_var == unsigned_char_var )
 with expansion:
   1 == 1
 
-ConditionTests.cpp:<line number>:
+Condition.tests.cpp:<line number>:
 PASSED:
   REQUIRE( long_var == unsigned_short_var )
 with expansion:
   1 == 1
 
-ConditionTests.cpp:<line number>:
+Condition.tests.cpp:<line number>:
 PASSED:
   REQUIRE( long_var == unsigned_int_var )
 with expansion:
   1 == 1
 
-ConditionTests.cpp:<line number>:
+Condition.tests.cpp:<line number>:
 PASSED:
   REQUIRE( long_var == unsigned_long_var )
 with expansion:
@@ -6945,10 +6945,10 @@ even more nested SECTION tests
   c
   d (leaf)
 -------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
+Misc.tests.cpp:<line number>
 ...............................................................................
 
-MiscTests.cpp:<line number>:
+Misc.tests.cpp:<line number>:
 PASSED:
 
 -------------------------------------------------------------------------------
@@ -6956,40 +6956,40 @@ even more nested SECTION tests
   c
   e (leaf)
 -------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
+Misc.tests.cpp:<line number>
 ...............................................................................
 
-MiscTests.cpp:<line number>:
+Misc.tests.cpp:<line number>:
 PASSED:
 
 -------------------------------------------------------------------------------
 even more nested SECTION tests
   f (leaf)
 -------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
+Misc.tests.cpp:<line number>
 ...............................................................................
 
-MiscTests.cpp:<line number>:
+Misc.tests.cpp:<line number>:
 PASSED:
 
 loose text artifact
 -------------------------------------------------------------------------------
 just failure
 -------------------------------------------------------------------------------
-MessageTests.cpp:<line number>
+Message.tests.cpp:<line number>
 ...............................................................................
 
-MessageTests.cpp:<line number>: FAILED:
+Message.tests.cpp:<line number>: FAILED:
 explicitly with message:
   Previous info should not be seen
 
 -------------------------------------------------------------------------------
 long long
 -------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
+Misc.tests.cpp:<line number>
 ...............................................................................
 
-MiscTests.cpp:<line number>:
+Misc.tests.cpp:<line number>:
 PASSED:
   REQUIRE( l == std::numeric_limits<long long>::max() )
 with expansion:
@@ -7001,10 +7001,10 @@ with expansion:
 looped SECTION tests
   s1
 -------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
+Misc.tests.cpp:<line number>
 ...............................................................................
 
-MiscTests.cpp:<line number>: FAILED:
+Misc.tests.cpp:<line number>: FAILED:
   CHECK( b > a )
 with expansion:
   0 > 1
@@ -7012,24 +7012,24 @@ with expansion:
 -------------------------------------------------------------------------------
 looped tests
 -------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
+Misc.tests.cpp:<line number>
 ...............................................................................
 
-MiscTests.cpp:<line number>: FAILED:
+Misc.tests.cpp:<line number>: FAILED:
   CHECK( ( fib[i] % 2 ) == 0 )
 with expansion:
   1 == 0
 with message:
   Testing if fib[0] (1) is even
 
-MiscTests.cpp:<line number>: FAILED:
+Misc.tests.cpp:<line number>: FAILED:
   CHECK( ( fib[i] % 2 ) == 0 )
 with expansion:
   1 == 0
 with message:
   Testing if fib[1] (1) is even
 
-MiscTests.cpp:<line number>:
+Misc.tests.cpp:<line number>:
 PASSED:
   CHECK( ( fib[i] % 2 ) == 0 )
 with expansion:
@@ -7037,21 +7037,21 @@ with expansion:
 with message:
   Testing if fib[2] (2) is even
 
-MiscTests.cpp:<line number>: FAILED:
+Misc.tests.cpp:<line number>: FAILED:
   CHECK( ( fib[i] % 2 ) == 0 )
 with expansion:
   1 == 0
 with message:
   Testing if fib[3] (3) is even
 
-MiscTests.cpp:<line number>: FAILED:
+Misc.tests.cpp:<line number>: FAILED:
   CHECK( ( fib[i] % 2 ) == 0 )
 with expansion:
   1 == 0
 with message:
   Testing if fib[4] (5) is even
 
-MiscTests.cpp:<line number>:
+Misc.tests.cpp:<line number>:
 PASSED:
   CHECK( ( fib[i] % 2 ) == 0 )
 with expansion:
@@ -7059,14 +7059,14 @@ with expansion:
 with message:
   Testing if fib[5] (8) is even
 
-MiscTests.cpp:<line number>: FAILED:
+Misc.tests.cpp:<line number>: FAILED:
   CHECK( ( fib[i] % 2 ) == 0 )
 with expansion:
   1 == 0
 with message:
   Testing if fib[6] (13) is even
 
-MiscTests.cpp:<line number>: FAILED:
+Misc.tests.cpp:<line number>: FAILED:
   CHECK( ( fib[i] % 2 ) == 0 )
 with expansion:
   1 == 0
@@ -7078,10 +7078,10 @@ more nested SECTION tests
   s1
   s2
 -------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
+Misc.tests.cpp:<line number>
 ...............................................................................
 
-MiscTests.cpp:<line number>: FAILED:
+Misc.tests.cpp:<line number>: FAILED:
   REQUIRE( a == b )
 with expansion:
   1 == 2
@@ -7091,10 +7091,10 @@ more nested SECTION tests
   s1
   s3
 -------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
+Misc.tests.cpp:<line number>
 ...............................................................................
 
-MiscTests.cpp:<line number>:
+Misc.tests.cpp:<line number>:
 PASSED:
   REQUIRE( a != b )
 with expansion:
@@ -7105,10 +7105,10 @@ more nested SECTION tests
   s1
   s4
 -------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
+Misc.tests.cpp:<line number>
 ...............................................................................
 
-MiscTests.cpp:<line number>:
+Misc.tests.cpp:<line number>:
 PASSED:
   REQUIRE( a < b )
 with expansion:
@@ -7118,16 +7118,16 @@ with expansion:
 nested SECTION tests
   s1
 -------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
+Misc.tests.cpp:<line number>
 ...............................................................................
 
-MiscTests.cpp:<line number>:
+Misc.tests.cpp:<line number>:
 PASSED:
   REQUIRE( a != b )
 with expansion:
   1 != 2
 
-MiscTests.cpp:<line number>:
+Misc.tests.cpp:<line number>:
 PASSED:
   REQUIRE( b != a )
 with expansion:
@@ -7138,10 +7138,10 @@ nested SECTION tests
   s1
   s2
 -------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
+Misc.tests.cpp:<line number>
 ...............................................................................
 
-MiscTests.cpp:<line number>:
+Misc.tests.cpp:<line number>:
 PASSED:
   REQUIRE( a != b )
 with expansion:
@@ -7150,10 +7150,10 @@ with expansion:
 -------------------------------------------------------------------------------
 non streamable - with conv. op
 -------------------------------------------------------------------------------
-TrickyTests.cpp:<line number>
+Tricky.tests.cpp:<line number>
 ...............................................................................
 
-TrickyTests.cpp:<line number>:
+Tricky.tests.cpp:<line number>:
 PASSED:
   REQUIRE( s == "7" )
 with expansion:
@@ -7162,10 +7162,10 @@ with expansion:
 -------------------------------------------------------------------------------
 non-copyable objects
 -------------------------------------------------------------------------------
-TrickyTests.cpp:<line number>
+Tricky.tests.cpp:<line number>
 ...............................................................................
 
-TrickyTests.cpp:<line number>:
+Tricky.tests.cpp:<line number>:
 PASSED:
   CHECK( ti == typeid(int) )
 with expansion:
@@ -7174,25 +7174,25 @@ with expansion:
 -------------------------------------------------------------------------------
 not allowed
 -------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
+Misc.tests.cpp:<line number>
 ...............................................................................
 
-MiscTests.cpp:<line number>:
+Misc.tests.cpp:<line number>:
 PASSED:
 
 -------------------------------------------------------------------------------
 null strings
 -------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
+Misc.tests.cpp:<line number>
 ...............................................................................
 
-MiscTests.cpp:<line number>:
+Misc.tests.cpp:<line number>:
 PASSED:
   REQUIRE( makeString( false ) != static_cast<char*>(0) )
 with expansion:
   "valid string" != {null string}
 
-MiscTests.cpp:<line number>:
+Misc.tests.cpp:<line number>:
 PASSED:
   REQUIRE( makeString( true ) == static_cast<char*>(0) )
 with expansion:
@@ -7201,10 +7201,10 @@ with expansion:
 -------------------------------------------------------------------------------
 null_ptr
 -------------------------------------------------------------------------------
-TrickyTests.cpp:<line number>
+Tricky.tests.cpp:<line number>
 ...............................................................................
 
-TrickyTests.cpp:<line number>:
+Tricky.tests.cpp:<line number>:
 PASSED:
   REQUIRE( ptr.get() == 0 )
 with expansion:
@@ -7213,10 +7213,10 @@ with expansion:
 -------------------------------------------------------------------------------
 pair<pair<int,const char *,pair<std::string,int> > -> toString
 -------------------------------------------------------------------------------
-ToStringPair.cpp:<line number>
+ToStringPair.tests.cpp:<line number>
 ...............................................................................
 
-ToStringPair.cpp:<line number>:
+ToStringPair.tests.cpp:<line number>:
 PASSED:
   REQUIRE( ::Catch::Detail::stringify( pair ) == "{ { 42, \"Arthur\" }, { \"Ford\", 24 } }" )
 with expansion:
@@ -7227,10 +7227,10 @@ with expansion:
 -------------------------------------------------------------------------------
 pointer to class
 -------------------------------------------------------------------------------
-TrickyTests.cpp:<line number>
+Tricky.tests.cpp:<line number>
 ...............................................................................
 
-TrickyTests.cpp:<line number>:
+Tricky.tests.cpp:<line number>:
 PASSED:
   REQUIRE( p == 0 )
 with expansion:
@@ -7240,16 +7240,16 @@ with expansion:
 random SECTION tests
   s1
 -------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
+Misc.tests.cpp:<line number>
 ...............................................................................
 
-MiscTests.cpp:<line number>:
+Misc.tests.cpp:<line number>:
 PASSED:
   REQUIRE( a != b )
 with expansion:
   1 != 2
 
-MiscTests.cpp:<line number>:
+Misc.tests.cpp:<line number>:
 PASSED:
   REQUIRE( b != a )
 with expansion:
@@ -7259,10 +7259,10 @@ with expansion:
 random SECTION tests
   s2
 -------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
+Misc.tests.cpp:<line number>
 ...............................................................................
 
-MiscTests.cpp:<line number>:
+Misc.tests.cpp:<line number>:
 PASSED:
   REQUIRE( a != b )
 with expansion:
@@ -7272,16 +7272,16 @@ with expansion:
 replaceInPlace
   replace single char
 -------------------------------------------------------------------------------
-TestMain.cpp:<line number>
+String.tests.cpp:<line number>
 ...............................................................................
 
-TestMain.cpp:<line number>:
+String.tests.cpp:<line number>:
 PASSED:
   CHECK( Catch::replaceInPlace( letters, "b", "z" ) )
 with expansion:
   true
 
-TestMain.cpp:<line number>:
+String.tests.cpp:<line number>:
 PASSED:
   CHECK( letters == "azcdefcg" )
 with expansion:
@@ -7291,16 +7291,16 @@ with expansion:
 replaceInPlace
   replace two chars
 -------------------------------------------------------------------------------
-TestMain.cpp:<line number>
+String.tests.cpp:<line number>
 ...............................................................................
 
-TestMain.cpp:<line number>:
+String.tests.cpp:<line number>:
 PASSED:
   CHECK( Catch::replaceInPlace( letters, "c", "z" ) )
 with expansion:
   true
 
-TestMain.cpp:<line number>:
+String.tests.cpp:<line number>:
 PASSED:
   CHECK( letters == "abzdefzg" )
 with expansion:
@@ -7310,16 +7310,16 @@ with expansion:
 replaceInPlace
   replace first char
 -------------------------------------------------------------------------------
-TestMain.cpp:<line number>
+String.tests.cpp:<line number>
 ...............................................................................
 
-TestMain.cpp:<line number>:
+String.tests.cpp:<line number>:
 PASSED:
   CHECK( Catch::replaceInPlace( letters, "a", "z" ) )
 with expansion:
   true
 
-TestMain.cpp:<line number>:
+String.tests.cpp:<line number>:
 PASSED:
   CHECK( letters == "zbcdefcg" )
 with expansion:
@@ -7329,16 +7329,16 @@ with expansion:
 replaceInPlace
   replace last char
 -------------------------------------------------------------------------------
-TestMain.cpp:<line number>
+String.tests.cpp:<line number>
 ...............................................................................
 
-TestMain.cpp:<line number>:
+String.tests.cpp:<line number>:
 PASSED:
   CHECK( Catch::replaceInPlace( letters, "g", "z" ) )
 with expansion:
   true
 
-TestMain.cpp:<line number>:
+String.tests.cpp:<line number>:
 PASSED:
   CHECK( letters == "abcdefcz" )
 with expansion:
@@ -7348,16 +7348,16 @@ with expansion:
 replaceInPlace
   replace all chars
 -------------------------------------------------------------------------------
-TestMain.cpp:<line number>
+String.tests.cpp:<line number>
 ...............................................................................
 
-TestMain.cpp:<line number>:
+String.tests.cpp:<line number>:
 PASSED:
   CHECK( Catch::replaceInPlace( letters, letters, "replaced" ) )
 with expansion:
   true
 
-TestMain.cpp:<line number>:
+String.tests.cpp:<line number>:
 PASSED:
   CHECK( letters == "replaced" )
 with expansion:
@@ -7367,16 +7367,16 @@ with expansion:
 replaceInPlace
   replace no chars
 -------------------------------------------------------------------------------
-TestMain.cpp:<line number>
+String.tests.cpp:<line number>
 ...............................................................................
 
-TestMain.cpp:<line number>:
+String.tests.cpp:<line number>:
 PASSED:
   CHECK_FALSE( Catch::replaceInPlace( letters, "x", "z" ) )
 with expansion:
   !false
 
-TestMain.cpp:<line number>:
+String.tests.cpp:<line number>:
 PASSED:
   CHECK( letters == letters )
 with expansion:
@@ -7386,16 +7386,16 @@ with expansion:
 replaceInPlace
   escape '
 -------------------------------------------------------------------------------
-TestMain.cpp:<line number>
+String.tests.cpp:<line number>
 ...............................................................................
 
-TestMain.cpp:<line number>:
+String.tests.cpp:<line number>:
 PASSED:
   CHECK( Catch::replaceInPlace( s, "'", "|'" ) )
 with expansion:
   true
 
-TestMain.cpp:<line number>:
+String.tests.cpp:<line number>:
 PASSED:
   CHECK( s == "didn|'t" )
 with expansion:
@@ -7404,10 +7404,10 @@ with expansion:
 -------------------------------------------------------------------------------
 send a single char to INFO
 -------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
+Misc.tests.cpp:<line number>
 ...............................................................................
 
-MiscTests.cpp:<line number>: FAILED:
+Misc.tests.cpp:<line number>: FAILED:
   REQUIRE( false )
 with message:
   3
@@ -7415,10 +7415,10 @@ with message:
 -------------------------------------------------------------------------------
 sends information to INFO
 -------------------------------------------------------------------------------
-MessageTests.cpp:<line number>
+Message.tests.cpp:<line number>
 ...............................................................................
 
-MessageTests.cpp:<line number>: FAILED:
+Message.tests.cpp:<line number>: FAILED:
   REQUIRE( false )
 with messages:
   hi
@@ -7427,10 +7427,10 @@ with messages:
 -------------------------------------------------------------------------------
 std::pair<int,const std::string> -> toString
 -------------------------------------------------------------------------------
-ToStringPair.cpp:<line number>
+ToStringPair.tests.cpp:<line number>
 ...............................................................................
 
-ToStringPair.cpp:<line number>:
+ToStringPair.tests.cpp:<line number>:
 PASSED:
   REQUIRE( ::Catch::Detail::stringify(value) == "{ 34, \"xyzzy\" }" )
 with expansion:
@@ -7439,10 +7439,10 @@ with expansion:
 -------------------------------------------------------------------------------
 std::pair<int,std::string> -> toString
 -------------------------------------------------------------------------------
-ToStringPair.cpp:<line number>
+ToStringPair.tests.cpp:<line number>
 ...............................................................................
 
-ToStringPair.cpp:<line number>:
+ToStringPair.tests.cpp:<line number>:
 PASSED:
   REQUIRE( ::Catch::Detail::stringify( value ) == "{ 34, \"xyzzy\" }" )
 with expansion:
@@ -7451,10 +7451,10 @@ with expansion:
 -------------------------------------------------------------------------------
 std::vector<std::pair<std::string,int> > -> toString
 -------------------------------------------------------------------------------
-ToStringPair.cpp:<line number>
+ToStringPair.tests.cpp:<line number>
 ...............................................................................
 
-ToStringPair.cpp:<line number>:
+ToStringPair.tests.cpp:<line number>:
 PASSED:
   REQUIRE( ::Catch::Detail::stringify( pr ) == "{ { \"green\", 55 } }" )
 with expansion:
@@ -7465,10 +7465,10 @@ with expansion:
 -------------------------------------------------------------------------------
 string literals of different sizes can be compared
 -------------------------------------------------------------------------------
-TrickyTests.cpp:<line number>
+Tricky.tests.cpp:<line number>
 ...............................................................................
 
-TrickyTests.cpp:<line number>: FAILED:
+Tricky.tests.cpp:<line number>: FAILED:
   REQUIRE( std::string( "first" ) == "second" )
 with expansion:
   "first" == "second"
@@ -7476,10 +7476,10 @@ with expansion:
 -------------------------------------------------------------------------------
 stringify( has_maker )
 -------------------------------------------------------------------------------
-ToStringWhich.cpp:<line number>
+ToStringWhich.tests.cpp:<line number>
 ...............................................................................
 
-ToStringWhich.cpp:<line number>:
+ToStringWhich.tests.cpp:<line number>:
 PASSED:
   REQUIRE( ::Catch::Detail::stringify( item ) == "StringMaker<has_maker>" )
 with expansion:
@@ -7490,10 +7490,10 @@ with expansion:
 -------------------------------------------------------------------------------
 stringify( has_maker_and_toString )
 -------------------------------------------------------------------------------
-ToStringWhich.cpp:<line number>
+ToStringWhich.tests.cpp:<line number>
 ...............................................................................
 
-ToStringWhich.cpp:<line number>:
+ToStringWhich.tests.cpp:<line number>:
 PASSED:
   REQUIRE( ::Catch::Detail::stringify( item ) == "StringMaker<has_maker_and_operator>" )
 with expansion:
@@ -7504,10 +7504,10 @@ with expansion:
 -------------------------------------------------------------------------------
 stringify( has_operator )
 -------------------------------------------------------------------------------
-ToStringWhich.cpp:<line number>
+ToStringWhich.tests.cpp:<line number>
 ...............................................................................
 
-ToStringWhich.cpp:<line number>:
+ToStringWhich.tests.cpp:<line number>:
 PASSED:
   REQUIRE( ::Catch::Detail::stringify( item ) == "operator<<( has_operator )" )
 with expansion:
@@ -7518,10 +7518,10 @@ with expansion:
 -------------------------------------------------------------------------------
 toString on const wchar_t const pointer returns the string contents
 -------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
+Misc.tests.cpp:<line number>
 ...............................................................................
 
-MiscTests.cpp:<line number>:
+Misc.tests.cpp:<line number>:
 PASSED:
   CHECK( result == "\"wide load\"" )
 with expansion:
@@ -7530,10 +7530,10 @@ with expansion:
 -------------------------------------------------------------------------------
 toString on const wchar_t pointer returns the string contents
 -------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
+Misc.tests.cpp:<line number>
 ...............................................................................
 
-MiscTests.cpp:<line number>:
+Misc.tests.cpp:<line number>:
 PASSED:
   CHECK( result == "\"wide load\"" )
 with expansion:
@@ -7542,10 +7542,10 @@ with expansion:
 -------------------------------------------------------------------------------
 toString on wchar_t const pointer returns the string contents
 -------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
+Misc.tests.cpp:<line number>
 ...............................................................................
 
-MiscTests.cpp:<line number>:
+Misc.tests.cpp:<line number>:
 PASSED:
   CHECK( result == "\"wide load\"" )
 with expansion:
@@ -7554,10 +7554,10 @@ with expansion:
 -------------------------------------------------------------------------------
 toString on wchar_t returns the string contents
 -------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
+Misc.tests.cpp:<line number>
 ...............................................................................
 
-MiscTests.cpp:<line number>:
+Misc.tests.cpp:<line number>:
 PASSED:
   CHECK( result == "\"wide load\"" )
 with expansion:
@@ -7566,10 +7566,10 @@ with expansion:
 -------------------------------------------------------------------------------
 toString( vectors<has_maker )
 -------------------------------------------------------------------------------
-ToStringWhich.cpp:<line number>
+ToStringWhich.tests.cpp:<line number>
 ...............................................................................
 
-ToStringWhich.cpp:<line number>:
+ToStringWhich.tests.cpp:<line number>:
 PASSED:
   REQUIRE( ::Catch::Detail::stringify( v ) == "{ StringMaker<has_maker> }" )
 with expansion:
@@ -7580,22 +7580,22 @@ with expansion:
 -------------------------------------------------------------------------------
 toString(enum class w/operator<<)
 -------------------------------------------------------------------------------
-EnumToString.cpp:<line number>
+EnumToString.tests.cpp:<line number>
 ...............................................................................
 
-EnumToString.cpp:<line number>:
+EnumToString.tests.cpp:<line number>:
 PASSED:
   CHECK( ::Catch::Detail::stringify(e0) == "E2/V0" )
 with expansion:
   "E2/V0" == "E2/V0"
 
-EnumToString.cpp:<line number>:
+EnumToString.tests.cpp:<line number>:
 PASSED:
   CHECK( ::Catch::Detail::stringify(e1) == "E2/V1" )
 with expansion:
   "E2/V1" == "E2/V1"
 
-EnumToString.cpp:<line number>:
+EnumToString.tests.cpp:<line number>:
 PASSED:
   CHECK( ::Catch::Detail::stringify(e3) == "Unknown enum value 10" )
 with expansion:
@@ -7606,15 +7606,15 @@ with expansion:
 -------------------------------------------------------------------------------
 toString(enum class)
 -------------------------------------------------------------------------------
-EnumToString.cpp:<line number>
+EnumToString.tests.cpp:<line number>
 ...............................................................................
 
-EnumToString.cpp:<line number>: FAILED:
+EnumToString.tests.cpp:<line number>: FAILED:
   CHECK( ::Catch::Detail::stringify(e0) == "0" )
 with expansion:
   "{?}" == "0"
 
-EnumToString.cpp:<line number>: FAILED:
+EnumToString.tests.cpp:<line number>: FAILED:
   CHECK( ::Catch::Detail::stringify(e1) == "1" )
 with expansion:
   "{?}" == "1"
@@ -7622,16 +7622,16 @@ with expansion:
 -------------------------------------------------------------------------------
 toString(enum w/operator<<)
 -------------------------------------------------------------------------------
-EnumToString.cpp:<line number>
+EnumToString.tests.cpp:<line number>
 ...............................................................................
 
-EnumToString.cpp:<line number>:
+EnumToString.tests.cpp:<line number>:
 PASSED:
   CHECK( ::Catch::Detail::stringify(e0) == "E2{0}" )
 with expansion:
   "E2{0}" == "E2{0}"
 
-EnumToString.cpp:<line number>:
+EnumToString.tests.cpp:<line number>:
 PASSED:
   CHECK( ::Catch::Detail::stringify(e1) == "E2{1}" )
 with expansion:
@@ -7640,16 +7640,16 @@ with expansion:
 -------------------------------------------------------------------------------
 toString(enum)
 -------------------------------------------------------------------------------
-EnumToString.cpp:<line number>
+EnumToString.tests.cpp:<line number>
 ...............................................................................
 
-EnumToString.cpp:<line number>:
+EnumToString.tests.cpp:<line number>:
 PASSED:
   CHECK( ::Catch::Detail::stringify(e0) == "0" )
 with expansion:
   "0" == "0"
 
-EnumToString.cpp:<line number>:
+EnumToString.tests.cpp:<line number>:
 PASSED:
   CHECK( ::Catch::Detail::stringify(e1) == "1" )
 with expansion:
@@ -7658,16 +7658,16 @@ with expansion:
 -------------------------------------------------------------------------------
 tuple<>
 -------------------------------------------------------------------------------
-ToStringTuple.cpp:<line number>
+ToStringTuple.tests.cpp:<line number>
 ...............................................................................
 
-ToStringTuple.cpp:<line number>:
+ToStringTuple.tests.cpp:<line number>:
 PASSED:
   CHECK( "{ }" == ::Catch::Detail::stringify(type{}) )
 with expansion:
   "{ }" == "{ }"
 
-ToStringTuple.cpp:<line number>:
+ToStringTuple.tests.cpp:<line number>:
 PASSED:
   CHECK( "{ }" == ::Catch::Detail::stringify(value) )
 with expansion:
@@ -7676,16 +7676,16 @@ with expansion:
 -------------------------------------------------------------------------------
 tuple<float,int>
 -------------------------------------------------------------------------------
-ToStringTuple.cpp:<line number>
+ToStringTuple.tests.cpp:<line number>
 ...............................................................................
 
-ToStringTuple.cpp:<line number>:
+ToStringTuple.tests.cpp:<line number>:
 PASSED:
   CHECK( "1.2f" == ::Catch::Detail::stringify(float(1.2)) )
 with expansion:
   "1.2f" == "1.2f"
 
-ToStringTuple.cpp:<line number>:
+ToStringTuple.tests.cpp:<line number>:
 PASSED:
   CHECK( "{ 1.2f, 0 }" == ::Catch::Detail::stringify(type{1.2f,0}) )
 with expansion:
@@ -7694,10 +7694,10 @@ with expansion:
 -------------------------------------------------------------------------------
 tuple<int>
 -------------------------------------------------------------------------------
-ToStringTuple.cpp:<line number>
+ToStringTuple.tests.cpp:<line number>
 ...............................................................................
 
-ToStringTuple.cpp:<line number>:
+ToStringTuple.tests.cpp:<line number>:
 PASSED:
   CHECK( "{ 0 }" == ::Catch::Detail::stringify(type{0}) )
 with expansion:
@@ -7706,10 +7706,10 @@ with expansion:
 -------------------------------------------------------------------------------
 tuple<0,int,const char *>
 -------------------------------------------------------------------------------
-ToStringTuple.cpp:<line number>
+ToStringTuple.tests.cpp:<line number>
 ...............................................................................
 
-ToStringTuple.cpp:<line number>:
+ToStringTuple.tests.cpp:<line number>:
 PASSED:
   CHECK( "{ 0, 42, \"Catch me\" }" == ::Catch::Detail::stringify(value) )
 with expansion:
@@ -7720,10 +7720,10 @@ with expansion:
 -------------------------------------------------------------------------------
 tuple<string,string>
 -------------------------------------------------------------------------------
-ToStringTuple.cpp:<line number>
+ToStringTuple.tests.cpp:<line number>
 ...............................................................................
 
-ToStringTuple.cpp:<line number>:
+ToStringTuple.tests.cpp:<line number>:
 PASSED:
   CHECK( "{ \"hello\", \"world\" }" == ::Catch::Detail::stringify(type{"hello","world"}) )
 with expansion:
@@ -7734,10 +7734,10 @@ with expansion:
 -------------------------------------------------------------------------------
 tuple<tuple<int>,tuple<>,float>
 -------------------------------------------------------------------------------
-ToStringTuple.cpp:<line number>
+ToStringTuple.tests.cpp:<line number>
 ...............................................................................
 
-ToStringTuple.cpp:<line number>:
+ToStringTuple.tests.cpp:<line number>:
 PASSED:
   CHECK( "{ { 42 }, { }, 1.2f }" == ::Catch::Detail::stringify(value) )
 with expansion:
@@ -7748,16 +7748,16 @@ with expansion:
 -------------------------------------------------------------------------------
 vec<vec<string,alloc>> -> toString
 -------------------------------------------------------------------------------
-ToStringVector.cpp:<line number>
+ToStringVector.tests.cpp:<line number>
 ...............................................................................
 
-ToStringVector.cpp:<line number>:
+ToStringVector.tests.cpp:<line number>:
 PASSED:
   REQUIRE( ::Catch::Detail::stringify(v) == "{  }" )
 with expansion:
   "{  }" == "{  }"
 
-ToStringVector.cpp:<line number>:
+ToStringVector.tests.cpp:<line number>:
 PASSED:
   REQUIRE( ::Catch::Detail::stringify(v) == "{ { \"hello\" }, { \"world\" } }" )
 with expansion:
@@ -7768,22 +7768,22 @@ with expansion:
 -------------------------------------------------------------------------------
 vector<int,allocator> -> toString
 -------------------------------------------------------------------------------
-ToStringVector.cpp:<line number>
+ToStringVector.tests.cpp:<line number>
 ...............................................................................
 
-ToStringVector.cpp:<line number>:
+ToStringVector.tests.cpp:<line number>:
 PASSED:
   REQUIRE( ::Catch::Detail::stringify(vv) == "{  }" )
 with expansion:
   "{  }" == "{  }"
 
-ToStringVector.cpp:<line number>:
+ToStringVector.tests.cpp:<line number>:
 PASSED:
   REQUIRE( ::Catch::Detail::stringify(vv) == "{ 42 }" )
 with expansion:
   "{ 42 }" == "{ 42 }"
 
-ToStringVector.cpp:<line number>:
+ToStringVector.tests.cpp:<line number>:
 PASSED:
   REQUIRE( ::Catch::Detail::stringify(vv) == "{ 42, 250 }" )
 with expansion:
@@ -7792,22 +7792,22 @@ with expansion:
 -------------------------------------------------------------------------------
 vector<int> -> toString
 -------------------------------------------------------------------------------
-ToStringVector.cpp:<line number>
+ToStringVector.tests.cpp:<line number>
 ...............................................................................
 
-ToStringVector.cpp:<line number>:
+ToStringVector.tests.cpp:<line number>:
 PASSED:
   REQUIRE( ::Catch::Detail::stringify(vv) == "{  }" )
 with expansion:
   "{  }" == "{  }"
 
-ToStringVector.cpp:<line number>:
+ToStringVector.tests.cpp:<line number>:
 PASSED:
   REQUIRE( ::Catch::Detail::stringify(vv) == "{ 42 }" )
 with expansion:
   "{ 42 }" == "{ 42 }"
 
-ToStringVector.cpp:<line number>:
+ToStringVector.tests.cpp:<line number>:
 PASSED:
   REQUIRE( ::Catch::Detail::stringify(vv) == "{ 42, 250 }" )
 with expansion:
@@ -7816,22 +7816,22 @@ with expansion:
 -------------------------------------------------------------------------------
 vector<string> -> toString
 -------------------------------------------------------------------------------
-ToStringVector.cpp:<line number>
+ToStringVector.tests.cpp:<line number>
 ...............................................................................
 
-ToStringVector.cpp:<line number>:
+ToStringVector.tests.cpp:<line number>:
 PASSED:
   REQUIRE( ::Catch::Detail::stringify(vv) == "{  }" )
 with expansion:
   "{  }" == "{  }"
 
-ToStringVector.cpp:<line number>:
+ToStringVector.tests.cpp:<line number>:
 PASSED:
   REQUIRE( ::Catch::Detail::stringify(vv) == "{ \"hello\" }" )
 with expansion:
   "{ "hello" }" == "{ "hello" }"
 
-ToStringVector.cpp:<line number>:
+ToStringVector.tests.cpp:<line number>:
 PASSED:
   REQUIRE( ::Catch::Detail::stringify(vv) == "{ \"hello\", \"world\" }" )
 with expansion:
@@ -7842,16 +7842,16 @@ with expansion:
 -------------------------------------------------------------------------------
 vectors can be sized and resized
 -------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
+Misc.tests.cpp:<line number>
 ...............................................................................
 
-MiscTests.cpp:<line number>:
+Misc.tests.cpp:<line number>:
 PASSED:
   REQUIRE( v.size() == 5 )
 with expansion:
   5 == 5
 
-MiscTests.cpp:<line number>:
+Misc.tests.cpp:<line number>:
 PASSED:
   REQUIRE( v.capacity() >= 5 )
 with expansion:
@@ -7861,16 +7861,16 @@ with expansion:
 vectors can be sized and resized
   resizing bigger changes size and capacity
 -------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
+Misc.tests.cpp:<line number>
 ...............................................................................
 
-MiscTests.cpp:<line number>:
+Misc.tests.cpp:<line number>:
 PASSED:
   REQUIRE( v.size() == 10 )
 with expansion:
   10 == 10
 
-MiscTests.cpp:<line number>:
+Misc.tests.cpp:<line number>:
 PASSED:
   REQUIRE( v.capacity() >= 10 )
 with expansion:
@@ -7879,16 +7879,16 @@ with expansion:
 -------------------------------------------------------------------------------
 vectors can be sized and resized
 -------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
+Misc.tests.cpp:<line number>
 ...............................................................................
 
-MiscTests.cpp:<line number>:
+Misc.tests.cpp:<line number>:
 PASSED:
   REQUIRE( v.size() == 5 )
 with expansion:
   5 == 5
 
-MiscTests.cpp:<line number>:
+Misc.tests.cpp:<line number>:
 PASSED:
   REQUIRE( v.capacity() >= 5 )
 with expansion:
@@ -7898,16 +7898,16 @@ with expansion:
 vectors can be sized and resized
   resizing smaller changes size but not capacity
 -------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
+Misc.tests.cpp:<line number>
 ...............................................................................
 
-MiscTests.cpp:<line number>:
+Misc.tests.cpp:<line number>:
 PASSED:
   REQUIRE( v.size() == 0 )
 with expansion:
   0 == 0
 
-MiscTests.cpp:<line number>:
+Misc.tests.cpp:<line number>:
 PASSED:
   REQUIRE( v.capacity() >= 5 )
 with expansion:
@@ -7918,10 +7918,10 @@ vectors can be sized and resized
   resizing smaller changes size but not capacity
   We can use the 'swap trick' to reset the capacity
 -------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
+Misc.tests.cpp:<line number>
 ...............................................................................
 
-MiscTests.cpp:<line number>:
+Misc.tests.cpp:<line number>:
 PASSED:
   REQUIRE( v.capacity() == 0 )
 with expansion:
@@ -7930,16 +7930,16 @@ with expansion:
 -------------------------------------------------------------------------------
 vectors can be sized and resized
 -------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
+Misc.tests.cpp:<line number>
 ...............................................................................
 
-MiscTests.cpp:<line number>:
+Misc.tests.cpp:<line number>:
 PASSED:
   REQUIRE( v.size() == 5 )
 with expansion:
   5 == 5
 
-MiscTests.cpp:<line number>:
+Misc.tests.cpp:<line number>:
 PASSED:
   REQUIRE( v.capacity() >= 5 )
 with expansion:
@@ -7949,16 +7949,16 @@ with expansion:
 vectors can be sized and resized
   reserving bigger changes capacity but not size
 -------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
+Misc.tests.cpp:<line number>
 ...............................................................................
 
-MiscTests.cpp:<line number>:
+Misc.tests.cpp:<line number>:
 PASSED:
   REQUIRE( v.size() == 5 )
 with expansion:
   5 == 5
 
-MiscTests.cpp:<line number>:
+Misc.tests.cpp:<line number>:
 PASSED:
   REQUIRE( v.capacity() >= 10 )
 with expansion:
@@ -7967,16 +7967,16 @@ with expansion:
 -------------------------------------------------------------------------------
 vectors can be sized and resized
 -------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
+Misc.tests.cpp:<line number>
 ...............................................................................
 
-MiscTests.cpp:<line number>:
+Misc.tests.cpp:<line number>:
 PASSED:
   REQUIRE( v.size() == 5 )
 with expansion:
   5 == 5
 
-MiscTests.cpp:<line number>:
+Misc.tests.cpp:<line number>:
 PASSED:
   REQUIRE( v.capacity() >= 5 )
 with expansion:
@@ -7986,16 +7986,16 @@ with expansion:
 vectors can be sized and resized
   reserving smaller does not change size or capacity
 -------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
+Misc.tests.cpp:<line number>
 ...............................................................................
 
-MiscTests.cpp:<line number>:
+Misc.tests.cpp:<line number>:
 PASSED:
   REQUIRE( v.size() == 5 )
 with expansion:
   5 == 5
 
-MiscTests.cpp:<line number>:
+Misc.tests.cpp:<line number>:
 PASSED:
   REQUIRE( v.capacity() >= 5 )
 with expansion:
@@ -8005,20 +8005,20 @@ with expansion:
 xmlentitycheck
   embedded xml
 -------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
+Misc.tests.cpp:<line number>
 ...............................................................................
 
-MiscTests.cpp:<line number>:
+Misc.tests.cpp:<line number>:
 PASSED:
 
 -------------------------------------------------------------------------------
 xmlentitycheck
   encoded chars
 -------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
+Misc.tests.cpp:<line number>
 ...............................................................................
 
-MiscTests.cpp:<line number>:
+Misc.tests.cpp:<line number>:
 PASSED:
 
 ===============================================================================
diff --git a/projects/SelfTest/Baselines/console.swa4.approved.txt b/projects/SelfTest/Baselines/console.swa4.approved.txt
index 18d25f6e..19c6e5c1 100644
--- a/projects/SelfTest/Baselines/console.swa4.approved.txt
+++ b/projects/SelfTest/Baselines/console.swa4.approved.txt
@@ -6,10 +6,10 @@ Run with -? for options
 -------------------------------------------------------------------------------
 # A test name that starts with a #
 -------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
+Misc.tests.cpp:<line number>
 ...............................................................................
 
-MiscTests.cpp:<line number>:
+Misc.tests.cpp:<line number>:
 PASSED:
 with message:
   yay
@@ -18,16 +18,16 @@ with message:
 #1005: Comparing pointer to int and long (NULL can be either on various
        systems)
 -------------------------------------------------------------------------------
-DecompositionTests.cpp:<line number>
+Decomposition.tests.cpp:<line number>
 ...............................................................................
 
-DecompositionTests.cpp:<line number>:
+Decomposition.tests.cpp:<line number>:
 PASSED:
   REQUIRE( fptr == 0 )
 with expansion:
   0 == 0
 
-DecompositionTests.cpp:<line number>:
+Decomposition.tests.cpp:<line number>:
 PASSED:
   REQUIRE( fptr == 0l )
 with expansion:
@@ -36,16 +36,16 @@ with expansion:
 -------------------------------------------------------------------------------
 #1027
 -------------------------------------------------------------------------------
-CompilationTests.cpp:<line number>
+Compilation.tests.cpp:<line number>
 ...............................................................................
 
-CompilationTests.cpp:<line number>:
+Compilation.tests.cpp:<line number>:
 PASSED:
   REQUIRE( y.v == 0 )
 with expansion:
   0 == 0
 
-CompilationTests.cpp:<line number>:
+Compilation.tests.cpp:<line number>:
 PASSED:
   REQUIRE( 0 == y.v )
 with expansion:
@@ -55,10 +55,10 @@ with expansion:
 #748 - captures with unexpected exceptions
   outside assertions
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:<line number>
+Exception.tests.cpp:<line number>
 ...............................................................................
 
-ExceptionTests.cpp:<line number>: FAILED:
+Exception.tests.cpp:<line number>: FAILED:
 due to unexpected exception with messages:
   answer := 42
   expected exception
@@ -67,10 +67,10 @@ due to unexpected exception with messages:
 #748 - captures with unexpected exceptions
   inside REQUIRE_NOTHROW
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:<line number>
+Exception.tests.cpp:<line number>
 ...............................................................................
 
-ExceptionTests.cpp:<line number>: FAILED:
+Exception.tests.cpp:<line number>: FAILED:
   REQUIRE_NOTHROW( thisThrows() )
 due to unexpected exception with messages:
   answer := 42
@@ -80,10 +80,10 @@ due to unexpected exception with messages:
 #748 - captures with unexpected exceptions
   inside REQUIRE_THROWS
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:<line number>
+Exception.tests.cpp:<line number>
 ...............................................................................
 
-ExceptionTests.cpp:<line number>:
+Exception.tests.cpp:<line number>:
 PASSED:
   REQUIRE_THROWS( thisThrows() )
 with message:
@@ -92,10 +92,10 @@ with message:
 -------------------------------------------------------------------------------
 #809
 -------------------------------------------------------------------------------
-CompilationTests.cpp:<line number>
+Compilation.tests.cpp:<line number>
 ...............................................................................
 
-CompilationTests.cpp:<line number>:
+Compilation.tests.cpp:<line number>:
 PASSED:
   REQUIRE( 42 == f )
 with expansion:
@@ -104,40 +104,40 @@ with expansion:
 -------------------------------------------------------------------------------
 #833
 -------------------------------------------------------------------------------
-CompilationTests.cpp:<line number>
+Compilation.tests.cpp:<line number>
 ...............................................................................
 
-CompilationTests.cpp:<line number>:
+Compilation.tests.cpp:<line number>:
 PASSED:
   REQUIRE( a == t )
 with expansion:
   3 == 3
 
-CompilationTests.cpp:<line number>:
+Compilation.tests.cpp:<line number>:
 PASSED:
   CHECK( a == t )
 with expansion:
   3 == 3
 
-CompilationTests.cpp:<line number>:
+Compilation.tests.cpp:<line number>:
 PASSED:
   REQUIRE_THROWS( throws_int(true) )
 
-CompilationTests.cpp:<line number>:
+Compilation.tests.cpp:<line number>:
 PASSED:
   CHECK_THROWS_AS( throws_int(true), int )
 
-CompilationTests.cpp:<line number>:
+Compilation.tests.cpp:<line number>:
 PASSED:
   REQUIRE_NOTHROW( throws_int(false) )
 
-CompilationTests.cpp:<line number>:
+Compilation.tests.cpp:<line number>:
 PASSED:
   REQUIRE_THAT( "aaa", Catch::EndsWith("aaa") )
 with expansion:
   "aaa" ends with: "aaa"
 
-CompilationTests.cpp:<line number>:
+Compilation.tests.cpp:<line number>:
 PASSED:
   REQUIRE( templated_tests<int>(3) )
 with expansion:
@@ -146,15 +146,15 @@ with expansion:
 -------------------------------------------------------------------------------
 #835 -- errno should not be touched by Catch
 -------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
+Misc.tests.cpp:<line number>
 ...............................................................................
 
-MiscTests.cpp:<line number>: FAILED:
+Misc.tests.cpp:<line number>: FAILED:
   CHECK( f() == 0 )
 with expansion:
   1 == 0
 
-MiscTests.cpp:<line number>:
+Misc.tests.cpp:<line number>:
 PASSED:
   REQUIRE( errno == 1 )
 with expansion:
@@ -163,10 +163,10 @@ with expansion:
 -------------------------------------------------------------------------------
 #872
 -------------------------------------------------------------------------------
-CompilationTests.cpp:<line number>
+Compilation.tests.cpp:<line number>
 ...............................................................................
 
-CompilationTests.cpp:<line number>:
+Compilation.tests.cpp:<line number>:
 PASSED:
   REQUIRE( x == 4 )
 with expansion:
@@ -178,10 +178,10 @@ with message:
 #961 -- Dynamically created sections should all be reported
   Looped section 0
 -------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
+Misc.tests.cpp:<line number>
 ...............................................................................
 
-MiscTests.cpp:<line number>:
+Misc.tests.cpp:<line number>:
 PASSED:
 with message:
   Everything is OK
@@ -190,10 +190,10 @@ with message:
 #961 -- Dynamically created sections should all be reported
   Looped section 1
 -------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
+Misc.tests.cpp:<line number>
 ...............................................................................
 
-MiscTests.cpp:<line number>:
+Misc.tests.cpp:<line number>:
 PASSED:
 with message:
   Everything is OK
@@ -202,10 +202,10 @@ with message:
 #961 -- Dynamically created sections should all be reported
   Looped section 2
 -------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
+Misc.tests.cpp:<line number>
 ...............................................................................
 
-MiscTests.cpp:<line number>:
+Misc.tests.cpp:<line number>:
 PASSED:
 with message:
   Everything is OK
@@ -214,10 +214,10 @@ with message:
 #961 -- Dynamically created sections should all be reported
   Looped section 3
 -------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
+Misc.tests.cpp:<line number>
 ...............................................................................
 
-MiscTests.cpp:<line number>:
+Misc.tests.cpp:<line number>:
 PASSED:
 with message:
   Everything is OK
@@ -226,10 +226,10 @@ with message:
 #961 -- Dynamically created sections should all be reported
   Looped section 4
 -------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
+Misc.tests.cpp:<line number>
 ...............................................................................
 
-MiscTests.cpp:<line number>:
+Misc.tests.cpp:<line number>:
 PASSED:
 with message:
   Everything is OK
@@ -237,21 +237,21 @@ with message:
 -------------------------------------------------------------------------------
 'Not' checks that should fail
 -------------------------------------------------------------------------------
-ConditionTests.cpp:<line number>
+Condition.tests.cpp:<line number>
 ...............................................................................
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( false != false )
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( true != true )
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK( !true )
 with expansion:
   false
 
-ConditionTests.cpp:<line number>: FAILED:
+Condition.tests.cpp:<line number>: FAILED:
   CHECK_FALSE( true )
 with expansion:
   !true
diff --git a/projects/SelfTest/Baselines/junit.sw.approved.txt b/projects/SelfTest/Baselines/junit.sw.approved.txt
index 97adb60b..249529ea 100644
--- a/projects/SelfTest/Baselines/junit.sw.approved.txt
+++ b/projects/SelfTest/Baselines/junit.sw.approved.txt
@@ -9,14 +9,14 @@
       <error type="TEST_CASE">
 expected exception
 answer := 42
-ExceptionTests.cpp:<line number>
+Exception.tests.cpp:<line number>
       </error>
     </testcase>
     <testcase classname="<exe-name>.global" name="#748 - captures with unexpected exceptions/inside REQUIRE_NOTHROW" time="{duration}">
       <error message="thisThrows()" type="REQUIRE_NOTHROW">
 expected exception
 answer := 42
-ExceptionTests.cpp:<line number>
+Exception.tests.cpp:<line number>
       </error>
     </testcase>
     <testcase classname="<exe-name>.global" name="#748 - captures with unexpected exceptions/inside REQUIRE_THROWS" time="{duration}"/>
@@ -24,7 +24,7 @@ ExceptionTests.cpp:<line number>
     <testcase classname="<exe-name>.global" name="#833" time="{duration}"/>
     <testcase classname="<exe-name>.global" name="#835 -- errno should not be touched by Catch" time="{duration}">
       <failure message="1 == 0" type="CHECK">
-MiscTests.cpp:<line number>
+Misc.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="#872" time="{duration}"/>
@@ -35,28 +35,28 @@ MiscTests.cpp:<line number>
     <testcase classname="<exe-name>.global" name="#961 -- Dynamically created sections should all be reported/Looped section 4" time="{duration}"/>
     <testcase classname="<exe-name>.global" name="'Not' checks that should fail" time="{duration}">
       <failure message="false != false" type="CHECK">
-ConditionTests.cpp:<line number>
+Condition.tests.cpp:<line number>
       </failure>
       <failure message="true != true" type="CHECK">
-ConditionTests.cpp:<line number>
+Condition.tests.cpp:<line number>
       </failure>
       <failure message="false" type="CHECK">
-ConditionTests.cpp:<line number>
+Condition.tests.cpp:<line number>
       </failure>
       <failure message="!true" type="CHECK_FALSE">
-ConditionTests.cpp:<line number>
+Condition.tests.cpp:<line number>
       </failure>
       <failure message="false" type="CHECK">
-ConditionTests.cpp:<line number>
+Condition.tests.cpp:<line number>
       </failure>
       <failure message="!true" type="CHECK_FALSE">
-ConditionTests.cpp:<line number>
+Condition.tests.cpp:<line number>
       </failure>
       <failure message="false" type="CHECK">
-ConditionTests.cpp:<line number>
+Condition.tests.cpp:<line number>
       </failure>
       <failure message="!(1 == 1)" type="CHECK_FALSE">
-ConditionTests.cpp:<line number>
+Condition.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="'Not' checks that should succeed" time="{duration}"/>
@@ -67,29 +67,29 @@ ConditionTests.cpp:<line number>
     <testcase classname="<exe-name>.global" name="(unimplemented) static bools can be evaluated/direct" time="{duration}"/>
     <testcase classname="<exe-name>.TestClass" name="A METHOD_AS_TEST_CASE based test run that fails" time="{duration}">
       <failure message="&quot;hello&quot; == &quot;world&quot;" type="REQUIRE">
-ClassTests.cpp:<line number>
+Class.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.TestClass" name="A METHOD_AS_TEST_CASE based test run that succeeds" time="{duration}"/>
     <testcase classname="<exe-name>.Fixture" name="A TEST_CASE_METHOD based test run that fails" time="{duration}">
       <failure message="1 == 2" type="REQUIRE">
-ClassTests.cpp:<line number>
+Class.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.Fixture" name="A TEST_CASE_METHOD based test run that succeeds" time="{duration}"/>
     <testcase classname="<exe-name>.global" name="A couple of nested sections followed by a failure" time="{duration}">
       <failure type="FAIL">
 to infinity and beyond
-MiscTests.cpp:<line number>
+Misc.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="A couple of nested sections followed by a failure/Outer/Inner" time="{duration}"/>
     <testcase classname="<exe-name>.global" name="A failing expression with a non streamable type is still captured" time="{duration}">
       <failure message="0x<hex digits> == 0x<hex digits>" type="CHECK">
-TrickyTests.cpp:<line number>
+Tricky.tests.cpp:<line number>
       </failure>
       <failure message="{?} == {?}" type="CHECK">
-TrickyTests.cpp:<line number>
+Tricky.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="Absolute margin" time="{duration}"/>
@@ -97,7 +97,7 @@ TrickyTests.cpp:<line number>
     <testcase classname="<exe-name>.global" name="An unchecked exception reports the line of the last assertion" time="{duration}">
       <error message="{Unknown expression after the reported line}">
 unexpected exception
-ExceptionTests.cpp:<line number>
+Exception.tests.cpp:<line number>
       </error>
     </testcase>
     <testcase classname="<exe-name>.global" name="Anonymous test case 1" time="{duration}"/>
@@ -127,115 +127,115 @@ ExceptionTests.cpp:<line number>
     <testcase classname="<exe-name>.global" name="Comparisons with int literals don't warn when mixing signed/ unsigned" time="{duration}"/>
     <testcase classname="<exe-name>.global" name="Contains string matcher" time="{duration}">
       <failure message="&quot;this string contains 'abc' as a substring&quot; contains: &quot;not there&quot; (case insensitive)" type="CHECK_THAT">
-MatchersTests.cpp:<line number>
+Matchers.tests.cpp:<line number>
       </failure>
       <failure message="&quot;this string contains 'abc' as a substring&quot; contains: &quot;STRING&quot;" type="CHECK_THAT">
-MatchersTests.cpp:<line number>
+Matchers.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="Custom exceptions can be translated when testing for nothrow" time="{duration}">
       <error message="throwCustom()" type="REQUIRE_NOTHROW">
 custom exception - not std
-ExceptionTests.cpp:<line number>
+Exception.tests.cpp:<line number>
       </error>
     </testcase>
     <testcase classname="<exe-name>.global" name="Custom exceptions can be translated when testing for throwing as something else" time="{duration}">
       <error message="throwCustom(), std::exception" type="REQUIRE_THROWS_AS">
 custom exception - not std
-ExceptionTests.cpp:<line number>
+Exception.tests.cpp:<line number>
       </error>
     </testcase>
     <testcase classname="<exe-name>.global" name="Custom std-exceptions can be custom translated" time="{duration}">
       <error type="TEST_CASE">
 custom std exception
-ExceptionTests.cpp:<line number>
+Exception.tests.cpp:<line number>
       </error>
     </testcase>
     <testcase classname="<exe-name>.global" name="Default scale is invisible to comparison" time="{duration}"/>
     <testcase classname="<exe-name>.global" name="EndsWith string matcher" time="{duration}">
       <failure message="&quot;this string contains 'abc' as a substring&quot; ends with: &quot;Substring&quot;" type="CHECK_THAT">
-MatchersTests.cpp:<line number>
+Matchers.tests.cpp:<line number>
       </failure>
       <failure message="&quot;this string contains 'abc' as a substring&quot; ends with: &quot;this&quot; (case insensitive)" type="CHECK_THAT">
-MatchersTests.cpp:<line number>
+Matchers.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="Epsilon only applies to Approx's value" time="{duration}"/>
     <testcase classname="<exe-name>.global" name="Equality checks that should fail" time="{duration}">
       <failure message="7 == 6" type="CHECK">
-ConditionTests.cpp:<line number>
+Condition.tests.cpp:<line number>
       </failure>
       <failure message="7 == 8" type="CHECK">
-ConditionTests.cpp:<line number>
+Condition.tests.cpp:<line number>
       </failure>
       <failure message="7 == 0" type="CHECK">
-ConditionTests.cpp:<line number>
+Condition.tests.cpp:<line number>
       </failure>
       <failure message="9.1f == Approx( 9.1099996567 )" type="CHECK">
-ConditionTests.cpp:<line number>
+Condition.tests.cpp:<line number>
       </failure>
       <failure message="9.1f == Approx( 9.0 )" type="CHECK">
-ConditionTests.cpp:<line number>
+Condition.tests.cpp:<line number>
       </failure>
       <failure message="9.1f == Approx( 1.0 )" type="CHECK">
-ConditionTests.cpp:<line number>
+Condition.tests.cpp:<line number>
       </failure>
       <failure message="9.1f == Approx( 0.0 )" type="CHECK">
-ConditionTests.cpp:<line number>
+Condition.tests.cpp:<line number>
       </failure>
       <failure message="3.1415926535 == Approx( 3.1415 )" type="CHECK">
-ConditionTests.cpp:<line number>
+Condition.tests.cpp:<line number>
       </failure>
       <failure message="&quot;hello&quot; == &quot;goodbye&quot;" type="CHECK">
-ConditionTests.cpp:<line number>
+Condition.tests.cpp:<line number>
       </failure>
       <failure message="&quot;hello&quot; == &quot;hell&quot;" type="CHECK">
-ConditionTests.cpp:<line number>
+Condition.tests.cpp:<line number>
       </failure>
       <failure message="&quot;hello&quot; == &quot;hello1&quot;" type="CHECK">
-ConditionTests.cpp:<line number>
+Condition.tests.cpp:<line number>
       </failure>
       <failure message="5 == 6" type="CHECK">
-ConditionTests.cpp:<line number>
+Condition.tests.cpp:<line number>
       </failure>
       <failure message="1.3 == Approx( 1.301 )" type="CHECK">
-ConditionTests.cpp:<line number>
+Condition.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="Equality checks that should succeed" time="{duration}"/>
     <testcase classname="<exe-name>.global" name="Equals" time="{duration}"/>
     <testcase classname="<exe-name>.global" name="Equals string matcher" time="{duration}">
       <failure message="&quot;this string contains 'abc' as a substring&quot; equals: &quot;this string contains 'ABC' as a substring&quot;" type="CHECK_THAT">
-MatchersTests.cpp:<line number>
+Matchers.tests.cpp:<line number>
       </failure>
       <failure message="&quot;this string contains 'abc' as a substring&quot; equals: &quot;something else&quot; (case insensitive)" type="CHECK_THAT">
-MatchersTests.cpp:<line number>
+Matchers.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="Exception matchers that fail/No exception" time="{duration}">
       <failure message="doesNotThrow(), SpecialException, ExceptionMatcher{ 1 }" type="CHECK_THROWS_MATCHES">
-MatchersTests.cpp:<line number>
+Matchers.tests.cpp:<line number>
       </failure>
       <failure message="doesNotThrow(), SpecialException, ExceptionMatcher{ 1 }" type="REQUIRE_THROWS_MATCHES">
-MatchersTests.cpp:<line number>
+Matchers.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="Exception matchers that fail/Type mismatch" time="{duration}">
       <error message="throwsAsInt(1), SpecialException, ExceptionMatcher{ 1 }" type="CHECK_THROWS_MATCHES">
 Unknown exception
-MatchersTests.cpp:<line number>
+Matchers.tests.cpp:<line number>
       </error>
       <error message="throwsAsInt(1), SpecialException, ExceptionMatcher{ 1 }" type="REQUIRE_THROWS_MATCHES">
 Unknown exception
-MatchersTests.cpp:<line number>
+Matchers.tests.cpp:<line number>
       </error>
     </testcase>
     <testcase classname="<exe-name>.global" name="Exception matchers that fail/Contents are wrong" time="{duration}">
       <failure message="{?} special exception has value of 1" type="CHECK_THROWS_MATCHES">
-MatchersTests.cpp:<line number>
+Matchers.tests.cpp:<line number>
       </failure>
       <failure message="{?} special exception has value of 1" type="REQUIRE_THROWS_MATCHES">
-MatchersTests.cpp:<line number>
+Matchers.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="Exception matchers that succeed" time="{duration}"/>
@@ -245,31 +245,31 @@ MatchersTests.cpp:<line number>
     <testcase classname="<exe-name>.global" name="Expected exceptions that don't throw or unexpected exceptions fail the test" time="{duration}">
       <error message="thisThrows(), std::string" type="CHECK_THROWS_AS">
 expected exception
-ExceptionTests.cpp:<line number>
+Exception.tests.cpp:<line number>
       </error>
       <failure message="thisDoesntThrow(), std::domain_error" type="CHECK_THROWS_AS">
-ExceptionTests.cpp:<line number>
+Exception.tests.cpp:<line number>
       </failure>
       <error message="thisThrows()" type="CHECK_NOTHROW">
 expected exception
-ExceptionTests.cpp:<line number>
+Exception.tests.cpp:<line number>
       </error>
     </testcase>
     <testcase classname="<exe-name>.global" name="FAIL aborts the test" time="{duration}">
       <failure type="FAIL">
 This is a failure
-MessageTests.cpp:<line number>
+Message.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="FAIL does not require an argument" time="{duration}">
       <failure type="FAIL">
-MessageTests.cpp:<line number>
+Message.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="FAIL_CHECK does not abort the test" time="{duration}">
       <failure type="FAIL_CHECK">
 This is a failure
-MessageTests.cpp:<line number>
+Message.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="Factorials are computed" time="{duration}"/>
@@ -285,44 +285,44 @@ MessageTests.cpp:<line number>
       <failure message="2 == 1" type="REQUIRE">
 this message should be logged
 so should this
-MessageTests.cpp:<line number>
+Message.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="INFO gets logged on failure, even if captured before successful assertions" time="{duration}">
       <failure message="2 == 1" type="CHECK">
 this message may be logged later
 this message should be logged
-MessageTests.cpp:<line number>
+Message.tests.cpp:<line number>
       </failure>
       <failure message="2 == 0" type="CHECK">
 this message may be logged later
 this message should be logged
 and this, but later
-MessageTests.cpp:<line number>
+Message.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="INFO is reset for each loop" time="{duration}">
       <failure message="10 &lt; 10" type="REQUIRE">
 current counter 10
 i := 10
-MessageTests.cpp:<line number>
+Message.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="Inequality checks that should fail" time="{duration}">
       <failure message="7 != 7" type="CHECK">
-ConditionTests.cpp:<line number>
+Condition.tests.cpp:<line number>
       </failure>
       <failure message="9.1f != Approx( 9.1000003815 )" type="CHECK">
-ConditionTests.cpp:<line number>
+Condition.tests.cpp:<line number>
       </failure>
       <failure message="3.1415926535 != Approx( 3.1415926535 )" type="CHECK">
-ConditionTests.cpp:<line number>
+Condition.tests.cpp:<line number>
       </failure>
       <failure message="&quot;hello&quot; != &quot;hello&quot;" type="CHECK">
-ConditionTests.cpp:<line number>
+Condition.tests.cpp:<line number>
       </failure>
       <failure message="5 != 5" type="CHECK">
-ConditionTests.cpp:<line number>
+Condition.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="Inequality checks that should succeed" time="{duration}"/>
@@ -333,98 +333,98 @@ ConditionTests.cpp:<line number>
     <testcase classname="<exe-name>.global" name="Matchers can be composed with both &amp;&amp; and ||" time="{duration}"/>
     <testcase classname="<exe-name>.global" name="Matchers can be composed with both &amp;&amp; and || - failing" time="{duration}">
       <failure message="&quot;this string contains 'abc' as a substring&quot; ( ( contains: &quot;string&quot; or contains: &quot;different&quot; ) and contains: &quot;random&quot; )" type="CHECK_THAT">
-MatchersTests.cpp:<line number>
+Matchers.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="Matchers can be negated (Not) with the ! operator" time="{duration}"/>
     <testcase classname="<exe-name>.global" name="Matchers can be negated (Not) with the ! operator - failing" time="{duration}">
       <failure message="&quot;this string contains 'abc' as a substring&quot; not contains: &quot;substring&quot;" type="CHECK_THAT">
-MatchersTests.cpp:<line number>
+Matchers.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="Mismatching exception messages failing the test" time="{duration}">
       <failure message="&quot;expected exception&quot; equals: &quot;should fail&quot;" type="REQUIRE_THROWS_WITH">
-ExceptionTests.cpp:<line number>
+Exception.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="Nice descriptive name" time="{duration}"/>
     <testcase classname="<exe-name>.global" name="Non-std exceptions can be translated" time="{duration}">
       <error type="TEST_CASE">
 custom exception
-ExceptionTests.cpp:<line number>
+Exception.tests.cpp:<line number>
       </error>
     </testcase>
     <testcase classname="<exe-name>.global" name="Objects that evaluated in boolean contexts can be checked" time="{duration}"/>
     <testcase classname="<exe-name>.global" name="Ordering comparison checks that should fail" time="{duration}">
       <failure message="7 > 7" type="CHECK">
-ConditionTests.cpp:<line number>
+Condition.tests.cpp:<line number>
       </failure>
       <failure message="7 &lt; 7" type="CHECK">
-ConditionTests.cpp:<line number>
+Condition.tests.cpp:<line number>
       </failure>
       <failure message="7 > 8" type="CHECK">
-ConditionTests.cpp:<line number>
+Condition.tests.cpp:<line number>
       </failure>
       <failure message="7 &lt; 6" type="CHECK">
-ConditionTests.cpp:<line number>
+Condition.tests.cpp:<line number>
       </failure>
       <failure message="7 &lt; 0" type="CHECK">
-ConditionTests.cpp:<line number>
+Condition.tests.cpp:<line number>
       </failure>
       <failure message="7 &lt; -1" type="CHECK">
-ConditionTests.cpp:<line number>
+Condition.tests.cpp:<line number>
       </failure>
       <failure message="7 >= 8" type="CHECK">
-ConditionTests.cpp:<line number>
+Condition.tests.cpp:<line number>
       </failure>
       <failure message="7 &lt;= 6" type="CHECK">
-ConditionTests.cpp:<line number>
+Condition.tests.cpp:<line number>
       </failure>
       <failure message="9.1f &lt; 9" type="CHECK">
-ConditionTests.cpp:<line number>
+Condition.tests.cpp:<line number>
       </failure>
       <failure message="9.1f > 10" type="CHECK">
-ConditionTests.cpp:<line number>
+Condition.tests.cpp:<line number>
       </failure>
       <failure message="9.1f > 9.2" type="CHECK">
-ConditionTests.cpp:<line number>
+Condition.tests.cpp:<line number>
       </failure>
       <failure message="&quot;hello&quot; > &quot;hello&quot;" type="CHECK">
-ConditionTests.cpp:<line number>
+Condition.tests.cpp:<line number>
       </failure>
       <failure message="&quot;hello&quot; &lt; &quot;hello&quot;" type="CHECK">
-ConditionTests.cpp:<line number>
+Condition.tests.cpp:<line number>
       </failure>
       <failure message="&quot;hello&quot; > &quot;hellp&quot;" type="CHECK">
-ConditionTests.cpp:<line number>
+Condition.tests.cpp:<line number>
       </failure>
       <failure message="&quot;hello&quot; > &quot;z&quot;" type="CHECK">
-ConditionTests.cpp:<line number>
+Condition.tests.cpp:<line number>
       </failure>
       <failure message="&quot;hello&quot; &lt; &quot;hellm&quot;" type="CHECK">
-ConditionTests.cpp:<line number>
+Condition.tests.cpp:<line number>
       </failure>
       <failure message="&quot;hello&quot; &lt; &quot;a&quot;" type="CHECK">
-ConditionTests.cpp:<line number>
+Condition.tests.cpp:<line number>
       </failure>
       <failure message="&quot;hello&quot; >= &quot;z&quot;" type="CHECK">
-ConditionTests.cpp:<line number>
+Condition.tests.cpp:<line number>
       </failure>
       <failure message="&quot;hello&quot; &lt;= &quot;a&quot;" type="CHECK">
-ConditionTests.cpp:<line number>
+Condition.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="Ordering comparison checks that should succeed" time="{duration}"/>
     <testcase classname="<exe-name>.global" name="Output from all sections is reported/one" time="{duration}">
       <failure type="FAIL">
 Message from section one
-MessageTests.cpp:<line number>
+Message.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="Output from all sections is reported/two" time="{duration}">
       <failure type="FAIL">
 Message from section two
-MessageTests.cpp:<line number>
+Message.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="Parse test names and tags/Empty test spec should have no filters" time="{duration}"/>
@@ -486,18 +486,18 @@ MessageTests.cpp:<line number>
     <testcase classname="<exe-name>.global" name="Process can be configured on command line/use-colour/error" time="{duration}"/>
     <testcase classname="<exe-name>.global" name="Reconstruction should be based on stringification: #914" time="{duration}">
       <failure message="Hey, its truthy!" type="CHECK">
-DecompositionTests.cpp:<line number>
+Decomposition.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="Regex string matcher" time="{duration}">
       <failure message="&quot;this string contains 'abc' as a substring&quot; matches &quot;this STRING contains 'abc' as a substring&quot; case sensitively" type="CHECK_THAT">
-MatchersTests.cpp:<line number>
+Matchers.tests.cpp:<line number>
       </failure>
       <failure message="&quot;this string contains 'abc' as a substring&quot; matches &quot;contains 'abc' as a substring&quot; case sensitively" type="CHECK_THAT">
-MatchersTests.cpp:<line number>
+Matchers.tests.cpp:<line number>
       </failure>
       <failure message="&quot;this string contains 'abc' as a substring&quot; matches &quot;this string contains 'abc' as a&quot; case sensitively" type="CHECK_THAT">
-MatchersTests.cpp:<line number>
+Matchers.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="SUCCEED counts as a test pass" time="{duration}"/>
@@ -528,10 +528,10 @@ Message from section two
     </testcase>
     <testcase classname="<exe-name>.global" name="StartsWith string matcher" time="{duration}">
       <failure message="&quot;this string contains 'abc' as a substring&quot; starts with: &quot;This String&quot;" type="CHECK_THAT">
-MatchersTests.cpp:<line number>
+Matchers.tests.cpp:<line number>
       </failure>
       <failure message="&quot;this string contains 'abc' as a substring&quot; starts with: &quot;string&quot; (case insensitive)" type="CHECK_THAT">
-MatchersTests.cpp:<line number>
+Matchers.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="String matchers" time="{duration}"/>
@@ -540,7 +540,7 @@ MatchersTests.cpp:<line number>
     <testcase classname="<exe-name>.global" name="StringRef/From string literal/c_str() does not cause copy" time="{duration}"/>
     <testcase classname="<exe-name>.global" name="StringRef/From sub-string" time="{duration}">
       <failure message="false" type="REQUIRE">
-StringRef.tests.cpp:<line number>
+String.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="StringRef/Substrings/zero-based substring" time="{duration}"/>
@@ -567,7 +567,7 @@ StringRef.tests.cpp:<line number>
 	$a = 20;
 }
 &quot;" type="CHECK">
-MiscTests.cpp:<line number>
+Misc.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="Tag alias can be registered against tag patterns/The same tag alias can only be registered once" time="{duration}"/>
@@ -596,7 +596,7 @@ MiscTests.cpp:<line number>
     <testcase classname="<exe-name>.global" name="Unexpected exceptions can be translated" time="{duration}">
       <error type="TEST_CASE">
 3.14
-ExceptionTests.cpp:<line number>
+Exception.tests.cpp:<line number>
       </error>
     </testcase>
     <testcase classname="<exe-name>.global" name="Use a custom approx" time="{duration}"/>
@@ -607,63 +607,63 @@ ExceptionTests.cpp:<line number>
     <testcase classname="<exe-name>.global" name="Vector matchers/Equals" time="{duration}"/>
     <testcase classname="<exe-name>.global" name="Vector matchers that fail/Contains (element)" time="{duration}">
       <failure message="{ 1, 2, 3 } Contains: -1" type="CHECK_THAT">
-MatchersTests.cpp:<line number>
+Matchers.tests.cpp:<line number>
       </failure>
       <failure message="{  } Contains: 1" type="CHECK_THAT">
-MatchersTests.cpp:<line number>
+Matchers.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="Vector matchers that fail/Contains (vector)" time="{duration}">
       <failure message="{  } Contains: { 1, 2, 3 }" type="CHECK_THAT">
-MatchersTests.cpp:<line number>
+Matchers.tests.cpp:<line number>
       </failure>
       <failure message="{ 1, 2, 3 } Contains: { 1, 2, 4 }" type="CHECK_THAT">
-MatchersTests.cpp:<line number>
+Matchers.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="Vector matchers that fail/Equals" time="{duration}">
       <failure message="{ 1, 2, 3 } Equals: { 1, 2 }" type="CHECK_THAT">
-MatchersTests.cpp:<line number>
+Matchers.tests.cpp:<line number>
       </failure>
       <failure message="{ 1, 2 } Equals: { 1, 2, 3 }" type="CHECK_THAT">
-MatchersTests.cpp:<line number>
+Matchers.tests.cpp:<line number>
       </failure>
       <failure message="{  } Equals: { 1, 2, 3 }" type="CHECK_THAT">
-MatchersTests.cpp:<line number>
+Matchers.tests.cpp:<line number>
       </failure>
       <failure message="{ 1, 2, 3 } Equals: {  }" type="CHECK_THAT">
-MatchersTests.cpp:<line number>
+Matchers.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="When checked exceptions are thrown they can be expected or unexpected" time="{duration}"/>
     <testcase classname="<exe-name>.global" name="When unchecked exceptions are thrown directly they are always failures" time="{duration}">
       <error type="TEST_CASE">
 unexpected exception
-ExceptionTests.cpp:<line number>
+Exception.tests.cpp:<line number>
       </error>
     </testcase>
     <testcase classname="<exe-name>.global" name="When unchecked exceptions are thrown during a CHECK the test should continue" time="{duration}">
       <error message="thisThrows() == 0" type="CHECK">
 expected exception
-ExceptionTests.cpp:<line number>
+Exception.tests.cpp:<line number>
       </error>
     </testcase>
     <testcase classname="<exe-name>.global" name="When unchecked exceptions are thrown during a REQUIRE the test should abort fail" time="{duration}">
       <error message="thisThrows() == 0" type="REQUIRE">
 expected exception
-ExceptionTests.cpp:<line number>
+Exception.tests.cpp:<line number>
       </error>
     </testcase>
     <testcase classname="<exe-name>.global" name="When unchecked exceptions are thrown from functions they are always failures" time="{duration}">
       <error message="thisThrows() == 0" type="CHECK">
 expected exception
-ExceptionTests.cpp:<line number>
+Exception.tests.cpp:<line number>
       </error>
     </testcase>
     <testcase classname="<exe-name>.global" name="When unchecked exceptions are thrown from sections they are always failures/section name" time="{duration}">
       <error type="TEST_CASE">
 unexpected exception
-ExceptionTests.cpp:<line number>
+Exception.tests.cpp:<line number>
       </error>
     </testcase>
     <testcase classname="<exe-name>.global" name="Where the LHS is not a simple value" time="{duration}"/>
@@ -685,19 +685,19 @@ ExceptionTests.cpp:<line number>
     <testcase classname="<exe-name>.global" name="checkedElse" time="{duration}"/>
     <testcase classname="<exe-name>.global" name="checkedElse, failing" time="{duration}">
       <failure message="false" type="CHECKED_ELSE">
-MiscTests.cpp:<line number>
+Misc.tests.cpp:<line number>
       </failure>
       <failure message="false" type="REQUIRE">
-MiscTests.cpp:<line number>
+Misc.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="checkedIf" time="{duration}"/>
     <testcase classname="<exe-name>.global" name="checkedIf, failing" time="{duration}">
       <failure message="false" type="CHECKED_IF">
-MiscTests.cpp:<line number>
+Misc.tests.cpp:<line number>
       </failure>
       <failure message="false" type="REQUIRE">
-MiscTests.cpp:<line number>
+Misc.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="comparisons between const int variables" time="{duration}"/>
@@ -708,44 +708,44 @@ MiscTests.cpp:<line number>
     <testcase classname="<exe-name>.global" name="just failure" time="{duration}">
       <failure type="FAIL">
 Previous info should not be seen
-MessageTests.cpp:<line number>
+Message.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="long long" time="{duration}"/>
     <testcase classname="<exe-name>.global" name="looped SECTION tests/s1" time="{duration}">
       <failure message="0 > 1" type="CHECK">
-MiscTests.cpp:<line number>
+Misc.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="looped tests" time="{duration}">
       <failure message="1 == 0" type="CHECK">
 Testing if fib[0] (1) is even
-MiscTests.cpp:<line number>
+Misc.tests.cpp:<line number>
       </failure>
       <failure message="1 == 0" type="CHECK">
 Testing if fib[1] (1) is even
-MiscTests.cpp:<line number>
+Misc.tests.cpp:<line number>
       </failure>
       <failure message="1 == 0" type="CHECK">
 Testing if fib[3] (3) is even
-MiscTests.cpp:<line number>
+Misc.tests.cpp:<line number>
       </failure>
       <failure message="1 == 0" type="CHECK">
 Testing if fib[4] (5) is even
-MiscTests.cpp:<line number>
+Misc.tests.cpp:<line number>
       </failure>
       <failure message="1 == 0" type="CHECK">
 Testing if fib[6] (13) is even
-MiscTests.cpp:<line number>
+Misc.tests.cpp:<line number>
       </failure>
       <failure message="1 == 0" type="CHECK">
 Testing if fib[7] (21) is even
-MiscTests.cpp:<line number>
+Misc.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="more nested SECTION tests/s2/s1" time="{duration}">
       <failure message="1 == 2" type="REQUIRE">
-MiscTests.cpp:<line number>
+Misc.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="more nested SECTION tests/s1/s3" time="{duration}"/>
@@ -771,14 +771,14 @@ MiscTests.cpp:<line number>
     <testcase classname="<exe-name>.global" name="send a single char to INFO" time="{duration}">
       <failure message="false" type="REQUIRE">
 3
-MiscTests.cpp:<line number>
+Misc.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="sends information to INFO" time="{duration}">
       <failure message="false" type="REQUIRE">
 hi
 i := 7
-MessageTests.cpp:<line number>
+Message.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="std::pair&lt;int,const std::string> -> toString" time="{duration}"/>
@@ -786,7 +786,7 @@ MessageTests.cpp:<line number>
     <testcase classname="<exe-name>.global" name="std::vector&lt;std::pair&lt;std::string,int> > -> toString" time="{duration}"/>
     <testcase classname="<exe-name>.global" name="string literals of different sizes can be compared" time="{duration}">
       <failure message="&quot;first&quot; == &quot;second&quot;" type="REQUIRE">
-TrickyTests.cpp:<line number>
+Tricky.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="stringify( has_maker )" time="{duration}"/>
@@ -800,10 +800,10 @@ TrickyTests.cpp:<line number>
     <testcase classname="<exe-name>.global" name="toString(enum class w/operator&lt;&lt;)" time="{duration}"/>
     <testcase classname="<exe-name>.global" name="toString(enum class)" time="{duration}">
       <failure message="&quot;{?}&quot; == &quot;0&quot;" type="CHECK">
-EnumToString.cpp:<line number>
+EnumToString.tests.cpp:<line number>
       </failure>
       <failure message="&quot;{?}&quot; == &quot;1&quot;" type="CHECK">
-EnumToString.cpp:<line number>
+EnumToString.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="toString(enum w/operator&lt;&lt;)" time="{duration}"/>
diff --git a/projects/SelfTest/Baselines/xml.sw.approved.txt b/projects/SelfTest/Baselines/xml.sw.approved.txt
index 7fb1c6b4..bbd769fb 100644
--- a/projects/SelfTest/Baselines/xml.sw.approved.txt
+++ b/projects/SelfTest/Baselines/xml.sw.approved.txt
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Catch name="<exe-name>">
   <Group name="<exe-name>">
-    <TestCase name="# A test name that starts with a #" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
+    <TestCase name="# A test name that starts with a #" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="#1005: Comparing pointer to int and long (NULL can be either on various systems)" tags="[Decomposition]" filename="projects/<exe-name>/UsageTests/DecompositionTests.cpp" >
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/DecompositionTests.cpp" >
+    <TestCase name="#1005: Comparing pointer to int and long (NULL can be either on various systems)" tags="[Decomposition]" filename="projects/<exe-name>/UsageTests/Decomposition.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Decomposition.tests.cpp" >
         <Original>
           fptr == 0
         </Original>
@@ -13,7 +13,7 @@
           0 == 0
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/DecompositionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Decomposition.tests.cpp" >
         <Original>
           fptr == 0l
         </Original>
@@ -23,8 +23,8 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="#1027" filename="projects/<exe-name>/UsageTests/CompilationTests.cpp" >
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/CompilationTests.cpp" >
+    <TestCase name="#1027" filename="projects/<exe-name>/UsageTests/Compilation.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Compilation.tests.cpp" >
         <Original>
           y.v == 0
         </Original>
@@ -32,7 +32,7 @@
           0 == 0
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/CompilationTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Compilation.tests.cpp" >
         <Original>
           0 == y.v
         </Original>
@@ -42,38 +42,38 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="#748 - captures with unexpected exceptions" tags="[!shouldfail][!throws][.][failing]" filename="projects/<exe-name>/UsageTests/ExceptionTests.cpp" >
-      <Section name="outside assertions" filename="projects/<exe-name>/UsageTests/ExceptionTests.cpp" >
+    <TestCase name="#748 - captures with unexpected exceptions" tags="[!shouldfail][!throws][.][failing]" filename="projects/<exe-name>/UsageTests/Exception.tests.cpp" >
+      <Section name="outside assertions" filename="projects/<exe-name>/UsageTests/Exception.tests.cpp" >
         <Info>
           answer := 42
         </Info>
-        <Exception filename="projects/<exe-name>/UsageTests/ExceptionTests.cpp" >
+        <Exception filename="projects/<exe-name>/UsageTests/Exception.tests.cpp" >
           expected exception
         </Exception>
         <OverallResults successes="0" failures="0" expectedFailures="1"/>
       </Section>
-      <Section name="inside REQUIRE_NOTHROW" filename="projects/<exe-name>/UsageTests/ExceptionTests.cpp" >
+      <Section name="inside REQUIRE_NOTHROW" filename="projects/<exe-name>/UsageTests/Exception.tests.cpp" >
         <Info>
           answer := 42
         </Info>
-        <Expression success="false" type="REQUIRE_NOTHROW" filename="projects/<exe-name>/UsageTests/ExceptionTests.cpp" >
+        <Expression success="false" type="REQUIRE_NOTHROW" filename="projects/<exe-name>/UsageTests/Exception.tests.cpp" >
           <Original>
             thisThrows()
           </Original>
           <Expanded>
             thisThrows()
           </Expanded>
-          <Exception filename="projects/<exe-name>/UsageTests/ExceptionTests.cpp" >
+          <Exception filename="projects/<exe-name>/UsageTests/Exception.tests.cpp" >
             expected exception
           </Exception>
         </Expression>
         <OverallResults successes="0" failures="0" expectedFailures="1"/>
       </Section>
-      <Section name="inside REQUIRE_THROWS" filename="projects/<exe-name>/UsageTests/ExceptionTests.cpp" >
+      <Section name="inside REQUIRE_THROWS" filename="projects/<exe-name>/UsageTests/Exception.tests.cpp" >
         <Info>
           answer := 42
         </Info>
-        <Expression success="true" type="REQUIRE_THROWS" filename="projects/<exe-name>/UsageTests/ExceptionTests.cpp" >
+        <Expression success="true" type="REQUIRE_THROWS" filename="projects/<exe-name>/UsageTests/Exception.tests.cpp" >
           <Original>
             thisThrows()
           </Original>
@@ -85,8 +85,8 @@
       </Section>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="#809" filename="projects/<exe-name>/UsageTests/CompilationTests.cpp" >
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/CompilationTests.cpp" >
+    <TestCase name="#809" filename="projects/<exe-name>/UsageTests/Compilation.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Compilation.tests.cpp" >
         <Original>
           42 == f
         </Original>
@@ -96,8 +96,8 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="#833" filename="projects/<exe-name>/UsageTests/CompilationTests.cpp" >
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/CompilationTests.cpp" >
+    <TestCase name="#833" filename="projects/<exe-name>/UsageTests/Compilation.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Compilation.tests.cpp" >
         <Original>
           a == t
         </Original>
@@ -105,7 +105,7 @@
           3 == 3
         </Expanded>
       </Expression>
-      <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/CompilationTests.cpp" >
+      <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/Compilation.tests.cpp" >
         <Original>
           a == t
         </Original>
@@ -113,7 +113,7 @@
           3 == 3
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE_THROWS" filename="projects/<exe-name>/UsageTests/CompilationTests.cpp" >
+      <Expression success="true" type="REQUIRE_THROWS" filename="projects/<exe-name>/UsageTests/Compilation.tests.cpp" >
         <Original>
           throws_int(true)
         </Original>
@@ -121,7 +121,7 @@
           throws_int(true)
         </Expanded>
       </Expression>
-      <Expression success="true" type="CHECK_THROWS_AS" filename="projects/<exe-name>/UsageTests/CompilationTests.cpp" >
+      <Expression success="true" type="CHECK_THROWS_AS" filename="projects/<exe-name>/UsageTests/Compilation.tests.cpp" >
         <Original>
           throws_int(true), int
         </Original>
@@ -129,7 +129,7 @@
           throws_int(true), int
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE_NOTHROW" filename="projects/<exe-name>/UsageTests/CompilationTests.cpp" >
+      <Expression success="true" type="REQUIRE_NOTHROW" filename="projects/<exe-name>/UsageTests/Compilation.tests.cpp" >
         <Original>
           throws_int(false)
         </Original>
@@ -137,7 +137,7 @@
           throws_int(false)
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE_THAT" filename="projects/<exe-name>/UsageTests/CompilationTests.cpp" >
+      <Expression success="true" type="REQUIRE_THAT" filename="projects/<exe-name>/UsageTests/Compilation.tests.cpp" >
         <Original>
           "aaa", Catch::EndsWith("aaa")
         </Original>
@@ -145,7 +145,7 @@
           "aaa" ends with: "aaa"
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/CompilationTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Compilation.tests.cpp" >
         <Original>
           templated_tests&lt;int>(3)
         </Original>
@@ -155,8 +155,8 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="#835 -- errno should not be touched by Catch" tags="[!shouldfail][.][failing]" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
-      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
+    <TestCase name="#835 -- errno should not be touched by Catch" tags="[!shouldfail][.][failing]" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
         <Original>
           f() == 0
         </Original>
@@ -164,7 +164,7 @@
           1 == 0
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
         <Original>
           errno == 1
         </Original>
@@ -174,11 +174,11 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="#872" filename="projects/<exe-name>/UsageTests/CompilationTests.cpp" >
+    <TestCase name="#872" filename="projects/<exe-name>/UsageTests/Compilation.tests.cpp" >
       <Info>
         dummy := 0
       </Info>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/CompilationTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Compilation.tests.cpp" >
         <Original>
           x == 4
         </Original>
@@ -188,26 +188,26 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="#961 -- Dynamically created sections should all be reported" tags="[.]" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
-      <Section name="Looped section 0" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
+    <TestCase name="#961 -- Dynamically created sections should all be reported" tags="[.]" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
+      <Section name="Looped section 0" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
         <OverallResults successes="1" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="Looped section 1" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
+      <Section name="Looped section 1" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
         <OverallResults successes="1" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="Looped section 2" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
+      <Section name="Looped section 2" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
         <OverallResults successes="1" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="Looped section 3" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
+      <Section name="Looped section 3" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
         <OverallResults successes="1" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="Looped section 4" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
+      <Section name="Looped section 4" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
         <OverallResults successes="1" failures="0" expectedFailures="0"/>
       </Section>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="'Not' checks that should fail" tags="[.][failing]" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
-      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+    <TestCase name="'Not' checks that should fail" tags="[.][failing]" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
           false != false
         </Original>
@@ -215,7 +215,7 @@
           false != false
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
           true != true
         </Original>
@@ -223,7 +223,7 @@
           true != true
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
           !true
         </Original>
@@ -231,7 +231,7 @@
           false
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK_FALSE" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK_FALSE" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
           !(true)
         </Original>
@@ -239,7 +239,7 @@
           !true
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
           !trueValue
         </Original>
@@ -247,7 +247,7 @@
           false
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK_FALSE" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK_FALSE" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
           !(trueValue)
         </Original>
@@ -255,7 +255,7 @@
           !true
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
           !(1 == 1)
         </Original>
@@ -263,7 +263,7 @@
           false
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK_FALSE" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK_FALSE" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
           !(1 == 1)
         </Original>
@@ -273,8 +273,8 @@
       </Expression>
       <OverallResult success="false"/>
     </TestCase>
-    <TestCase name="'Not' checks that should succeed" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+    <TestCase name="'Not' checks that should succeed" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
           false == false
         </Original>
@@ -282,7 +282,7 @@
           false == false
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
           true == true
         </Original>
@@ -290,7 +290,7 @@
           true == true
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
           !false
         </Original>
@@ -298,7 +298,7 @@
           true
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE_FALSE" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE_FALSE" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
           !(false)
         </Original>
@@ -306,7 +306,7 @@
           !false
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
           !falseValue
         </Original>
@@ -314,7 +314,7 @@
           true
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE_FALSE" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE_FALSE" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
           !(falseValue)
         </Original>
@@ -322,7 +322,7 @@
           !false
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
           !(1 == 2)
         </Original>
@@ -330,7 +330,7 @@
           true
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE_FALSE" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE_FALSE" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
           !(1 == 2)
         </Original>
@@ -340,9 +340,9 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="(unimplemented) static bools can be evaluated" tags="[Tricky]" filename="projects/<exe-name>/UsageTests/TrickyTests.cpp" >
-      <Section name="compare to true" filename="projects/<exe-name>/UsageTests/TrickyTests.cpp" >
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/TrickyTests.cpp" >
+    <TestCase name="(unimplemented) static bools can be evaluated" tags="[Tricky]" filename="projects/<exe-name>/UsageTests/Tricky.tests.cpp" >
+      <Section name="compare to true" filename="projects/<exe-name>/UsageTests/Tricky.tests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Tricky.tests.cpp" >
           <Original>
             is_true&lt;true>::value == true
           </Original>
@@ -350,7 +350,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/TrickyTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Tricky.tests.cpp" >
           <Original>
             true == is_true&lt;true>::value
           </Original>
@@ -360,8 +360,8 @@
         </Expression>
         <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="compare to false" filename="projects/<exe-name>/UsageTests/TrickyTests.cpp" >
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/TrickyTests.cpp" >
+      <Section name="compare to false" filename="projects/<exe-name>/UsageTests/Tricky.tests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Tricky.tests.cpp" >
           <Original>
             is_true&lt;false>::value == false
           </Original>
@@ -369,7 +369,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/TrickyTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Tricky.tests.cpp" >
           <Original>
             false == is_true&lt;false>::value
           </Original>
@@ -379,8 +379,8 @@
         </Expression>
         <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="negation" filename="projects/<exe-name>/UsageTests/TrickyTests.cpp" >
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/TrickyTests.cpp" >
+      <Section name="negation" filename="projects/<exe-name>/UsageTests/Tricky.tests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Tricky.tests.cpp" >
           <Original>
             !is_true&lt;false>::value
           </Original>
@@ -390,8 +390,8 @@
         </Expression>
         <OverallResults successes="1" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="double negation" filename="projects/<exe-name>/UsageTests/TrickyTests.cpp" >
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/TrickyTests.cpp" >
+      <Section name="double negation" filename="projects/<exe-name>/UsageTests/Tricky.tests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Tricky.tests.cpp" >
           <Original>
             !!is_true&lt;true>::value
           </Original>
@@ -401,8 +401,8 @@
         </Expression>
         <OverallResults successes="1" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="direct" filename="projects/<exe-name>/UsageTests/TrickyTests.cpp" >
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/TrickyTests.cpp" >
+      <Section name="direct" filename="projects/<exe-name>/UsageTests/Tricky.tests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Tricky.tests.cpp" >
           <Original>
             is_true&lt;true>::value
           </Original>
@@ -410,7 +410,7 @@
             true
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE_FALSE" filename="projects/<exe-name>/UsageTests/TrickyTests.cpp" >
+        <Expression success="true" type="REQUIRE_FALSE" filename="projects/<exe-name>/UsageTests/Tricky.tests.cpp" >
           <Original>
             !(is_true&lt;false>::value)
           </Original>
@@ -422,8 +422,8 @@
       </Section>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="A METHOD_AS_TEST_CASE based test run that fails" tags="[.][class][failing]" filename="projects/<exe-name>/UsageTests/ClassTests.cpp" >
-      <Expression success="false" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ClassTests.cpp" >
+    <TestCase name="A METHOD_AS_TEST_CASE based test run that fails" tags="[.][class][failing]" filename="projects/<exe-name>/UsageTests/Class.tests.cpp" >
+      <Expression success="false" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Class.tests.cpp" >
         <Original>
           s == "world"
         </Original>
@@ -433,8 +433,8 @@
       </Expression>
       <OverallResult success="false"/>
     </TestCase>
-    <TestCase name="A METHOD_AS_TEST_CASE based test run that succeeds" tags="[class]" filename="projects/<exe-name>/UsageTests/ClassTests.cpp" >
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ClassTests.cpp" >
+    <TestCase name="A METHOD_AS_TEST_CASE based test run that succeeds" tags="[class]" filename="projects/<exe-name>/UsageTests/Class.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Class.tests.cpp" >
         <Original>
           s == "hello"
         </Original>
@@ -444,8 +444,8 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="A TEST_CASE_METHOD based test run that fails" tags="[.][class][failing]" filename="projects/<exe-name>/UsageTests/ClassTests.cpp" >
-      <Expression success="false" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ClassTests.cpp" >
+    <TestCase name="A TEST_CASE_METHOD based test run that fails" tags="[.][class][failing]" filename="projects/<exe-name>/UsageTests/Class.tests.cpp" >
+      <Expression success="false" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Class.tests.cpp" >
         <Original>
           m_a == 2
         </Original>
@@ -455,8 +455,8 @@
       </Expression>
       <OverallResult success="false"/>
     </TestCase>
-    <TestCase name="A TEST_CASE_METHOD based test run that succeeds" tags="[class]" filename="projects/<exe-name>/UsageTests/ClassTests.cpp" >
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ClassTests.cpp" >
+    <TestCase name="A TEST_CASE_METHOD based test run that succeeds" tags="[class]" filename="projects/<exe-name>/UsageTests/Class.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Class.tests.cpp" >
         <Original>
           m_a == 1
         </Original>
@@ -466,20 +466,20 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="A couple of nested sections followed by a failure" tags="[.][failing]" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
-      <Section name="Outer" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
-        <Section name="Inner" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
+    <TestCase name="A couple of nested sections followed by a failure" tags="[.][failing]" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
+      <Section name="Outer" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
+        <Section name="Inner" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
           <OverallResults successes="1" failures="0" expectedFailures="0"/>
         </Section>
         <OverallResults successes="1" failures="0" expectedFailures="0"/>
       </Section>
-      <Failure filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
+      <Failure filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
         to infinity and beyond
       </Failure>
       <OverallResult success="false"/>
     </TestCase>
-    <TestCase name="A failing expression with a non streamable type is still captured" tags="[.][Tricky][failing]" filename="projects/<exe-name>/UsageTests/TrickyTests.cpp" >
-      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/TrickyTests.cpp" >
+    <TestCase name="A failing expression with a non streamable type is still captured" tags="[.][Tricky][failing]" filename="projects/<exe-name>/UsageTests/Tricky.tests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/Tricky.tests.cpp" >
         <Original>
           &amp;o1 == &amp;o2
         </Original>
@@ -487,7 +487,7 @@
           0x<hex digits> == 0x<hex digits>
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/TrickyTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/Tricky.tests.cpp" >
         <Original>
           o1 == o2
         </Original>
@@ -497,8 +497,8 @@
       </Expression>
       <OverallResult success="false"/>
     </TestCase>
-    <TestCase name="Absolute margin" tags="[Approx]" filename="projects/<exe-name>/UsageTests/ApproxTests.cpp" >
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ApproxTests.cpp" >
+    <TestCase name="Absolute margin" tags="[Approx]" filename="projects/<exe-name>/UsageTests/Approx.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Approx.tests.cpp" >
         <Original>
           104.0 != Approx(100.0)
         </Original>
@@ -506,7 +506,7 @@
           104.0 != Approx( 100.0 )
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ApproxTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Approx.tests.cpp" >
         <Original>
           104.0 == Approx(100.0).margin(5)
         </Original>
@@ -514,7 +514,7 @@
           104.0 == Approx( 100.0 )
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ApproxTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Approx.tests.cpp" >
         <Original>
           104.0 == Approx(100.0).margin(4)
         </Original>
@@ -522,7 +522,7 @@
           104.0 == Approx( 100.0 )
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ApproxTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Approx.tests.cpp" >
         <Original>
           104.0 != Approx(100.0).margin(3)
         </Original>
@@ -530,7 +530,7 @@
           104.0 != Approx( 100.0 )
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ApproxTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Approx.tests.cpp" >
         <Original>
           100.3 != Approx(100.0)
         </Original>
@@ -538,7 +538,7 @@
           100.3 != Approx( 100.0 )
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ApproxTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Approx.tests.cpp" >
         <Original>
           100.3 == Approx(100.0).margin(0.5)
         </Original>
@@ -548,11 +548,11 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="An empty test with no assertions" tags="[empty]" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
+    <TestCase name="An empty test with no assertions" tags="[empty]" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="An expression with side-effects should only be evaluated once" tags="[Tricky]" filename="projects/<exe-name>/UsageTests/TrickyTests.cpp" >
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/TrickyTests.cpp" >
+    <TestCase name="An expression with side-effects should only be evaluated once" tags="[Tricky]" filename="projects/<exe-name>/UsageTests/Tricky.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Tricky.tests.cpp" >
         <Original>
           i++ == 7
         </Original>
@@ -560,7 +560,7 @@
           7 == 7
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/TrickyTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Tricky.tests.cpp" >
         <Original>
           i++ == 8
         </Original>
@@ -570,8 +570,8 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="An unchecked exception reports the line of the last assertion" tags="[!throws][.][failing]" filename="projects/<exe-name>/UsageTests/ExceptionTests.cpp" >
-      <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/ExceptionTests.cpp" >
+    <TestCase name="An unchecked exception reports the line of the last assertion" tags="[!throws][.][failing]" filename="projects/<exe-name>/UsageTests/Exception.tests.cpp" >
+      <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/Exception.tests.cpp" >
         <Original>
           1 == 1
         </Original>
@@ -579,24 +579,24 @@
           1 == 1
         </Expanded>
       </Expression>
-      <Expression success="false" filename="projects/<exe-name>/UsageTests/ExceptionTests.cpp" >
+      <Expression success="false" filename="projects/<exe-name>/UsageTests/Exception.tests.cpp" >
         <Original>
           {Unknown expression after the reported line}
         </Original>
         <Expanded>
           {Unknown expression after the reported line}
         </Expanded>
-        <Exception filename="projects/<exe-name>/UsageTests/ExceptionTests.cpp" >
+        <Exception filename="projects/<exe-name>/UsageTests/Exception.tests.cpp" >
           unexpected exception
         </Exception>
       </Expression>
       <OverallResult success="false"/>
     </TestCase>
-    <TestCase name="Anonymous test case 1" filename="projects/<exe-name>/UsageTests/VariadicMacrosTests.cpp" >
+    <TestCase name="Anonymous test case 1" filename="projects/<exe-name>/UsageTests/VariadicMacros.tests.cpp" >
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Approx setters validate their arguments" tags="[Approx]" filename="projects/<exe-name>/UsageTests/ApproxTests.cpp" >
-      <Expression success="true" type="REQUIRE_NOTHROW" filename="projects/<exe-name>/UsageTests/ApproxTests.cpp" >
+    <TestCase name="Approx setters validate their arguments" tags="[Approx]" filename="projects/<exe-name>/UsageTests/Approx.tests.cpp" >
+      <Expression success="true" type="REQUIRE_NOTHROW" filename="projects/<exe-name>/UsageTests/Approx.tests.cpp" >
         <Original>
           Approx(0).margin(0)
         </Original>
@@ -604,7 +604,7 @@
           Approx(0).margin(0)
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE_NOTHROW" filename="projects/<exe-name>/UsageTests/ApproxTests.cpp" >
+      <Expression success="true" type="REQUIRE_NOTHROW" filename="projects/<exe-name>/UsageTests/Approx.tests.cpp" >
         <Original>
           Approx(0).margin(1234656)
         </Original>
@@ -612,7 +612,7 @@
           Approx(0).margin(1234656)
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE_THROWS_AS" filename="projects/<exe-name>/UsageTests/ApproxTests.cpp" >
+      <Expression success="true" type="REQUIRE_THROWS_AS" filename="projects/<exe-name>/UsageTests/Approx.tests.cpp" >
         <Original>
           Approx(0).margin(-2), std::domain_error
         </Original>
@@ -620,7 +620,7 @@
           Approx(0).margin(-2), std::domain_error
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE_NOTHROW" filename="projects/<exe-name>/UsageTests/ApproxTests.cpp" >
+      <Expression success="true" type="REQUIRE_NOTHROW" filename="projects/<exe-name>/UsageTests/Approx.tests.cpp" >
         <Original>
           Approx(0).epsilon(0)
         </Original>
@@ -628,7 +628,7 @@
           Approx(0).epsilon(0)
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE_NOTHROW" filename="projects/<exe-name>/UsageTests/ApproxTests.cpp" >
+      <Expression success="true" type="REQUIRE_NOTHROW" filename="projects/<exe-name>/UsageTests/Approx.tests.cpp" >
         <Original>
           Approx(0).epsilon(1)
         </Original>
@@ -636,7 +636,7 @@
           Approx(0).epsilon(1)
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE_THROWS_AS" filename="projects/<exe-name>/UsageTests/ApproxTests.cpp" >
+      <Expression success="true" type="REQUIRE_THROWS_AS" filename="projects/<exe-name>/UsageTests/Approx.tests.cpp" >
         <Original>
           Approx(0).epsilon(-0.001), std::domain_error
         </Original>
@@ -644,7 +644,7 @@
           Approx(0).epsilon(-0.001), std::domain_error
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE_THROWS_AS" filename="projects/<exe-name>/UsageTests/ApproxTests.cpp" >
+      <Expression success="true" type="REQUIRE_THROWS_AS" filename="projects/<exe-name>/UsageTests/Approx.tests.cpp" >
         <Original>
           Approx(0).epsilon(1.0001), std::domain_error
         </Original>
@@ -654,8 +654,8 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Approx with exactly-representable margin" tags="[Approx]" filename="projects/<exe-name>/UsageTests/ApproxTests.cpp" >
-      <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/ApproxTests.cpp" >
+    <TestCase name="Approx with exactly-representable margin" tags="[Approx]" filename="projects/<exe-name>/UsageTests/Approx.tests.cpp" >
+      <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/Approx.tests.cpp" >
         <Original>
           0.25f == Approx(0.0f).margin(0.25f)
         </Original>
@@ -663,7 +663,7 @@
           0.25f == Approx( 0.0 )
         </Expanded>
       </Expression>
-      <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/ApproxTests.cpp" >
+      <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/Approx.tests.cpp" >
         <Original>
           0.0f == Approx(0.25f).margin(0.25f)
         </Original>
@@ -671,7 +671,7 @@
           0.0f == Approx( 0.25 )
         </Expanded>
       </Expression>
-      <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/ApproxTests.cpp" >
+      <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/Approx.tests.cpp" >
         <Original>
           0.5f == Approx(0.25f).margin(0.25f)
         </Original>
@@ -679,7 +679,7 @@
           0.5f == Approx( 0.25 )
         </Expanded>
       </Expression>
-      <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/ApproxTests.cpp" >
+      <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/Approx.tests.cpp" >
         <Original>
           245.0f == Approx(245.25f).margin(0.25f)
         </Original>
@@ -687,7 +687,7 @@
           245.0f == Approx( 245.25 )
         </Expanded>
       </Expression>
-      <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/ApproxTests.cpp" >
+      <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/Approx.tests.cpp" >
         <Original>
           245.5f == Approx(245.25f).margin(0.25f)
         </Original>
@@ -697,8 +697,8 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Approximate PI" tags="[Approx][PI]" filename="projects/<exe-name>/UsageTests/ApproxTests.cpp" >
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ApproxTests.cpp" >
+    <TestCase name="Approximate PI" tags="[Approx][PI]" filename="projects/<exe-name>/UsageTests/Approx.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Approx.tests.cpp" >
         <Original>
           divide( 22, 7 ) == Approx( 3.141 ).epsilon( 0.001 )
         </Original>
@@ -706,7 +706,7 @@
           3.1428571429 == Approx( 3.141 )
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ApproxTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Approx.tests.cpp" >
         <Original>
           divide( 22, 7 ) != Approx( 3.141 ).epsilon( 0.0001 )
         </Original>
@@ -716,8 +716,8 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Approximate comparisons with different epsilons" tags="[Approx]" filename="projects/<exe-name>/UsageTests/ApproxTests.cpp" >
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ApproxTests.cpp" >
+    <TestCase name="Approximate comparisons with different epsilons" tags="[Approx]" filename="projects/<exe-name>/UsageTests/Approx.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Approx.tests.cpp" >
         <Original>
           d != Approx( 1.231 )
         </Original>
@@ -725,7 +725,7 @@
           1.23 != Approx( 1.231 )
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ApproxTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Approx.tests.cpp" >
         <Original>
           d == Approx( 1.231 ).epsilon( 0.1 )
         </Original>
@@ -735,8 +735,8 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Approximate comparisons with floats" tags="[Approx]" filename="projects/<exe-name>/UsageTests/ApproxTests.cpp" >
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ApproxTests.cpp" >
+    <TestCase name="Approximate comparisons with floats" tags="[Approx]" filename="projects/<exe-name>/UsageTests/Approx.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Approx.tests.cpp" >
         <Original>
           1.23f == Approx( 1.23f )
         </Original>
@@ -744,7 +744,7 @@
           1.23f == Approx( 1.2300000191 )
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ApproxTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Approx.tests.cpp" >
         <Original>
           0.0f == Approx( 0.0f )
         </Original>
@@ -754,8 +754,8 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Approximate comparisons with ints" tags="[Approx]" filename="projects/<exe-name>/UsageTests/ApproxTests.cpp" >
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ApproxTests.cpp" >
+    <TestCase name="Approximate comparisons with ints" tags="[Approx]" filename="projects/<exe-name>/UsageTests/Approx.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Approx.tests.cpp" >
         <Original>
           1 == Approx( 1 )
         </Original>
@@ -763,7 +763,7 @@
           1 == Approx( 1.0 )
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ApproxTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Approx.tests.cpp" >
         <Original>
           0 == Approx( 0 )
         </Original>
@@ -773,8 +773,8 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Approximate comparisons with mixed numeric types" tags="[Approx]" filename="projects/<exe-name>/UsageTests/ApproxTests.cpp" >
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ApproxTests.cpp" >
+    <TestCase name="Approximate comparisons with mixed numeric types" tags="[Approx]" filename="projects/<exe-name>/UsageTests/Approx.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Approx.tests.cpp" >
         <Original>
           1.0f == Approx( 1 )
         </Original>
@@ -782,7 +782,7 @@
           1.0f == Approx( 1.0 )
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ApproxTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Approx.tests.cpp" >
         <Original>
           0 == Approx( dZero)
         </Original>
@@ -790,7 +790,7 @@
           0 == Approx( 0.0 )
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ApproxTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Approx.tests.cpp" >
         <Original>
           0 == Approx( dSmall ).margin( 0.001 )
         </Original>
@@ -798,7 +798,7 @@
           0 == Approx( 0.00001 )
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ApproxTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Approx.tests.cpp" >
         <Original>
           1.234f == Approx( dMedium )
         </Original>
@@ -806,7 +806,7 @@
           1.234f == Approx( 1.234 )
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ApproxTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Approx.tests.cpp" >
         <Original>
           dMedium == Approx( 1.234f )
         </Original>
@@ -816,8 +816,8 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Assertions then sections" tags="[Tricky]" filename="projects/<exe-name>/UsageTests/TrickyTests.cpp" >
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/TrickyTests.cpp" >
+    <TestCase name="Assertions then sections" tags="[Tricky]" filename="projects/<exe-name>/UsageTests/Tricky.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Tricky.tests.cpp" >
         <Original>
           Catch::alwaysTrue()
         </Original>
@@ -825,8 +825,8 @@
           true
         </Expanded>
       </Expression>
-      <Section name="A section" filename="projects/<exe-name>/UsageTests/TrickyTests.cpp" >
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/TrickyTests.cpp" >
+      <Section name="A section" filename="projects/<exe-name>/UsageTests/Tricky.tests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Tricky.tests.cpp" >
           <Original>
             Catch::alwaysTrue()
           </Original>
@@ -834,8 +834,8 @@
             true
           </Expanded>
         </Expression>
-        <Section name="Another section" filename="projects/<exe-name>/UsageTests/TrickyTests.cpp" >
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/TrickyTests.cpp" >
+        <Section name="Another section" filename="projects/<exe-name>/UsageTests/Tricky.tests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Tricky.tests.cpp" >
             <Original>
               Catch::alwaysTrue()
             </Original>
@@ -847,7 +847,7 @@
         </Section>
         <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/TrickyTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Tricky.tests.cpp" >
         <Original>
           Catch::alwaysTrue()
         </Original>
@@ -855,8 +855,8 @@
           true
         </Expanded>
       </Expression>
-      <Section name="A section" filename="projects/<exe-name>/UsageTests/TrickyTests.cpp" >
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/TrickyTests.cpp" >
+      <Section name="A section" filename="projects/<exe-name>/UsageTests/Tricky.tests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Tricky.tests.cpp" >
           <Original>
             Catch::alwaysTrue()
           </Original>
@@ -864,8 +864,8 @@
             true
           </Expanded>
         </Expression>
-        <Section name="Another other section" filename="projects/<exe-name>/UsageTests/TrickyTests.cpp" >
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/TrickyTests.cpp" >
+        <Section name="Another other section" filename="projects/<exe-name>/UsageTests/Tricky.tests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Tricky.tests.cpp" >
             <Original>
               Catch::alwaysTrue()
             </Original>
@@ -879,8 +879,8 @@
       </Section>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Assorted miscellaneous tests" tags="[Approx]" filename="projects/<exe-name>/UsageTests/ApproxTests.cpp" >
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ApproxTests.cpp" >
+    <TestCase name="Assorted miscellaneous tests" tags="[Approx]" filename="projects/<exe-name>/UsageTests/Approx.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Approx.tests.cpp" >
         <Original>
           INFINITY == Approx(INFINITY)
         </Original>
@@ -888,7 +888,7 @@
           inff == Approx( inf )
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ApproxTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Approx.tests.cpp" >
         <Original>
           NAN != Approx(NAN)
         </Original>
@@ -896,7 +896,7 @@
           nanf != Approx( nan )
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE_FALSE" filename="projects/<exe-name>/UsageTests/ApproxTests.cpp" >
+      <Expression success="true" type="REQUIRE_FALSE" filename="projects/<exe-name>/UsageTests/Approx.tests.cpp" >
         <Original>
           !(NAN == Approx(NAN))
         </Original>
@@ -906,8 +906,8 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Bitfields can be captured (#1027)" filename="projects/<exe-name>/UsageTests/TrickyTests.cpp" >
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/TrickyTests.cpp" >
+    <TestCase name="Bitfields can be captured (#1027)" filename="projects/<exe-name>/UsageTests/Tricky.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Tricky.tests.cpp" >
         <Original>
           y.v == 0
         </Original>
@@ -915,7 +915,7 @@
           0 == 0
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/TrickyTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Tricky.tests.cpp" >
         <Original>
           0 == y.v
         </Original>
@@ -925,12 +925,12 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Capture and info messages" filename="projects/<exe-name>/UsageTests/ToStringGeneralTests.cpp" >
-      <Section name="Capture should stringify like assertions" filename="projects/<exe-name>/UsageTests/ToStringGeneralTests.cpp" >
+    <TestCase name="Capture and info messages" filename="projects/<exe-name>/UsageTests/ToStringGeneral.tests.cpp" >
+      <Section name="Capture should stringify like assertions" filename="projects/<exe-name>/UsageTests/ToStringGeneral.tests.cpp" >
         <Info>
           i := 2
         </Info>
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ToStringGeneralTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ToStringGeneral.tests.cpp" >
           <Original>
             true
           </Original>
@@ -940,11 +940,11 @@
         </Expression>
         <OverallResults successes="1" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="Info should NOT stringify the way assertions do" filename="projects/<exe-name>/UsageTests/ToStringGeneralTests.cpp" >
+      <Section name="Info should NOT stringify the way assertions do" filename="projects/<exe-name>/UsageTests/ToStringGeneral.tests.cpp" >
         <Info>
           3
         </Info>
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ToStringGeneralTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ToStringGeneral.tests.cpp" >
           <Original>
             true
           </Original>
@@ -956,9 +956,9 @@
       </Section>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Character pretty printing" filename="projects/<exe-name>/UsageTests/ToStringGeneralTests.cpp" >
-      <Section name="Specifically escaped" filename="projects/<exe-name>/UsageTests/ToStringGeneralTests.cpp" >
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/ToStringGeneralTests.cpp" >
+    <TestCase name="Character pretty printing" filename="projects/<exe-name>/UsageTests/ToStringGeneral.tests.cpp" >
+      <Section name="Specifically escaped" filename="projects/<exe-name>/UsageTests/ToStringGeneral.tests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/ToStringGeneral.tests.cpp" >
           <Original>
             tab == '\t'
           </Original>
@@ -966,7 +966,7 @@
             '\t' == '\t'
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/ToStringGeneralTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/ToStringGeneral.tests.cpp" >
           <Original>
             newline == '\n'
           </Original>
@@ -974,7 +974,7 @@
             '\n' == '\n'
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/ToStringGeneralTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/ToStringGeneral.tests.cpp" >
           <Original>
             carr_return == '\r'
           </Original>
@@ -982,7 +982,7 @@
             '\r' == '\r'
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/ToStringGeneralTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/ToStringGeneral.tests.cpp" >
           <Original>
             form_feed == '\f'
           </Original>
@@ -992,8 +992,8 @@
         </Expression>
         <OverallResults successes="4" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="General chars" filename="projects/<exe-name>/UsageTests/ToStringGeneralTests.cpp" >
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/ToStringGeneralTests.cpp" >
+      <Section name="General chars" filename="projects/<exe-name>/UsageTests/ToStringGeneral.tests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/ToStringGeneral.tests.cpp" >
           <Original>
             space == ' '
           </Original>
@@ -1001,7 +1001,7 @@
             ' ' == ' '
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ToStringGeneralTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ToStringGeneral.tests.cpp" >
           <Original>
             c == chars[i]
           </Original>
@@ -1009,7 +1009,7 @@
             'a' == 'a'
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ToStringGeneralTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ToStringGeneral.tests.cpp" >
           <Original>
             c == chars[i]
           </Original>
@@ -1017,7 +1017,7 @@
             'z' == 'z'
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ToStringGeneralTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ToStringGeneral.tests.cpp" >
           <Original>
             c == chars[i]
           </Original>
@@ -1025,7 +1025,7 @@
             'A' == 'A'
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ToStringGeneralTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ToStringGeneral.tests.cpp" >
           <Original>
             c == chars[i]
           </Original>
@@ -1035,8 +1035,8 @@
         </Expression>
         <OverallResults successes="5" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="Low ASCII" filename="projects/<exe-name>/UsageTests/ToStringGeneralTests.cpp" >
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/ToStringGeneralTests.cpp" >
+      <Section name="Low ASCII" filename="projects/<exe-name>/UsageTests/ToStringGeneral.tests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/ToStringGeneral.tests.cpp" >
           <Original>
             null_terminator == '\0'
           </Original>
@@ -1044,7 +1044,7 @@
             0 == 0
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ToStringGeneralTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ToStringGeneral.tests.cpp" >
           <Original>
             c == i
           </Original>
@@ -1052,7 +1052,7 @@
             2 == 2
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ToStringGeneralTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ToStringGeneral.tests.cpp" >
           <Original>
             c == i
           </Original>
@@ -1060,7 +1060,7 @@
             3 == 3
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ToStringGeneralTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ToStringGeneral.tests.cpp" >
           <Original>
             c == i
           </Original>
@@ -1068,7 +1068,7 @@
             4 == 4
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ToStringGeneralTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ToStringGeneral.tests.cpp" >
           <Original>
             c == i
           </Original>
@@ -1080,8 +1080,8 @@
       </Section>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Commas in various macros are allowed" filename="projects/<exe-name>/UsageTests/TrickyTests.cpp" >
-      <Expression success="true" type="REQUIRE_THROWS" filename="projects/<exe-name>/UsageTests/TrickyTests.cpp" >
+    <TestCase name="Commas in various macros are allowed" filename="projects/<exe-name>/UsageTests/Tricky.tests.cpp" >
+      <Expression success="true" type="REQUIRE_THROWS" filename="projects/<exe-name>/UsageTests/Tricky.tests.cpp" >
         <Original>
           std::vector&lt;constructor_throws>{constructor_throws{}, constructor_throws{}}
         </Original>
@@ -1089,7 +1089,7 @@
           std::vector&lt;constructor_throws>{constructor_throws{}, constructor_throws{}}
         </Expanded>
       </Expression>
-      <Expression success="true" type="CHECK_THROWS" filename="projects/<exe-name>/UsageTests/TrickyTests.cpp" >
+      <Expression success="true" type="CHECK_THROWS" filename="projects/<exe-name>/UsageTests/Tricky.tests.cpp" >
         <Original>
           std::vector&lt;constructor_throws>{constructor_throws{}, constructor_throws{}}
         </Original>
@@ -1097,7 +1097,7 @@
           std::vector&lt;constructor_throws>{constructor_throws{}, constructor_throws{}}
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE_NOTHROW" filename="projects/<exe-name>/UsageTests/TrickyTests.cpp" >
+      <Expression success="true" type="REQUIRE_NOTHROW" filename="projects/<exe-name>/UsageTests/Tricky.tests.cpp" >
         <Original>
           std::vector&lt;int>{1, 2, 3} == std::vector&lt;int>{1, 2, 3}
         </Original>
@@ -1105,7 +1105,7 @@
           std::vector&lt;int>{1, 2, 3} == std::vector&lt;int>{1, 2, 3}
         </Expanded>
       </Expression>
-      <Expression success="true" type="CHECK_NOTHROW" filename="projects/<exe-name>/UsageTests/TrickyTests.cpp" >
+      <Expression success="true" type="CHECK_NOTHROW" filename="projects/<exe-name>/UsageTests/Tricky.tests.cpp" >
         <Original>
           std::vector&lt;int>{1, 2, 3} == std::vector&lt;int>{1, 2, 3}
         </Original>
@@ -1113,7 +1113,7 @@
           std::vector&lt;int>{1, 2, 3} == std::vector&lt;int>{1, 2, 3}
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/TrickyTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Tricky.tests.cpp" >
         <Original>
           std::vector&lt;int>{1, 2} == std::vector&lt;int>{1, 2}
         </Original>
@@ -1121,7 +1121,7 @@
           { 1, 2 } == { 1, 2 }
         </Expanded>
       </Expression>
-      <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/TrickyTests.cpp" >
+      <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/Tricky.tests.cpp" >
         <Original>
           std::vector&lt;int>{1, 2} == std::vector&lt;int>{1, 2}
         </Original>
@@ -1129,7 +1129,7 @@
           { 1, 2 } == { 1, 2 }
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE_FALSE" filename="projects/<exe-name>/UsageTests/TrickyTests.cpp" >
+      <Expression success="true" type="REQUIRE_FALSE" filename="projects/<exe-name>/UsageTests/Tricky.tests.cpp" >
         <Original>
           !(std::vector&lt;int>{1, 2} == std::vector&lt;int>{1, 2, 3})
         </Original>
@@ -1137,7 +1137,7 @@
           !({ 1, 2 } == { 1, 2, 3 })
         </Expanded>
       </Expression>
-      <Expression success="true" type="CHECK_FALSE" filename="projects/<exe-name>/UsageTests/TrickyTests.cpp" >
+      <Expression success="true" type="CHECK_FALSE" filename="projects/<exe-name>/UsageTests/Tricky.tests.cpp" >
         <Original>
           !(std::vector&lt;int>{1, 2} == std::vector&lt;int>{1, 2, 3})
         </Original>
@@ -1145,7 +1145,7 @@
           !({ 1, 2 } == { 1, 2, 3 })
         </Expanded>
       </Expression>
-      <Expression success="true" type="CHECK_NOFAIL" filename="projects/<exe-name>/UsageTests/TrickyTests.cpp" >
+      <Expression success="true" type="CHECK_NOFAIL" filename="projects/<exe-name>/UsageTests/Tricky.tests.cpp" >
         <Original>
           std::vector&lt;int>{1, 2} == std::vector&lt;int>{1, 2}
         </Original>
@@ -1153,7 +1153,7 @@
           { 1, 2 } == { 1, 2 }
         </Expanded>
       </Expression>
-      <Expression success="true" type="CHECKED_IF" filename="projects/<exe-name>/UsageTests/TrickyTests.cpp" >
+      <Expression success="true" type="CHECKED_IF" filename="projects/<exe-name>/UsageTests/Tricky.tests.cpp" >
         <Original>
           std::vector&lt;int>{1, 2} == std::vector&lt;int>{1, 2}
         </Original>
@@ -1161,7 +1161,7 @@
           { 1, 2 } == { 1, 2 }
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/TrickyTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Tricky.tests.cpp" >
         <Original>
           true
         </Original>
@@ -1169,7 +1169,7 @@
           true
         </Expanded>
       </Expression>
-      <Expression success="true" type="CHECKED_ELSE" filename="projects/<exe-name>/UsageTests/TrickyTests.cpp" >
+      <Expression success="true" type="CHECKED_ELSE" filename="projects/<exe-name>/UsageTests/Tricky.tests.cpp" >
         <Original>
           std::vector&lt;int>{1, 2} == std::vector&lt;int>{1, 2}
         </Original>
@@ -1179,8 +1179,8 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Comparing function pointers" tags="[Tricky][function pointer]" filename="projects/<exe-name>/UsageTests/TrickyTests.cpp" >
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/TrickyTests.cpp" >
+    <TestCase name="Comparing function pointers" tags="[Tricky][function pointer]" filename="projects/<exe-name>/UsageTests/Tricky.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Tricky.tests.cpp" >
         <Original>
           a
         </Original>
@@ -1188,7 +1188,7 @@
           0x<hex digits>
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/TrickyTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Tricky.tests.cpp" >
         <Original>
           a == &amp;foo
         </Original>
@@ -1198,8 +1198,8 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Comparison with explicitly convertible types" tags="[Approx]" filename="projects/<exe-name>/UsageTests/ApproxTests.cpp" >
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ApproxTests.cpp" >
+    <TestCase name="Comparison with explicitly convertible types" tags="[Approx]" filename="projects/<exe-name>/UsageTests/Approx.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Approx.tests.cpp" >
         <Original>
           td == Approx(10.0)
         </Original>
@@ -1207,7 +1207,7 @@
           StrongDoubleTypedef(10) == Approx( 10.0 )
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ApproxTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Approx.tests.cpp" >
         <Original>
           Approx(10.0) == td
         </Original>
@@ -1215,7 +1215,7 @@
           Approx( 10.0 ) == StrongDoubleTypedef(10)
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ApproxTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Approx.tests.cpp" >
         <Original>
           td != Approx(11.0)
         </Original>
@@ -1223,7 +1223,7 @@
           StrongDoubleTypedef(10) != Approx( 11.0 )
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ApproxTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Approx.tests.cpp" >
         <Original>
           Approx(11.0) != td
         </Original>
@@ -1231,7 +1231,7 @@
           Approx( 11.0 ) != StrongDoubleTypedef(10)
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ApproxTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Approx.tests.cpp" >
         <Original>
           td &lt;= Approx(10.0)
         </Original>
@@ -1239,7 +1239,7 @@
           StrongDoubleTypedef(10) &lt;= Approx( 10.0 )
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ApproxTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Approx.tests.cpp" >
         <Original>
           td &lt;= Approx(11.0)
         </Original>
@@ -1247,7 +1247,7 @@
           StrongDoubleTypedef(10) &lt;= Approx( 11.0 )
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ApproxTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Approx.tests.cpp" >
         <Original>
           Approx(10.0) &lt;= td
         </Original>
@@ -1255,7 +1255,7 @@
           Approx( 10.0 ) &lt;= StrongDoubleTypedef(10)
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ApproxTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Approx.tests.cpp" >
         <Original>
           Approx(9.0) &lt;= td
         </Original>
@@ -1263,7 +1263,7 @@
           Approx( 9.0 ) &lt;= StrongDoubleTypedef(10)
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ApproxTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Approx.tests.cpp" >
         <Original>
           td >= Approx(9.0)
         </Original>
@@ -1271,7 +1271,7 @@
           StrongDoubleTypedef(10) >= Approx( 9.0 )
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ApproxTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Approx.tests.cpp" >
         <Original>
           td >= Approx(10.0)
         </Original>
@@ -1279,7 +1279,7 @@
           StrongDoubleTypedef(10) >= Approx( 10.0 )
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ApproxTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Approx.tests.cpp" >
         <Original>
           Approx(10.0) >= td
         </Original>
@@ -1287,7 +1287,7 @@
           Approx( 10.0 ) >= StrongDoubleTypedef(10)
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ApproxTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Approx.tests.cpp" >
         <Original>
           Approx(11.0) >= td
         </Original>
@@ -1297,8 +1297,8 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Comparisons between ints where one side is computed" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
-      <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+    <TestCase name="Comparisons between ints where one side is computed" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
+      <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
           54 == 6*9
         </Original>
@@ -1308,8 +1308,8 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Comparisons between unsigned ints and negative signed ints match c++ standard behaviour" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
-      <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+    <TestCase name="Comparisons between unsigned ints and negative signed ints match c++ standard behaviour" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
+      <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
           ( -1 > 2u )
         </Original>
@@ -1317,7 +1317,7 @@
           true
         </Expanded>
       </Expression>
-      <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+      <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
           -1 > 2u
         </Original>
@@ -1325,7 +1325,7 @@
           -1 > 2
         </Expanded>
       </Expression>
-      <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+      <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
           ( 2u &lt; -1 )
         </Original>
@@ -1333,7 +1333,7 @@
           true
         </Expanded>
       </Expression>
-      <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+      <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
           2u &lt; -1
         </Original>
@@ -1341,7 +1341,7 @@
           2 &lt; -1
         </Expanded>
       </Expression>
-      <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+      <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
           ( minInt > 2u )
         </Original>
@@ -1349,7 +1349,7 @@
           true
         </Expanded>
       </Expression>
-      <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+      <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
           minInt > 2u
         </Original>
@@ -1359,8 +1359,8 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Comparisons with int literals don't warn when mixing signed/ unsigned" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+    <TestCase name="Comparisons with int literals don't warn when mixing signed/ unsigned" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
           i == 1
         </Original>
@@ -1368,7 +1368,7 @@
           1 == 1
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
           ui == 2
         </Original>
@@ -1376,7 +1376,7 @@
           2 == 2
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
           l == 3
         </Original>
@@ -1384,7 +1384,7 @@
           3 == 3
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
           ul == 4
         </Original>
@@ -1392,7 +1392,7 @@
           4 == 4
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
           c == 5
         </Original>
@@ -1400,7 +1400,7 @@
           5 == 5
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
           uc == 6
         </Original>
@@ -1408,7 +1408,7 @@
           6 == 6
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
           1 == i
         </Original>
@@ -1416,7 +1416,7 @@
           1 == 1
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
           2 == ui
         </Original>
@@ -1424,7 +1424,7 @@
           2 == 2
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
           3 == l
         </Original>
@@ -1432,7 +1432,7 @@
           3 == 3
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
           4 == ul
         </Original>
@@ -1440,7 +1440,7 @@
           4 == 4
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
           5 == c
         </Original>
@@ -1448,7 +1448,7 @@
           5 == 5
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
           6 == uc
         </Original>
@@ -1456,7 +1456,7 @@
           6 == 6
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
           (std::numeric_limits&lt;uint32_t>::max)() > ul
         </Original>
@@ -1466,8 +1466,8 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Contains string matcher" tags="[.][failing][matchers]" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
-      <Expression success="false" type="CHECK_THAT" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
+    <TestCase name="Contains string matcher" tags="[.][failing][matchers]" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
+      <Expression success="false" type="CHECK_THAT" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
         <Original>
           testStringForMatching(), Contains( "not there", Catch::CaseSensitive::No )
         </Original>
@@ -1475,7 +1475,7 @@
           "this string contains 'abc' as a substring" contains: "not there" (case insensitive)
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK_THAT" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
+      <Expression success="false" type="CHECK_THAT" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
         <Original>
           testStringForMatching(), Contains( "STRING" )
         </Original>
@@ -1485,42 +1485,42 @@
       </Expression>
       <OverallResult success="false"/>
     </TestCase>
-    <TestCase name="Custom exceptions can be translated when testing for nothrow" tags="[!throws][.][failing]" filename="projects/<exe-name>/UsageTests/ExceptionTests.cpp" >
-      <Expression success="false" type="REQUIRE_NOTHROW" filename="projects/<exe-name>/UsageTests/ExceptionTests.cpp" >
+    <TestCase name="Custom exceptions can be translated when testing for nothrow" tags="[!throws][.][failing]" filename="projects/<exe-name>/UsageTests/Exception.tests.cpp" >
+      <Expression success="false" type="REQUIRE_NOTHROW" filename="projects/<exe-name>/UsageTests/Exception.tests.cpp" >
         <Original>
           throwCustom()
         </Original>
         <Expanded>
           throwCustom()
         </Expanded>
-        <Exception filename="projects/<exe-name>/UsageTests/ExceptionTests.cpp" >
+        <Exception filename="projects/<exe-name>/UsageTests/Exception.tests.cpp" >
           custom exception - not std
         </Exception>
       </Expression>
       <OverallResult success="false"/>
     </TestCase>
-    <TestCase name="Custom exceptions can be translated when testing for throwing as something else" tags="[!throws][.][failing]" filename="projects/<exe-name>/UsageTests/ExceptionTests.cpp" >
-      <Expression success="false" type="REQUIRE_THROWS_AS" filename="projects/<exe-name>/UsageTests/ExceptionTests.cpp" >
+    <TestCase name="Custom exceptions can be translated when testing for throwing as something else" tags="[!throws][.][failing]" filename="projects/<exe-name>/UsageTests/Exception.tests.cpp" >
+      <Expression success="false" type="REQUIRE_THROWS_AS" filename="projects/<exe-name>/UsageTests/Exception.tests.cpp" >
         <Original>
           throwCustom(), std::exception
         </Original>
         <Expanded>
           throwCustom(), std::exception
         </Expanded>
-        <Exception filename="projects/<exe-name>/UsageTests/ExceptionTests.cpp" >
+        <Exception filename="projects/<exe-name>/UsageTests/Exception.tests.cpp" >
           custom exception - not std
         </Exception>
       </Expression>
       <OverallResult success="false"/>
     </TestCase>
-    <TestCase name="Custom std-exceptions can be custom translated" tags="[!throws][.][failing]" filename="projects/<exe-name>/UsageTests/ExceptionTests.cpp" >
-      <Exception filename="projects/<exe-name>/UsageTests/ExceptionTests.cpp" >
+    <TestCase name="Custom std-exceptions can be custom translated" tags="[!throws][.][failing]" filename="projects/<exe-name>/UsageTests/Exception.tests.cpp" >
+      <Exception filename="projects/<exe-name>/UsageTests/Exception.tests.cpp" >
         custom std exception
       </Exception>
       <OverallResult success="false"/>
     </TestCase>
-    <TestCase name="Default scale is invisible to comparison" tags="[Approx]" filename="projects/<exe-name>/UsageTests/ApproxTests.cpp" >
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ApproxTests.cpp" >
+    <TestCase name="Default scale is invisible to comparison" tags="[Approx]" filename="projects/<exe-name>/UsageTests/Approx.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Approx.tests.cpp" >
         <Original>
           101.000001 != Approx(100).epsilon(0.01)
         </Original>
@@ -1528,7 +1528,7 @@
           101.000001 != Approx( 100.0 )
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ApproxTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Approx.tests.cpp" >
         <Original>
           std::pow(10, -5) != Approx(std::pow(10, -7))
         </Original>
@@ -1538,8 +1538,8 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="EndsWith string matcher" tags="[.][failing][matchers]" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
-      <Expression success="false" type="CHECK_THAT" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
+    <TestCase name="EndsWith string matcher" tags="[.][failing][matchers]" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
+      <Expression success="false" type="CHECK_THAT" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
         <Original>
           testStringForMatching(), EndsWith( "Substring" )
         </Original>
@@ -1547,7 +1547,7 @@
           "this string contains 'abc' as a substring" ends with: "Substring"
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK_THAT" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
+      <Expression success="false" type="CHECK_THAT" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
         <Original>
           testStringForMatching(), EndsWith( "this", Catch::CaseSensitive::No )
         </Original>
@@ -1557,8 +1557,8 @@
       </Expression>
       <OverallResult success="false"/>
     </TestCase>
-    <TestCase name="Epsilon only applies to Approx's value" tags="[Approx]" filename="projects/<exe-name>/UsageTests/ApproxTests.cpp" >
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ApproxTests.cpp" >
+    <TestCase name="Epsilon only applies to Approx's value" tags="[Approx]" filename="projects/<exe-name>/UsageTests/Approx.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Approx.tests.cpp" >
         <Original>
           101.01 != Approx(100).epsilon(0.01)
         </Original>
@@ -1568,8 +1568,8 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Equality checks that should fail" tags="[!mayfail][.][failing]" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
-      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+    <TestCase name="Equality checks that should fail" tags="[!mayfail][.][failing]" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
           data.int_seven == 6
         </Original>
@@ -1577,7 +1577,7 @@
           7 == 6
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
           data.int_seven == 8
         </Original>
@@ -1585,7 +1585,7 @@
           7 == 8
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
           data.int_seven == 0
         </Original>
@@ -1593,7 +1593,7 @@
           7 == 0
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
           data.float_nine_point_one == Approx( 9.11f )
         </Original>
@@ -1601,7 +1601,7 @@
           9.1f == Approx( 9.1099996567 )
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
           data.float_nine_point_one == Approx( 9.0f )
         </Original>
@@ -1609,7 +1609,7 @@
           9.1f == Approx( 9.0 )
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
           data.float_nine_point_one == Approx( 1 )
         </Original>
@@ -1617,7 +1617,7 @@
           9.1f == Approx( 1.0 )
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
           data.float_nine_point_one == Approx( 0 )
         </Original>
@@ -1625,7 +1625,7 @@
           9.1f == Approx( 0.0 )
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
           data.double_pi == Approx( 3.1415 )
         </Original>
@@ -1633,7 +1633,7 @@
           3.1415926535 == Approx( 3.1415 )
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
           data.str_hello == "goodbye"
         </Original>
@@ -1641,7 +1641,7 @@
           "hello" == "goodbye"
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
           data.str_hello == "hell"
         </Original>
@@ -1649,7 +1649,7 @@
           "hello" == "hell"
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
           data.str_hello == "hello1"
         </Original>
@@ -1657,7 +1657,7 @@
           "hello" == "hello1"
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
           data.str_hello.size() == 6
         </Original>
@@ -1665,7 +1665,7 @@
           5 == 6
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
           x == Approx( 1.301 )
         </Original>
@@ -1675,8 +1675,8 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Equality checks that should succeed" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+    <TestCase name="Equality checks that should succeed" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
           data.int_seven == 7
         </Original>
@@ -1684,7 +1684,7 @@
           7 == 7
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
           data.float_nine_point_one == Approx( 9.1f )
         </Original>
@@ -1692,7 +1692,7 @@
           9.1f == Approx( 9.1000003815 )
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
           data.double_pi == Approx( 3.1415926535 )
         </Original>
@@ -1700,7 +1700,7 @@
           3.1415926535 == Approx( 3.1415926535 )
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
           data.str_hello == "hello"
         </Original>
@@ -1708,7 +1708,7 @@
           "hello" == "hello"
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
           "hello" == data.str_hello
         </Original>
@@ -1716,7 +1716,7 @@
           "hello" == "hello"
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
           data.str_hello.size() == 5
         </Original>
@@ -1724,7 +1724,7 @@
           5 == 5
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
           x == Approx( 1.3 )
         </Original>
@@ -1734,8 +1734,8 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Equals" tags="[matchers]" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
-      <Expression success="true" type="CHECK_THAT" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
+    <TestCase name="Equals" tags="[matchers]" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
+      <Expression success="true" type="CHECK_THAT" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
         <Original>
           testStringForMatching(), Equals( "this string contains 'abc' as a substring" )
         </Original>
@@ -1743,7 +1743,7 @@
           "this string contains 'abc' as a substring" equals: "this string contains 'abc' as a substring"
         </Expanded>
       </Expression>
-      <Expression success="true" type="CHECK_THAT" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
+      <Expression success="true" type="CHECK_THAT" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
         <Original>
           testStringForMatching(), Equals( "this string contains 'ABC' as a substring", Catch::CaseSensitive::No )
         </Original>
@@ -1753,8 +1753,8 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Equals string matcher" tags="[.][failing][matchers]" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
-      <Expression success="false" type="CHECK_THAT" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
+    <TestCase name="Equals string matcher" tags="[.][failing][matchers]" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
+      <Expression success="false" type="CHECK_THAT" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
         <Original>
           testStringForMatching(), Equals( "this string contains 'ABC' as a substring" )
         </Original>
@@ -1762,7 +1762,7 @@
           "this string contains 'abc' as a substring" equals: "this string contains 'ABC' as a substring"
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK_THAT" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
+      <Expression success="false" type="CHECK_THAT" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
         <Original>
           testStringForMatching(), Equals( "something else", Catch::CaseSensitive::No )
         </Original>
@@ -1772,9 +1772,9 @@
       </Expression>
       <OverallResult success="false"/>
     </TestCase>
-    <TestCase name="Exception matchers that fail" tags="[!throws][.][.failing][exceptions][matchers]" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
-      <Section name="No exception" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
-        <Expression success="false" type="CHECK_THROWS_MATCHES" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
+    <TestCase name="Exception matchers that fail" tags="[!throws][.][.failing][exceptions][matchers]" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
+      <Section name="No exception" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
+        <Expression success="false" type="CHECK_THROWS_MATCHES" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
           <Original>
             doesNotThrow(), SpecialException, ExceptionMatcher{ 1 }
           </Original>
@@ -1782,7 +1782,7 @@
             doesNotThrow(), SpecialException, ExceptionMatcher{ 1 }
           </Expanded>
         </Expression>
-        <Expression success="false" type="REQUIRE_THROWS_MATCHES" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
+        <Expression success="false" type="REQUIRE_THROWS_MATCHES" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
           <Original>
             doesNotThrow(), SpecialException, ExceptionMatcher{ 1 }
           </Original>
@@ -1792,33 +1792,33 @@
         </Expression>
         <OverallResults successes="0" failures="2" expectedFailures="0"/>
       </Section>
-      <Section name="Type mismatch" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
-        <Expression success="false" type="CHECK_THROWS_MATCHES" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
+      <Section name="Type mismatch" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
+        <Expression success="false" type="CHECK_THROWS_MATCHES" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
           <Original>
             throwsAsInt(1), SpecialException, ExceptionMatcher{ 1 }
           </Original>
           <Expanded>
             throwsAsInt(1), SpecialException, ExceptionMatcher{ 1 }
           </Expanded>
-          <Exception filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
+          <Exception filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
             Unknown exception
           </Exception>
         </Expression>
-        <Expression success="false" type="REQUIRE_THROWS_MATCHES" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
+        <Expression success="false" type="REQUIRE_THROWS_MATCHES" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
           <Original>
             throwsAsInt(1), SpecialException, ExceptionMatcher{ 1 }
           </Original>
           <Expanded>
             throwsAsInt(1), SpecialException, ExceptionMatcher{ 1 }
           </Expanded>
-          <Exception filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
+          <Exception filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
             Unknown exception
           </Exception>
         </Expression>
         <OverallResults successes="0" failures="2" expectedFailures="0"/>
       </Section>
-      <Section name="Contents are wrong" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
-        <Expression success="false" type="CHECK_THROWS_MATCHES" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
+      <Section name="Contents are wrong" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
+        <Expression success="false" type="CHECK_THROWS_MATCHES" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
           <Original>
             throws(3), SpecialException, ExceptionMatcher{ 1 }
           </Original>
@@ -1826,7 +1826,7 @@
             {?} special exception has value of 1
           </Expanded>
         </Expression>
-        <Expression success="false" type="REQUIRE_THROWS_MATCHES" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
+        <Expression success="false" type="REQUIRE_THROWS_MATCHES" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
           <Original>
             throws(4), SpecialException, ExceptionMatcher{ 1 }
           </Original>
@@ -1838,8 +1838,8 @@
       </Section>
       <OverallResult success="false"/>
     </TestCase>
-    <TestCase name="Exception matchers that succeed" tags="[!throws][exceptions][matchers]" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
-      <Expression success="true" type="CHECK_THROWS_MATCHES" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
+    <TestCase name="Exception matchers that succeed" tags="[!throws][exceptions][matchers]" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
+      <Expression success="true" type="CHECK_THROWS_MATCHES" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
         <Original>
           throws(1), SpecialException, ExceptionMatcher{ 1 }
         </Original>
@@ -1847,7 +1847,7 @@
           {?} special exception has value of 1
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE_THROWS_MATCHES" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
+      <Expression success="true" type="REQUIRE_THROWS_MATCHES" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
         <Original>
           throws(2), SpecialException, ExceptionMatcher{ 2 }
         </Original>
@@ -1857,9 +1857,9 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Exception messages can be tested for" tags="[!throws]" filename="projects/<exe-name>/UsageTests/ExceptionTests.cpp" >
-      <Section name="exact match" filename="projects/<exe-name>/UsageTests/ExceptionTests.cpp" >
-        <Expression success="true" type="REQUIRE_THROWS_WITH" filename="projects/<exe-name>/UsageTests/ExceptionTests.cpp" >
+    <TestCase name="Exception messages can be tested for" tags="[!throws]" filename="projects/<exe-name>/UsageTests/Exception.tests.cpp" >
+      <Section name="exact match" filename="projects/<exe-name>/UsageTests/Exception.tests.cpp" >
+        <Expression success="true" type="REQUIRE_THROWS_WITH" filename="projects/<exe-name>/UsageTests/Exception.tests.cpp" >
           <Original>
             thisThrows(), "expected exception"
           </Original>
@@ -1869,8 +1869,8 @@
         </Expression>
         <OverallResults successes="1" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="different case" filename="projects/<exe-name>/UsageTests/ExceptionTests.cpp" >
-        <Expression success="true" type="REQUIRE_THROWS_WITH" filename="projects/<exe-name>/UsageTests/ExceptionTests.cpp" >
+      <Section name="different case" filename="projects/<exe-name>/UsageTests/Exception.tests.cpp" >
+        <Expression success="true" type="REQUIRE_THROWS_WITH" filename="projects/<exe-name>/UsageTests/Exception.tests.cpp" >
           <Original>
             thisThrows(), Equals( "expecteD Exception", Catch::CaseSensitive::No )
           </Original>
@@ -1880,8 +1880,8 @@
         </Expression>
         <OverallResults successes="1" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="wildcarded" filename="projects/<exe-name>/UsageTests/ExceptionTests.cpp" >
-        <Expression success="true" type="REQUIRE_THROWS_WITH" filename="projects/<exe-name>/UsageTests/ExceptionTests.cpp" >
+      <Section name="wildcarded" filename="projects/<exe-name>/UsageTests/Exception.tests.cpp" >
+        <Expression success="true" type="REQUIRE_THROWS_WITH" filename="projects/<exe-name>/UsageTests/Exception.tests.cpp" >
           <Original>
             thisThrows(), StartsWith( "expected" )
           </Original>
@@ -1889,7 +1889,7 @@
             "expected exception" starts with: "expected"
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE_THROWS_WITH" filename="projects/<exe-name>/UsageTests/ExceptionTests.cpp" >
+        <Expression success="true" type="REQUIRE_THROWS_WITH" filename="projects/<exe-name>/UsageTests/Exception.tests.cpp" >
           <Original>
             thisThrows(), EndsWith( "exception" )
           </Original>
@@ -1897,7 +1897,7 @@
             "expected exception" ends with: "exception"
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE_THROWS_WITH" filename="projects/<exe-name>/UsageTests/ExceptionTests.cpp" >
+        <Expression success="true" type="REQUIRE_THROWS_WITH" filename="projects/<exe-name>/UsageTests/Exception.tests.cpp" >
           <Original>
             thisThrows(), Contains( "except" )
           </Original>
@@ -1905,7 +1905,7 @@
             "expected exception" contains: "except"
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE_THROWS_WITH" filename="projects/<exe-name>/UsageTests/ExceptionTests.cpp" >
+        <Expression success="true" type="REQUIRE_THROWS_WITH" filename="projects/<exe-name>/UsageTests/Exception.tests.cpp" >
           <Original>
             thisThrows(), Contains( "exCept", Catch::CaseSensitive::No )
           </Original>
@@ -1917,19 +1917,19 @@
       </Section>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Expected exceptions that don't throw or unexpected exceptions fail the test" tags="[!throws][.][failing]" filename="projects/<exe-name>/UsageTests/ExceptionTests.cpp" >
-      <Expression success="false" type="CHECK_THROWS_AS" filename="projects/<exe-name>/UsageTests/ExceptionTests.cpp" >
+    <TestCase name="Expected exceptions that don't throw or unexpected exceptions fail the test" tags="[!throws][.][failing]" filename="projects/<exe-name>/UsageTests/Exception.tests.cpp" >
+      <Expression success="false" type="CHECK_THROWS_AS" filename="projects/<exe-name>/UsageTests/Exception.tests.cpp" >
         <Original>
           thisThrows(), std::string
         </Original>
         <Expanded>
           thisThrows(), std::string
         </Expanded>
-        <Exception filename="projects/<exe-name>/UsageTests/ExceptionTests.cpp" >
+        <Exception filename="projects/<exe-name>/UsageTests/Exception.tests.cpp" >
           expected exception
         </Exception>
       </Expression>
-      <Expression success="false" type="CHECK_THROWS_AS" filename="projects/<exe-name>/UsageTests/ExceptionTests.cpp" >
+      <Expression success="false" type="CHECK_THROWS_AS" filename="projects/<exe-name>/UsageTests/Exception.tests.cpp" >
         <Original>
           thisDoesntThrow(), std::domain_error
         </Original>
@@ -1937,31 +1937,31 @@
           thisDoesntThrow(), std::domain_error
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK_NOTHROW" filename="projects/<exe-name>/UsageTests/ExceptionTests.cpp" >
+      <Expression success="false" type="CHECK_NOTHROW" filename="projects/<exe-name>/UsageTests/Exception.tests.cpp" >
         <Original>
           thisThrows()
         </Original>
         <Expanded>
           thisThrows()
         </Expanded>
-        <Exception filename="projects/<exe-name>/UsageTests/ExceptionTests.cpp" >
+        <Exception filename="projects/<exe-name>/UsageTests/Exception.tests.cpp" >
           expected exception
         </Exception>
       </Expression>
       <OverallResult success="false"/>
     </TestCase>
-    <TestCase name="FAIL aborts the test" tags="[.][failing][messages]" filename="projects/<exe-name>/UsageTests/MessageTests.cpp" >
-      <Failure filename="projects/<exe-name>/UsageTests/MessageTests.cpp" >
+    <TestCase name="FAIL aborts the test" tags="[.][failing][messages]" filename="projects/<exe-name>/UsageTests/Message.tests.cpp" >
+      <Failure filename="projects/<exe-name>/UsageTests/Message.tests.cpp" >
         This is a failure
       </Failure>
       <OverallResult success="false"/>
     </TestCase>
-    <TestCase name="FAIL does not require an argument" tags="[.][failing][messages]" filename="projects/<exe-name>/UsageTests/MessageTests.cpp" >
-      <Failure filename="projects/<exe-name>/UsageTests/MessageTests.cpp" />
+    <TestCase name="FAIL does not require an argument" tags="[.][failing][messages]" filename="projects/<exe-name>/UsageTests/Message.tests.cpp" >
+      <Failure filename="projects/<exe-name>/UsageTests/Message.tests.cpp" />
       <OverallResult success="false"/>
     </TestCase>
-    <TestCase name="FAIL_CHECK does not abort the test" tags="[.][failing][messages]" filename="projects/<exe-name>/UsageTests/MessageTests.cpp" >
-      <Failure filename="projects/<exe-name>/UsageTests/MessageTests.cpp" >
+    <TestCase name="FAIL_CHECK does not abort the test" tags="[.][failing][messages]" filename="projects/<exe-name>/UsageTests/Message.tests.cpp" >
+      <Failure filename="projects/<exe-name>/UsageTests/Message.tests.cpp" >
         This is a failure
       </Failure>
       <Warning>
@@ -1969,8 +1969,8 @@
       </Warning>
       <OverallResult success="false"/>
     </TestCase>
-    <TestCase name="Factorials are computed" tags="[factorial]" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
+    <TestCase name="Factorials are computed" tags="[factorial]" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
         <Original>
           Factorial(0) == 1
         </Original>
@@ -1978,7 +1978,7 @@
           1 == 1
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
         <Original>
           Factorial(1) == 1
         </Original>
@@ -1986,7 +1986,7 @@
           1 == 1
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
         <Original>
           Factorial(2) == 2
         </Original>
@@ -1994,7 +1994,7 @@
           2 == 2
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
         <Original>
           Factorial(3) == 6
         </Original>
@@ -2002,7 +2002,7 @@
           6 == 6
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
         <Original>
           Factorial(10) == 3628800
         </Original>
@@ -2012,9 +2012,9 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Floating point matchers: double" tags="[floating-point][matchers]" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
-      <Section name="Margin" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
-        <Expression success="true" type="REQUIRE_THAT" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
+    <TestCase name="Floating point matchers: double" tags="[floating-point][matchers]" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
+      <Section name="Margin" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
+        <Expression success="true" type="REQUIRE_THAT" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
           <Original>
             1., WithinAbs(1., 0)
           </Original>
@@ -2022,7 +2022,7 @@
             1.0 is within 0.0 of 1.0
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE_THAT" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
+        <Expression success="true" type="REQUIRE_THAT" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
           <Original>
             0., WithinAbs(1., 1)
           </Original>
@@ -2030,7 +2030,7 @@
             0.0 is within 1.0 of 1.0
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE_THAT" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
+        <Expression success="true" type="REQUIRE_THAT" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
           <Original>
             0., !WithinAbs(1., 0.99)
           </Original>
@@ -2038,7 +2038,7 @@
             0.0 not is within 0.99 of 1.0
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE_THAT" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
+        <Expression success="true" type="REQUIRE_THAT" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
           <Original>
             0., !WithinAbs(1., 0.99)
           </Original>
@@ -2046,7 +2046,7 @@
             0.0 not is within 0.99 of 1.0
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE_THAT" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
+        <Expression success="true" type="REQUIRE_THAT" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
           <Original>
             NAN, !WithinAbs(NAN, 0)
           </Original>
@@ -2056,8 +2056,8 @@
         </Expression>
         <OverallResults successes="5" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="ULPs" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
-        <Expression success="true" type="REQUIRE_THAT" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
+      <Section name="ULPs" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
+        <Expression success="true" type="REQUIRE_THAT" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
           <Original>
             1., WithinULP(1., 0)
           </Original>
@@ -2065,7 +2065,7 @@
             1.0 is within 0 ULPs of 1.0
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE_THAT" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
+        <Expression success="true" type="REQUIRE_THAT" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
           <Original>
             std::nextafter(1., 2.), WithinULP(1., 1)
           </Original>
@@ -2073,7 +2073,7 @@
             1.0 is within 1 ULPs of 1.0
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE_THAT" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
+        <Expression success="true" type="REQUIRE_THAT" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
           <Original>
             std::nextafter(1., 0.), WithinULP(1., 1)
           </Original>
@@ -2081,7 +2081,7 @@
             1.0 is within 1 ULPs of 1.0
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE_THAT" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
+        <Expression success="true" type="REQUIRE_THAT" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
           <Original>
             std::nextafter(1., 2.), !WithinULP(1., 0)
           </Original>
@@ -2089,7 +2089,7 @@
             1.0 not is within 0 ULPs of 1.0
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE_THAT" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
+        <Expression success="true" type="REQUIRE_THAT" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
           <Original>
             1., WithinULP(1., 0)
           </Original>
@@ -2097,7 +2097,7 @@
             1.0 is within 0 ULPs of 1.0
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE_THAT" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
+        <Expression success="true" type="REQUIRE_THAT" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
           <Original>
             -0., WithinULP(0., 0)
           </Original>
@@ -2105,7 +2105,7 @@
             -0.0 is within 0 ULPs of 0.0
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE_THAT" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
+        <Expression success="true" type="REQUIRE_THAT" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
           <Original>
             NAN, !WithinULP(NAN, 123)
           </Original>
@@ -2115,8 +2115,8 @@
         </Expression>
         <OverallResults successes="7" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="Composed" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
-        <Expression success="true" type="REQUIRE_THAT" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
+      <Section name="Composed" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
+        <Expression success="true" type="REQUIRE_THAT" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
           <Original>
             1., WithinAbs(1., 0.5) || WithinULP(2., 1)
           </Original>
@@ -2124,7 +2124,7 @@
             1.0 ( is within 0.5 of 1.0 or is within 1 ULPs of 2.0 )
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE_THAT" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
+        <Expression success="true" type="REQUIRE_THAT" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
           <Original>
             1., WithinAbs(2., 0.5) || WithinULP(1., 0)
           </Original>
@@ -2132,7 +2132,7 @@
             1.0 ( is within 0.5 of 2.0 or is within 0 ULPs of 1.0 )
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE_THAT" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
+        <Expression success="true" type="REQUIRE_THAT" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
           <Original>
             NAN, !(WithinAbs(NAN, 100) || WithinULP(NAN, 123))
           </Original>
@@ -2144,9 +2144,9 @@
       </Section>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Floating point matchers: float" tags="[floating-point][matchers]" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
-      <Section name="Margin" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
-        <Expression success="true" type="REQUIRE_THAT" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
+    <TestCase name="Floating point matchers: float" tags="[floating-point][matchers]" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
+      <Section name="Margin" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
+        <Expression success="true" type="REQUIRE_THAT" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
           <Original>
             1.f, WithinAbs(1.f, 0)
           </Original>
@@ -2154,7 +2154,7 @@
             1.0f is within 0.0 of 1.0
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE_THAT" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
+        <Expression success="true" type="REQUIRE_THAT" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
           <Original>
             0.f, WithinAbs(1.f, 1)
           </Original>
@@ -2162,7 +2162,7 @@
             0.0f is within 1.0 of 1.0
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE_THAT" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
+        <Expression success="true" type="REQUIRE_THAT" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
           <Original>
             0.f, !WithinAbs(1.f, 0.99f)
           </Original>
@@ -2170,7 +2170,7 @@
             0.0f not is within 0.9900000095 of 1.0
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE_THAT" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
+        <Expression success="true" type="REQUIRE_THAT" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
           <Original>
             0.f, !WithinAbs(1.f, 0.99f)
           </Original>
@@ -2178,7 +2178,7 @@
             0.0f not is within 0.9900000095 of 1.0
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE_THAT" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
+        <Expression success="true" type="REQUIRE_THAT" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
           <Original>
             0.f, WithinAbs(-0.f, 0)
           </Original>
@@ -2186,7 +2186,7 @@
             0.0f is within 0.0 of -0.0
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE_THAT" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
+        <Expression success="true" type="REQUIRE_THAT" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
           <Original>
             NAN, !WithinAbs(NAN, 0)
           </Original>
@@ -2196,8 +2196,8 @@
         </Expression>
         <OverallResults successes="6" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="ULPs" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
-        <Expression success="true" type="REQUIRE_THAT" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
+      <Section name="ULPs" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
+        <Expression success="true" type="REQUIRE_THAT" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
           <Original>
             1.f, WithinULP(1.f, 0)
           </Original>
@@ -2205,7 +2205,7 @@
             1.0f is within 0 ULPs of 1.0f
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE_THAT" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
+        <Expression success="true" type="REQUIRE_THAT" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
           <Original>
             std::nextafter(1.f, 2.f), WithinULP(1.f, 1)
           </Original>
@@ -2213,7 +2213,7 @@
             1.0f is within 1 ULPs of 1.0f
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE_THAT" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
+        <Expression success="true" type="REQUIRE_THAT" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
           <Original>
             std::nextafter(1.f, 0.f), WithinULP(1.f, 1)
           </Original>
@@ -2221,7 +2221,7 @@
             1.0f is within 1 ULPs of 1.0f
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE_THAT" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
+        <Expression success="true" type="REQUIRE_THAT" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
           <Original>
             std::nextafter(1.f, 2.f), !WithinULP(1.f, 0)
           </Original>
@@ -2229,7 +2229,7 @@
             1.0f not is within 0 ULPs of 1.0f
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE_THAT" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
+        <Expression success="true" type="REQUIRE_THAT" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
           <Original>
             1.f, WithinULP(1.f, 0)
           </Original>
@@ -2237,7 +2237,7 @@
             1.0f is within 0 ULPs of 1.0f
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE_THAT" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
+        <Expression success="true" type="REQUIRE_THAT" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
           <Original>
             -0.f, WithinULP(0.f, 0)
           </Original>
@@ -2245,7 +2245,7 @@
             -0.0f is within 0 ULPs of 0.0f
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE_THAT" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
+        <Expression success="true" type="REQUIRE_THAT" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
           <Original>
             NAN, !WithinULP(NAN, 123)
           </Original>
@@ -2255,8 +2255,8 @@
         </Expression>
         <OverallResults successes="7" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="Composed" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
-        <Expression success="true" type="REQUIRE_THAT" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
+      <Section name="Composed" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
+        <Expression success="true" type="REQUIRE_THAT" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
           <Original>
             1.f, WithinAbs(1.f, 0.5) || WithinULP(1.f, 1)
           </Original>
@@ -2264,7 +2264,7 @@
             1.0f ( is within 0.5 of 1.0 or is within 1 ULPs of 1.0f )
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE_THAT" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
+        <Expression success="true" type="REQUIRE_THAT" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
           <Original>
             1.f, WithinAbs(2.f, 0.5) || WithinULP(1.f, 0)
           </Original>
@@ -2272,7 +2272,7 @@
             1.0f ( is within 0.5 of 2.0 or is within 0 ULPs of 1.0f )
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE_THAT" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
+        <Expression success="true" type="REQUIRE_THAT" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
           <Original>
             NAN, !(WithinAbs(NAN, 100) || WithinULP(NAN, 123))
           </Original>
@@ -2284,8 +2284,8 @@
       </Section>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Greater-than inequalities with different epsilons" tags="[Approx]" filename="projects/<exe-name>/UsageTests/ApproxTests.cpp" >
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ApproxTests.cpp" >
+    <TestCase name="Greater-than inequalities with different epsilons" tags="[Approx]" filename="projects/<exe-name>/UsageTests/Approx.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Approx.tests.cpp" >
         <Original>
           d >= Approx( 1.22 )
         </Original>
@@ -2293,7 +2293,7 @@
           1.23 >= Approx( 1.22 )
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ApproxTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Approx.tests.cpp" >
         <Original>
           d >= Approx( 1.23 )
         </Original>
@@ -2301,7 +2301,7 @@
           1.23 >= Approx( 1.23 )
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE_FALSE" filename="projects/<exe-name>/UsageTests/ApproxTests.cpp" >
+      <Expression success="true" type="REQUIRE_FALSE" filename="projects/<exe-name>/UsageTests/Approx.tests.cpp" >
         <Original>
           !(d >= Approx( 1.24 ))
         </Original>
@@ -2309,7 +2309,7 @@
           !(1.23 >= Approx( 1.24 ))
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ApproxTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Approx.tests.cpp" >
         <Original>
           d >= Approx( 1.24 ).epsilon(0.1)
         </Original>
@@ -2319,7 +2319,7 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="INFO and WARN do not abort tests" tags="[.][messages]" filename="projects/<exe-name>/UsageTests/MessageTests.cpp" >
+    <TestCase name="INFO and WARN do not abort tests" tags="[.][messages]" filename="projects/<exe-name>/UsageTests/Message.tests.cpp" >
       <Info>
         this is a message
       </Info>
@@ -2328,14 +2328,14 @@
       </Warning>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="INFO gets logged on failure" tags="[.][failing][messages]" filename="projects/<exe-name>/UsageTests/MessageTests.cpp" >
+    <TestCase name="INFO gets logged on failure" tags="[.][failing][messages]" filename="projects/<exe-name>/UsageTests/Message.tests.cpp" >
       <Info>
         this message should be logged
       </Info>
       <Info>
         so should this
       </Info>
-      <Expression success="false" type="REQUIRE" filename="projects/<exe-name>/UsageTests/MessageTests.cpp" >
+      <Expression success="false" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Message.tests.cpp" >
         <Original>
           a == 1
         </Original>
@@ -2345,11 +2345,11 @@
       </Expression>
       <OverallResult success="false"/>
     </TestCase>
-    <TestCase name="INFO gets logged on failure, even if captured before successful assertions" tags="[.][failing][messages]" filename="projects/<exe-name>/UsageTests/MessageTests.cpp" >
+    <TestCase name="INFO gets logged on failure, even if captured before successful assertions" tags="[.][failing][messages]" filename="projects/<exe-name>/UsageTests/Message.tests.cpp" >
       <Info>
         this message may be logged later
       </Info>
-      <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/MessageTests.cpp" >
+      <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/Message.tests.cpp" >
         <Original>
           a == 2
         </Original>
@@ -2363,7 +2363,7 @@
       <Info>
         this message should be logged
       </Info>
-      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/MessageTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/Message.tests.cpp" >
         <Original>
           a == 1
         </Original>
@@ -2380,7 +2380,7 @@
       <Info>
         and this, but later
       </Info>
-      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/MessageTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/Message.tests.cpp" >
         <Original>
           a == 0
         </Original>
@@ -2400,7 +2400,7 @@
       <Info>
         but not this
       </Info>
-      <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/MessageTests.cpp" >
+      <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/Message.tests.cpp" >
         <Original>
           a == 2
         </Original>
@@ -2410,14 +2410,14 @@
       </Expression>
       <OverallResult success="false"/>
     </TestCase>
-    <TestCase name="INFO is reset for each loop" tags="[.][failing][messages]" filename="projects/<exe-name>/UsageTests/MessageTests.cpp" >
+    <TestCase name="INFO is reset for each loop" tags="[.][failing][messages]" filename="projects/<exe-name>/UsageTests/Message.tests.cpp" >
       <Info>
         current counter 0
       </Info>
       <Info>
         i := 0
       </Info>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/MessageTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Message.tests.cpp" >
         <Original>
           i &lt; 10
         </Original>
@@ -2431,7 +2431,7 @@
       <Info>
         i := 1
       </Info>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/MessageTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Message.tests.cpp" >
         <Original>
           i &lt; 10
         </Original>
@@ -2445,7 +2445,7 @@
       <Info>
         i := 2
       </Info>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/MessageTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Message.tests.cpp" >
         <Original>
           i &lt; 10
         </Original>
@@ -2459,7 +2459,7 @@
       <Info>
         i := 3
       </Info>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/MessageTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Message.tests.cpp" >
         <Original>
           i &lt; 10
         </Original>
@@ -2473,7 +2473,7 @@
       <Info>
         i := 4
       </Info>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/MessageTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Message.tests.cpp" >
         <Original>
           i &lt; 10
         </Original>
@@ -2487,7 +2487,7 @@
       <Info>
         i := 5
       </Info>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/MessageTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Message.tests.cpp" >
         <Original>
           i &lt; 10
         </Original>
@@ -2501,7 +2501,7 @@
       <Info>
         i := 6
       </Info>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/MessageTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Message.tests.cpp" >
         <Original>
           i &lt; 10
         </Original>
@@ -2515,7 +2515,7 @@
       <Info>
         i := 7
       </Info>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/MessageTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Message.tests.cpp" >
         <Original>
           i &lt; 10
         </Original>
@@ -2529,7 +2529,7 @@
       <Info>
         i := 8
       </Info>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/MessageTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Message.tests.cpp" >
         <Original>
           i &lt; 10
         </Original>
@@ -2543,7 +2543,7 @@
       <Info>
         i := 9
       </Info>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/MessageTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Message.tests.cpp" >
         <Original>
           i &lt; 10
         </Original>
@@ -2557,7 +2557,7 @@
       <Info>
         i := 10
       </Info>
-      <Expression success="false" type="REQUIRE" filename="projects/<exe-name>/UsageTests/MessageTests.cpp" >
+      <Expression success="false" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Message.tests.cpp" >
         <Original>
           i &lt; 10
         </Original>
@@ -2567,8 +2567,8 @@
       </Expression>
       <OverallResult success="false"/>
     </TestCase>
-    <TestCase name="Inequality checks that should fail" tags="[!shouldfail][.][failing]" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
-      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+    <TestCase name="Inequality checks that should fail" tags="[!shouldfail][.][failing]" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
           data.int_seven != 7
         </Original>
@@ -2576,7 +2576,7 @@
           7 != 7
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
           data.float_nine_point_one != Approx( 9.1f )
         </Original>
@@ -2584,7 +2584,7 @@
           9.1f != Approx( 9.1000003815 )
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
           data.double_pi != Approx( 3.1415926535 )
         </Original>
@@ -2592,7 +2592,7 @@
           3.1415926535 != Approx( 3.1415926535 )
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
           data.str_hello != "hello"
         </Original>
@@ -2600,7 +2600,7 @@
           "hello" != "hello"
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
           data.str_hello.size() != 5
         </Original>
@@ -2610,8 +2610,8 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Inequality checks that should succeed" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+    <TestCase name="Inequality checks that should succeed" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
           data.int_seven != 6
         </Original>
@@ -2619,7 +2619,7 @@
           7 != 6
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
           data.int_seven != 8
         </Original>
@@ -2627,7 +2627,7 @@
           7 != 8
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
           data.float_nine_point_one != Approx( 9.11f )
         </Original>
@@ -2635,7 +2635,7 @@
           9.1f != Approx( 9.1099996567 )
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
           data.float_nine_point_one != Approx( 9.0f )
         </Original>
@@ -2643,7 +2643,7 @@
           9.1f != Approx( 9.0 )
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
           data.float_nine_point_one != Approx( 1 )
         </Original>
@@ -2651,7 +2651,7 @@
           9.1f != Approx( 1.0 )
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
           data.float_nine_point_one != Approx( 0 )
         </Original>
@@ -2659,7 +2659,7 @@
           9.1f != Approx( 0.0 )
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
           data.double_pi != Approx( 3.1415 )
         </Original>
@@ -2667,7 +2667,7 @@
           3.1415926535 != Approx( 3.1415 )
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
           data.str_hello != "goodbye"
         </Original>
@@ -2675,7 +2675,7 @@
           "hello" != "goodbye"
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
           data.str_hello != "hell"
         </Original>
@@ -2683,7 +2683,7 @@
           "hello" != "hell"
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
           data.str_hello != "hello1"
         </Original>
@@ -2691,7 +2691,7 @@
           "hello" != "hello1"
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
           data.str_hello.size() != 6
         </Original>
@@ -2701,8 +2701,8 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Less-than inequalities with different epsilons" tags="[Approx]" filename="projects/<exe-name>/UsageTests/ApproxTests.cpp" >
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ApproxTests.cpp" >
+    <TestCase name="Less-than inequalities with different epsilons" tags="[Approx]" filename="projects/<exe-name>/UsageTests/Approx.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Approx.tests.cpp" >
         <Original>
           d &lt;= Approx( 1.24 )
         </Original>
@@ -2710,7 +2710,7 @@
           1.23 &lt;= Approx( 1.24 )
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ApproxTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Approx.tests.cpp" >
         <Original>
           d &lt;= Approx( 1.23 )
         </Original>
@@ -2718,7 +2718,7 @@
           1.23 &lt;= Approx( 1.23 )
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE_FALSE" filename="projects/<exe-name>/UsageTests/ApproxTests.cpp" >
+      <Expression success="true" type="REQUIRE_FALSE" filename="projects/<exe-name>/UsageTests/Approx.tests.cpp" >
         <Original>
           !(d &lt;= Approx( 1.22 ))
         </Original>
@@ -2726,7 +2726,7 @@
           !(1.23 &lt;= Approx( 1.22 ))
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ApproxTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Approx.tests.cpp" >
         <Original>
           d &lt;= Approx( 1.22 ).epsilon(0.1)
         </Original>
@@ -2736,11 +2736,11 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="ManuallyRegistered" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
+    <TestCase name="ManuallyRegistered" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Matchers can be (AllOf) composed with the &amp;&amp; operator" tags="[matchers][operator&amp;&amp;][operators]" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
-      <Expression success="true" type="CHECK_THAT" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
+    <TestCase name="Matchers can be (AllOf) composed with the &amp;&amp; operator" tags="[matchers][operator&amp;&amp;][operators]" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
+      <Expression success="true" type="CHECK_THAT" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
         <Original>
           testStringForMatching(), Contains( "string" ) &amp;&amp; Contains( "abc" ) &amp;&amp; Contains( "substring" ) &amp;&amp; Contains( "contains" )
         </Original>
@@ -2750,8 +2750,8 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Matchers can be (AnyOf) composed with the || operator" tags="[matchers][operators][operator||]" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
-      <Expression success="true" type="CHECK_THAT" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
+    <TestCase name="Matchers can be (AnyOf) composed with the || operator" tags="[matchers][operators][operator||]" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
+      <Expression success="true" type="CHECK_THAT" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
         <Original>
           testStringForMatching(), Contains( "string" ) || Contains( "different" ) || Contains( "random" )
         </Original>
@@ -2759,7 +2759,7 @@
           "this string contains 'abc' as a substring" ( contains: "string" or contains: "different" or contains: "random" )
         </Expanded>
       </Expression>
-      <Expression success="true" type="CHECK_THAT" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
+      <Expression success="true" type="CHECK_THAT" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
         <Original>
           testStringForMatching2(), Contains( "string" ) || Contains( "different" ) || Contains( "random" )
         </Original>
@@ -2769,8 +2769,8 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Matchers can be composed with both &amp;&amp; and ||" tags="[matchers][operator&amp;&amp;][operators][operator||]" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
-      <Expression success="true" type="CHECK_THAT" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
+    <TestCase name="Matchers can be composed with both &amp;&amp; and ||" tags="[matchers][operator&amp;&amp;][operators][operator||]" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
+      <Expression success="true" type="CHECK_THAT" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
         <Original>
           testStringForMatching(), ( Contains( "string" ) || Contains( "different" ) ) &amp;&amp; Contains( "substring" )
         </Original>
@@ -2780,8 +2780,8 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Matchers can be composed with both &amp;&amp; and || - failing" tags="[.][.failing][matchers][operator&amp;&amp;][operators][operator||]" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
-      <Expression success="false" type="CHECK_THAT" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
+    <TestCase name="Matchers can be composed with both &amp;&amp; and || - failing" tags="[.][.failing][matchers][operator&amp;&amp;][operators][operator||]" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
+      <Expression success="false" type="CHECK_THAT" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
         <Original>
           testStringForMatching(), ( Contains( "string" ) || Contains( "different" ) ) &amp;&amp; Contains( "random" )
         </Original>
@@ -2791,8 +2791,8 @@
       </Expression>
       <OverallResult success="false"/>
     </TestCase>
-    <TestCase name="Matchers can be negated (Not) with the ! operator" tags="[matchers][not][operators]" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
-      <Expression success="true" type="CHECK_THAT" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
+    <TestCase name="Matchers can be negated (Not) with the ! operator" tags="[matchers][not][operators]" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
+      <Expression success="true" type="CHECK_THAT" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
         <Original>
           testStringForMatching(), !Contains( "different" )
         </Original>
@@ -2802,8 +2802,8 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Matchers can be negated (Not) with the ! operator - failing" tags="[.][.failing][matchers][not][operators]" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
-      <Expression success="false" type="CHECK_THAT" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
+    <TestCase name="Matchers can be negated (Not) with the ! operator - failing" tags="[.][.failing][matchers][not][operators]" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
+      <Expression success="false" type="CHECK_THAT" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
         <Original>
           testStringForMatching(), !Contains( "substring" )
         </Original>
@@ -2813,8 +2813,8 @@
       </Expression>
       <OverallResult success="false"/>
     </TestCase>
-    <TestCase name="Mismatching exception messages failing the test" tags="[!throws][.][failing]" filename="projects/<exe-name>/UsageTests/ExceptionTests.cpp" >
-      <Expression success="true" type="REQUIRE_THROWS_WITH" filename="projects/<exe-name>/UsageTests/ExceptionTests.cpp" >
+    <TestCase name="Mismatching exception messages failing the test" tags="[!throws][.][failing]" filename="projects/<exe-name>/UsageTests/Exception.tests.cpp" >
+      <Expression success="true" type="REQUIRE_THROWS_WITH" filename="projects/<exe-name>/UsageTests/Exception.tests.cpp" >
         <Original>
           thisThrows(), "expected exception"
         </Original>
@@ -2822,7 +2822,7 @@
           "expected exception" equals: "expected exception"
         </Expanded>
       </Expression>
-      <Expression success="false" type="REQUIRE_THROWS_WITH" filename="projects/<exe-name>/UsageTests/ExceptionTests.cpp" >
+      <Expression success="false" type="REQUIRE_THROWS_WITH" filename="projects/<exe-name>/UsageTests/Exception.tests.cpp" >
         <Original>
           thisThrows(), "should fail"
         </Original>
@@ -2832,20 +2832,20 @@
       </Expression>
       <OverallResult success="false"/>
     </TestCase>
-    <TestCase name="Nice descriptive name" tags="[.][tag1][tag2][tag3]" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
+    <TestCase name="Nice descriptive name" tags="[.][tag1][tag2][tag3]" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
       <Warning>
         This one ran
       </Warning>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Non-std exceptions can be translated" tags="[!throws][.][failing]" filename="projects/<exe-name>/UsageTests/ExceptionTests.cpp" >
-      <Exception filename="projects/<exe-name>/UsageTests/ExceptionTests.cpp" >
+    <TestCase name="Non-std exceptions can be translated" tags="[!throws][.][failing]" filename="projects/<exe-name>/UsageTests/Exception.tests.cpp" >
+      <Exception filename="projects/<exe-name>/UsageTests/Exception.tests.cpp" >
         custom exception
       </Exception>
       <OverallResult success="false"/>
     </TestCase>
-    <TestCase name="Objects that evaluated in boolean contexts can be checked" tags="[SafeBool][Tricky]" filename="projects/<exe-name>/UsageTests/TrickyTests.cpp" >
-      <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/TrickyTests.cpp" >
+    <TestCase name="Objects that evaluated in boolean contexts can be checked" tags="[SafeBool][Tricky]" filename="projects/<exe-name>/UsageTests/Tricky.tests.cpp" >
+      <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/Tricky.tests.cpp" >
         <Original>
           True
         </Original>
@@ -2853,7 +2853,7 @@
           {?}
         </Expanded>
       </Expression>
-      <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/TrickyTests.cpp" >
+      <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/Tricky.tests.cpp" >
         <Original>
           !False
         </Original>
@@ -2861,7 +2861,7 @@
           true
         </Expanded>
       </Expression>
-      <Expression success="true" type="CHECK_FALSE" filename="projects/<exe-name>/UsageTests/TrickyTests.cpp" >
+      <Expression success="true" type="CHECK_FALSE" filename="projects/<exe-name>/UsageTests/Tricky.tests.cpp" >
         <Original>
           !(False)
         </Original>
@@ -2871,8 +2871,8 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Ordering comparison checks that should fail" tags="[.][failing]" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
-      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+    <TestCase name="Ordering comparison checks that should fail" tags="[.][failing]" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
           data.int_seven > 7
         </Original>
@@ -2880,7 +2880,7 @@
           7 > 7
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
           data.int_seven &lt; 7
         </Original>
@@ -2888,7 +2888,7 @@
           7 &lt; 7
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
           data.int_seven > 8
         </Original>
@@ -2896,7 +2896,7 @@
           7 > 8
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
           data.int_seven &lt; 6
         </Original>
@@ -2904,7 +2904,7 @@
           7 &lt; 6
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
           data.int_seven &lt; 0
         </Original>
@@ -2912,7 +2912,7 @@
           7 &lt; 0
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
           data.int_seven &lt; -1
         </Original>
@@ -2920,7 +2920,7 @@
           7 &lt; -1
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
           data.int_seven >= 8
         </Original>
@@ -2928,7 +2928,7 @@
           7 >= 8
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
           data.int_seven &lt;= 6
         </Original>
@@ -2936,7 +2936,7 @@
           7 &lt;= 6
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
           data.float_nine_point_one &lt; 9
         </Original>
@@ -2944,7 +2944,7 @@
           9.1f &lt; 9
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
           data.float_nine_point_one > 10
         </Original>
@@ -2952,7 +2952,7 @@
           9.1f > 10
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
        

The changes are longer than what is shown.