Exclude test name from approval tests
diff --git a/projects/SelfTest/Baselines/xml.sw.approved.txt b/projects/SelfTest/Baselines/xml.sw.approved.txt
index 6d9d735..3e7af57 100644
--- a/projects/SelfTest/Baselines/xml.sw.approved.txt
+++ b/projects/SelfTest/Baselines/xml.sw.approved.txt
@@ -1,11 +1,11 @@
 <?xml version="1.1" encoding="UTF-8"?>
-<Catch name="CatchSelfTest">
-  <Group name="CatchSelfTest">
+<Catch name="<exe-name>">
+  <Group name="<exe-name>">
     <TestCase name="# A test name that starts with a #">
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="'Not' checks that should fail">
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           false != false
         </Original>
@@ -13,7 +13,7 @@
           false != false
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           true != true
         </Original>
@@ -21,7 +21,7 @@
           true != true
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           !true
         </Original>
@@ -29,7 +29,7 @@
           false
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK_FALSE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK_FALSE" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           !true
         </Original>
@@ -37,7 +37,7 @@
           !true
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           !trueValue
         </Original>
@@ -45,7 +45,7 @@
           false
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK_FALSE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK_FALSE" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           !trueValue
         </Original>
@@ -53,7 +53,7 @@
           !true
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           !(1 == 1)
         </Original>
@@ -61,7 +61,7 @@
           false
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK_FALSE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK_FALSE" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           !1 == 1
         </Original>
@@ -72,7 +72,7 @@
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="'Not' checks that should succeed">
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           false == false
         </Original>
@@ -80,7 +80,7 @@
           false == false
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           true == true
         </Original>
@@ -88,7 +88,7 @@
           true == true
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           !false
         </Original>
@@ -96,7 +96,7 @@
           true
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE_FALSE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE_FALSE" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           !false
         </Original>
@@ -104,7 +104,7 @@
           !false
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           !falseValue
         </Original>
@@ -112,7 +112,7 @@
           true
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE_FALSE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE_FALSE" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           !falseValue
         </Original>
@@ -120,7 +120,7 @@
           !false
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           !(1 == 2)
         </Original>
@@ -128,7 +128,7 @@
           true
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE_FALSE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE_FALSE" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           !1 == 2
         </Original>
@@ -140,7 +140,7 @@
     </TestCase>
     <TestCase name="(unimplemented) static bools can be evaluated">
       <Section name="compare to true">
-        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TrickyTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/TrickyTests.cpp" >
           <Original>
             is_true&lt;true>::value == true
           </Original>
@@ -148,7 +148,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TrickyTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/TrickyTests.cpp" >
           <Original>
             true == is_true&lt;true>::value
           </Original>
@@ -159,7 +159,7 @@
         <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="compare to false">
-        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TrickyTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/TrickyTests.cpp" >
           <Original>
             is_true&lt;false>::value == false
           </Original>
@@ -167,7 +167,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TrickyTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/TrickyTests.cpp" >
           <Original>
             false == is_true&lt;false>::value
           </Original>
@@ -178,7 +178,7 @@
         <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="negation">
-        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TrickyTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/TrickyTests.cpp" >
           <Original>
             !is_true&lt;false>::value
           </Original>
@@ -189,7 +189,7 @@
         <OverallResults successes="1" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="double negation">
-        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TrickyTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/TrickyTests.cpp" >
           <Original>
             !!is_true&lt;true>::value
           </Original>
@@ -200,7 +200,7 @@
         <OverallResults successes="1" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="direct">
-        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TrickyTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/TrickyTests.cpp" >
           <Original>
             is_true&lt;true>::value
           </Original>
@@ -208,7 +208,7 @@
             true
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE_FALSE" filename="projects/SelfTest/TrickyTests.cpp" >
+        <Expression success="true" type="REQUIRE_FALSE" filename="projects/<exe-name>/TrickyTests.cpp" >
           <Original>
             !is_true&lt;false>::value
           </Original>
@@ -221,7 +221,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="A METHOD_AS_TEST_CASE based test run that fails">
-      <Expression success="false" type="REQUIRE" filename="projects/SelfTest/ClassTests.cpp" >
+      <Expression success="false" type="REQUIRE" filename="projects/<exe-name>/ClassTests.cpp" >
         <Original>
           s == "world"
         </Original>
@@ -232,7 +232,7 @@
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="A METHOD_AS_TEST_CASE based test run that succeeds">
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ClassTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ClassTests.cpp" >
         <Original>
           s == "hello"
         </Original>
@@ -243,7 +243,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="A TEST_CASE_METHOD based test run that fails">
-      <Expression success="false" type="REQUIRE" filename="projects/SelfTest/ClassTests.cpp" >
+      <Expression success="false" type="REQUIRE" filename="projects/<exe-name>/ClassTests.cpp" >
         <Original>
           m_a == 2
         </Original>
@@ -254,7 +254,7 @@
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="A TEST_CASE_METHOD based test run that succeeds">
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ClassTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ClassTests.cpp" >
         <Original>
           m_a == 1
         </Original>
@@ -277,7 +277,7 @@
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="A failing expression with a non streamable type is still captured">
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/TrickyTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/TrickyTests.cpp" >
         <Original>
           &amp;o1 == &amp;o2
         </Original>
@@ -285,7 +285,7 @@
           0x<hex digits> == 0x<hex digits>
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/TrickyTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/TrickyTests.cpp" >
         <Original>
           o1 == o2
         </Original>
@@ -296,7 +296,7 @@
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="AllOf matcher">
-      <Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" >
+      <Expression success="true" type="CHECK_THAT" filename="projects/<exe-name>/MiscTests.cpp" >
         <Original>
           testStringForMatching(), AllOf( Catch::Contains( "string" ), Catch::Contains( "abc" ) )
         </Original>
@@ -310,7 +310,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="An expression with side-effects should only be evaluated once">
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TrickyTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/TrickyTests.cpp" >
         <Original>
           i++ == 7
         </Original>
@@ -318,7 +318,7 @@
           7 == 7
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TrickyTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/TrickyTests.cpp" >
         <Original>
           i++ == 8
         </Original>
@@ -329,7 +329,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="An unchecked exception reports the line of the last assertion">
-      <Expression success="true" type="CHECK" filename="projects/SelfTest/ExceptionTests.cpp" >
+      <Expression success="true" type="CHECK" filename="projects/<exe-name>/ExceptionTests.cpp" >
         <Original>
           1 == 1
         </Original>
@@ -337,14 +337,14 @@
           1 == 1
         </Expanded>
       </Expression>
-      <Expression success="false" filename="projects/SelfTest/ExceptionTests.cpp" >
+      <Expression success="false" filename="projects/<exe-name>/ExceptionTests.cpp" >
         <Original>
           {Unknown expression after the reported line}
         </Original>
         <Expanded>
           {Unknown expression after the reported line}
         </Expanded>
-        <Exception filename="projects/SelfTest/ExceptionTests.cpp" >
+        <Exception filename="projects/<exe-name>/ExceptionTests.cpp" >
           unexpected exception
         </Exception>
       </Expression>
@@ -354,7 +354,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="AnyOf matcher">
-      <Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" >
+      <Expression success="true" type="CHECK_THAT" filename="projects/<exe-name>/MiscTests.cpp" >
         <Original>
           testStringForMatching(), AnyOf( Catch::Contains( "string" ), Catch::Contains( "not there" ) )
         </Original>
@@ -362,7 +362,7 @@
           "this string contains 'abc' as a substring" ( contains: "string" or contains: "not there" )
         </Expanded>
       </Expression>
-      <Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" >
+      <Expression success="true" type="CHECK_THAT" filename="projects/<exe-name>/MiscTests.cpp" >
         <Original>
           testStringForMatching(), AnyOf( Catch::Contains( "not there" ), Catch::Contains( "string" ) )
         </Original>
@@ -373,7 +373,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Approximate PI">
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ApproxTests.cpp" >
         <Original>
           divide( 22, 7 ) == Approx( 3.141 ).epsilon( 0.001 )
         </Original>
@@ -381,7 +381,7 @@
           3.1428571429 == Approx( 3.141 )
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ApproxTests.cpp" >
         <Original>
           divide( 22, 7 ) != Approx( 3.141 ).epsilon( 0.0001 )
         </Original>
@@ -392,7 +392,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Approximate comparisons with different epsilons">
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ApproxTests.cpp" >
         <Original>
           d != Approx( 1.231 )
         </Original>
@@ -400,7 +400,7 @@
           1.23 != Approx( 1.231 )
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ApproxTests.cpp" >
         <Original>
           d == Approx( 1.231 ).epsilon( 0.1 )
         </Original>
@@ -411,7 +411,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Approximate comparisons with floats">
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ApproxTests.cpp" >
         <Original>
           1.23f == Approx( 1.23f )
         </Original>
@@ -419,7 +419,7 @@
           1.23f == Approx( 1.2300000191 )
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ApproxTests.cpp" >
         <Original>
           0.0f == Approx( 0.0f )
         </Original>
@@ -430,7 +430,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Approximate comparisons with ints">
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ApproxTests.cpp" >
         <Original>
           1 == Approx( 1 )
         </Original>
@@ -438,7 +438,7 @@
           1 == Approx( 1.0 )
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ApproxTests.cpp" >
         <Original>
           0 == Approx( 0 )
         </Original>
@@ -449,7 +449,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Approximate comparisons with mixed numeric types">
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ApproxTests.cpp" >
         <Original>
           1.0f == Approx( 1 )
         </Original>
@@ -457,7 +457,7 @@
           1.0f == Approx( 1.0 )
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ApproxTests.cpp" >
         <Original>
           0 == Approx( dZero)
         </Original>
@@ -465,7 +465,7 @@
           0 == Approx( 0.0 )
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ApproxTests.cpp" >
         <Original>
           0 == Approx( dSmall ).epsilon( 0.001 )
         </Original>
@@ -473,7 +473,7 @@
           0 == Approx( 0.00001 )
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ApproxTests.cpp" >
         <Original>
           1.234f == Approx( dMedium )
         </Original>
@@ -481,7 +481,7 @@
           1.234f == Approx( 1.234 )
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ApproxTests.cpp" >
         <Original>
           dMedium == Approx( 1.234f )
         </Original>
@@ -492,7 +492,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Assertions then sections">
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TrickyTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/TrickyTests.cpp" >
         <Original>
           Catch::alwaysTrue()
         </Original>
@@ -501,7 +501,7 @@
         </Expanded>
       </Expression>
       <Section name="A section">
-        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TrickyTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/TrickyTests.cpp" >
           <Original>
             Catch::alwaysTrue()
           </Original>
@@ -510,7 +510,7 @@
           </Expanded>
         </Expression>
         <Section name="Another section">
-          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TrickyTests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/TrickyTests.cpp" >
             <Original>
               Catch::alwaysTrue()
             </Original>
@@ -522,7 +522,7 @@
         </Section>
         <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TrickyTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/TrickyTests.cpp" >
         <Original>
           Catch::alwaysTrue()
         </Original>
@@ -531,7 +531,7 @@
         </Expanded>
       </Expression>
       <Section name="A section">
-        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TrickyTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/TrickyTests.cpp" >
           <Original>
             Catch::alwaysTrue()
           </Original>
@@ -540,7 +540,7 @@
           </Expanded>
         </Expression>
         <Section name="Another other section">
-          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TrickyTests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/TrickyTests.cpp" >
             <Original>
               Catch::alwaysTrue()
             </Original>
@@ -555,7 +555,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Comparing function pointers">
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TrickyTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/TrickyTests.cpp" >
         <Original>
           a
         </Original>
@@ -563,7 +563,7 @@
           true
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TrickyTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/TrickyTests.cpp" >
         <Original>
           a == &amp;foo
         </Original>
@@ -574,7 +574,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Comparing member function pointers">
-      <Expression success="true" type="CHECK" filename="projects/SelfTest/TrickyTests.cpp" >
+      <Expression success="true" type="CHECK" filename="projects/<exe-name>/TrickyTests.cpp" >
         <Original>
           m == &amp;S::f
         </Original>
@@ -587,7 +587,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Comparisons between ints where one side is computed">
-      <Expression success="true" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="CHECK" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           54 == 6*9
         </Original>
@@ -598,7 +598,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Comparisons between unsigned ints and negative signed ints match c++ standard behaviour">
-      <Expression success="true" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="CHECK" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           ( -1 > 2u )
         </Original>
@@ -606,7 +606,7 @@
           true
         </Expanded>
       </Expression>
-      <Expression success="true" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="CHECK" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           -1 > 2u
         </Original>
@@ -614,7 +614,7 @@
           -1 > 2
         </Expanded>
       </Expression>
-      <Expression success="true" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="CHECK" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           ( 2u &lt; -1 )
         </Original>
@@ -622,7 +622,7 @@
           true
         </Expanded>
       </Expression>
-      <Expression success="true" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="CHECK" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           2u &lt; -1
         </Original>
@@ -630,7 +630,7 @@
           2 &lt; -1
         </Expanded>
       </Expression>
-      <Expression success="true" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="CHECK" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           ( minInt > 2u )
         </Original>
@@ -638,7 +638,7 @@
           true
         </Expanded>
       </Expression>
-      <Expression success="true" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="CHECK" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           minInt > 2u
         </Original>
@@ -649,7 +649,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Comparisons with int literals don't warn when mixing signed/ unsigned">
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           i == 1
         </Original>
@@ -657,7 +657,7 @@
           1 == 1
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           ui == 2
         </Original>
@@ -665,7 +665,7 @@
           2 == 2
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           l == 3
         </Original>
@@ -673,7 +673,7 @@
           3 == 3
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           ul == 4
         </Original>
@@ -681,7 +681,7 @@
           4 == 4
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           c == 5
         </Original>
@@ -689,7 +689,7 @@
           5 == 5
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           uc == 6
         </Original>
@@ -697,7 +697,7 @@
           6 == 6
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           1 == i
         </Original>
@@ -705,7 +705,7 @@
           1 == 1
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           2 == ui
         </Original>
@@ -713,7 +713,7 @@
           2 == 2
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           3 == l
         </Original>
@@ -721,7 +721,7 @@
           3 == 3
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           4 == ul
         </Original>
@@ -729,7 +729,7 @@
           4 == 4
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           5 == c
         </Original>
@@ -737,7 +737,7 @@
           5 == 5
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           6 == uc
         </Original>
@@ -745,7 +745,7 @@
           6 == 6
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           (std::numeric_limits&lt;unsigned long>::max)() > ul
         </Original>
@@ -758,7 +758,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Contains string matcher">
-      <Expression success="false" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" >
+      <Expression success="false" type="CHECK_THAT" filename="projects/<exe-name>/MiscTests.cpp" >
         <Original>
           testStringForMatching(), Contains( "not there" )
         </Original>
@@ -769,41 +769,41 @@
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="Custom exceptions can be translated when testing for nothrow">
-      <Expression success="false" type="REQUIRE_NOTHROW" filename="projects/SelfTest/ExceptionTests.cpp" >
+      <Expression success="false" type="REQUIRE_NOTHROW" filename="projects/<exe-name>/ExceptionTests.cpp" >
         <Original>
           throwCustom()
         </Original>
         <Expanded>
           throwCustom()
         </Expanded>
-        <Exception filename="projects/SelfTest/ExceptionTests.cpp" >
+        <Exception filename="projects/<exe-name>/ExceptionTests.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">
-      <Expression success="false" type="REQUIRE_THROWS_AS" filename="projects/SelfTest/ExceptionTests.cpp" >
+      <Expression success="false" type="REQUIRE_THROWS_AS" filename="projects/<exe-name>/ExceptionTests.cpp" >
         <Original>
           throwCustom()
         </Original>
         <Expanded>
           throwCustom()
         </Expanded>
-        <Exception filename="projects/SelfTest/ExceptionTests.cpp" >
+        <Exception filename="projects/<exe-name>/ExceptionTests.cpp" >
           custom exception - not std
         </Exception>
       </Expression>
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="Custom std-exceptions can be custom translated">
-      <Exception filename="projects/SelfTest/ExceptionTests.cpp" >
+      <Exception filename="projects/<exe-name>/ExceptionTests.cpp" >
         custom std exception
       </Exception>
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="Demonstrate that a non-const == is not used">
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TrickyTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/TrickyTests.cpp" >
         <Original>
           t == 1u
         </Original>
@@ -814,7 +814,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="EndsWith string matcher">
-      <Expression success="false" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" >
+      <Expression success="false" type="CHECK_THAT" filename="projects/<exe-name>/MiscTests.cpp" >
         <Original>
           testStringForMatching(), EndsWith( "this" )
         </Original>
@@ -825,7 +825,7 @@
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="Equality checks that should fail">
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           data.int_seven == 6
         </Original>
@@ -833,7 +833,7 @@
           7 == 6
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           data.int_seven == 8
         </Original>
@@ -841,7 +841,7 @@
           7 == 8
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           data.int_seven == 0
         </Original>
@@ -849,7 +849,7 @@
           7 == 0
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           data.float_nine_point_one == Approx( 9.11f )
         </Original>
@@ -857,7 +857,7 @@
           9.1f == Approx( 9.1099996567 )
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           data.float_nine_point_one == Approx( 9.0f )
         </Original>
@@ -865,7 +865,7 @@
           9.1f == Approx( 9.0 )
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           data.float_nine_point_one == Approx( 1 )
         </Original>
@@ -873,7 +873,7 @@
           9.1f == Approx( 1.0 )
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           data.float_nine_point_one == Approx( 0 )
         </Original>
@@ -881,7 +881,7 @@
           9.1f == Approx( 0.0 )
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           data.double_pi == Approx( 3.1415 )
         </Original>
@@ -889,7 +889,7 @@
           3.1415926535 == Approx( 3.1415 )
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           data.str_hello == "goodbye"
         </Original>
@@ -897,7 +897,7 @@
           "hello" == "goodbye"
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           data.str_hello == "hell"
         </Original>
@@ -905,7 +905,7 @@
           "hello" == "hell"
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           data.str_hello == "hello1"
         </Original>
@@ -913,7 +913,7 @@
           "hello" == "hello1"
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           data.str_hello.size() == 6
         </Original>
