From d4e5f184369ce34592bb6f89e793bdb22d1d011a Mon Sep 17 00:00:00 2001
From: Phil Nash <github@philnash.me>
Date: Mon, 8 Sep 2014 08:14:22 +0100
Subject: [PATCH] Merged group name commit from develop

---
 include/catch_runner.hpp                      |    4 +-
 .../SelfTest/Baselines/junit.sw.approved.txt  |    2 +-
 .../SelfTest/Baselines/xml.sw.approved.txt    | 1402 ++++++++---------
 3 files changed, 704 insertions(+), 704 deletions(-)

diff --git a/include/catch_runner.hpp b/include/catch_runner.hpp
index 42069b9f..e6303d88 100644
--- a/include/catch_runner.hpp
+++ b/include/catch_runner.hpp
@@ -37,7 +37,7 @@ namespace Catch {
 
             Totals totals;
 
-            context.testGroupStarting( "", 1, 1 ); // deprecated?
+            context.testGroupStarting( "all tests", 1, 1 ); // deprecated?
 
             TestSpec testSpec = m_config->testSpec();
             if( !testSpec.hasFilters() )
@@ -60,7 +60,7 @@ namespace Catch {
                     m_testsAlreadyRun.insert( *it );
                 }
             }
-            context.testGroupEnded( "", totals, 1, 1 );
+            context.testGroupEnded( "all tests", totals, 1, 1 );
             return totals;
         }
 
diff --git a/projects/SelfTest/Baselines/junit.sw.approved.txt b/projects/SelfTest/Baselines/junit.sw.approved.txt
index 450c09fe..d0e29857 100644
--- a/projects/SelfTest/Baselines/junit.sw.approved.txt
+++ b/projects/SelfTest/Baselines/junit.sw.approved.txt
@@ -1,5 +1,5 @@
 <testsuites>
-  <testsuite errors="12" failures="87" tests="729" hostname="tbd" time="{duration}" timestamp="tbd">
+  <testsuite name="all tests" errors="12" failures="87" tests="729" hostname="tbd" time="{duration}" timestamp="tbd">
     <testcase classname="global" name="Some simple comparisons between doubles" time="{duration}"/>
     <testcase classname="global" name="Approximate comparisons with different epsilons" time="{duration}"/>
     <testcase classname="global" name="Approximate comparisons with floats" time="{duration}"/>
diff --git a/projects/SelfTest/Baselines/xml.sw.approved.txt b/projects/SelfTest/Baselines/xml.sw.approved.txt
index 1789cb2e..498f899e 100644
--- a/projects/SelfTest/Baselines/xml.sw.approved.txt
+++ b/projects/SelfTest/Baselines/xml.sw.approved.txt
@@ -1,7 +1,7 @@
 <Catch name="CatchSelfTest">
-  <Group>
+  <Group name="all tests">
     <TestCase name="Some simple comparisons between doubles">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ApproxTests.cpp" >
         <Original>
           d == Approx( 1.23 )
         </Original>
@@ -9,7 +9,7 @@
           1.23 == Approx( 1.23 )
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ApproxTests.cpp" >
         <Original>
           d != Approx( 1.22 )
         </Original>
@@ -17,7 +17,7 @@
           1.23 != Approx( 1.22 )
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ApproxTests.cpp" >
         <Original>
           d != Approx( 1.24 )
         </Original>
@@ -25,7 +25,7 @@
           1.23 != Approx( 1.24 )
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ApproxTests.cpp" >
         <Original>
           Approx( d ) == 1.23
         </Original>
@@ -33,7 +33,7 @@
           Approx( 1.23 ) == 1.23
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ApproxTests.cpp" >
         <Original>
           Approx( d ) != 1.22
         </Original>
@@ -41,7 +41,7 @@
           Approx( 1.23 ) != 1.22
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ApproxTests.cpp" >
         <Original>
           Approx( d ) != 1.24
         </Original>
@@ -52,7 +52,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Approximate comparisons with different epsilons">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ApproxTests.cpp" >
         <Original>
           d != Approx( 1.231 )
         </Original>
@@ -60,7 +60,7 @@
           1.23 != Approx( 1.231 )
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ApproxTests.cpp" >
         <Original>
           d == Approx( 1.231 ).epsilon( 0.1 )
         </Original>
@@ -71,7 +71,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Approximate comparisons with floats">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ApproxTests.cpp" >
         <Original>
           1.23f == Approx( 1.23f )
         </Original>
@@ -79,7 +79,7 @@
           1.23f == Approx( 1.2300000191 )
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ApproxTests.cpp" >
         <Original>
           0.0f == Approx( 0.0f )
         </Original>
@@ -90,7 +90,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Approximate comparisons with ints">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ApproxTests.cpp" >
         <Original>
           1 == Approx( 1 )
         </Original>
@@ -98,7 +98,7 @@
           1 == Approx( 1.0 )
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ApproxTests.cpp" >
         <Original>
           0 == Approx( 0 )
         </Original>
@@ -109,7 +109,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Approximate comparisons with mixed numeric types">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ApproxTests.cpp" >
         <Original>
           1.0f == Approx( 1 )
         </Original>
@@ -117,7 +117,7 @@
           1.0f == Approx( 1.0 )
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ApproxTests.cpp" >
         <Original>
           0 == Approx( dZero)
         </Original>
@@ -125,7 +125,7 @@
           0 == Approx( 0.0 )
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ApproxTests.cpp" >
         <Original>
           0 == Approx( dSmall ).epsilon( 0.001 )
         </Original>
@@ -133,7 +133,7 @@
           0 == Approx( 0.00001 )
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ApproxTests.cpp" >
         <Original>
           1.234f == Approx( dMedium )
         </Original>
@@ -141,7 +141,7 @@
           1.234f == Approx( 1.234 )
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ApproxTests.cpp" >
         <Original>
           dMedium == Approx( 1.234f )
         </Original>
@@ -152,7 +152,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Use a custom approx">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ApproxTests.cpp" >
         <Original>
           d == approx( 1.23 )
         </Original>
@@ -160,7 +160,7 @@
           1.23 == Approx( 1.23 )
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ApproxTests.cpp" >
         <Original>
           d == approx( 1.22 )
         </Original>
@@ -168,7 +168,7 @@
           1.23 == Approx( 1.22 )
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ApproxTests.cpp" >
         <Original>
           d == approx( 1.24 )
         </Original>
@@ -176,7 +176,7 @@
           1.23 == Approx( 1.24 )
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ApproxTests.cpp" >
         <Original>
           d != approx( 1.25 )
         </Original>
@@ -184,7 +184,7 @@
           1.23 != Approx( 1.25 )
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ApproxTests.cpp" >
         <Original>
           approx( d ) == 1.23
         </Original>
@@ -192,7 +192,7 @@
           Approx( 1.23 ) == 1.23
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ApproxTests.cpp" >
         <Original>
           approx( d ) == 1.22
         </Original>
@@ -200,7 +200,7 @@
           Approx( 1.23 ) == 1.22
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ApproxTests.cpp" >
         <Original>
           approx( d ) == 1.24
         </Original>
@@ -208,7 +208,7 @@
           Approx( 1.23 ) == 1.24
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ApproxTests.cpp" >
         <Original>
           approx( d ) != 1.25
         </Original>
@@ -219,7 +219,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Approximate PI">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ApproxTests.cpp" >
         <Original>
           divide( 22, 7 ) == Approx( 3.141 ).epsilon( 0.001 )
         </Original>
@@ -227,7 +227,7 @@
           3.1428571429 == Approx( 3.141 )
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ApproxTests.cpp" >
         <Original>
           divide( 22, 7 ) != Approx( 3.141 ).epsilon( 0.0001 )
         </Original>
@@ -238,7 +238,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="A METHOD_AS_TEST_CASE based test run that succeeds">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ClassTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ClassTests.cpp" >
         <Original>
           s == &quot;hello&quot;
         </Original>
@@ -249,7 +249,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="A METHOD_AS_TEST_CASE based test run that fails">
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ClassTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ClassTests.cpp" >
         <Original>
           s == &quot;world&quot;
         </Original>
@@ -260,7 +260,7 @@
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="A TEST_CASE_METHOD based test run that succeeds">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ClassTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ClassTests.cpp" >
         <Original>
           m_a == 1
         </Original>
@@ -271,7 +271,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="A TEST_CASE_METHOD based test run that fails">
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ClassTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ClassTests.cpp" >
         <Original>
           m_a == 2
         </Original>
@@ -282,7 +282,7 @@
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="Equality checks that should succeed">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.int_seven == 7
         </Original>
@@ -290,7 +290,7 @@
           7 == 7
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.float_nine_point_one == Approx( 9.1f )
         </Original>
@@ -298,7 +298,7 @@
           9.1f == Approx( 9.1000003815 )
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.double_pi == Approx( 3.1415926535 )
         </Original>
@@ -306,7 +306,7 @@
           3.1415926535 == Approx( 3.1415926535 )
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.str_hello == &quot;hello&quot;
         </Original>
@@ -314,7 +314,7 @@
           &quot;hello&quot; == &quot;hello&quot;
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           &quot;hello&quot; == data.str_hello
         </Original>
@@ -322,7 +322,7 @@
           &quot;hello&quot; == &quot;hello&quot;
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.str_hello.size() == 5
         </Original>
@@ -330,7 +330,7 @@
           5 == 5
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           x == Approx( 1.3 )
         </Original>
@@ -341,7 +341,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Equality checks that should fail">
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.int_seven == 6
         </Original>
@@ -349,7 +349,7 @@
           7 == 6
         </Expanded>
       </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.int_seven == 8
         </Original>
@@ -357,7 +357,7 @@
           7 == 8
         </Expanded>
       </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.int_seven == 0
         </Original>
@@ -365,7 +365,7 @@
           7 == 0
         </Expanded>
       </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.float_nine_point_one == Approx( 9.11f )
         </Original>
@@ -373,7 +373,7 @@
           9.1f == Approx( 9.1099996567 )
         </Expanded>
       </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.float_nine_point_one == Approx( 9.0f )
         </Original>
@@ -381,7 +381,7 @@
           9.1f == Approx( 9.0 )
         </Expanded>
       </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.float_nine_point_one == Approx( 1 )
         </Original>
@@ -389,7 +389,7 @@
           9.1f == Approx( 1.0 )
         </Expanded>
       </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.float_nine_point_one == Approx( 0 )
         </Original>
@@ -397,7 +397,7 @@
           9.1f == Approx( 0.0 )
         </Expanded>
       </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.double_pi == Approx( 3.1415 )
         </Original>
@@ -405,7 +405,7 @@
           3.1415926535 == Approx( 3.1415 )
         </Expanded>
       </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.str_hello == &quot;goodbye&quot;
         </Original>
@@ -413,7 +413,7 @@
           &quot;hello&quot; == &quot;goodbye&quot;
         </Expanded>
       </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.str_hello == &quot;hell&quot;
         </Original>
@@ -421,7 +421,7 @@
           &quot;hello&quot; == &quot;hell&quot;
         </Expanded>
       </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.str_hello == &quot;hello1&quot;
         </Original>
@@ -429,7 +429,7 @@
           &quot;hello&quot; == &quot;hello1&quot;
         </Expanded>
       </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.str_hello.size() == 6
         </Original>
@@ -437,7 +437,7 @@
           5 == 6
         </Expanded>
       </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           x == Approx( 1.301 )
         </Original>
@@ -448,7 +448,7 @@
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="Inequality checks that should succeed">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.int_seven != 6
         </Original>
@@ -456,7 +456,7 @@
           7 != 6
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.int_seven != 8
         </Original>
@@ -464,7 +464,7 @@
           7 != 8
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.float_nine_point_one != Approx( 9.11f )
         </Original>
@@ -472,7 +472,7 @@
           9.1f != Approx( 9.1099996567 )
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.float_nine_point_one != Approx( 9.0f )
         </Original>
@@ -480,7 +480,7 @@
           9.1f != Approx( 9.0 )
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.float_nine_point_one != Approx( 1 )
         </Original>
@@ -488,7 +488,7 @@
           9.1f != Approx( 1.0 )
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.float_nine_point_one != Approx( 0 )
         </Original>
@@ -496,7 +496,7 @@
           9.1f != Approx( 0.0 )
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.double_pi != Approx( 3.1415 )
         </Original>
@@ -504,7 +504,7 @@
           3.1415926535 != Approx( 3.1415 )
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.str_hello != &quot;goodbye&quot;
         </Original>
@@ -512,7 +512,7 @@
           &quot;hello&quot; != &quot;goodbye&quot;
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.str_hello != &quot;hell&quot;
         </Original>
@@ -520,7 +520,7 @@
           &quot;hello&quot; != &quot;hell&quot;
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.str_hello != &quot;hello1&quot;
         </Original>
@@ -528,7 +528,7 @@
           &quot;hello&quot; != &quot;hello1&quot;
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.str_hello.size() != 6
         </Original>
@@ -539,7 +539,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Inequality checks that should fail">
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.int_seven != 7
         </Original>
@@ -547,7 +547,7 @@
           7 != 7
         </Expanded>
       </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.float_nine_point_one != Approx( 9.1f )
         </Original>
@@ -555,7 +555,7 @@
           9.1f != Approx( 9.1000003815 )
         </Expanded>
       </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.double_pi != Approx( 3.1415926535 )
         </Original>
