All tests files have .tests.cpp suffix. Also moved tests out of TestMain.cpp and moved up a level
diff --git a/projects/SelfTest/Baselines/xml.sw.approved.txt b/projects/SelfTest/Baselines/xml.sw.approved.txt
index 7fb1c6b..bbd769f 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>
           data.float_nine_point_one > 9.2
         </Original>
@@ -2960,7 +2960,7 @@
           9.1f > 9.2
         </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>
@@ -2968,7 +2968,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 &lt; "hello"
         </Original>
@@ -2976,7 +2976,7 @@
           "hello" &lt; "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 > "hellp"
         </Original>
@@ -2984,7 +2984,7 @@
           "hello" > "hellp"
         </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 > "z"
         </Original>
@@ -2992,7 +2992,7 @@
           "hello" > "z"
         </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 &lt; "hellm"
         </Original>
@@ -3000,7 +3000,7 @@
           "hello" &lt; "hellm"
         </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 &lt; "a"
         </Original>
@@ -3008,7 +3008,7 @@
           "hello" &lt; "a"
         </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 >= "z"
         </Original>
@@ -3016,7 +3016,7 @@
           "hello" >= "z"
         </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 &lt;= "a"
         </Original>
@@ -3026,8 +3026,8 @@
       </Expression>
       <OverallResult success="false"/>
     </TestCase>
-    <TestCase name="Ordering comparison 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="Ordering comparison 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 &lt; 8
         </Original>
@@ -3035,7 +3035,7 @@
           7 &lt; 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.int_seven > 6
         </Original>
@@ -3043,7 +3043,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 > 0
         </Original>
@@ -3051,7 +3051,7 @@
           7 > 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.int_seven > -1
         </Original>
@@ -3059,7 +3059,7 @@
           7 > -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>
           data.int_seven >= 7
         </Original>
@@ -3067,7 +3067,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.int_seven >= 6
         </Original>
@@ -3075,7 +3075,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 &lt;= 7
         </Original>
@@ -3083,7 +3083,7 @@
           7 &lt;= 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.int_seven &lt;= 8
         </Original>
@@ -3091,7 +3091,7 @@
           7 &lt;= 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 > 9
         </Original>
@@ -3099,7 +3099,7 @@
           9.1f > 9
         </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 &lt; 10
         </Original>
@@ -3107,7 +3107,7 @@
           9.1f &lt; 10
         </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 &lt; 9.2
         </Original>
@@ -3115,7 +3115,7 @@
           9.1f &lt; 9.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>
           data.str_hello &lt;= "hello"
         </Original>
@@ -3123,7 +3123,7 @@
           "hello" &lt;= "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 >= "hello"
         </Original>
@@ -3131,7 +3131,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 &lt; "hellp"
         </Original>
@@ -3139,7 +3139,7 @@
           "hello" &lt; "hellp"
         </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 &lt; "zebra"
         </Original>
@@ -3147,7 +3147,7 @@
           "hello" &lt; "zebra"
         </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 > "hellm"
         </Original>
@@ -3155,7 +3155,7 @@
           "hello" > "hellm"
         </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 > "a"
         </Original>
@@ -3165,24 +3165,24 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Output from all sections is reported" tags="[.][failing][messages]" filename="projects/<exe-name>/UsageTests/MessageTests.cpp" >
-      <Section name="one" filename="projects/<exe-name>/UsageTests/MessageTests.cpp" >
-        <Failure filename="projects/<exe-name>/UsageTests/MessageTests.cpp" >
+    <TestCase name="Output from all sections is reported" tags="[.][failing][messages]" filename="projects/<exe-name>/UsageTests/Message.tests.cpp" >
+      <Section name="one" filename="projects/<exe-name>/UsageTests/Message.tests.cpp" >
+        <Failure filename="projects/<exe-name>/UsageTests/Message.tests.cpp" >
           Message from section one
         </Failure>
         <OverallResults successes="0" failures="1" expectedFailures="0"/>
       </Section>
-      <Section name="two" filename="projects/<exe-name>/UsageTests/MessageTests.cpp" >
-        <Failure filename="projects/<exe-name>/UsageTests/MessageTests.cpp" >
+      <Section name="two" filename="projects/<exe-name>/UsageTests/Message.tests.cpp" >
+        <Failure filename="projects/<exe-name>/UsageTests/Message.tests.cpp" >
           Message from section two
         </Failure>
         <OverallResults successes="0" failures="1" expectedFailures="0"/>
       </Section>
       <OverallResult success="false"/>
     </TestCase>
-    <TestCase name="Parse test names and tags" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
-      <Section name="Empty test spec should have no filters" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+    <TestCase name="Parse test names and tags" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
+      <Section name="Empty test spec should have no filters" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.hasFilters() == false
           </Original>
@@ -3190,7 +3190,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcA ) == false
           </Original>
@@ -3198,7 +3198,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcB ) == false
           </Original>
@@ -3208,8 +3208,8 @@
         </Expression>
         <OverallResults successes="3" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="Test spec from empty string should have no filters" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+      <Section name="Test spec from empty string should have no filters" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.hasFilters() == false
           </Original>
@@ -3217,7 +3217,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches(tcA ) == false
           </Original>
@@ -3225,7 +3225,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcB ) == false
           </Original>
@@ -3235,8 +3235,8 @@
         </Expression>
         <OverallResults successes="3" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="Test spec from just a comma should have no filters" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+      <Section name="Test spec from just a comma should have no filters" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.hasFilters() == false
           </Original>
@@ -3244,7 +3244,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcA ) == false
           </Original>
@@ -3252,7 +3252,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcB ) == false
           </Original>
@@ -3262,8 +3262,8 @@
         </Expression>
         <OverallResults successes="3" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="Test spec from name should have one filter" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+      <Section name="Test spec from name should have one filter" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.hasFilters() == true
           </Original>
@@ -3271,7 +3271,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcA ) == false
           </Original>
@@ -3279,7 +3279,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcB ) == true
           </Original>
@@ -3289,8 +3289,8 @@
         </Expression>
         <OverallResults successes="3" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="Test spec from quoted name should have one filter" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+      <Section name="Test spec from quoted name should have one filter" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.hasFilters() == true
           </Original>
@@ -3298,7 +3298,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcA ) == false
           </Original>
@@ -3306,7 +3306,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcB ) == true
           </Original>
@@ -3316,8 +3316,8 @@
         </Expression>
         <OverallResults successes="3" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="Test spec from name should have one filter" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+      <Section name="Test spec from name should have one filter" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.hasFilters() == true
           </Original>
@@ -3325,7 +3325,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcA ) == false
           </Original>
@@ -3333,7 +3333,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcB ) == true
           </Original>
@@ -3341,7 +3341,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcC ) == false
           </Original>
@@ -3351,8 +3351,8 @@
         </Expression>
         <OverallResults successes="4" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="Wildcard at the start" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+      <Section name="Wildcard at the start" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.hasFilters() == true
           </Original>
@@ -3360,7 +3360,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcA ) == false
           </Original>
@@ -3368,7 +3368,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcB ) == false
           </Original>
@@ -3376,7 +3376,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcC ) == true
           </Original>
@@ -3384,7 +3384,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcD ) == false
           </Original>
@@ -3392,7 +3392,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             parseTestSpec( "*a" ).matches( tcA ) == true
           </Original>
@@ -3402,8 +3402,8 @@
         </Expression>
         <OverallResults successes="6" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="Wildcard at the end" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+      <Section name="Wildcard at the end" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.hasFilters() == true
           </Original>
@@ -3411,7 +3411,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcA ) == false
           </Original>
@@ -3419,7 +3419,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcB ) == false
           </Original>
@@ -3427,7 +3427,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcC ) == true
           </Original>
@@ -3435,7 +3435,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcD ) == false
           </Original>
@@ -3443,7 +3443,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             parseTestSpec( "a*" ).matches( tcA ) == true
           </Original>
@@ -3453,8 +3453,8 @@
         </Expression>
         <OverallResults successes="6" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="Wildcard at both ends" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+      <Section name="Wildcard at both ends" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.hasFilters() == true
           </Original>
@@ -3462,7 +3462,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcA ) == false
           </Original>
@@ -3470,7 +3470,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcB ) == false
           </Original>
@@ -3478,7 +3478,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcC ) == true
           </Original>
@@ -3486,7 +3486,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcD ) == true
           </Original>
@@ -3494,7 +3494,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             parseTestSpec( "*a*" ).matches( tcA ) == true
           </Original>
@@ -3504,8 +3504,8 @@
         </Expression>
         <OverallResults successes="6" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="Redundant wildcard at the start" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+      <Section name="Redundant wildcard at the start" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.hasFilters() == true
           </Original>
@@ -3513,7 +3513,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcA ) == true
           </Original>
@@ -3521,7 +3521,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcB ) == false
           </Original>
@@ -3531,8 +3531,8 @@
         </Expression>
         <OverallResults successes="3" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="Redundant wildcard at the end" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+      <Section name="Redundant wildcard at the end" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.hasFilters() == true
           </Original>
@@ -3540,7 +3540,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcA ) == true
           </Original>
@@ -3548,7 +3548,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcB ) == false
           </Original>
@@ -3558,8 +3558,8 @@
         </Expression>
         <OverallResults successes="3" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="Redundant wildcard at both ends" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+      <Section name="Redundant wildcard at both ends" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.hasFilters() == true
           </Original>
@@ -3567,7 +3567,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcA ) == true
           </Original>
@@ -3575,7 +3575,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcB ) == false
           </Original>
@@ -3585,8 +3585,8 @@
         </Expression>
         <OverallResults successes="3" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="Wildcard at both ends, redundant at start" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+      <Section name="Wildcard at both ends, redundant at start" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.hasFilters() == true
           </Original>
@@ -3594,7 +3594,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcA ) == false
           </Original>
@@ -3602,7 +3602,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcB ) == false
           </Original>
@@ -3610,7 +3610,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcC ) == true
           </Original>
@@ -3618,7 +3618,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcD ) == true
           </Original>
@@ -3628,8 +3628,8 @@
         </Expression>
         <OverallResults successes="5" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="Just wildcard" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+      <Section name="Just wildcard" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.hasFilters() == true
           </Original>
@@ -3637,7 +3637,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcA ) == true
           </Original>
@@ -3645,7 +3645,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcB ) == true
           </Original>
@@ -3653,7 +3653,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcC ) == true
           </Original>
@@ -3661,7 +3661,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcD ) == true
           </Original>
@@ -3671,8 +3671,8 @@
         </Expression>
         <OverallResults successes="5" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="Single tag" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+      <Section name="Single tag" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.hasFilters() == true
           </Original>
@@ -3680,7 +3680,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcA ) == false
           </Original>
@@ -3688,7 +3688,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcB ) == true
           </Original>
@@ -3696,7 +3696,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcC ) == false
           </Original>
@@ -3706,8 +3706,8 @@
         </Expression>
         <OverallResults successes="4" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="Single tag, two matches" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+      <Section name="Single tag, two matches" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.hasFilters() == true
           </Original>
@@ -3715,7 +3715,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcA ) == false
           </Original>
@@ -3723,7 +3723,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcB ) == true
           </Original>
@@ -3731,7 +3731,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcC ) == true
           </Original>
@@ -3741,8 +3741,8 @@
         </Expression>
         <OverallResults successes="4" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="Two tags" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+      <Section name="Two tags" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.hasFilters() == true
           </Original>
@@ -3750,7 +3750,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcA ) == false
           </Original>
@@ -3758,7 +3758,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcB ) == false
           </Original>
@@ -3766,7 +3766,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcC ) == true
           </Original>
@@ -3776,8 +3776,8 @@
         </Expression>
         <OverallResults successes="4" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="Two tags, spare separated" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+      <Section name="Two tags, spare separated" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.hasFilters() == true
           </Original>
@@ -3785,7 +3785,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcA ) == false
           </Original>
@@ -3793,7 +3793,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcB ) == false
           </Original>
@@ -3801,7 +3801,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcC ) == true
           </Original>
@@ -3811,8 +3811,8 @@
         </Expression>
         <OverallResults successes="4" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="Wildcarded name and tag" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+      <Section name="Wildcarded name and tag" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.hasFilters() == true
           </Original>
@@ -3820,7 +3820,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcA ) == false
           </Original>
@@ -3828,7 +3828,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcB ) == false
           </Original>
@@ -3836,7 +3836,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcC ) == true
           </Original>
@@ -3844,7 +3844,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcD ) == false
           </Original>
@@ -3854,8 +3854,8 @@
         </Expression>
         <OverallResults successes="5" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="Single tag exclusion" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+      <Section name="Single tag exclusion" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.hasFilters() == true
           </Original>
@@ -3863,7 +3863,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcA ) == true
           </Original>
@@ -3871,7 +3871,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcB ) == false
           </Original>
@@ -3879,7 +3879,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcC ) == true
           </Original>
@@ -3889,8 +3889,8 @@
         </Expression>
         <OverallResults successes="4" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="One tag exclusion and one tag inclusion" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+      <Section name="One tag exclusion and one tag inclusion" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.hasFilters() == true
           </Original>
@@ -3898,7 +3898,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcA ) == false
           </Original>
@@ -3906,7 +3906,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcB ) == true
           </Original>
@@ -3914,7 +3914,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcC ) == false
           </Original>
@@ -3924,8 +3924,8 @@
         </Expression>
         <OverallResults successes="4" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="One tag exclusion and one wldcarded name inclusion" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+      <Section name="One tag exclusion and one wldcarded name inclusion" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.hasFilters() == true
           </Original>
@@ -3933,7 +3933,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcA ) == false
           </Original>
@@ -3941,7 +3941,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcB ) == false
           </Original>
@@ -3949,7 +3949,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcC ) == false
           </Original>
@@ -3957,7 +3957,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcD ) == true
           </Original>
@@ -3967,8 +3967,8 @@
         </Expression>
         <OverallResults successes="5" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="One tag exclusion, using exclude:, and one wldcarded name inclusion" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+      <Section name="One tag exclusion, using exclude:, and one wldcarded name inclusion" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.hasFilters() == true
           </Original>
@@ -3976,7 +3976,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcA ) == false
           </Original>
@@ -3984,7 +3984,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcB ) == false
           </Original>
@@ -3992,7 +3992,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcC ) == false
           </Original>
@@ -4000,7 +4000,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcD ) == true
           </Original>
@@ -4010,8 +4010,8 @@
         </Expression>
         <OverallResults successes="5" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="name exclusion" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+      <Section name="name exclusion" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.hasFilters() == true
           </Original>
@@ -4019,7 +4019,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcA ) == true
           </Original>
@@ -4027,7 +4027,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcB ) == false
           </Original>
@@ -4035,7 +4035,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcC ) == true
           </Original>
@@ -4043,7 +4043,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcD ) == true
           </Original>
@@ -4053,8 +4053,8 @@
         </Expression>
         <OverallResults successes="5" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="wildcarded name exclusion" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+      <Section name="wildcarded name exclusion" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.hasFilters() == true
           </Original>
@@ -4062,7 +4062,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcA ) == true
           </Original>
@@ -4070,7 +4070,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcB ) == true
           </Original>
@@ -4078,7 +4078,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcC ) == false
           </Original>
@@ -4086,7 +4086,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcD ) == false
           </Original>
@@ -4096,8 +4096,8 @@
         </Expression>
         <OverallResults successes="5" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="wildcarded name exclusion with tag inclusion" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+      <Section name="wildcarded name exclusion with tag inclusion" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.hasFilters() == true
           </Original>
@@ -4105,7 +4105,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcA ) == true
           </Original>
@@ -4113,7 +4113,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcB ) == true
           </Original>
@@ -4121,7 +4121,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcC ) == true
           </Original>
@@ -4129,7 +4129,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcD ) == false
           </Original>
@@ -4139,8 +4139,8 @@
         </Expression>
         <OverallResults successes="5" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="wildcarded name exclusion, using exclude:, with tag inclusion" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+      <Section name="wildcarded name exclusion, using exclude:, with tag inclusion" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.hasFilters() == true
           </Original>
@@ -4148,7 +4148,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcA ) == true
           </Original>
@@ -4156,7 +4156,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcB ) == true
           </Original>
@@ -4164,7 +4164,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcC ) == true
           </Original>
@@ -4172,7 +4172,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcD ) == false
           </Original>
@@ -4182,8 +4182,8 @@
         </Expression>
         <OverallResults successes="5" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="two wildcarded names" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+      <Section name="two wildcarded names" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.hasFilters() == true
           </Original>
@@ -4191,7 +4191,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcA ) == false
           </Original>
@@ -4199,7 +4199,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcB ) == false
           </Original>
@@ -4207,7 +4207,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcC ) == true
           </Original>
@@ -4215,7 +4215,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcD ) == false
           </Original>
@@ -4225,8 +4225,8 @@
         </Expression>
         <OverallResults successes="5" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="empty tag" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+      <Section name="empty tag" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.hasFilters() == false
           </Original>
@@ -4234,7 +4234,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcA ) == false
           </Original>
@@ -4242,7 +4242,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcB ) == false
           </Original>
@@ -4250,7 +4250,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcC ) == false
           </Original>
@@ -4258,7 +4258,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcD ) == false
           </Original>
@@ -4268,8 +4268,8 @@
         </Expression>
         <OverallResults successes="5" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="empty quoted name" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+      <Section name="empty quoted name" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.hasFilters() == false
           </Original>
@@ -4277,7 +4277,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcA ) == false
           </Original>
@@ -4285,7 +4285,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcB ) == false
           </Original>
@@ -4293,7 +4293,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcC ) == false
           </Original>
@@ -4301,7 +4301,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcD ) == false
           </Original>
@@ -4311,8 +4311,8 @@
         </Expression>
         <OverallResults successes="5" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="quoted string followed by tag exclusion" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+      <Section name="quoted string followed by tag exclusion" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.hasFilters() == true
           </Original>