@@ -921,7 +921,7 @@
           5 == 6
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           x == Approx( 1.301 )
         </Original>
@@ -932,7 +932,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Equality checks that should succeed">
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           data.int_seven == 7
         </Original>
@@ -940,7 +940,7 @@
           7 == 7
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           data.float_nine_point_one == Approx( 9.1f )
         </Original>
@@ -948,7 +948,7 @@
           9.1f == Approx( 9.1000003815 )
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           data.double_pi == Approx( 3.1415926535 )
         </Original>
@@ -956,7 +956,7 @@
           3.1415926535 == Approx( 3.1415926535 )
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           data.str_hello == "hello"
         </Original>
@@ -964,7 +964,7 @@
           "hello" == "hello"
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           "hello" == data.str_hello
         </Original>
@@ -972,7 +972,7 @@
           "hello" == "hello"
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           data.str_hello.size() == 5
         </Original>
@@ -980,7 +980,7 @@
           5 == 5
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           x == Approx( 1.3 )
         </Original>
@@ -991,7 +991,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Equals">
-      <Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" >
+      <Expression success="true" type="CHECK_THAT" filename="projects/<exe-name>/MiscTests.cpp" >
         <Original>
           testStringForMatching(), Equals( "this string contains 'abc' as a substring" )
         </Original>
@@ -1002,7 +1002,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Equals string matcher">
-      <Expression success="false" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" >
+      <Expression success="false" type="CHECK_THAT" filename="projects/<exe-name>/MiscTests.cpp" >
         <Original>
           testStringForMatching(), Equals( "something else" )
         </Original>
@@ -1013,7 +1013,7 @@
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="Equals string matcher, with NULL">
-      <Expression success="true" type="REQUIRE_THAT" filename="projects/SelfTest/MiscTests.cpp" >
+      <Expression success="true" type="REQUIRE_THAT" filename="projects/<exe-name>/MiscTests.cpp" >
         <Original>
           "", Equals(0)
         </Original>
@@ -1025,7 +1025,7 @@
     </TestCase>
     <TestCase name="Exception messages can be tested for">
       <Section name="exact match">
-        <Expression success="true" type="REQUIRE_THROWS_WITH" filename="projects/SelfTest/ExceptionTests.cpp" >
+        <Expression success="true" type="REQUIRE_THROWS_WITH" filename="projects/<exe-name>/ExceptionTests.cpp" >
           <Original>
             thisThrows(), "expected exception"
           </Original>
@@ -1036,7 +1036,7 @@
         <OverallResults successes="1" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="different case">
-        <Expression success="true" type="REQUIRE_THROWS_WITH" filename="projects/SelfTest/ExceptionTests.cpp" >
+        <Expression success="true" type="REQUIRE_THROWS_WITH" filename="projects/<exe-name>/ExceptionTests.cpp" >
           <Original>
             thisThrows(), Equals( "expecteD Exception", Catch::CaseSensitive::No )
           </Original>
@@ -1047,7 +1047,7 @@
         <OverallResults successes="1" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="wildcarded">
-        <Expression success="true" type="REQUIRE_THROWS_WITH" filename="projects/SelfTest/ExceptionTests.cpp" >
+        <Expression success="true" type="REQUIRE_THROWS_WITH" filename="projects/<exe-name>/ExceptionTests.cpp" >
           <Original>
             thisThrows(), StartsWith( "expected" )
           </Original>
@@ -1055,7 +1055,7 @@
             thisThrows(), StartsWith( "expected" )
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE_THROWS_WITH" filename="projects/SelfTest/ExceptionTests.cpp" >
+        <Expression success="true" type="REQUIRE_THROWS_WITH" filename="projects/<exe-name>/ExceptionTests.cpp" >
           <Original>
             thisThrows(), EndsWith( "exception" )
           </Original>
@@ -1063,7 +1063,7 @@
             thisThrows(), EndsWith( "exception" )
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE_THROWS_WITH" filename="projects/SelfTest/ExceptionTests.cpp" >
+        <Expression success="true" type="REQUIRE_THROWS_WITH" filename="projects/<exe-name>/ExceptionTests.cpp" >
           <Original>
             thisThrows(), Contains( "except" )
           </Original>
@@ -1071,7 +1071,7 @@
             thisThrows(), Contains( "except" )
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE_THROWS_WITH" filename="projects/SelfTest/ExceptionTests.cpp" >
+        <Expression success="true" type="REQUIRE_THROWS_WITH" filename="projects/<exe-name>/ExceptionTests.cpp" >
           <Original>
             thisThrows(), Contains( "exCept", Catch::CaseSensitive::No )
           </Original>
@@ -1084,18 +1084,18 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Expected exceptions that don't throw or unexpected exceptions fail the test">
-      <Expression success="false" type="CHECK_THROWS_AS" filename="projects/SelfTest/ExceptionTests.cpp" >
+      <Expression success="false" type="CHECK_THROWS_AS" filename="projects/<exe-name>/ExceptionTests.cpp" >
         <Original>
           thisThrows()
         </Original>
         <Expanded>
           thisThrows()
         </Expanded>
-        <Exception filename="projects/SelfTest/ExceptionTests.cpp" >
+        <Exception filename="projects/<exe-name>/ExceptionTests.cpp" >
           expected exception
         </Exception>
       </Expression>
-      <Expression success="false" type="CHECK_THROWS_AS" filename="projects/SelfTest/ExceptionTests.cpp" >
+      <Expression success="false" type="CHECK_THROWS_AS" filename="projects/<exe-name>/ExceptionTests.cpp" >
         <Original>
           thisDoesntThrow()
         </Original>
@@ -1103,14 +1103,14 @@
           thisDoesntThrow()
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK_NOTHROW" filename="projects/SelfTest/ExceptionTests.cpp" >
+      <Expression success="false" type="CHECK_NOTHROW" filename="projects/<exe-name>/ExceptionTests.cpp" >
         <Original>
           thisThrows()
         </Original>
         <Expanded>
           thisThrows()
         </Expanded>
-        <Exception filename="projects/SelfTest/ExceptionTests.cpp" >
+        <Exception filename="projects/<exe-name>/ExceptionTests.cpp" >
           expected exception
         </Exception>
       </Expression>
@@ -1127,7 +1127,7 @@
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="Factorials are computed">
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/MiscTests.cpp" >
         <Original>
           Factorial(0) == 1
         </Original>
@@ -1135,7 +1135,7 @@
           1 == 1
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/MiscTests.cpp" >
         <Original>
           Factorial(1) == 1
         </Original>
@@ -1143,7 +1143,7 @@
           1 == 1
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/MiscTests.cpp" >
         <Original>
           Factorial(2) == 2
         </Original>
@@ -1151,7 +1151,7 @@
           2 == 2
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/MiscTests.cpp" >
         <Original>
           Factorial(3) == 6
         </Original>
@@ -1159,7 +1159,7 @@
           6 == 6
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/MiscTests.cpp" >
         <Original>
           Factorial(10) == 3628800
         </Original>
@@ -1170,7 +1170,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Generator over a range of pairs">
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           i->first == i->second-1
         </Original>
@@ -1178,7 +1178,7 @@
           0 == 0
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           i->first == i->second-1
         </Original>
@@ -1189,7 +1189,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Generators over two ranges">
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -1197,7 +1197,7 @@
           2 == 2
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -1205,7 +1205,7 @@
           200 == 200
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -1213,7 +1213,7 @@
           4 == 4
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -1221,7 +1221,7 @@
           200 == 200
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -1229,7 +1229,7 @@
           6 == 6
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -1237,7 +1237,7 @@
           200 == 200
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -1245,7 +1245,7 @@
           8 == 8
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -1253,7 +1253,7 @@
           200 == 200
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -1261,7 +1261,7 @@
           10 == 10
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -1269,7 +1269,7 @@
           200 == 200
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -1277,7 +1277,7 @@
           30 == 30
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -1285,7 +1285,7 @@
           200 == 200
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -1293,7 +1293,7 @@
           40 == 40
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -1301,7 +1301,7 @@
           200 == 200
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -1309,7 +1309,7 @@
           42 == 42
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -1317,7 +1317,7 @@
           200 == 200
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -1325,7 +1325,7 @@
           72 == 72
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -1333,7 +1333,7 @@
           200 == 200
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -1341,7 +1341,7 @@
           2 == 2
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -1349,7 +1349,7 @@
           202 == 202
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -1357,7 +1357,7 @@
           4 == 4
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -1365,7 +1365,7 @@
           202 == 202
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -1373,7 +1373,7 @@
           6 == 6
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -1381,7 +1381,7 @@
           202 == 202
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -1389,7 +1389,7 @@
           8 == 8
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -1397,7 +1397,7 @@
           202 == 202
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -1405,7 +1405,7 @@
           10 == 10
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -1413,7 +1413,7 @@
           202 == 202
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -1421,7 +1421,7 @@
           30 == 30
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -1429,7 +1429,7 @@
           202 == 202
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -1437,7 +1437,7 @@
           40 == 40
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -1445,7 +1445,7 @@
           202 == 202
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -1453,7 +1453,7 @@
           42 == 42
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -1461,7 +1461,7 @@
           202 == 202
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -1469,7 +1469,7 @@
           72 == 72
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -1477,7 +1477,7 @@
           202 == 202
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -1485,7 +1485,7 @@
           2 == 2
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -1493,7 +1493,7 @@
           204 == 204
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -1501,7 +1501,7 @@
           4 == 4
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -1509,7 +1509,7 @@
           204 == 204
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -1517,7 +1517,7 @@
           6 == 6
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -1525,7 +1525,7 @@
           204 == 204
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -1533,7 +1533,7 @@
           8 == 8
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -1541,7 +1541,7 @@
           204 == 204
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -1549,7 +1549,7 @@
           10 == 10
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -1557,7 +1557,7 @@
           204 == 204
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -1565,7 +1565,7 @@
           30 == 30
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -1573,7 +1573,7 @@
           204 == 204
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -1581,7 +1581,7 @@
           40 == 40
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -1589,7 +1589,7 @@
           204 == 204
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -1597,7 +1597,7 @@
           42 == 42
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -1605,7 +1605,7 @@
           204 == 204
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -1613,7 +1613,7 @@
           72 == 72
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -1621,7 +1621,7 @@
           204 == 204
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -1629,7 +1629,7 @@
           2 == 2
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -1637,7 +1637,7 @@
           206 == 206
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -1645,7 +1645,7 @@
           4 == 4
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -1653,7 +1653,7 @@
           206 == 206
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -1661,7 +1661,7 @@
           6 == 6
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -1669,7 +1669,7 @@
           206 == 206
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -1677,7 +1677,7 @@
           8 == 8
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -1685,7 +1685,7 @@
           206 == 206
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -1693,7 +1693,7 @@
           10 == 10
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -1701,7 +1701,7 @@
           206 == 206
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -1709,7 +1709,7 @@
           30 == 30
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -1717,7 +1717,7 @@
           206 == 206
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -1725,7 +1725,7 @@
           40 == 40
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -1733,7 +1733,7 @@
           206 == 206
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -1741,7 +1741,7 @@
           42 == 42
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -1749,7 +1749,7 @@
           206 == 206
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -1757,7 +1757,7 @@
           72 == 72
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -1765,7 +1765,7 @@
           206 == 206
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -1773,7 +1773,7 @@
           2 == 2
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -1781,7 +1781,7 @@
           208 == 208
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -1789,7 +1789,7 @@
           4 == 4
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -1797,7 +1797,7 @@
           208 == 208
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -1805,7 +1805,7 @@
           6 == 6
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -1813,7 +1813,7 @@
           208 == 208
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -1821,7 +1821,7 @@
           8 == 8
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -1829,7 +1829,7 @@
           208 == 208
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -1837,7 +1837,7 @@
           10 == 10
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -1845,7 +1845,7 @@
           208 == 208
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -1853,7 +1853,7 @@
           30 == 30
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -1861,7 +1861,7 @@
           208 == 208
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -1869,7 +1869,7 @@
           40 == 40
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -1877,7 +1877,7 @@
           208 == 208
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -1885,7 +1885,7 @@
           42 == 42
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -1893,7 +1893,7 @@
           208 == 208
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -1901,7 +1901,7 @@
           72 == 72
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -1909,7 +1909,7 @@
           208 == 208
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -1917,7 +1917,7 @@
           2 == 2
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -1925,7 +1925,7 @@
           210 == 210
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -1933,7 +1933,7 @@
           4 == 4
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -1941,7 +1941,7 @@
           210 == 210
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -1949,7 +1949,7 @@
           6 == 6
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -1957,7 +1957,7 @@
           210 == 210
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -1965,7 +1965,7 @@
           8 == 8
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -1973,7 +1973,7 @@
           210 == 210
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -1981,7 +1981,7 @@
           10 == 10
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -1989,7 +1989,7 @@
           210 == 210
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -1997,7 +1997,7 @@
           30 == 30
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -2005,7 +2005,7 @@
           210 == 210
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -2013,7 +2013,7 @@
           40 == 40
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -2021,7 +2021,7 @@
           210 == 210
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -2029,7 +2029,7 @@
           42 == 42
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -2037,7 +2037,7 @@
           210 == 210
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -2045,7 +2045,7 @@
           72 == 72
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -2053,7 +2053,7 @@
           210 == 210
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -2061,7 +2061,7 @@
           2 == 2
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -2069,7 +2069,7 @@
           212 == 212
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -2077,7 +2077,7 @@
           4 == 4
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -2085,7 +2085,7 @@
           212 == 212
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -2093,7 +2093,7 @@
           6 == 6
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -2101,7 +2101,7 @@
           212 == 212
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -2109,7 +2109,7 @@
           8 == 8
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -2117,7 +2117,7 @@
           212 == 212
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -2125,7 +2125,7 @@
           10 == 10
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -2133,7 +2133,7 @@
           212 == 212
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -2141,7 +2141,7 @@
           30 == 30
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -2149,7 +2149,7 @@
           212 == 212
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -2157,7 +2157,7 @@
           40 == 40
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -2165,7 +2165,7 @@
           212 == 212
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -2173,7 +2173,7 @@
           42 == 42
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -2181,7 +2181,7 @@
           212 == 212
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -2189,7 +2189,7 @@
           72 == 72
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -2197,7 +2197,7 @@
           212 == 212
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -2205,7 +2205,7 @@
           2 == 2
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -2213,7 +2213,7 @@
           214 == 214
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -2221,7 +2221,7 @@
           4 == 4
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -2229,7 +2229,7 @@
           214 == 214
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -2237,7 +2237,7 @@
           6 == 6
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -2245,7 +2245,7 @@
           214 == 214
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -2253,7 +2253,7 @@
           8 == 8
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -2261,7 +2261,7 @@
           214 == 214
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -2269,7 +2269,7 @@
           10 == 10
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -2277,7 +2277,7 @@
           214 == 214
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -2285,7 +2285,7 @@
           30 == 30
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -2293,7 +2293,7 @@
           214 == 214
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -2301,7 +2301,7 @@
           40 == 40
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -2309,7 +2309,7 @@
           214 == 214
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -2317,7 +2317,7 @@
           42 == 42
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -2325,7 +2325,7 @@
           214 == 214
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -2333,7 +2333,7 @@
           72 == 72
         </Expanded>
       </Expression>
-      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -2359,7 +2359,7 @@
       <Info>
         so should this
       </Info>
-      <Expression success="false" type="REQUIRE" filename="projects/SelfTest/MessageTests.cpp" >
+      <Expression success="false" type="REQUIRE" filename="projects/<exe-name>/MessageTests.cpp" >
         <Original>
           a == 1
         </Original>
@@ -2370,7 +2370,7 @@
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="INFO gets logged on failure, even if captured before successful assertions">
-      <Expression success="true" type="CHECK" filename="projects/SelfTest/MessageTests.cpp" >
+      <Expression success="true" type="CHECK" filename="projects/<exe-name>/MessageTests.cpp" >
         <Original>
           a == 2
         </Original>
@@ -2381,7 +2381,7 @@
       <Info>
         this message should be logged
       </Info>
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/MessageTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/MessageTests.cpp" >
         <Original>
           a == 1
         </Original>
@@ -2392,7 +2392,7 @@
       <Info>
         and this, but later
       </Info>
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/MessageTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/MessageTests.cpp" >
         <Original>
           a == 0
         </Original>
@@ -2400,7 +2400,7 @@
           2 == 0
         </Expanded>
       </Expression>
-      <Expression success="true" type="CHECK" filename="projects/SelfTest/MessageTests.cpp" >
+      <Expression success="true" type="CHECK" filename="projects/<exe-name>/MessageTests.cpp" >
         <Original>
           a == 2
         </Original>
@@ -2411,7 +2411,7 @@
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="Inequality checks that should fail">
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           data.int_seven != 7
         </Original>
@@ -2419,7 +2419,7 @@
           7 != 7
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           data.float_nine_point_one != Approx( 9.1f )
         </Original>
@@ -2427,7 +2427,7 @@
           9.1f != Approx( 9.1000003815 )
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           data.double_pi != Approx( 3.1415926535 )
         </Original>
@@ -2435,7 +2435,7 @@
           3.1415926535 != Approx( 3.1415926535 )
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           data.str_hello != "hello"
         </Original>
@@ -2443,7 +2443,7 @@
           "hello" != "hello"
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           data.str_hello.size() != 5
         </Original>
@@ -2454,7 +2454,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Inequality checks that should succeed">
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           data.int_seven != 6
         </Original>
@@ -2462,7 +2462,7 @@
           7 != 6
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           data.int_seven != 8
         </Original>
@@ -2470,7 +2470,7 @@
           7 != 8
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           data.float_nine_point_one != Approx( 9.11f )
         </Original>
@@ -2478,7 +2478,7 @@
           9.1f != Approx( 9.1099996567 )
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           data.float_nine_point_one != Approx( 9.0f )
         </Original>
@@ -2486,7 +2486,7 @@
           9.1f != Approx( 9.0 )
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           data.float_nine_point_one != Approx( 1 )
         </Original>
@@ -2494,7 +2494,7 @@
           9.1f != Approx( 1.0 )
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           data.float_nine_point_one != Approx( 0 )
         </Original>