@@ -563,7 +563,7 @@
           3.1415926535 != Approx( 3.1415926535 )
         </Expanded>
       </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.str_hello != &quot;hello&quot;
         </Original>
@@ -571,7 +571,7 @@
           &quot;hello&quot; != &quot;hello&quot;
         </Expanded>
       </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.str_hello.size() != 5
         </Original>
@@ -582,7 +582,7 @@
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="Ordering comparison checks that should succeed">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.int_seven &lt; 8
         </Original>
@@ -590,7 +590,7 @@
           7 &lt; 8
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.int_seven > 6
         </Original>
@@ -598,7 +598,7 @@
           7 > 6
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.int_seven > 0
         </Original>
@@ -606,7 +606,7 @@
           7 > 0
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.int_seven > -1
         </Original>
@@ -614,7 +614,7 @@
           7 > -1
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.int_seven >= 7
         </Original>
@@ -622,7 +622,7 @@
           7 >= 7
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.int_seven >= 6
         </Original>
@@ -630,7 +630,7 @@
           7 >= 6
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.int_seven &lt;= 7
         </Original>
@@ -638,7 +638,7 @@
           7 &lt;= 7
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.int_seven &lt;= 8
         </Original>
@@ -646,7 +646,7 @@
           7 &lt;= 8
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.float_nine_point_one > 9
         </Original>
@@ -654,7 +654,7 @@
           9.1f > 9
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.float_nine_point_one &lt; 10
         </Original>
@@ -662,7 +662,7 @@
           9.1f &lt; 10
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.float_nine_point_one &lt; 9.2
         </Original>
@@ -670,7 +670,7 @@
           9.1f &lt; 9.2
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.str_hello &lt;= &quot;hello&quot;
         </Original>
@@ -678,7 +678,7 @@
           &quot;hello&quot; &lt;= &quot;hello&quot;
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.str_hello >= &quot;hello&quot;
         </Original>
@@ -686,7 +686,7 @@
           &quot;hello&quot; >= &quot;hello&quot;
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.str_hello &lt; &quot;hellp&quot;
         </Original>
@@ -694,7 +694,7 @@
           &quot;hello&quot; &lt; &quot;hellp&quot;
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.str_hello &lt; &quot;zebra&quot;
         </Original>
@@ -702,7 +702,7 @@
           &quot;hello&quot; &lt; &quot;zebra&quot;
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.str_hello > &quot;hellm&quot;
         </Original>
@@ -710,7 +710,7 @@
           &quot;hello&quot; > &quot;hellm&quot;
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.str_hello > &quot;a&quot;
         </Original>
@@ -721,7 +721,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Ordering comparison checks that should fail">
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.int_seven > 7
         </Original>
@@ -729,7 +729,7 @@
           7 > 7
         </Expanded>
       </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.int_seven &lt; 7
         </Original>
@@ -737,7 +737,7 @@
           7 &lt; 7
         </Expanded>
       </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.int_seven > 8
         </Original>
@@ -745,7 +745,7 @@
           7 > 8
         </Expanded>
       </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.int_seven &lt; 6
         </Original>
@@ -753,7 +753,7 @@
           7 &lt; 6
         </Expanded>
       </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.int_seven &lt; 0
         </Original>
@@ -761,7 +761,7 @@
           7 &lt; 0
         </Expanded>
       </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.int_seven &lt; -1
         </Original>
@@ -769,7 +769,7 @@
           7 &lt; -1
         </Expanded>
       </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.int_seven >= 8
         </Original>
@@ -777,7 +777,7 @@
           7 >= 8
         </Expanded>
       </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.int_seven &lt;= 6
         </Original>
@@ -785,7 +785,7 @@
           7 &lt;= 6
         </Expanded>
       </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.float_nine_point_one &lt; 9
         </Original>
@@ -793,7 +793,7 @@
           9.1f &lt; 9
         </Expanded>
       </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.float_nine_point_one > 10
         </Original>
@@ -801,7 +801,7 @@
           9.1f > 10
         </Expanded>
       </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.float_nine_point_one > 9.2
         </Original>
@@ -809,7 +809,7 @@
           9.1f > 9.2
         </Expanded>
       </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.str_hello > &quot;hello&quot;
         </Original>
@@ -817,7 +817,7 @@
           &quot;hello&quot; > &quot;hello&quot;
         </Expanded>
       </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.str_hello &lt; &quot;hello&quot;
         </Original>
@@ -825,7 +825,7 @@
           &quot;hello&quot; &lt; &quot;hello&quot;
         </Expanded>
       </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.str_hello > &quot;hellp&quot;
         </Original>
@@ -833,7 +833,7 @@
           &quot;hello&quot; > &quot;hellp&quot;
         </Expanded>
       </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.str_hello > &quot;z&quot;
         </Original>
@@ -841,7 +841,7 @@
           &quot;hello&quot; > &quot;z&quot;
         </Expanded>
       </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.str_hello &lt; &quot;hellm&quot;
         </Original>
@@ -849,7 +849,7 @@
           &quot;hello&quot; &lt; &quot;hellm&quot;
         </Expanded>
       </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.str_hello &lt; &quot;a&quot;
         </Original>
@@ -857,7 +857,7 @@
           &quot;hello&quot; &lt; &quot;a&quot;
         </Expanded>
       </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.str_hello >= &quot;z&quot;
         </Original>
@@ -865,7 +865,7 @@
           &quot;hello&quot; >= &quot;z&quot;
         </Expanded>
       </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.str_hello &lt;= &quot;a&quot;
         </Original>
@@ -876,7 +876,7 @@
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="Comparisons with int literals don't warn when mixing signed/ unsigned">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           i == 1
         </Original>
@@ -884,7 +884,7 @@
           1 == 1
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           ui == 2
         </Original>
@@ -892,7 +892,7 @@
           2 == 2
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           l == 3
         </Original>
@@ -900,7 +900,7 @@
           3 == 3
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           ul == 4
         </Original>
@@ -908,7 +908,7 @@
           4 == 4
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           c == 5
         </Original>
@@ -916,7 +916,7 @@
           5 == 5
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           uc == 6
         </Original>
@@ -924,7 +924,7 @@
           6 == 6
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           1 == i
         </Original>
@@ -932,7 +932,7 @@
           1 == 1
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           2 == ui
         </Original>
@@ -940,7 +940,7 @@
           2 == 2
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           3 == l
         </Original>
@@ -948,7 +948,7 @@
           3 == 3
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           4 == ul
         </Original>
@@ -956,7 +956,7 @@
           4 == 4
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           5 == c
         </Original>
@@ -964,7 +964,7 @@
           5 == 5
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           6 == uc
         </Original>
@@ -972,7 +972,7 @@
           6 == 6
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           (std::numeric_limits&lt;unsigned long>::max)() > ul
         </Original>
@@ -983,7 +983,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="comparisons between int variables">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           long_var == unsigned_char_var
         </Original>
@@ -991,7 +991,7 @@
           1 == 1
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           long_var == unsigned_short_var
         </Original>
@@ -999,7 +999,7 @@
           1 == 1
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           long_var == unsigned_int_var
         </Original>
@@ -1007,7 +1007,7 @@
           1 == 1
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           long_var == unsigned_long_var
         </Original>
@@ -1018,7 +1018,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="comparisons between const int variables">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           unsigned_char_var == 1
         </Original>
@@ -1026,7 +1026,7 @@
           1 == 1
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           unsigned_short_var == 1
         </Original>
@@ -1034,7 +1034,7 @@
           1 == 1
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           unsigned_int_var == 1
         </Original>
@@ -1042,7 +1042,7 @@
           1 == 1
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           unsigned_long_var == 1
         </Original>
@@ -1053,7 +1053,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Comparisons between unsigned ints and negative signed ints match c++ standard behaviour">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           ( -1 > 2u )
         </Original>
@@ -1061,7 +1061,7 @@
           true
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           -1 > 2u
         </Original>
@@ -1069,7 +1069,7 @@
           -1 > 2
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           ( 2u &lt; -1 )
         </Original>
@@ -1077,7 +1077,7 @@
           true
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           2u &lt; -1
         </Original>
@@ -1085,7 +1085,7 @@
           2 &lt; -1
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           ( minInt > 2u )
         </Original>
@@ -1093,7 +1093,7 @@
           true
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           minInt > 2u
         </Original>
@@ -1104,7 +1104,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Comparisons between ints where one side is computed">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           54 == 6*9
         </Original>
@@ -1115,7 +1115,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Pointers can be compared to null">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           p == __null
         </Original>
@@ -1123,7 +1123,7 @@
           __null == 0
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           p == pNULL
         </Original>
@@ -1131,7 +1131,7 @@
           __null == __null
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           p != __null
         </Original>
@@ -1139,7 +1139,7 @@
           0x<hex digits> != 0
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           cp != __null
         </Original>
@@ -1147,7 +1147,7 @@
           0x<hex digits> != 0
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           cpc != __null
         </Original>
@@ -1155,7 +1155,7 @@
           0x<hex digits> != 0
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           returnsNull() == __null
         </Original>
@@ -1163,7 +1163,7 @@
           {null string} == 0
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           returnsConstNull() == __null
         </Original>
@@ -1171,7 +1171,7 @@
           {null string} == 0
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           __null != p
         </Original>
@@ -1182,7 +1182,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="'Not' checks that should succeed">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           false == false
         </Original>
@@ -1190,7 +1190,7 @@
           false == false
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           true == true
         </Original>
@@ -1198,7 +1198,7 @@
           true == true
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           !false
         </Original>
@@ -1206,7 +1206,7 @@
           true
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           !false
         </Original>
@@ -1214,7 +1214,7 @@
           !false
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           !falseValue
         </Original>
@@ -1222,7 +1222,7 @@
           true
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           !falseValue
         </Original>
@@ -1230,7 +1230,7 @@
           !false
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           !(1 == 2)
         </Original>
@@ -1238,7 +1238,7 @@
           true
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           !1 == 2
         </Original>
@@ -1249,7 +1249,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="'Not' checks that should fail">
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           false != false
         </Original>
@@ -1257,7 +1257,7 @@
           false != false
         </Expanded>
       </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           true != true
         </Original>
@@ -1265,7 +1265,7 @@
           true != true
         </Expanded>
       </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           !true
         </Original>
@@ -1273,7 +1273,7 @@
           false
         </Expanded>
       </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           !true
         </Original>
@@ -1281,7 +1281,7 @@
           !true
         </Expanded>
       </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           !trueValue
         </Original>
@@ -1289,7 +1289,7 @@
           false
         </Expanded>
       </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           !trueValue
         </Original>
@@ -1297,7 +1297,7 @@
           !true
         </Expanded>
       </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           !(1 == 1)
         </Original>
@@ -1305,7 +1305,7 @@
           false
         </Expanded>
       </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           !1 == 1
         </Original>
@@ -1316,7 +1316,7 @@
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="When checked exceptions are thrown they can be expected or unexpected">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ExceptionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ExceptionTests.cpp" >
         <Original>
           thisThrows()
         </Original>
@@ -1324,7 +1324,7 @@
           thisThrows()
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ExceptionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ExceptionTests.cpp" >
         <Original>
           thisDoesntThrow()
         </Original>
@@ -1332,7 +1332,7 @@
           thisDoesntThrow()
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ExceptionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ExceptionTests.cpp" >
         <Original>
           thisThrows()
         </Original>
@@ -1343,18 +1343,18 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Expected exceptions that don't throw or unexpected exceptions fail the test">
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ExceptionTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ExceptionTests.cpp" >
         <Original>
           thisThrows()
         </Original>
         <Expanded>
           thisThrows()
         </Expanded>
-        <Exception filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ExceptionTests.cpp" >
+        <Exception filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ExceptionTests.cpp" >
           expected exception
         </Exception>
       </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ExceptionTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ExceptionTests.cpp" >
         <Original>
           thisDoesntThrow()
         </Original>
@@ -1362,27 +1362,27 @@
           thisDoesntThrow()
         </Expanded>
       </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ExceptionTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ExceptionTests.cpp" >
         <Original>
           thisThrows()
         </Original>
         <Expanded>
           thisThrows()
         </Expanded>
-        <Exception filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ExceptionTests.cpp" >
+        <Exception filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ExceptionTests.cpp" >
           expected exception
         </Exception>
       </Expression>
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="When unchecked exceptions are thrown directly they are always failures">
-      <Exception filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ExceptionTests.cpp" >
+      <Exception filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ExceptionTests.cpp" >
         unexpected exception
       </Exception>
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="An unchecked exception reports the line of the last assertion">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ExceptionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ExceptionTests.cpp" >
         <Original>
           1 == 1
         </Original>
@@ -1390,14 +1390,14 @@
           1 == 1
         </Expanded>
       </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ExceptionTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ExceptionTests.cpp" >
         <Original>
           {Unknown expression after the reported line}
         </Original>
         <Expanded>
           {Unknown expression after the reported line}
         </Expanded>
-        <Exception filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ExceptionTests.cpp" >
+        <Exception filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ExceptionTests.cpp" >
           unexpected exception
         </Exception>
       </Expression>
@@ -1405,7 +1405,7 @@
     </TestCase>
     <TestCase name="When unchecked exceptions are thrown from sections they are always failures">
       <Section name="section name">