@@ -4320,7 +4320,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcA ) == false
           </Original>
@@ -4328,7 +4328,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcB ) == false
           </Original>
@@ -4336,7 +4336,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcC ) == false
           </Original>
@@ -4344,7 +4344,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             spec.matches( tcD ) == true
           </Original>
@@ -4356,8 +4356,8 @@
       </Section>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Parsing a std::pair" tags="[Tricky][std::pair]" filename="projects/<exe-name>/UsageTests/TrickyTests.cpp" >
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/TrickyTests.cpp" >
+    <TestCase name="Parsing a std::pair" tags="[Tricky][std::pair]" filename="projects/<exe-name>/UsageTests/Tricky.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Tricky.tests.cpp" >
         <Original>
           (std::pair&lt;int, int>( 1, 2 )) == aNicePair
         </Original>
@@ -4367,8 +4367,8 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Pointers can be compared to null" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+    <TestCase name="Pointers can be compared to null" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
           p == 0
         </Original>
@@ -4376,7 +4376,7 @@
           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>
           p == pNULL
         </Original>
@@ -4384,7 +4384,7 @@
           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>
           p != 0
         </Original>
@@ -4392,7 +4392,7 @@
           0x<hex digits> != 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>
           cp != 0
         </Original>
@@ -4400,7 +4400,7 @@
           0x<hex digits> != 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>
           cpc != 0
         </Original>
@@ -4408,7 +4408,7 @@
           0x<hex digits> != 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>
           returnsNull() == 0
         </Original>
@@ -4416,7 +4416,7 @@
           {null string} == 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>
           returnsConstNull() == 0
         </Original>
@@ -4424,7 +4424,7 @@
           {null string} == 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>
           0 != p
         </Original>
@@ -4434,9 +4434,9 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Process can be configured on command line" tags="[command-line][config]" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
-      <Section name="empty args don't cause a crash" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
+    <TestCase name="Process can be configured on command line" tags="[command-line][config]" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
+      <Section name="empty args don't cause a crash" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             result
           </Original>
@@ -4444,7 +4444,7 @@
             {?}
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             config.processName == ""
           </Original>
@@ -4454,8 +4454,8 @@
         </Expression>
         <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="default - no arguments" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
+      <Section name="default - no arguments" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             result
           </Original>
@@ -4463,7 +4463,7 @@
             {?}
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             config.processName == "test"
           </Original>
@@ -4471,7 +4471,7 @@
             "test" == "test"
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             config.shouldDebugBreak == false
           </Original>
@@ -4479,7 +4479,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             config.abortAfter == -1
           </Original>
@@ -4487,7 +4487,7 @@
             -1 == -1
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             config.noThrow == false
           </Original>
@@ -4495,7 +4495,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           <Original>
             config.reporterNames.empty()
           </Original>
@@ -4505,9 +4505,9 @@
         </Expression>
         <OverallResults successes="6" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="test lists" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
-        <Section name="1 test" description="Specify one test case using" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
-          <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
+      <Section name="test lists" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
+        <Section name="1 test" description="Specify one test case using" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
+          <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
             <Original>
               result
             </Original>
@@ -4515,7 +4515,7 @@
               {?}
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
             <Original>
               cfg.testSpec().matches(fakeTestCase("notIncluded")) == false
             </Original>
@@ -4523,7 +4523,7 @@
               false == false
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
             <Original>
               cfg.testSpec().matches(fakeTestCase("test1"))
             </Original>
@@ -4535,9 +4535,9 @@
         </Section>
         <OverallResults successes="3" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="test lists" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
-        <Section name="Specify one test case exclusion using exclude:" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
-          <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
+      <Section name="test lists" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
+        <Section name="Specify one test case exclusion using exclude:" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
+          <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
             <Original>
               result
             </Original>
@@ -4545,7 +4545,7 @@
               {?}
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
             <Original>
               cfg.testSpec().matches(fakeTestCase("test1")) == false
             </Original>
@@ -4553,7 +4553,7 @@
               false == false
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
             <Original>
               cfg.testSpec().matches(fakeTestCase("alwaysIncluded"))
             </Original>
@@ -4565,9 +4565,9 @@
         </Section>
         <OverallResults successes="3" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="test lists" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
-        <Section name="Specify one test case exclusion using ~" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
-          <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
+      <Section name="test lists" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
+        <Section name="Specify one test case exclusion using ~" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
+          <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
             <Original>
               result
             </Original>
@@ -4575,7 +4575,7 @@
               {?}
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
             <Original>
               cfg.testSpec().matches(fakeTestCase("test1")) == false
             </Original>
@@ -4583,7 +4583,7 @@
               false == false
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
             <Original>
               cfg.testSpec().matches(fakeTestCase("alwaysIncluded"))
             </Original>
@@ -4595,9 +4595,9 @@
         </Section>
         <OverallResults successes="3" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="reporter" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
-        <Section name="-r/console" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
-          <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
+      <Section name="reporter" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
+        <Section name="-r/console" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
+          <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
             <Original>
               cli.parse({"test", "-r", "console"})
             </Original>
@@ -4605,7 +4605,7 @@
               {?}
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
             <Original>
               config.reporterNames[0] == "console"
             </Original>
@@ -4617,9 +4617,9 @@
         </Section>
         <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="reporter" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
-        <Section name="-r/xml" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
-          <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
+      <Section name="reporter" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
+        <Section name="-r/xml" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
+          <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
             <Original>
               cli.parse({"test", "-r", "xml"})
             </Original>
@@ -4627,7 +4627,7 @@
               {?}
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
             <Original>
               config.reporterNames[0] == "xml"
             </Original>
@@ -4639,9 +4639,9 @@
         </Section>
         <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="reporter" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
-        <Section name="-r xml and junit" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
-          <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
+      <Section name="reporter" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
+        <Section name="-r xml and junit" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
+          <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
             <Original>
               cli.parse({"test", "-r", "xml", "-r", "junit"})
             </Original>
@@ -4649,7 +4649,7 @@
               {?}
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
             <Original>
               config.reporterNames.size() == 2
             </Original>
@@ -4657,7 +4657,7 @@
               2 == 2
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
             <Original>
               config.reporterNames[0] == "xml"
             </Original>
@@ -4665,7 +4665,7 @@
               "xml" == "xml"
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
             <Original>
               config.reporterNames[1] == "junit"
             </Original>
@@ -4677,9 +4677,9 @@
         </Section>
         <OverallResults successes="4" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="reporter" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
-        <Section name="--reporter/junit" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
-          <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
+      <Section name="reporter" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
+        <Section name="--reporter/junit" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
+          <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
             <Original>
               cli.parse({"test", "--reporter", "junit"})
             </Original>
@@ -4687,7 +4687,7 @@
               {?}
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
             <Original>
               config.reporterNames[0] == "junit"
             </Original>
@@ -4699,9 +4699,9 @@
         </Section>
         <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="debugger" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
-        <Section name="-b" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
-          <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
+      <Section name="debugger" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
+        <Section name="-b" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
+          <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
             <Original>
               cli.parse({"test", "-b"})
             </Original>
@@ -4709,7 +4709,7 @@
               {?}
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
             <Original>
               config.shouldDebugBreak == true
             </Original>
@@ -4721,9 +4721,9 @@
         </Section>
         <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="debugger" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
-        <Section name="--break" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
-          <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
+      <Section name="debugger" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
+        <Section name="--break" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
+          <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
             <Original>
               cli.parse({"test", "--break"})
             </Original>
@@ -4731,7 +4731,7 @@
               {?}
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
             <Original>
               config.shouldDebugBreak
             </Original>
@@ -4743,9 +4743,9 @@
         </Section>
         <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="abort" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
-        <Section name="-a aborts after first failure" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
-          <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
+      <Section name="abort" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
+        <Section name="-a aborts after first failure" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
+          <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
             <Original>
               cli.parse({"test", "-a"})
             </Original>
@@ -4753,7 +4753,7 @@
               {?}
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
             <Original>
               config.abortAfter == 1
             </Original>
@@ -4765,9 +4765,9 @@
         </Section>
         <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="abort" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
-        <Section name="-x 2 aborts after two failures" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
-          <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
+      <Section name="abort" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
+        <Section name="-x 2 aborts after two failures" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
+          <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
             <Original>
               cli.parse({"test", "-x", "2"})
             </Original>
@@ -4775,7 +4775,7 @@
               {?}
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
             <Original>
               config.abortAfter == 2
             </Original>
@@ -4787,9 +4787,9 @@
         </Section>
         <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="abort" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
-        <Section name="-x must be numeric" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
-          <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
+      <Section name="abort" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
+        <Section name="-x must be numeric" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
+          <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
             <Original>
               !result
             </Original>
@@ -4797,7 +4797,7 @@
               true
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE_THAT" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
+          <Expression success="true" type="REQUIRE_THAT" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
             <Original>
               result.errorMessage(), Contains("convert") &amp;&amp; Contains("oops")
             </Original>
@@ -4809,9 +4809,9 @@
         </Section>
         <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="nothrow" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
-        <Section name="-e" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
-          <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
+      <Section name="nothrow" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
+        <Section name="-e" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
+          <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
             <Original>
               cli.parse({"test", "-e"})
             </Original>
@@ -4819,7 +4819,7 @@
               {?}
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
             <Original>
               config.noThrow
             </Original>
@@ -4831,9 +4831,9 @@
         </Section>
         <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="nothrow" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
-        <Section name="--nothrow" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
-          <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
+      <Section name="nothrow" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
+        <Section name="--nothrow" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
+          <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
             <Original>
               cli.parse({"test", "--nothrow"})
             </Original>
@@ -4841,7 +4841,7 @@
               {?}
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
             <Original>
               config.noThrow
             </Original>
@@ -4853,9 +4853,9 @@
         </Section>
         <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="output filename" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
-        <Section name="-o filename" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
-          <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
+      <Section name="output filename" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
+        <Section name="-o filename" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
+          <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
             <Original>
               cli.parse({"test", "-o", "filename.ext"})
             </Original>
@@ -4863,7 +4863,7 @@
               {?}
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
             <Original>
               config.outputFilename == "filename.ext"
             </Original>
@@ -4875,9 +4875,9 @@
         </Section>
         <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="output filename" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
-        <Section name="--out" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
-          <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
+      <Section name="output filename" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
+        <Section name="--out" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
+          <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
             <Original>
               cli.parse({"test", "--out", "filename.ext"})
             </Original>
@@ -4885,7 +4885,7 @@
               {?}
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
             <Original>
               config.outputFilename == "filename.ext"
             </Original>
@@ -4897,9 +4897,9 @@
         </Section>
         <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="combinations" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
-        <Section name="Single character flags can be combined" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
-          <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
+      <Section name="combinations" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
+        <Section name="Single character flags can be combined" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
+          <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
             <Original>
               cli.parse({"test", "-abe"})
             </Original>
@@ -4907,7 +4907,7 @@
               {?}
             </Expanded>
           </Expression>
-          <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
+          <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
             <Original>
               config.abortAfter == 1
             </Original>
@@ -4915,7 +4915,7 @@
               1 == 1
             </Expanded>
           </Expression>
-          <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
+          <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
             <Original>
               config.shouldDebugBreak
             </Original>
@@ -4923,7 +4923,7 @@
               true
             </Expanded>
           </Expression>
-          <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
+          <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
             <Original>
               config.noThrow == true
             </Original>
@@ -4935,9 +4935,9 @@
         </Section>
         <OverallResults successes="4" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="use-colour" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
-        <Section name="without option" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
-          <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
+      <Section name="use-colour" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
+        <Section name="without option" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
+          <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
             <Original>
               cli.parse({"test"})
             </Original>
@@ -4945,7 +4945,7 @@
               {?}
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
             <Original>
               config.useColour == UseColour::Auto
             </Original>
@@ -4957,9 +4957,9 @@
         </Section>
         <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="use-colour" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
-        <Section name="auto" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
-          <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
+      <Section name="use-colour" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
+        <Section name="auto" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
+          <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
             <Original>
               cli.parse({"test", "--use-colour", "auto"})
             </Original>
@@ -4967,7 +4967,7 @@
               {?}
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
             <Original>
               config.useColour == UseColour::Auto
             </Original>
@@ -4979,9 +4979,9 @@
         </Section>
         <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="use-colour" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
-        <Section name="yes" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
-          <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
+      <Section name="use-colour" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
+        <Section name="yes" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
+          <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
             <Original>
               cli.parse({"test", "--use-colour", "yes"})
             </Original>
@@ -4989,7 +4989,7 @@
               {?}
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
             <Original>
               config.useColour == UseColour::Yes
             </Original>
@@ -5001,9 +5001,9 @@
         </Section>
         <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="use-colour" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
-        <Section name="no" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
-          <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
+      <Section name="use-colour" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
+        <Section name="no" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
+          <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
             <Original>
               cli.parse({"test", "--use-colour", "no"})
             </Original>
@@ -5011,7 +5011,7 @@
               {?}
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
             <Original>
               config.useColour == UseColour::No
             </Original>
@@ -5023,9 +5023,9 @@
         </Section>
         <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="use-colour" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
-        <Section name="error" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
-          <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
+      <Section name="use-colour" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
+        <Section name="error" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
+          <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
             <Original>
               !result
             </Original>
@@ -5033,7 +5033,7 @@
               true
             </Expanded>
           </Expression>
-          <Expression success="true" type="CHECK_THAT" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
+          <Expression success="true" type="CHECK_THAT" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
             <Original>
               result.errorMessage(), Contains( "colour mode must be one of" )
             </Original>
@@ -5047,8 +5047,8 @@
       </Section>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Reconstruction should be based on stringification: #914" tags="[.][Decomposition][failing]" filename="projects/<exe-name>/UsageTests/DecompositionTests.cpp" >
-      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/DecompositionTests.cpp" >
+    <TestCase name="Reconstruction should be based on stringification: #914" tags="[.][Decomposition][failing]" filename="projects/<exe-name>/UsageTests/Decomposition.tests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/Decomposition.tests.cpp" >
         <Original>
           truthy(false)
         </Original>
@@ -5058,8 +5058,8 @@
       </Expression>
       <OverallResult success="false"/>
     </TestCase>
-    <TestCase name="Regex 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="Regex 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(), Matches("this STRING contains 'abc' as a substring")
         </Original>
@@ -5067,7 +5067,7 @@
           "this string contains 'abc' as a substring" matches "this STRING contains 'abc' as a substring" case sensitively
         </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(), Matches("contains 'abc' as a substring")
         </Original>
@@ -5075,7 +5075,7 @@
           "this string contains 'abc' as a substring" matches "contains 'abc' as a substring" case sensitively
         </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(), Matches("this string contains 'abc' as a")
         </Original>
@@ -5085,15 +5085,15 @@
       </Expression>
       <OverallResult success="false"/>
     </TestCase>
-    <TestCase name="SUCCEED counts as a test pass" tags="[messages]" filename="projects/<exe-name>/UsageTests/MessageTests.cpp" >
+    <TestCase name="SUCCEED counts as a test pass" tags="[messages]" filename="projects/<exe-name>/UsageTests/Message.tests.cpp" >
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="SUCCESS does not require an argument" tags="[.][messages]" filename="projects/<exe-name>/UsageTests/MessageTests.cpp" >
+    <TestCase name="SUCCESS does not require an argument" tags="[.][messages]" filename="projects/<exe-name>/UsageTests/Message.tests.cpp" >
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Scenario: BDD tests requiring Fixtures to provide commonly-accessed data or methods" tags="[bdd][fixtures]" filename="projects/<exe-name>/UsageTests/BDDTests.cpp" >
-      <Section name="Given: No operations precede me" filename="projects/<exe-name>/UsageTests/BDDTests.cpp" >
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/BDDTests.cpp" >
+    <TestCase name="Scenario: BDD tests requiring Fixtures to provide commonly-accessed data or methods" tags="[bdd][fixtures]" filename="projects/<exe-name>/UsageTests/BDD.tests.cpp" >
+      <Section name="Given: No operations precede me" filename="projects/<exe-name>/UsageTests/BDD.tests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/BDD.tests.cpp" >
           <Original>
             before == 0
           </Original>
@@ -5101,9 +5101,9 @@
             0 == 0
           </Expanded>
         </Expression>
-        <Section name="When: We get the count" filename="projects/<exe-name>/UsageTests/BDDTests.cpp" >
-          <Section name="Then: Subsequently values are higher" filename="projects/<exe-name>/UsageTests/BDDTests.cpp" >
-            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/BDDTests.cpp" >
+        <Section name="When: We get the count" filename="projects/<exe-name>/UsageTests/BDD.tests.cpp" >
+          <Section name="Then: Subsequently values are higher" filename="projects/<exe-name>/UsageTests/BDD.tests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/BDD.tests.cpp" >
               <Original>
                 after > before
               </Original>
@@ -5119,11 +5119,11 @@
       </Section>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Scenario: Do that thing with the thing" tags="[Tags]" filename="projects/<exe-name>/UsageTests/BDDTests.cpp" >
-      <Section name="Given: This stuff exists" filename="projects/<exe-name>/UsageTests/BDDTests.cpp" >
-        <Section name="When: I do this" filename="projects/<exe-name>/UsageTests/BDDTests.cpp" >
-          <Section name="Then: it should do this" filename="projects/<exe-name>/UsageTests/BDDTests.cpp" >
-            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/BDDTests.cpp" >
+    <TestCase name="Scenario: Do that thing with the thing" tags="[Tags]" filename="projects/<exe-name>/UsageTests/BDD.tests.cpp" >
+      <Section name="Given: This stuff exists" filename="projects/<exe-name>/UsageTests/BDD.tests.cpp" >
+        <Section name="When: I do this" filename="projects/<exe-name>/UsageTests/BDD.tests.cpp" >
+          <Section name="Then: it should do this" filename="projects/<exe-name>/UsageTests/BDD.tests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/BDD.tests.cpp" >
               <Original>
                 itDoesThis()
               </Original>
