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

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}"/>