-        <Exception filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ExceptionTests.cpp" >
+        <Exception filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ExceptionTests.cpp" >
           unexpected exception
         </Exception>
         <OverallResults successes="0" failures="1" expectedFailures="0"/>
@@ -1413,42 +1413,42 @@
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="When unchecked exceptions are thrown from functions they are always failures">
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ExceptionTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ExceptionTests.cpp" >
         <Original>
           thisThrows() == 0
         </Original>
         <Expanded>
           thisThrows() == 0
         </Expanded>
-        <Exception filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ExceptionTests.cpp" >
+        <Exception filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/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" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ExceptionTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ExceptionTests.cpp" >
         <Original>
           thisThrows() == 0
         </Original>
         <Expanded>
           thisThrows() == 0
         </Expanded>
-        <Exception filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ExceptionTests.cpp" >
+        <Exception filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ExceptionTests.cpp" >
           expected exception
         </Exception>
       </Expression>
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="When unchecked exceptions are thrown during a CHECK the test should abort and fail">
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ExceptionTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ExceptionTests.cpp" >
         <Original>
           thisThrows() == 0
         </Original>
         <Expanded>
           thisThrows() == 0
         </Expanded>
-        <Exception filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ExceptionTests.cpp" >
+        <Exception filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ExceptionTests.cpp" >
           expected exception
         </Exception>
       </Expression>
@@ -1458,47 +1458,47 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Unexpected custom exceptions can be translated">
-      <Exception filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ExceptionTests.cpp" >
+      <Exception filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ExceptionTests.cpp" >
         custom exception
       </Exception>
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="Custom exceptions can be translated when testing for nothrow">
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ExceptionTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ExceptionTests.cpp" >
         <Original>
           throwCustom()
         </Original>
         <Expanded>
           throwCustom()
         </Expanded>
-        <Exception filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ExceptionTests.cpp" >
+        <Exception filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/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" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ExceptionTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ExceptionTests.cpp" >
         <Original>
           throwCustom()
         </Original>
         <Expanded>
           throwCustom()
         </Expanded>
-        <Exception filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ExceptionTests.cpp" >
+        <Exception filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ExceptionTests.cpp" >
           custom exception - not std
         </Exception>
       </Expression>
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="Unexpected exceptions can be translated">
-      <Exception filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ExceptionTests.cpp" >
+      <Exception filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ExceptionTests.cpp" >
         3.14
       </Exception>
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="NotImplemented exception">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ExceptionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ExceptionTests.cpp" >
         <Original>
           thisFunctionNotImplemented( 7 )
         </Original>
@@ -1509,7 +1509,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Generators over two ranges">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -1517,7 +1517,7 @@
           2 == 2
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -1525,7 +1525,7 @@
           200 == 200
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -1533,7 +1533,7 @@
           4 == 4
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -1541,7 +1541,7 @@
           200 == 200
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -1549,7 +1549,7 @@
           6 == 6
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -1557,7 +1557,7 @@
           200 == 200
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -1565,7 +1565,7 @@
           8 == 8
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -1573,7 +1573,7 @@
           200 == 200
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -1581,7 +1581,7 @@
           10 == 10
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -1589,7 +1589,7 @@
           200 == 200
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -1597,7 +1597,7 @@
           30 == 30
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -1605,7 +1605,7 @@
           200 == 200
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -1613,7 +1613,7 @@
           40 == 40
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -1621,7 +1621,7 @@
           200 == 200
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -1629,7 +1629,7 @@
           42 == 42
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -1637,7 +1637,7 @@
           200 == 200
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -1645,7 +1645,7 @@
           72 == 72
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -1653,7 +1653,7 @@
           200 == 200
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -1661,7 +1661,7 @@
           2 == 2
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -1669,7 +1669,7 @@
           202 == 202
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -1677,7 +1677,7 @@
           4 == 4
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -1685,7 +1685,7 @@
           202 == 202
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -1693,7 +1693,7 @@
           6 == 6
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -1701,7 +1701,7 @@
           202 == 202
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -1709,7 +1709,7 @@
           8 == 8
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -1717,7 +1717,7 @@
           202 == 202
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -1725,7 +1725,7 @@
           10 == 10
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -1733,7 +1733,7 @@
           202 == 202
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -1741,7 +1741,7 @@
           30 == 30
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -1749,7 +1749,7 @@
           202 == 202
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -1757,7 +1757,7 @@
           40 == 40
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -1765,7 +1765,7 @@
           202 == 202
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -1773,7 +1773,7 @@
           42 == 42
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -1781,7 +1781,7 @@
           202 == 202
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -1789,7 +1789,7 @@
           72 == 72
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -1797,7 +1797,7 @@
           202 == 202
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -1805,7 +1805,7 @@
           2 == 2
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -1813,7 +1813,7 @@
           204 == 204
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -1821,7 +1821,7 @@
           4 == 4
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -1829,7 +1829,7 @@
           204 == 204
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -1837,7 +1837,7 @@
           6 == 6
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -1845,7 +1845,7 @@
           204 == 204
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -1853,7 +1853,7 @@
           8 == 8
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -1861,7 +1861,7 @@
           204 == 204
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -1869,7 +1869,7 @@
           10 == 10
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -1877,7 +1877,7 @@
           204 == 204
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -1885,7 +1885,7 @@
           30 == 30
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -1893,7 +1893,7 @@
           204 == 204
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -1901,7 +1901,7 @@
           40 == 40
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -1909,7 +1909,7 @@
           204 == 204
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -1917,7 +1917,7 @@
           42 == 42
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -1925,7 +1925,7 @@
           204 == 204
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -1933,7 +1933,7 @@
           72 == 72
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -1941,7 +1941,7 @@
           204 == 204
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -1949,7 +1949,7 @@
           2 == 2
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -1957,7 +1957,7 @@
           206 == 206
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -1965,7 +1965,7 @@
           4 == 4
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -1973,7 +1973,7 @@
           206 == 206
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -1981,7 +1981,7 @@
           6 == 6
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -1989,7 +1989,7 @@
           206 == 206
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -1997,7 +1997,7 @@
           8 == 8
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -2005,7 +2005,7 @@
           206 == 206
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -2013,7 +2013,7 @@
           10 == 10
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -2021,7 +2021,7 @@
           206 == 206
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -2029,7 +2029,7 @@
           30 == 30
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -2037,7 +2037,7 @@
           206 == 206
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -2045,7 +2045,7 @@
           40 == 40
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -2053,7 +2053,7 @@
           206 == 206
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -2061,7 +2061,7 @@
           42 == 42
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -2069,7 +2069,7 @@
           206 == 206
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -2077,7 +2077,7 @@
           72 == 72
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -2085,7 +2085,7 @@
           206 == 206
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -2093,7 +2093,7 @@
           2 == 2
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -2101,7 +2101,7 @@
           208 == 208
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -2109,7 +2109,7 @@
           4 == 4
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -2117,7 +2117,7 @@
           208 == 208
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -2125,7 +2125,7 @@
           6 == 6
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -2133,7 +2133,7 @@
           208 == 208
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -2141,7 +2141,7 @@
           8 == 8
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -2149,7 +2149,7 @@
           208 == 208
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -2157,7 +2157,7 @@
           10 == 10
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -2165,7 +2165,7 @@
           208 == 208
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -2173,7 +2173,7 @@
           30 == 30
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -2181,7 +2181,7 @@
           208 == 208
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -2189,7 +2189,7 @@
           40 == 40
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -2197,7 +2197,7 @@
           208 == 208
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -2205,7 +2205,7 @@
           42 == 42
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -2213,7 +2213,7 @@
           208 == 208
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -2221,7 +2221,7 @@
           72 == 72
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -2229,7 +2229,7 @@
           208 == 208
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -2237,7 +2237,7 @@
           2 == 2
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -2245,7 +2245,7 @@
           210 == 210
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -2253,7 +2253,7 @@
           4 == 4
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -2261,7 +2261,7 @@
           210 == 210
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -2269,7 +2269,7 @@
           6 == 6
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -2277,7 +2277,7 @@
           210 == 210
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -2285,7 +2285,7 @@
           8 == 8
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -2293,7 +2293,7 @@
           210 == 210
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -2301,7 +2301,7 @@
           10 == 10
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -2309,7 +2309,7 @@
           210 == 210
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -2317,7 +2317,7 @@
           30 == 30
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -2325,7 +2325,7 @@
           210 == 210
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -2333,7 +2333,7 @@
           40 == 40
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -2341,7 +2341,7 @@
           210 == 210
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -2349,7 +2349,7 @@
           42 == 42
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -2357,7 +2357,7 @@
           210 == 210
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -2365,7 +2365,7 @@
           72 == 72
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -2373,7 +2373,7 @@
           210 == 210
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -2381,7 +2381,7 @@
           2 == 2
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -2389,7 +2389,7 @@
           212 == 212
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -2397,7 +2397,7 @@
           4 == 4
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -2405,7 +2405,7 @@
           212 == 212
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -2413,7 +2413,7 @@
           6 == 6
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -2421,7 +2421,7 @@
           212 == 212
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -2429,7 +2429,7 @@
           8 == 8
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -2437,7 +2437,7 @@
           212 == 212
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -2445,7 +2445,7 @@
           10 == 10
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -2453,7 +2453,7 @@
           212 == 212
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -2461,7 +2461,7 @@
           30 == 30
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -2469,7 +2469,7 @@
           212 == 212
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -2477,7 +2477,7 @@
           40 == 40
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -2485,7 +2485,7 @@
           212 == 212
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -2493,7 +2493,7 @@
           42 == 42
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -2501,7 +2501,7 @@
           212 == 212
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -2509,7 +2509,7 @@
           72 == 72
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -2517,7 +2517,7 @@
           212 == 212
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -2525,7 +2525,7 @@
           2 == 2
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -2533,7 +2533,7 @@
           214 == 214
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -2541,7 +2541,7 @@
           4 == 4
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -2549,7 +2549,7 @@
           214 == 214
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -2557,7 +2557,7 @@
           6 == 6
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -2565,7 +2565,7 @@
           214 == 214
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -2573,7 +2573,7 @@
           8 == 8
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -2581,7 +2581,7 @@
           214 == 214
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -2589,7 +2589,7 @@
           10 == 10
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -2597,7 +2597,7 @@
           214 == 214
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -2605,7 +2605,7 @@
           30 == 30
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -2613,7 +2613,7 @@
           214 == 214
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -2621,7 +2621,7 @@
           40 == 40
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -2629,7 +2629,7 @@
           214 == 214
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -2637,7 +2637,7 @@
           42 == 42
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -2645,7 +2645,7 @@
           214 == 214
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -2653,7 +2653,7 @@
           72 == 72
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -2664,7 +2664,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Generator over a range of pairs">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           i->first == i->second-1
         </Original>
@@ -2672,7 +2672,7 @@
           0 == 0
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/GeneratorTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/GeneratorTests.cpp" >
         <Original>
           i->first == i->second-1
         </Original>
@@ -2701,7 +2701,7 @@
       <Info>
         so should this
       </Info>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MessageTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MessageTests.cpp" >
         <Original>
           a == 1
         </Original>
@@ -2712,7 +2712,7 @@
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="INFO gets logged on failure, even if captured before successful assertions">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MessageTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MessageTests.cpp" >
         <Original>
           a == 2
         </Original>
@@ -2723,7 +2723,7 @@
       <Info>
         this message should be logged
       </Info>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MessageTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MessageTests.cpp" >
         <Original>
           a == 1
         </Original>
@@ -2734,7 +2734,7 @@
       <Info>
         and this, but later
       </Info>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MessageTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MessageTests.cpp" >
         <Original>
           a == 0
         </Original>
@@ -2742,7 +2742,7 @@
           2 == 0
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MessageTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MessageTests.cpp" >
         <Original>
           a == 2
         </Original>
@@ -2790,7 +2790,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="SCOPED_INFO is reset for each loop">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MessageTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MessageTests.cpp" >
         <Original>
           i &lt; 10
         </Original>
@@ -2798,7 +2798,7 @@
           0 &lt; 10
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MessageTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MessageTests.cpp" >
         <Original>
           i &lt; 10
         </Original>
@@ -2806,7 +2806,7 @@
           1 &lt; 10
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MessageTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MessageTests.cpp" >
         <Original>
           i &lt; 10
         </Original>
@@ -2814,7 +2814,7 @@
           2 &lt; 10
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MessageTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MessageTests.cpp" >
         <Original>
           i &lt; 10
         </Original>
@@ -2822,7 +2822,7 @@
           3 &lt; 10
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MessageTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MessageTests.cpp" >
         <Original>
           i &lt; 10
         </Original>
@@ -2830,7 +2830,7 @@
           4 &lt; 10
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MessageTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MessageTests.cpp" >
         <Original>
           i &lt; 10
         </Original>
@@ -2838,7 +2838,7 @@
           5 &lt; 10
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MessageTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MessageTests.cpp" >
         <Original>
           i &lt; 10
         </Original>
@@ -2846,7 +2846,7 @@
           6 &lt; 10
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MessageTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MessageTests.cpp" >
         <Original>
           i &lt; 10
         </Original>