@@ -5131,8 +5131,8 @@
                 true
               </Expanded>
             </Expression>
-            <Section name="And: do that" filename="projects/<exe-name>/UsageTests/BDDTests.cpp" >
-              <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/BDDTests.cpp" >
+            <Section name="And: do that" filename="projects/<exe-name>/UsageTests/BDD.tests.cpp" >
+              <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/BDD.tests.cpp" >
                 <Original>
                   itDoesThat()
                 </Original>
@@ -5150,10 +5150,10 @@
       </Section>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Scenario: This is a really long scenario name to see how the list command deals with wrapping" tags="[anotherReallyLongTagNameButThisOneHasNoObviousWrapPointsSoShouldSplitWithinAWordUsingADashCharacter][long][lots][one very long tag name that should cause line wrapping writing out using the list command][tags][verbose][very long tags]" filename="projects/<exe-name>/UsageTests/BDDTests.cpp" >
-      <Section name="Given: A section name that is so long that it cannot fit in a single console width" filename="projects/<exe-name>/UsageTests/BDDTests.cpp" >
-        <Section name="When: The test headers are printed as part of the normal running of the scenario" filename="projects/<exe-name>/UsageTests/BDDTests.cpp" >
-          <Section name="Then: The, deliberately very long and overly verbose (you see what I did there?) section names must wrap, along with an indent" filename="projects/<exe-name>/UsageTests/BDDTests.cpp" >
+    <TestCase name="Scenario: This is a really long scenario name to see how the list command deals with wrapping" tags="[anotherReallyLongTagNameButThisOneHasNoObviousWrapPointsSoShouldSplitWithinAWordUsingADashCharacter][long][lots][one very long tag name that should cause line wrapping writing out using the list command][tags][verbose][very long tags]" filename="projects/<exe-name>/UsageTests/BDD.tests.cpp" >
+      <Section name="Given: A section name that is so long that it cannot fit in a single console width" filename="projects/<exe-name>/UsageTests/BDD.tests.cpp" >
+        <Section name="When: The test headers are printed as part of the normal running of the scenario" filename="projects/<exe-name>/UsageTests/BDD.tests.cpp" >
+          <Section name="Then: The, deliberately very long and overly verbose (you see what I did there?) section names must wrap, along with an indent" filename="projects/<exe-name>/UsageTests/BDD.tests.cpp" >
             <OverallResults successes="1" failures="0" expectedFailures="0"/>
           </Section>
           <OverallResults successes="1" failures="0" expectedFailures="0"/>
@@ -5162,9 +5162,9 @@
       </Section>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Scenario: Vector resizing affects size and capacity" tags="[bdd][capacity][size][vector]" filename="projects/<exe-name>/UsageTests/BDDTests.cpp" >
-      <Section name="Given: an empty vector" filename="projects/<exe-name>/UsageTests/BDDTests.cpp" >
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/BDDTests.cpp" >
+    <TestCase name="Scenario: Vector resizing affects size and capacity" tags="[bdd][capacity][size][vector]" filename="projects/<exe-name>/UsageTests/BDD.tests.cpp" >
+      <Section name="Given: an empty vector" filename="projects/<exe-name>/UsageTests/BDD.tests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/BDD.tests.cpp" >
           <Original>
             v.size() == 0
           </Original>
@@ -5172,9 +5172,9 @@
             0 == 0
           </Expanded>
         </Expression>
-        <Section name="When: it is made larger" filename="projects/<exe-name>/UsageTests/BDDTests.cpp" >
-          <Section name="Then: the size and capacity go up" filename="projects/<exe-name>/UsageTests/BDDTests.cpp" >
-            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/BDDTests.cpp" >
+        <Section name="When: it is made larger" filename="projects/<exe-name>/UsageTests/BDD.tests.cpp" >
+          <Section name="Then: the size and capacity go up" filename="projects/<exe-name>/UsageTests/BDD.tests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/BDD.tests.cpp" >
               <Original>
                 v.size() == 10
               </Original>
@@ -5182,7 +5182,7 @@
                 10 == 10
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/BDDTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/BDD.tests.cpp" >
               <Original>
                 v.capacity() >= 10
               </Original>
@@ -5190,9 +5190,9 @@
                 10 >= 10
               </Expanded>
             </Expression>
-            <Section name="And when: it is made smaller again" filename="projects/<exe-name>/UsageTests/BDDTests.cpp" >
-              <Section name="Then: the size goes down but the capacity stays the same" filename="projects/<exe-name>/UsageTests/BDDTests.cpp" >
-                <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/BDDTests.cpp" >
+            <Section name="And when: it is made smaller again" filename="projects/<exe-name>/UsageTests/BDD.tests.cpp" >
+              <Section name="Then: the size goes down but the capacity stays the same" filename="projects/<exe-name>/UsageTests/BDD.tests.cpp" >
+                <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/BDD.tests.cpp" >
                   <Original>
                     v.size() == 5
                   </Original>
@@ -5200,7 +5200,7 @@
                     5 == 5
                   </Expanded>
                 </Expression>
-                <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/BDDTests.cpp" >
+                <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/BDD.tests.cpp" >
                   <Original>
                     v.capacity() >= 10
                   </Original>
@@ -5218,8 +5218,8 @@
         </Section>
         <OverallResults successes="5" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="Given: an empty vector" filename="projects/<exe-name>/UsageTests/BDDTests.cpp" >
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/BDDTests.cpp" >
+      <Section name="Given: an empty vector" filename="projects/<exe-name>/UsageTests/BDD.tests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/BDD.tests.cpp" >
           <Original>
             v.size() == 0
           </Original>
@@ -5227,9 +5227,9 @@
             0 == 0
           </Expanded>
         </Expression>
-        <Section name="When: we reserve more space" filename="projects/<exe-name>/UsageTests/BDDTests.cpp" >
-          <Section name="Then: The capacity is increased but the size remains the same" filename="projects/<exe-name>/UsageTests/BDDTests.cpp" >
-            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/BDDTests.cpp" >
+        <Section name="When: we reserve more space" filename="projects/<exe-name>/UsageTests/BDD.tests.cpp" >
+          <Section name="Then: The capacity is increased but the size remains the same" filename="projects/<exe-name>/UsageTests/BDD.tests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/BDD.tests.cpp" >
               <Original>
                 v.capacity() >= 10
               </Original>
@@ -5237,7 +5237,7 @@
                 10 >= 10
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/BDDTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/BDD.tests.cpp" >
               <Original>
                 v.size() == 0
               </Original>
@@ -5253,7 +5253,7 @@
       </Section>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Sends stuff to stdout and stderr" tags="[.]" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
+    <TestCase name="Sends stuff to stdout and stderr" tags="[.]" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
       <OverallResult success="true">
         <StdOut>
 A string sent directly to stdout
@@ -5263,8 +5263,8 @@
         </StdErr>
       </OverallResult>
     </TestCase>
-    <TestCase name="Some simple comparisons between doubles" tags="[Approx]" filename="projects/<exe-name>/UsageTests/ApproxTests.cpp" >
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ApproxTests.cpp" >
+    <TestCase name="Some simple comparisons between doubles" 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.23 )
         </Original>
@@ -5272,7 +5272,7 @@
           1.23 == Approx( 1.23 )
         </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.22 )
         </Original>
@@ -5280,7 +5280,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.24 )
         </Original>
@@ -5288,7 +5288,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>
           Approx( d ) == 1.23
         </Original>
@@ -5296,7 +5296,7 @@
           Approx( 1.23 ) == 1.23
         </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( d ) != 1.22
         </Original>
@@ -5304,7 +5304,7 @@
           Approx( 1.23 ) != 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>
           Approx( d ) != 1.24
         </Original>
@@ -5312,7 +5312,7 @@
           Approx( 1.23 ) != 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>
           INFINITY == Approx(INFINITY)
         </Original>
@@ -5322,11 +5322,11 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Standard output from all sections is reported" tags="[.][messages]" filename="projects/<exe-name>/UsageTests/MessageTests.cpp" >
-      <Section name="one" filename="projects/<exe-name>/UsageTests/MessageTests.cpp" >
+    <TestCase name="Standard output from all sections is reported" tags="[.][messages]" filename="projects/<exe-name>/UsageTests/Message.tests.cpp" >
+      <Section name="one" filename="projects/<exe-name>/UsageTests/Message.tests.cpp" >
         <OverallResults successes="0" failures="1" expectedFailures="0"/>
       </Section>
-      <Section name="two" filename="projects/<exe-name>/UsageTests/MessageTests.cpp" >
+      <Section name="two" filename="projects/<exe-name>/UsageTests/Message.tests.cpp" >
         <OverallResults successes="0" failures="1" expectedFailures="0"/>
       </Section>
       <OverallResult success="false">
@@ -5336,8 +5336,8 @@
         </StdOut>
       </OverallResult>
     </TestCase>
-    <TestCase name="StartsWith 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="StartsWith 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(), StartsWith( "This String" )
         </Original>
@@ -5345,7 +5345,7 @@
           "this string contains 'abc' as a substring" starts with: "This String"
         </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(), StartsWith( "string", Catch::CaseSensitive::No )
         </Original>
@@ -5355,8 +5355,8 @@
       </Expression>
       <OverallResult success="false"/>
     </TestCase>
-    <TestCase name="String matchers" tags="[matchers]" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
-      <Expression success="true" type="REQUIRE_THAT" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
+    <TestCase name="String matchers" tags="[matchers]" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
+      <Expression success="true" type="REQUIRE_THAT" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
         <Original>
           testStringForMatching(), Contains( "string" )
         </Original>
@@ -5364,7 +5364,7 @@
           "this string contains 'abc' as a substring" contains: "string"
         </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>
           testStringForMatching(), Contains( "string", Catch::CaseSensitive::No )
         </Original>
@@ -5372,7 +5372,7 @@
           "this string contains 'abc' as a substring" contains: "string" (case insensitive)
         </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(), Contains( "abc" )
         </Original>
@@ -5380,7 +5380,7 @@
           "this string contains 'abc' as a substring" contains: "abc"
         </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(), Contains( "aBC", Catch::CaseSensitive::No )
         </Original>
@@ -5388,7 +5388,7 @@
           "this string contains 'abc' as a substring" contains: "abc" (case insensitive)
         </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(), StartsWith( "this" )
         </Original>
@@ -5396,7 +5396,7 @@
           "this string contains 'abc' as a substring" starts with: "this"
         </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(), StartsWith( "THIS", Catch::CaseSensitive::No )
         </Original>
@@ -5404,7 +5404,7 @@
           "this string contains 'abc' as a substring" starts with: "this" (case insensitive)
         </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(), EndsWith( "substring" )
         </Original>
@@ -5412,7 +5412,7 @@
           "this string contains 'abc' as a substring" ends with: "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(), EndsWith(" SuBsTrInG", Catch::CaseSensitive::No )
         </Original>
@@ -5420,7 +5420,7 @@
           "this string contains 'abc' as a substring" ends with: " substring" (case insensitive)
         </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>
           testStringForMatching(), Matches("this string contains 'abc' as a substring")
         </Original>
@@ -5428,7 +5428,7 @@
           "this string contains 'abc' as a substring" matches "this string contains 'abc' as a substring" case sensitively
         </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>
           testStringForMatching(), Matches("this string CONTAINS 'abc' as a substring", Catch::CaseSensitive::No)
         </Original>
@@ -5436,7 +5436,7 @@
           "this string contains 'abc' as a substring" matches "this string CONTAINS 'abc' as a substring" case insensitively
         </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>
           testStringForMatching(), Matches("^this string contains 'abc' as a substring$")
         </Original>
@@ -5444,7 +5444,7 @@
           "this string contains 'abc' as a substring" matches "^this string contains 'abc' as a substring$" case sensitively
         </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>
           testStringForMatching(), Matches("^.* 'abc' .*$")
         </Original>
@@ -5452,7 +5452,7 @@
           "this string contains 'abc' as a substring" matches "^.* 'abc' .*$" case sensitively
         </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>
           testStringForMatching(), Matches("^.* 'ABC' .*$", Catch::CaseSensitive::No)
         </Original>
@@ -5462,9 +5462,9 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="StringRef" tags="[Strings]" filename="projects/<exe-name>/IntrospectiveTests/StringRef.tests.cpp" >
-      <Section name="Empty string" filename="projects/<exe-name>/IntrospectiveTests/StringRef.tests.cpp" >
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/StringRef.tests.cpp" >
+    <TestCase name="StringRef" tags="[Strings]" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
+      <Section name="Empty string" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
           <Original>
             empty.empty()
           </Original>
@@ -5472,7 +5472,7 @@
             true
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/StringRef.tests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
           <Original>
             empty.size() == 0
           </Original>
@@ -5480,7 +5480,7 @@
             0 == 0
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/StringRef.tests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
           <Original>
             std::strcmp( empty.c_str(), "" ) == 0
           </Original>
@@ -5490,8 +5490,8 @@
         </Expression>
         <OverallResults successes="3" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="From string literal" filename="projects/<exe-name>/IntrospectiveTests/StringRef.tests.cpp" >
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/StringRef.tests.cpp" >
+      <Section name="From string literal" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
           <Original>
             s.empty() == false
           </Original>
@@ -5499,7 +5499,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/StringRef.tests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
           <Original>
             s.size() == 5
           </Original>
@@ -5507,7 +5507,7 @@
             5 == 5
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/StringRef.tests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
           <Original>
             isSubstring( s ) == false
           </Original>
@@ -5515,7 +5515,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/StringRef.tests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
           <Original>
             std::strcmp( rawChars, "hello" ) == 0
           </Original>
@@ -5523,8 +5523,8 @@
             0 == 0
           </Expanded>
         </Expression>
-        <Section name="c_str() does not cause copy" filename="projects/<exe-name>/IntrospectiveTests/StringRef.tests.cpp" >
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/StringRef.tests.cpp" >
+        <Section name="c_str() does not cause copy" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
             <Original>
               isOwned( s ) == false
             </Original>
@@ -5532,7 +5532,7 @@
               false == false
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/StringRef.tests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
             <Original>
               s.c_str() == rawChars
             </Original>
@@ -5540,7 +5540,7 @@
               "hello" == "hello"
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/StringRef.tests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
             <Original>
               isOwned( s ) == false
             </Original>
@@ -5552,8 +5552,8 @@
         </Section>
         <OverallResults successes="7" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="From sub-string" filename="projects/<exe-name>/IntrospectiveTests/StringRef.tests.cpp" >
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/StringRef.tests.cpp" >
+      <Section name="From sub-string" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
           <Original>
             original == "original"
           </Original>
@@ -5561,7 +5561,7 @@
             original == "original"
           </Expanded>
         </Expression>
-        <Expression success="false" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/StringRef.tests.cpp" >
+        <Expression success="false" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
           <Original>
             isSubstring( original )
           </Original>
@@ -5571,9 +5571,9 @@
         </Expression>
         <OverallResults successes="1" failures="1" expectedFailures="0"/>
       </Section>
-      <Section name="Substrings" filename="projects/<exe-name>/IntrospectiveTests/StringRef.tests.cpp" >
-        <Section name="zero-based substring" filename="projects/<exe-name>/IntrospectiveTests/StringRef.tests.cpp" >
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/StringRef.tests.cpp" >
+      <Section name="Substrings" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
+        <Section name="zero-based substring" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
             <Original>
               ss.empty() == false
             </Original>
@@ -5581,7 +5581,7 @@
               false == false
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/StringRef.tests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
             <Original>
               ss.size() == 5
             </Original>
@@ -5589,7 +5589,7 @@
               5 == 5
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/StringRef.tests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
             <Original>
               std::strcmp( ss.c_str(), "hello" ) == 0
             </Original>
@@ -5597,7 +5597,7 @@
               0 == 0
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/StringRef.tests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
             <Original>
               ss == "hello"
             </Original>
@@ -5609,9 +5609,9 @@
         </Section>
         <OverallResults successes="4" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="Substrings" filename="projects/<exe-name>/IntrospectiveTests/StringRef.tests.cpp" >
-        <Section name="c_str() causes copy" filename="projects/<exe-name>/IntrospectiveTests/StringRef.tests.cpp" >
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/StringRef.tests.cpp" >
+      <Section name="Substrings" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
+        <Section name="c_str() causes copy" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
             <Original>
               isSubstring( ss )
             </Original>
@@ -5619,7 +5619,7 @@
               true
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/StringRef.tests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
             <Original>
               isOwned( ss ) == false
             </Original>
@@ -5627,7 +5627,7 @@
               false == false
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/StringRef.tests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
             <Original>
               rawChars == data( s )
             </Original>
@@ -5635,7 +5635,7 @@
               "hello world!" == "hello world!"
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/StringRef.tests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
             <Original>
               ss.c_str() != rawChars
             </Original>
@@ -5643,7 +5643,7 @@
               "hello" != "hello world!"
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/StringRef.tests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
             <Original>
               isSubstring( ss ) == false
             </Original>
@@ -5651,7 +5651,7 @@
               false == false
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/StringRef.tests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
             <Original>
               isOwned( ss )
             </Original>
@@ -5659,7 +5659,7 @@
               true
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/StringRef.tests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
             <Original>
               data( ss ) != data( s )
             </Original>
@@ -5671,9 +5671,9 @@
         </Section>
         <OverallResults successes="7" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="Substrings" filename="projects/<exe-name>/IntrospectiveTests/StringRef.tests.cpp" >
-        <Section name="non-zero-based substring" filename="projects/<exe-name>/IntrospectiveTests/StringRef.tests.cpp" >
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/StringRef.tests.cpp" >
+      <Section name="Substrings" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
+        <Section name="non-zero-based substring" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
             <Original>
               ss.size() == 6
             </Original>