@@ -2502,7 +2502,7 @@
           9.1f != Approx( 0.0 )
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           data.double_pi != Approx( 3.1415 )
         </Original>
@@ -2510,7 +2510,7 @@
           3.1415926535 != Approx( 3.1415 )
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           data.str_hello != "goodbye"
         </Original>
@@ -2518,7 +2518,7 @@
           "hello" != "goodbye"
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           data.str_hello != "hell"
         </Original>
@@ -2526,7 +2526,7 @@
           "hello" != "hell"
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           data.str_hello != "hello1"
         </Original>
@@ -2534,7 +2534,7 @@
           "hello" != "hello1"
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           data.str_hello.size() != 6
         </Original>
@@ -2547,7 +2547,7 @@
     <TestCase name="Long strings can be wrapped">
       <Section name="plain string">
         <Section name="No wrapping">
-          <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" type="CHECK" filename="projects/<exe-name>/TestMain.cpp" >
             <Original>
               Text( testString, TextAttributes().setWidth( 80 ) ).toString() == testString
             </Original>
@@ -2557,7 +2557,7 @@
 "one two three four"
             </Expanded>
           </Expression>
-          <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" type="CHECK" filename="projects/<exe-name>/TestMain.cpp" >
             <Original>
               Text( testString, TextAttributes().setWidth( 18 ) ).toString() == testString
             </Original>
@@ -2573,7 +2573,7 @@
       </Section>
       <Section name="plain string">
         <Section name="Wrapped once">
-          <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" type="CHECK" filename="projects/<exe-name>/TestMain.cpp" >
             <Original>
               Text( testString, TextAttributes().setWidth( 17 ) ).toString() == "one two three\nfour"
             </Original>
@@ -2585,7 +2585,7 @@
 four"
             </Expanded>
           </Expression>
-          <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" type="CHECK" filename="projects/<exe-name>/TestMain.cpp" >
             <Original>
               Text( testString, TextAttributes().setWidth( 16 ) ).toString() == "one two three\nfour"
             </Original>
@@ -2597,7 +2597,7 @@
 four"
             </Expanded>
           </Expression>
-          <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" type="CHECK" filename="projects/<exe-name>/TestMain.cpp" >
             <Original>
               Text( testString, TextAttributes().setWidth( 14 ) ).toString() == "one two three\nfour"
             </Original>
@@ -2609,7 +2609,7 @@
 four"
             </Expanded>
           </Expression>
-          <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" type="CHECK" filename="projects/<exe-name>/TestMain.cpp" >
             <Original>
               Text( testString, TextAttributes().setWidth( 13 ) ).toString() == "one two three\nfour"
             </Original>
@@ -2621,7 +2621,7 @@
 four"
             </Expanded>
           </Expression>
-          <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" type="CHECK" filename="projects/<exe-name>/TestMain.cpp" >
             <Original>
               Text( testString, TextAttributes().setWidth( 12 ) ).toString() == "one two\nthree four"
             </Original>
@@ -2639,7 +2639,7 @@
       </Section>
       <Section name="plain string">
         <Section name="Wrapped twice">
-          <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" type="CHECK" filename="projects/<exe-name>/TestMain.cpp" >
             <Original>
               Text( testString, TextAttributes().setWidth( 9 ) ).toString() == "one two\nthree\nfour"
             </Original>
@@ -2653,7 +2653,7 @@
 four"
             </Expanded>
           </Expression>
-          <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" type="CHECK" filename="projects/<exe-name>/TestMain.cpp" >
             <Original>
               Text( testString, TextAttributes().setWidth( 8 ) ).toString() == "one two\nthree\nfour"
             </Original>
@@ -2667,7 +2667,7 @@
 four"
             </Expanded>
           </Expression>
-          <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" type="CHECK" filename="projects/<exe-name>/TestMain.cpp" >
             <Original>
               Text( testString, TextAttributes().setWidth( 7 ) ).toString() == "one two\nthree\nfour"
             </Original>
@@ -2687,7 +2687,7 @@
       </Section>
       <Section name="plain string">
         <Section name="Wrapped three times">
-          <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" type="CHECK" filename="projects/<exe-name>/TestMain.cpp" >
             <Original>
               Text( testString, TextAttributes().setWidth( 6 ) ).toString() == "one\ntwo\nthree\nfour"
             </Original>
@@ -2703,7 +2703,7 @@
 four"
             </Expanded>
           </Expression>
-          <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" type="CHECK" filename="projects/<exe-name>/TestMain.cpp" >
             <Original>
               Text( testString, TextAttributes().setWidth( 5 ) ).toString() == "one\ntwo\nthree\nfour"
             </Original>
@@ -2725,7 +2725,7 @@
       </Section>
       <Section name="plain string">
         <Section name="Short wrap">
-          <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" type="CHECK" filename="projects/<exe-name>/TestMain.cpp" >
             <Original>
               Text( "abcdef", TextAttributes().setWidth( 4 ) ).toString() == "abc-\ndef"
             </Original>
@@ -2737,7 +2737,7 @@
 def"
             </Expanded>
           </Expression>
-          <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" type="CHECK" filename="projects/<exe-name>/TestMain.cpp" >
             <Original>
               Text( "abcdefg", TextAttributes().setWidth( 4 ) ).toString() == "abc-\ndefg"
             </Original>
@@ -2749,7 +2749,7 @@
 defg"
             </Expanded>
           </Expression>
-          <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" type="CHECK" filename="projects/<exe-name>/TestMain.cpp" >
             <Original>
               Text( "abcdefgh", TextAttributes().setWidth( 4 ) ).toString() == "abc-\ndef-\ngh"
             </Original>
@@ -2763,7 +2763,7 @@
 gh"
             </Expanded>
           </Expression>
-          <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" type="CHECK" filename="projects/<exe-name>/TestMain.cpp" >
             <Original>
               Text( testString, TextAttributes().setWidth( 4 ) ).toString() == "one\ntwo\nthr-\nee\nfour"
             </Original>
@@ -2781,7 +2781,7 @@
 four"
             </Expanded>
           </Expression>
-          <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" type="CHECK" filename="projects/<exe-name>/TestMain.cpp" >
             <Original>
               Text( testString, TextAttributes().setWidth( 3 ) ).toString() == "one\ntwo\nth-\nree\nfo-\nur"
             </Original>
@@ -2807,7 +2807,7 @@
       </Section>
       <Section name="plain string">
         <Section name="As container">
-          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/TestMain.cpp" >
             <Original>
               text.size() == 4
             </Original>
@@ -2815,7 +2815,7 @@
               4 == 4
             </Expanded>
           </Expression>
-          <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" type="CHECK" filename="projects/<exe-name>/TestMain.cpp" >
             <Original>
               text[0] == "one"
             </Original>
@@ -2823,7 +2823,7 @@
               "one" == "one"
             </Expanded>
           </Expression>
-          <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" type="CHECK" filename="projects/<exe-name>/TestMain.cpp" >
             <Original>
               text[1] == "two"
             </Original>
@@ -2831,7 +2831,7 @@
               "two" == "two"
             </Expanded>
           </Expression>
-          <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" type="CHECK" filename="projects/<exe-name>/TestMain.cpp" >
             <Original>
               text[2] == "three"
             </Original>
@@ -2839,7 +2839,7 @@
               "three" == "three"
             </Expanded>
           </Expression>
-          <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" type="CHECK" filename="projects/<exe-name>/TestMain.cpp" >
             <Original>
               text[3] == "four"
             </Original>
@@ -2853,7 +2853,7 @@
       </Section>
       <Section name="plain string">
         <Section name="Indent first line differently">
-          <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" type="CHECK" filename="projects/<exe-name>/TestMain.cpp" >
             <Original>
               text.toString() == " one two\n    three\n    four"
             </Original>
@@ -2873,7 +2873,7 @@
       </Section>
       <Section name="With newlines">
         <Section name="No wrapping">
-          <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" type="CHECK" filename="projects/<exe-name>/TestMain.cpp" >
             <Original>
               Text( testString, TextAttributes().setWidth( 80 ) ).toString() == testString
             </Original>
@@ -2885,7 +2885,7 @@
 three four"
             </Expanded>
           </Expression>
-          <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" type="CHECK" filename="projects/<exe-name>/TestMain.cpp" >
             <Original>
               Text( testString, TextAttributes().setWidth( 18 ) ).toString() == testString
             </Original>
@@ -2897,7 +2897,7 @@
 three four"
             </Expanded>
           </Expression>
-          <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" type="CHECK" filename="projects/<exe-name>/TestMain.cpp" >
             <Original>
               Text( testString, TextAttributes().setWidth( 10 ) ).toString() == testString
             </Original>
@@ -2915,7 +2915,7 @@
       </Section>
       <Section name="With newlines">
         <Section name="Trailing newline">
-          <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" type="CHECK" filename="projects/<exe-name>/TestMain.cpp" >
             <Original>
               Text( "abcdef\n", TextAttributes().setWidth( 10 ) ).toString() == "abcdef\n"
             </Original>
@@ -2927,7 +2927,7 @@
 "
             </Expanded>
           </Expression>
-          <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" type="CHECK" filename="projects/<exe-name>/TestMain.cpp" >
             <Original>
               Text( "abcdef", TextAttributes().setWidth( 6 ) ).toString() == "abcdef"
             </Original>
@@ -2935,7 +2935,7 @@
               "abcdef" == "abcdef"
             </Expanded>
           </Expression>
-          <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" type="CHECK" filename="projects/<exe-name>/TestMain.cpp" >
             <Original>
               Text( "abcdef\n", TextAttributes().setWidth( 6 ) ).toString() == "abcdef\n"
             </Original>
@@ -2953,7 +2953,7 @@
       </Section>
       <Section name="With newlines">
         <Section name="Wrapped once">
-          <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" type="CHECK" filename="projects/<exe-name>/TestMain.cpp" >
             <Original>
               Text( testString, TextAttributes().setWidth( 9 ) ).toString() == "one two\nthree\nfour"
             </Original>
@@ -2967,7 +2967,7 @@
 four"
             </Expanded>
           </Expression>
-          <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" type="CHECK" filename="projects/<exe-name>/TestMain.cpp" >
             <Original>
               Text( testString, TextAttributes().setWidth( 8 ) ).toString() == "one two\nthree\nfour"
             </Original>
@@ -2981,7 +2981,7 @@
 four"
             </Expanded>
           </Expression>
-          <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" type="CHECK" filename="projects/<exe-name>/TestMain.cpp" >
             <Original>
               Text( testString, TextAttributes().setWidth( 7 ) ).toString() == "one two\nthree\nfour"
             </Original>
@@ -3001,7 +3001,7 @@
       </Section>
       <Section name="With newlines">
         <Section name="Wrapped twice">
-          <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" type="CHECK" filename="projects/<exe-name>/TestMain.cpp" >
             <Original>
               Text( testString, TextAttributes().setWidth( 6 ) ).toString() == "one\ntwo\nthree\nfour"
             </Original>
@@ -3022,7 +3022,7 @@
         <OverallResults successes="1" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="With tabs">
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/TestMain.cpp" >
           <Original>
             Text( testString, TextAttributes().setWidth( 15 ) ).toString() == "one two three\n        four\n        five\n        six"
           </Original>
@@ -3043,7 +3043,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Long text is truncted">
-      <Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/TestMain.cpp" >
+      <Expression success="true" type="CHECK_THAT" filename="projects/<exe-name>/TestMain.cpp" >
         <Original>
           t.toString(), EndsWith( "... message truncated due to excessive size" )
         </Original>
@@ -4057,7 +4057,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Matchers can be (AllOf) composed with the &amp;&amp; operator">
-      <Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" >
+      <Expression success="true" type="CHECK_THAT" filename="projects/<exe-name>/MiscTests.cpp" >
         <Original>
           testStringForMatching(), Contains( "string" ) &amp;&amp; Contains( "abc" ) &amp;&amp; Contains( "substring" ) &amp;&amp; Contains( "contains" )
         </Original>
@@ -4068,7 +4068,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Matchers can be (AnyOf) composed with the || operator">
-      <Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" >
+      <Expression success="true" type="CHECK_THAT" filename="projects/<exe-name>/MiscTests.cpp" >
         <Original>
           testStringForMatching(), Contains( "string" ) || Contains( "different" ) || Contains( "random" )
         </Original>
@@ -4076,7 +4076,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/SelfTest/MiscTests.cpp" >
+      <Expression success="true" type="CHECK_THAT" filename="projects/<exe-name>/MiscTests.cpp" >
         <Original>
           testStringForMatching2(), Contains( "string" ) || Contains( "different" ) || Contains( "random" )
         </Original>
@@ -4087,7 +4087,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Matchers can be composed with both &amp;&amp; and ||">
-      <Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" >
+      <Expression success="true" type="CHECK_THAT" filename="projects/<exe-name>/MiscTests.cpp" >
         <Original>
           testStringForMatching(), ( Contains( "string" ) || Contains( "different" ) ) &amp;&amp; Contains( "substring" )
         </Original>
@@ -4098,7 +4098,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Matchers can be composed with both &amp;&amp; and || - failing">
-      <Expression success="false" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" >
+      <Expression success="false" type="CHECK_THAT" filename="projects/<exe-name>/MiscTests.cpp" >
         <Original>
           testStringForMatching(), ( Contains( "string" ) || Contains( "different" ) ) &amp;&amp; Contains( "random" )
         </Original>
@@ -4109,7 +4109,7 @@
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="Matchers can be negated (Not) with the ! operator">
-      <Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" >
+      <Expression success="true" type="CHECK_THAT" filename="projects/<exe-name>/MiscTests.cpp" >
         <Original>
           testStringForMatching(), !Contains( "different" )
         </Original>
@@ -4120,7 +4120,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Matchers can be negated (Not) with the ! operator - failing">
-      <Expression success="false" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" >
+      <Expression success="false" type="CHECK_THAT" filename="projects/<exe-name>/MiscTests.cpp" >
         <Original>
           testStringForMatching(), !Contains( "substring" )
         </Original>
@@ -4131,7 +4131,7 @@
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="Mismatching exception messages failing the test">
-      <Expression success="true" type="REQUIRE_THROWS_WITH" filename="projects/SelfTest/ExceptionTests.cpp" >
+      <Expression success="true" type="REQUIRE_THROWS_WITH" filename="projects/<exe-name>/ExceptionTests.cpp" >
         <Original>
           thisThrows(), "expected exception"
         </Original>
@@ -4139,7 +4139,7 @@
           thisThrows(), "expected exception"
         </Expanded>
       </Expression>
-      <Expression success="false" type="REQUIRE_THROWS_WITH" filename="projects/SelfTest/ExceptionTests.cpp" >
+      <Expression success="false" type="REQUIRE_THROWS_WITH" filename="projects/<exe-name>/ExceptionTests.cpp" >
         <Original>
           thisThrows(), "should fail"
         </Original>
@@ -4156,13 +4156,13 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Non-std exceptions can be translated">
-      <Exception filename="projects/SelfTest/ExceptionTests.cpp" >
+      <Exception filename="projects/<exe-name>/ExceptionTests.cpp" >
         custom exception
       </Exception>
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="NotImplemented exception">
-      <Expression success="true" type="REQUIRE_THROWS" filename="projects/SelfTest/ExceptionTests.cpp" >
+      <Expression success="true" type="REQUIRE_THROWS" filename="projects/<exe-name>/ExceptionTests.cpp" >
         <Original>
           thisFunctionNotImplemented( 7 )
         </Original>
@@ -4173,7 +4173,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Objects that evaluated in boolean contexts can be checked">
-      <Expression success="true" type="CHECK" filename="projects/SelfTest/TrickyTests.cpp" >
+      <Expression success="true" type="CHECK" filename="projects/<exe-name>/TrickyTests.cpp" >
         <Original>
           True
         </Original>
@@ -4181,7 +4181,7 @@
           true
         </Expanded>
       </Expression>
-      <Expression success="true" type="CHECK" filename="projects/SelfTest/TrickyTests.cpp" >
+      <Expression success="true" type="CHECK" filename="projects/<exe-name>/TrickyTests.cpp" >
         <Original>
           !False
         </Original>
@@ -4189,7 +4189,7 @@
           true
         </Expanded>
       </Expression>
-      <Expression success="true" type="CHECK_FALSE" filename="projects/SelfTest/TrickyTests.cpp" >
+      <Expression success="true" type="CHECK_FALSE" filename="projects/<exe-name>/TrickyTests.cpp" >
         <Original>
           !False
         </Original>
@@ -4200,7 +4200,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Operators at different namespace levels not hijacked by Koenig lookup">
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TrickyTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/TrickyTests.cpp" >
         <Original>
           0x<hex digits> == o
         </Original>
@@ -4211,7 +4211,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Ordering comparison checks that should fail">
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           data.int_seven > 7
         </Original>
@@ -4219,7 +4219,7 @@
           7 > 7
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           data.int_seven &lt; 7
         </Original>
@@ -4227,7 +4227,7 @@
           7 &lt; 7
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           data.int_seven > 8
         </Original>
@@ -4235,7 +4235,7 @@
           7 > 8
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           data.int_seven &lt; 6
         </Original>
@@ -4243,7 +4243,7 @@
           7 &lt; 6
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           data.int_seven &lt; 0
         </Original>
@@ -4251,7 +4251,7 @@
           7 &lt; 0
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           data.int_seven &lt; -1
         </Original>
@@ -4259,7 +4259,7 @@
           7 &lt; -1
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           data.int_seven >= 8
         </Original>
@@ -4267,7 +4267,7 @@
           7 >= 8
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           data.int_seven &lt;= 6
         </Original>
@@ -4275,7 +4275,7 @@
           7 &lt;= 6
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           data.float_nine_point_one &lt; 9
         </Original>
@@ -4283,7 +4283,7 @@
           9.1f &lt; 9
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           data.float_nine_point_one > 10
         </Original>
@@ -4291,7 +4291,7 @@
           9.1f > 10
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           data.float_nine_point_one > 9.2
         </Original>
@@ -4299,7 +4299,7 @@
           9.1f > 9.2
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           data.str_hello > "hello"
         </Original>