@@ -2854,7 +2854,7 @@
           7 &lt; 10
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MessageTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MessageTests.cpp" >
         <Original>
           i &lt; 10
         </Original>
@@ -2862,7 +2862,7 @@
           8 &lt; 10
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MessageTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MessageTests.cpp" >
         <Original>
           i &lt; 10
         </Original>
@@ -2876,7 +2876,7 @@
       <Info>
         i := 10
       </Info>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MessageTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MessageTests.cpp" >
         <Original>
           i &lt; 10
         </Original>
@@ -2887,7 +2887,7 @@
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="The NO_FAIL macro reports a failure but does not fail the test">
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MessageTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MessageTests.cpp" >
         <Original>
           1 == 2
         </Original>
@@ -2913,7 +2913,7 @@
       <Info>
         i := 7
       </Info>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MessageTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MessageTests.cpp" >
         <Original>
           false
         </Original>
@@ -2934,7 +2934,7 @@
     </TestCase>
     <TestCase name="random SECTION tests">
       <Section name="s1" description="doesn't equal">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MiscTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MiscTests.cpp" >
           <Original>
             a != b
           </Original>
@@ -2942,7 +2942,7 @@
             1 != 2
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MiscTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MiscTests.cpp" >
           <Original>
             b != a
           </Original>
@@ -2953,7 +2953,7 @@
         <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="s2" description="not equal">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MiscTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MiscTests.cpp" >
           <Original>
             a != b
           </Original>
@@ -2967,7 +2967,7 @@
     </TestCase>
     <TestCase name="nested SECTION tests">
       <Section name="s1" description="doesn't equal">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MiscTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MiscTests.cpp" >
           <Original>
             a != b
           </Original>
@@ -2975,7 +2975,7 @@
             1 != 2
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MiscTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MiscTests.cpp" >
           <Original>
             b != a
           </Original>
@@ -2984,7 +2984,7 @@
           </Expanded>
         </Expression>
         <Section name="s2" description="not equal">
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MiscTests.cpp" >
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MiscTests.cpp" >
             <Original>
               a != b
             </Original>
@@ -3001,7 +3001,7 @@
     <TestCase name="more nested SECTION tests">
       <Section name="s1" description="doesn't equal">
         <Section name="s2" description="equal">
-          <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MiscTests.cpp" >
+          <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MiscTests.cpp" >
             <Original>
               a == b
             </Original>
@@ -3035,7 +3035,7 @@
     </TestCase>
     <TestCase name="looped SECTION tests">
       <Section name="s1" description="b is currently: 0">
-        <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MiscTests.cpp" >
+        <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MiscTests.cpp" >
           <Original>
             b > a
           </Original>
@@ -3051,7 +3051,7 @@
       <Info>
         Testing if fib[0] (1) is even
       </Info>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MiscTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MiscTests.cpp" >
         <Original>
           ( fib[i] % 2 ) == 0
         </Original>
@@ -3062,7 +3062,7 @@
       <Info>
         Testing if fib[1] (1) is even
       </Info>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MiscTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MiscTests.cpp" >
         <Original>
           ( fib[i] % 2 ) == 0
         </Original>
@@ -3070,7 +3070,7 @@
           1 == 0
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MiscTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MiscTests.cpp" >
         <Original>
           ( fib[i] % 2 ) == 0
         </Original>
@@ -3081,7 +3081,7 @@
       <Info>
         Testing if fib[3] (3) is even
       </Info>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MiscTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MiscTests.cpp" >
         <Original>
           ( fib[i] % 2 ) == 0
         </Original>
@@ -3092,7 +3092,7 @@
       <Info>
         Testing if fib[4] (5) is even
       </Info>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MiscTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MiscTests.cpp" >
         <Original>
           ( fib[i] % 2 ) == 0
         </Original>
@@ -3100,7 +3100,7 @@
           1 == 0
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MiscTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MiscTests.cpp" >
         <Original>
           ( fib[i] % 2 ) == 0
         </Original>
@@ -3111,7 +3111,7 @@
       <Info>
         Testing if fib[6] (13) is even
       </Info>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MiscTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MiscTests.cpp" >
         <Original>
           ( fib[i] % 2 ) == 0
         </Original>
@@ -3122,7 +3122,7 @@
       <Info>
         Testing if fib[7] (21) is even
       </Info>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MiscTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MiscTests.cpp" >
         <Original>
           ( fib[i] % 2 ) == 0
         </Original>
@@ -3136,7 +3136,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="null strings">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MiscTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MiscTests.cpp" >
         <Original>
           makeString( false ) != static_cast&lt;char*>(__null)
         </Original>
@@ -3144,7 +3144,7 @@
           &quot;valid string&quot; != {null string}
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MiscTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MiscTests.cpp" >
         <Original>
           makeString( true ) == static_cast&lt;char*>(__null)
         </Original>
@@ -3155,7 +3155,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="checkedIf">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MiscTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MiscTests.cpp" >
         <Original>
           flag
         </Original>
@@ -3163,7 +3163,7 @@
           true
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MiscTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MiscTests.cpp" >
         <Original>
           testCheckedIf( true )
         </Original>
@@ -3174,7 +3174,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="checkedIf, failing">
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MiscTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MiscTests.cpp" >
         <Original>
           flag
         </Original>
@@ -3182,7 +3182,7 @@
           false
         </Expanded>
       </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MiscTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MiscTests.cpp" >
         <Original>
           testCheckedIf( false )
         </Original>
@@ -3193,7 +3193,7 @@
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="checkedElse">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MiscTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MiscTests.cpp" >
         <Original>
           flag
         </Original>
@@ -3201,7 +3201,7 @@
           true
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MiscTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MiscTests.cpp" >
         <Original>
           testCheckedElse( true )
         </Original>
@@ -3212,7 +3212,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="checkedElse, failing">
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MiscTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MiscTests.cpp" >
         <Original>
           flag
         </Original>
@@ -3220,7 +3220,7 @@
           false
         </Expanded>
       </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MiscTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MiscTests.cpp" >
         <Original>
           testCheckedElse( false )
         </Original>
@@ -3243,7 +3243,7 @@
       <Info>
         3
       </Info>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MiscTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MiscTests.cpp" >
         <Original>
           false
         </Original>
@@ -3254,7 +3254,7 @@
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="atomic if">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MiscTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MiscTests.cpp" >
         <Original>
           x == 0
         </Original>
@@ -3265,7 +3265,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="String matchers">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MiscTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MiscTests.cpp" >
         <Original>
           testStringForMatching() Contains( &quot;string&quot; )
         </Original>
@@ -3273,7 +3273,7 @@
           &quot;this string contains 'abc' as a substring&quot; contains: &quot;string&quot;
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MiscTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MiscTests.cpp" >
         <Original>
           testStringForMatching() Contains( &quot;abc&quot; )
         </Original>
@@ -3281,7 +3281,7 @@
           &quot;this string contains 'abc' as a substring&quot; contains: &quot;abc&quot;
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MiscTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MiscTests.cpp" >
         <Original>
           testStringForMatching() StartsWith( &quot;this&quot; )
         </Original>
@@ -3289,7 +3289,7 @@
           &quot;this string contains 'abc' as a substring&quot; starts with: &quot;this&quot;
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MiscTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MiscTests.cpp" >
         <Original>
           testStringForMatching() EndsWith( &quot;substring&quot; )
         </Original>
@@ -3300,7 +3300,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Contains string matcher">
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MiscTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MiscTests.cpp" >
         <Original>
           testStringForMatching() Contains( &quot;not there&quot; )
         </Original>
@@ -3311,7 +3311,7 @@
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="StartsWith string matcher">
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MiscTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MiscTests.cpp" >
         <Original>
           testStringForMatching() StartsWith( &quot;string&quot; )
         </Original>
@@ -3322,7 +3322,7 @@
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="EndsWith string matcher">
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MiscTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MiscTests.cpp" >
         <Original>
           testStringForMatching() EndsWith( &quot;this&quot; )
         </Original>
@@ -3333,7 +3333,7 @@
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="Equals string matcher">
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MiscTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MiscTests.cpp" >
         <Original>
           testStringForMatching() Equals( &quot;something else&quot; )
         </Original>
@@ -3344,7 +3344,7 @@
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="Equals string matcher, with NULL">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MiscTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MiscTests.cpp" >
         <Original>
           &quot;&quot; Equals(__null)
         </Original>
@@ -3355,7 +3355,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="AllOf matcher">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MiscTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MiscTests.cpp" >
         <Original>
           testStringForMatching() AllOf( Catch::Contains( &quot;string&quot; ), Catch::Contains( &quot;abc&quot; ) )
         </Original>
@@ -3366,7 +3366,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="AnyOf matcher">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MiscTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MiscTests.cpp" >
         <Original>
           testStringForMatching() AnyOf( Catch::Contains( &quot;string&quot; ), Catch::Contains( &quot;not there&quot; ) )
         </Original>
@@ -3374,7 +3374,7 @@
           &quot;this string contains 'abc' as a substring&quot; ( contains: &quot;string&quot; or contains: &quot;not there&quot; )
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MiscTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MiscTests.cpp" >
         <Original>
           testStringForMatching() AnyOf( Catch::Contains( &quot;not there&quot; ), Catch::Contains( &quot;string&quot; ) )
         </Original>
@@ -3385,7 +3385,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Equals">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MiscTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MiscTests.cpp" >
         <Original>
           testStringForMatching() Equals( &quot;this string contains 'abc' as a substring&quot; )
         </Original>
@@ -3396,7 +3396,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Factorials are computed">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MiscTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MiscTests.cpp" >
         <Original>
           Factorial(0) == 1
         </Original>
@@ -3404,7 +3404,7 @@
           1 == 1
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MiscTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MiscTests.cpp" >
         <Original>
           Factorial(1) == 1
         </Original>
@@ -3412,7 +3412,7 @@
           1 == 1
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MiscTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MiscTests.cpp" >
         <Original>
           Factorial(2) == 2
         </Original>
@@ -3420,7 +3420,7 @@
           2 == 2
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MiscTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MiscTests.cpp" >
         <Original>
           Factorial(3) == 6
         </Original>
@@ -3428,7 +3428,7 @@
           6 == 6
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MiscTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MiscTests.cpp" >
         <Original>
           Factorial(10) == 3628800
         </Original>
@@ -3454,7 +3454,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="vectors can be sized and resized">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MiscTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MiscTests.cpp" >
         <Original>
           v.size() == 5
         </Original>
@@ -3462,7 +3462,7 @@
           5 == 5
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MiscTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MiscTests.cpp" >
         <Original>
           v.capacity() >= 5
         </Original>
@@ -3471,7 +3471,7 @@
         </Expanded>
       </Expression>
       <Section name="resizing bigger changes size and capacity">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MiscTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MiscTests.cpp" >
           <Original>
             v.size() == 10
           </Original>
@@ -3479,7 +3479,7 @@
             10 == 10
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MiscTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MiscTests.cpp" >
           <Original>
             v.capacity() >= 10
           </Original>
@@ -3489,7 +3489,7 @@
         </Expression>
         <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MiscTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MiscTests.cpp" >
         <Original>
           v.size() == 5
         </Original>
@@ -3497,7 +3497,7 @@
           5 == 5
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MiscTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MiscTests.cpp" >
         <Original>
           v.capacity() >= 5
         </Original>
@@ -3506,7 +3506,7 @@
         </Expanded>
       </Expression>
       <Section name="resizing smaller changes size but not capacity">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MiscTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MiscTests.cpp" >
           <Original>
             v.size() == 0
           </Original>
@@ -3514,7 +3514,7 @@
             0 == 0
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MiscTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MiscTests.cpp" >
           <Original>
             v.capacity() >= 5
           </Original>
@@ -3523,7 +3523,7 @@
           </Expanded>
         </Expression>
         <Section name="We can use the 'swap trick' to reset the capacity">
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MiscTests.cpp" >
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MiscTests.cpp" >
             <Original>
               v.capacity() == 0
             </Original>
@@ -3535,7 +3535,7 @@
         </Section>
         <OverallResults successes="3" failures="0" expectedFailures="0"/>
       </Section>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MiscTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MiscTests.cpp" >
         <Original>
           v.size() == 5
         </Original>
@@ -3543,7 +3543,7 @@
           5 == 5
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MiscTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MiscTests.cpp" >
         <Original>
           v.capacity() >= 5
         </Original>
@@ -3552,7 +3552,7 @@
         </Expanded>
       </Expression>
       <Section name="reserving bigger changes capacity but not size">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MiscTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MiscTests.cpp" >
           <Original>
             v.size() == 5
           </Original>
@@ -3560,7 +3560,7 @@
             5 == 5
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MiscTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MiscTests.cpp" >
           <Original>
             v.capacity() >= 10
           </Original>
@@ -3570,7 +3570,7 @@
         </Expression>
         <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MiscTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MiscTests.cpp" >
         <Original>
           v.size() == 5
         </Original>
@@ -3578,7 +3578,7 @@
           5 == 5
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MiscTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MiscTests.cpp" >
         <Original>
           v.capacity() >= 5
         </Original>
@@ -3587,7 +3587,7 @@
         </Expanded>
       </Expression>
       <Section name="reserving smaller does not change size or capacity">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MiscTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MiscTests.cpp" >
           <Original>
             v.size() == 5
           </Original>