@@ -5681,7 +5681,7 @@
               6 == 6
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/StringRef.tests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
             <Original>
               std::strcmp( ss.c_str(), "world!" ) == 0
             </Original>
@@ -5693,9 +5693,9 @@
         </Section>
         <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="Substrings" filename="projects/<exe-name>/IntrospectiveTests/StringRef.tests.cpp" >
-        <Section name="Pointer values of full refs should match" filename="projects/<exe-name>/IntrospectiveTests/StringRef.tests.cpp" >
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/StringRef.tests.cpp" >
+      <Section name="Substrings" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
+        <Section name="Pointer values of full refs should match" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
             <Original>
               s.c_str() == s2.c_str()
             </Original>
@@ -5707,9 +5707,9 @@
         </Section>
         <OverallResults successes="1" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="Substrings" filename="projects/<exe-name>/IntrospectiveTests/StringRef.tests.cpp" >
-        <Section name="Pointer values of substring refs should not match" filename="projects/<exe-name>/IntrospectiveTests/StringRef.tests.cpp" >
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/StringRef.tests.cpp" >
+      <Section name="Substrings" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
+        <Section name="Pointer values of substring refs should not match" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
             <Original>
               s.c_str() != ss.c_str()
             </Original>
@@ -5721,8 +5721,8 @@
         </Section>
         <OverallResults successes="1" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="Comparisons" filename="projects/<exe-name>/IntrospectiveTests/StringRef.tests.cpp" >
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/StringRef.tests.cpp" >
+      <Section name="Comparisons" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
           <Original>
             StringRef("hello") == StringRef("hello")
           </Original>
@@ -5730,7 +5730,7 @@
             hello == hello
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/StringRef.tests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
           <Original>
             StringRef("hello") != StringRef("cello")
           </Original>
@@ -5740,9 +5740,9 @@
         </Expression>
         <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="from std::string" filename="projects/<exe-name>/IntrospectiveTests/StringRef.tests.cpp" >
-        <Section name="implicitly constructed" filename="projects/<exe-name>/IntrospectiveTests/StringRef.tests.cpp" >
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/StringRef.tests.cpp" >
+      <Section name="from std::string" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
+        <Section name="implicitly constructed" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
             <Original>
               sr == "a standard string"
             </Original>
@@ -5750,7 +5750,7 @@
               a standard string == "a standard string"
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/StringRef.tests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
             <Original>
               sr.size() == stdStr.size()
             </Original>
@@ -5762,9 +5762,9 @@
         </Section>
         <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="from std::string" filename="projects/<exe-name>/IntrospectiveTests/StringRef.tests.cpp" >
-        <Section name="explicitly constructed" filename="projects/<exe-name>/IntrospectiveTests/StringRef.tests.cpp" >
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/StringRef.tests.cpp" >
+      <Section name="from std::string" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
+        <Section name="explicitly constructed" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
             <Original>
               sr == "a standard string"
             </Original>
@@ -5772,7 +5772,7 @@
               a standard string == "a standard string"
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/StringRef.tests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
             <Original>
               sr.size() == stdStr.size()
             </Original>
@@ -5784,9 +5784,9 @@
         </Section>
         <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="from std::string" filename="projects/<exe-name>/IntrospectiveTests/StringRef.tests.cpp" >
-        <Section name="assigned" filename="projects/<exe-name>/IntrospectiveTests/StringRef.tests.cpp" >
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/StringRef.tests.cpp" >
+      <Section name="from std::string" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
+        <Section name="assigned" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
             <Original>
               sr == "a standard string"
             </Original>
@@ -5794,7 +5794,7 @@
               a standard string == "a standard string"
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/StringRef.tests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
             <Original>
               sr.size() == stdStr.size()
             </Original>
@@ -5806,9 +5806,9 @@
         </Section>
         <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="to std::string" filename="projects/<exe-name>/IntrospectiveTests/StringRef.tests.cpp" >
-        <Section name="implicitly constructed" filename="projects/<exe-name>/IntrospectiveTests/StringRef.tests.cpp" >
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/StringRef.tests.cpp" >
+      <Section name="to std::string" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
+        <Section name="implicitly constructed" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
             <Original>
               stdStr == "a stringref"
             </Original>
@@ -5816,7 +5816,7 @@
               "a stringref" == "a stringref"
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/StringRef.tests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
             <Original>
               stdStr.size() == sr.size()
             </Original>
@@ -5828,9 +5828,9 @@
         </Section>
         <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="to std::string" filename="projects/<exe-name>/IntrospectiveTests/StringRef.tests.cpp" >
-        <Section name="explicitly constructed" filename="projects/<exe-name>/IntrospectiveTests/StringRef.tests.cpp" >
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/StringRef.tests.cpp" >
+      <Section name="to std::string" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
+        <Section name="explicitly constructed" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
             <Original>
               stdStr == "a stringref"
             </Original>
@@ -5838,7 +5838,7 @@
               "a stringref" == "a stringref"
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/StringRef.tests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
             <Original>
               stdStr.size() == sr.size()
             </Original>
@@ -5850,9 +5850,9 @@
         </Section>
         <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="to std::string" filename="projects/<exe-name>/IntrospectiveTests/StringRef.tests.cpp" >
-        <Section name="assigned" filename="projects/<exe-name>/IntrospectiveTests/StringRef.tests.cpp" >
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/StringRef.tests.cpp" >
+      <Section name="to std::string" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
+        <Section name="assigned" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
             <Original>
               stdStr == "a stringref"
             </Original>
@@ -5860,7 +5860,7 @@
               "a stringref" == "a stringref"
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/StringRef.tests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
             <Original>
               stdStr.size() == sr.size()
             </Original>
@@ -5874,8 +5874,8 @@
       </Section>
       <OverallResult success="false"/>
     </TestCase>
-    <TestCase name="Stringifying std::chrono::duration helpers" tags="[chrono][toString]" filename="projects/<exe-name>/UsageTests/ToStringChrono.cpp" >
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ToStringChrono.cpp" >
+    <TestCase name="Stringifying std::chrono::duration helpers" tags="[chrono][toString]" filename="projects/<exe-name>/UsageTests/ToStringChrono.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ToStringChrono.tests.cpp" >
         <Original>
           minute == seconds
         </Original>
@@ -5883,7 +5883,7 @@
           1 m == 60 s
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ToStringChrono.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ToStringChrono.tests.cpp" >
         <Original>
           hour != seconds
         </Original>
@@ -5891,7 +5891,7 @@
           1 h != 60 s
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ToStringChrono.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ToStringChrono.tests.cpp" >
         <Original>
           micro != milli
         </Original>
@@ -5899,7 +5899,7 @@
           1 us != 1 ms
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ToStringChrono.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ToStringChrono.tests.cpp" >
         <Original>
           nano != micro
         </Original>
@@ -5909,8 +5909,8 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Stringifying std::chrono::duration with weird ratios" tags="[chrono][toString]" filename="projects/<exe-name>/UsageTests/ToStringChrono.cpp" >
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ToStringChrono.cpp" >
+    <TestCase name="Stringifying std::chrono::duration with weird ratios" tags="[chrono][toString]" filename="projects/<exe-name>/UsageTests/ToStringChrono.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ToStringChrono.tests.cpp" >
         <Original>
           half_minute != femto_second
         </Original>
@@ -5920,8 +5920,8 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Stringifying std::chrono::time_point&lt;system_clock>" tags="[chrono][toString]" filename="projects/<exe-name>/UsageTests/ToStringChrono.cpp" >
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ToStringChrono.cpp" >
+    <TestCase name="Stringifying std::chrono::time_point&lt;system_clock>" tags="[chrono][toString]" filename="projects/<exe-name>/UsageTests/ToStringChrono.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ToStringChrono.tests.cpp" >
         <Original>
           now != later
         </Original>
@@ -5933,8 +5933,8 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Tabs and newlines show in output" tags="[.][failing][whitespace]" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
-      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
+    <TestCase name="Tabs and newlines show in output" tags="[.][failing][whitespace]" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
         <Original>
           s1 == s2
         </Original>
@@ -5951,9 +5951,9 @@
       </Expression>
       <OverallResult success="false"/>
     </TestCase>
-    <TestCase name="Tag alias can be registered against tag patterns" filename="projects/<exe-name>/IntrospectiveTests/TagAliasTests.cpp" >
-      <Section name="The same tag alias can only be registered once" filename="projects/<exe-name>/IntrospectiveTests/TagAliasTests.cpp" >
-        <Expression success="true" type="CHECK_THAT" filename="projects/<exe-name>/IntrospectiveTests/TagAliasTests.cpp" >
+    <TestCase name="Tag alias can be registered against tag patterns" filename="projects/<exe-name>/IntrospectiveTests/TagAlias.tests.cpp" >
+      <Section name="The same tag alias can only be registered once" filename="projects/<exe-name>/IntrospectiveTests/TagAlias.tests.cpp" >
+        <Expression success="true" type="CHECK_THAT" filename="projects/<exe-name>/IntrospectiveTests/TagAlias.tests.cpp" >
           <Original>
             what, Contains( "[@zzz]" )
           </Original>
@@ -5963,7 +5963,7 @@
 	Redefined at: file:10" contains: "[@zzz]"
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK_THAT" filename="projects/<exe-name>/IntrospectiveTests/TagAliasTests.cpp" >
+        <Expression success="true" type="CHECK_THAT" filename="projects/<exe-name>/IntrospectiveTests/TagAlias.tests.cpp" >
           <Original>
             what, Contains( "file" )
           </Original>
@@ -5973,7 +5973,7 @@
 	Redefined at: file:10" contains: "file"
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK_THAT" filename="projects/<exe-name>/IntrospectiveTests/TagAliasTests.cpp" >
+        <Expression success="true" type="CHECK_THAT" filename="projects/<exe-name>/IntrospectiveTests/TagAlias.tests.cpp" >
           <Original>
             what, Contains( "2" )
           </Original>
@@ -5983,7 +5983,7 @@
 	Redefined at: file:10" contains: "2"
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK_THAT" filename="projects/<exe-name>/IntrospectiveTests/TagAliasTests.cpp" >
+        <Expression success="true" type="CHECK_THAT" filename="projects/<exe-name>/IntrospectiveTests/TagAlias.tests.cpp" >
           <Original>
             what, Contains( "10" )
           </Original>
@@ -5995,8 +5995,8 @@
         </Expression>
         <OverallResults successes="4" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="Tag aliases must be of the form [@name]" filename="projects/<exe-name>/IntrospectiveTests/TagAliasTests.cpp" >
-        <Expression success="true" type="CHECK_THROWS" filename="projects/<exe-name>/IntrospectiveTests/TagAliasTests.cpp" >
+      <Section name="Tag aliases must be of the form [@name]" filename="projects/<exe-name>/IntrospectiveTests/TagAlias.tests.cpp" >
+        <Expression success="true" type="CHECK_THROWS" filename="projects/<exe-name>/IntrospectiveTests/TagAlias.tests.cpp" >
           <Original>
             registry.add( "[no ampersat]", "", Catch::SourceLineInfo( "file", 3 ) )
           </Original>
@@ -6004,7 +6004,7 @@
             registry.add( "[no ampersat]", "", Catch::SourceLineInfo( "file", 3 ) )
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK_THROWS" filename="projects/<exe-name>/IntrospectiveTests/TagAliasTests.cpp" >
+        <Expression success="true" type="CHECK_THROWS" filename="projects/<exe-name>/IntrospectiveTests/TagAlias.tests.cpp" >
           <Original>
             registry.add( "[the @ is not at the start]", "", Catch::SourceLineInfo( "file", 3 ) )
           </Original>
@@ -6012,7 +6012,7 @@
             registry.add( "[the @ is not at the start]", "", Catch::SourceLineInfo( "file", 3 ) )
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK_THROWS" filename="projects/<exe-name>/IntrospectiveTests/TagAliasTests.cpp" >
+        <Expression success="true" type="CHECK_THROWS" filename="projects/<exe-name>/IntrospectiveTests/TagAlias.tests.cpp" >
           <Original>
             registry.add( "@no square bracket at start]", "", Catch::SourceLineInfo( "file", 3 ) )
           </Original>
@@ -6020,7 +6020,7 @@
             registry.add( "@no square bracket at start]", "", Catch::SourceLineInfo( "file", 3 ) )
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK_THROWS" filename="projects/<exe-name>/IntrospectiveTests/TagAliasTests.cpp" >
+        <Expression success="true" type="CHECK_THROWS" filename="projects/<exe-name>/IntrospectiveTests/TagAlias.tests.cpp" >
           <Original>
             registry.add( "[@no square bracket at end", "", Catch::SourceLineInfo( "file", 3 ) )
           </Original>
@@ -6032,11 +6032,11 @@
       </Section>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Test case with one argument" filename="projects/<exe-name>/UsageTests/VariadicMacrosTests.cpp" >
+    <TestCase name="Test case with one argument" filename="projects/<exe-name>/UsageTests/VariadicMacros.tests.cpp" >
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Test enum bit values" tags="[Tricky]" filename="projects/<exe-name>/UsageTests/TrickyTests.cpp" >
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/TrickyTests.cpp" >
+    <TestCase name="Test enum bit values" tags="[Tricky]" filename="projects/<exe-name>/UsageTests/Tricky.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Tricky.tests.cpp" >
         <Original>
           0x<hex digits> == bit30and31
         </Original>
@@ -6046,8 +6046,8 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="The NO_FAIL macro reports a failure but does not fail the test" tags="[messages]" filename="projects/<exe-name>/UsageTests/MessageTests.cpp" >
-      <Expression success="false" type="CHECK_NOFAIL" filename="projects/<exe-name>/UsageTests/MessageTests.cpp" >
+    <TestCase name="The NO_FAIL macro reports a failure but does not fail the test" tags="[messages]" filename="projects/<exe-name>/UsageTests/Message.tests.cpp" >
+      <Expression success="false" type="CHECK_NOFAIL" filename="projects/<exe-name>/UsageTests/Message.tests.cpp" >
         <Original>
           1 == 2
         </Original>
@@ -6057,11 +6057,11 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="This test 'should' fail but doesn't" tags="[!shouldfail][.][failing]" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
+    <TestCase name="This test 'should' fail but doesn't" tags="[!shouldfail][.][failing]" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
       <OverallResult success="false"/>
     </TestCase>
-    <TestCase name="Tracker" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+    <TestCase name="Tracker" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
         <Original>
           testCase.isOpen()
         </Original>
@@ -6069,7 +6069,7 @@
           true
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
         <Original>
           s1.isOpen()
         </Original>
@@ -6077,8 +6077,8 @@
           true
         </Expanded>
       </Expression>
-      <Section name="successfully close one section" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+      <Section name="successfully close one section" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
           <Original>
             s1.isSuccessfullyCompleted()
           </Original>
@@ -6086,7 +6086,7 @@
             true
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
           <Original>
             testCase.isComplete() == false
           </Original>
@@ -6094,7 +6094,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
           <Original>
             ctx.completedCycle()
           </Original>
@@ -6102,7 +6102,7 @@
             true
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
           <Original>
             testCase.isSuccessfullyCompleted()
           </Original>
@@ -6112,7 +6112,7 @@
         </Expression>
         <OverallResults successes="4" failures="0" expectedFailures="0"/>
       </Section>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
         <Original>
           testCase.isOpen()
         </Original>
@@ -6120,7 +6120,7 @@
           true
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
         <Original>
           s1.isOpen()
         </Original>
@@ -6128,8 +6128,8 @@
           true
         </Expanded>
       </Expression>
-      <Section name="fail one section" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+      <Section name="fail one section" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
           <Original>
             s1.isComplete()
           </Original>
@@ -6137,7 +6137,7 @@
             true
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
           <Original>
             s1.isSuccessfullyCompleted() == false
           </Original>
@@ -6145,7 +6145,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
           <Original>
             testCase.isComplete() == false
           </Original>
@@ -6153,7 +6153,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
           <Original>
             ctx.completedCycle()
           </Original>
@@ -6161,7 +6161,7 @@
             true
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
           <Original>
             testCase.isSuccessfullyCompleted() == false
           </Original>
@@ -6169,8 +6169,8 @@
             false == false
           </Expanded>
         </Expression>
-        <Section name="re-enter after failed section" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+        <Section name="re-enter after failed section" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
             <Original>
               testCase2.isOpen()
             </Original>
@@ -6178,7 +6178,7 @@
               true
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
             <Original>
               s1b.isOpen() == false
             </Original>
@@ -6186,7 +6186,7 @@
               false == false
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
             <Original>
               ctx.completedCycle()
             </Original>
@@ -6194,7 +6194,7 @@
               true
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
             <Original>
               testCase.isComplete()
             </Original>
@@ -6202,7 +6202,7 @@
               true
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
             <Original>
               testCase.isSuccessfullyCompleted()
             </Original>
@@ -6214,7 +6214,7 @@
         </Section>
         <OverallResults successes="10" failures="0" expectedFailures="0"/>
       </Section>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
         <Original>
           testCase.isOpen()
         </Original>
@@ -6222,7 +6222,7 @@
           true
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
         <Original>
           s1.isOpen()
         </Original>
@@ -6230,8 +6230,8 @@
           true
         </Expanded>
       </Expression>
-      <Section name="fail one section" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+      <Section name="fail one section" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
           <Original>
             s1.isComplete()
           </Original>
@@ -6239,7 +6239,7 @@
             true
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
           <Original>
             s1.isSuccessfullyCompleted() == false
           </Original>
@@ -6247,7 +6247,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
           <Original>
             testCase.isComplete() == false
           </Original>
@@ -6255,7 +6255,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
           <Original>
             ctx.completedCycle()
           </Original>
@@ -6263,7 +6263,7 @@
             true
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
           <Original>
             testCase.isSuccessfullyCompleted() == false
           </Original>