@@ -4307,7 +4307,7 @@
           "hello" > "hello"
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           data.str_hello &lt; "hello"
         </Original>
@@ -4315,7 +4315,7 @@
           "hello" &lt; "hello"
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           data.str_hello > "hellp"
         </Original>
@@ -4323,7 +4323,7 @@
           "hello" > "hellp"
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           data.str_hello > "z"
         </Original>
@@ -4331,7 +4331,7 @@
           "hello" > "z"
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           data.str_hello &lt; "hellm"
         </Original>
@@ -4339,7 +4339,7 @@
           "hello" &lt; "hellm"
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           data.str_hello &lt; "a"
         </Original>
@@ -4347,7 +4347,7 @@
           "hello" &lt; "a"
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           data.str_hello >= "z"
         </Original>
@@ -4355,7 +4355,7 @@
           "hello" >= "z"
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           data.str_hello &lt;= "a"
         </Original>
@@ -4366,7 +4366,7 @@
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="Ordering comparison checks that should succeed">
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           data.int_seven &lt; 8
         </Original>
@@ -4374,7 +4374,7 @@
           7 &lt; 8
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           data.int_seven > 6
         </Original>
@@ -4382,7 +4382,7 @@
           7 > 6
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           data.int_seven > 0
         </Original>
@@ -4390,7 +4390,7 @@
           7 > 0
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           data.int_seven > -1
         </Original>
@@ -4398,7 +4398,7 @@
           7 > -1
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           data.int_seven >= 7
         </Original>
@@ -4406,7 +4406,7 @@
           7 >= 7
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           data.int_seven >= 6
         </Original>
@@ -4414,7 +4414,7 @@
           7 >= 6
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           data.int_seven &lt;= 7
         </Original>
@@ -4422,7 +4422,7 @@
           7 &lt;= 7
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           data.int_seven &lt;= 8
         </Original>
@@ -4430,7 +4430,7 @@
           7 &lt;= 8
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           data.float_nine_point_one > 9
         </Original>
@@ -4438,7 +4438,7 @@
           9.1f > 9
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           data.float_nine_point_one &lt; 10
         </Original>
@@ -4446,7 +4446,7 @@
           9.1f &lt; 10
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           data.float_nine_point_one &lt; 9.2
         </Original>
@@ -4454,7 +4454,7 @@
           9.1f &lt; 9.2
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           data.str_hello &lt;= "hello"
         </Original>
@@ -4462,7 +4462,7 @@
           "hello" &lt;= "hello"
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           data.str_hello >= "hello"
         </Original>
@@ -4470,7 +4470,7 @@
           "hello" >= "hello"
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           data.str_hello &lt; "hellp"
         </Original>
@@ -4478,7 +4478,7 @@
           "hello" &lt; "hellp"
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           data.str_hello &lt; "zebra"
         </Original>
@@ -4486,7 +4486,7 @@
           "hello" &lt; "zebra"
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           data.str_hello > "hellm"
         </Original>
@@ -4494,7 +4494,7 @@
           "hello" > "hellm"
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           data.str_hello > "a"
         </Original>
@@ -4521,7 +4521,7 @@
     </TestCase>
     <TestCase name="Parse test names and tags">
       <Section name="Empty test spec should have no filters">
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.hasFilters() == false
           </Original>
@@ -4529,7 +4529,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcA ) == false
           </Original>
@@ -4537,7 +4537,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcB ) == false
           </Original>
@@ -4548,7 +4548,7 @@
         <OverallResults successes="3" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="Test spec from empty string should have no filters">
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.hasFilters() == false
           </Original>
@@ -4556,7 +4556,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches(tcA ) == false
           </Original>
@@ -4564,7 +4564,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcB ) == false
           </Original>
@@ -4575,7 +4575,7 @@
         <OverallResults successes="3" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="Test spec from just a comma should have no filters">
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.hasFilters() == false
           </Original>
@@ -4583,7 +4583,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcA ) == false
           </Original>
@@ -4591,7 +4591,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcB ) == false
           </Original>
@@ -4602,7 +4602,7 @@
         <OverallResults successes="3" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="Test spec from name should have one filter">
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.hasFilters() == true
           </Original>
@@ -4610,7 +4610,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcA ) == false
           </Original>
@@ -4618,7 +4618,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcB ) == true
           </Original>
@@ -4629,7 +4629,7 @@
         <OverallResults successes="3" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="Test spec from quoted name should have one filter">
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.hasFilters() == true
           </Original>
@@ -4637,7 +4637,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcA ) == false
           </Original>
@@ -4645,7 +4645,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcB ) == true
           </Original>
@@ -4656,7 +4656,7 @@
         <OverallResults successes="3" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="Test spec from name should have one filter">
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.hasFilters() == true
           </Original>
@@ -4664,7 +4664,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcA ) == false
           </Original>
@@ -4672,7 +4672,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcB ) == true
           </Original>
@@ -4680,7 +4680,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcC ) == false
           </Original>
@@ -4691,7 +4691,7 @@
         <OverallResults successes="4" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="Wildcard at the start">
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.hasFilters() == true
           </Original>
@@ -4699,7 +4699,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcA ) == false
           </Original>
@@ -4707,7 +4707,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcB ) == false
           </Original>
@@ -4715,7 +4715,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcC ) == true
           </Original>
@@ -4723,7 +4723,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcD ) == false
           </Original>
@@ -4731,7 +4731,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             parseTestSpec( "*a" ).matches( tcA ) == true
           </Original>
@@ -4742,7 +4742,7 @@
         <OverallResults successes="6" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="Wildcard at the end">
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.hasFilters() == true
           </Original>
@@ -4750,7 +4750,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcA ) == false
           </Original>
@@ -4758,7 +4758,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcB ) == false
           </Original>
@@ -4766,7 +4766,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcC ) == true
           </Original>
@@ -4774,7 +4774,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcD ) == false
           </Original>
@@ -4782,7 +4782,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             parseTestSpec( "a*" ).matches( tcA ) == true
           </Original>
@@ -4793,7 +4793,7 @@
         <OverallResults successes="6" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="Wildcard at both ends">
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.hasFilters() == true
           </Original>
@@ -4801,7 +4801,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcA ) == false
           </Original>
@@ -4809,7 +4809,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcB ) == false
           </Original>
@@ -4817,7 +4817,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcC ) == true
           </Original>
@@ -4825,7 +4825,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcD ) == true
           </Original>
@@ -4833,7 +4833,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             parseTestSpec( "*a*" ).matches( tcA ) == true
           </Original>
@@ -4844,7 +4844,7 @@
         <OverallResults successes="6" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="Redundant wildcard at the start">
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.hasFilters() == true
           </Original>
@@ -4852,7 +4852,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcA ) == true
           </Original>
@@ -4860,7 +4860,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcB ) == false
           </Original>
@@ -4871,7 +4871,7 @@
         <OverallResults successes="3" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="Redundant wildcard at the end">
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.hasFilters() == true
           </Original>
@@ -4879,7 +4879,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcA ) == true
           </Original>
@@ -4887,7 +4887,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcB ) == false
           </Original>
@@ -4898,7 +4898,7 @@
         <OverallResults successes="3" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="Redundant wildcard at both ends">
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.hasFilters() == true
           </Original>
@@ -4906,7 +4906,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcA ) == true
           </Original>
@@ -4914,7 +4914,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcB ) == false
           </Original>
@@ -4925,7 +4925,7 @@
         <OverallResults successes="3" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="Wildcard at both ends, redundant at start">
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.hasFilters() == true
           </Original>
@@ -4933,7 +4933,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcA ) == false
           </Original>
@@ -4941,7 +4941,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcB ) == false
           </Original>
@@ -4949,7 +4949,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcC ) == true
           </Original>
@@ -4957,7 +4957,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcD ) == true
           </Original>
@@ -4968,7 +4968,7 @@
         <OverallResults successes="5" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="Just wildcard">
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.hasFilters() == true
           </Original>
@@ -4976,7 +4976,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcA ) == true
           </Original>
@@ -4984,7 +4984,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcB ) == true
           </Original>
@@ -4992,7 +4992,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcC ) == true
           </Original>
@@ -5000,7 +5000,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcD ) == true
           </Original>
@@ -5011,7 +5011,7 @@
         <OverallResults successes="5" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="Single tag">
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.hasFilters() == true
           </Original>
@@ -5019,7 +5019,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcA ) == false
           </Original>
@@ -5027,7 +5027,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcB ) == true
           </Original>
@@ -5035,7 +5035,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcC ) == false
           </Original>
@@ -5046,7 +5046,7 @@
         <OverallResults successes="4" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="Single tag, two matches">
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.hasFilters() == true
           </Original>
@@ -5054,7 +5054,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcA ) == false
           </Original>
@@ -5062,7 +5062,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcB ) == true
           </Original>
@@ -5070,7 +5070,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcC ) == true
           </Original>
@@ -5081,7 +5081,7 @@
         <OverallResults successes="4" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="Two tags">
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.hasFilters() == true
           </Original>
@@ -5089,7 +5089,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcA ) == false
           </Original>
@@ -5097,7 +5097,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcB ) == false
           </Original>
@@ -5105,7 +5105,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcC ) == true
           </Original>
@@ -5116,7 +5116,7 @@
         <OverallResults successes="4" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="Two tags, spare separated">
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.hasFilters() == true
           </Original>
@@ -5124,7 +5124,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcA ) == false
           </Original>
@@ -5132,7 +5132,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcB ) == false
           </Original>
@@ -5140,7 +5140,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcC ) == true
           </Original>
@@ -5151,7 +5151,7 @@
         <OverallResults successes="4" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="Wildcarded name and tag">
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.hasFilters() == true
           </Original>
@@ -5159,7 +5159,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcA ) == false
           </Original>
@@ -5167,7 +5167,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcB ) == false
           </Original>
@@ -5175,7 +5175,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcC ) == true
           </Original>
@@ -5183,7 +5183,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcD ) == false
           </Original>
@@ -5194,7 +5194,7 @@
         <OverallResults successes="5" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="Single tag exclusion">
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.hasFilters() == true
           </Original>
@@ -5202,7 +5202,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcA ) == true
           </Original>
@@ -5210,7 +5210,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcB ) == false
           </Original>
@@ -5218,7 +5218,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcC ) == true
           </Original>
@@ -5229,7 +5229,7 @@
         <OverallResults successes="4" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="One tag exclusion and one tag inclusion">
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.hasFilters() == true
           </Original>
@@ -5237,7 +5237,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcA ) == false
           </Original>
@@ -5245,7 +5245,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcB ) == true
           </Original>
@@ -5253,7 +5253,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcC ) == false
           </Original>
@@ -5264,7 +5264,7 @@
         <OverallResults successes="4" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="One tag exclusion and one wldcarded name inclusion">
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.hasFilters() == true
           </Original>
@@ -5272,7 +5272,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcA ) == false
           </Original>
@@ -5280,7 +5280,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcB ) == false
           </Original>
@@ -5288,7 +5288,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcC ) == false
           </Original>
@@ -5296,7 +5296,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcD ) == true
           </Original>
@@ -5307,7 +5307,7 @@
         <OverallResults successes="5" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="One tag exclusion, using exclude:, and one wldcarded name inclusion">
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.hasFilters() == true
           </Original>
@@ -5315,7 +5315,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcA ) == false
           </Original>
@@ -5323,7 +5323,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcB ) == false
           </Original>
@@ -5331,7 +5331,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcC ) == false
           </Original>
@@ -5339,7 +5339,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcD ) == true
           </Original>
@@ -5350,7 +5350,7 @@
         <OverallResults successes="5" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="name exclusion">
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.hasFilters() == true
           </Original>
@@ -5358,7 +5358,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcA ) == true
           </Original>
@@ -5366,7 +5366,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcB ) == false
           </Original>
@@ -5374,7 +5374,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcC ) == true
           </Original>
@@ -5382,7 +5382,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcD ) == true
           </Original>
@@ -5393,7 +5393,7 @@
         <OverallResults successes="5" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="wildcarded name exclusion">
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.hasFilters() == true
           </Original>
@@ -5401,7 +5401,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcA ) == true
           </Original>
@@ -5409,7 +5409,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcB ) == true
           </Original>
@@ -5417,7 +5417,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcC ) == false
           </Original>
@@ -5425,7 +5425,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcD ) == false
           </Original>
@@ -5436,7 +5436,7 @@
         <OverallResults successes="5" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="wildcarded name exclusion with tag inclusion">
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.hasFilters() == true
           </Original>
@@ -5444,7 +5444,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcA ) == true
           </Original>
@@ -5452,7 +5452,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcB ) == true
           </Original>
@@ -5460,7 +5460,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcC ) == true
           </Original>
@@ -5468,7 +5468,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcD ) == false
           </Original>
@@ -5479,7 +5479,7 @@
         <OverallResults successes="5" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="wildcarded name exclusion, using exclude:, with tag inclusion">
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.hasFilters() == true
           </Original>
@@ -5487,7 +5487,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcA ) == true
           </Original>
@@ -5495,7 +5495,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcB ) == true
           </Original>
@@ -5503,7 +5503,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcC ) == true
           </Original>
@@ -5511,7 +5511,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcD ) == false
           </Original>
@@ -5522,7 +5522,7 @@
         <OverallResults successes="5" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="two wildcarded names">
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.hasFilters() == true
           </Original>
@@ -5530,7 +5530,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcA ) == false
           </Original>
@@ -5538,7 +5538,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcB ) == false
           </Original>
@@ -5546,7 +5546,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcC ) == true
           </Original>
@@ -5554,7 +5554,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcD ) == false
           </Original>
@@ -5565,7 +5565,7 @@
         <OverallResults successes="5" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="empty tag">
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.hasFilters() == false
           </Original>
@@ -5573,7 +5573,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcA ) == false
           </Original>
@@ -5581,7 +5581,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcB ) == false
           </Original>
@@ -5589,7 +5589,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcC ) == false
           </Original>
@@ -5597,7 +5597,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcD ) == false
           </Original>
@@ -5608,7 +5608,7 @@
         <OverallResults successes="5" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="empty quoted name">
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.hasFilters() == false
           </Original>
@@ -5616,7 +5616,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcA ) == false
           </Original>
@@ -5624,7 +5624,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcB ) == false
           </Original>
@@ -5632,7 +5632,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcC ) == false
           </Original>
@@ -5640,7 +5640,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcD ) == false
           </Original>
@@ -5651,7 +5651,7 @@
         <OverallResults successes="5" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="quoted string followed by tag exclusion">
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.hasFilters() == true
           </Original>
@@ -5659,7 +5659,7 @@
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcA ) == false
           </Original>
@@ -5667,7 +5667,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcB ) == false
           </Original>
@@ -5675,7 +5675,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcC ) == false
           </Original>
@@ -5683,7 +5683,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcD ) == true
           </Original>
@@ -5696,7 +5696,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Parsing a std::pair">
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TrickyTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/TrickyTests.cpp" >
         <Original>
           (std::pair&lt;int, int>( 1, 2 )) == aNicePair
         </Original>
@@ -5707,7 +5707,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Pointers can be compared to null">
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           p == 0
         </Original>
@@ -5715,7 +5715,7 @@
           NULL == 0
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           p == pNULL
         </Original>
@@ -5723,7 +5723,7 @@
           NULL == NULL
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           p != 0
         </Original>
@@ -5731,7 +5731,7 @@
           0x<hex digits> != 0
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           cp != 0
         </Original>
@@ -5739,7 +5739,7 @@
           0x<hex digits> != 0
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           cpc != 0
         </Original>
@@ -5747,7 +5747,7 @@
           0x<hex digits> != 0
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           returnsNull() == 0
         </Original>
@@ -5755,7 +5755,7 @@
           {null string} == 0
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           returnsConstNull() == 0
         </Original>
@@ -5763,7 +5763,7 @@
           {null string} == 0
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           0 != p
         </Original>
@@ -5784,7 +5784,7 @@
     </TestCase>
     <TestCase name="Process can be configured on command line">
       <Section name="default - no arguments">
-        <Expression success="true" type="CHECK_NOTHROW" filename="projects/SelfTest/TestMain.cpp" >
+        <Expression success="true" type="CHECK_NOTHROW" filename="projects/<exe-name>/TestMain.cpp" >
           <Original>
             parseIntoConfig( argv, config )
           </Original>
@@ -5792,7 +5792,7 @@
             parseIntoConfig( argv, config )
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/TestMain.cpp" >
           <Original>
             config.shouldDebugBreak == false
           </Original>
@@ -5800,7 +5800,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/TestMain.cpp" >
           <Original>
             config.abortAfter == -1
           </Original>
@@ -5808,7 +5808,7 @@
             -1 == -1
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/TestMain.cpp" >
           <Original>
             config.noThrow == false
           </Original>
@@ -5816,7 +5816,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/TestMain.cpp" >
           <Original>
             config.reporterNames.empty()
           </Original>
@@ -5828,7 +5828,7 @@
       </Section>
       <Section name="test lists">
         <Section name="1 test" description="Specify one test case using">
-          <Expression success="true" type="CHECK_NOTHROW" filename="projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" type="CHECK_NOTHROW" filename="projects/<exe-name>/TestMain.cpp" >
             <Original>
               parseIntoConfig( argv, config )
             </Original>
@@ -5836,7 +5836,7 @@
               parseIntoConfig( argv, config )
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/TestMain.cpp" >
             <Original>
               cfg.testSpec().matches( fakeTestCase( "notIncluded" ) ) == false
             </Original>
@@ -5844,7 +5844,7 @@
               false == false
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/TestMain.cpp" >
             <Original>
               cfg.testSpec().matches( fakeTestCase( "test1" ) )
             </Original>
@@ -5858,7 +5858,7 @@
       </Section>
       <Section name="test lists">
         <Section name="Specify one test case exclusion using exclude:">
-          <Expression success="true" type="CHECK_NOTHROW" filename="projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" type="CHECK_NOTHROW" filename="projects/<exe-name>/TestMain.cpp" >
             <Original>
               parseIntoConfig( argv, config )
             </Original>
@@ -5866,7 +5866,7 @@
               parseIntoConfig( argv, config )
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/TestMain.cpp" >
             <Original>
               cfg.testSpec().matches( fakeTestCase( "test1" ) ) == false
             </Original>