@@ -3595,7 +3595,7 @@
             5 == 5
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MiscTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MiscTests.cpp" >
           <Original>
             v.capacity() >= 5
           </Original>
@@ -3623,7 +3623,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Tabs and newlines show in output">
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MiscTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MiscTests.cpp" >
         <Original>
           s1 == s2
         </Original>
@@ -3641,7 +3641,7 @@
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="toString on const wchar_t const pointer returns the string contents">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MiscTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MiscTests.cpp" >
         <Original>
           result == &quot;\&quot;wide load\&quot;&quot;
         </Original>
@@ -3652,7 +3652,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="toString on const wchar_t pointer returns the string contents">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MiscTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MiscTests.cpp" >
         <Original>
           result == &quot;\&quot;wide load\&quot;&quot;
         </Original>
@@ -3663,7 +3663,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="toString on wchar_t const pointer returns the string contents">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MiscTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MiscTests.cpp" >
         <Original>
           result == &quot;\&quot;wide load\&quot;&quot;
         </Original>
@@ -3674,7 +3674,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="toString on wchar_t returns the string contents">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/MiscTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/MiscTests.cpp" >
         <Original>
           result == &quot;\&quot;wide load\&quot;&quot;
         </Original>
@@ -3686,7 +3686,7 @@
     </TestCase>
     <TestCase name="Process can be configured on command line">
       <Section name="default - no arguments">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TestMain.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TestMain.cpp" >
           <Original>
             parseIntoConfig( argv, config )
           </Original>
@@ -3694,7 +3694,7 @@
             parseIntoConfig( argv, config )
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TestMain.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TestMain.cpp" >
           <Original>
             config.shouldDebugBreak == false
           </Original>
@@ -3702,7 +3702,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TestMain.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TestMain.cpp" >
           <Original>
             config.abortAfter == -1
           </Original>
@@ -3710,7 +3710,7 @@
             -1 == -1
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TestMain.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TestMain.cpp" >
           <Original>
             config.noThrow == false
           </Original>
@@ -3718,7 +3718,7 @@
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TestMain.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TestMain.cpp" >
           <Original>
             config.reporterName.empty()
           </Original>
@@ -3730,7 +3730,7 @@
       </Section>
       <Section name="test lists">
         <Section name="1 test" description="Specify one test case using">
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TestMain.cpp" >
             <Original>
               parseIntoConfig( argv, config )
             </Original>
@@ -3738,7 +3738,7 @@
               parseIntoConfig( argv, config )
             </Expanded>
           </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TestMain.cpp" >
             <Original>
               cfg.testSpec().matches( fakeTestCase( &quot;notIncluded&quot; ) ) == false
             </Original>
@@ -3746,7 +3746,7 @@
               false == false
             </Expanded>
           </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TestMain.cpp" >
             <Original>
               cfg.testSpec().matches( fakeTestCase( &quot;test1&quot; ) )
             </Original>
@@ -3760,7 +3760,7 @@
       </Section>
       <Section name="test lists">
         <Section name="Specify one test case exclusion using exclude:">
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TestMain.cpp" >
             <Original>
               parseIntoConfig( argv, config )
             </Original>
@@ -3768,7 +3768,7 @@
               parseIntoConfig( argv, config )
             </Expanded>
           </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TestMain.cpp" >
             <Original>
               cfg.testSpec().matches( fakeTestCase( &quot;test1&quot; ) ) == false
             </Original>
@@ -3776,7 +3776,7 @@
               false == false
             </Expanded>
           </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TestMain.cpp" >
             <Original>
               cfg.testSpec().matches( fakeTestCase( &quot;alwaysIncluded&quot; ) )
             </Original>
@@ -3790,7 +3790,7 @@
       </Section>
       <Section name="test lists">
         <Section name="Specify one test case exclusion using ~">
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TestMain.cpp" >
             <Original>
               parseIntoConfig( argv, config )
             </Original>
@@ -3798,7 +3798,7 @@
               parseIntoConfig( argv, config )
             </Expanded>
           </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TestMain.cpp" >
             <Original>
               cfg.testSpec().matches( fakeTestCase( &quot;test1&quot; ) ) == false
             </Original>
@@ -3806,7 +3806,7 @@
               false == false
             </Expanded>
           </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TestMain.cpp" >
             <Original>
               cfg.testSpec().matches( fakeTestCase( &quot;alwaysIncluded&quot; ) )
             </Original>
@@ -3820,7 +3820,7 @@
       </Section>
       <Section name="reporter">
         <Section name="-r/console">
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TestMain.cpp" >
             <Original>
               parseIntoConfig( argv, config )
             </Original>
@@ -3828,7 +3828,7 @@
               parseIntoConfig( argv, config )
             </Expanded>
           </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TestMain.cpp" >
             <Original>
               config.reporterName == &quot;console&quot;
             </Original>
@@ -3842,7 +3842,7 @@
       </Section>
       <Section name="reporter">
         <Section name="-r/xml">
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TestMain.cpp" >
             <Original>
               parseIntoConfig( argv, config )
             </Original>
@@ -3850,7 +3850,7 @@
               parseIntoConfig( argv, config )
             </Expanded>
           </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TestMain.cpp" >
             <Original>
               config.reporterName == &quot;xml&quot;
             </Original>
@@ -3864,7 +3864,7 @@
       </Section>
       <Section name="reporter">
         <Section name="--reporter/junit">
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TestMain.cpp" >
             <Original>
               parseIntoConfig( argv, config )
             </Original>
@@ -3872,7 +3872,7 @@
               parseIntoConfig( argv, config )
             </Expanded>
           </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TestMain.cpp" >
             <Original>
               config.reporterName == &quot;junit&quot;
             </Original>
@@ -3886,7 +3886,7 @@
       </Section>
       <Section name="debugger">
         <Section name="-b">
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TestMain.cpp" >
             <Original>
               parseIntoConfig( argv, config )
             </Original>
@@ -3894,7 +3894,7 @@
               parseIntoConfig( argv, config )
             </Expanded>
           </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TestMain.cpp" >
             <Original>
               config.shouldDebugBreak == true
             </Original>
@@ -3908,7 +3908,7 @@
       </Section>
       <Section name="debugger">
         <Section name="--break">
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TestMain.cpp" >
             <Original>
               parseIntoConfig( argv, config )
             </Original>
@@ -3916,7 +3916,7 @@
               parseIntoConfig( argv, config )
             </Expanded>
           </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TestMain.cpp" >
             <Original>
               config.shouldDebugBreak
             </Original>
@@ -3930,7 +3930,7 @@
       </Section>
       <Section name="abort">
         <Section name="-a aborts after first failure">
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TestMain.cpp" >
             <Original>
               parseIntoConfig( argv, config )
             </Original>
@@ -3938,7 +3938,7 @@
               parseIntoConfig( argv, config )
             </Expanded>
           </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TestMain.cpp" >
             <Original>
               config.abortAfter == 1
             </Original>
@@ -3952,7 +3952,7 @@
       </Section>
       <Section name="abort">
         <Section name="-x 2 aborts after two failures">
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TestMain.cpp" >
             <Original>
               parseIntoConfig( argv, config )
             </Original>
@@ -3960,7 +3960,7 @@
               parseIntoConfig( argv, config )
             </Expanded>
           </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TestMain.cpp" >
             <Original>
               config.abortAfter == 2
             </Original>
@@ -3974,7 +3974,7 @@
       </Section>
       <Section name="abort">
         <Section name="-x must be greater than zero">
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TestMain.cpp" >
             <Original>
               parseIntoConfigAndReturnError( argv, config ) Contains( &quot;greater than zero&quot; )
             </Original>
@@ -3989,7 +3989,7 @@
       </Section>
       <Section name="abort">
         <Section name="-x must be numeric">
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TestMain.cpp" >
             <Original>
               parseIntoConfigAndReturnError( argv, config ) Contains( &quot;-x&quot; )
             </Original>
@@ -4004,7 +4004,7 @@
       </Section>
       <Section name="nothrow">
         <Section name="-e">
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TestMain.cpp" >
             <Original>
               parseIntoConfig( argv, config )
             </Original>
@@ -4012,7 +4012,7 @@
               parseIntoConfig( argv, config )
             </Expanded>
           </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TestMain.cpp" >
             <Original>
               config.noThrow == true
             </Original>
@@ -4026,7 +4026,7 @@
       </Section>
       <Section name="nothrow">
         <Section name="--nothrow">
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TestMain.cpp" >
             <Original>
               parseIntoConfig( argv, config )
             </Original>
@@ -4034,7 +4034,7 @@
               parseIntoConfig( argv, config )
             </Expanded>
           </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TestMain.cpp" >
             <Original>
               config.noThrow == true
             </Original>
@@ -4048,7 +4048,7 @@
       </Section>
       <Section name="output filename">
         <Section name="-o filename">
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TestMain.cpp" >
             <Original>
               parseIntoConfig( argv, config )
             </Original>
@@ -4056,7 +4056,7 @@
               parseIntoConfig( argv, config )
             </Expanded>
           </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TestMain.cpp" >
             <Original>
               config.outputFilename == &quot;filename.ext&quot;
             </Original>
@@ -4070,7 +4070,7 @@
       </Section>
       <Section name="output filename">
         <Section name="--out">
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TestMain.cpp" >
             <Original>
               parseIntoConfig( argv, config )
             </Original>
@@ -4078,7 +4078,7 @@
               parseIntoConfig( argv, config )
             </Expanded>
           </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TestMain.cpp" >
             <Original>
               config.outputFilename == &quot;filename.ext&quot;
             </Original>
@@ -4092,7 +4092,7 @@
       </Section>
       <Section name="combinations">
         <Section name="Single character flags can be combined">
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TestMain.cpp" >
             <Original>
               parseIntoConfig( argv, config )
             </Original>
@@ -4100,7 +4100,7 @@
               parseIntoConfig( argv, config )
             </Expanded>
           </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TestMain.cpp" >
             <Original>
               config.abortAfter == 1
             </Original>
@@ -4108,7 +4108,7 @@
               1 == 1
             </Expanded>
           </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TestMain.cpp" >
             <Original>
               config.shouldDebugBreak
             </Original>
@@ -4116,7 +4116,7 @@
               true
             </Expanded>
           </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TestMain.cpp" >
             <Original>
               config.noThrow == true
             </Original>
@@ -4133,7 +4133,7 @@
     <TestCase name="Long strings can be wrapped">
       <Section name="plain string">
         <Section name="No wrapping">
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TestMain.cpp" >
             <Original>
               Text( testString, TextAttributes().setWidth( 80 ) ).toString() == testString
             </Original>
@@ -4143,7 +4143,7 @@
 &quot;one two three four&quot;
             </Expanded>
           </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TestMain.cpp" >
             <Original>
               Text( testString, TextAttributes().setWidth( 18 ) ).toString() == testString
             </Original>
@@ -4159,7 +4159,7 @@
       </Section>
       <Section name="plain string">
         <Section name="Wrapped once">
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TestMain.cpp" >
             <Original>
               Text( testString, TextAttributes().setWidth( 17 ) ).toString() == &quot;one two three\nfour&quot;
             </Original>
@@ -4171,7 +4171,7 @@ four&quot;
 four&quot;
             </Expanded>
           </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TestMain.cpp" >
             <Original>
               Text( testString, TextAttributes().setWidth( 16 ) ).toString() == &quot;one two three\nfour&quot;
             </Original>
@@ -4183,7 +4183,7 @@ four&quot;
 four&quot;
             </Expanded>
           </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TestMain.cpp" >
             <Original>
               Text( testString, TextAttributes().setWidth( 14 ) ).toString() == &quot;one two three\nfour&quot;
             </Original>
@@ -4195,7 +4195,7 @@ four&quot;
 four&quot;
             </Expanded>
           </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TestMain.cpp" >
             <Original>
               Text( testString, TextAttributes().setWidth( 13 ) ).toString() == &quot;one two three\nfour&quot;
             </Original>
@@ -4207,7 +4207,7 @@ four&quot;
 four&quot;
             </Expanded>
           </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TestMain.cpp" >
             <Original>
               Text( testString, TextAttributes().setWidth( 12 ) ).toString() == &quot;one two\nthree four&quot;
             </Original>
@@ -4225,7 +4225,7 @@ three four&quot;
       </Section>
       <Section name="plain string">
         <Section name="Wrapped twice">
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TestMain.cpp" >
             <Original>
               Text( testString, TextAttributes().setWidth( 9 ) ).toString() == &quot;one two\nthree\nfour&quot;
             </Original>
@@ -4239,7 +4239,7 @@ three
 four&quot;
             </Expanded>
           </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TestMain.cpp" >
             <Original>
               Text( testString, TextAttributes().setWidth( 8 ) ).toString() == &quot;one two\nthree\nfour&quot;
             </Original>
@@ -4253,7 +4253,7 @@ three
 four&quot;
             </Expanded>
           </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TestMain.cpp" >
             <Original>
               Text( testString, TextAttributes().setWidth( 7 ) ).toString() == &quot;one two\nthree\nfour&quot;
             </Original>
@@ -4273,7 +4273,7 @@ four&quot;
       </Section>
       <Section name="plain string">
         <Section name="Wrapped three times">
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TestMain.cpp" >
             <Original>
               Text( testString, TextAttributes().setWidth( 6 ) ).toString() == &quot;one\ntwo\nthree\nfour&quot;
             </Original>