@@ -6271,8 +6271,8 @@
             false == false
           </Expanded>
         </Expression>
-        <Section name="re-enter after failed section and find next section" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+        <Section name="re-enter after failed section and find next section" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
             <Original>
               testCase2.isOpen()
             </Original>
@@ -6280,7 +6280,7 @@
               true
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
             <Original>
               s1b.isOpen() == false
             </Original>
@@ -6288,7 +6288,7 @@
               false == false
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
             <Original>
               s2.isOpen()
             </Original>
@@ -6296,7 +6296,7 @@
               true
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
             <Original>
               ctx.completedCycle()
             </Original>
@@ -6304,7 +6304,7 @@
               true
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
             <Original>
               testCase.isComplete()
             </Original>
@@ -6312,7 +6312,7 @@
               true
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
             <Original>
               testCase.isSuccessfullyCompleted()
             </Original>
@@ -6324,7 +6324,7 @@
         </Section>
         <OverallResults successes="11" failures="0" expectedFailures="0"/>
       </Section>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
         <Original>
           testCase.isOpen()
         </Original>
@@ -6332,7 +6332,7 @@
           true
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
         <Original>
           s1.isOpen()
         </Original>
@@ -6340,8 +6340,8 @@
           true
         </Expanded>
       </Expression>
-      <Section name="successfully close one section, then find another" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+      <Section name="successfully close one section, then find another" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
           <Original>
             s2.isOpen() == false
           </Original>
@@ -6349,7 +6349,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
           <Original>
             testCase.isComplete() == false
           </Original>
@@ -6357,8 +6357,8 @@
             false == false
           </Expanded>
         </Expression>
-        <Section name="Re-enter - skips S1 and enters S2" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+        <Section name="Re-enter - skips S1 and enters S2" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
             <Original>
               testCase2.isOpen()
             </Original>
@@ -6366,7 +6366,7 @@
               true
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
             <Original>
               s1b.isOpen() == false
             </Original>
@@ -6374,7 +6374,7 @@
               false == false
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
             <Original>
               s2b.isOpen()
             </Original>
@@ -6382,7 +6382,7 @@
               true
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
             <Original>
               ctx.completedCycle() == false
             </Original>
@@ -6390,8 +6390,8 @@
               false == false
             </Expanded>
           </Expression>
-          <Section name="Successfully close S2" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
-            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+          <Section name="Successfully close S2" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
               <Original>
                 ctx.completedCycle()
               </Original>
@@ -6399,7 +6399,7 @@
                 true
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
               <Original>
                 s2b.isSuccessfullyCompleted()
               </Original>
@@ -6407,7 +6407,7 @@
                 true
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
               <Original>
                 testCase2.isComplete() == false
               </Original>
@@ -6415,7 +6415,7 @@
                 false == false
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
               <Original>
                 testCase2.isSuccessfullyCompleted()
               </Original>
@@ -6429,7 +6429,7 @@
         </Section>
         <OverallResults successes="10" failures="0" expectedFailures="0"/>
       </Section>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
         <Original>
           testCase.isOpen()
         </Original>
@@ -6437,7 +6437,7 @@
           true
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
         <Original>
           s1.isOpen()
         </Original>
@@ -6445,8 +6445,8 @@
           true
         </Expanded>
       </Expression>
-      <Section name="successfully close one section, then find another" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+      <Section name="successfully close one section, then find another" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
           <Original>
             s2.isOpen() == false
           </Original>
@@ -6454,7 +6454,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
           <Original>
             testCase.isComplete() == false
           </Original>
@@ -6462,8 +6462,8 @@
             false == false
           </Expanded>
         </Expression>
-        <Section name="Re-enter - skips S1 and enters S2" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+        <Section name="Re-enter - skips S1 and enters S2" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
             <Original>
               testCase2.isOpen()
             </Original>
@@ -6471,7 +6471,7 @@
               true
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
             <Original>
               s1b.isOpen() == false
             </Original>
@@ -6479,7 +6479,7 @@
               false == false
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
             <Original>
               s2b.isOpen()
             </Original>
@@ -6487,7 +6487,7 @@
               true
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
             <Original>
               ctx.completedCycle() == false
             </Original>
@@ -6495,8 +6495,8 @@
               false == false
             </Expanded>
           </Expression>
-          <Section name="fail S2" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
-            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+          <Section name="fail S2" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
               <Original>
                 ctx.completedCycle()
               </Original>
@@ -6504,7 +6504,7 @@
                 true
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
               <Original>
                 s2b.isComplete()
               </Original>
@@ -6512,7 +6512,7 @@
                 true
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
               <Original>
                 s2b.isSuccessfullyCompleted() == false
               </Original>
@@ -6520,7 +6520,7 @@
                 false == false
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
               <Original>
                 testCase2.isSuccessfullyCompleted() == false
               </Original>
@@ -6528,7 +6528,7 @@
                 false == false
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
               <Original>
                 testCase3.isOpen()
               </Original>
@@ -6536,7 +6536,7 @@
                 true
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
               <Original>
                 s1c.isOpen() == false
               </Original>
@@ -6544,7 +6544,7 @@
                 false == false
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
               <Original>
                 s2c.isOpen() == false
               </Original>
@@ -6552,7 +6552,7 @@
                 false == false
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
               <Original>
                 testCase3.isSuccessfullyCompleted()
               </Original>
@@ -6566,7 +6566,7 @@
         </Section>
         <OverallResults successes="14" failures="0" expectedFailures="0"/>
       </Section>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
         <Original>
           testCase.isOpen()
         </Original>
@@ -6574,7 +6574,7 @@
           true
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
         <Original>
           s1.isOpen()
         </Original>
@@ -6582,8 +6582,8 @@
           true
         </Expanded>
       </Expression>
-      <Section name="open a nested section" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+      <Section name="open a nested section" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
           <Original>
             s2.isOpen()
           </Original>
@@ -6591,7 +6591,7 @@
             true
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
           <Original>
             s2.isComplete()
           </Original>
@@ -6599,7 +6599,7 @@
             true
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
           <Original>
             s1.isComplete() == false
           </Original>
@@ -6607,7 +6607,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
           <Original>
             s1.isComplete()
           </Original>
@@ -6615,7 +6615,7 @@
             true
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
           <Original>
             testCase.isComplete() == false
           </Original>
@@ -6623,7 +6623,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
           <Original>
             testCase.isComplete()
           </Original>
@@ -6633,7 +6633,7 @@
         </Expression>
         <OverallResults successes="6" failures="0" expectedFailures="0"/>
       </Section>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
         <Original>
           testCase.isOpen()
         </Original>
@@ -6641,7 +6641,7 @@
           true
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
         <Original>
           s1.isOpen()
         </Original>
@@ -6649,8 +6649,8 @@
           true
         </Expanded>
       </Expression>
-      <Section name="start a generator" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+      <Section name="start a generator" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
           <Original>
             g1.isOpen()
           </Original>
@@ -6658,7 +6658,7 @@
             true
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
           <Original>
             g1.index() == 0
           </Original>
@@ -6666,7 +6666,7 @@
             0 == 0
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
           <Original>
             g1.isComplete() == false
           </Original>
@@ -6674,7 +6674,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
           <Original>
             s1.isComplete() == false
           </Original>
@@ -6682,8 +6682,8 @@
             false == false
           </Expanded>
         </Expression>
-        <Section name="close outer section" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+        <Section name="close outer section" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
             <Original>
               s1.isComplete() == false
             </Original>
@@ -6691,7 +6691,7 @@
               false == false
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
             <Original>
               testCase.isSuccessfullyCompleted() == false
             </Original>
@@ -6699,8 +6699,8 @@
               false == false
             </Expanded>
           </Expression>
-          <Section name="Re-enter for second generation" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
-            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+          <Section name="Re-enter for second generation" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
               <Original>
                 testCase2.isOpen()
               </Original>
@@ -6708,7 +6708,7 @@
                 true
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
               <Original>
                 s1b.isOpen()
               </Original>
@@ -6716,7 +6716,7 @@
                 true
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
               <Original>
                 g1b.isOpen()
               </Original>
@@ -6724,7 +6724,7 @@
                 true
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
               <Original>
                 g1b.index() == 1
               </Original>
@@ -6732,7 +6732,7 @@
                 1 == 1
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
               <Original>
                 s1.isComplete() == false
               </Original>
@@ -6740,7 +6740,7 @@
                 false == false
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
               <Original>
                 s1b.isComplete()
               </Original>
@@ -6748,7 +6748,7 @@
                 true
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
               <Original>
                 g1b.isComplete()
               </Original>
@@ -6756,7 +6756,7 @@
                 true
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
               <Original>
                 testCase2.isComplete()
               </Original>
@@ -6770,7 +6770,7 @@
         </Section>
         <OverallResults successes="14" failures="0" expectedFailures="0"/>
       </Section>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
         <Original>
           testCase.isOpen()
         </Original>
@@ -6778,7 +6778,7 @@
           true
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
         <Original>
           s1.isOpen()
         </Original>
@@ -6786,8 +6786,8 @@
           true
         </Expanded>
       </Expression>
-      <Section name="start a generator" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+      <Section name="start a generator" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
           <Original>
             g1.isOpen()
           </Original>
@@ -6795,7 +6795,7 @@
             true
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
           <Original>
             g1.index() == 0
           </Original>
@@ -6803,7 +6803,7 @@
             0 == 0
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
           <Original>
             g1.isComplete() == false
           </Original>
@@ -6811,7 +6811,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
           <Original>
             s1.isComplete() == false
           </Original>
@@ -6819,8 +6819,8 @@
             false == false
           </Expanded>
         </Expression>
-        <Section name="Start a new inner section" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+        <Section name="Start a new inner section" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
             <Original>
               s2.isOpen()
             </Original>
@@ -6828,7 +6828,7 @@
               true
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
             <Original>
               s2.isComplete()
             </Original>
@@ -6836,7 +6836,7 @@
               true
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
             <Original>
               s1.isComplete() == false
             </Original>
@@ -6844,7 +6844,7 @@
               false == false
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
             <Original>
               testCase.isComplete() == false
             </Original>
@@ -6852,8 +6852,8 @@
               false == false
             </Expanded>
           </Expression>
-          <Section name="Re-enter for second generation" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
-            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+          <Section name="Re-enter for second generation" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
               <Original>
                 testCase2.isOpen()
               </Original>
@@ -6861,7 +6861,7 @@
                 true
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
               <Original>
                 s1b.isOpen()
               </Original>
@@ -6869,7 +6869,7 @@
                 true
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
               <Original>
                 g1b.isOpen()
               </Original>
@@ -6877,7 +6877,7 @@
                 true
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
               <Original>
                 g1b.index() == 1
               </Original>
@@ -6885,7 +6885,7 @@
                 1 == 1
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
               <Original>
                 s2b.isOpen()
               </Original>
@@ -6893,7 +6893,7 @@
                 true
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
               <Original>
                 s2b.isComplete()
               </Original>
@@ -6901,7 +6901,7 @@
                 true
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
               <Original>
                 g1b.isComplete()
               </Original>
@@ -6909,7 +6909,7 @@
                 true
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
               <Original>
                 s1b.isComplete()
               </Original>
@@ -6917,7 +6917,7 @@
                 true
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
               <Original>
                 testCase2.isComplete()
               </Original>
@@ -6931,7 +6931,7 @@
         </Section>
         <OverallResults successes="17" failures="0" expectedFailures="0"/>
       </Section>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
         <Original>
           testCase.isOpen()
         </Original>
@@ -6939,7 +6939,7 @@
           true
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
         <Original>
           s1.isOpen()
         </Original>
@@ -6947,8 +6947,8 @@
           true
         </Expanded>
       </Expression>
-      <Section name="start a generator" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+      <Section name="start a generator" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
           <Original>
             g1.isOpen()
           </Original>
@@ -6956,7 +6956,7 @@
             true
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
           <Original>
             g1.index() == 0
           </Original>
@@ -6964,7 +6964,7 @@
             0 == 0
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
           <Original>
             g1.isComplete() == false
           </Original>
@@ -6972,7 +6972,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
           <Original>
             s1.isComplete() == false
           </Original>
@@ -6980,8 +6980,8 @@
             false == false
           </Expanded>
         </Expression>
-        <Section name="Fail an inner section" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+        <Section name="Fail an inner section" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
             <Original>
               s2.isOpen()
             </Original>
@@ -6989,7 +6989,7 @@
               true
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
             <Original>
               s2.isComplete()
             </Original>
@@ -6997,7 +6997,7 @@
               true
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
             <Original>
               s2.isSuccessfullyCompleted() == false
             </Original>
@@ -7005,7 +7005,7 @@
               false == false
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
             <Original>
               s1.isComplete() == false
             </Original>
@@ -7013,7 +7013,7 @@
               false == false
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
             <Original>
               testCase.isComplete() == false
             </Original>
@@ -7021,8 +7021,8 @@
               false == false
             </Expanded>
           </Expression>
-          <Section name="Re-enter for second generation" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
-            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+          <Section name="Re-enter for second generation" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
               <Original>
                 testCase2.isOpen()
               </Original>
@@ -7030,7 +7030,7 @@
                 true
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
               <Original>
                 s1b.isOpen()
               </Original>
@@ -7038,7 +7038,7 @@
                 true
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
               <Original>
                 g1b.isOpen()
               </Original>
@@ -7046,7 +7046,7 @@
                 true
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
               <Original>
                 g1b.index() == 0
               </Original>
@@ -7054,7 +7054,7 @@
                 0 == 0
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
               <Original>
                 s2b.isOpen() == false
               </Original>
@@ -7062,7 +7062,7 @@
                 false == false
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
               <Original>
                 g1b.isComplete() == false
               </Original>
@@ -7070,7 +7070,7 @@
                 false == false
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
               <Original>
                 s1b.isComplete() == false
               </Original>
@@ -7078,7 +7078,7 @@
                 false == false
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
               <Original>
                 testCase2.isComplete() == false
               </Original>
@@ -7086,7 +7086,7 @@
                 false == false
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
               <Original>
                 testCase3.isOpen()
               </Original>
@@ -7094,7 +7094,7 @@
                 true
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
               <Original>
                 s1c.isOpen()
               </Original>
@@ -7102,7 +7102,7 @@
                 true
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
               <Original>
                 g1c.isOpen()
               </Original>
@@ -7110,7 +7110,7 @@
                 true
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
               <Original>
                 g1c.index() == 1
               </Original>
@@ -7118,7 +7118,7 @@
                 1 == 1
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
               <Original>
                 s2c.isOpen()
               </Original>
@@ -7126,7 +7126,7 @@
                 true
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
               <Original>
                 s2c.isComplete()
               </Original>
@@ -7134,7 +7134,7 @@
                 true
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
               <Original>
                 g1c.isComplete()
               </Original>
@@ -7142,7 +7142,7 @@
                 true
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
               <Original>
                 s1c.isComplete()
               </Original>
@@ -7150,7 +7150,7 @@
                 true
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
               <Original>
                 testCase3.isComplete()
               </Original>
@@ -7166,14 +7166,14 @@
       </Section>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Unexpected exceptions can be translated" tags="[!throws][.][failing]" filename="projects/<exe-name>/UsageTests/ExceptionTests.cpp" >
-      <Exception filename="projects/<exe-name>/UsageTests/ExceptionTests.cpp" >
+    <TestCase name="Unexpected exceptions can be translated" tags="[!throws][.][failing]" filename="projects/<exe-name>/UsageTests/Exception.tests.cpp" >
+      <Exception filename="projects/<exe-name>/UsageTests/Exception.tests.cpp" >
         3.14
       </Exception>
       <OverallResult success="false"/>
     </TestCase>
-    <TestCase name="Use a custom approx" tags="[Approx][custom]" filename="projects/<exe-name>/UsageTests/ApproxTests.cpp" >
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ApproxTests.cpp" >
+    <TestCase name="Use a custom approx" tags="[Approx][custom]" 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.23 )
         </Original>
@@ -7181,7 +7181,7 @@
           1.23 == Approx( 1.23 )
         </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.22 )
         </Original>
@@ -7189,7 +7189,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.24 )
         </Original>
@@ -7197,7 +7197,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.25 )
         </Original>
@@ -7205,7 +7205,7 @@
           1.23 != Approx( 1.25 )
         </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( d ) == 1.23
         </Original>
@@ -7213,7 +7213,7 @@
           Approx( 1.23 ) == 1.23
         </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( d ) == 1.22
         </Original>
@@ -7221,7 +7221,7 @@
           Approx( 1.23 ) == 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>
           approx( d ) == 1.24
         </Original>
@@ -7229,7 +7229,7 @@
           Approx( 1.23 ) == 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>
           approx( d ) != 1.25
         </Original>
@@ -7239,15 +7239,15 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Variadic macros" tags="[sections][variadic]" filename="projects/<exe-name>/UsageTests/VariadicMacrosTests.cpp" >
-      <Section name="Section with one argument" filename="projects/<exe-name>/UsageTests/VariadicMacrosTests.cpp" >
+    <TestCase name="Variadic macros" tags="[sections][variadic]" filename="projects/<exe-name>/UsageTests/VariadicMacros.tests.cpp" >
+      <Section name="Section with one argument" filename="projects/<exe-name>/UsageTests/VariadicMacros.tests.cpp" >
         <OverallResults successes="1" failures="0" expectedFailures="0"/>
       </Section>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Vector matchers" tags="[matchers][vector]" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
-      <Section name="Contains (element)" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
-        <Expression success="true" type="CHECK_THAT" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
+    <TestCase name="Vector matchers" tags="[matchers][vector]" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
+      <Section name="Contains (element)" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
+        <Expression success="true" type="CHECK_THAT" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
           <Original>
             v, VectorContains( 1 )
           </Original>
@@ -7255,7 +7255,7 @@
             { 1, 2, 3 } Contains: 1
           </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>
             v, VectorContains( 2 )
           </Original>