@@ -5874,7 +5874,7 @@
               false == false
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/TestMain.cpp" >
             <Original>
               cfg.testSpec().matches( fakeTestCase( "alwaysIncluded" ) )
             </Original>
@@ -5888,7 +5888,7 @@
       </Section>
       <Section name="test lists">
         <Section name="Specify one test case exclusion using ~">
-          <Expression success="true" type="CHECK_NOTHROW" filename="projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" type="CHECK_NOTHROW" filename="projects/<exe-name>/TestMain.cpp" >
             <Original>
               parseIntoConfig( argv, config )
             </Original>
@@ -5896,7 +5896,7 @@
               parseIntoConfig( argv, config )
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/TestMain.cpp" >
             <Original>
               cfg.testSpec().matches( fakeTestCase( "test1" ) ) == false
             </Original>
@@ -5904,7 +5904,7 @@
               false == false
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/TestMain.cpp" >
             <Original>
               cfg.testSpec().matches( fakeTestCase( "alwaysIncluded" ) )
             </Original>
@@ -5918,7 +5918,7 @@
       </Section>
       <Section name="reporter">
         <Section name="-r/console">
-          <Expression success="true" type="CHECK_NOTHROW" filename="projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" type="CHECK_NOTHROW" filename="projects/<exe-name>/TestMain.cpp" >
             <Original>
               parseIntoConfig( argv, config )
             </Original>
@@ -5926,7 +5926,7 @@
               parseIntoConfig( argv, config )
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/TestMain.cpp" >
             <Original>
               config.reporterNames[0] == "console"
             </Original>
@@ -5940,7 +5940,7 @@
       </Section>
       <Section name="reporter">
         <Section name="-r/xml">
-          <Expression success="true" type="CHECK_NOTHROW" filename="projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" type="CHECK_NOTHROW" filename="projects/<exe-name>/TestMain.cpp" >
             <Original>
               parseIntoConfig( argv, config )
             </Original>
@@ -5948,7 +5948,7 @@
               parseIntoConfig( argv, config )
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/TestMain.cpp" >
             <Original>
               config.reporterNames[0] == "xml"
             </Original>
@@ -5962,7 +5962,7 @@
       </Section>
       <Section name="reporter">
         <Section name="-r xml and junit">
-          <Expression success="true" type="CHECK_NOTHROW" filename="projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" type="CHECK_NOTHROW" filename="projects/<exe-name>/TestMain.cpp" >
             <Original>
               parseIntoConfig( argv, config )
             </Original>
@@ -5970,7 +5970,7 @@
               parseIntoConfig( argv, config )
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/TestMain.cpp" >
             <Original>
               config.reporterNames.size() == 2
             </Original>
@@ -5978,7 +5978,7 @@
               2 == 2
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/TestMain.cpp" >
             <Original>
               config.reporterNames[0] == "xml"
             </Original>
@@ -5986,7 +5986,7 @@
               "xml" == "xml"
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/TestMain.cpp" >
             <Original>
               config.reporterNames[1] == "junit"
             </Original>
@@ -6000,7 +6000,7 @@
       </Section>
       <Section name="reporter">
         <Section name="--reporter/junit">
-          <Expression success="true" type="CHECK_NOTHROW" filename="projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" type="CHECK_NOTHROW" filename="projects/<exe-name>/TestMain.cpp" >
             <Original>
               parseIntoConfig( argv, config )
             </Original>
@@ -6008,7 +6008,7 @@
               parseIntoConfig( argv, config )
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/TestMain.cpp" >
             <Original>
               config.reporterNames[0] == "junit"
             </Original>
@@ -6022,7 +6022,7 @@
       </Section>
       <Section name="debugger">
         <Section name="-b">
-          <Expression success="true" type="CHECK_NOTHROW" filename="projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" type="CHECK_NOTHROW" filename="projects/<exe-name>/TestMain.cpp" >
             <Original>
               parseIntoConfig( argv, config )
             </Original>
@@ -6030,7 +6030,7 @@
               parseIntoConfig( argv, config )
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/TestMain.cpp" >
             <Original>
               config.shouldDebugBreak == true
             </Original>
@@ -6044,7 +6044,7 @@
       </Section>
       <Section name="debugger">
         <Section name="--break">
-          <Expression success="true" type="CHECK_NOTHROW" filename="projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" type="CHECK_NOTHROW" filename="projects/<exe-name>/TestMain.cpp" >
             <Original>
               parseIntoConfig( argv, config )
             </Original>
@@ -6052,7 +6052,7 @@
               parseIntoConfig( argv, config )
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/TestMain.cpp" >
             <Original>
               config.shouldDebugBreak
             </Original>
@@ -6066,7 +6066,7 @@
       </Section>
       <Section name="abort">
         <Section name="-a aborts after first failure">
-          <Expression success="true" type="CHECK_NOTHROW" filename="projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" type="CHECK_NOTHROW" filename="projects/<exe-name>/TestMain.cpp" >
             <Original>
               parseIntoConfig( argv, config )
             </Original>
@@ -6074,7 +6074,7 @@
               parseIntoConfig( argv, config )
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/TestMain.cpp" >
             <Original>
               config.abortAfter == 1
             </Original>
@@ -6088,7 +6088,7 @@
       </Section>
       <Section name="abort">
         <Section name="-x 2 aborts after two failures">
-          <Expression success="true" type="CHECK_NOTHROW" filename="projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" type="CHECK_NOTHROW" filename="projects/<exe-name>/TestMain.cpp" >
             <Original>
               parseIntoConfig( argv, config )
             </Original>
@@ -6096,7 +6096,7 @@
               parseIntoConfig( argv, config )
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/TestMain.cpp" >
             <Original>
               config.abortAfter == 2
             </Original>
@@ -6110,7 +6110,7 @@
       </Section>
       <Section name="abort">
         <Section name="-x must be greater than zero">
-          <Expression success="true" type="REQUIRE_THAT" filename="projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" type="REQUIRE_THAT" filename="projects/<exe-name>/TestMain.cpp" >
             <Original>
               parseIntoConfigAndReturnError( argv, config ), Contains( "greater than zero" )
             </Original>
@@ -6125,7 +6125,7 @@
       </Section>
       <Section name="abort">
         <Section name="-x must be numeric">
-          <Expression success="true" type="REQUIRE_THAT" filename="projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" type="REQUIRE_THAT" filename="projects/<exe-name>/TestMain.cpp" >
             <Original>
               parseIntoConfigAndReturnError( argv, config ), Contains( "-x" )
             </Original>
@@ -6140,7 +6140,7 @@
       </Section>
       <Section name="nothrow">
         <Section name="-e">
-          <Expression success="true" type="CHECK_NOTHROW" filename="projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" type="CHECK_NOTHROW" filename="projects/<exe-name>/TestMain.cpp" >
             <Original>
               parseIntoConfig( argv, config )
             </Original>
@@ -6148,7 +6148,7 @@
               parseIntoConfig( argv, config )
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/TestMain.cpp" >
             <Original>
               config.noThrow == true
             </Original>
@@ -6162,7 +6162,7 @@
       </Section>
       <Section name="nothrow">
         <Section name="--nothrow">
-          <Expression success="true" type="CHECK_NOTHROW" filename="projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" type="CHECK_NOTHROW" filename="projects/<exe-name>/TestMain.cpp" >
             <Original>
               parseIntoConfig( argv, config )
             </Original>
@@ -6170,7 +6170,7 @@
               parseIntoConfig( argv, config )
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/TestMain.cpp" >
             <Original>
               config.noThrow == true
             </Original>
@@ -6184,7 +6184,7 @@
       </Section>
       <Section name="output filename">
         <Section name="-o filename">
-          <Expression success="true" type="CHECK_NOTHROW" filename="projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" type="CHECK_NOTHROW" filename="projects/<exe-name>/TestMain.cpp" >
             <Original>
               parseIntoConfig( argv, config )
             </Original>
@@ -6192,7 +6192,7 @@
               parseIntoConfig( argv, config )
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/TestMain.cpp" >
             <Original>
               config.outputFilename == "filename.ext"
             </Original>
@@ -6206,7 +6206,7 @@
       </Section>
       <Section name="output filename">
         <Section name="--out">
-          <Expression success="true" type="CHECK_NOTHROW" filename="projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" type="CHECK_NOTHROW" filename="projects/<exe-name>/TestMain.cpp" >
             <Original>
               parseIntoConfig( argv, config )
             </Original>
@@ -6214,7 +6214,7 @@
               parseIntoConfig( argv, config )
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/TestMain.cpp" >
             <Original>
               config.outputFilename == "filename.ext"
             </Original>
@@ -6228,7 +6228,7 @@
       </Section>
       <Section name="combinations">
         <Section name="Single character flags can be combined">
-          <Expression success="true" type="CHECK_NOTHROW" filename="projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" type="CHECK_NOTHROW" filename="projects/<exe-name>/TestMain.cpp" >
             <Original>
               parseIntoConfig( argv, config )
             </Original>
@@ -6236,7 +6236,7 @@
               parseIntoConfig( argv, config )
             </Expanded>
           </Expression>
-          <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" type="CHECK" filename="projects/<exe-name>/TestMain.cpp" >
             <Original>
               config.abortAfter == 1
             </Original>
@@ -6244,7 +6244,7 @@
               1 == 1
             </Expanded>
           </Expression>
-          <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" type="CHECK" filename="projects/<exe-name>/TestMain.cpp" >
             <Original>
               config.shouldDebugBreak
             </Original>
@@ -6252,7 +6252,7 @@
               true
             </Expanded>
           </Expression>
-          <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" type="CHECK" filename="projects/<exe-name>/TestMain.cpp" >
             <Original>
               config.noThrow == true
             </Original>
@@ -6266,7 +6266,7 @@
       </Section>
       <Section name="use-colour">
         <Section name="without option">
-          <Expression success="true" type="CHECK_NOTHROW" filename="projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" type="CHECK_NOTHROW" filename="projects/<exe-name>/TestMain.cpp" >
             <Original>
               parseIntoConfig( argv, config )
             </Original>
@@ -6274,7 +6274,7 @@
               parseIntoConfig( argv, config )
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/TestMain.cpp" >
             <Original>
               config.useColour == UseColour::Auto
             </Original>
@@ -6288,7 +6288,7 @@
       </Section>
       <Section name="use-colour">
         <Section name="auto">
-          <Expression success="true" type="CHECK_NOTHROW" filename="projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" type="CHECK_NOTHROW" filename="projects/<exe-name>/TestMain.cpp" >
             <Original>
               parseIntoConfig( argv, config )
             </Original>
@@ -6296,7 +6296,7 @@
               parseIntoConfig( argv, config )
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/TestMain.cpp" >
             <Original>
               config.useColour == UseColour::Auto
             </Original>
@@ -6310,7 +6310,7 @@
       </Section>
       <Section name="use-colour">
         <Section name="yes">
-          <Expression success="true" type="CHECK_NOTHROW" filename="projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" type="CHECK_NOTHROW" filename="projects/<exe-name>/TestMain.cpp" >
             <Original>
               parseIntoConfig( argv, config )
             </Original>
@@ -6318,7 +6318,7 @@
               parseIntoConfig( argv, config )
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/TestMain.cpp" >
             <Original>
               config.useColour == UseColour::Yes
             </Original>
@@ -6332,7 +6332,7 @@
       </Section>
       <Section name="use-colour">
         <Section name="no">
-          <Expression success="true" type="CHECK_NOTHROW" filename="projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" type="CHECK_NOTHROW" filename="projects/<exe-name>/TestMain.cpp" >
             <Original>
               parseIntoConfig( argv, config )
             </Original>
@@ -6340,7 +6340,7 @@
               parseIntoConfig( argv, config )
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/TestMain.cpp" >
             <Original>
               config.useColour == UseColour::No
             </Original>
@@ -6354,7 +6354,7 @@
       </Section>
       <Section name="use-colour">
         <Section name="error">
-          <Expression success="true" type="REQUIRE_THROWS_WITH" filename="projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" type="REQUIRE_THROWS_WITH" filename="projects/<exe-name>/TestMain.cpp" >
             <Original>
               parseIntoConfig( argv, config ), Contains( "colour mode must be one of" )
             </Original>
@@ -6369,7 +6369,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="SCOPED_INFO is reset for each loop">
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MessageTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/MessageTests.cpp" >
         <Original>
           i &lt; 10
         </Original>
@@ -6377,7 +6377,7 @@
           0 &lt; 10
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MessageTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/MessageTests.cpp" >
         <Original>
           i &lt; 10
         </Original>
@@ -6385,7 +6385,7 @@
           1 &lt; 10
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MessageTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/MessageTests.cpp" >
         <Original>
           i &lt; 10
         </Original>
@@ -6393,7 +6393,7 @@
           2 &lt; 10
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MessageTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/MessageTests.cpp" >
         <Original>
           i &lt; 10
         </Original>
@@ -6401,7 +6401,7 @@
           3 &lt; 10
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MessageTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/MessageTests.cpp" >
         <Original>
           i &lt; 10
         </Original>
@@ -6409,7 +6409,7 @@
           4 &lt; 10
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MessageTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/MessageTests.cpp" >
         <Original>
           i &lt; 10
         </Original>
@@ -6417,7 +6417,7 @@
           5 &lt; 10
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MessageTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/MessageTests.cpp" >
         <Original>
           i &lt; 10
         </Original>
@@ -6425,7 +6425,7 @@
           6 &lt; 10
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MessageTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/MessageTests.cpp" >
         <Original>
           i &lt; 10
         </Original>
@@ -6433,7 +6433,7 @@
           7 &lt; 10
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MessageTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/MessageTests.cpp" >
         <Original>
           i &lt; 10
         </Original>
@@ -6441,7 +6441,7 @@
           8 &lt; 10
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MessageTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/MessageTests.cpp" >
         <Original>
           i &lt; 10
         </Original>
@@ -6455,7 +6455,7 @@
       <Info>
         i := 10
       </Info>
-      <Expression success="false" type="REQUIRE" filename="projects/SelfTest/MessageTests.cpp" >
+      <Expression success="false" type="REQUIRE" filename="projects/<exe-name>/MessageTests.cpp" >
         <Original>
           i &lt; 10
         </Original>
@@ -6473,7 +6473,7 @@
     </TestCase>
     <TestCase name="Scenario: BDD tests requiring Fixtures to provide commonly-accessed data or methods">
       <Section name="Given: No operations precede me">
-        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/BDDTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/BDDTests.cpp" >
           <Original>
             before == 0
           </Original>
@@ -6483,7 +6483,7 @@
         </Expression>
         <Section name="When: We get the count">
           <Section name="Then: Subsequently values are higher">
-            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/BDDTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/BDDTests.cpp" >
               <Original>
                 after > before
               </Original>
@@ -6503,7 +6503,7 @@
       <Section name="Given: This stuff exists">
         <Section name="When: I do this">
           <Section name="Then: it should do this">
-            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/BDDTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/BDDTests.cpp" >
               <Original>
                 itDoesThis()
               </Original>
@@ -6512,7 +6512,7 @@
               </Expanded>
             </Expression>
             <Section name="And: do that">
-              <Expression success="true" type="REQUIRE" filename="projects/SelfTest/BDDTests.cpp" >
+              <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/BDDTests.cpp" >
                 <Original>
                   itDoesThat()
                 </Original>
@@ -6544,7 +6544,7 @@
     </TestCase>
     <TestCase name="Scenario: Vector resizing affects size and capacity">
       <Section name="Given: an empty vector">
-        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/BDDTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/BDDTests.cpp" >
           <Original>
             v.size() == 0
           </Original>
@@ -6554,7 +6554,7 @@
         </Expression>
         <Section name="When: it is made larger">
           <Section name="Then: the size and capacity go up">
-            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/BDDTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/BDDTests.cpp" >
               <Original>
                 v.size() == 10
               </Original>
@@ -6562,7 +6562,7 @@
                 10 == 10
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/BDDTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/BDDTests.cpp" >
               <Original>
                 v.capacity() >= 10
               </Original>
@@ -6572,7 +6572,7 @@
             </Expression>
             <Section name="And when: it is made smaller again">
               <Section name="Then: the size goes down but the capacity stays the same">
-                <Expression success="true" type="REQUIRE" filename="projects/SelfTest/BDDTests.cpp" >
+                <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/BDDTests.cpp" >
                   <Original>
                     v.size() == 5
                   </Original>
@@ -6580,7 +6580,7 @@
                     5 == 5
                   </Expanded>
                 </Expression>
-                <Expression success="true" type="REQUIRE" filename="projects/SelfTest/BDDTests.cpp" >
+                <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/BDDTests.cpp" >
                   <Original>
                     v.capacity() >= 10
                   </Original>
@@ -6599,7 +6599,7 @@
         <OverallResults successes="5" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="Given: an empty vector">
-        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/BDDTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/BDDTests.cpp" >
           <Original>
             v.size() == 0
           </Original>
@@ -6609,7 +6609,7 @@
         </Expression>
         <Section name="When: we reserve more space">
           <Section name="Then: The capacity is increased but the size remains the same">
-            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/BDDTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/BDDTests.cpp" >
               <Original>
                 v.capacity() >= 10
               </Original>
@@ -6617,7 +6617,7 @@
                 10 >= 10
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/BDDTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/BDDTests.cpp" >
               <Original>
                 v.size() == 0
               </Original>
@@ -6637,7 +6637,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Some simple comparisons between doubles">
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ApproxTests.cpp" >
         <Original>
           d == Approx( 1.23 )
         </Original>
@@ -6645,7 +6645,7 @@
           1.23 == Approx( 1.23 )
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ApproxTests.cpp" >
         <Original>
           d != Approx( 1.22 )
         </Original>
@@ -6653,7 +6653,7 @@
           1.23 != Approx( 1.22 )
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ApproxTests.cpp" >
         <Original>
           d != Approx( 1.24 )
         </Original>
@@ -6661,7 +6661,7 @@
           1.23 != Approx( 1.24 )
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ApproxTests.cpp" >
         <Original>
           Approx( d ) == 1.23
         </Original>