@@ -4289,7 +4289,7 @@ three
 four&quot;
             </Expanded>
           </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TestMain.cpp" >
             <Original>
               Text( testString, TextAttributes().setWidth( 5 ) ).toString() == &quot;one\ntwo\nthree\nfour&quot;
             </Original>
@@ -4311,7 +4311,7 @@ four&quot;
       </Section>
       <Section name="plain string">
         <Section name="Short wrap">
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TestMain.cpp" >
             <Original>
               Text( &quot;abcdef&quot;, TextAttributes().setWidth( 4 ) ).toString() == &quot;abc-\ndef&quot;
             </Original>
@@ -4323,7 +4323,7 @@ def&quot;
 def&quot;
             </Expanded>
           </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TestMain.cpp" >
             <Original>
               Text( &quot;abcdefg&quot;, TextAttributes().setWidth( 4 ) ).toString() == &quot;abc-\ndefg&quot;
             </Original>
@@ -4335,7 +4335,7 @@ defg&quot;
 defg&quot;
             </Expanded>
           </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TestMain.cpp" >
             <Original>
               Text( &quot;abcdefgh&quot;, TextAttributes().setWidth( 4 ) ).toString() == &quot;abc-\ndef-\ngh&quot;
             </Original>
@@ -4349,7 +4349,7 @@ def-
 gh&quot;
             </Expanded>
           </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TestMain.cpp" >
             <Original>
               Text( testString, TextAttributes().setWidth( 4 ) ).toString() == &quot;one\ntwo\nthr-\nee\nfour&quot;
             </Original>
@@ -4367,7 +4367,7 @@ ee
 four&quot;
             </Expanded>
           </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TestMain.cpp" >
             <Original>
               Text( testString, TextAttributes().setWidth( 3 ) ).toString() == &quot;one\ntwo\nth-\nree\nfo-\nur&quot;
             </Original>
@@ -4393,7 +4393,7 @@ ur&quot;
       </Section>
       <Section name="plain string">
         <Section name="As container">
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TestMain.cpp" >
             <Original>
               text.size() == 4
             </Original>
@@ -4401,7 +4401,7 @@ ur&quot;
               4 == 4
             </Expanded>
           </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TestMain.cpp" >
             <Original>
               text[0] == &quot;one&quot;
             </Original>
@@ -4409,7 +4409,7 @@ ur&quot;
               &quot;one&quot; == &quot;one&quot;
             </Expanded>
           </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TestMain.cpp" >
             <Original>
               text[1] == &quot;two&quot;
             </Original>
@@ -4417,7 +4417,7 @@ ur&quot;
               &quot;two&quot; == &quot;two&quot;
             </Expanded>
           </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TestMain.cpp" >
             <Original>
               text[2] == &quot;three&quot;
             </Original>
@@ -4425,7 +4425,7 @@ ur&quot;
               &quot;three&quot; == &quot;three&quot;
             </Expanded>
           </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TestMain.cpp" >
             <Original>
               text[3] == &quot;four&quot;
             </Original>
@@ -4439,7 +4439,7 @@ ur&quot;
       </Section>
       <Section name="plain string">
         <Section name="Indent first line differently">
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TestMain.cpp" >
             <Original>
               text.toString() == &quot; one two\n    three\n    four&quot;
             </Original>
@@ -4459,7 +4459,7 @@ ur&quot;
       </Section>
       <Section name="With newlines">
         <Section name="No wrapping">
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TestMain.cpp" >
             <Original>
               Text( testString, TextAttributes().setWidth( 80 ) ).toString() == testString
             </Original>
@@ -4471,7 +4471,7 @@ three four&quot;
 three four&quot;
             </Expanded>
           </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TestMain.cpp" >
             <Original>
               Text( testString, TextAttributes().setWidth( 18 ) ).toString() == testString
             </Original>
@@ -4483,7 +4483,7 @@ three four&quot;
 three four&quot;
             </Expanded>
           </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TestMain.cpp" >
             <Original>
               Text( testString, TextAttributes().setWidth( 10 ) ).toString() == testString
             </Original>
@@ -4501,7 +4501,7 @@ three four&quot;
       </Section>
       <Section name="With newlines">
         <Section name="Trailing newline">
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TestMain.cpp" >
             <Original>
               Text( &quot;abcdef\n&quot;, TextAttributes().setWidth( 10 ) ).toString() == &quot;abcdef\n&quot;
             </Original>
@@ -4513,7 +4513,7 @@ three four&quot;
 &quot;
             </Expanded>
           </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TestMain.cpp" >
             <Original>
               Text( &quot;abcdef&quot;, TextAttributes().setWidth( 6 ) ).toString() == &quot;abcdef&quot;
             </Original>
@@ -4521,7 +4521,7 @@ three four&quot;
               &quot;abcdef&quot; == &quot;abcdef&quot;
             </Expanded>
           </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TestMain.cpp" >
             <Original>
               Text( &quot;abcdef\n&quot;, TextAttributes().setWidth( 6 ) ).toString() == &quot;abcdef\n&quot;
             </Original>
@@ -4539,7 +4539,7 @@ three four&quot;
       </Section>
       <Section name="With newlines">
         <Section name="Wrapped once">
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TestMain.cpp" >
             <Original>
               Text( testString, TextAttributes().setWidth( 9 ) ).toString() == &quot;one two\nthree\nfour&quot;
             </Original>
@@ -4553,7 +4553,7 @@ three
 four&quot;
             </Expanded>
           </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TestMain.cpp" >
             <Original>
               Text( testString, TextAttributes().setWidth( 8 ) ).toString() == &quot;one two\nthree\nfour&quot;
             </Original>
@@ -4567,7 +4567,7 @@ three
 four&quot;
             </Expanded>
           </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TestMain.cpp" >
             <Original>
               Text( testString, TextAttributes().setWidth( 7 ) ).toString() == &quot;one two\nthree\nfour&quot;
             </Original>
@@ -4587,7 +4587,7 @@ four&quot;
       </Section>
       <Section name="With newlines">
         <Section name="Wrapped twice">
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TestMain.cpp" >
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TestMain.cpp" >
             <Original>
               Text( testString, TextAttributes().setWidth( 6 ) ).toString() == &quot;one\ntwo\nthree\nfour&quot;
             </Original>
@@ -4608,7 +4608,7 @@ four&quot;
         <OverallResults successes="1" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="With tabs">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TestMain.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TestMain.cpp" >
           <Original>
             Text( testString, TextAttributes().setWidth( 15 ) ).toString() == &quot;one two three\n        four\n        five\n        six&quot;
           </Original>
@@ -4632,7 +4632,7 @@ four&quot;
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Text can be formatted using the Text class">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TestMain.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TestMain.cpp" >
         <Original>
           Text( &quot;hi there&quot; ).toString() == &quot;hi there&quot;
         </Original>
@@ -4640,7 +4640,7 @@ four&quot;
           &quot;hi there&quot; == &quot;hi there&quot;
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TestMain.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TestMain.cpp" >
         <Original>
           Text( &quot;hi there&quot;, narrow ).toString() == &quot;hi\nthere&quot;
         </Original>
@@ -4655,7 +4655,7 @@ there&quot;
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Long text is truncted">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TestMain.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TestMain.cpp" >
         <Original>
           t.toString() EndsWith( &quot;... message truncated due to excessive size&quot; )
         </Original>
@@ -5666,7 +5666,7 @@ there&quot;
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Parsing a std::pair">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TrickyTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TrickyTests.cpp" >
         <Original>
           (std::pair&lt;int, int>( 1, 2 )) == aNicePair
         </Original>
@@ -5689,7 +5689,7 @@ there&quot;
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="A failing expression with a non streamable type is still captured[failing]">
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TrickyTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TrickyTests.cpp" >
         <Original>
           &amp;o1 == &amp;o2
         </Original>
@@ -5697,7 +5697,7 @@ there&quot;
           0x<hex digits> == 0x<hex digits>
         </Expanded>
       </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TrickyTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TrickyTests.cpp" >
         <Original>
           o1 == o2
         </Original>
@@ -5708,7 +5708,7 @@ there&quot;
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="string literals of different sizes can be compared[failing]">
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TrickyTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TrickyTests.cpp" >
         <Original>
           std::string( &quot;first&quot; ) == &quot;second&quot;
         </Original>
@@ -5719,7 +5719,7 @@ there&quot;
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="An expression with side-effects should only be evaluated once">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TrickyTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TrickyTests.cpp" >
         <Original>
           i++ == 7
         </Original>
@@ -5727,7 +5727,7 @@ there&quot;
           7 == 7
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TrickyTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TrickyTests.cpp" >
         <Original>
           i++ == 8
         </Original>
@@ -5738,7 +5738,7 @@ there&quot;
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Operators at different namespace levels not hijacked by Koenig lookup">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TrickyTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TrickyTests.cpp" >
         <Original>
           0x<hex digits> == o
         </Original>
@@ -5749,7 +5749,7 @@ there&quot;
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Demonstrate that a non-const == is not used">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TrickyTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TrickyTests.cpp" >
         <Original>
           t == 1u
         </Original>
@@ -5760,7 +5760,7 @@ there&quot;
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Test enum bit values">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TrickyTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TrickyTests.cpp" >
         <Original>
           0x<hex digits> == bit30and31
         </Original>
@@ -5771,7 +5771,7 @@ there&quot;
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="boolean member">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TrickyTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TrickyTests.cpp" >
         <Original>
           obj.prop != __null
         </Original>
@@ -5783,7 +5783,7 @@ there&quot;
     </TestCase>
     <TestCase name="(unimplemented) static bools can be evaluated">
       <Section name="compare to true">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TrickyTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TrickyTests.cpp" >
           <Original>
             is_true&lt;true>::value == true
           </Original>
@@ -5791,7 +5791,7 @@ there&quot;
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TrickyTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TrickyTests.cpp" >
           <Original>
             true == is_true&lt;true>::value
           </Original>
@@ -5802,7 +5802,7 @@ there&quot;
         <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="compare to false">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TrickyTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TrickyTests.cpp" >
           <Original>
             is_true&lt;false>::value == false
           </Original>
@@ -5810,7 +5810,7 @@ there&quot;
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TrickyTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TrickyTests.cpp" >
           <Original>
             false == is_true&lt;false>::value
           </Original>
@@ -5821,7 +5821,7 @@ there&quot;
         <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="negation">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TrickyTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TrickyTests.cpp" >
           <Original>
             !is_true&lt;false>::value
           </Original>
@@ -5832,7 +5832,7 @@ there&quot;
         <OverallResults successes="1" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="double negation">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TrickyTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TrickyTests.cpp" >
           <Original>
             !!is_true&lt;true>::value
           </Original>
@@ -5843,7 +5843,7 @@ there&quot;
         <OverallResults successes="1" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="direct">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TrickyTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TrickyTests.cpp" >
           <Original>
             is_true&lt;true>::value
           </Original>
@@ -5851,7 +5851,7 @@ there&quot;
             true
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TrickyTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TrickyTests.cpp" >
           <Original>
             !is_true&lt;false>::value
           </Original>
@@ -5864,7 +5864,7 @@ there&quot;
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Objects that evaluated in boolean contexts can be checked">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TrickyTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TrickyTests.cpp" >
         <Original>
           True
         </Original>
@@ -5872,7 +5872,7 @@ there&quot;
           true
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TrickyTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TrickyTests.cpp" >
         <Original>
           !False
         </Original>
@@ -5880,7 +5880,7 @@ there&quot;
           true
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TrickyTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TrickyTests.cpp" >
         <Original>
           !False
         </Original>
@@ -5891,7 +5891,7 @@ there&quot;
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Assertions then sections">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TrickyTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TrickyTests.cpp" >
         <Original>
           Catch::alwaysTrue()
         </Original>
@@ -5900,7 +5900,7 @@ there&quot;
         </Expanded>
       </Expression>
       <Section name="A section">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TrickyTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TrickyTests.cpp" >
           <Original>
             Catch::alwaysTrue()
           </Original>
@@ -5909,7 +5909,7 @@ there&quot;
           </Expanded>
         </Expression>
         <Section name="Another section">
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TrickyTests.cpp" >
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TrickyTests.cpp" >
             <Original>
               Catch::alwaysTrue()
             </Original>
@@ -5921,7 +5921,7 @@ there&quot;
         </Section>
         <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TrickyTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TrickyTests.cpp" >
         <Original>
           Catch::alwaysTrue()
         </Original>
@@ -5930,7 +5930,7 @@ there&quot;
         </Expanded>
       </Expression>
       <Section name="A section">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TrickyTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TrickyTests.cpp" >
           <Original>
             Catch::alwaysTrue()
           </Original>
@@ -5939,7 +5939,7 @@ there&quot;
           </Expanded>
         </Expression>
         <Section name="Another other section">
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TrickyTests.cpp" >
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TrickyTests.cpp" >
             <Original>
               Catch::alwaysTrue()
             </Original>
@@ -5954,7 +5954,7 @@ there&quot;
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="non streamable - with conv. op">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TrickyTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TrickyTests.cpp" >
         <Original>
           s == &quot;7&quot;
         </Original>