@@ -7265,8 +7265,8 @@
         </Expression>
         <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="Contains (vector)" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
-        <Expression success="true" type="CHECK_THAT" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
+      <Section name="Contains (vector)" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
+        <Expression success="true" type="CHECK_THAT" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
           <Original>
             v, Contains( v2 )
           </Original>
@@ -7274,7 +7274,7 @@
             { 1, 2, 3 } Contains: { 1, 2 }
           </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>
             v, Contains( v2 )
           </Original>
@@ -7282,7 +7282,7 @@
             { 1, 2, 3 } Contains: { 1, 2, 3 }
           </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>
             v, Contains( empty)
           </Original>
@@ -7290,7 +7290,7 @@
             { 1, 2, 3 } Contains: {  }
           </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>
             empty, Contains( empty)
           </Original>
@@ -7300,8 +7300,8 @@
         </Expression>
         <OverallResults successes="4" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="Contains (element), composed" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
-        <Expression success="true" type="CHECK_THAT" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
+      <Section name="Contains (element), composed" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
+        <Expression success="true" type="CHECK_THAT" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
           <Original>
             v, VectorContains( 1 ) &amp;&amp; VectorContains( 2 )
           </Original>
@@ -7311,8 +7311,8 @@
         </Expression>
         <OverallResults successes="1" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="Equals" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
-        <Expression success="true" type="CHECK_THAT" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
+      <Section name="Equals" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
+        <Expression success="true" type="CHECK_THAT" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
           <Original>
             v, Equals( v )
           </Original>
@@ -7320,7 +7320,7 @@
             { 1, 2, 3 } Equals: { 1, 2, 3 }
           </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>
             empty, Equals( empty )
           </Original>
@@ -7328,7 +7328,7 @@
             {  } Equals: {  }
           </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>
             v, Equals( v2 )
           </Original>
@@ -7340,9 +7340,9 @@
       </Section>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Vector matchers that fail" tags="[.][failing][matchers][vector]" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
-      <Section name="Contains (element)" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
-        <Expression success="false" type="CHECK_THAT" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
+    <TestCase name="Vector matchers that fail" tags="[.][failing][matchers][vector]" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
+      <Section name="Contains (element)" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
+        <Expression success="false" type="CHECK_THAT" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
           <Original>
             v, VectorContains( -1 )
           </Original>
@@ -7350,7 +7350,7 @@
             { 1, 2, 3 } Contains: -1
           </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>
             empty, VectorContains( 1 )
           </Original>
@@ -7360,8 +7360,8 @@
         </Expression>
         <OverallResults successes="0" failures="2" expectedFailures="0"/>
       </Section>
-      <Section name="Contains (vector)" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
-        <Expression success="false" type="CHECK_THAT" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
+      <Section name="Contains (vector)" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
+        <Expression success="false" type="CHECK_THAT" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
           <Original>
             empty, Contains( v)
           </Original>
@@ -7369,7 +7369,7 @@
             {  } Contains: { 1, 2, 3 }
           </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>
             v, Contains( v2 )
           </Original>
@@ -7379,8 +7379,8 @@
         </Expression>
         <OverallResults successes="0" failures="2" expectedFailures="0"/>
       </Section>
-      <Section name="Equals" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
-        <Expression success="false" type="CHECK_THAT" filename="projects/<exe-name>/UsageTests/MatchersTests.cpp" >
+      <Section name="Equals" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
+        <Expression success="false" type="CHECK_THAT" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" >
           <Original>
             v, Equals( v2 )
           </Original>
@@ -7388,7 +7388,7 @@
             { 1, 2, 3 } Equals: { 1, 2 }
           </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>
             v2, Equals( v )
           </Original>
@@ -7396,7 +7396,7 @@
             { 1, 2 } Equals: { 1, 2, 3 }
           </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>
             empty, Equals( v )
           </Original>
@@ -7404,7 +7404,7 @@
             {  } Equals: { 1, 2, 3 }
           </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>
             v, Equals( empty )
           </Original>
@@ -7416,8 +7416,8 @@
       </Section>
       <OverallResult success="false"/>
     </TestCase>
-    <TestCase name="When checked exceptions are thrown they can be expected or unexpected" tags="[!throws]" filename="projects/<exe-name>/UsageTests/ExceptionTests.cpp" >
-      <Expression success="true" type="REQUIRE_THROWS_AS" filename="projects/<exe-name>/UsageTests/ExceptionTests.cpp" >
+    <TestCase name="When checked exceptions are thrown they can be expected or unexpected" tags="[!throws]" filename="projects/<exe-name>/UsageTests/Exception.tests.cpp" >
+      <Expression success="true" type="REQUIRE_THROWS_AS" filename="projects/<exe-name>/UsageTests/Exception.tests.cpp" >
         <Original>
           thisThrows(), std::domain_error
         </Original>
@@ -7425,7 +7425,7 @@
           thisThrows(), std::domain_error
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE_NOTHROW" filename="projects/<exe-name>/UsageTests/ExceptionTests.cpp" >
+      <Expression success="true" type="REQUIRE_NOTHROW" filename="projects/<exe-name>/UsageTests/Exception.tests.cpp" >
         <Original>
           thisDoesntThrow()
         </Original>
@@ -7433,7 +7433,7 @@
           thisDoesntThrow()
         </Expanded>
       </Expression>
-      <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>
@@ -7443,93 +7443,93 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="When unchecked exceptions are thrown directly they are always failures" tags="[!throws][.][failing]" filename="projects/<exe-name>/UsageTests/ExceptionTests.cpp" >
-      <Exception filename="projects/<exe-name>/UsageTests/ExceptionTests.cpp" >
+    <TestCase name="When unchecked exceptions are thrown directly they are always failures" tags="[!throws][.][failing]" filename="projects/<exe-name>/UsageTests/Exception.tests.cpp" >
+      <Exception filename="projects/<exe-name>/UsageTests/Exception.tests.cpp" >
         unexpected exception
       </Exception>
       <OverallResult success="false"/>
     </TestCase>
-    <TestCase name="When unchecked exceptions are thrown during a CHECK the test should continue" tags="[!throws][.][failing]" filename="projects/<exe-name>/UsageTests/ExceptionTests.cpp" >
-      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/ExceptionTests.cpp" >
+    <TestCase name="When unchecked exceptions are thrown during a CHECK the test should continue" tags="[!throws][.][failing]" filename="projects/<exe-name>/UsageTests/Exception.tests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/Exception.tests.cpp" >
         <Original>
           thisThrows() == 0
         </Original>
         <Expanded>
           thisThrows() == 0
         </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="When unchecked exceptions are thrown during a REQUIRE the test should abort fail" tags="[!throws][.][failing]" filename="projects/<exe-name>/UsageTests/ExceptionTests.cpp" >
-      <Expression success="false" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ExceptionTests.cpp" >
+    <TestCase name="When unchecked exceptions are thrown during a REQUIRE the test should abort fail" tags="[!throws][.][failing]" filename="projects/<exe-name>/UsageTests/Exception.tests.cpp" >
+      <Expression success="false" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Exception.tests.cpp" >
         <Original>
           thisThrows() == 0
         </Original>
         <Expanded>
           thisThrows() == 0
         </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="When unchecked exceptions are thrown from functions they are always failures" tags="[!throws][.][failing]" filename="projects/<exe-name>/UsageTests/ExceptionTests.cpp" >
-      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/ExceptionTests.cpp" >
+    <TestCase name="When unchecked exceptions are thrown from functions they are always failures" tags="[!throws][.][failing]" filename="projects/<exe-name>/UsageTests/Exception.tests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/Exception.tests.cpp" >
         <Original>
           thisThrows() == 0
         </Original>
         <Expanded>
           thisThrows() == 0
         </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="When unchecked exceptions are thrown from sections they are always failures" tags="[!throws][.][failing]" filename="projects/<exe-name>/UsageTests/ExceptionTests.cpp" >
-      <Section name="section name" filename="projects/<exe-name>/UsageTests/ExceptionTests.cpp" >
-        <Exception filename="projects/<exe-name>/UsageTests/ExceptionTests.cpp" >
+    <TestCase name="When unchecked exceptions are thrown from sections they are always failures" tags="[!throws][.][failing]" filename="projects/<exe-name>/UsageTests/Exception.tests.cpp" >
+      <Section name="section name" filename="projects/<exe-name>/UsageTests/Exception.tests.cpp" >
+        <Exception filename="projects/<exe-name>/UsageTests/Exception.tests.cpp" >
           unexpected exception
         </Exception>
         <OverallResults successes="0" failures="1" expectedFailures="0"/>
       </Section>
       <OverallResult success="false"/>
     </TestCase>
-    <TestCase name="When unchecked exceptions are thrown, but caught, they do not affect the test" tags="[!throws]" filename="projects/<exe-name>/UsageTests/ExceptionTests.cpp" >
+    <TestCase name="When unchecked exceptions are thrown, but caught, they do not affect the test" tags="[!throws]" filename="projects/<exe-name>/UsageTests/Exception.tests.cpp" >
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Where the LHS is not a simple value" tags="[.][Tricky][failing]" filename="projects/<exe-name>/UsageTests/TrickyTests.cpp" >
+    <TestCase name="Where the LHS is not a simple value" tags="[.][Tricky][failing]" filename="projects/<exe-name>/UsageTests/Tricky.tests.cpp" >
       <Warning>
         Uncomment the code in this test to check that it gives a sensible compiler error
       </Warning>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Where there is more to the expression after the RHS" tags="[.][Tricky][failing]" filename="projects/<exe-name>/UsageTests/TrickyTests.cpp" >
+    <TestCase name="Where there is more to the expression after the RHS" tags="[.][Tricky][failing]" filename="projects/<exe-name>/UsageTests/Tricky.tests.cpp" >
       <Warning>
         Uncomment the code in this test to check that it gives a sensible compiler error
       </Warning>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="X/level/0/a" tags="[Tricky]" filename="projects/<exe-name>/UsageTests/TrickyTests.cpp" >
+    <TestCase name="X/level/0/a" tags="[Tricky]" filename="projects/<exe-name>/UsageTests/Tricky.tests.cpp" >
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="X/level/0/b" tags="[Tricky][fizz]" filename="projects/<exe-name>/UsageTests/TrickyTests.cpp" >
+    <TestCase name="X/level/0/b" tags="[Tricky][fizz]" filename="projects/<exe-name>/UsageTests/Tricky.tests.cpp" >
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="X/level/1/a" tags="[Tricky]" filename="projects/<exe-name>/UsageTests/TrickyTests.cpp" >
+    <TestCase name="X/level/1/a" tags="[Tricky]" filename="projects/<exe-name>/UsageTests/Tricky.tests.cpp" >
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="X/level/1/b" tags="[Tricky]" filename="projects/<exe-name>/UsageTests/TrickyTests.cpp" >
+    <TestCase name="X/level/1/b" tags="[Tricky]" filename="projects/<exe-name>/UsageTests/Tricky.tests.cpp" >
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="XmlEncode" filename="projects/<exe-name>/IntrospectiveTests/XmlTests.cpp" >
-      <Section name="normal string" filename="projects/<exe-name>/IntrospectiveTests/XmlTests.cpp" >
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/XmlTests.cpp" >
+    <TestCase name="XmlEncode" filename="projects/<exe-name>/IntrospectiveTests/Xml.tests.cpp" >
+      <Section name="normal string" filename="projects/<exe-name>/IntrospectiveTests/Xml.tests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/Xml.tests.cpp" >
           <Original>
             encode( "normal string" ) == "normal string"
           </Original>
@@ -7539,8 +7539,8 @@
         </Expression>
         <OverallResults successes="1" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="empty string" filename="projects/<exe-name>/IntrospectiveTests/XmlTests.cpp" >
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/XmlTests.cpp" >
+      <Section name="empty string" filename="projects/<exe-name>/IntrospectiveTests/Xml.tests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/Xml.tests.cpp" >
           <Original>
             encode( "" ) == ""
           </Original>
@@ -7550,8 +7550,8 @@
         </Expression>
         <OverallResults successes="1" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="string with ampersand" filename="projects/<exe-name>/IntrospectiveTests/XmlTests.cpp" >
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/XmlTests.cpp" >
+      <Section name="string with ampersand" filename="projects/<exe-name>/IntrospectiveTests/Xml.tests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/Xml.tests.cpp" >
           <Original>
             encode( "smith &amp; jones" ) == "smith &amp;amp; jones"
           </Original>
@@ -7561,8 +7561,8 @@
         </Expression>
         <OverallResults successes="1" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="string with less-than" filename="projects/<exe-name>/IntrospectiveTests/XmlTests.cpp" >
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/XmlTests.cpp" >
+      <Section name="string with less-than" filename="projects/<exe-name>/IntrospectiveTests/Xml.tests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/Xml.tests.cpp" >
           <Original>
             encode( "smith &lt; jones" ) == "smith &amp;lt; jones"
           </Original>
@@ -7572,8 +7572,8 @@
         </Expression>
         <OverallResults successes="1" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="string with greater-than" filename="projects/<exe-name>/IntrospectiveTests/XmlTests.cpp" >
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/XmlTests.cpp" >
+      <Section name="string with greater-than" filename="projects/<exe-name>/IntrospectiveTests/Xml.tests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/Xml.tests.cpp" >
           <Original>
             encode( "smith > jones" ) == "smith > jones"
           </Original>
@@ -7581,7 +7581,7 @@
             "smith > jones" == "smith > jones"
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/XmlTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/Xml.tests.cpp" >
           <Original>
             encode( "smith ]]&gt; jones" ) == "smith ]]&amp;gt; jones"
           </Original>
@@ -7593,8 +7593,8 @@
         </Expression>
         <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="string with quotes" filename="projects/<exe-name>/IntrospectiveTests/XmlTests.cpp" >
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/XmlTests.cpp" >
+      <Section name="string with quotes" filename="projects/<exe-name>/IntrospectiveTests/Xml.tests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/Xml.tests.cpp" >
           <Original>
             encode( stringWithQuotes ) == stringWithQuotes
           </Original>
@@ -7604,7 +7604,7 @@
 "don't "quote" me on that"
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/XmlTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/Xml.tests.cpp" >
           <Original>
             encode( stringWithQuotes, Catch::XmlEncode::ForAttributes ) == "don't &amp;quot;quote&amp;quot; me on that"
           </Original>
@@ -7616,8 +7616,8 @@
         </Expression>
         <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="string with control char (1)" filename="projects/<exe-name>/IntrospectiveTests/XmlTests.cpp" >
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/XmlTests.cpp" >
+      <Section name="string with control char (1)" filename="projects/<exe-name>/IntrospectiveTests/Xml.tests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/Xml.tests.cpp" >
           <Original>
             encode( "[\x01]" ) == "[\\x01]"
           </Original>
@@ -7627,8 +7627,8 @@
         </Expression>
         <OverallResults successes="1" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="string with control char (x7F)" filename="projects/<exe-name>/IntrospectiveTests/XmlTests.cpp" >
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/XmlTests.cpp" >
+      <Section name="string with control char (x7F)" filename="projects/<exe-name>/IntrospectiveTests/Xml.tests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/Xml.tests.cpp" >
           <Original>
             encode( "[\x7F]" ) == "[\\x7F]"
           </Original>
@@ -7640,8 +7640,8 @@
       </Section>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="atomic if" tags="[0][failing]" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
+    <TestCase name="atomic if" tags="[0][failing]" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
         <Original>
           x == 0
         </Original>
@@ -7651,8 +7651,8 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="boolean member" tags="[Tricky]" filename="projects/<exe-name>/UsageTests/TrickyTests.cpp" >
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/TrickyTests.cpp" >
+    <TestCase name="boolean member" tags="[Tricky]" filename="projects/<exe-name>/UsageTests/Tricky.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Tricky.tests.cpp" >
         <Original>
           obj.prop != 0
         </Original>
@@ -7662,8 +7662,8 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="checkedElse" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
-      <Expression success="true" type="CHECKED_ELSE" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
+    <TestCase name="checkedElse" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
+      <Expression success="true" type="CHECKED_ELSE" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
         <Original>
           flag
         </Original>
@@ -7671,7 +7671,7 @@
           true
         </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>
           testCheckedElse( true )
         </Original>
@@ -7681,8 +7681,8 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="checkedElse, failing" tags="[.][failing]" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
-      <Expression success="false" type="CHECKED_ELSE" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
+    <TestCase name="checkedElse, failing" tags="[.][failing]" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
+      <Expression success="false" type="CHECKED_ELSE" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
         <Original>
           flag
         </Original>
@@ -7690,7 +7690,7 @@
           false
         </Expanded>
       </Expression>
-      <Expression success="false" type="REQUIRE" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
+      <Expression success="false" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
         <Original>
           testCheckedElse( false )
         </Original>
@@ -7700,8 +7700,8 @@
       </Expression>
       <OverallResult success="false"/>
     </TestCase>
-    <TestCase name="checkedIf" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
-      <Expression success="true" type="CHECKED_IF" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
+    <TestCase name="checkedIf" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
+      <Expression success="true" type="CHECKED_IF" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
         <Original>
           flag
         </Original>
@@ -7709,7 +7709,7 @@
           true
         </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>
           testCheckedIf( true )
         </Original>
@@ -7719,8 +7719,8 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="checkedIf, failing" tags="[.][failing]" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
-      <Expression success="false" type="CHECKED_IF" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
+    <TestCase name="checkedIf, failing" tags="[.][failing]" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
+      <Expression success="false" type="CHECKED_IF" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
         <Original>
           flag
         </Original>
@@ -7728,7 +7728,7 @@
           false
         </Expanded>
       </Expression>
-      <Expression success="false" type="REQUIRE" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
+      <Expression success="false" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
         <Original>
           testCheckedIf( false )
         </Original>