@@ -6669,7 +6669,7 @@
           Approx( 1.23 ) == 1.23
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ApproxTests.cpp" >
         <Original>
           Approx( d ) != 1.22
         </Original>
@@ -6677,7 +6677,7 @@
           Approx( 1.23 ) != 1.22
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ApproxTests.cpp" >
         <Original>
           Approx( d ) != 1.24
         </Original>
@@ -6697,7 +6697,7 @@
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="StartsWith string matcher">
-      <Expression success="false" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" >
+      <Expression success="false" type="CHECK_THAT" filename="projects/<exe-name>/MiscTests.cpp" >
         <Original>
           testStringForMatching(), StartsWith( "string" )
         </Original>
@@ -6708,7 +6708,7 @@
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="String matchers">
-      <Expression success="true" type="REQUIRE_THAT" filename="projects/SelfTest/MiscTests.cpp" >
+      <Expression success="true" type="REQUIRE_THAT" filename="projects/<exe-name>/MiscTests.cpp" >
         <Original>
           testStringForMatching(), Contains( "string" )
         </Original>
@@ -6716,7 +6716,7 @@
           "this string contains 'abc' as a substring" contains: "string"
         </Expanded>
       </Expression>
-      <Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" >
+      <Expression success="true" type="CHECK_THAT" filename="projects/<exe-name>/MiscTests.cpp" >
         <Original>
           testStringForMatching(), Contains( "abc" )
         </Original>
@@ -6724,7 +6724,7 @@
           "this string contains 'abc' as a substring" contains: "abc"
         </Expanded>
       </Expression>
-      <Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" >
+      <Expression success="true" type="CHECK_THAT" filename="projects/<exe-name>/MiscTests.cpp" >
         <Original>
           testStringForMatching(), StartsWith( "this" )
         </Original>
@@ -6732,7 +6732,7 @@
           "this string contains 'abc' as a substring" starts with: "this"
         </Expanded>
       </Expression>
-      <Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" >
+      <Expression success="true" type="CHECK_THAT" filename="projects/<exe-name>/MiscTests.cpp" >
         <Original>
           testStringForMatching(), EndsWith( "substring" )
         </Original>
@@ -6746,7 +6746,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Tabs and newlines show in output">
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/MiscTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/MiscTests.cpp" >
         <Original>
           s1 == s2
         </Original>
@@ -6765,7 +6765,7 @@
     </TestCase>
     <TestCase name="Tag alias can be registered against tag patterns">
       <Section name="The same tag alias can only be registered once">
-        <Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/TagAliasTests.cpp" >
+        <Expression success="true" type="CHECK_THAT" filename="projects/<exe-name>/TagAliasTests.cpp" >
           <Original>
             what, Contains( "[@zzz]" )
           </Original>
@@ -6775,7 +6775,7 @@
 	Redefined at file:10" contains: "[@zzz]"
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/TagAliasTests.cpp" >
+        <Expression success="true" type="CHECK_THAT" filename="projects/<exe-name>/TagAliasTests.cpp" >
           <Original>
             what, Contains( "file" )
           </Original>
@@ -6785,7 +6785,7 @@
 	Redefined at file:10" contains: "file"
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/TagAliasTests.cpp" >
+        <Expression success="true" type="CHECK_THAT" filename="projects/<exe-name>/TagAliasTests.cpp" >
           <Original>
             what, Contains( "2" )
           </Original>
@@ -6795,7 +6795,7 @@
 	Redefined at file:10" contains: "2"
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/TagAliasTests.cpp" >
+        <Expression success="true" type="CHECK_THAT" filename="projects/<exe-name>/TagAliasTests.cpp" >
           <Original>
             what, Contains( "10" )
           </Original>
@@ -6808,7 +6808,7 @@
         <OverallResults successes="4" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="Tag aliases must be of the form [@name]">
-        <Expression success="true" type="CHECK_THROWS" filename="projects/SelfTest/TagAliasTests.cpp" >
+        <Expression success="true" type="CHECK_THROWS" filename="projects/<exe-name>/TagAliasTests.cpp" >
           <Original>
             registry.add( "[no ampersat]", "", Catch::SourceLineInfo( "file", 3 ) )
           </Original>
@@ -6816,7 +6816,7 @@
             registry.add( "[no ampersat]", "", Catch::SourceLineInfo( "file", 3 ) )
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK_THROWS" filename="projects/SelfTest/TagAliasTests.cpp" >
+        <Expression success="true" type="CHECK_THROWS" filename="projects/<exe-name>/TagAliasTests.cpp" >
           <Original>
             registry.add( "[the @ is not at the start]", "", Catch::SourceLineInfo( "file", 3 ) )
           </Original>
@@ -6824,7 +6824,7 @@
             registry.add( "[the @ is not at the start]", "", Catch::SourceLineInfo( "file", 3 ) )
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK_THROWS" filename="projects/SelfTest/TagAliasTests.cpp" >
+        <Expression success="true" type="CHECK_THROWS" filename="projects/<exe-name>/TagAliasTests.cpp" >
           <Original>
             registry.add( "@no square bracket at start]", "", Catch::SourceLineInfo( "file", 3 ) )
           </Original>
@@ -6832,7 +6832,7 @@
             registry.add( "@no square bracket at start]", "", Catch::SourceLineInfo( "file", 3 ) )
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK_THROWS" filename="projects/SelfTest/TagAliasTests.cpp" >
+        <Expression success="true" type="CHECK_THROWS" filename="projects/<exe-name>/TagAliasTests.cpp" >
           <Original>
             registry.add( "[@no square bracket at end", "", Catch::SourceLineInfo( "file", 3 ) )
           </Original>
@@ -6848,7 +6848,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Test enum bit values">
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TrickyTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/TrickyTests.cpp" >
         <Original>
           0x<hex digits> == bit30and31
         </Original>
@@ -6859,7 +6859,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Text can be formatted using the Text class">
-      <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" >
+      <Expression success="true" type="CHECK" filename="projects/<exe-name>/TestMain.cpp" >
         <Original>
           Text( "hi there" ).toString() == "hi there"
         </Original>
@@ -6867,7 +6867,7 @@
           "hi there" == "hi there"
         </Expanded>
       </Expression>
-      <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" >
+      <Expression success="true" type="CHECK" filename="projects/<exe-name>/TestMain.cpp" >
         <Original>
           Text( "hi there", narrow ).toString() == "hi\nthere"
         </Original>
@@ -6882,7 +6882,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="The NO_FAIL macro reports a failure but does not fail the test">
-      <Expression success="false" type="CHECK_NOFAIL" filename="projects/SelfTest/MessageTests.cpp" >
+      <Expression success="false" type="CHECK_NOFAIL" filename="projects/<exe-name>/MessageTests.cpp" >
         <Original>
           1 == 2
         </Original>
@@ -6896,7 +6896,7 @@
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="Tracker">
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
         <Original>
           testCase.isOpen()
         </Original>
@@ -6904,7 +6904,7 @@
           true
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
         <Original>
           s1.isOpen()
         </Original>
@@ -6913,7 +6913,7 @@
         </Expanded>
       </Expression>
       <Section name="successfully close one section">
-        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
           <Original>
             s1.isSuccessfullyCompleted()
           </Original>
@@ -6921,7 +6921,7 @@
             true
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
           <Original>
             testCase.isComplete() == false
           </Original>
@@ -6929,7 +6929,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
           <Original>
             ctx.completedCycle()
           </Original>
@@ -6937,7 +6937,7 @@
             true
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
           <Original>
             testCase.isSuccessfullyCompleted()
           </Original>
@@ -6947,7 +6947,7 @@
         </Expression>
         <OverallResults successes="4" failures="0" expectedFailures="0"/>
       </Section>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
         <Original>
           testCase.isOpen()
         </Original>
@@ -6955,7 +6955,7 @@
           true
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
         <Original>
           s1.isOpen()
         </Original>
@@ -6964,7 +6964,7 @@
         </Expanded>
       </Expression>
       <Section name="fail one section">
-        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
           <Original>
             s1.isComplete()
           </Original>
@@ -6972,7 +6972,7 @@
             true
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
           <Original>
             s1.isSuccessfullyCompleted() == false
           </Original>
@@ -6980,7 +6980,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
           <Original>
             testCase.isComplete() == false
           </Original>
@@ -6988,7 +6988,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
           <Original>
             ctx.completedCycle()
           </Original>
@@ -6996,7 +6996,7 @@
             true
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
           <Original>
             testCase.isSuccessfullyCompleted() == false
           </Original>
@@ -7005,7 +7005,7 @@
           </Expanded>
         </Expression>
         <Section name="re-enter after failed section">
-          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
             <Original>
               testCase2.isOpen()
             </Original>
@@ -7013,7 +7013,7 @@
               true
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
             <Original>
               s1b.isOpen() == false
             </Original>
@@ -7021,7 +7021,7 @@
               false == false
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
             <Original>
               ctx.completedCycle()
             </Original>
@@ -7029,7 +7029,7 @@
               true
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
             <Original>
               testCase.isComplete()
             </Original>
@@ -7037,7 +7037,7 @@
               true
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
             <Original>
               testCase.isSuccessfullyCompleted()
             </Original>
@@ -7049,7 +7049,7 @@
         </Section>
         <OverallResults successes="10" failures="0" expectedFailures="0"/>
       </Section>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
         <Original>
           testCase.isOpen()
         </Original>
@@ -7057,7 +7057,7 @@
           true
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
         <Original>
           s1.isOpen()
         </Original>
@@ -7066,7 +7066,7 @@
         </Expanded>
       </Expression>
       <Section name="fail one section">
-        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
           <Original>
             s1.isComplete()
           </Original>
@@ -7074,7 +7074,7 @@
             true
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
           <Original>
             s1.isSuccessfullyCompleted() == false
           </Original>
@@ -7082,7 +7082,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
           <Original>
             testCase.isComplete() == false
           </Original>
@@ -7090,7 +7090,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
           <Original>
             ctx.completedCycle()
           </Original>
@@ -7098,7 +7098,7 @@
             true
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
           <Original>
             testCase.isSuccessfullyCompleted() == false
           </Original>
@@ -7107,7 +7107,7 @@
           </Expanded>
         </Expression>
         <Section name="re-enter after failed section and find next section">
-          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
             <Original>
               testCase2.isOpen()
             </Original>
@@ -7115,7 +7115,7 @@
               true
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
             <Original>
               s1b.isOpen() == false
             </Original>
@@ -7123,7 +7123,7 @@
               false == false
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
             <Original>
               s2.isOpen()
             </Original>
@@ -7131,7 +7131,7 @@
               true
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
             <Original>
               ctx.completedCycle()
             </Original>
@@ -7139,7 +7139,7 @@
               true
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
             <Original>
               testCase.isComplete()
             </Original>
@@ -7147,7 +7147,7 @@
               true
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
             <Original>
               testCase.isSuccessfullyCompleted()
             </Original>
@@ -7159,7 +7159,7 @@
         </Section>
         <OverallResults successes="11" failures="0" expectedFailures="0"/>
       </Section>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
         <Original>
           testCase.isOpen()
         </Original>
@@ -7167,7 +7167,7 @@
           true
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
         <Original>
           s1.isOpen()
         </Original>
@@ -7176,7 +7176,7 @@
         </Expanded>
       </Expression>
       <Section name="successfully close one section, then find another">
-        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
           <Original>
             s2.isOpen() == false
           </Original>
@@ -7184,7 +7184,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
           <Original>
             testCase.isComplete() == false
           </Original>
@@ -7193,7 +7193,7 @@
           </Expanded>
         </Expression>
         <Section name="Re-enter - skips S1 and enters S2">
-          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
             <Original>
               testCase2.isOpen()
             </Original>
@@ -7201,7 +7201,7 @@
               true
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
             <Original>
               s1b.isOpen() == false
             </Original>
@@ -7209,7 +7209,7 @@
               false == false
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
             <Original>
               s2b.isOpen()
             </Original>
@@ -7217,7 +7217,7 @@
               true
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
             <Original>
               ctx.completedCycle() == false
             </Original>
@@ -7226,7 +7226,7 @@
             </Expanded>
           </Expression>
           <Section name="Successfully close S2">
-            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
               <Original>
                 ctx.completedCycle()
               </Original>
@@ -7234,7 +7234,7 @@
                 true
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
               <Original>
                 s2b.isSuccessfullyCompleted()
               </Original>
@@ -7242,7 +7242,7 @@
                 true
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
               <Original>
                 testCase2.isComplete() == false
               </Original>
@@ -7250,7 +7250,7 @@
                 false == false
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
               <Original>
                 testCase2.isSuccessfullyCompleted()
               </Original>
@@ -7264,7 +7264,7 @@
         </Section>
         <OverallResults successes="10" failures="0" expectedFailures="0"/>
       </Section>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
         <Original>
           testCase.isOpen()
         </Original>
@@ -7272,7 +7272,7 @@
           true
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
         <Original>
           s1.isOpen()
         </Original>
@@ -7281,7 +7281,7 @@
         </Expanded>
       </Expression>
       <Section name="successfully close one section, then find another">
-        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
           <Original>
             s2.isOpen() == false
           </Original>
@@ -7289,7 +7289,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
           <Original>
             testCase.isComplete() == false
           </Original>
@@ -7298,7 +7298,7 @@
           </Expanded>
         </Expression>
         <Section name="Re-enter - skips S1 and enters S2">
-          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
             <Original>
               testCase2.isOpen()
             </Original>
@@ -7306,7 +7306,7 @@
               true
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
             <Original>
               s1b.isOpen() == false
             </Original>
@@ -7314,7 +7314,7 @@
               false == false
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
             <Original>
               s2b.isOpen()
             </Original>
@@ -7322,7 +7322,7 @@
               true
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
             <Original>
               ctx.completedCycle() == false
             </Original>
@@ -7331,7 +7331,7 @@
             </Expanded>
           </Expression>
           <Section name="fail S2">
-            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
               <Original>
                 ctx.completedCycle()
               </Original>
@@ -7339,7 +7339,7 @@
                 true
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
               <Original>
                 s2b.isComplete()
               </Original>
@@ -7347,7 +7347,7 @@
                 true
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
               <Original>
                 s2b.isSuccessfullyCompleted() == false
               </Original>
@@ -7355,7 +7355,7 @@
                 false == false
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
               <Original>
                 testCase2.isSuccessfullyCompleted() == false
               </Original>
@@ -7363,7 +7363,7 @@
                 false == false
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
               <Original>
                 testCase3.isOpen()
               </Original>
@@ -7371,7 +7371,7 @@
                 true
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
               <Original>
                 s1c.isOpen() == false
               </Original>
@@ -7379,7 +7379,7 @@
                 false == false
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
               <Original>
                 s2c.isOpen() == false
               </Original>
@@ -7387,7 +7387,7 @@
                 false == false
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
               <Original>
                 testCase3.isSuccessfullyCompleted()
               </Original>
@@ -7401,7 +7401,7 @@
         </Section>
         <OverallResults successes="14" failures="0" expectedFailures="0"/>
       </Section>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
         <Original>
           testCase.isOpen()
         </Original>
@@ -7409,7 +7409,7 @@
           true
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
         <Original>
           s1.isOpen()
         </Original>
@@ -7418,7 +7418,7 @@
         </Expanded>
       </Expression>
       <Section name="open a nested section">
-        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
           <Original>
             s2.isOpen()
           </Original>
@@ -7426,7 +7426,7 @@
             true
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
           <Original>
             s2.isComplete()
           </Original>
@@ -7434,7 +7434,7 @@
             true
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
           <Original>
             s1.isComplete() == false
           </Original>
@@ -7442,7 +7442,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
           <Original>
             s1.isComplete()
           </Original>
@@ -7450,7 +7450,7 @@
             true
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
           <Original>
             testCase.isComplete() == false
           </Original>
@@ -7458,7 +7458,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
           <Original>
             testCase.isComplete()
           </Original>
@@ -7468,7 +7468,7 @@
         </Expression>
         <OverallResults successes="6" failures="0" expectedFailures="0"/>
       </Section>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
         <Original>
           testCase.isOpen()
         </Original>
@@ -7476,7 +7476,7 @@
           true
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
         <Original>
           s1.isOpen()
         </Original>
@@ -7485,7 +7485,7 @@
         </Expanded>
       </Expression>
       <Section name="start a generator">
-        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
           <Original>
             g1.isOpen()
           </Original>
@@ -7493,7 +7493,7 @@
             true
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
           <Original>
             g1.index() == 0
           </Original>
@@ -7501,7 +7501,7 @@
             0 == 0
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
           <Original>
             g1.isComplete() == false
           </Original>
@@ -7509,7 +7509,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
           <Original>
             s1.isComplete() == false
           </Original>
@@ -7518,7 +7518,7 @@
           </Expanded>
         </Expression>
         <Section name="close outer section">
-          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
             <Original>
               s1.isComplete() == false
             </Original>
@@ -7526,7 +7526,7 @@
               false == false
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
             <Original>
               testCase.isSuccessfullyCompleted() == false
             </Original>
@@ -7535,7 +7535,7 @@
             </Expanded>
           </Expression>
           <Section name="Re-enter for second generation">
-            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
               <Original>
                 testCase2.isOpen()
               </Original>
@@ -7543,7 +7543,7 @@
                 true
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
               <Original>
                 s1b.isOpen()
               </Original>
@@ -7551,7 +7551,7 @@
                 true
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
               <Original>
                 g1b.isOpen()
               </Original>
@@ -7559,7 +7559,7 @@
                 true
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
               <Original>
                 g1b.index() == 1
               </Original>
@@ -7567,7 +7567,7 @@
                 1 == 1
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
               <Original>
                 s1.isComplete() == false
               </Original>
@@ -7575,7 +7575,7 @@
                 false == false
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
               <Original>
                 s1b.isComplete()
               </Original>
@@ -7583,7 +7583,7 @@
                 true
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
               <Original>
                 g1b.isComplete()
               </Original>
@@ -7591,7 +7591,7 @@
                 true
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
               <Original>
                 testCase2.isComplete()
               </Original>
@@ -7605,7 +7605,7 @@
         </Section>
         <OverallResults successes="14" failures="0" expectedFailures="0"/>
       </Section>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
         <Original>
           testCase.isOpen()
         </Original>