@@ -5965,7 +5965,7 @@ there&quot;
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Comparing function pointers">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TrickyTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TrickyTests.cpp" >
         <Original>
           a
         </Original>
@@ -5973,7 +5973,7 @@ there&quot;
           true
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TrickyTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TrickyTests.cpp" >
         <Original>
           a == &amp;foo
         </Original>
@@ -5984,7 +5984,7 @@ there&quot;
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Comparing member function pointers">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TrickyTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TrickyTests.cpp" >
         <Original>
           m == &amp;S::f
         </Original>
@@ -5997,7 +5997,7 @@ there&quot;
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="pointer to class">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TrickyTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TrickyTests.cpp" >
         <Original>
           p == 0
         </Original>
@@ -6008,7 +6008,7 @@ there&quot;
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="null_ptr">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TrickyTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TrickyTests.cpp" >
         <Original>
           ptr.get() == nullptr
         </Original>
@@ -6032,7 +6032,7 @@ there&quot;
     </TestCase>
     <TestCase name="Parse test names and tags">
       <Section name="Empty test spec should have no filters">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.hasFilters() == false
           </Original>
@@ -6040,7 +6040,7 @@ there&quot;
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcA ) == false
           </Original>
@@ -6048,7 +6048,7 @@ there&quot;
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcB ) == false
           </Original>
@@ -6059,7 +6059,7 @@ there&quot;
         <OverallResults successes="3" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="Test spec from empty string should have no filters">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.hasFilters() == false
           </Original>
@@ -6067,7 +6067,7 @@ there&quot;
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches(tcA ) == false
           </Original>
@@ -6075,7 +6075,7 @@ there&quot;
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcB ) == false
           </Original>
@@ -6086,7 +6086,7 @@ there&quot;
         <OverallResults successes="3" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="Test spec from just a comma should have no filters">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.hasFilters() == false
           </Original>
@@ -6094,7 +6094,7 @@ there&quot;
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcA ) == false
           </Original>
@@ -6102,7 +6102,7 @@ there&quot;
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcB ) == false
           </Original>
@@ -6113,7 +6113,7 @@ there&quot;
         <OverallResults successes="3" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="Test spec from name should have one filter">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.hasFilters() == true
           </Original>
@@ -6121,7 +6121,7 @@ there&quot;
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcA ) == false
           </Original>
@@ -6129,7 +6129,7 @@ there&quot;
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcB ) == true
           </Original>
@@ -6140,7 +6140,7 @@ there&quot;
         <OverallResults successes="3" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="Test spec from quoted name should have one filter">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.hasFilters() == true
           </Original>
@@ -6148,7 +6148,7 @@ there&quot;
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcA ) == false
           </Original>
@@ -6156,7 +6156,7 @@ there&quot;
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcB ) == true
           </Original>
@@ -6167,7 +6167,7 @@ there&quot;
         <OverallResults successes="3" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="Test spec from name should have one filter">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.hasFilters() == true
           </Original>
@@ -6175,7 +6175,7 @@ there&quot;
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcA ) == false
           </Original>
@@ -6183,7 +6183,7 @@ there&quot;
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcB ) == true
           </Original>
@@ -6191,7 +6191,7 @@ there&quot;
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcC ) == false
           </Original>
@@ -6202,7 +6202,7 @@ there&quot;
         <OverallResults successes="4" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="Wildcard at the start">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.hasFilters() == true
           </Original>
@@ -6210,7 +6210,7 @@ there&quot;
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcA ) == false
           </Original>
@@ -6218,7 +6218,7 @@ there&quot;
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcB ) == false
           </Original>
@@ -6226,7 +6226,7 @@ there&quot;
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcC ) == true
           </Original>
@@ -6234,7 +6234,7 @@ there&quot;
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcD ) == false
           </Original>
@@ -6242,7 +6242,7 @@ there&quot;
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             parseTestSpec( &quot;*a&quot; ).matches( tcA ) == true
           </Original>
@@ -6253,7 +6253,7 @@ there&quot;
         <OverallResults successes="6" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="Wildcard at the end">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.hasFilters() == true
           </Original>
@@ -6261,7 +6261,7 @@ there&quot;
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcA ) == false
           </Original>
@@ -6269,7 +6269,7 @@ there&quot;
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcB ) == false
           </Original>
@@ -6277,7 +6277,7 @@ there&quot;
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcC ) == true
           </Original>
@@ -6285,7 +6285,7 @@ there&quot;
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcD ) == false
           </Original>
@@ -6293,7 +6293,7 @@ there&quot;
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             parseTestSpec( &quot;a*&quot; ).matches( tcA ) == true
           </Original>
@@ -6304,7 +6304,7 @@ there&quot;
         <OverallResults successes="6" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="Wildcard at both ends">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.hasFilters() == true
           </Original>
@@ -6312,7 +6312,7 @@ there&quot;
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcA ) == false
           </Original>
@@ -6320,7 +6320,7 @@ there&quot;
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcB ) == false
           </Original>
@@ -6328,7 +6328,7 @@ there&quot;
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcC ) == true
           </Original>
@@ -6336,7 +6336,7 @@ there&quot;
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcD ) == true
           </Original>
@@ -6344,7 +6344,7 @@ there&quot;
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             parseTestSpec( &quot;*a*&quot; ).matches( tcA ) == true
           </Original>
@@ -6355,7 +6355,7 @@ there&quot;
         <OverallResults successes="6" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="Redundant wildcard at the start">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.hasFilters() == true
           </Original>
@@ -6363,7 +6363,7 @@ there&quot;
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcA ) == true
           </Original>
@@ -6371,7 +6371,7 @@ there&quot;
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcB ) == false
           </Original>
@@ -6382,7 +6382,7 @@ there&quot;
         <OverallResults successes="3" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="Redundant wildcard at the end">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.hasFilters() == true
           </Original>
@@ -6390,7 +6390,7 @@ there&quot;
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcA ) == true
           </Original>
@@ -6398,7 +6398,7 @@ there&quot;
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcB ) == false
           </Original>
@@ -6409,7 +6409,7 @@ there&quot;
         <OverallResults successes="3" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="Redundant wildcard at both ends">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.hasFilters() == true
           </Original>
@@ -6417,7 +6417,7 @@ there&quot;
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcA ) == true
           </Original>
@@ -6425,7 +6425,7 @@ there&quot;
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcB ) == false
           </Original>
@@ -6436,7 +6436,7 @@ there&quot;
         <OverallResults successes="3" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="Wildcard at both ends, redundant at start">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.hasFilters() == true
           </Original>
@@ -6444,7 +6444,7 @@ there&quot;
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcA ) == false
           </Original>
@@ -6452,7 +6452,7 @@ there&quot;
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcB ) == false
           </Original>
@@ -6460,7 +6460,7 @@ there&quot;
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcC ) == true
           </Original>
@@ -6468,7 +6468,7 @@ there&quot;
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcD ) == true
           </Original>
@@ -6479,7 +6479,7 @@ there&quot;
         <OverallResults successes="5" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="Just wildcard">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.hasFilters() == true
           </Original>
@@ -6487,7 +6487,7 @@ there&quot;
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcA ) == true
           </Original>
@@ -6495,7 +6495,7 @@ there&quot;
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcB ) == true
           </Original>
@@ -6503,7 +6503,7 @@ there&quot;
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcC ) == true
           </Original>
@@ -6511,7 +6511,7 @@ there&quot;
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcD ) == true
           </Original>
@@ -6522,7 +6522,7 @@ there&quot;
         <OverallResults successes="5" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="Single tag">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.hasFilters() == true
           </Original>
@@ -6530,7 +6530,7 @@ there&quot;
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcA ) == false
           </Original>
@@ -6538,7 +6538,7 @@ there&quot;
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcB ) == true
           </Original>
@@ -6546,7 +6546,7 @@ there&quot;
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcC ) == false
           </Original>
@@ -6557,7 +6557,7 @@ there&quot;
         <OverallResults successes="4" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="Single tag, two matches">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.hasFilters() == true
           </Original>
@@ -6565,7 +6565,7 @@ there&quot;
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcA ) == false
           </Original>
@@ -6573,7 +6573,7 @@ there&quot;
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcB ) == true
           </Original>
@@ -6581,7 +6581,7 @@ there&quot;
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcC ) == true
           </Original>
@@ -6592,7 +6592,7 @@ there&quot;
         <OverallResults successes="4" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="Two tags">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.hasFilters() == true
           </Original>
@@ -6600,7 +6600,7 @@ there&quot;
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcA ) == false
           </Original>
@@ -6608,7 +6608,7 @@ there&quot;
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcB ) == false
           </Original>
@@ -6616,7 +6616,7 @@ there&quot;
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcC ) == true
           </Original>
@@ -6627,7 +6627,7 @@ there&quot;
         <OverallResults successes="4" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="Two tags, spare separated">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.hasFilters() == true
           </Original>
@@ -6635,7 +6635,7 @@ there&quot;
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcA ) == false
           </Original>
@@ -6643,7 +6643,7 @@ there&quot;
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcB ) == false
           </Original>
@@ -6651,7 +6651,7 @@ there&quot;
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcC ) == true
           </Original>
@@ -6662,7 +6662,7 @@ there&quot;
         <OverallResults successes="4" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="Wildcarded name and tag">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.hasFilters() == true
           </Original>
@@ -6670,7 +6670,7 @@ there&quot;
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcA ) == false
           </Original>
@@ -6678,7 +6678,7 @@ there&quot;
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcB ) == false
           </Original>
@@ -6686,7 +6686,7 @@ there&quot;
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcC ) == true
           </Original>
@@ -6694,7 +6694,7 @@ there&quot;
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcD ) == false
           </Original>
@@ -6705,7 +6705,7 @@ there&quot;
         <OverallResults successes="5" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="Single tag exclusion">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.hasFilters() == true
           </Original>
@@ -6713,7 +6713,7 @@ there&quot;
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcA ) == true
           </Original>
@@ -6721,7 +6721,7 @@ there&quot;
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcB ) == false
           </Original>
@@ -6729,7 +6729,7 @@ there&quot;
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcC ) == true
           </Original>
@@ -6740,7 +6740,7 @@ there&quot;
         <OverallResults successes="4" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="One tag exclusion and one tag inclusion">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.hasFilters() == true
           </Original>
@@ -6748,7 +6748,7 @@ there&quot;
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcA ) == false
           </Original>
@@ -6756,7 +6756,7 @@ there&quot;
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcB ) == true
           </Original>
@@ -6764,7 +6764,7 @@ there&quot;
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcC ) == false
           </Original>
@@ -6775,7 +6775,7 @@ there&quot;
         <OverallResults successes="4" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="One tag exclusion and one wldcarded name inclusion">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.hasFilters() == true
           </Original>
@@ -6783,7 +6783,7 @@ there&quot;
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcA ) == false
           </Original>
@@ -6791,7 +6791,7 @@ there&quot;
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcB ) == false
           </Original>
@@ -6799,7 +6799,7 @@ there&quot;
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcC ) == false
           </Original>
@@ -6807,7 +6807,7 @@ there&quot;
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcD ) == true
           </Original>
@@ -6818,7 +6818,7 @@ there&quot;
         <OverallResults successes="5" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="One tag exclusion, using exclude:, and one wldcarded name inclusion">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.hasFilters() == true
           </Original>
@@ -6826,7 +6826,7 @@ there&quot;
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcA ) == false
           </Original>
@@ -6834,7 +6834,7 @@ there&quot;
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcB ) == false
           </Original>
@@ -6842,7 +6842,7 @@ there&quot;
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcC ) == false
           </Original>
@@ -6850,7 +6850,7 @@ there&quot;
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcD ) == true
           </Original>
@@ -6861,7 +6861,7 @@ there&quot;
         <OverallResults successes="5" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="name exclusion">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.hasFilters() == true
           </Original>
@@ -6869,7 +6869,7 @@ there&quot;
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcA ) == true
           </Original>
@@ -6877,7 +6877,7 @@ there&quot;
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcB ) == false
           </Original>
@@ -6885,7 +6885,7 @@ there&quot;
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcC ) == true
           </Original>
@@ -6893,7 +6893,7 @@ there&quot;
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcD ) == true
           </Original>
@@ -6904,7 +6904,7 @@ there&quot;
         <OverallResults successes="5" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="wildcarded name exclusion">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.hasFilters() == true
           </Original>
@@ -6912,7 +6912,7 @@ there&quot;
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcA ) == true
           </Original>
@@ -6920,7 +6920,7 @@ there&quot;
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcB ) == true
           </Original>
@@ -6928,7 +6928,7 @@ there&quot;
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcC ) == false
           </Original>
@@ -6936,7 +6936,7 @@ there&quot;
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcD ) == false
           </Original>
@@ -6947,7 +6947,7 @@ there&quot;
         <OverallResults successes="5" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="wildcarded name exclusion with tag inclusion">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.hasFilters() == true
           </Original>
@@ -6955,7 +6955,7 @@ there&quot;
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcA ) == true
           </Original>
@@ -6963,7 +6963,7 @@ there&quot;
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcB ) == true
           </Original>
@@ -6971,7 +6971,7 @@ there&quot;
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcC ) == true
           </Original>
@@ -6979,7 +6979,7 @@ there&quot;
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcD ) == false
           </Original>