@@ -7738,8 +7738,8 @@
       </Expression>
       <OverallResult success="false"/>
     </TestCase>
-    <TestCase name="comparisons between const int variables" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+    <TestCase name="comparisons between const int variables" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
           unsigned_char_var == 1
         </Original>
@@ -7747,7 +7747,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>
           unsigned_short_var == 1
         </Original>
@@ -7755,7 +7755,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>
           unsigned_int_var == 1
         </Original>
@@ -7763,7 +7763,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>
           unsigned_long_var == 1
         </Original>
@@ -7773,8 +7773,8 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="comparisons between int variables" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ConditionTests.cpp" >
+    <TestCase name="comparisons between int variables" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Condition.tests.cpp" >
         <Original>
           long_var == unsigned_char_var
         </Original>
@@ -7782,7 +7782,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>
           long_var == unsigned_short_var
         </Original>
@@ -7790,7 +7790,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>
           long_var == unsigned_int_var
         </Original>
@@ -7798,7 +7798,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>
           long_var == unsigned_long_var
         </Original>
@@ -7808,42 +7808,42 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="even more nested SECTION tests" tags="[sections]" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
-      <Section name="c" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
-        <Section name="d (leaf)" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
+    <TestCase name="even more nested SECTION tests" tags="[sections]" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
+      <Section name="c" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
+        <Section name="d (leaf)" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
           <OverallResults successes="1" failures="0" expectedFailures="0"/>
         </Section>
         <OverallResults successes="1" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="c" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
-        <Section name="e (leaf)" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
+      <Section name="c" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
+        <Section name="e (leaf)" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
           <OverallResults successes="1" failures="0" expectedFailures="0"/>
         </Section>
         <OverallResults successes="1" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="f (leaf)" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
+      <Section name="f (leaf)" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
         <OverallResults successes="1" failures="0" expectedFailures="0"/>
       </Section>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="first tag" tags="[tag1]" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
+    <TestCase name="first tag" tags="[tag1]" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="has printf" filename="projects/<exe-name>/UsageTests/TrickyTests.cpp" >
+    <TestCase name="has printf" filename="projects/<exe-name>/UsageTests/Tricky.tests.cpp" >
 loose text artifact
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="just failure" tags="[.][fail][isolated info][messages]" filename="projects/<exe-name>/UsageTests/MessageTests.cpp" >
-      <Failure filename="projects/<exe-name>/UsageTests/MessageTests.cpp" >
+    <TestCase name="just failure" tags="[.][fail][isolated info][messages]" filename="projects/<exe-name>/UsageTests/Message.tests.cpp" >
+      <Failure filename="projects/<exe-name>/UsageTests/Message.tests.cpp" >
         Previous info should not be seen
       </Failure>
       <OverallResult success="false"/>
     </TestCase>
-    <TestCase name="just info" tags="[info][isolated info][messages]" filename="projects/<exe-name>/UsageTests/MessageTests.cpp" >
+    <TestCase name="just info" tags="[info][isolated info][messages]" filename="projects/<exe-name>/UsageTests/Message.tests.cpp" >
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="long long" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
+    <TestCase name="long long" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
         <Original>
           l == std::numeric_limits&lt;long long>::max()
         </Original>
@@ -7855,9 +7855,9 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="looped SECTION tests" tags="[.][failing][sections]" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
-      <Section name="s1" description="b is currently: 0" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
-        <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
+    <TestCase name="looped SECTION tests" tags="[.][failing][sections]" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
+      <Section name="s1" description="b is currently: 0" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
+        <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
           <Original>
             b > a
           </Original>
@@ -7869,11 +7869,11 @@
       </Section>
       <OverallResult success="false"/>
     </TestCase>
-    <TestCase name="looped tests" tags="[.][failing]" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
+    <TestCase name="looped tests" tags="[.][failing]" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
       <Info>
         Testing if fib[0] (1) is even
       </Info>
-      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
         <Original>
           ( fib[i] % 2 ) == 0
         </Original>
@@ -7884,7 +7884,7 @@
       <Info>
         Testing if fib[1] (1) is even
       </Info>
-      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
         <Original>
           ( fib[i] % 2 ) == 0
         </Original>
@@ -7895,7 +7895,7 @@
       <Info>
         Testing if fib[2] (2) is even
       </Info>
-      <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
+      <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
         <Original>
           ( fib[i] % 2 ) == 0
         </Original>
@@ -7906,7 +7906,7 @@
       <Info>
         Testing if fib[3] (3) is even
       </Info>
-      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
         <Original>
           ( fib[i] % 2 ) == 0
         </Original>
@@ -7917,7 +7917,7 @@
       <Info>
         Testing if fib[4] (5) is even
       </Info>
-      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
         <Original>
           ( fib[i] % 2 ) == 0
         </Original>
@@ -7928,7 +7928,7 @@
       <Info>
         Testing if fib[5] (8) is even
       </Info>
-      <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
+      <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
         <Original>
           ( fib[i] % 2 ) == 0
         </Original>
@@ -7939,7 +7939,7 @@
       <Info>
         Testing if fib[6] (13) is even
       </Info>
-      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
         <Original>
           ( fib[i] % 2 ) == 0
         </Original>
@@ -7950,7 +7950,7 @@
       <Info>
         Testing if fib[7] (21) is even
       </Info>
-      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
         <Original>
           ( fib[i] % 2 ) == 0
         </Original>
@@ -7960,10 +7960,10 @@
       </Expression>
       <OverallResult success="false"/>
     </TestCase>
-    <TestCase name="more nested SECTION tests" tags="[.][failing][sections]" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
-      <Section name="s1" description="doesn't equal" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
-        <Section name="s2" description="equal" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
-          <Expression success="false" type="REQUIRE" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
+    <TestCase name="more nested SECTION tests" tags="[.][failing][sections]" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
+      <Section name="s1" description="doesn't equal" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
+        <Section name="s2" description="equal" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
+          <Expression success="false" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
             <Original>
               a == b
             </Original>
@@ -7975,9 +7975,9 @@
         </Section>
         <OverallResults successes="0" failures="1" expectedFailures="0"/>
       </Section>
-      <Section name="s1" description="doesn't equal" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
-        <Section name="s3" description="not equal" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
+      <Section name="s1" description="doesn't equal" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
+        <Section name="s3" description="not equal" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
             <Original>
               a != b
             </Original>
@@ -7989,9 +7989,9 @@
         </Section>
         <OverallResults successes="1" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="s1" description="doesn't equal" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
-        <Section name="s4" description="less than" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
+      <Section name="s1" description="doesn't equal" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
+        <Section name="s4" description="less than" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
             <Original>
               a &lt; b
             </Original>
@@ -8005,9 +8005,9 @@
       </Section>
       <OverallResult success="false"/>
     </TestCase>
-    <TestCase name="nested SECTION tests" tags="[.][failing][sections]" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
-      <Section name="s1" description="doesn't equal" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
+    <TestCase name="nested SECTION tests" tags="[.][failing][sections]" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
+      <Section name="s1" description="doesn't equal" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
           <Original>
             a != b
           </Original>
@@ -8015,7 +8015,7 @@
             1 != 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>
             b != a
           </Original>
@@ -8023,8 +8023,8 @@
             2 != 1
           </Expanded>
         </Expression>
-        <Section name="s2" description="not equal" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
+        <Section name="s2" description="not equal" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
             <Original>
               a != b
             </Original>
@@ -8038,8 +8038,8 @@
       </Section>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="non streamable - with conv. op" tags="[Tricky]" filename="projects/<exe-name>/UsageTests/TrickyTests.cpp" >
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/TrickyTests.cpp" >
+    <TestCase name="non streamable - with conv. op" tags="[Tricky]" filename="projects/<exe-name>/UsageTests/Tricky.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Tricky.tests.cpp" >
         <Original>
           s == "7"
         </Original>
@@ -8049,8 +8049,8 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="non-copyable objects" tags="[.][failing]" filename="projects/<exe-name>/UsageTests/TrickyTests.cpp" >
-      <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/TrickyTests.cpp" >
+    <TestCase name="non-copyable objects" tags="[.][failing]" filename="projects/<exe-name>/UsageTests/Tricky.tests.cpp" >
+      <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/Tricky.tests.cpp" >
         <Original>
           ti == typeid(int)
         </Original>
@@ -8060,11 +8060,11 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="not allowed" tags="[!throws]" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
+    <TestCase name="not allowed" tags="[!throws]" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="null strings" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
+    <TestCase name="null strings" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
         <Original>
           makeString( false ) != static_cast&lt;char*>(0)
         </Original>
@@ -8072,7 +8072,7 @@
           "valid string" != {null string}
         </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>
           makeString( true ) == static_cast&lt;char*>(0)
         </Original>
@@ -8082,8 +8082,8 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="null_ptr" tags="[Tricky]" filename="projects/<exe-name>/UsageTests/TrickyTests.cpp" >
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/TrickyTests.cpp" >
+    <TestCase name="null_ptr" tags="[Tricky]" filename="projects/<exe-name>/UsageTests/Tricky.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Tricky.tests.cpp" >
         <Original>
           ptr.get() == 0
         </Original>
@@ -8093,8 +8093,8 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="pair&lt;pair&lt;int,const char *,pair&lt;std::string,int> > -> toString" tags="[pair][toString]" filename="projects/<exe-name>/UsageTests/ToStringPair.cpp" >
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ToStringPair.cpp" >
+    <TestCase name="pair&lt;pair&lt;int,const char *,pair&lt;std::string,int> > -> toString" tags="[pair][toString]" filename="projects/<exe-name>/UsageTests/ToStringPair.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ToStringPair.tests.cpp" >
         <Original>
           ::Catch::Detail::stringify( pair ) == "{ { 42, \"Arthur\" }, { \"Ford\", 24 } }"
         </Original>
@@ -8106,8 +8106,8 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="pointer to class" tags="[Tricky]" filename="projects/<exe-name>/UsageTests/TrickyTests.cpp" >
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/TrickyTests.cpp" >
+    <TestCase name="pointer to class" tags="[Tricky]" filename="projects/<exe-name>/UsageTests/Tricky.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Tricky.tests.cpp" >
         <Original>
           p == 0
         </Original>
@@ -8117,9 +8117,9 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="random SECTION tests" tags="[.][failing][sections]" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
-      <Section name="s1" description="doesn't equal" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
+    <TestCase name="random SECTION tests" tags="[.][failing][sections]" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
+      <Section name="s1" description="doesn't equal" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
           <Original>
             a != b
           </Original>
@@ -8127,7 +8127,7 @@
             1 != 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>
             b != a
           </Original>
@@ -8137,8 +8137,8 @@
         </Expression>
         <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="s2" description="not equal" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
+      <Section name="s2" description="not equal" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
           <Original>
             a != b
           </Original>
@@ -8150,9 +8150,9 @@
       </Section>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="replaceInPlace" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
-      <Section name="replace single char" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
+    <TestCase name="replaceInPlace" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
+      <Section name="replace single char" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
           <Original>
             Catch::replaceInPlace( letters, "b", "z" )
           </Original>
@@ -8160,7 +8160,7 @@
             true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
           <Original>
             letters == "azcdefcg"
           </Original>
@@ -8170,8 +8170,8 @@
         </Expression>
         <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="replace two chars" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
+      <Section name="replace two chars" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
           <Original>
             Catch::replaceInPlace( letters, "c", "z" )
           </Original>
@@ -8179,7 +8179,7 @@
             true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
           <Original>
             letters == "abzdefzg"
           </Original>
@@ -8189,8 +8189,8 @@
         </Expression>
         <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="replace first char" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
+      <Section name="replace first char" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
           <Original>
             Catch::replaceInPlace( letters, "a", "z" )
           </Original>
@@ -8198,7 +8198,7 @@
             true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
           <Original>
             letters == "zbcdefcg"
           </Original>
@@ -8208,8 +8208,8 @@
         </Expression>
         <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="replace last char" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
+      <Section name="replace last char" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
           <Original>
             Catch::replaceInPlace( letters, "g", "z" )
           </Original>
@@ -8217,7 +8217,7 @@
             true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
           <Original>
             letters == "abcdefcz"
           </Original>
@@ -8227,8 +8227,8 @@
         </Expression>
         <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="replace all chars" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
+      <Section name="replace all chars" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
           <Original>
             Catch::replaceInPlace( letters, letters, "replaced" )
           </Original>
@@ -8236,7 +8236,7 @@
             true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
           <Original>
             letters == "replaced"
           </Original>
@@ -8246,8 +8246,8 @@
         </Expression>
         <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="replace no chars" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
-        <Expression success="true" type="CHECK_FALSE" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
+      <Section name="replace no chars" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
+        <Expression success="true" type="CHECK_FALSE" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
           <Original>
             !(Catch::replaceInPlace( letters, "x", "z" ))
           </Original>
@@ -8255,7 +8255,7 @@
             !false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
           <Original>
             letters == letters
           </Original>
@@ -8265,8 +8265,8 @@
         </Expression>
         <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="escape '" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
+      <Section name="escape '" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
           <Original>
             Catch::replaceInPlace( s, "'", "|'" )
           </Original>
@@ -8274,7 +8274,7 @@
             true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/TestMain.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
           <Original>
             s == "didn|'t"
           </Original>
@@ -8286,14 +8286,14 @@
       </Section>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="second tag" tags="[tag2]" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
+    <TestCase name="second tag" tags="[tag2]" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="send a single char to INFO" tags="[.][failing]" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
+    <TestCase name="send a single char to INFO" tags="[.][failing]" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
       <Info>
         3
       </Info>
-      <Expression success="false" type="REQUIRE" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
+      <Expression success="false" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
         <Original>
           false
         </Original>
@@ -8303,14 +8303,14 @@
       </Expression>
       <OverallResult success="false"/>
     </TestCase>
-    <TestCase name="sends information to INFO" tags="[.][failing]" filename="projects/<exe-name>/UsageTests/MessageTests.cpp" >
+    <TestCase name="sends information to INFO" tags="[.][failing]" filename="projects/<exe-name>/UsageTests/Message.tests.cpp" >
       <Info>
         hi
       </Info>
       <Info>
         i := 7
       </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>
           false
         </Original>
@@ -8320,8 +8320,8 @@
       </Expression>
       <OverallResult success="false"/>
     </TestCase>
-    <TestCase name="std::pair&lt;int,const std::string> -> toString" tags="[pair][toString]" filename="projects/<exe-name>/UsageTests/ToStringPair.cpp" >
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ToStringPair.cpp" >
+    <TestCase name="std::pair&lt;int,const std::string> -> toString" tags="[pair][toString]" filename="projects/<exe-name>/UsageTests/ToStringPair.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ToStringPair.tests.cpp" >
         <Original>
           ::Catch::Detail::stringify(value) == "{ 34, \"xyzzy\" }"
         </Original>
@@ -8331,8 +8331,8 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="std::pair&lt;int,std::string> -> toString" tags="[pair][toString]" filename="projects/<exe-name>/UsageTests/ToStringPair.cpp" >
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ToStringPair.cpp" >
+    <TestCase name="std::pair&lt;int,std::string> -> toString" tags="[pair][toString]" filename="projects/<exe-name>/UsageTests/ToStringPair.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ToStringPair.tests.cpp" >
         <Original>
           ::Catch::Detail::stringify( value ) == "{ 34, \"xyzzy\" }"
         </Original>
@@ -8342,8 +8342,8 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="std::vector&lt;std::pair&lt;std::string,int> > -> toString" tags="[pair][toString]" filename="projects/<exe-name>/UsageTests/ToStringPair.cpp" >
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ToStringPair.cpp" >
+    <TestCase name="std::vector&lt;std::pair&lt;std::string,int> > -> toString" tags="[pair][toString]" filename="projects/<exe-name>/UsageTests/ToStringPair.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ToStringPair.tests.cpp" >
         <Original>
           ::Catch::Detail::stringify( pr ) == "{ { \"green\", 55 } }"
         </Original>
@@ -8355,8 +8355,8 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="string literals of different sizes can be compared" tags="[.][Tricky][failing]" filename="projects/<exe-name>/UsageTests/TrickyTests.cpp" >
-      <Expression success="false" type="REQUIRE" filename="projects/<exe-name>/UsageTests/TrickyTests.cpp" >
+    <TestCase name="string literals of different sizes can be compared" tags="[.][Tricky][failing]" filename="projects/<exe-name>/UsageTests/Tricky.tests.cpp" >
+      <Expression success="false" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Tricky.tests.cpp" >
         <Original>
           std::string( "first" ) == "second"
         </Original>
@@ -8366,8 +8366,8 @@
       </Expression>
       <OverallResult success="false"/>
     </TestCase>
-    <TestCase name="stringify( has_maker )" tags="[toString]" filename="projects/<exe-name>/UsageTests/ToStringWhich.cpp" >
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ToStringWhich.cpp" >
+    <TestCase name="stringify( has_maker )" tags="[toString]" filename="projects/<exe-name>/UsageTests/ToStringWhich.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ToStringWhich.tests.cpp" >
         <Original>
           ::Catch::Detail::stringify( item ) == "StringMaker&lt;has_maker>"
         </Original>
@@ -8379,8 +8379,8 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="stringify( has_maker_and_toString )" tags="[.][toString]" filename="projects/<exe-name>/UsageTests/ToStringWhich.cpp" >
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ToStringWhich.cpp" >
+    <TestCase name="stringify( has_maker_and_toString )" tags="[.][toString]" filename="projects/<exe-name>/UsageTests/ToStringWhich.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ToStringWhich.tests.cpp" >
         <Original>
           ::Catch::Detail::stringify( item ) == "StringMaker&lt;has_maker_and_operator>"
         </Original>