@@ -7613,7 +7613,7 @@
           true
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
         <Original>
           s1.isOpen()
         </Original>
@@ -7622,7 +7622,7 @@
         </Expanded>
       </Expression>
       <Section name="start a generator">
-        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
           <Original>
             g1.isOpen()
           </Original>
@@ -7630,7 +7630,7 @@
             true
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
           <Original>
             g1.index() == 0
           </Original>
@@ -7638,7 +7638,7 @@
             0 == 0
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
           <Original>
             g1.isComplete() == false
           </Original>
@@ -7646,7 +7646,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
           <Original>
             s1.isComplete() == false
           </Original>
@@ -7655,7 +7655,7 @@
           </Expanded>
         </Expression>
         <Section name="Start a new inner section">
-          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
             <Original>
               s2.isOpen()
             </Original>
@@ -7663,7 +7663,7 @@
               true
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
             <Original>
               s2.isComplete()
             </Original>
@@ -7671,7 +7671,7 @@
               true
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
             <Original>
               s1.isComplete() == false
             </Original>
@@ -7679,7 +7679,7 @@
               false == false
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
             <Original>
               testCase.isComplete() == false
             </Original>
@@ -7688,7 +7688,7 @@
             </Expanded>
           </Expression>
           <Section name="Re-enter for second generation">
-            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
               <Original>
                 testCase2.isOpen()
               </Original>
@@ -7696,7 +7696,7 @@
                 true
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
               <Original>
                 s1b.isOpen()
               </Original>
@@ -7704,7 +7704,7 @@
                 true
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
               <Original>
                 g1b.isOpen()
               </Original>
@@ -7712,7 +7712,7 @@
                 true
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
               <Original>
                 g1b.index() == 1
               </Original>
@@ -7720,7 +7720,7 @@
                 1 == 1
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
               <Original>
                 s2b.isOpen()
               </Original>
@@ -7728,7 +7728,7 @@
                 true
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
               <Original>
                 s2b.isComplete()
               </Original>
@@ -7736,7 +7736,7 @@
                 true
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
               <Original>
                 g1b.isComplete()
               </Original>
@@ -7744,7 +7744,7 @@
                 true
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
               <Original>
                 s1b.isComplete()
               </Original>
@@ -7752,7 +7752,7 @@
                 true
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
               <Original>
                 testCase2.isComplete()
               </Original>
@@ -7766,7 +7766,7 @@
         </Section>
         <OverallResults successes="17" failures="0" expectedFailures="0"/>
       </Section>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
         <Original>
           testCase.isOpen()
         </Original>
@@ -7774,7 +7774,7 @@
           true
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
         <Original>
           s1.isOpen()
         </Original>
@@ -7783,7 +7783,7 @@
         </Expanded>
       </Expression>
       <Section name="start a generator">
-        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
           <Original>
             g1.isOpen()
           </Original>
@@ -7791,7 +7791,7 @@
             true
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
           <Original>
             g1.index() == 0
           </Original>
@@ -7799,7 +7799,7 @@
             0 == 0
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
           <Original>
             g1.isComplete() == false
           </Original>
@@ -7807,7 +7807,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
           <Original>
             s1.isComplete() == false
           </Original>
@@ -7816,7 +7816,7 @@
           </Expanded>
         </Expression>
         <Section name="Fail an inner section">
-          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
             <Original>
               s2.isOpen()
             </Original>
@@ -7824,7 +7824,7 @@
               true
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
             <Original>
               s2.isComplete()
             </Original>
@@ -7832,7 +7832,7 @@
               true
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
             <Original>
               s2.isSuccessfullyCompleted() == false
             </Original>
@@ -7840,7 +7840,7 @@
               false == false
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
             <Original>
               s1.isComplete() == false
             </Original>
@@ -7848,7 +7848,7 @@
               false == false
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
             <Original>
               testCase.isComplete() == false
             </Original>
@@ -7857,7 +7857,7 @@
             </Expanded>
           </Expression>
           <Section name="Re-enter for second generation">
-            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
               <Original>
                 testCase2.isOpen()
               </Original>
@@ -7865,7 +7865,7 @@
                 true
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
               <Original>
                 s1b.isOpen()
               </Original>
@@ -7873,7 +7873,7 @@
                 true
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
               <Original>
                 g1b.isOpen()
               </Original>
@@ -7881,7 +7881,7 @@
                 true
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
               <Original>
                 g1b.index() == 0
               </Original>
@@ -7889,7 +7889,7 @@
                 0 == 0
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
               <Original>
                 s2b.isOpen() == false
               </Original>
@@ -7897,7 +7897,7 @@
                 false == false
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
               <Original>
                 g1b.isComplete() == false
               </Original>
@@ -7905,7 +7905,7 @@
                 false == false
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
               <Original>
                 s1b.isComplete() == false
               </Original>
@@ -7913,7 +7913,7 @@
                 false == false
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
               <Original>
                 testCase2.isComplete() == false
               </Original>
@@ -7921,7 +7921,7 @@
                 false == false
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
               <Original>
                 testCase3.isOpen()
               </Original>
@@ -7929,7 +7929,7 @@
                 true
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
               <Original>
                 s1c.isOpen()
               </Original>
@@ -7937,7 +7937,7 @@
                 true
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
               <Original>
                 g1c.isOpen()
               </Original>
@@ -7945,7 +7945,7 @@
                 true
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
               <Original>
                 g1c.index() == 1
               </Original>
@@ -7953,7 +7953,7 @@
                 1 == 1
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
               <Original>
                 s2c.isOpen()
               </Original>
@@ -7961,7 +7961,7 @@
                 true
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
               <Original>
                 s2c.isComplete()
               </Original>
@@ -7969,7 +7969,7 @@
                 true
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
               <Original>
                 g1c.isComplete()
               </Original>
@@ -7977,7 +7977,7 @@
                 true
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
               <Original>
                 s1c.isComplete()
               </Original>
@@ -7985,7 +7985,7 @@
                 true
               </Expanded>
             </Expression>
-            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/PartTrackerTests.cpp" >
               <Original>
                 testCase3.isComplete()
               </Original>
@@ -8002,13 +8002,13 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Unexpected exceptions can be translated">
-      <Exception filename="projects/SelfTest/ExceptionTests.cpp" >
+      <Exception filename="projects/<exe-name>/ExceptionTests.cpp" >
         3.14
       </Exception>
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="Use a custom approx">
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ApproxTests.cpp" >
         <Original>
           d == approx( 1.23 )
         </Original>
@@ -8016,7 +8016,7 @@
           1.23 == Approx( 1.23 )
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ApproxTests.cpp" >
         <Original>
           d == approx( 1.22 )
         </Original>
@@ -8024,7 +8024,7 @@
           1.23 == Approx( 1.22 )
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ApproxTests.cpp" >
         <Original>
           d == approx( 1.24 )
         </Original>
@@ -8032,7 +8032,7 @@
           1.23 == Approx( 1.24 )
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ApproxTests.cpp" >
         <Original>
           d != approx( 1.25 )
         </Original>
@@ -8040,7 +8040,7 @@
           1.23 != Approx( 1.25 )
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ApproxTests.cpp" >
         <Original>
           approx( d ) == 1.23
         </Original>
@@ -8048,7 +8048,7 @@
           Approx( 1.23 ) == 1.23
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ApproxTests.cpp" >
         <Original>
           approx( d ) == 1.22
         </Original>
@@ -8056,7 +8056,7 @@
           Approx( 1.23 ) == 1.22
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ApproxTests.cpp" >
         <Original>
           approx( d ) == 1.24
         </Original>
@@ -8064,7 +8064,7 @@
           Approx( 1.23 ) == 1.24
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ApproxTests.cpp" >
         <Original>
           approx( d ) != 1.25
         </Original>
@@ -8081,7 +8081,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="When checked exceptions are thrown they can be expected or unexpected">
-      <Expression success="true" type="REQUIRE_THROWS_AS" filename="projects/SelfTest/ExceptionTests.cpp" >
+      <Expression success="true" type="REQUIRE_THROWS_AS" filename="projects/<exe-name>/ExceptionTests.cpp" >
         <Original>
           thisThrows()
         </Original>
@@ -8089,7 +8089,7 @@
           thisThrows()
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE_NOTHROW" filename="projects/SelfTest/ExceptionTests.cpp" >
+      <Expression success="true" type="REQUIRE_NOTHROW" filename="projects/<exe-name>/ExceptionTests.cpp" >
         <Original>
           thisDoesntThrow()
         </Original>
@@ -8097,7 +8097,7 @@
           thisDoesntThrow()
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE_THROWS" filename="projects/SelfTest/ExceptionTests.cpp" >
+      <Expression success="true" type="REQUIRE_THROWS" filename="projects/<exe-name>/ExceptionTests.cpp" >
         <Original>
           thisThrows()
         </Original>
@@ -8108,48 +8108,48 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="When unchecked exceptions are thrown directly they are always failures">
-      <Exception filename="projects/SelfTest/ExceptionTests.cpp" >
+      <Exception filename="projects/<exe-name>/ExceptionTests.cpp" >
         unexpected exception
       </Exception>
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="When unchecked exceptions are thrown during a CHECK the test should abort and fail">
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/ExceptionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/ExceptionTests.cpp" >
         <Original>
           thisThrows() == 0
         </Original>
         <Expanded>
           thisThrows() == 0
         </Expanded>
-        <Exception filename="projects/SelfTest/ExceptionTests.cpp" >
+        <Exception filename="projects/<exe-name>/ExceptionTests.cpp" >
           expected exception
         </Exception>
       </Expression>
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="When unchecked exceptions are thrown during a REQUIRE the test should abort fail">
-      <Expression success="false" type="REQUIRE" filename="projects/SelfTest/ExceptionTests.cpp" >
+      <Expression success="false" type="REQUIRE" filename="projects/<exe-name>/ExceptionTests.cpp" >
         <Original>
           thisThrows() == 0
         </Original>
         <Expanded>
           thisThrows() == 0
         </Expanded>
-        <Exception filename="projects/SelfTest/ExceptionTests.cpp" >
+        <Exception filename="projects/<exe-name>/ExceptionTests.cpp" >
           expected exception
         </Exception>
       </Expression>
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="When unchecked exceptions are thrown from functions they are always failures">
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/ExceptionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/ExceptionTests.cpp" >
         <Original>
           thisThrows() == 0
         </Original>
         <Expanded>
           thisThrows() == 0
         </Expanded>
-        <Exception filename="projects/SelfTest/ExceptionTests.cpp" >
+        <Exception filename="projects/<exe-name>/ExceptionTests.cpp" >
           expected exception
         </Exception>
       </Expression>
@@ -8157,7 +8157,7 @@
     </TestCase>
     <TestCase name="When unchecked exceptions are thrown from sections they are always failures">
       <Section name="section name">
-        <Exception filename="projects/SelfTest/ExceptionTests.cpp" >
+        <Exception filename="projects/<exe-name>/ExceptionTests.cpp" >
           unexpected exception
         </Exception>
         <OverallResults successes="0" failures="1" expectedFailures="0"/>
@@ -8193,7 +8193,7 @@
     </TestCase>
     <TestCase name="XmlEncode">
       <Section name="normal string">
-        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/MiscTests.cpp" >
           <Original>
             encode( "normal string" ) == "normal string"
           </Original>
@@ -8204,7 +8204,7 @@
         <OverallResults successes="1" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="empty string">
-        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/MiscTests.cpp" >
           <Original>
             encode( "" ) == ""
           </Original>
@@ -8215,7 +8215,7 @@
         <OverallResults successes="1" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="string with ampersand">
-        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/MiscTests.cpp" >
           <Original>
             encode( "smith &amp; jones" ) == "smith &amp;amp; jones"
           </Original>
@@ -8226,7 +8226,7 @@
         <OverallResults successes="1" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="string with less-than">
-        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/MiscTests.cpp" >
           <Original>
             encode( "smith &lt; jones" ) == "smith &amp;lt; jones"
           </Original>
@@ -8237,7 +8237,7 @@
         <OverallResults successes="1" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="string with greater-than">
-        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/MiscTests.cpp" >
           <Original>
             encode( "smith > jones" ) == "smith > jones"
           </Original>
@@ -8245,7 +8245,7 @@
             "smith > jones" == "smith > jones"
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/MiscTests.cpp" >
           <Original>
             encode( "smith ]]&gt; jones" ) == "smith ]]&amp;gt; jones"
           </Original>
@@ -8258,7 +8258,7 @@
         <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="string with quotes">
-        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/MiscTests.cpp" >
           <Original>
             encode( stringWithQuotes ) == stringWithQuotes
           </Original>
@@ -8268,7 +8268,7 @@
 "don't "quote" me on that"
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/MiscTests.cpp" >
           <Original>
             encode( stringWithQuotes, Catch::XmlEncode::ForAttributes ) == "don't &amp;quot;quote&amp;quot; me on that"
           </Original>
@@ -8281,7 +8281,7 @@
         <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="string with control char (1)">
-        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/MiscTests.cpp" >
           <Original>
             encode( "[\x01]" ) == "[&amp;#x01;]"
           </Original>
@@ -8292,7 +8292,7 @@
         <OverallResults successes="1" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="string with control char (x7F)">
-        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/MiscTests.cpp" >
           <Original>
             encode( "[\x7F]" ) == "[&amp;#x7F;]"
           </Original>
@@ -8305,7 +8305,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="atomic if">
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/MiscTests.cpp" >
         <Original>
           x == 0
         </Original>
@@ -8316,7 +8316,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="boolean member">
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TrickyTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/TrickyTests.cpp" >
         <Original>
           obj.prop != 0
         </Original>
@@ -8327,7 +8327,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="checkedElse">
-      <Expression success="true" type="CHECKED_ELSE" filename="projects/SelfTest/MiscTests.cpp" >
+      <Expression success="true" type="CHECKED_ELSE" filename="projects/<exe-name>/MiscTests.cpp" >
         <Original>
           flag
         </Original>
@@ -8335,7 +8335,7 @@
           true
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/MiscTests.cpp" >
         <Original>
           testCheckedElse( true )
         </Original>
@@ -8346,7 +8346,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="checkedElse, failing">
-      <Expression success="false" type="CHECKED_ELSE" filename="projects/SelfTest/MiscTests.cpp" >
+      <Expression success="false" type="CHECKED_ELSE" filename="projects/<exe-name>/MiscTests.cpp" >
         <Original>
           flag
         </Original>
@@ -8354,7 +8354,7 @@
           false
         </Expanded>
       </Expression>
-      <Expression success="false" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" >
+      <Expression success="false" type="REQUIRE" filename="projects/<exe-name>/MiscTests.cpp" >
         <Original>
           testCheckedElse( false )
         </Original>
@@ -8365,7 +8365,7 @@
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="checkedIf">
-      <Expression success="true" type="CHECKED_IF" filename="projects/SelfTest/MiscTests.cpp" >
+      <Expression success="true" type="CHECKED_IF" filename="projects/<exe-name>/MiscTests.cpp" >
         <Original>
           flag
         </Original>
@@ -8373,7 +8373,7 @@
           true
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/MiscTests.cpp" >
         <Original>
           testCheckedIf( true )
         </Original>
@@ -8384,7 +8384,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="checkedIf, failing">
-      <Expression success="false" type="CHECKED_IF" filename="projects/SelfTest/MiscTests.cpp" >
+      <Expression success="false" type="CHECKED_IF" filename="projects/<exe-name>/MiscTests.cpp" >
         <Original>
           flag
         </Original>
@@ -8392,7 +8392,7 @@
           false
         </Expanded>
       </Expression>
-      <Expression success="false" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" >
+      <Expression success="false" type="REQUIRE" filename="projects/<exe-name>/MiscTests.cpp" >
         <Original>
           testCheckedIf( false )
         </Original>
@@ -8403,7 +8403,7 @@
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="comparisons between const int variables">
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           unsigned_char_var == 1
         </Original>
@@ -8411,7 +8411,7 @@
           1 == 1
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           unsigned_short_var == 1
         </Original>
@@ -8419,7 +8419,7 @@
           1 == 1
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           unsigned_int_var == 1
         </Original>
@@ -8427,7 +8427,7 @@
           1 == 1
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           unsigned_long_var == 1
         </Original>
@@ -8438,7 +8438,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="comparisons between int variables">
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           long_var == unsigned_char_var
         </Original>
@@ -8446,7 +8446,7 @@
           1 == 1
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           long_var == unsigned_short_var
         </Original>
@@ -8454,7 +8454,7 @@
           1 == 1
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           long_var == unsigned_int_var
         </Original>
@@ -8462,7 +8462,7 @@
           1 == 1
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           long_var == unsigned_long_var
         </Original>
@@ -8504,7 +8504,7 @@
     </TestCase>
     <TestCase name="looped SECTION tests">
       <Section name="s1" description="b is currently: 0">
-        <Expression success="false" type="CHECK" filename="projects/SelfTest/MiscTests.cpp" >
+        <Expression success="false" type="CHECK" filename="projects/<exe-name>/MiscTests.cpp" >
           <Original>
             b > a
           </Original>
@@ -8520,7 +8520,7 @@
       <Info>
         Testing if fib[0] (1) is even
       </Info>
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/MiscTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/MiscTests.cpp" >
         <Original>
           ( fib[i] % 2 ) == 0
         </Original>
@@ -8531,7 +8531,7 @@
       <Info>
         Testing if fib[1] (1) is even
       </Info>
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/MiscTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/MiscTests.cpp" >
         <Original>
           ( fib[i] % 2 ) == 0
         </Original>
@@ -8539,7 +8539,7 @@
           1 == 0
         </Expanded>
       </Expression>
-      <Expression success="true" type="CHECK" filename="projects/SelfTest/MiscTests.cpp" >
+      <Expression success="true" type="CHECK" filename="projects/<exe-name>/MiscTests.cpp" >
         <Original>
           ( fib[i] % 2 ) == 0
         </Original>
@@ -8550,7 +8550,7 @@
       <Info>
         Testing if fib[3] (3) is even
       </Info>
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/MiscTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/MiscTests.cpp" >
         <Original>
           ( fib[i] % 2 ) == 0
         </Original>