@@ -6990,7 +6990,7 @@ there&quot;
         <OverallResults successes="5" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="wildcarded name exclusion, using exclude:, with tag inclusion">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.hasFilters() == true
           </Original>
@@ -6998,7 +6998,7 @@ there&quot;
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcA ) == true
           </Original>
@@ -7006,7 +7006,7 @@ there&quot;
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcB ) == true
           </Original>
@@ -7014,7 +7014,7 @@ there&quot;
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcC ) == true
           </Original>
@@ -7022,7 +7022,7 @@ there&quot;
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcD ) == false
           </Original>
@@ -7033,7 +7033,7 @@ there&quot;
         <OverallResults successes="5" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="two wildcarded names">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.hasFilters() == true
           </Original>
@@ -7041,7 +7041,7 @@ there&quot;
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcA ) == false
           </Original>
@@ -7049,7 +7049,7 @@ there&quot;
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcB ) == false
           </Original>
@@ -7057,7 +7057,7 @@ there&quot;
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcC ) == true
           </Original>
@@ -7065,7 +7065,7 @@ there&quot;
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcD ) == false
           </Original>
@@ -7076,7 +7076,7 @@ there&quot;
         <OverallResults successes="5" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="empty tag">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.hasFilters() == false
           </Original>
@@ -7084,7 +7084,7 @@ there&quot;
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcA ) == false
           </Original>
@@ -7092,7 +7092,7 @@ there&quot;
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcB ) == false
           </Original>
@@ -7100,7 +7100,7 @@ there&quot;
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcC ) == false
           </Original>
@@ -7108,7 +7108,7 @@ there&quot;
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcD ) == false
           </Original>
@@ -7119,7 +7119,7 @@ there&quot;
         <OverallResults successes="5" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="empty quoted name">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.hasFilters() == false
           </Original>
@@ -7127,7 +7127,7 @@ there&quot;
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcA ) == false
           </Original>
@@ -7135,7 +7135,7 @@ there&quot;
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcB ) == false
           </Original>
@@ -7143,7 +7143,7 @@ there&quot;
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcC ) == false
           </Original>
@@ -7151,7 +7151,7 @@ there&quot;
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcD ) == false
           </Original>
@@ -7162,7 +7162,7 @@ there&quot;
         <OverallResults successes="5" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="quoted string followed by tag exclusion">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.hasFilters() == true
           </Original>
@@ -7170,7 +7170,7 @@ there&quot;
             true == true
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcA ) == false
           </Original>
@@ -7178,7 +7178,7 @@ there&quot;
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcB ) == false
           </Original>
@@ -7186,7 +7186,7 @@ there&quot;
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcC ) == false
           </Original>
@@ -7194,7 +7194,7 @@ there&quot;
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/CmdLineTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
             spec.matches( tcD ) == true
           </Original>
@@ -7208,7 +7208,7 @@ there&quot;
     </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" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TagAliasTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TagAliasTests.cpp" >
           <Original>
             what Contains( &quot;[@zzz]&quot; )
           </Original>
@@ -7218,7 +7218,7 @@ there&quot;
 	Redefined at file:10&quot; contains: &quot;[@zzz]&quot;
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TagAliasTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TagAliasTests.cpp" >
           <Original>
             what Contains( &quot;file&quot; )
           </Original>
@@ -7228,7 +7228,7 @@ there&quot;
 	Redefined at file:10&quot; contains: &quot;file&quot;
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TagAliasTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TagAliasTests.cpp" >
           <Original>
             what Contains( &quot;2&quot; )
           </Original>
@@ -7238,7 +7238,7 @@ there&quot;
 	Redefined at file:10&quot; contains: &quot;2&quot;
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TagAliasTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TagAliasTests.cpp" >
           <Original>
             what Contains( &quot;10&quot; )
           </Original>
@@ -7251,7 +7251,7 @@ there&quot;
         <OverallResults successes="4" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="Tag aliases must be of the form [@name]">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TagAliasTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TagAliasTests.cpp" >
           <Original>
             registry.add( &quot;[no ampersat]&quot;, &quot;&quot;, Catch::SourceLineInfo( &quot;file&quot;, 3 ) )
           </Original>
@@ -7259,7 +7259,7 @@ there&quot;
             registry.add( &quot;[no ampersat]&quot;, &quot;&quot;, Catch::SourceLineInfo( &quot;file&quot;, 3 ) )
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TagAliasTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TagAliasTests.cpp" >
           <Original>
             registry.add( &quot;[the @ is not at the start]&quot;, &quot;&quot;, Catch::SourceLineInfo( &quot;file&quot;, 3 ) )
           </Original>
@@ -7267,7 +7267,7 @@ there&quot;
             registry.add( &quot;[the @ is not at the start]&quot;, &quot;&quot;, Catch::SourceLineInfo( &quot;file&quot;, 3 ) )
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TagAliasTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TagAliasTests.cpp" >
           <Original>
             registry.add( &quot;@no square bracket at start]&quot;, &quot;&quot;, Catch::SourceLineInfo( &quot;file&quot;, 3 ) )
           </Original>
@@ -7275,7 +7275,7 @@ there&quot;
             registry.add( &quot;@no square bracket at start]&quot;, &quot;&quot;, Catch::SourceLineInfo( &quot;file&quot;, 3 ) )
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/TagAliasTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/TagAliasTests.cpp" >
           <Original>
             registry.add( &quot;[@no square bracket at end&quot;, &quot;&quot;, Catch::SourceLineInfo( &quot;file&quot;, 3 ) )
           </Original>
@@ -7303,7 +7303,7 @@ there&quot;
       <Section name="Given: This stuff exists">
         <Section name="When: I do this">
           <Section name="Then: it should do this">
-            <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/BDDTests.cpp" >
+            <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/BDDTests.cpp" >
               <Original>
                 itDoesThis()
               </Original>
@@ -7312,7 +7312,7 @@ there&quot;
               </Expanded>
             </Expression>
             <Section name="And: do that">
-              <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/BDDTests.cpp" >
+              <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/BDDTests.cpp" >
                 <Original>
                   itDoesThat()
                 </Original>
@@ -7332,7 +7332,7 @@ there&quot;
     </TestCase>
     <TestCase name="Scenario: Vector resizing affects size and capacity">
       <Section name="Given: an empty vector">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/BDDTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/BDDTests.cpp" >
           <Original>
             v.size() == 0
           </Original>
@@ -7342,7 +7342,7 @@ there&quot;
         </Expression>
         <Section name="When: it is made larger">
           <Section name="Then: the size and capacity go up">
-            <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/BDDTests.cpp" >
+            <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/BDDTests.cpp" >
               <Original>
                 v.size() == 10
               </Original>
@@ -7350,7 +7350,7 @@ there&quot;
                 10 == 10
               </Expanded>
             </Expression>
-            <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/BDDTests.cpp" >
+            <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/BDDTests.cpp" >
               <Original>
                 v.capacity() >= 10
               </Original>
@@ -7360,7 +7360,7 @@ there&quot;
             </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" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/BDDTests.cpp" >
+                <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/BDDTests.cpp" >
                   <Original>
                     v.size() == 5
                   </Original>
@@ -7368,7 +7368,7 @@ there&quot;
                     5 == 5
                   </Expanded>
                 </Expression>
-                <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/BDDTests.cpp" >
+                <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/BDDTests.cpp" >
                   <Original>
                     v.capacity() >= 10
                   </Original>
@@ -7387,7 +7387,7 @@ there&quot;
         <OverallResults successes="5" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="Given: an empty vector">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/BDDTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/BDDTests.cpp" >
           <Original>
             v.size() == 0
           </Original>
@@ -7397,7 +7397,7 @@ there&quot;
         </Expression>
         <Section name="When: we reserve more space">
           <Section name="Then: The capacity is increased but the size remains the same">
-            <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/BDDTests.cpp" >
+            <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/BDDTests.cpp" >
               <Original>
                 v.capacity() >= 10
               </Original>
@@ -7405,7 +7405,7 @@ there&quot;
                 10 >= 10
               </Expanded>
             </Expression>
-            <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/BDDTests.cpp" >
+            <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/BDDTests.cpp" >
               <Original>
                 v.size() == 0
               </Original>
@@ -7435,7 +7435,7 @@ there&quot;
     </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" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/BDDTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/BDDTests.cpp" >
           <Original>
             before == 0
           </Original>
@@ -7445,7 +7445,7 @@ there&quot;
         </Expression>
         <Section name="When: We get the count">
           <Section name="Then: Subsequently values are higher">
-            <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/BDDTests.cpp" >
+            <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/BDDTests.cpp" >
               <Original>
                 after > before
               </Original>
@@ -7462,7 +7462,7 @@ there&quot;
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="section tracking">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/SectionTrackerTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/SectionTrackerTests.cpp" >
         <Original>
           !testCaseTracker.isCompleted()
         </Original>
@@ -7471,7 +7471,7 @@ there&quot;
         </Expanded>
       </Expression>
       <Section name="test case with no sections">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/SectionTrackerTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/SectionTrackerTests.cpp" >
           <Original>
             !testCaseTracker.isCompleted()
           </Original>
@@ -7479,7 +7479,7 @@ there&quot;
             !false
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/SectionTrackerTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/SectionTrackerTests.cpp" >
           <Original>
             testCaseTracker.isCompleted()
           </Original>
@@ -7489,7 +7489,7 @@ there&quot;
         </Expression>
         <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/SectionTrackerTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/SectionTrackerTests.cpp" >
         <Original>
           !testCaseTracker.isCompleted()
         </Original>
@@ -7498,7 +7498,7 @@ there&quot;
         </Expanded>
       </Expression>
       <Section name="test case with one section">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/SectionTrackerTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/SectionTrackerTests.cpp" >
           <Original>
             testCaseTracker.enterSection( section1Name )
           </Original>
@@ -7506,7 +7506,7 @@ there&quot;
             true
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/SectionTrackerTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/SectionTrackerTests.cpp" >
           <Original>
             !testCaseTracker.isCompleted()
           </Original>
@@ -7514,7 +7514,7 @@ there&quot;
             !false
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/SectionTrackerTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/SectionTrackerTests.cpp" >
           <Original>
             testCaseTracker.isCompleted()
           </Original>
@@ -7522,7 +7522,7 @@ there&quot;
             true
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/SectionTrackerTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/SectionTrackerTests.cpp" >
           <Original>
             !testCaseTracker.enterSection( section1Name )
           </Original>
@@ -7532,7 +7532,7 @@ there&quot;
         </Expression>
         <OverallResults successes="4" failures="0" expectedFailures="0"/>
       </Section>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/SectionTrackerTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/SectionTrackerTests.cpp" >
         <Original>
           !testCaseTracker.isCompleted()
         </Original>
@@ -7541,7 +7541,7 @@ there&quot;
         </Expanded>
       </Expression>
       <Section name="test case with two consecutive sections">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/SectionTrackerTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/SectionTrackerTests.cpp" >
           <Original>
             testCaseTracker.enterSection( section1Name )
           </Original>
@@ -7549,7 +7549,7 @@ there&quot;
             true
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/SectionTrackerTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/SectionTrackerTests.cpp" >
           <Original>
             !testCaseTracker.enterSection( section2Name )
           </Original>
@@ -7557,7 +7557,7 @@ there&quot;
             !false
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/SectionTrackerTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/SectionTrackerTests.cpp" >
           <Original>
             !testCaseTracker.isCompleted()
           </Original>
@@ -7565,7 +7565,7 @@ there&quot;
             !false
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/SectionTrackerTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/SectionTrackerTests.cpp" >
           <Original>
             !testCaseTracker.enterSection( section1Name )
           </Original>
@@ -7573,7 +7573,7 @@ there&quot;
             !false
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/SectionTrackerTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/SectionTrackerTests.cpp" >
           <Original>
             testCaseTracker.enterSection( section2Name )
           </Original>
@@ -7581,7 +7581,7 @@ there&quot;
             true
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/SectionTrackerTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/SectionTrackerTests.cpp" >
           <Original>
             testCaseTracker.isCompleted()
           </Original>
@@ -7591,7 +7591,7 @@ there&quot;
         </Expression>
         <OverallResults successes="6" failures="0" expectedFailures="0"/>
       </Section>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/SectionTrackerTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/SectionTrackerTests.cpp" >
         <Original>
           !testCaseTracker.isCompleted()
         </Original>
@@ -7600,7 +7600,7 @@ there&quot;
         </Expanded>
       </Expression>
       <Section name="test case with one section within another">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/SectionTrackerTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/SectionTrackerTests.cpp" >
           <Original>
             testCaseTracker.enterSection( section1Name )
           </Original>
@@ -7608,7 +7608,7 @@ there&quot;
             true
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/SectionTrackerTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/SectionTrackerTests.cpp" >
           <Original>
             testCaseTracker.enterSection( section2Name )
           </Original>
@@ -7616,7 +7616,7 @@ there&quot;
             true
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/SectionTrackerTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/SectionTrackerTests.cpp" >
           <Original>
             !testCaseTracker.isCompleted()
           </Original>
@@ -7624,7 +7624,7 @@ there&quot;
             !false
           </Expanded>
         </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/SectionTrackerTests.cpp" >
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/SectionTrackerTests.cpp" >
           <Original>
             testCaseTracker.isCompleted()
           </Original>