@@ -8392,8 +8392,8 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="stringify( has_operator )" tags="[toString]" filename="projects/<exe-name>/UsageTests/ToStringWhich.cpp" >
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ToStringWhich.cpp" >
+    <TestCase name="stringify( has_operator )" tags="[toString]" filename="projects/<exe-name>/UsageTests/ToStringWhich.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ToStringWhich.tests.cpp" >
         <Original>
           ::Catch::Detail::stringify( item ) == "operator&lt;&lt;( has_operator )"
         </Original>
@@ -8405,8 +8405,8 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="toString on const wchar_t const pointer returns the string contents" tags="[toString]" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
-      <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
+    <TestCase name="toString on const wchar_t const pointer returns the string contents" tags="[toString]" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
+      <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
         <Original>
           result == "\"wide load\""
         </Original>
@@ -8416,8 +8416,8 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="toString on const wchar_t pointer returns the string contents" tags="[toString]" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
-      <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
+    <TestCase name="toString on const wchar_t pointer returns the string contents" tags="[toString]" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
+      <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
         <Original>
           result == "\"wide load\""
         </Original>
@@ -8427,8 +8427,8 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="toString on wchar_t const pointer returns the string contents" tags="[toString]" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
-      <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
+    <TestCase name="toString on wchar_t const pointer returns the string contents" tags="[toString]" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
+      <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
         <Original>
           result == "\"wide load\""
         </Original>
@@ -8438,8 +8438,8 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="toString on wchar_t returns the string contents" tags="[toString]" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
-      <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
+    <TestCase name="toString on wchar_t returns the string contents" tags="[toString]" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
+      <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
         <Original>
           result == "\"wide load\""
         </Original>
@@ -8449,8 +8449,8 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="toString( vectors&lt;has_maker )" tags="[toString]" filename="projects/<exe-name>/UsageTests/ToStringWhich.cpp" >
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ToStringWhich.cpp" >
+    <TestCase name="toString( vectors&lt;has_maker )" tags="[toString]" filename="projects/<exe-name>/UsageTests/ToStringWhich.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ToStringWhich.tests.cpp" >
         <Original>
           ::Catch::Detail::stringify( v ) == "{ StringMaker&lt;has_maker> }"
         </Original>
@@ -8462,8 +8462,8 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="toString(enum class w/operator&lt;&lt;)" tags="[enum][enumClass][toString]" filename="projects/<exe-name>/UsageTests/EnumToString.cpp" >
-      <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/EnumToString.cpp" >
+    <TestCase name="toString(enum class w/operator&lt;&lt;)" tags="[enum][enumClass][toString]" filename="projects/<exe-name>/UsageTests/EnumToString.tests.cpp" >
+      <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/EnumToString.tests.cpp" >
         <Original>
           ::Catch::Detail::stringify(e0) == "E2/V0"
         </Original>
@@ -8471,7 +8471,7 @@
           "E2/V0" == "E2/V0"
         </Expanded>
       </Expression>
-      <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/EnumToString.cpp" >
+      <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/EnumToString.tests.cpp" >
         <Original>
           ::Catch::Detail::stringify(e1) == "E2/V1"
         </Original>
@@ -8479,7 +8479,7 @@
           "E2/V1" == "E2/V1"
         </Expanded>
       </Expression>
-      <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/EnumToString.cpp" >
+      <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/EnumToString.tests.cpp" >
         <Original>
           ::Catch::Detail::stringify(e3) == "Unknown enum value 10"
         </Original>
@@ -8491,8 +8491,8 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="toString(enum class)" tags="[.][enum][enumClass][toString]" filename="projects/<exe-name>/UsageTests/EnumToString.cpp" >
-      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/EnumToString.cpp" >
+    <TestCase name="toString(enum class)" tags="[.][enum][enumClass][toString]" filename="projects/<exe-name>/UsageTests/EnumToString.tests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/EnumToString.tests.cpp" >
         <Original>
           ::Catch::Detail::stringify(e0) == "0"
         </Original>
@@ -8500,7 +8500,7 @@
           "{?}" == "0"
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/EnumToString.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/UsageTests/EnumToString.tests.cpp" >
         <Original>
           ::Catch::Detail::stringify(e1) == "1"
         </Original>
@@ -8510,8 +8510,8 @@
       </Expression>
       <OverallResult success="false"/>
     </TestCase>
-    <TestCase name="toString(enum w/operator&lt;&lt;)" tags="[enum][toString]" filename="projects/<exe-name>/UsageTests/EnumToString.cpp" >
-      <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/EnumToString.cpp" >
+    <TestCase name="toString(enum w/operator&lt;&lt;)" tags="[enum][toString]" filename="projects/<exe-name>/UsageTests/EnumToString.tests.cpp" >
+      <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/EnumToString.tests.cpp" >
         <Original>
           ::Catch::Detail::stringify(e0) == "E2{0}"
         </Original>
@@ -8519,7 +8519,7 @@
           "E2{0}" == "E2{0}"
         </Expanded>
       </Expression>
-      <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/EnumToString.cpp" >
+      <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/EnumToString.tests.cpp" >
         <Original>
           ::Catch::Detail::stringify(e1) == "E2{1}"
         </Original>
@@ -8529,8 +8529,8 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="toString(enum)" tags="[enum][toString]" filename="projects/<exe-name>/UsageTests/EnumToString.cpp" >
-      <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/EnumToString.cpp" >
+    <TestCase name="toString(enum)" tags="[enum][toString]" filename="projects/<exe-name>/UsageTests/EnumToString.tests.cpp" >
+      <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/EnumToString.tests.cpp" >
         <Original>
           ::Catch::Detail::stringify(e0) == "0"
         </Original>
@@ -8538,7 +8538,7 @@
           "0" == "0"
         </Expanded>
       </Expression>
-      <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/EnumToString.cpp" >
+      <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/EnumToString.tests.cpp" >
         <Original>
           ::Catch::Detail::stringify(e1) == "1"
         </Original>
@@ -8548,8 +8548,8 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="tuple&lt;>" tags="[toString][tuple]" filename="projects/<exe-name>/UsageTests/ToStringTuple.cpp" >
-      <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/ToStringTuple.cpp" >
+    <TestCase name="tuple&lt;>" tags="[toString][tuple]" filename="projects/<exe-name>/UsageTests/ToStringTuple.tests.cpp" >
+      <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/ToStringTuple.tests.cpp" >
         <Original>
           "{ }" == ::Catch::Detail::stringify(type{})
         </Original>
@@ -8557,7 +8557,7 @@
           "{ }" == "{ }"
         </Expanded>
       </Expression>
-      <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/ToStringTuple.cpp" >
+      <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/ToStringTuple.tests.cpp" >
         <Original>
           "{ }" == ::Catch::Detail::stringify(value)
         </Original>
@@ -8567,8 +8567,8 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="tuple&lt;float,int>" tags="[toString][tuple]" filename="projects/<exe-name>/UsageTests/ToStringTuple.cpp" >
-      <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/ToStringTuple.cpp" >
+    <TestCase name="tuple&lt;float,int>" tags="[toString][tuple]" filename="projects/<exe-name>/UsageTests/ToStringTuple.tests.cpp" >
+      <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/ToStringTuple.tests.cpp" >
         <Original>
           "1.2f" == ::Catch::Detail::stringify(float(1.2))
         </Original>
@@ -8576,7 +8576,7 @@
           "1.2f" == "1.2f"
         </Expanded>
       </Expression>
-      <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/ToStringTuple.cpp" >
+      <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/ToStringTuple.tests.cpp" >
         <Original>
           "{ 1.2f, 0 }" == ::Catch::Detail::stringify(type{1.2f,0})
         </Original>
@@ -8586,8 +8586,8 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="tuple&lt;int>" tags="[toString][tuple]" filename="projects/<exe-name>/UsageTests/ToStringTuple.cpp" >
-      <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/ToStringTuple.cpp" >
+    <TestCase name="tuple&lt;int>" tags="[toString][tuple]" filename="projects/<exe-name>/UsageTests/ToStringTuple.tests.cpp" >
+      <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/ToStringTuple.tests.cpp" >
         <Original>
           "{ 0 }" == ::Catch::Detail::stringify(type{0})
         </Original>
@@ -8597,8 +8597,8 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="tuple&lt;0,int,const char *>" tags="[toString][tuple]" filename="projects/<exe-name>/UsageTests/ToStringTuple.cpp" >
-      <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/ToStringTuple.cpp" >
+    <TestCase name="tuple&lt;0,int,const char *>" tags="[toString][tuple]" filename="projects/<exe-name>/UsageTests/ToStringTuple.tests.cpp" >
+      <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/ToStringTuple.tests.cpp" >
         <Original>
           "{ 0, 42, \"Catch me\" }" == ::Catch::Detail::stringify(value)
         </Original>
@@ -8610,8 +8610,8 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="tuple&lt;string,string>" tags="[toString][tuple]" filename="projects/<exe-name>/UsageTests/ToStringTuple.cpp" >
-      <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/ToStringTuple.cpp" >
+    <TestCase name="tuple&lt;string,string>" tags="[toString][tuple]" filename="projects/<exe-name>/UsageTests/ToStringTuple.tests.cpp" >
+      <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/ToStringTuple.tests.cpp" >
         <Original>
           "{ \"hello\", \"world\" }" == ::Catch::Detail::stringify(type{"hello","world"})
         </Original>
@@ -8623,8 +8623,8 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="tuple&lt;tuple&lt;int>,tuple&lt;>,float>" tags="[toString][tuple]" filename="projects/<exe-name>/UsageTests/ToStringTuple.cpp" >
-      <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/ToStringTuple.cpp" >
+    <TestCase name="tuple&lt;tuple&lt;int>,tuple&lt;>,float>" tags="[toString][tuple]" filename="projects/<exe-name>/UsageTests/ToStringTuple.tests.cpp" >
+      <Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/ToStringTuple.tests.cpp" >
         <Original>
           "{ { 42 }, { }, 1.2f }" == ::Catch::Detail::stringify(value)
         </Original>
@@ -8636,8 +8636,8 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="vec&lt;vec&lt;string,alloc>> -> toString" tags="[toString][vector,allocator]" filename="projects/<exe-name>/UsageTests/ToStringVector.cpp" >
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ToStringVector.cpp" >
+    <TestCase name="vec&lt;vec&lt;string,alloc>> -> toString" tags="[toString][vector,allocator]" filename="projects/<exe-name>/UsageTests/ToStringVector.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ToStringVector.tests.cpp" >
         <Original>
           ::Catch::Detail::stringify(v) == "{  }"
         </Original>
@@ -8645,7 +8645,7 @@
           "{  }" == "{  }"
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ToStringVector.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ToStringVector.tests.cpp" >
         <Original>
           ::Catch::Detail::stringify(v) == "{ { \"hello\" }, { \"world\" } }"
         </Original>
@@ -8657,8 +8657,8 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="vector&lt;int,allocator> -> toString" tags="[toString][vector,allocator]" filename="projects/<exe-name>/UsageTests/ToStringVector.cpp" >
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ToStringVector.cpp" >
+    <TestCase name="vector&lt;int,allocator> -> toString" tags="[toString][vector,allocator]" filename="projects/<exe-name>/UsageTests/ToStringVector.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ToStringVector.tests.cpp" >
         <Original>
           ::Catch::Detail::stringify(vv) == "{  }"
         </Original>
@@ -8666,7 +8666,7 @@
           "{  }" == "{  }"
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ToStringVector.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ToStringVector.tests.cpp" >
         <Original>
           ::Catch::Detail::stringify(vv) == "{ 42 }"
         </Original>
@@ -8674,7 +8674,7 @@
           "{ 42 }" == "{ 42 }"
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ToStringVector.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ToStringVector.tests.cpp" >
         <Original>
           ::Catch::Detail::stringify(vv) == "{ 42, 250 }"
         </Original>
@@ -8684,8 +8684,8 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="vector&lt;int> -> toString" tags="[toString][vector]" filename="projects/<exe-name>/UsageTests/ToStringVector.cpp" >
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ToStringVector.cpp" >
+    <TestCase name="vector&lt;int> -> toString" tags="[toString][vector]" filename="projects/<exe-name>/UsageTests/ToStringVector.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ToStringVector.tests.cpp" >
         <Original>
           ::Catch::Detail::stringify(vv) == "{  }"
         </Original>
@@ -8693,7 +8693,7 @@
           "{  }" == "{  }"
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ToStringVector.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ToStringVector.tests.cpp" >
         <Original>
           ::Catch::Detail::stringify(vv) == "{ 42 }"
         </Original>
@@ -8701,7 +8701,7 @@
           "{ 42 }" == "{ 42 }"
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ToStringVector.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ToStringVector.tests.cpp" >
         <Original>
           ::Catch::Detail::stringify(vv) == "{ 42, 250 }"
         </Original>
@@ -8711,8 +8711,8 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="vector&lt;string> -> toString" tags="[toString][vector]" filename="projects/<exe-name>/UsageTests/ToStringVector.cpp" >
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ToStringVector.cpp" >
+    <TestCase name="vector&lt;string> -> toString" tags="[toString][vector]" filename="projects/<exe-name>/UsageTests/ToStringVector.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ToStringVector.tests.cpp" >
         <Original>
           ::Catch::Detail::stringify(vv) == "{  }"
         </Original>
@@ -8720,7 +8720,7 @@
           "{  }" == "{  }"
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ToStringVector.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ToStringVector.tests.cpp" >
         <Original>
           ::Catch::Detail::stringify(vv) == "{ \"hello\" }"
         </Original>
@@ -8728,7 +8728,7 @@
           "{ "hello" }" == "{ "hello" }"
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ToStringVector.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ToStringVector.tests.cpp" >
         <Original>
           ::Catch::Detail::stringify(vv) == "{ \"hello\", \"world\" }"
         </Original>
@@ -8740,8 +8740,8 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="vectors can be sized and resized" tags="[vector]" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
+    <TestCase name="vectors can be sized and resized" tags="[vector]" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
         <Original>
           v.size() == 5
         </Original>
@@ -8749,7 +8749,7 @@
           5 == 5
         </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>
           v.capacity() >= 5
         </Original>
@@ -8757,8 +8757,8 @@
           5 >= 5
         </Expanded>
       </Expression>
-      <Section name="resizing bigger changes size and capacity" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
+      <Section name="resizing bigger changes size and capacity" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
           <Original>
             v.size() == 10
           </Original>
@@ -8766,7 +8766,7 @@
             10 == 10
           </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>
             v.capacity() >= 10
           </Original>
@@ -8776,7 +8776,7 @@
         </Expression>
         <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
-      <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>
           v.size() == 5
         </Original>
@@ -8784,7 +8784,7 @@
           5 == 5
         </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>
           v.capacity() >= 5
         </Original>
@@ -8792,8 +8792,8 @@
           5 >= 5
         </Expanded>
       </Expression>
-      <Section name="resizing smaller changes size but not capacity" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
+      <Section name="resizing smaller changes size but not capacity" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
           <Original>
             v.size() == 0
           </Original>
@@ -8801,7 +8801,7 @@
             0 == 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>
             v.capacity() >= 5
           </Original>
@@ -8809,8 +8809,8 @@
             5 >= 5
           </Expanded>
         </Expression>
-        <Section name="We can use the 'swap trick' to reset the capacity" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
+        <Section name="We can use the 'swap trick' to reset the capacity" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
             <Original>
               v.capacity() == 0
             </Original>
@@ -8822,7 +8822,7 @@
         </Section>
         <OverallResults successes="3" failures="0" expectedFailures="0"/>
       </Section>
-      <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>
           v.size() == 5
         </Original>
@@ -8830,7 +8830,7 @@
           5 == 5
         </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>
           v.capacity() >= 5
         </Original>
@@ -8838,8 +8838,8 @@
           5 >= 5
         </Expanded>
       </Expression>
-      <Section name="reserving bigger changes capacity but not size" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
+      <Section name="reserving bigger changes capacity but not size" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
           <Original>
             v.size() == 5
           </Original>
@@ -8847,7 +8847,7 @@
             5 == 5
           </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>
             v.capacity() >= 10
           </Original>
@@ -8857,7 +8857,7 @@
         </Expression>
         <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
-      <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>
           v.size() == 5
         </Original>
@@ -8865,7 +8865,7 @@
           5 == 5
         </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>
           v.capacity() >= 5
         </Original>
@@ -8873,8 +8873,8 @@
           5 >= 5
         </Expanded>
       </Expression>
-      <Section name="reserving smaller does not change size or capacity" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
+      <Section name="reserving smaller does not change size or capacity" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
           <Original>
             v.size() == 5
           </Original>
@@ -8882,7 +8882,7 @@
             5 == 5
           </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>
             v.capacity() >= 5
           </Original>
@@ -8894,11 +8894,11 @@
       </Section>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="xmlentitycheck" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
-      <Section name="embedded xml" description="&lt;test>it should be possible to embed xml characters, such as &lt;, &quot; or &amp;, or even whole &lt;xml>documents&lt;/xml> within an attribute&lt;/test>" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
+    <TestCase name="xmlentitycheck" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
+      <Section name="embedded xml" description="&lt;test>it should be possible to embed xml characters, such as &lt;, &quot; or &amp;, or even whole &lt;xml>documents&lt;/xml> within an attribute&lt;/test>" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
         <OverallResults successes="1" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="encoded chars" description="these should all be encoded: &amp;&amp;&amp;&quot;&quot;&quot;&lt;&lt;&lt;&amp;&quot;&lt;&lt;&amp;&quot;" filename="projects/<exe-name>/UsageTests/MiscTests.cpp" >
+      <Section name="encoded chars" description="these should all be encoded: &amp;&amp;&amp;&quot;&quot;&quot;&lt;&lt;&lt;&amp;&quot;&lt;&lt;&amp;&quot;" filename="projects/<exe-name>/UsageTests/Misc.tests.cpp" >
         <OverallResults successes="1" failures="0" expectedFailures="0"/>
       </Section>
       <OverallResult success="true"/>