@@ -8561,7 +8561,7 @@
       <Info>
         Testing if fib[4] (5) is even
       </Info>
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/MiscTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/MiscTests.cpp" >
         <Original>
           ( fib[i] % 2 ) == 0
         </Original>
@@ -8569,7 +8569,7 @@
           1 == 0
         </Expanded>
       </Expression>
-      <Expression success="true" type="CHECK" filename="projects/SelfTest/MiscTests.cpp" >
+      <Expression success="true" type="CHECK" filename="projects/<exe-name>/MiscTests.cpp" >
         <Original>
           ( fib[i] % 2 ) == 0
         </Original>
@@ -8580,7 +8580,7 @@
       <Info>
         Testing if fib[6] (13) is even
       </Info>
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/MiscTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/MiscTests.cpp" >
         <Original>
           ( fib[i] % 2 ) == 0
         </Original>
@@ -8591,7 +8591,7 @@
       <Info>
         Testing if fib[7] (21) is even
       </Info>
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/MiscTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/<exe-name>/MiscTests.cpp" >
         <Original>
           ( fib[i] % 2 ) == 0
         </Original>
@@ -8604,7 +8604,7 @@
     <TestCase name="more nested SECTION tests">
       <Section name="s1" description="doesn't equal">
         <Section name="s2" description="equal">
-          <Expression success="false" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" >
+          <Expression success="false" type="REQUIRE" filename="projects/<exe-name>/MiscTests.cpp" >
             <Original>
               a == b
             </Original>
@@ -8618,7 +8618,7 @@
       </Section>
       <Section name="s1" description="doesn't equal">
         <Section name="s3" description="not equal">
-          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/MiscTests.cpp" >
             <Original>
               a != b
             </Original>
@@ -8632,7 +8632,7 @@
       </Section>
       <Section name="s1" description="doesn't equal">
         <Section name="s4" description="less than">
-          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/MiscTests.cpp" >
             <Original>
               a &lt; b
             </Original>
@@ -8648,7 +8648,7 @@
     </TestCase>
     <TestCase name="nested SECTION tests">
       <Section name="s1" description="doesn't equal">
-        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/MiscTests.cpp" >
           <Original>
             a != b
           </Original>
@@ -8656,7 +8656,7 @@
             1 != 2
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/MiscTests.cpp" >
           <Original>
             b != a
           </Original>
@@ -8665,7 +8665,7 @@
           </Expanded>
         </Expression>
         <Section name="s2" description="not equal">
-          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/MiscTests.cpp" >
             <Original>
               a != b
             </Original>
@@ -8680,7 +8680,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="non streamable - with conv. op">
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TrickyTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/TrickyTests.cpp" >
         <Original>
           s == "7"
         </Original>
@@ -8694,7 +8694,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="null strings">
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/MiscTests.cpp" >
         <Original>
           makeString( false ) != static_cast&lt;char*>(0)
         </Original>
@@ -8702,7 +8702,7 @@
           "valid string" != {null string}
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/MiscTests.cpp" >
         <Original>
           makeString( true ) == static_cast&lt;char*>(0)
         </Original>
@@ -8713,7 +8713,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="pair&lt;pair&lt;int,const char *,pair&lt;std::string,int> > -> toString">
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ToStringPair.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ToStringPair.cpp" >
         <Original>
           Catch::toString( pair ) == "{ { 42, \"Arthur\" }, { \"Ford\", 24 } }"
         </Original>
@@ -8726,7 +8726,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="pointer to class">
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TrickyTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/TrickyTests.cpp" >
         <Original>
           p == 0
         </Original>
@@ -8738,7 +8738,7 @@
     </TestCase>
     <TestCase name="random SECTION tests">
       <Section name="s1" description="doesn't equal">
-        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/MiscTests.cpp" >
           <Original>
             a != b
           </Original>
@@ -8746,7 +8746,7 @@
             1 != 2
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/MiscTests.cpp" >
           <Original>
             b != a
           </Original>
@@ -8757,7 +8757,7 @@
         <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="s2" description="not equal">
-        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/MiscTests.cpp" >
           <Original>
             a != b
           </Original>
@@ -8771,7 +8771,7 @@
     </TestCase>
     <TestCase name="replaceInPlace">
       <Section name="replace single char">
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/TestMain.cpp" >
           <Original>
             replaceInPlace( letters, "b", "z" )
           </Original>
@@ -8779,7 +8779,7 @@
             true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/TestMain.cpp" >
           <Original>
             letters == "azcdefcg"
           </Original>
@@ -8790,7 +8790,7 @@
         <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="replace two chars">
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/TestMain.cpp" >
           <Original>
             replaceInPlace( letters, "c", "z" )
           </Original>
@@ -8798,7 +8798,7 @@
             true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/TestMain.cpp" >
           <Original>
             letters == "abzdefzg"
           </Original>
@@ -8809,7 +8809,7 @@
         <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="replace first char">
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/TestMain.cpp" >
           <Original>
             replaceInPlace( letters, "a", "z" )
           </Original>
@@ -8817,7 +8817,7 @@
             true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/TestMain.cpp" >
           <Original>
             letters == "zbcdefcg"
           </Original>
@@ -8828,7 +8828,7 @@
         <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="replace last char">
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/TestMain.cpp" >
           <Original>
             replaceInPlace( letters, "g", "z" )
           </Original>
@@ -8836,7 +8836,7 @@
             true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/TestMain.cpp" >
           <Original>
             letters == "abcdefcz"
           </Original>
@@ -8847,7 +8847,7 @@
         <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="replace all chars">
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/TestMain.cpp" >
           <Original>
             replaceInPlace( letters, letters, "replaced" )
           </Original>
@@ -8855,7 +8855,7 @@
             true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/TestMain.cpp" >
           <Original>
             letters == "replaced"
           </Original>
@@ -8866,7 +8866,7 @@
         <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="replace no chars">
-        <Expression success="true" type="CHECK_FALSE" filename="projects/SelfTest/TestMain.cpp" >
+        <Expression success="true" type="CHECK_FALSE" filename="projects/<exe-name>/TestMain.cpp" >
           <Original>
             !replaceInPlace( letters, "x", "z" )
           </Original>
@@ -8874,7 +8874,7 @@
             !false
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/TestMain.cpp" >
           <Original>
             letters == letters
           </Original>
@@ -8885,7 +8885,7 @@
         <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="escape '">
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/TestMain.cpp" >
           <Original>
             replaceInPlace( s, "'", "|'" )
           </Original>
@@ -8893,7 +8893,7 @@
             true
           </Expanded>
         </Expression>
-        <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" >
+        <Expression success="true" type="CHECK" filename="projects/<exe-name>/TestMain.cpp" >
           <Original>
             s == "didn|'t"
           </Original>
@@ -8912,7 +8912,7 @@
       <Info>
         3
       </Info>
-      <Expression success="false" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" >
+      <Expression success="false" type="REQUIRE" filename="projects/<exe-name>/MiscTests.cpp" >
         <Original>
           false
         </Original>
@@ -8929,7 +8929,7 @@
       <Info>
         i := 7
       </Info>
-      <Expression success="false" type="REQUIRE" filename="projects/SelfTest/MessageTests.cpp" >
+      <Expression success="false" type="REQUIRE" filename="projects/<exe-name>/MessageTests.cpp" >
         <Original>
           false
         </Original>
@@ -8940,7 +8940,7 @@
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="std::pair&lt;int,const std::string> -> toString">
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ToStringPair.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ToStringPair.cpp" >
         <Original>
           Catch::toString(value) == "{ 34, \"xyzzy\" }"
         </Original>
@@ -8951,7 +8951,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="std::pair&lt;int,std::string> -> toString">
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ToStringPair.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ToStringPair.cpp" >
         <Original>
           Catch::toString( value ) == "{ 34, \"xyzzy\" }"
         </Original>
@@ -8962,7 +8962,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="std::vector&lt;std::pair&lt;std::string,int> > -> toString">
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ToStringPair.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ToStringPair.cpp" >
         <Original>
           Catch::toString( pr ) == "{ { \"green\", 55 } }"
         </Original>
@@ -8975,7 +8975,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="string literals of different sizes can be compared">
-      <Expression success="false" type="REQUIRE" filename="projects/SelfTest/TrickyTests.cpp" >
+      <Expression success="false" type="REQUIRE" filename="projects/<exe-name>/TrickyTests.cpp" >
         <Original>
           std::string( "first" ) == "second"
         </Original>
@@ -8986,7 +8986,7 @@
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="toString on const wchar_t const pointer returns the string contents">
-      <Expression success="true" type="CHECK" filename="projects/SelfTest/MiscTests.cpp" >
+      <Expression success="true" type="CHECK" filename="projects/<exe-name>/MiscTests.cpp" >
         <Original>
           result == "\"wide load\""
         </Original>
@@ -8997,7 +8997,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="toString on const wchar_t pointer returns the string contents">
-      <Expression success="true" type="CHECK" filename="projects/SelfTest/MiscTests.cpp" >
+      <Expression success="true" type="CHECK" filename="projects/<exe-name>/MiscTests.cpp" >
         <Original>
           result == "\"wide load\""
         </Original>
@@ -9008,7 +9008,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="toString on wchar_t const pointer returns the string contents">
-      <Expression success="true" type="CHECK" filename="projects/SelfTest/MiscTests.cpp" >
+      <Expression success="true" type="CHECK" filename="projects/<exe-name>/MiscTests.cpp" >
         <Original>
           result == "\"wide load\""
         </Original>
@@ -9019,7 +9019,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="toString on wchar_t returns the string contents">
-      <Expression success="true" type="CHECK" filename="projects/SelfTest/MiscTests.cpp" >
+      <Expression success="true" type="CHECK" filename="projects/<exe-name>/MiscTests.cpp" >
         <Original>
           result == "\"wide load\""
         </Original>
@@ -9030,7 +9030,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="toString( has_maker )">
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ToStringWhich.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ToStringWhich.cpp" >
         <Original>
           Catch::toString( item ) == "StringMaker&lt;has_maker>"
         </Original>
@@ -9043,7 +9043,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="toString( has_maker_and_toString )">
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ToStringWhich.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ToStringWhich.cpp" >
         <Original>
           Catch::toString( item ) == "toString( has_maker_and_toString )"
         </Original>
@@ -9056,7 +9056,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="toString( has_toString )">
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ToStringWhich.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ToStringWhich.cpp" >
         <Original>
           Catch::toString( item ) == "toString( has_toString )"
         </Original>
@@ -9069,7 +9069,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="toString( vectors&lt;has_maker )">
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ToStringWhich.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ToStringWhich.cpp" >
         <Original>
           Catch::toString( v ) == "{ StringMaker&lt;has_maker> }"
         </Original>
@@ -9082,7 +9082,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="toString( vectors&lt;has_maker_and_toString )">
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ToStringWhich.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ToStringWhich.cpp" >
         <Original>
           Catch::toString( v ) == "{ StringMaker&lt;has_maker_and_toString> }"
         </Original>
@@ -9095,7 +9095,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="toString( vectors&lt;has_toString )">
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ToStringWhich.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ToStringWhich.cpp" >
         <Original>
           Catch::toString( v ) == "{ {?} }"
         </Original>
@@ -9106,7 +9106,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="toString(enum w/operator&lt;&lt;)">
-      <Expression success="true" type="CHECK" filename="projects/SelfTest/EnumToString.cpp" >
+      <Expression success="true" type="CHECK" filename="projects/<exe-name>/EnumToString.cpp" >
         <Original>
           Catch::toString(e0) == "E2{0}"
         </Original>
@@ -9114,7 +9114,7 @@
           "E2{0}" == "E2{0}"
         </Expanded>
       </Expression>
-      <Expression success="true" type="CHECK" filename="projects/SelfTest/EnumToString.cpp" >
+      <Expression success="true" type="CHECK" filename="projects/<exe-name>/EnumToString.cpp" >
         <Original>
           Catch::toString(e1) == "E2{1}"
         </Original>
@@ -9125,7 +9125,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="toString(enum)">
-      <Expression success="true" type="CHECK" filename="projects/SelfTest/EnumToString.cpp" >
+      <Expression success="true" type="CHECK" filename="projects/<exe-name>/EnumToString.cpp" >
         <Original>
           Catch::toString(e0) == "0"
         </Original>
@@ -9133,7 +9133,7 @@
           "0" == "0"
         </Expanded>
       </Expression>
-      <Expression success="true" type="CHECK" filename="projects/SelfTest/EnumToString.cpp" >
+      <Expression success="true" type="CHECK" filename="projects/<exe-name>/EnumToString.cpp" >
         <Original>
           Catch::toString(e1) == "1"
         </Original>
@@ -9144,7 +9144,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="vec&lt;vec&lt;string,alloc>> -> toString">
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ToStringVector.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ToStringVector.cpp" >
         <Original>
           Catch::toString(v) == "{  }"
         </Original>
@@ -9152,7 +9152,7 @@
           "{  }" == "{  }"
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ToStringVector.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ToStringVector.cpp" >
         <Original>
           Catch::toString(v) == "{ { \"hello\" }, { \"world\" } }"
         </Original>
@@ -9165,7 +9165,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="vector&lt;int,allocator> -> toString">
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ToStringVector.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ToStringVector.cpp" >
         <Original>
           Catch::toString(vv) == "{  }"
         </Original>
@@ -9173,7 +9173,7 @@
           "{  }" == "{  }"
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ToStringVector.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ToStringVector.cpp" >
         <Original>
           Catch::toString(vv) == "{ 42 }"
         </Original>
@@ -9181,7 +9181,7 @@
           "{ 42 }" == "{ 42 }"
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ToStringVector.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ToStringVector.cpp" >
         <Original>
           Catch::toString(vv) == "{ 42, 250 }"
         </Original>
@@ -9192,7 +9192,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="vector&lt;int> -> toString">
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ToStringVector.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ToStringVector.cpp" >
         <Original>
           Catch::toString(vv) == "{  }"
         </Original>
@@ -9200,7 +9200,7 @@
           "{  }" == "{  }"
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ToStringVector.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ToStringVector.cpp" >
         <Original>
           Catch::toString(vv) == "{ 42 }"
         </Original>
@@ -9208,7 +9208,7 @@
           "{ 42 }" == "{ 42 }"
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ToStringVector.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ToStringVector.cpp" >
         <Original>
           Catch::toString(vv) == "{ 42, 250 }"
         </Original>
@@ -9219,7 +9219,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="vector&lt;string> -> toString">
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ToStringVector.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ToStringVector.cpp" >
         <Original>
           Catch::toString(vv) == "{  }"
         </Original>
@@ -9227,7 +9227,7 @@
           "{  }" == "{  }"
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ToStringVector.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ToStringVector.cpp" >
         <Original>
           Catch::toString(vv) == "{ \"hello\" }"
         </Original>
@@ -9235,7 +9235,7 @@
           "{ "hello" }" == "{ "hello" }"
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ToStringVector.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ToStringVector.cpp" >
         <Original>
           Catch::toString(vv) == "{ \"hello\", \"world\" }"
         </Original>
@@ -9248,7 +9248,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="vectors can be sized and resized">
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/MiscTests.cpp" >
         <Original>
           v.size() == 5
         </Original>
@@ -9256,7 +9256,7 @@
           5 == 5
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/MiscTests.cpp" >
         <Original>
           v.capacity() >= 5
         </Original>
@@ -9265,7 +9265,7 @@
         </Expanded>
       </Expression>
       <Section name="resizing bigger changes size and capacity">
-        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/MiscTests.cpp" >
           <Original>
             v.size() == 10
           </Original>
@@ -9273,7 +9273,7 @@
             10 == 10
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/MiscTests.cpp" >
           <Original>
             v.capacity() >= 10
           </Original>
@@ -9283,7 +9283,7 @@
         </Expression>
         <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/MiscTests.cpp" >
         <Original>
           v.size() == 5
         </Original>
@@ -9291,7 +9291,7 @@
           5 == 5
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/MiscTests.cpp" >
         <Original>
           v.capacity() >= 5
         </Original>
@@ -9300,7 +9300,7 @@
         </Expanded>
       </Expression>
       <Section name="resizing smaller changes size but not capacity">
-        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/MiscTests.cpp" >
           <Original>
             v.size() == 0
           </Original>
@@ -9308,7 +9308,7 @@
             0 == 0
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/MiscTests.cpp" >
           <Original>
             v.capacity() >= 5
           </Original>
@@ -9317,7 +9317,7 @@
           </Expanded>
         </Expression>
         <Section name="We can use the 'swap trick' to reset the capacity">
-          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" >
+          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/MiscTests.cpp" >
             <Original>
               v.capacity() == 0
             </Original>
@@ -9329,7 +9329,7 @@
         </Section>
         <OverallResults successes="3" failures="0" expectedFailures="0"/>
       </Section>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/MiscTests.cpp" >
         <Original>
           v.size() == 5
         </Original>
@@ -9337,7 +9337,7 @@
           5 == 5
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/MiscTests.cpp" >
         <Original>
           v.capacity() >= 5
         </Original>
@@ -9346,7 +9346,7 @@
         </Expanded>
       </Expression>
       <Section name="reserving bigger changes capacity but not size">
-        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/MiscTests.cpp" >
           <Original>
             v.size() == 5
           </Original>
@@ -9354,7 +9354,7 @@
             5 == 5
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/MiscTests.cpp" >
           <Original>
             v.capacity() >= 10
           </Original>
@@ -9364,7 +9364,7 @@
         </Expression>
         <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/MiscTests.cpp" >
         <Original>
           v.size() == 5
         </Original>
@@ -9372,7 +9372,7 @@
           5 == 5
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/MiscTests.cpp" >
         <Original>
           v.capacity() >= 5
         </Original>
@@ -9381,7 +9381,7 @@
         </Expanded>
       </Expression>
       <Section name="reserving smaller does not change size or capacity">
-        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/MiscTests.cpp" >
           <Original>
             v.size() == 5
           </Original>
@@ -9389,7 +9389,7 @@
             5 == 5
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" >
+        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/MiscTests.cpp" >
           <Original>
             v.capacity() >= 5
           </Original>