Removed line numbers from approval tests
diff --git a/projects/SelfTest/Baselines/approvedResults.txt b/projects/SelfTest/Baselines/approvedResults.txt
index 9191ed3..e1aa917 100644
--- a/projects/SelfTest/Baselines/approvedResults.txt
+++ b/projects/SelfTest/Baselines/approvedResults.txt
@@ -6,10 +6,10 @@
 -------------------------------------------------------------------------------
 ./failing/TestClass/failingCase
 -------------------------------------------------------------------------------
-ClassTests.cpp:35
+ClassTests.cpp
 ...............................................................................
 
-ClassTests.cpp:28: FAILED:
+ClassTests.cpp: FAILED:
   REQUIRE( s == "world" )
 with expansion:
   "hello" == "world"
@@ -17,10 +17,10 @@
 -------------------------------------------------------------------------------
 ./failing/Fixture/failingCase
 -------------------------------------------------------------------------------
-ClassTests.cpp:53
+ClassTests.cpp
 ...............................................................................
 
-ClassTests.cpp:55: FAILED:
+ClassTests.cpp: FAILED:
   REQUIRE( m_a == 2 )
 with expansion:
   1 == 2
@@ -28,70 +28,70 @@
 -------------------------------------------------------------------------------
 ./failing/conditions/equality
 -------------------------------------------------------------------------------
-ConditionTests.cpp:67
+ConditionTests.cpp
 ...............................................................................
 
-ConditionTests.cpp:71: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK( data.int_seven == 6 )
 with expansion:
   7 == 6
 
-ConditionTests.cpp:72: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK( data.int_seven == 8 )
 with expansion:
   7 == 8
 
-ConditionTests.cpp:73: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK( data.int_seven == 0 )
 with expansion:
   7 == 0
 
-ConditionTests.cpp:74: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK( data.float_nine_point_one == Approx( 9.11f ) )
 with expansion:
   9.1 == Approx( 9.11 )
 
-ConditionTests.cpp:75: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK( data.float_nine_point_one == Approx( 9.0f ) )
 with expansion:
   9.1 == Approx( 9 )
 
-ConditionTests.cpp:76: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK( data.float_nine_point_one == Approx( 1 ) )
 with expansion:
   9.1 == Approx( 1 )
 
-ConditionTests.cpp:77: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK( data.float_nine_point_one == Approx( 0 ) )
 with expansion:
   9.1 == Approx( 0 )
 
-ConditionTests.cpp:78: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK( data.double_pi == Approx( 3.1415 ) )
 with expansion:
   3.1415926535 == Approx( 3.1415 )
 
-ConditionTests.cpp:79: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK( data.str_hello == "goodbye" )
 with expansion:
   "hello" == "goodbye"
 
-ConditionTests.cpp:80: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK( data.str_hello == "hell" )
 with expansion:
   "hello" == "hell"
 
-ConditionTests.cpp:81: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK( data.str_hello == "hello1" )
 with expansion:
   "hello" == "hello1"
 
-ConditionTests.cpp:82: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK( data.str_hello.size() == 6 )
 with expansion:
   5 == 6
 
-ConditionTests.cpp:85: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK( x == Approx( 1.301 ) )
 with expansion:
   1.3 == Approx( 1.301 )
@@ -99,30 +99,30 @@
 -------------------------------------------------------------------------------
 ./failing/conditions/inequality
 -------------------------------------------------------------------------------
-ConditionTests.cpp:107
+ConditionTests.cpp
 ...............................................................................
 
-ConditionTests.cpp:111: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK( data.int_seven != 7 )
 with expansion:
   7 != 7
 
-ConditionTests.cpp:112: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK( data.float_nine_point_one != Approx( 9.1f ) )
 with expansion:
   9.1 != Approx( 9.1 )
 
-ConditionTests.cpp:113: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK( data.double_pi != Approx( 3.1415926535 ) )
 with expansion:
   3.1415926535 != Approx( 3.14159 )
 
-ConditionTests.cpp:114: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK( data.str_hello != "hello" )
 with expansion:
   "hello" != "hello"
 
-ConditionTests.cpp:115: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK( data.str_hello.size() != 5 )
 with expansion:
   5 != 5
@@ -130,100 +130,100 @@
 -------------------------------------------------------------------------------
 ./failing/conditions/ordered
 -------------------------------------------------------------------------------
-ConditionTests.cpp:148
+ConditionTests.cpp
 ...............................................................................
 
-ConditionTests.cpp:152: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK( data.int_seven > 7 )
 with expansion:
   7 > 7
 
-ConditionTests.cpp:153: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK( data.int_seven < 7 )
 with expansion:
   7 < 7
 
-ConditionTests.cpp:154: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK( data.int_seven > 8 )
 with expansion:
   7 > 8
 
-ConditionTests.cpp:155: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK( data.int_seven < 6 )
 with expansion:
   7 < 6
 
-ConditionTests.cpp:156: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK( data.int_seven < 0 )
 with expansion:
   7 < 0
 
-ConditionTests.cpp:157: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK( data.int_seven < -1 )
 with expansion:
   7 < -1
 
-ConditionTests.cpp:159: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK( data.int_seven >= 8 )
 with expansion:
   7 >= 8
 
-ConditionTests.cpp:160: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK( data.int_seven <= 6 )
 with expansion:
   7 <= 6
 
-ConditionTests.cpp:162: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK( data.float_nine_point_one < 9 )
 with expansion:
   9.1 < 9
 
-ConditionTests.cpp:163: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK( data.float_nine_point_one > 10 )
 with expansion:
   9.1 > 10
 
-ConditionTests.cpp:164: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK( data.float_nine_point_one > 9.2 )
 with expansion:
   9.1 > 9.199999999999999
 
-ConditionTests.cpp:166: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK( data.str_hello > "hello" )
 with expansion:
   "hello" > "hello"
 
-ConditionTests.cpp:167: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK( data.str_hello < "hello" )
 with expansion:
   "hello" < "hello"
 
-ConditionTests.cpp:168: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK( data.str_hello > "hellp" )
 with expansion:
   "hello" > "hellp"
 
-ConditionTests.cpp:169: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK( data.str_hello > "z" )
 with expansion:
   "hello" > "z"
 
-ConditionTests.cpp:170: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK( data.str_hello < "hellm" )
 with expansion:
   "hello" < "hellm"
 
-ConditionTests.cpp:171: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK( data.str_hello < "a" )
 with expansion:
   "hello" < "a"
 
-ConditionTests.cpp:173: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK( data.str_hello >= "z" )
 with expansion:
   "hello" >= "z"
 
-ConditionTests.cpp:174: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK( data.str_hello <= "a" )
 with expansion:
   "hello" <= "a"
@@ -231,39 +231,39 @@
 -------------------------------------------------------------------------------
 ./failing/conditions/not
 -------------------------------------------------------------------------------
-ConditionTests.cpp:333
+ConditionTests.cpp
 ...............................................................................
 
-ConditionTests.cpp:337: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK( false != false )
 
-ConditionTests.cpp:338: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK( true != true )
 
-ConditionTests.cpp:339: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK( !true )
 with expansion:
   false
 
-ConditionTests.cpp:340: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK_FALSE( true )
 
-ConditionTests.cpp:342: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK( !trueValue )
 with expansion:
   false
 
-ConditionTests.cpp:343: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK_FALSE( trueValue )
 with expansion:
   !true
 
-ConditionTests.cpp:345: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK( !(1 == 1) )
 with expansion:
   false
 
-ConditionTests.cpp:346: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK_FALSE( 1 == 1 )
 with expansion:
   !(1 == 1)
@@ -271,19 +271,19 @@
 -------------------------------------------------------------------------------
 ./failing/exceptions/explicit
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:38
+ExceptionTests.cpp
 ...............................................................................
 
-ExceptionTests.cpp:40: FAILED:
+ExceptionTests.cpp: FAILED:
   CHECK_THROWS_AS( thisThrows() )
 due to unexpected exception with message:
   expected exception
 
-ExceptionTests.cpp:41: FAILED:
+ExceptionTests.cpp: FAILED:
   CHECK_THROWS_AS( thisDoesntThrow() )
 because no exception was thrown where one was expected:
 
-ExceptionTests.cpp:42: FAILED:
+ExceptionTests.cpp: FAILED:
   CHECK_NOTHROW( thisThrows() )
 due to unexpected exception with message:
   expected exception
@@ -291,20 +291,20 @@
 -------------------------------------------------------------------------------
 ./failing/exceptions/implicit
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:45
+ExceptionTests.cpp
 ...............................................................................
 
-ExceptionTests.cpp:45: FAILED:
+ExceptionTests.cpp: FAILED:
 due to unexpected exception with message:
   unexpected exception
 
 -------------------------------------------------------------------------------
 ./failing/exceptions/implicit/2
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:51
+ExceptionTests.cpp
 ...............................................................................
 
-ExceptionTests.cpp:53: FAILED:
+ExceptionTests.cpp: FAILED:
   {Unknown expression after the reported line}
 due to unexpected exception with message:
   unexpected exception
@@ -313,20 +313,20 @@
 ./failing/exceptions/implicit/3
   section name
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:59
+ExceptionTests.cpp
 ...............................................................................
 
-ExceptionTests.cpp:59: FAILED:
+ExceptionTests.cpp: FAILED:
 due to unexpected exception with message:
   unexpected exception
 
 -------------------------------------------------------------------------------
 ./failing/exceptions/implicit/4
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:66
+ExceptionTests.cpp
 ...............................................................................
 
-ExceptionTests.cpp:68: FAILED:
+ExceptionTests.cpp: FAILED:
   CHECK( thisThrows() == 0 )
 due to unexpected exception with message:
   expected exception
@@ -334,20 +334,20 @@
 -------------------------------------------------------------------------------
 ./failing/exceptions/custom
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:108
+ExceptionTests.cpp
 ...............................................................................
 
-ExceptionTests.cpp:108: FAILED:
+ExceptionTests.cpp: FAILED:
 due to unexpected exception with message:
   custom exception
 
 -------------------------------------------------------------------------------
 ./failing/exceptions/custom/nothrow
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:119
+ExceptionTests.cpp
 ...............................................................................
 
-ExceptionTests.cpp:121: FAILED:
+ExceptionTests.cpp: FAILED:
   REQUIRE_NOTHROW( throwCustom() )
 due to unexpected exception with message:
   custom exception - not std
@@ -355,10 +355,10 @@
 -------------------------------------------------------------------------------
 ./failing/exceptions/custom/throw
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:124
+ExceptionTests.cpp
 ...............................................................................
 
-ExceptionTests.cpp:126: FAILED:
+ExceptionTests.cpp: FAILED:
   REQUIRE_THROWS_AS( throwCustom() )
 due to unexpected exception with message:
   custom exception - not std
@@ -366,20 +366,20 @@
 -------------------------------------------------------------------------------
 ./failing/exceptions/custom/double
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:130
+ExceptionTests.cpp
 ...............................................................................
 
-ExceptionTests.cpp:130: FAILED:
+ExceptionTests.cpp: FAILED:
 due to unexpected exception with message:
   3.14
 
 -------------------------------------------------------------------------------
 ./failing/message/info/1
 -------------------------------------------------------------------------------
-MessageTests.cpp:21
+MessageTests.cpp
 ...............................................................................
 
-MessageTests.cpp:26: FAILED:
+MessageTests.cpp: FAILED:
   REQUIRE( a == 1 )
 with expansion:
   2 == 1
@@ -390,10 +390,10 @@
 -------------------------------------------------------------------------------
 ./mixed/message/info/2
 -------------------------------------------------------------------------------
-MessageTests.cpp:30
+MessageTests.cpp
 ...............................................................................
 
-MessageTests.cpp:39: FAILED:
+MessageTests.cpp: FAILED:
   CHECK( a == 1 )
 with expansion:
   2 == 1
@@ -401,7 +401,7 @@
   this message may be logged later
   this message should be logged
 
-MessageTests.cpp:43: FAILED:
+MessageTests.cpp: FAILED:
   CHECK( a == 0 )
 with expansion:
   2 == 0
@@ -411,10 +411,10 @@
 -------------------------------------------------------------------------------
 ./failing/message/fail
 -------------------------------------------------------------------------------
-MessageTests.cpp:50
+MessageTests.cpp
 ...............................................................................
 
-MessageTests.cpp:53: FAILED:
+MessageTests.cpp: FAILED:
 explicitly with message:
   This is a failure
 
@@ -422,10 +422,10 @@
 ./failing/message/sections
   one
 -------------------------------------------------------------------------------
-MessageTests.cpp:58
+MessageTests.cpp
 ...............................................................................
 
-MessageTests.cpp:60: FAILED:
+MessageTests.cpp: FAILED:
 explicitly with message:
   Message from section one
 
@@ -433,10 +433,10 @@
 ./failing/message/sections
   two
 -------------------------------------------------------------------------------
-MessageTests.cpp:63
+MessageTests.cpp
 ...............................................................................
 
-MessageTests.cpp:65: FAILED:
+MessageTests.cpp: FAILED:
 explicitly with message:
   Message from section two
 
@@ -445,10 +445,10 @@
 -------------------------------------------------------------------------------
 ./mixed/message/scoped
 -------------------------------------------------------------------------------
-MessageTests.cpp:82
+MessageTests.cpp
 ...............................................................................
 
-MessageTests.cpp:88: FAILED:
+MessageTests.cpp: FAILED:
   REQUIRE( i < 10 )
 with expansion:
   10 < 10
@@ -459,10 +459,10 @@
 -------------------------------------------------------------------------------
 just failure
 -------------------------------------------------------------------------------
-MessageTests.cpp:101
+MessageTests.cpp
 ...............................................................................
 
-MessageTests.cpp:103: FAILED:
+MessageTests.cpp: FAILED:
 explicitly with message:
   Previous info should not be seen
 
@@ -471,10 +471,10 @@
   s1
   s2
 -------------------------------------------------------------------------------
-MiscTests.cpp:55
+MiscTests.cpp
 ...............................................................................
 
-MiscTests.cpp:57: FAILED:
+MiscTests.cpp: FAILED:
   REQUIRE( a == b )
 with expansion:
   1 == 2
@@ -483,10 +483,10 @@
 ./mixed/Misc/Sections/loops
   s1
 -------------------------------------------------------------------------------
-MiscTests.cpp:97
+MiscTests.cpp
 ...............................................................................
 
-MiscTests.cpp:99: FAILED:
+MiscTests.cpp: FAILED:
   CHECK( b > a )
 with expansion:
   0 > 1
@@ -494,45 +494,45 @@
 -------------------------------------------------------------------------------
 ./mixed/Misc/loops
 -------------------------------------------------------------------------------
-MiscTests.cpp:104
+MiscTests.cpp
 ...............................................................................
 
-MiscTests.cpp:111: FAILED:
+MiscTests.cpp: FAILED:
   CHECK( ( fib[i] % 2 ) == 0 )
 with expansion:
   1 == 0
 with message:
   Testing if fib[0] (1) is even
 
-MiscTests.cpp:111: FAILED:
+MiscTests.cpp: FAILED:
   CHECK( ( fib[i] % 2 ) == 0 )
 with expansion:
   1 == 0
 with message:
   Testing if fib[1] (1) is even
 
-MiscTests.cpp:111: FAILED:
+MiscTests.cpp: FAILED:
   CHECK( ( fib[i] % 2 ) == 0 )
 with expansion:
   1 == 0
 with message:
   Testing if fib[3] (3) is even
 
-MiscTests.cpp:111: FAILED:
+MiscTests.cpp: FAILED:
   CHECK( ( fib[i] % 2 ) == 0 )
 with expansion:
   1 == 0
 with message:
   Testing if fib[4] (5) is even
 
-MiscTests.cpp:111: FAILED:
+MiscTests.cpp: FAILED:
   CHECK( ( fib[i] % 2 ) == 0 )
 with expansion:
   1 == 0
 with message:
   Testing if fib[6] (13) is even
 
-MiscTests.cpp:111: FAILED:
+MiscTests.cpp: FAILED:
   CHECK( ( fib[i] % 2 ) == 0 )
 with expansion:
   1 == 0
@@ -544,10 +544,10 @@
 -------------------------------------------------------------------------------
 ./failing/info
 -------------------------------------------------------------------------------
-MiscTests.cpp:133
+MiscTests.cpp
 ...............................................................................
 
-MiscTests.cpp:138: FAILED:
+MiscTests.cpp: FAILED:
   REQUIRE( false )
 with messages:
   hi
@@ -556,15 +556,15 @@
 -------------------------------------------------------------------------------
 ./failing/checkedif
 -------------------------------------------------------------------------------
-MiscTests.cpp:154
+MiscTests.cpp
 ...............................................................................
 
-MiscTests.cpp:143: FAILED:
+MiscTests.cpp: FAILED:
   CHECKED_IF( flag )
 with expansion:
   false
 
-MiscTests.cpp:156: FAILED:
+MiscTests.cpp: FAILED:
   REQUIRE( testCheckedIf( false ) )
 with expansion:
   false
@@ -572,15 +572,15 @@
 -------------------------------------------------------------------------------
 ./failing/checkedelse
 -------------------------------------------------------------------------------
-MiscTests.cpp:172
+MiscTests.cpp
 ...............................................................................
 
-MiscTests.cpp:161: FAILED:
+MiscTests.cpp: FAILED:
   CHECKED_ELSE( flag )
 with expansion:
   false
 
-MiscTests.cpp:174: FAILED:
+MiscTests.cpp: FAILED:
   REQUIRE( testCheckedElse( false ) )
 with expansion:
   false
@@ -588,10 +588,10 @@
 -------------------------------------------------------------------------------
 ./manual/onechar
 -------------------------------------------------------------------------------
-MiscTests.cpp:189
+MiscTests.cpp
 ...............................................................................
 
-MiscTests.cpp:192: FAILED:
+MiscTests.cpp: FAILED:
   REQUIRE( false )
 with message:
   3
@@ -599,10 +599,10 @@
 -------------------------------------------------------------------------------
 ./failing/matchers/Contains
 -------------------------------------------------------------------------------
-MiscTests.cpp:219
+MiscTests.cpp
 ...............................................................................
 
-MiscTests.cpp:221: FAILED:
+MiscTests.cpp: FAILED:
   CHECK_THAT( testStringForMatching() Contains( "not there" ) )
 with expansion:
   "this string contains 'abc' as a substring" contains: "not there"
@@ -610,10 +610,10 @@
 -------------------------------------------------------------------------------
 ./failing/matchers/StartsWith
 -------------------------------------------------------------------------------
-MiscTests.cpp:224
+MiscTests.cpp
 ...............................................................................
 
-MiscTests.cpp:226: FAILED:
+MiscTests.cpp: FAILED:
   CHECK_THAT( testStringForMatching() StartsWith( "string" ) )
 with expansion:
   "this string contains 'abc' as a substring" starts with: "string"
@@ -621,10 +621,10 @@
 -------------------------------------------------------------------------------
 ./failing/matchers/EndsWith
 -------------------------------------------------------------------------------
-MiscTests.cpp:229
+MiscTests.cpp
 ...............................................................................
 
-MiscTests.cpp:231: FAILED:
+MiscTests.cpp: FAILED:
   CHECK_THAT( testStringForMatching() EndsWith( "this" ) )
 with expansion:
   "this string contains 'abc' as a substring" ends with: "this"
@@ -632,10 +632,10 @@
 -------------------------------------------------------------------------------
 ./failing/matchers/Equals
 -------------------------------------------------------------------------------
-MiscTests.cpp:234
+MiscTests.cpp
 ...............................................................................
 
-MiscTests.cpp:236: FAILED:
+MiscTests.cpp: FAILED:
   CHECK_THAT( testStringForMatching() Equals( "something else" ) )
 with expansion:
   "this string contains 'abc' as a substring" equals: "something else"
@@ -653,15 +653,15 @@
 -------------------------------------------------------------------------------
 ./failing/Tricky/non streamable type
 -------------------------------------------------------------------------------
-TrickyTests.cpp:88
+TrickyTests.cpp
 ...............................................................................
 
-TrickyTests.cpp:95: FAILED:
+TrickyTests.cpp: FAILED:
   CHECK( &o1 == &o2 )
 with expansion:
   0x<hex digits> == 0x<hex digits>
 
-TrickyTests.cpp:96: FAILED:
+TrickyTests.cpp: FAILED:
   CHECK( o1 == o2 )
 with expansion:
   {?} == {?}
@@ -669,10 +669,10 @@
 -------------------------------------------------------------------------------
 ./failing/string literals
 -------------------------------------------------------------------------------
-TrickyTests.cpp:104
+TrickyTests.cpp
 ...............................................................................
 
-TrickyTests.cpp:106: FAILED:
+TrickyTests.cpp: FAILED:
   REQUIRE( std::string( "first" ) == "second" )
 with expansion:
   "first" == "second"
@@ -688,40 +688,40 @@
 -------------------------------------------------------------------------------
 ./succeeding/Approx/simple
 -------------------------------------------------------------------------------
-ApproxTests.cpp:16
+ApproxTests.cpp
 ...............................................................................
 
-ApproxTests.cpp:20:
+ApproxTests.cpp:
 PASSED:
   REQUIRE( d == Approx( 1.23 ) )
 with expansion:
   1.23 == Approx( 1.23 )
 
-ApproxTests.cpp:21:
+ApproxTests.cpp:
 PASSED:
   REQUIRE( d != Approx( 1.22 ) )
 with expansion:
   1.23 != Approx( 1.22 )
 
-ApproxTests.cpp:22:
+ApproxTests.cpp:
 PASSED:
   REQUIRE( d != Approx( 1.24 ) )
 with expansion:
   1.23 != Approx( 1.24 )
 
-ApproxTests.cpp:24:
+ApproxTests.cpp:
 PASSED:
   REQUIRE( Approx( d ) == 1.23 )
 with expansion:
   Approx( 1.23 ) == 1.23
 
-ApproxTests.cpp:25:
+ApproxTests.cpp:
 PASSED:
   REQUIRE( Approx( d ) != 1.22 )
 with expansion:
   Approx( 1.23 ) != 1.22
 
-ApproxTests.cpp:26:
+ApproxTests.cpp:
 PASSED:
   REQUIRE( Approx( d ) != 1.24 )
 with expansion:
@@ -730,16 +730,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/Approx/epsilon
 -------------------------------------------------------------------------------
-ApproxTests.cpp:34
+ApproxTests.cpp
 ...............................................................................
 
-ApproxTests.cpp:38:
+ApproxTests.cpp:
 PASSED:
   REQUIRE( d != Approx( 1.231 ) )
 with expansion:
   1.23 != Approx( 1.231 )
 
-ApproxTests.cpp:39:
+ApproxTests.cpp:
 PASSED:
   REQUIRE( d == Approx( 1.231 ).epsilon( 0.1 ) )
 with expansion:
@@ -748,16 +748,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/Approx/float
 -------------------------------------------------------------------------------
-ApproxTests.cpp:47
+ApproxTests.cpp
 ...............................................................................
 
-ApproxTests.cpp:49:
+ApproxTests.cpp:
 PASSED:
   REQUIRE( 1.23f == Approx( 1.23f ) )
 with expansion:
   1.23 == Approx( 1.23 )
 
-ApproxTests.cpp:50:
+ApproxTests.cpp:
 PASSED:
   REQUIRE( 0.0f == Approx( 0.0f ) )
 with expansion:
@@ -766,48 +766,48 @@
 -------------------------------------------------------------------------------
 ./succeeding/Approx/int
 -------------------------------------------------------------------------------
-ApproxTests.cpp:58
+ApproxTests.cpp
 ...............................................................................
 
-ApproxTests.cpp:60:
+ApproxTests.cpp:
 PASSED:
   REQUIRE( 1 == Approx( 1 ) )
 
-ApproxTests.cpp:61:
+ApproxTests.cpp:
 PASSED:
   REQUIRE( 0 == Approx( 0 ) )
 
 -------------------------------------------------------------------------------
 ./succeeding/Approx/mixed
 -------------------------------------------------------------------------------
-ApproxTests.cpp:69
+ApproxTests.cpp
 ...............................................................................
 
-ApproxTests.cpp:75:
+ApproxTests.cpp:
 PASSED:
   REQUIRE( 1.0f == Approx( 1 ) )
 with expansion:
   1 == Approx( 1 )
 
-ApproxTests.cpp:76:
+ApproxTests.cpp:
 PASSED:
   REQUIRE( 0 == Approx( dZero) )
 with expansion:
   0 == Approx( 0 )
 
-ApproxTests.cpp:77:
+ApproxTests.cpp:
 PASSED:
   REQUIRE( 0 == Approx( dSmall ).epsilon( 0.001 ) )
 with expansion:
   0 == Approx( 1e-05 )
 
-ApproxTests.cpp:78:
+ApproxTests.cpp:
 PASSED:
   REQUIRE( 1.234f == Approx( dMedium ) )
 with expansion:
   1.234 == Approx( 1.234 )
 
-ApproxTests.cpp:79:
+ApproxTests.cpp:
 PASSED:
   REQUIRE( dMedium == Approx( 1.234f ) )
 with expansion:
@@ -816,52 +816,52 @@
 -------------------------------------------------------------------------------
 ./succeeding/Approx/custom
 -------------------------------------------------------------------------------
-ApproxTests.cpp:87
+ApproxTests.cpp
 ...............................................................................
 
-ApproxTests.cpp:93:
+ApproxTests.cpp:
 PASSED:
   REQUIRE( d == approx( 1.23 ) )
 with expansion:
   1.23 == Approx( 1.23 )
 
-ApproxTests.cpp:94:
+ApproxTests.cpp:
 PASSED:
   REQUIRE( d == approx( 1.22 ) )
 with expansion:
   1.23 == Approx( 1.22 )
 
-ApproxTests.cpp:95:
+ApproxTests.cpp:
 PASSED:
   REQUIRE( d == approx( 1.24 ) )
 with expansion:
   1.23 == Approx( 1.24 )
 
-ApproxTests.cpp:96:
+ApproxTests.cpp:
 PASSED:
   REQUIRE( d != approx( 1.25 ) )
 with expansion:
   1.23 != Approx( 1.25 )
 
-ApproxTests.cpp:98:
+ApproxTests.cpp:
 PASSED:
   REQUIRE( approx( d ) == 1.23 )
 with expansion:
   Approx( 1.23 ) == 1.23
 
-ApproxTests.cpp:99:
+ApproxTests.cpp:
 PASSED:
   REQUIRE( approx( d ) == 1.22 )
 with expansion:
   Approx( 1.23 ) == 1.22
 
-ApproxTests.cpp:100:
+ApproxTests.cpp:
 PASSED:
   REQUIRE( approx( d ) == 1.24 )
 with expansion:
   Approx( 1.23 ) == 1.24
 
-ApproxTests.cpp:101:
+ApproxTests.cpp:
 PASSED:
   REQUIRE( approx( d ) != 1.25 )
 with expansion:
@@ -870,16 +870,16 @@
 -------------------------------------------------------------------------------
 Approximate PI
 -------------------------------------------------------------------------------
-ApproxTests.cpp:108
+ApproxTests.cpp
 ...............................................................................
 
-ApproxTests.cpp:110:
+ApproxTests.cpp:
 PASSED:
   REQUIRE( divide( 22, 7 ) == Approx( 3.141 ).epsilon( 0.001 ) )
 with expansion:
   3.142857142857143 == Approx( 3.141 )
 
-ApproxTests.cpp:111:
+ApproxTests.cpp:
 PASSED:
   REQUIRE( divide( 22, 7 ) != Approx( 3.141 ).epsilon( 0.0001 ) )
 with expansion:
@@ -888,10 +888,10 @@
 -------------------------------------------------------------------------------
 ./succeeding/TestClass/succeedingCase
 -------------------------------------------------------------------------------
-ClassTests.cpp:34
+ClassTests.cpp
 ...............................................................................
 
-ClassTests.cpp:24:
+ClassTests.cpp:
 PASSED:
   REQUIRE( s == "hello" )
 with expansion:
@@ -900,10 +900,10 @@
 -------------------------------------------------------------------------------
 ./failing/TestClass/failingCase
 -------------------------------------------------------------------------------
-ClassTests.cpp:35
+ClassTests.cpp
 ...............................................................................
 
-ClassTests.cpp:28: FAILED:
+ClassTests.cpp: FAILED:
   REQUIRE( s == "world" )
 with expansion:
   "hello" == "world"
@@ -911,10 +911,10 @@
 -------------------------------------------------------------------------------
 ./succeeding/Fixture/succeedingCase
 -------------------------------------------------------------------------------
-ClassTests.cpp:45
+ClassTests.cpp
 ...............................................................................
 
-ClassTests.cpp:47:
+ClassTests.cpp:
 PASSED:
   REQUIRE( m_a == 1 )
 with expansion:
@@ -923,10 +923,10 @@
 -------------------------------------------------------------------------------
 ./failing/Fixture/failingCase
 -------------------------------------------------------------------------------
-ClassTests.cpp:53
+ClassTests.cpp
 ...............................................................................
 
-ClassTests.cpp:55: FAILED:
+ClassTests.cpp: FAILED:
   REQUIRE( m_a == 2 )
 with expansion:
   1 == 2
@@ -934,46 +934,46 @@
 -------------------------------------------------------------------------------
 ./succeeding/conditions/equality
 -------------------------------------------------------------------------------
-ConditionTests.cpp:47
+ConditionTests.cpp
 ...............................................................................
 
-ConditionTests.cpp:55:
+ConditionTests.cpp:
 PASSED:
   REQUIRE( data.int_seven == 7 )
 with expansion:
   7 == 7
 
-ConditionTests.cpp:56:
+ConditionTests.cpp:
 PASSED:
   REQUIRE( data.float_nine_point_one == Approx( 9.1f ) )
 with expansion:
   9.1 == Approx( 9.1 )
 
-ConditionTests.cpp:57:
+ConditionTests.cpp:
 PASSED:
   REQUIRE( data.double_pi == Approx( 3.1415926535 ) )
 with expansion:
   3.1415926535 == Approx( 3.14159 )
 
-ConditionTests.cpp:58:
+ConditionTests.cpp:
 PASSED:
   REQUIRE( data.str_hello == "hello" )
 with expansion:
   "hello" == "hello"
 
-ConditionTests.cpp:59:
+ConditionTests.cpp:
 PASSED:
   REQUIRE( "hello" == data.str_hello )
 with expansion:
   "hello" == "hello"
 
-ConditionTests.cpp:60:
+ConditionTests.cpp:
 PASSED:
   REQUIRE( data.str_hello.size() == 5 )
 with expansion:
   5 == 5
 
-ConditionTests.cpp:63:
+ConditionTests.cpp:
 PASSED:
   REQUIRE( x == Approx( 1.3 ) )
 with expansion:
@@ -982,70 +982,70 @@
 -------------------------------------------------------------------------------
 ./failing/conditions/equality
 -------------------------------------------------------------------------------
-ConditionTests.cpp:67
+ConditionTests.cpp
 ...............................................................................
 
-ConditionTests.cpp:71: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK( data.int_seven == 6 )
 with expansion:
   7 == 6
 
-ConditionTests.cpp:72: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK( data.int_seven == 8 )
 with expansion:
   7 == 8
 
-ConditionTests.cpp:73: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK( data.int_seven == 0 )
 with expansion:
   7 == 0
 
-ConditionTests.cpp:74: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK( data.float_nine_point_one == Approx( 9.11f ) )
 with expansion:
   9.1 == Approx( 9.11 )
 
-ConditionTests.cpp:75: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK( data.float_nine_point_one == Approx( 9.0f ) )
 with expansion:
   9.1 == Approx( 9 )
 
-ConditionTests.cpp:76: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK( data.float_nine_point_one == Approx( 1 ) )
 with expansion:
   9.1 == Approx( 1 )
 
-ConditionTests.cpp:77: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK( data.float_nine_point_one == Approx( 0 ) )
 with expansion:
   9.1 == Approx( 0 )
 
-ConditionTests.cpp:78: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK( data.double_pi == Approx( 3.1415 ) )
 with expansion:
   3.1415926535 == Approx( 3.1415 )
 
-ConditionTests.cpp:79: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK( data.str_hello == "goodbye" )
 with expansion:
   "hello" == "goodbye"
 
-ConditionTests.cpp:80: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK( data.str_hello == "hell" )
 with expansion:
   "hello" == "hell"
 
-ConditionTests.cpp:81: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK( data.str_hello == "hello1" )
 with expansion:
   "hello" == "hello1"
 
-ConditionTests.cpp:82: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK( data.str_hello.size() == 6 )
 with expansion:
   5 == 6
 
-ConditionTests.cpp:85: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK( x == Approx( 1.301 ) )
 with expansion:
   1.3 == Approx( 1.301 )
@@ -1053,70 +1053,70 @@
 -------------------------------------------------------------------------------
 ./succeeding/conditions/inequality
 -------------------------------------------------------------------------------
-ConditionTests.cpp:89
+ConditionTests.cpp
 ...............................................................................
 
-ConditionTests.cpp:93:
+ConditionTests.cpp:
 PASSED:
   REQUIRE( data.int_seven != 6 )
 with expansion:
   7 != 6
 
-ConditionTests.cpp:94:
+ConditionTests.cpp:
 PASSED:
   REQUIRE( data.int_seven != 8 )
 with expansion:
   7 != 8
 
-ConditionTests.cpp:95:
+ConditionTests.cpp:
 PASSED:
   REQUIRE( data.float_nine_point_one != Approx( 9.11f ) )
 with expansion:
   9.1 != Approx( 9.11 )
 
-ConditionTests.cpp:96:
+ConditionTests.cpp:
 PASSED:
   REQUIRE( data.float_nine_point_one != Approx( 9.0f ) )
 with expansion:
   9.1 != Approx( 9 )
 
-ConditionTests.cpp:97:
+ConditionTests.cpp:
 PASSED:
   REQUIRE( data.float_nine_point_one != Approx( 1 ) )
 with expansion:
   9.1 != Approx( 1 )
 
-ConditionTests.cpp:98:
+ConditionTests.cpp:
 PASSED:
   REQUIRE( data.float_nine_point_one != Approx( 0 ) )
 with expansion:
   9.1 != Approx( 0 )
 
-ConditionTests.cpp:99:
+ConditionTests.cpp:
 PASSED:
   REQUIRE( data.double_pi != Approx( 3.1415 ) )
 with expansion:
   3.1415926535 != Approx( 3.1415 )
 
-ConditionTests.cpp:100:
+ConditionTests.cpp:
 PASSED:
   REQUIRE( data.str_hello != "goodbye" )
 with expansion:
   "hello" != "goodbye"
 
-ConditionTests.cpp:101:
+ConditionTests.cpp:
 PASSED:
   REQUIRE( data.str_hello != "hell" )
 with expansion:
   "hello" != "hell"
 
-ConditionTests.cpp:102:
+ConditionTests.cpp:
 PASSED:
   REQUIRE( data.str_hello != "hello1" )
 with expansion:
   "hello" != "hello1"
 
-ConditionTests.cpp:103:
+ConditionTests.cpp:
 PASSED:
   REQUIRE( data.str_hello.size() != 6 )
 with expansion:
@@ -1125,30 +1125,30 @@
 -------------------------------------------------------------------------------
 ./failing/conditions/inequality
 -------------------------------------------------------------------------------
-ConditionTests.cpp:107
+ConditionTests.cpp
 ...............................................................................
 
-ConditionTests.cpp:111: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK( data.int_seven != 7 )
 with expansion:
   7 != 7
 
-ConditionTests.cpp:112: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK( data.float_nine_point_one != Approx( 9.1f ) )
 with expansion:
   9.1 != Approx( 9.1 )
 
-ConditionTests.cpp:113: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK( data.double_pi != Approx( 3.1415926535 ) )
 with expansion:
   3.1415926535 != Approx( 3.14159 )
 
-ConditionTests.cpp:114: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK( data.str_hello != "hello" )
 with expansion:
   "hello" != "hello"
 
-ConditionTests.cpp:115: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK( data.str_hello.size() != 5 )
 with expansion:
   5 != 5
@@ -1156,106 +1156,106 @@
 -------------------------------------------------------------------------------
 ./succeeding/conditions/ordered
 -------------------------------------------------------------------------------
-ConditionTests.cpp:120
+ConditionTests.cpp
 ...............................................................................
 
-ConditionTests.cpp:124:
+ConditionTests.cpp:
 PASSED:
   REQUIRE( data.int_seven < 8 )
 with expansion:
   7 < 8
 
-ConditionTests.cpp:125:
+ConditionTests.cpp:
 PASSED:
   REQUIRE( data.int_seven > 6 )
 with expansion:
   7 > 6
 
-ConditionTests.cpp:126:
+ConditionTests.cpp:
 PASSED:
   REQUIRE( data.int_seven > 0 )
 with expansion:
   7 > 0
 
-ConditionTests.cpp:127:
+ConditionTests.cpp:
 PASSED:
   REQUIRE( data.int_seven > -1 )
 with expansion:
   7 > -1
 
-ConditionTests.cpp:129:
+ConditionTests.cpp:
 PASSED:
   REQUIRE( data.int_seven >= 7 )
 with expansion:
   7 >= 7
 
-ConditionTests.cpp:130:
+ConditionTests.cpp:
 PASSED:
   REQUIRE( data.int_seven >= 6 )
 with expansion:
   7 >= 6
 
-ConditionTests.cpp:131:
+ConditionTests.cpp:
 PASSED:
   REQUIRE( data.int_seven <= 7 )
 with expansion:
   7 <= 7
 
-ConditionTests.cpp:132:
+ConditionTests.cpp:
 PASSED:
   REQUIRE( data.int_seven <= 8 )
 with expansion:
   7 <= 8
 
-ConditionTests.cpp:134:
+ConditionTests.cpp:
 PASSED:
   REQUIRE( data.float_nine_point_one > 9 )
 with expansion:
   9.1 > 9
 
-ConditionTests.cpp:135:
+ConditionTests.cpp:
 PASSED:
   REQUIRE( data.float_nine_point_one < 10 )
 with expansion:
   9.1 < 10
 
-ConditionTests.cpp:136:
+ConditionTests.cpp:
 PASSED:
   REQUIRE( data.float_nine_point_one < 9.2 )
 with expansion:
   9.1 < 9.199999999999999
 
-ConditionTests.cpp:138:
+ConditionTests.cpp:
 PASSED:
   REQUIRE( data.str_hello <= "hello" )
 with expansion:
   "hello" <= "hello"
 
-ConditionTests.cpp:139:
+ConditionTests.cpp:
 PASSED:
   REQUIRE( data.str_hello >= "hello" )
 with expansion:
   "hello" >= "hello"
 
-ConditionTests.cpp:141:
+ConditionTests.cpp:
 PASSED:
   REQUIRE( data.str_hello < "hellp" )
 with expansion:
   "hello" < "hellp"
 
-ConditionTests.cpp:142:
+ConditionTests.cpp:
 PASSED:
   REQUIRE( data.str_hello < "zebra" )
 with expansion:
   "hello" < "zebra"
 
-ConditionTests.cpp:143:
+ConditionTests.cpp:
 PASSED:
   REQUIRE( data.str_hello > "hellm" )
 with expansion:
   "hello" > "hellm"
 
-ConditionTests.cpp:144:
+ConditionTests.cpp:
 PASSED:
   REQUIRE( data.str_hello > "a" )
 with expansion:
@@ -1264,100 +1264,100 @@
 -------------------------------------------------------------------------------
 ./failing/conditions/ordered
 -------------------------------------------------------------------------------
-ConditionTests.cpp:148
+ConditionTests.cpp
 ...............................................................................
 
-ConditionTests.cpp:152: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK( data.int_seven > 7 )
 with expansion:
   7 > 7
 
-ConditionTests.cpp:153: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK( data.int_seven < 7 )
 with expansion:
   7 < 7
 
-ConditionTests.cpp:154: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK( data.int_seven > 8 )
 with expansion:
   7 > 8
 
-ConditionTests.cpp:155: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK( data.int_seven < 6 )
 with expansion:
   7 < 6
 
-ConditionTests.cpp:156: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK( data.int_seven < 0 )
 with expansion:
   7 < 0
 
-ConditionTests.cpp:157: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK( data.int_seven < -1 )
 with expansion:
   7 < -1
 
-ConditionTests.cpp:159: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK( data.int_seven >= 8 )
 with expansion:
   7 >= 8
 
-ConditionTests.cpp:160: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK( data.int_seven <= 6 )
 with expansion:
   7 <= 6
 
-ConditionTests.cpp:162: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK( data.float_nine_point_one < 9 )
 with expansion:
   9.1 < 9
 
-ConditionTests.cpp:163: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK( data.float_nine_point_one > 10 )
 with expansion:
   9.1 > 10
 
-ConditionTests.cpp:164: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK( data.float_nine_point_one > 9.2 )
 with expansion:
   9.1 > 9.199999999999999
 
-ConditionTests.cpp:166: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK( data.str_hello > "hello" )
 with expansion:
   "hello" > "hello"
 
-ConditionTests.cpp:167: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK( data.str_hello < "hello" )
 with expansion:
   "hello" < "hello"
 
-ConditionTests.cpp:168: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK( data.str_hello > "hellp" )
 with expansion:
   "hello" > "hellp"
 
-ConditionTests.cpp:169: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK( data.str_hello > "z" )
 with expansion:
   "hello" > "z"
 
-ConditionTests.cpp:170: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK( data.str_hello < "hellm" )
 with expansion:
   "hello" < "hellm"
 
-ConditionTests.cpp:171: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK( data.str_hello < "a" )
 with expansion:
   "hello" < "a"
 
-ConditionTests.cpp:173: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK( data.str_hello >= "z" )
 with expansion:
   "hello" >= "z"
 
-ConditionTests.cpp:174: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK( data.str_hello <= "a" )
 with expansion:
   "hello" <= "a"
@@ -1365,82 +1365,82 @@
 -------------------------------------------------------------------------------
 ./succeeding/conditions/int literals
 -------------------------------------------------------------------------------
-ConditionTests.cpp:179
+ConditionTests.cpp
 ...............................................................................
 
-ConditionTests.cpp:188:
+ConditionTests.cpp:
 PASSED:
   REQUIRE( i == 1 )
 with expansion:
   1 == 1
 
-ConditionTests.cpp:189:
+ConditionTests.cpp:
 PASSED:
   REQUIRE( ui == 2 )
 with expansion:
   2 == 2
 
-ConditionTests.cpp:190:
+ConditionTests.cpp:
 PASSED:
   REQUIRE( l == 3 )
 with expansion:
   3 == 3
 
-ConditionTests.cpp:191:
+ConditionTests.cpp:
 PASSED:
   REQUIRE( ul == 4 )
 with expansion:
   4 == 4
 
-ConditionTests.cpp:192:
+ConditionTests.cpp:
 PASSED:
   REQUIRE( c == 5 )
 with expansion:
   5 == 5
 
-ConditionTests.cpp:193:
+ConditionTests.cpp:
 PASSED:
   REQUIRE( uc == 6 )
 with expansion:
   6 == 6
 
-ConditionTests.cpp:195:
+ConditionTests.cpp:
 PASSED:
   REQUIRE( 1 == i )
 with expansion:
   1 == 1
 
-ConditionTests.cpp:196:
+ConditionTests.cpp:
 PASSED:
   REQUIRE( 2 == ui )
 with expansion:
   2 == 2
 
-ConditionTests.cpp:197:
+ConditionTests.cpp:
 PASSED:
   REQUIRE( 3 == l )
 with expansion:
   3 == 3
 
-ConditionTests.cpp:198:
+ConditionTests.cpp:
 PASSED:
   REQUIRE( 4 == ul )
 with expansion:
   4 == 4
 
-ConditionTests.cpp:199:
+ConditionTests.cpp:
 PASSED:
   REQUIRE( 5 == c )
 with expansion:
   5 == 5
 
-ConditionTests.cpp:200:
+ConditionTests.cpp:
 PASSED:
   REQUIRE( 6 == uc )
 with expansion:
   6 == 6
 
-ConditionTests.cpp:202:
+ConditionTests.cpp:
 PASSED:
   REQUIRE( (std::numeric_limits<unsigned long>::max)() > ul )
 with expansion:
@@ -1449,28 +1449,28 @@
 -------------------------------------------------------------------------------
 ./succeeding/conditions//long_to_unsigned_x
 -------------------------------------------------------------------------------
-ConditionTests.cpp:218
+ConditionTests.cpp
 ...............................................................................
 
-ConditionTests.cpp:226:
+ConditionTests.cpp:
 PASSED:
   REQUIRE( long_var == unsigned_char_var )
 with expansion:
   1 == 1
 
-ConditionTests.cpp:227:
+ConditionTests.cpp:
 PASSED:
   REQUIRE( long_var == unsigned_short_var )
 with expansion:
   1 == 1
 
-ConditionTests.cpp:228:
+ConditionTests.cpp:
 PASSED:
   REQUIRE( long_var == unsigned_int_var )
 with expansion:
   1 == 1
 
-ConditionTests.cpp:229:
+ConditionTests.cpp:
 PASSED:
   REQUIRE( long_var == unsigned_long_var )
 with expansion:
@@ -1479,28 +1479,28 @@
 -------------------------------------------------------------------------------
 ./succeeding/conditions/const ints to int literal
 -------------------------------------------------------------------------------
-ConditionTests.cpp:233
+ConditionTests.cpp
 ...............................................................................
 
-ConditionTests.cpp:240:
+ConditionTests.cpp:
 PASSED:
   REQUIRE( unsigned_char_var == 1 )
 with expansion:
   1 == 1
 
-ConditionTests.cpp:241:
+ConditionTests.cpp:
 PASSED:
   REQUIRE( unsigned_short_var == 1 )
 with expansion:
   1 == 1
 
-ConditionTests.cpp:242:
+ConditionTests.cpp:
 PASSED:
   REQUIRE( unsigned_int_var == 1 )
 with expansion:
   1 == 1
 
-ConditionTests.cpp:243:
+ConditionTests.cpp:
 PASSED:
   REQUIRE( unsigned_long_var == 1 )
 with expansion:
@@ -1509,40 +1509,40 @@
 -------------------------------------------------------------------------------
 ./succeeding/conditions/negative ints
 -------------------------------------------------------------------------------
-ConditionTests.cpp:247
+ConditionTests.cpp
 ...............................................................................
 
-ConditionTests.cpp:249:
+ConditionTests.cpp:
 PASSED:
   CHECK( ( -1 > 2u ) )
 with expansion:
   true
 
-ConditionTests.cpp:250:
+ConditionTests.cpp:
 PASSED:
   CHECK( -1 > 2u )
 with expansion:
   -1 > 2
 
-ConditionTests.cpp:252:
+ConditionTests.cpp:
 PASSED:
   CHECK( ( 2u < -1 ) )
 with expansion:
   true
 
-ConditionTests.cpp:253:
+ConditionTests.cpp:
 PASSED:
   CHECK( 2u < -1 )
 with expansion:
   2 < -1
 
-ConditionTests.cpp:256:
+ConditionTests.cpp:
 PASSED:
   CHECK( ( minInt > 2u ) )
 with expansion:
   true
 
-ConditionTests.cpp:257:
+ConditionTests.cpp:
 PASSED:
   CHECK( minInt > 2u )
 with expansion:
@@ -1551,10 +1551,10 @@
 -------------------------------------------------------------------------------
 ./succeeding/conditions/computed ints
 -------------------------------------------------------------------------------
-ConditionTests.cpp:270
+ConditionTests.cpp
 ...............................................................................
 
-ConditionTests.cpp:272:
+ConditionTests.cpp:
 PASSED:
   CHECK( 54 == 6*9 )
 with expansion:
@@ -1563,52 +1563,52 @@
 -------------------------------------------------------------------------------
 ./succeeding/conditions/ptr
 -------------------------------------------------------------------------------
-ConditionTests.cpp:283
+ConditionTests.cpp
 ...............................................................................
 
-ConditionTests.cpp:288:
+ConditionTests.cpp:
 PASSED:
   REQUIRE( p == __null )
 with expansion:
   __null == 0
 
-ConditionTests.cpp:289:
+ConditionTests.cpp:
 PASSED:
   REQUIRE( p == pNULL )
 with expansion:
   __null == __null
 
-ConditionTests.cpp:294:
+ConditionTests.cpp:
 PASSED:
   REQUIRE( p != __null )
 with expansion:
   0x<hex digits> != 0
 
-ConditionTests.cpp:297:
+ConditionTests.cpp:
 PASSED:
   REQUIRE( cp != __null )
 with expansion:
   0x<hex digits> != 0
 
-ConditionTests.cpp:300:
+ConditionTests.cpp:
 PASSED:
   REQUIRE( cpc != __null )
 with expansion:
   0x<hex digits> != 0
 
-ConditionTests.cpp:302:
+ConditionTests.cpp:
 PASSED:
   REQUIRE( returnsNull() == __null )
 with expansion:
   {null string} == 0
 
-ConditionTests.cpp:303:
+ConditionTests.cpp:
 PASSED:
   REQUIRE( returnsConstNull() == __null )
 with expansion:
   {null string} == 0
 
-ConditionTests.cpp:305:
+ConditionTests.cpp:
 PASSED:
   REQUIRE( __null != p )
 with expansion:
@@ -1617,46 +1617,46 @@
 -------------------------------------------------------------------------------
 ./succeeding/conditions/not
 -------------------------------------------------------------------------------
-ConditionTests.cpp:316
+ConditionTests.cpp
 ...............................................................................
 
-ConditionTests.cpp:320:
+ConditionTests.cpp:
 PASSED:
   REQUIRE( false == false )
 
-ConditionTests.cpp:321:
+ConditionTests.cpp:
 PASSED:
   REQUIRE( true == true )
 
-ConditionTests.cpp:322:
+ConditionTests.cpp:
 PASSED:
   REQUIRE( !false )
 with expansion:
   true
 
-ConditionTests.cpp:323:
+ConditionTests.cpp:
 PASSED:
   REQUIRE_FALSE( false )
 
-ConditionTests.cpp:325:
+ConditionTests.cpp:
 PASSED:
   REQUIRE( !falseValue )
 with expansion:
   true
 
-ConditionTests.cpp:326:
+ConditionTests.cpp:
 PASSED:
   REQUIRE_FALSE( falseValue )
 with expansion:
   !false
 
-ConditionTests.cpp:328:
+ConditionTests.cpp:
 PASSED:
   REQUIRE( !(1 == 2) )
 with expansion:
   true
 
-ConditionTests.cpp:329:
+ConditionTests.cpp:
 PASSED:
   REQUIRE_FALSE( 1 == 2 )
 with expansion:
@@ -1665,39 +1665,39 @@
 -------------------------------------------------------------------------------
 ./failing/conditions/not
 -------------------------------------------------------------------------------
-ConditionTests.cpp:333
+ConditionTests.cpp
 ...............................................................................
 
-ConditionTests.cpp:337: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK( false != false )
 
-ConditionTests.cpp:338: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK( true != true )
 
-ConditionTests.cpp:339: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK( !true )
 with expansion:
   false
 
-ConditionTests.cpp:340: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK_FALSE( true )
 
-ConditionTests.cpp:342: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK( !trueValue )
 with expansion:
   false
 
-ConditionTests.cpp:343: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK_FALSE( trueValue )
 with expansion:
   !true
 
-ConditionTests.cpp:345: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK( !(1 == 1) )
 with expansion:
   false
 
-ConditionTests.cpp:346: FAILED:
+ConditionTests.cpp: FAILED:
   CHECK_FALSE( 1 == 1 )
 with expansion:
   !(1 == 1)
@@ -1705,37 +1705,37 @@
 -------------------------------------------------------------------------------
 ./succeeding/exceptions/explicit
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:31
+ExceptionTests.cpp
 ...............................................................................
 
-ExceptionTests.cpp:33:
+ExceptionTests.cpp:
 PASSED:
   REQUIRE_THROWS_AS( thisThrows() )
 
-ExceptionTests.cpp:34:
+ExceptionTests.cpp:
 PASSED:
   REQUIRE_NOTHROW( thisDoesntThrow() )
 
-ExceptionTests.cpp:35:
+ExceptionTests.cpp:
 PASSED:
   REQUIRE_THROWS( thisThrows() )
 
 -------------------------------------------------------------------------------
 ./failing/exceptions/explicit
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:38
+ExceptionTests.cpp
 ...............................................................................
 
-ExceptionTests.cpp:40: FAILED:
+ExceptionTests.cpp: FAILED:
   CHECK_THROWS_AS( thisThrows() )
 due to unexpected exception with message:
   expected exception
 
-ExceptionTests.cpp:41: FAILED:
+ExceptionTests.cpp: FAILED:
   CHECK_THROWS_AS( thisDoesntThrow() )
 because no exception was thrown where one was expected:
 
-ExceptionTests.cpp:42: FAILED:
+ExceptionTests.cpp: FAILED:
   CHECK_NOTHROW( thisThrows() )
 due to unexpected exception with message:
   expected exception
@@ -1743,24 +1743,24 @@
 -------------------------------------------------------------------------------
 ./failing/exceptions/implicit
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:45
+ExceptionTests.cpp
 ...............................................................................
 
-ExceptionTests.cpp:45: FAILED:
+ExceptionTests.cpp: FAILED:
 due to unexpected exception with message:
   unexpected exception
 
 -------------------------------------------------------------------------------
 ./failing/exceptions/implicit/2
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:51
+ExceptionTests.cpp
 ...............................................................................
 
-ExceptionTests.cpp:53:
+ExceptionTests.cpp:
 PASSED:
   CHECK( 1 == 1 )
 
-ExceptionTests.cpp:53: FAILED:
+ExceptionTests.cpp: FAILED:
   {Unknown expression after the reported line}
 due to unexpected exception with message:
   unexpected exception
@@ -1769,20 +1769,20 @@
 ./failing/exceptions/implicit/3
   section name
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:59
+ExceptionTests.cpp
 ...............................................................................
 
-ExceptionTests.cpp:59: FAILED:
+ExceptionTests.cpp: FAILED:
 due to unexpected exception with message:
   unexpected exception
 
 -------------------------------------------------------------------------------
 ./failing/exceptions/implicit/4
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:66
+ExceptionTests.cpp
 ...............................................................................
 
-ExceptionTests.cpp:68: FAILED:
+ExceptionTests.cpp: FAILED:
   CHECK( thisThrows() == 0 )
 due to unexpected exception with message:
   expected exception
@@ -1790,7 +1790,7 @@
 -------------------------------------------------------------------------------
 ./succeeding/exceptions/implicit
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:71
+ExceptionTests.cpp
 ...............................................................................
 
 
@@ -1799,20 +1799,20 @@
 -------------------------------------------------------------------------------
 ./failing/exceptions/custom
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:108
+ExceptionTests.cpp
 ...............................................................................
 
-ExceptionTests.cpp:108: FAILED:
+ExceptionTests.cpp: FAILED:
 due to unexpected exception with message:
   custom exception
 
 -------------------------------------------------------------------------------
 ./failing/exceptions/custom/nothrow
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:119
+ExceptionTests.cpp
 ...............................................................................
 
-ExceptionTests.cpp:121: FAILED:
+ExceptionTests.cpp: FAILED:
   REQUIRE_NOTHROW( throwCustom() )
 due to unexpected exception with message:
   custom exception - not std
@@ -1820,10 +1820,10 @@
 -------------------------------------------------------------------------------
 ./failing/exceptions/custom/throw
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:124
+ExceptionTests.cpp
 ...............................................................................
 
-ExceptionTests.cpp:126: FAILED:
+ExceptionTests.cpp: FAILED:
   REQUIRE_THROWS_AS( throwCustom() )
 due to unexpected exception with message:
   custom exception - not std
@@ -1831,888 +1831,888 @@
 -------------------------------------------------------------------------------
 ./failing/exceptions/custom/double
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:130
+ExceptionTests.cpp
 ...............................................................................
 
-ExceptionTests.cpp:130: FAILED:
+ExceptionTests.cpp: FAILED:
 due to unexpected exception with message:
   3.14
 
 -------------------------------------------------------------------------------
 ./succeeding/exceptions/notimplemented
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:140
+ExceptionTests.cpp
 ...............................................................................
 
-ExceptionTests.cpp:142:
+ExceptionTests.cpp:
 PASSED:
   REQUIRE_THROWS( thisFunctionNotImplemented( 7 ) )
 
 -------------------------------------------------------------------------------
 ./succeeding/generators/1
 -------------------------------------------------------------------------------
-GeneratorTests.cpp:19
+GeneratorTests.cpp
 ...............................................................................
 
-GeneratorTests.cpp:26:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   2 == 2
 
-GeneratorTests.cpp:27:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   200 == 200
 
-GeneratorTests.cpp:26:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   4 == 4
 
-GeneratorTests.cpp:27:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   200 == 200
 
-GeneratorTests.cpp:26:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   6 == 6
 
-GeneratorTests.cpp:27:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   200 == 200
 
-GeneratorTests.cpp:26:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   8 == 8
 
-GeneratorTests.cpp:27:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   200 == 200
 
-GeneratorTests.cpp:26:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   10 == 10
 
-GeneratorTests.cpp:27:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   200 == 200
 
-GeneratorTests.cpp:26:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   30 == 30
 
-GeneratorTests.cpp:27:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   200 == 200
 
-GeneratorTests.cpp:26:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   40 == 40
 
-GeneratorTests.cpp:27:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   200 == 200
 
-GeneratorTests.cpp:26:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   42 == 42
 
-GeneratorTests.cpp:27:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   200 == 200
 
-GeneratorTests.cpp:26:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   72 == 72
 
-GeneratorTests.cpp:27:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   200 == 200
 
-GeneratorTests.cpp:26:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   2 == 2
 
-GeneratorTests.cpp:27:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   202 == 202
 
-GeneratorTests.cpp:26:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   4 == 4
 
-GeneratorTests.cpp:27:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   202 == 202
 
-GeneratorTests.cpp:26:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   6 == 6
 
-GeneratorTests.cpp:27:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   202 == 202
 
-GeneratorTests.cpp:26:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   8 == 8
 
-GeneratorTests.cpp:27:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   202 == 202
 
-GeneratorTests.cpp:26:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   10 == 10
 
-GeneratorTests.cpp:27:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   202 == 202
 
-GeneratorTests.cpp:26:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   30 == 30
 
-GeneratorTests.cpp:27:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   202 == 202
 
-GeneratorTests.cpp:26:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   40 == 40
 
-GeneratorTests.cpp:27:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   202 == 202
 
-GeneratorTests.cpp:26:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   42 == 42
 
-GeneratorTests.cpp:27:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   202 == 202
 
-GeneratorTests.cpp:26:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   72 == 72
 
-GeneratorTests.cpp:27:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   202 == 202
 
-GeneratorTests.cpp:26:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   2 == 2
 
-GeneratorTests.cpp:27:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   204 == 204
 
-GeneratorTests.cpp:26:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   4 == 4
 
-GeneratorTests.cpp:27:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   204 == 204
 
-GeneratorTests.cpp:26:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   6 == 6
 
-GeneratorTests.cpp:27:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   204 == 204
 
-GeneratorTests.cpp:26:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   8 == 8
 
-GeneratorTests.cpp:27:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   204 == 204
 
-GeneratorTests.cpp:26:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   10 == 10
 
-GeneratorTests.cpp:27:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   204 == 204
 
-GeneratorTests.cpp:26:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   30 == 30
 
-GeneratorTests.cpp:27:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   204 == 204
 
-GeneratorTests.cpp:26:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   40 == 40
 
-GeneratorTests.cpp:27:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   204 == 204
 
-GeneratorTests.cpp:26:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   42 == 42
 
-GeneratorTests.cpp:27:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   204 == 204
 
-GeneratorTests.cpp:26:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   72 == 72
 
-GeneratorTests.cpp:27:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   204 == 204
 
-GeneratorTests.cpp:26:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   2 == 2
 
-GeneratorTests.cpp:27:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   206 == 206
 
-GeneratorTests.cpp:26:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   4 == 4
 
-GeneratorTests.cpp:27:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   206 == 206
 
-GeneratorTests.cpp:26:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   6 == 6
 
-GeneratorTests.cpp:27:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   206 == 206
 
-GeneratorTests.cpp:26:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   8 == 8
 
-GeneratorTests.cpp:27:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   206 == 206
 
-GeneratorTests.cpp:26:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   10 == 10
 
-GeneratorTests.cpp:27:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   206 == 206
 
-GeneratorTests.cpp:26:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   30 == 30
 
-GeneratorTests.cpp:27:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   206 == 206
 
-GeneratorTests.cpp:26:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   40 == 40
 
-GeneratorTests.cpp:27:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   206 == 206
 
-GeneratorTests.cpp:26:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   42 == 42
 
-GeneratorTests.cpp:27:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   206 == 206
 
-GeneratorTests.cpp:26:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   72 == 72
 
-GeneratorTests.cpp:27:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   206 == 206
 
-GeneratorTests.cpp:26:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   2 == 2
 
-GeneratorTests.cpp:27:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   208 == 208
 
-GeneratorTests.cpp:26:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   4 == 4
 
-GeneratorTests.cpp:27:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   208 == 208
 
-GeneratorTests.cpp:26:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   6 == 6
 
-GeneratorTests.cpp:27:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   208 == 208
 
-GeneratorTests.cpp:26:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   8 == 8
 
-GeneratorTests.cpp:27:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   208 == 208
 
-GeneratorTests.cpp:26:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   10 == 10
 
-GeneratorTests.cpp:27:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   208 == 208
 
-GeneratorTests.cpp:26:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   30 == 30
 
-GeneratorTests.cpp:27:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   208 == 208
 
-GeneratorTests.cpp:26:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   40 == 40
 
-GeneratorTests.cpp:27:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   208 == 208
 
-GeneratorTests.cpp:26:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   42 == 42
 
-GeneratorTests.cpp:27:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   208 == 208
 
-GeneratorTests.cpp:26:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   72 == 72
 
-GeneratorTests.cpp:27:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   208 == 208
 
-GeneratorTests.cpp:26:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   2 == 2
 
-GeneratorTests.cpp:27:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   210 == 210
 
-GeneratorTests.cpp:26:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   4 == 4
 
-GeneratorTests.cpp:27:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   210 == 210
 
-GeneratorTests.cpp:26:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   6 == 6
 
-GeneratorTests.cpp:27:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   210 == 210
 
-GeneratorTests.cpp:26:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   8 == 8
 
-GeneratorTests.cpp:27:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   210 == 210
 
-GeneratorTests.cpp:26:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   10 == 10
 
-GeneratorTests.cpp:27:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   210 == 210
 
-GeneratorTests.cpp:26:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   30 == 30
 
-GeneratorTests.cpp:27:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   210 == 210
 
-GeneratorTests.cpp:26:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   40 == 40
 
-GeneratorTests.cpp:27:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   210 == 210
 
-GeneratorTests.cpp:26:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   42 == 42
 
-GeneratorTests.cpp:27:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   210 == 210
 
-GeneratorTests.cpp:26:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   72 == 72
 
-GeneratorTests.cpp:27:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   210 == 210
 
-GeneratorTests.cpp:26:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   2 == 2
 
-GeneratorTests.cpp:27:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   212 == 212
 
-GeneratorTests.cpp:26:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   4 == 4
 
-GeneratorTests.cpp:27:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   212 == 212
 
-GeneratorTests.cpp:26:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   6 == 6
 
-GeneratorTests.cpp:27:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   212 == 212
 
-GeneratorTests.cpp:26:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   8 == 8
 
-GeneratorTests.cpp:27:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   212 == 212
 
-GeneratorTests.cpp:26:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   10 == 10
 
-GeneratorTests.cpp:27:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   212 == 212
 
-GeneratorTests.cpp:26:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   30 == 30
 
-GeneratorTests.cpp:27:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   212 == 212
 
-GeneratorTests.cpp:26:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   40 == 40
 
-GeneratorTests.cpp:27:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   212 == 212
 
-GeneratorTests.cpp:26:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   42 == 42
 
-GeneratorTests.cpp:27:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   212 == 212
 
-GeneratorTests.cpp:26:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   72 == 72
 
-GeneratorTests.cpp:27:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   212 == 212
 
-GeneratorTests.cpp:26:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   2 == 2
 
-GeneratorTests.cpp:27:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   214 == 214
 
-GeneratorTests.cpp:26:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   4 == 4
 
-GeneratorTests.cpp:27:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   214 == 214
 
-GeneratorTests.cpp:26:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   6 == 6
 
-GeneratorTests.cpp:27:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   214 == 214
 
-GeneratorTests.cpp:26:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   8 == 8
 
-GeneratorTests.cpp:27:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   214 == 214
 
-GeneratorTests.cpp:26:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   10 == 10
 
-GeneratorTests.cpp:27:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   214 == 214
 
-GeneratorTests.cpp:26:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   30 == 30
 
-GeneratorTests.cpp:27:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   214 == 214
 
-GeneratorTests.cpp:26:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   40 == 40
 
-GeneratorTests.cpp:27:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   214 == 214
 
-GeneratorTests.cpp:26:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   42 == 42
 
-GeneratorTests.cpp:27:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   214 == 214
 
-GeneratorTests.cpp:26:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   72 == 72
 
-GeneratorTests.cpp:27:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
@@ -2721,16 +2721,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/generators/2
 -------------------------------------------------------------------------------
-GeneratorTests.cpp:32
+GeneratorTests.cpp
 ...............................................................................
 
-GeneratorTests.cpp:40:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( i->first == i->second-1 )
 with expansion:
   0 == 0
 
-GeneratorTests.cpp:40:
+GeneratorTests.cpp:
 PASSED:
   CATCH_REQUIRE( i->first == i->second-1 )
 with expansion:
@@ -2739,10 +2739,10 @@
 -------------------------------------------------------------------------------
 ./succeeding/message
 -------------------------------------------------------------------------------
-MessageTests.cpp:11
+MessageTests.cpp
 ...............................................................................
 
-MessageTests.cpp:14:
+MessageTests.cpp:
 warning:
   this is a message
   this is a warning
@@ -2753,10 +2753,10 @@
 -------------------------------------------------------------------------------
 ./succeeding/succeed
 -------------------------------------------------------------------------------
-MessageTests.cpp:16
+MessageTests.cpp
 ...............................................................................
 
-MessageTests.cpp:18:
+MessageTests.cpp:
 PASSED:
 with message:
   this is a success
@@ -2764,10 +2764,10 @@
 -------------------------------------------------------------------------------
 ./failing/message/info/1
 -------------------------------------------------------------------------------
-MessageTests.cpp:21
+MessageTests.cpp
 ...............................................................................
 
-MessageTests.cpp:26: FAILED:
+MessageTests.cpp: FAILED:
   REQUIRE( a == 1 )
 with expansion:
   2 == 1
@@ -2778,10 +2778,10 @@
 -------------------------------------------------------------------------------
 ./mixed/message/info/2
 -------------------------------------------------------------------------------
-MessageTests.cpp:30
+MessageTests.cpp
 ...............................................................................
 
-MessageTests.cpp:35:
+MessageTests.cpp:
 PASSED:
   CHECK( a == 2 )
 with expansion:
@@ -2789,21 +2789,21 @@
 with message:
   this message may be logged later
 
-MessageTests.cpp:39: FAILED:
+MessageTests.cpp: FAILED:
   CHECK( a == 1 )
 with expansion:
   2 == 1
 with message:
   this message should be logged
 
-MessageTests.cpp:43: FAILED:
+MessageTests.cpp: FAILED:
   CHECK( a == 0 )
 with expansion:
   2 == 0
 with message:
   and this, but later
 
-MessageTests.cpp:47:
+MessageTests.cpp:
 PASSED:
   CHECK( a == 2 )
 with expansion:
@@ -2814,10 +2814,10 @@
 -------------------------------------------------------------------------------
 ./failing/message/fail
 -------------------------------------------------------------------------------
-MessageTests.cpp:50
+MessageTests.cpp
 ...............................................................................
 
-MessageTests.cpp:53: FAILED:
+MessageTests.cpp: FAILED:
 explicitly with message:
   This is a failure
 
@@ -2825,10 +2825,10 @@
 ./failing/message/sections
   one
 -------------------------------------------------------------------------------
-MessageTests.cpp:58
+MessageTests.cpp
 ...............................................................................
 
-MessageTests.cpp:60: FAILED:
+MessageTests.cpp: FAILED:
 explicitly with message:
   Message from section one
 
@@ -2836,10 +2836,10 @@
 ./failing/message/sections
   two
 -------------------------------------------------------------------------------
-MessageTests.cpp:63
+MessageTests.cpp
 ...............................................................................
 
-MessageTests.cpp:65: FAILED:
+MessageTests.cpp: FAILED:
 explicitly with message:
   Message from section two
 
@@ -2848,7 +2848,7 @@
 ./succeeding/message/sections/stdout
   one
 -------------------------------------------------------------------------------
-MessageTests.cpp:71
+MessageTests.cpp
 ...............................................................................
 
 
@@ -2859,7 +2859,7 @@
 ./succeeding/message/sections/stdout
   two
 -------------------------------------------------------------------------------
-MessageTests.cpp:76
+MessageTests.cpp
 ...............................................................................
 
 
@@ -2868,10 +2868,10 @@
 -------------------------------------------------------------------------------
 ./mixed/message/scoped
 -------------------------------------------------------------------------------
-MessageTests.cpp:82
+MessageTests.cpp
 ...............................................................................
 
-MessageTests.cpp:88:
+MessageTests.cpp:
 PASSED:
   REQUIRE( i < 10 )
 with expansion:
@@ -2880,7 +2880,7 @@
   current counter 0
   i := 0
 
-MessageTests.cpp:88:
+MessageTests.cpp:
 PASSED:
   REQUIRE( i < 10 )
 with expansion:
@@ -2889,7 +2889,7 @@
   current counter 1
   i := 1
 
-MessageTests.cpp:88:
+MessageTests.cpp:
 PASSED:
   REQUIRE( i < 10 )
 with expansion:
@@ -2898,7 +2898,7 @@
   current counter 2
   i := 2
 
-MessageTests.cpp:88:
+MessageTests.cpp:
 PASSED:
   REQUIRE( i < 10 )
 with expansion:
@@ -2907,7 +2907,7 @@
   current counter 3
   i := 3
 
-MessageTests.cpp:88:
+MessageTests.cpp:
 PASSED:
   REQUIRE( i < 10 )
 with expansion:
@@ -2916,7 +2916,7 @@
   current counter 4
   i := 4
 
-MessageTests.cpp:88:
+MessageTests.cpp:
 PASSED:
   REQUIRE( i < 10 )
 with expansion:
@@ -2925,7 +2925,7 @@
   current counter 5
   i := 5
 
-MessageTests.cpp:88:
+MessageTests.cpp:
 PASSED:
   REQUIRE( i < 10 )
 with expansion:
@@ -2934,7 +2934,7 @@
   current counter 6
   i := 6
 
-MessageTests.cpp:88:
+MessageTests.cpp:
 PASSED:
   REQUIRE( i < 10 )
 with expansion:
@@ -2943,7 +2943,7 @@
   current counter 7
   i := 7
 
-MessageTests.cpp:88:
+MessageTests.cpp:
 PASSED:
   REQUIRE( i < 10 )
 with expansion:
@@ -2952,7 +2952,7 @@
   current counter 8
   i := 8
 
-MessageTests.cpp:88:
+MessageTests.cpp:
 PASSED:
   REQUIRE( i < 10 )
 with expansion:
@@ -2961,7 +2961,7 @@
   current counter 9
   i := 9
 
-MessageTests.cpp:88: FAILED:
+MessageTests.cpp: FAILED:
   REQUIRE( i < 10 )
 with expansion:
   10 < 10
@@ -2972,10 +2972,10 @@
 -------------------------------------------------------------------------------
 ./succeeding/nofail
 -------------------------------------------------------------------------------
-MessageTests.cpp:92
+MessageTests.cpp
 ...............................................................................
 
-MessageTests.cpp:94:
+MessageTests.cpp:
 FAILED - but was ok:
   CHECK_NOFAIL( 1 == 2 )
 
@@ -2985,7 +2985,7 @@
 -------------------------------------------------------------------------------
 just info
 -------------------------------------------------------------------------------
-MessageTests.cpp:97
+MessageTests.cpp
 ...............................................................................
 
 
@@ -2994,10 +2994,10 @@
 -------------------------------------------------------------------------------
 just failure
 -------------------------------------------------------------------------------
-MessageTests.cpp:101
+MessageTests.cpp
 ...............................................................................
 
-MessageTests.cpp:103: FAILED:
+MessageTests.cpp: FAILED:
 explicitly with message:
   Previous info should not be seen
 
@@ -3005,16 +3005,16 @@
 ./succeeding/Misc/Sections
   s1
 -------------------------------------------------------------------------------
-MiscTests.cpp:19
+MiscTests.cpp
 ...............................................................................
 
-MiscTests.cpp:21:
+MiscTests.cpp:
 PASSED:
   REQUIRE( a != b )
 with expansion:
   1 != 2
 
-MiscTests.cpp:22:
+MiscTests.cpp:
 PASSED:
   REQUIRE( b != a )
 with expansion:
@@ -3024,10 +3024,10 @@
 ./succeeding/Misc/Sections
   s2
 -------------------------------------------------------------------------------
-MiscTests.cpp:25
+MiscTests.cpp
 ...............................................................................
 
-MiscTests.cpp:27:
+MiscTests.cpp:
 PASSED:
   REQUIRE( a != b )
 with expansion:
@@ -3037,16 +3037,16 @@
 ./succeeding/Misc/Sections/nested
   s1
 -------------------------------------------------------------------------------
-MiscTests.cpp:36
+MiscTests.cpp
 ...............................................................................
 
-MiscTests.cpp:38:
+MiscTests.cpp:
 PASSED:
   REQUIRE( a != b )
 with expansion:
   1 != 2
 
-MiscTests.cpp:39:
+MiscTests.cpp:
 PASSED:
   REQUIRE( b != a )
 with expansion:
@@ -3057,10 +3057,10 @@
   s1
   s2
 -------------------------------------------------------------------------------
-MiscTests.cpp:41
+MiscTests.cpp
 ...............................................................................
 
-MiscTests.cpp:43:
+MiscTests.cpp:
 PASSED:
   REQUIRE( a != b )
 with expansion:
@@ -3071,10 +3071,10 @@
   s1
   s2
 -------------------------------------------------------------------------------
-MiscTests.cpp:55
+MiscTests.cpp
 ...............................................................................
 
-MiscTests.cpp:57: FAILED:
+MiscTests.cpp: FAILED:
   REQUIRE( a == b )
 with expansion:
   1 == 2
@@ -3084,10 +3084,10 @@
   s1
   s3
 -------------------------------------------------------------------------------
-MiscTests.cpp:60
+MiscTests.cpp
 ...............................................................................
 
-MiscTests.cpp:62:
+MiscTests.cpp:
 PASSED:
   REQUIRE( a != b )
 with expansion:
@@ -3098,10 +3098,10 @@
   s1
   s4
 -------------------------------------------------------------------------------
-MiscTests.cpp:64
+MiscTests.cpp
 ...............................................................................
 
-MiscTests.cpp:66:
+MiscTests.cpp:
 PASSED:
   REQUIRE( a < b )
 with expansion:
@@ -3112,7 +3112,7 @@
   c
   d (leaf)
 -------------------------------------------------------------------------------
-MiscTests.cpp:75
+MiscTests.cpp
 ...............................................................................
 
 
@@ -3123,7 +3123,7 @@
   c
   e (leaf)
 -------------------------------------------------------------------------------
-MiscTests.cpp:79
+MiscTests.cpp
 ...............................................................................
 
 
@@ -3133,7 +3133,7 @@
 ./Sections/nested/a/b
   f (leaf)
 -------------------------------------------------------------------------------
-MiscTests.cpp:84
+MiscTests.cpp
 ...............................................................................
 
 
@@ -3143,10 +3143,10 @@
 ./mixed/Misc/Sections/loops
   s1
 -------------------------------------------------------------------------------
-MiscTests.cpp:97
+MiscTests.cpp
 ...............................................................................
 
-MiscTests.cpp:99: FAILED:
+MiscTests.cpp: FAILED:
   CHECK( b > a )
 with expansion:
   0 > 1
@@ -3154,24 +3154,24 @@
 -------------------------------------------------------------------------------
 ./mixed/Misc/loops
 -------------------------------------------------------------------------------
-MiscTests.cpp:104
+MiscTests.cpp
 ...............................................................................
 
-MiscTests.cpp:111: FAILED:
+MiscTests.cpp: FAILED:
   CHECK( ( fib[i] % 2 ) == 0 )
 with expansion:
   1 == 0
 with message:
   Testing if fib[0] (1) is even
 
-MiscTests.cpp:111: FAILED:
+MiscTests.cpp: FAILED:
   CHECK( ( fib[i] % 2 ) == 0 )
 with expansion:
   1 == 0
 with message:
   Testing if fib[1] (1) is even
 
-MiscTests.cpp:111:
+MiscTests.cpp:
 PASSED:
   CHECK( ( fib[i] % 2 ) == 0 )
 with expansion:
@@ -3179,21 +3179,21 @@
 with message:
   Testing if fib[2] (2) is even
 
-MiscTests.cpp:111: FAILED:
+MiscTests.cpp: FAILED:
   CHECK( ( fib[i] % 2 ) == 0 )
 with expansion:
   1 == 0
 with message:
   Testing if fib[3] (3) is even
 
-MiscTests.cpp:111: FAILED:
+MiscTests.cpp: FAILED:
   CHECK( ( fib[i] % 2 ) == 0 )
 with expansion:
   1 == 0
 with message:
   Testing if fib[4] (5) is even
 
-MiscTests.cpp:111:
+MiscTests.cpp:
 PASSED:
   CHECK( ( fib[i] % 2 ) == 0 )
 with expansion:
@@ -3201,14 +3201,14 @@
 with message:
   Testing if fib[5] (8) is even
 
-MiscTests.cpp:111: FAILED:
+MiscTests.cpp: FAILED:
   CHECK( ( fib[i] % 2 ) == 0 )
 with expansion:
   1 == 0
 with message:
   Testing if fib[6] (13) is even
 
-MiscTests.cpp:111: FAILED:
+MiscTests.cpp: FAILED:
   CHECK( ( fib[i] % 2 ) == 0 )
 with expansion:
   1 == 0
@@ -3220,7 +3220,7 @@
 -------------------------------------------------------------------------------
 ./succeeding/Misc/stdout,stderr
 -------------------------------------------------------------------------------
-MiscTests.cpp:115
+MiscTests.cpp
 ...............................................................................
 
 
@@ -3229,16 +3229,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/Misc/null strings
 -------------------------------------------------------------------------------
-MiscTests.cpp:127
+MiscTests.cpp
 ...............................................................................
 
-MiscTests.cpp:129:
+MiscTests.cpp:
 PASSED:
   REQUIRE( makeString( false ) != static_cast<char*>(__null) )
 with expansion:
   "valid string" != {null string}
 
-MiscTests.cpp:130:
+MiscTests.cpp:
 PASSED:
   REQUIRE( makeString( true ) == static_cast<char*>(__null) )
 with expansion:
@@ -3247,10 +3247,10 @@
 -------------------------------------------------------------------------------
 ./failing/info
 -------------------------------------------------------------------------------
-MiscTests.cpp:133
+MiscTests.cpp
 ...............................................................................
 
-MiscTests.cpp:138: FAILED:
+MiscTests.cpp: FAILED:
   REQUIRE( false )
 with messages:
   hi
@@ -3259,16 +3259,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/checkedif
 -------------------------------------------------------------------------------
-MiscTests.cpp:149
+MiscTests.cpp
 ...............................................................................
 
-MiscTests.cpp:143:
+MiscTests.cpp:
 PASSED:
   CHECKED_IF( flag )
 with expansion:
   true
 
-MiscTests.cpp:151:
+MiscTests.cpp:
 PASSED:
   REQUIRE( testCheckedIf( true ) )
 with expansion:
@@ -3277,15 +3277,15 @@
 -------------------------------------------------------------------------------
 ./failing/checkedif
 -------------------------------------------------------------------------------
-MiscTests.cpp:154
+MiscTests.cpp
 ...............................................................................
 
-MiscTests.cpp:143: FAILED:
+MiscTests.cpp: FAILED:
   CHECKED_IF( flag )
 with expansion:
   false
 
-MiscTests.cpp:156: FAILED:
+MiscTests.cpp: FAILED:
   REQUIRE( testCheckedIf( false ) )
 with expansion:
   false
@@ -3293,16 +3293,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/checkedelse
 -------------------------------------------------------------------------------
-MiscTests.cpp:167
+MiscTests.cpp
 ...............................................................................
 
-MiscTests.cpp:161:
+MiscTests.cpp:
 PASSED:
   CHECKED_ELSE( flag )
 with expansion:
   true
 
-MiscTests.cpp:169:
+MiscTests.cpp:
 PASSED:
   REQUIRE( testCheckedElse( true ) )
 with expansion:
@@ -3311,15 +3311,15 @@
 -------------------------------------------------------------------------------
 ./failing/checkedelse
 -------------------------------------------------------------------------------
-MiscTests.cpp:172
+MiscTests.cpp
 ...............................................................................
 
-MiscTests.cpp:161: FAILED:
+MiscTests.cpp: FAILED:
   CHECKED_ELSE( flag )
 with expansion:
   false
 
-MiscTests.cpp:174: FAILED:
+MiscTests.cpp: FAILED:
   REQUIRE( testCheckedElse( false ) )
 with expansion:
   false
@@ -3328,7 +3328,7 @@
 ./misc/xmlentitycheck
   embedded xml
 -------------------------------------------------------------------------------
-MiscTests.cpp:179
+MiscTests.cpp
 ...............................................................................
 
 
@@ -3338,7 +3338,7 @@
 ./misc/xmlentitycheck
   encoded chars
 -------------------------------------------------------------------------------
-MiscTests.cpp:183
+MiscTests.cpp
 ...............................................................................
 
 
@@ -3347,10 +3347,10 @@
 -------------------------------------------------------------------------------
 ./manual/onechar
 -------------------------------------------------------------------------------
-MiscTests.cpp:189
+MiscTests.cpp
 ...............................................................................
 
-MiscTests.cpp:192: FAILED:
+MiscTests.cpp: FAILED:
   REQUIRE( false )
 with message:
   3
@@ -3358,10 +3358,10 @@
 -------------------------------------------------------------------------------
 ./succeeding/atomic if
 -------------------------------------------------------------------------------
-MiscTests.cpp:195
+MiscTests.cpp
 ...............................................................................
 
-MiscTests.cpp:202:
+MiscTests.cpp:
 PASSED:
   REQUIRE( x == 0 )
 with expansion:
@@ -3370,28 +3370,28 @@
 -------------------------------------------------------------------------------
 ./succeeding/matchers
 -------------------------------------------------------------------------------
-MiscTests.cpp:210
+MiscTests.cpp
 ...............................................................................
 
-MiscTests.cpp:212:
+MiscTests.cpp:
 PASSED:
   REQUIRE_THAT( testStringForMatching() Contains( "string" ) )
 with expansion:
   "this string contains 'abc' as a substring" contains: "string"
 
-MiscTests.cpp:213:
+MiscTests.cpp:
 PASSED:
   CHECK_THAT( testStringForMatching() Contains( "abc" ) )
 with expansion:
   "this string contains 'abc' as a substring" contains: "abc"
 
-MiscTests.cpp:215:
+MiscTests.cpp:
 PASSED:
   CHECK_THAT( testStringForMatching() StartsWith( "this" ) )
 with expansion:
   "this string contains 'abc' as a substring" starts with: "this"
 
-MiscTests.cpp:216:
+MiscTests.cpp:
 PASSED:
   CHECK_THAT( testStringForMatching() EndsWith( "substring" ) )
 with expansion:
@@ -3400,10 +3400,10 @@
 -------------------------------------------------------------------------------
 ./failing/matchers/Contains
 -------------------------------------------------------------------------------
-MiscTests.cpp:219
+MiscTests.cpp
 ...............................................................................
 
-MiscTests.cpp:221: FAILED:
+MiscTests.cpp: FAILED:
   CHECK_THAT( testStringForMatching() Contains( "not there" ) )
 with expansion:
   "this string contains 'abc' as a substring" contains: "not there"
@@ -3411,10 +3411,10 @@
 -------------------------------------------------------------------------------
 ./failing/matchers/StartsWith
 -------------------------------------------------------------------------------
-MiscTests.cpp:224
+MiscTests.cpp
 ...............................................................................
 
-MiscTests.cpp:226: FAILED:
+MiscTests.cpp: FAILED:
   CHECK_THAT( testStringForMatching() StartsWith( "string" ) )
 with expansion:
   "this string contains 'abc' as a substring" starts with: "string"
@@ -3422,10 +3422,10 @@
 -------------------------------------------------------------------------------
 ./failing/matchers/EndsWith
 -------------------------------------------------------------------------------
-MiscTests.cpp:229
+MiscTests.cpp
 ...............................................................................
 
-MiscTests.cpp:231: FAILED:
+MiscTests.cpp: FAILED:
   CHECK_THAT( testStringForMatching() EndsWith( "this" ) )
 with expansion:
   "this string contains 'abc' as a substring" ends with: "this"
@@ -3433,10 +3433,10 @@
 -------------------------------------------------------------------------------
 ./failing/matchers/Equals
 -------------------------------------------------------------------------------
-MiscTests.cpp:234
+MiscTests.cpp
 ...............................................................................
 
-MiscTests.cpp:236: FAILED:
+MiscTests.cpp: FAILED:
   CHECK_THAT( testStringForMatching() Equals( "something else" ) )
 with expansion:
   "this string contains 'abc' as a substring" equals: "something else"
@@ -3444,10 +3444,10 @@
 -------------------------------------------------------------------------------
 string
 -------------------------------------------------------------------------------
-MiscTests.cpp:238
+MiscTests.cpp
 ...............................................................................
 
-MiscTests.cpp:240:
+MiscTests.cpp:
 PASSED:
   REQUIRE_THAT( "" Equals(__null) )
 with expansion:
@@ -3456,10 +3456,10 @@
 -------------------------------------------------------------------------------
 ./succeeding/matchers/AllOf
 -------------------------------------------------------------------------------
-MiscTests.cpp:242
+MiscTests.cpp
 ...............................................................................
 
-MiscTests.cpp:244:
+MiscTests.cpp:
 PASSED:
   CHECK_THAT( testStringForMatching() AllOf( Catch::Contains( "string" ), Catch::Contains( "abc" ) ) )
 with expansion:
@@ -3469,17 +3469,17 @@
 -------------------------------------------------------------------------------
 ./succeeding/matchers/AnyOf
 -------------------------------------------------------------------------------
-MiscTests.cpp:246
+MiscTests.cpp
 ...............................................................................
 
-MiscTests.cpp:248:
+MiscTests.cpp:
 PASSED:
   CHECK_THAT( testStringForMatching() AnyOf( Catch::Contains( "string" ), Catch::Contains( "not there" ) ) )
 with expansion:
   "this string contains 'abc' as a substring" ( contains: "string" or contains:
   "not there" )
 
-MiscTests.cpp:249:
+MiscTests.cpp:
 PASSED:
   CHECK_THAT( testStringForMatching() AnyOf( Catch::Contains( "not there" ), Catch::Contains( "string" ) ) )
 with expansion:
@@ -3489,10 +3489,10 @@
 -------------------------------------------------------------------------------
 ./succeeding/matchers/Equals
 -------------------------------------------------------------------------------
-MiscTests.cpp:252
+MiscTests.cpp
 ...............................................................................
 
-MiscTests.cpp:254:
+MiscTests.cpp:
 PASSED:
   CHECK_THAT( testStringForMatching() Equals( "this string contains 'abc' as a substring" ) )
 with expansion:
@@ -3502,34 +3502,34 @@
 -------------------------------------------------------------------------------
 Factorials are computed
 -------------------------------------------------------------------------------
-MiscTests.cpp:263
+MiscTests.cpp
 ...............................................................................
 
-MiscTests.cpp:264:
+MiscTests.cpp:
 PASSED:
   REQUIRE( Factorial(0) == 1 )
 with expansion:
   1 == 1
 
-MiscTests.cpp:265:
+MiscTests.cpp:
 PASSED:
   REQUIRE( Factorial(1) == 1 )
 with expansion:
   1 == 1
 
-MiscTests.cpp:266:
+MiscTests.cpp:
 PASSED:
   REQUIRE( Factorial(2) == 2 )
 with expansion:
   2 == 2
 
-MiscTests.cpp:267:
+MiscTests.cpp:
 PASSED:
   REQUIRE( Factorial(3) == 6 )
 with expansion:
   6 == 6
 
-MiscTests.cpp:268:
+MiscTests.cpp:
 PASSED:
   REQUIRE( Factorial(10) == 3628800 )
 with expansion:
@@ -3538,7 +3538,7 @@
 -------------------------------------------------------------------------------
 empty
 -------------------------------------------------------------------------------
-MiscTests.cpp:271
+MiscTests.cpp
 ...............................................................................
 
 
@@ -3547,10 +3547,10 @@
 -------------------------------------------------------------------------------
 Nice descriptive name
 -------------------------------------------------------------------------------
-MiscTests.cpp:275
+MiscTests.cpp
 ...............................................................................
 
-MiscTests.cpp:277:
+MiscTests.cpp:
 warning:
   This one ran
 
@@ -3560,7 +3560,7 @@
 -------------------------------------------------------------------------------
 first tag
 -------------------------------------------------------------------------------
-MiscTests.cpp:279
+MiscTests.cpp
 ...............................................................................
 
 
@@ -3569,7 +3569,7 @@
 -------------------------------------------------------------------------------
 second tag
 -------------------------------------------------------------------------------
-MiscTests.cpp:282
+MiscTests.cpp
 ...............................................................................
 
 
@@ -3578,16 +3578,16 @@
 -------------------------------------------------------------------------------
 vectors can be sized and resized
 -------------------------------------------------------------------------------
-MiscTests.cpp:295
+MiscTests.cpp
 ...............................................................................
 
-MiscTests.cpp:299:
+MiscTests.cpp:
 PASSED:
   REQUIRE( v.size() == 5 )
 with expansion:
   5 == 5
 
-MiscTests.cpp:300:
+MiscTests.cpp:
 PASSED:
   REQUIRE( v.capacity() >= 5 )
 with expansion:
@@ -3597,16 +3597,16 @@
 vectors can be sized and resized
   resizing bigger changes size and capacity
 -------------------------------------------------------------------------------
-MiscTests.cpp:302
+MiscTests.cpp
 ...............................................................................
 
-MiscTests.cpp:305:
+MiscTests.cpp:
 PASSED:
   REQUIRE( v.size() == 10 )
 with expansion:
   10 == 10
 
-MiscTests.cpp:306:
+MiscTests.cpp:
 PASSED:
   REQUIRE( v.capacity() >= 10 )
 with expansion:
@@ -3615,16 +3615,16 @@
 -------------------------------------------------------------------------------
 vectors can be sized and resized
 -------------------------------------------------------------------------------
-MiscTests.cpp:295
+MiscTests.cpp
 ...............................................................................
 
-MiscTests.cpp:299:
+MiscTests.cpp:
 PASSED:
   REQUIRE( v.size() == 5 )
 with expansion:
   5 == 5
 
-MiscTests.cpp:300:
+MiscTests.cpp:
 PASSED:
   REQUIRE( v.capacity() >= 5 )
 with expansion:
@@ -3634,16 +3634,16 @@
 vectors can be sized and resized
   resizing smaller changes size but not capacity
 -------------------------------------------------------------------------------
-MiscTests.cpp:308
+MiscTests.cpp
 ...............................................................................
 
-MiscTests.cpp:311:
+MiscTests.cpp:
 PASSED:
   REQUIRE( v.size() == 0 )
 with expansion:
   0 == 0
 
-MiscTests.cpp:312:
+MiscTests.cpp:
 PASSED:
   REQUIRE( v.capacity() >= 5 )
 with expansion:
@@ -3654,10 +3654,10 @@
   resizing smaller changes size but not capacity
   We can use the 'swap trick' to reset the capacity
 -------------------------------------------------------------------------------
-MiscTests.cpp:314
+MiscTests.cpp
 ...............................................................................
 
-MiscTests.cpp:318:
+MiscTests.cpp:
 PASSED:
   REQUIRE( v.capacity() == 0 )
 with expansion:
@@ -3666,16 +3666,16 @@
 -------------------------------------------------------------------------------
 vectors can be sized and resized
 -------------------------------------------------------------------------------
-MiscTests.cpp:295
+MiscTests.cpp
 ...............................................................................
 
-MiscTests.cpp:299:
+MiscTests.cpp:
 PASSED:
   REQUIRE( v.size() == 5 )
 with expansion:
   5 == 5
 
-MiscTests.cpp:300:
+MiscTests.cpp:
 PASSED:
   REQUIRE( v.capacity() >= 5 )
 with expansion:
@@ -3685,16 +3685,16 @@
 vectors can be sized and resized
   resizing smaller changes size but not capacity
 -------------------------------------------------------------------------------
-MiscTests.cpp:308
+MiscTests.cpp
 ...............................................................................
 
-MiscTests.cpp:311:
+MiscTests.cpp:
 PASSED:
   REQUIRE( v.size() == 0 )
 with expansion:
   0 == 0
 
-MiscTests.cpp:312:
+MiscTests.cpp:
 PASSED:
   REQUIRE( v.capacity() >= 5 )
 with expansion:
@@ -3703,16 +3703,16 @@
 -------------------------------------------------------------------------------
 vectors can be sized and resized
 -------------------------------------------------------------------------------
-MiscTests.cpp:295
+MiscTests.cpp
 ...............................................................................
 
-MiscTests.cpp:299:
+MiscTests.cpp:
 PASSED:
   REQUIRE( v.size() == 5 )
 with expansion:
   5 == 5
 
-MiscTests.cpp:300:
+MiscTests.cpp:
 PASSED:
   REQUIRE( v.capacity() >= 5 )
 with expansion:
@@ -3722,16 +3722,16 @@
 vectors can be sized and resized
   reserving bigger changes capacity but not size
 -------------------------------------------------------------------------------
-MiscTests.cpp:321
+MiscTests.cpp
 ...............................................................................
 
-MiscTests.cpp:324:
+MiscTests.cpp:
 PASSED:
   REQUIRE( v.size() == 5 )
 with expansion:
   5 == 5
 
-MiscTests.cpp:325:
+MiscTests.cpp:
 PASSED:
   REQUIRE( v.capacity() >= 10 )
 with expansion:
@@ -3740,16 +3740,16 @@
 -------------------------------------------------------------------------------
 vectors can be sized and resized
 -------------------------------------------------------------------------------
-MiscTests.cpp:295
+MiscTests.cpp
 ...............................................................................
 
-MiscTests.cpp:299:
+MiscTests.cpp:
 PASSED:
   REQUIRE( v.size() == 5 )
 with expansion:
   5 == 5
 
-MiscTests.cpp:300:
+MiscTests.cpp:
 PASSED:
   REQUIRE( v.capacity() >= 5 )
 with expansion:
@@ -3759,16 +3759,16 @@
 vectors can be sized and resized
   reserving smaller does not change size or capacity
 -------------------------------------------------------------------------------
-MiscTests.cpp:327
+MiscTests.cpp
 ...............................................................................
 
-MiscTests.cpp:330:
+MiscTests.cpp:
 PASSED:
   REQUIRE( v.size() == 5 )
 with expansion:
   5 == 5
 
-MiscTests.cpp:331:
+MiscTests.cpp:
 PASSED:
   REQUIRE( v.capacity() >= 5 )
 with expansion:
@@ -3779,140 +3779,140 @@
   selftest/expected result
   selftest/expected result/failing tests
 -------------------------------------------------------------------------------
-TestMain.cpp:23
+TestMain.cpp
 ...............................................................................
 
-catch_self_test.hpp:120:
+catch_self_test.hpp:
 PASSED:
 with message:
   Tests failed, as expected
 
-catch_self_test.hpp:120:
+catch_self_test.hpp:
 PASSED:
 with message:
   Tests failed, as expected
 
-catch_self_test.hpp:120:
+catch_self_test.hpp:
 PASSED:
 with message:
   Tests failed, as expected
 
-catch_self_test.hpp:120:
+catch_self_test.hpp:
 PASSED:
 with message:
   Tests failed, as expected
 
-catch_self_test.hpp:120:
+catch_self_test.hpp:
 PASSED:
 with message:
   Tests failed, as expected
 
-catch_self_test.hpp:120:
+catch_self_test.hpp:
 PASSED:
 with message:
   Tests failed, as expected
 
-catch_self_test.hpp:120:
+catch_self_test.hpp:
 PASSED:
 with message:
   Tests failed, as expected
 
-catch_self_test.hpp:120:
+catch_self_test.hpp:
 PASSED:
 with message:
   Tests failed, as expected
 
-catch_self_test.hpp:120:
+catch_self_test.hpp:
 PASSED:
 with message:
   Tests failed, as expected
 
-catch_self_test.hpp:120:
+catch_self_test.hpp:
 PASSED:
 with message:
   Tests failed, as expected
 
-catch_self_test.hpp:120:
+catch_self_test.hpp:
 PASSED:
 with message:
   Tests failed, as expected
 
-catch_self_test.hpp:120:
+catch_self_test.hpp:
 PASSED:
 with message:
   Tests failed, as expected
 
-catch_self_test.hpp:120:
+catch_self_test.hpp:
 PASSED:
 with message:
   Tests failed, as expected
 
-catch_self_test.hpp:120:
+catch_self_test.hpp:
 PASSED:
 with message:
   Tests failed, as expected
 
-catch_self_test.hpp:120:
+catch_self_test.hpp:
 PASSED:
 with message:
   Tests failed, as expected
 
-catch_self_test.hpp:120:
+catch_self_test.hpp:
 PASSED:
 with message:
   Tests failed, as expected
 
-catch_self_test.hpp:120:
+catch_self_test.hpp:
 PASSED:
 with message:
   Tests failed, as expected
 
-catch_self_test.hpp:120:
+catch_self_test.hpp:
 PASSED:
 with message:
   Tests failed, as expected
 
-catch_self_test.hpp:120:
+catch_self_test.hpp:
 PASSED:
 with message:
   Tests failed, as expected
 
-catch_self_test.hpp:120:
+catch_self_test.hpp:
 PASSED:
 with message:
   Tests failed, as expected
 
-catch_self_test.hpp:120:
+catch_self_test.hpp:
 PASSED:
 with message:
   Tests failed, as expected
 
-catch_self_test.hpp:120:
+catch_self_test.hpp:
 PASSED:
 with message:
   Tests failed, as expected
 
-catch_self_test.hpp:120:
+catch_self_test.hpp:
 PASSED:
 with message:
   Tests failed, as expected
 
-catch_self_test.hpp:120:
+catch_self_test.hpp:
 PASSED:
 with message:
   Tests failed, as expected
 
-catch_self_test.hpp:120:
+catch_self_test.hpp:
 PASSED:
 with message:
   Tests failed, as expected
 
-catch_self_test.hpp:120:
+catch_self_test.hpp:
 PASSED:
 with message:
   Tests failed, as expected
 
-catch_self_test.hpp:120:
+catch_self_test.hpp:
 PASSED:
 with message:
   Tests failed, as expected
@@ -3922,239 +3922,239 @@
   selftest/expected result
   selftest/expected result/succeeding tests
 -------------------------------------------------------------------------------
-TestMain.cpp:28
+TestMain.cpp
 ...............................................................................
 
-catch_self_test.hpp:109:
+catch_self_test.hpp:
 PASSED:
 with message:
   Tests passed, as expected
 
-catch_self_test.hpp:109:
+catch_self_test.hpp:
 PASSED:
 with message:
   Tests passed, as expected
 
-catch_self_test.hpp:109:
+catch_self_test.hpp:
 PASSED:
 with message:
   Tests passed, as expected
 
-catch_self_test.hpp:109:
+catch_self_test.hpp:
 PASSED:
 with message:
   Tests passed, as expected
 
-catch_self_test.hpp:109:
+catch_self_test.hpp:
 PASSED:
 with message:
   Tests passed, as expected
 
-catch_self_test.hpp:109:
+catch_self_test.hpp:
 PASSED:
 with message:
   Tests passed, as expected
 
-catch_self_test.hpp:109:
+catch_self_test.hpp:
 PASSED:
 with message:
   Tests passed, as expected
 
-catch_self_test.hpp:109:
+catch_self_test.hpp:
 PASSED:
 with message:
   Tests passed, as expected
 
-catch_self_test.hpp:109:
+catch_self_test.hpp:
 PASSED:
 with message:
   Tests passed, as expected
 
-catch_self_test.hpp:109:
+catch_self_test.hpp:
 PASSED:
 with message:
   Tests passed, as expected
 
-catch_self_test.hpp:109:
+catch_self_test.hpp:
 PASSED:
 with message:
   Tests passed, as expected
 
-catch_self_test.hpp:109:
+catch_self_test.hpp:
 PASSED:
 with message:
   Tests passed, as expected
 
-catch_self_test.hpp:109:
+catch_self_test.hpp:
 PASSED:
 with message:
   Tests passed, as expected
 
-catch_self_test.hpp:109:
+catch_self_test.hpp:
 PASSED:
 with message:
   Tests passed, as expected
 
-catch_self_test.hpp:109:
+catch_self_test.hpp:
 PASSED:
 with message:
   Tests passed, as expected
 
-catch_self_test.hpp:109:
+catch_self_test.hpp:
 PASSED:
 with message:
   Tests passed, as expected
 
-catch_self_test.hpp:109:
+catch_self_test.hpp:
 PASSED:
 with message:
   Tests passed, as expected
 
-catch_self_test.hpp:109:
+catch_self_test.hpp:
 PASSED:
 with message:
   Tests passed, as expected
 
-catch_self_test.hpp:109:
+catch_self_test.hpp:
 PASSED:
 with message:
   Tests passed, as expected
 
-catch_self_test.hpp:109:
+catch_self_test.hpp:
 PASSED:
 with message:
   Tests passed, as expected
 
-catch_self_test.hpp:109:
+catch_self_test.hpp:
 PASSED:
 with message:
   Tests passed, as expected
 
-catch_self_test.hpp:109:
+catch_self_test.hpp:
 PASSED:
 with message:
   Tests passed, as expected
 
-catch_self_test.hpp:109:
+catch_self_test.hpp:
 PASSED:
 with message:
   Tests passed, as expected
 
-catch_self_test.hpp:109:
+catch_self_test.hpp:
 PASSED:
 with message:
   Tests passed, as expected
 
-catch_self_test.hpp:109:
+catch_self_test.hpp:
 PASSED:
 with message:
   Tests passed, as expected
 
 Message from section one
 Message from section two
-catch_self_test.hpp:109:
+catch_self_test.hpp:
 PASSED:
 with message:
   Tests passed, as expected
 
-catch_self_test.hpp:109:
+catch_self_test.hpp:
 PASSED:
 with message:
   Tests passed, as expected
 
-catch_self_test.hpp:109:
+catch_self_test.hpp:
 PASSED:
 with message:
   Tests passed, as expected
 
-catch_self_test.hpp:109:
+catch_self_test.hpp:
 PASSED:
 with message:
   Tests passed, as expected
 
 Some information
 An error
-catch_self_test.hpp:109:
+catch_self_test.hpp:
 PASSED:
 with message:
   Tests passed, as expected
 
-catch_self_test.hpp:109:
+catch_self_test.hpp:
 PASSED:
 with message:
   Tests passed, as expected
 
-catch_self_test.hpp:109:
+catch_self_test.hpp:
 PASSED:
 with message:
   Tests passed, as expected
 
-catch_self_test.hpp:109:
+catch_self_test.hpp:
 PASSED:
 with message:
   Tests passed, as expected
 
-catch_self_test.hpp:109:
+catch_self_test.hpp:
 PASSED:
 with message:
   Tests passed, as expected
 
-catch_self_test.hpp:109:
+catch_self_test.hpp:
 PASSED:
 with message:
   Tests passed, as expected
 
-catch_self_test.hpp:109:
+catch_self_test.hpp:
 PASSED:
 with message:
   Tests passed, as expected
 
-catch_self_test.hpp:109:
+catch_self_test.hpp:
 PASSED:
 with message:
   Tests passed, as expected
 
-catch_self_test.hpp:109:
+catch_self_test.hpp:
 PASSED:
 with message:
   Tests passed, as expected
 
-catch_self_test.hpp:109:
+catch_self_test.hpp:
 PASSED:
 with message:
   Tests passed, as expected
 
-catch_self_test.hpp:109:
+catch_self_test.hpp:
 PASSED:
 with message:
   Tests passed, as expected
 
-catch_self_test.hpp:109:
+catch_self_test.hpp:
 PASSED:
 with message:
   Tests passed, as expected
 
-catch_self_test.hpp:109:
+catch_self_test.hpp:
 PASSED:
 with message:
   Tests passed, as expected
 
-catch_self_test.hpp:109:
+catch_self_test.hpp:
 PASSED:
 with message:
   Tests passed, as expected
 
-catch_self_test.hpp:109:
+catch_self_test.hpp:
 PASSED:
 with message:
   Tests passed, as expected
 
-catch_self_test.hpp:109:
+catch_self_test.hpp:
 PASSED:
 with message:
   Tests passed, as expected
 
-catch_self_test.hpp:109:
+catch_self_test.hpp:
 PASSED:
 with message:
   Tests passed, as expected
@@ -4168,16 +4168,16 @@
   selftest/test counts
   selftest/test counts/succeeding tests
 -------------------------------------------------------------------------------
-TestMain.cpp:39
+TestMain.cpp
 ...............................................................................
 
-TestMain.cpp:41:
+TestMain.cpp:
 PASSED:
   CHECK( totals.assertions.passed == 296 )
 with expansion:
   296 == 296
 
-TestMain.cpp:42:
+TestMain.cpp:
 PASSED:
   CHECK( totals.assertions.failed == 0 )
 with expansion:
@@ -4188,16 +4188,16 @@
   selftest/test counts
   selftest/test counts/failing tests
 -------------------------------------------------------------------------------
-TestMain.cpp:46
+TestMain.cpp
 ...............................................................................
 
-TestMain.cpp:48:
+TestMain.cpp:
 PASSED:
   CHECK( totals.assertions.passed == 1 )
 with expansion:
   1 == 1
 
-TestMain.cpp:49:
+TestMain.cpp:
 PASSED:
   CHECK( totals.assertions.failed == 74 )
 with expansion:
@@ -4206,16 +4206,16 @@
 -------------------------------------------------------------------------------
 meta/Misc/Sections
 -------------------------------------------------------------------------------
-TestMain.cpp:54
+TestMain.cpp
 ...............................................................................
 
-TestMain.cpp:58:
+TestMain.cpp:
 PASSED:
   CHECK( totals.assertions.passed == 2 )
 with expansion:
   2 == 2
 
-TestMain.cpp:59:
+TestMain.cpp:
 PASSED:
   CHECK( totals.assertions.failed == 1 )
 with expansion:
@@ -4225,32 +4225,32 @@
 Process can be configured on command line
   default - no arguments
 -------------------------------------------------------------------------------
-TestMain.cpp:96
+TestMain.cpp
 ...............................................................................
 
-TestMain.cpp:98:
+TestMain.cpp:
 PASSED:
   CHECK_NOTHROW( parseIntoConfig( argv, config ) )
 
-TestMain.cpp:100:
+TestMain.cpp:
 PASSED:
   CHECK( config.shouldDebugBreak == false )
 with expansion:
   false == false
 
-TestMain.cpp:101:
+TestMain.cpp:
 PASSED:
   CHECK( config.abortAfter == -1 )
 with expansion:
   -1 == -1
 
-TestMain.cpp:102:
+TestMain.cpp:
 PASSED:
   CHECK( config.noThrow == false )
 with expansion:
   false == false
 
-TestMain.cpp:103:
+TestMain.cpp:
 PASSED:
   CHECK( config.reporterName.empty() )
 with expansion:
@@ -4261,26 +4261,26 @@
   test lists
   1 test
 -------------------------------------------------------------------------------
-TestMain.cpp:107
+TestMain.cpp
 ...............................................................................
 
-TestMain.cpp:109:
+TestMain.cpp:
 PASSED:
   CHECK_NOTHROW( parseIntoConfig( argv, config ) )
 
-TestMain.cpp:112:
+TestMain.cpp:
 PASSED:
   REQUIRE( cfg.filters().size() == 1 )
 with expansion:
   1 == 1
 
-TestMain.cpp:113:
+TestMain.cpp:
 PASSED:
   REQUIRE( cfg.filters()[0].shouldInclude( fakeTestCase( "notIncluded" ) ) == false )
 with expansion:
   false == false
 
-TestMain.cpp:114:
+TestMain.cpp:
 PASSED:
   REQUIRE( cfg.filters()[0].shouldInclude( fakeTestCase( "test1" ) ) )
 with expansion:
@@ -4291,26 +4291,26 @@
   test lists
   Specify one test case exclusion using exclude:
 -------------------------------------------------------------------------------
-TestMain.cpp:116
+TestMain.cpp
 ...............................................................................
 
-TestMain.cpp:118:
+TestMain.cpp:
 PASSED:
   CHECK_NOTHROW( parseIntoConfig( argv, config ) )
 
-TestMain.cpp:121:
+TestMain.cpp:
 PASSED:
   REQUIRE( cfg.filters().size() == 1 )
 with expansion:
   1 == 1
 
-TestMain.cpp:122:
+TestMain.cpp:
 PASSED:
   REQUIRE( cfg.filters()[0].shouldInclude( fakeTestCase( "test1" ) ) == false )
 with expansion:
   false == false
 
-TestMain.cpp:123:
+TestMain.cpp:
 PASSED:
   REQUIRE( cfg.filters()[0].shouldInclude( fakeTestCase( "alwaysIncluded" ) ) )
 with expansion:
@@ -4321,26 +4321,26 @@
   test lists
   Specify one test case exclusion using ~
 -------------------------------------------------------------------------------
-TestMain.cpp:126
+TestMain.cpp
 ...............................................................................
 
-TestMain.cpp:128:
+TestMain.cpp:
 PASSED:
   CHECK_NOTHROW( parseIntoConfig( argv, config ) )
 
-TestMain.cpp:131:
+TestMain.cpp:
 PASSED:
   REQUIRE( cfg.filters().size() == 1 )
 with expansion:
   1 == 1
 
-TestMain.cpp:132:
+TestMain.cpp:
 PASSED:
   REQUIRE( cfg.filters()[0].shouldInclude( fakeTestCase( "test1" ) ) == false )
 with expansion:
   false == false
 
-TestMain.cpp:133:
+TestMain.cpp:
 PASSED:
   REQUIRE( cfg.filters()[0].shouldInclude( fakeTestCase( "alwaysIncluded" ) ) )
 with expansion:
@@ -4351,32 +4351,32 @@
   test lists
   Specify two test cases using -t
 -------------------------------------------------------------------------------
-TestMain.cpp:136
+TestMain.cpp
 ...............................................................................
 
-TestMain.cpp:138:
+TestMain.cpp:
 PASSED:
   CHECK_NOTHROW( parseIntoConfig( argv, config ) )
 
-TestMain.cpp:141:
+TestMain.cpp:
 PASSED:
   REQUIRE( cfg.filters().size() == 1 )
 with expansion:
   1 == 1
 
-TestMain.cpp:142:
+TestMain.cpp:
 PASSED:
   REQUIRE( cfg.filters()[0].shouldInclude( fakeTestCase( "notIncluded" ) ) == false )
 with expansion:
   false == false
 
-TestMain.cpp:143:
+TestMain.cpp:
 PASSED:
   REQUIRE( cfg.filters()[0].shouldInclude( fakeTestCase( "test1" ) ) )
 with expansion:
   true
 
-TestMain.cpp:144:
+TestMain.cpp:
 PASSED:
   REQUIRE( cfg.filters()[0].shouldInclude( fakeTestCase( "test2" ) ) )
 with expansion:
@@ -4387,14 +4387,14 @@
   reporter
   -r/console
 -------------------------------------------------------------------------------
-TestMain.cpp:149
+TestMain.cpp
 ...............................................................................
 
-TestMain.cpp:151:
+TestMain.cpp:
 PASSED:
   CHECK_NOTHROW( parseIntoConfig( argv, config ) )
 
-TestMain.cpp:153:
+TestMain.cpp:
 PASSED:
   REQUIRE( config.reporterName == "console" )
 with expansion:
@@ -4405,14 +4405,14 @@
   reporter
   -r/xml
 -------------------------------------------------------------------------------
-TestMain.cpp:155
+TestMain.cpp
 ...............................................................................
 
-TestMain.cpp:157:
+TestMain.cpp:
 PASSED:
   CHECK_NOTHROW( parseIntoConfig( argv, config ) )
 
-TestMain.cpp:159:
+TestMain.cpp:
 PASSED:
   REQUIRE( config.reporterName == "xml" )
 with expansion:
@@ -4423,14 +4423,14 @@
   reporter
   --reporter/junit
 -------------------------------------------------------------------------------
-TestMain.cpp:161
+TestMain.cpp
 ...............................................................................
 
-TestMain.cpp:163:
+TestMain.cpp:
 PASSED:
   CHECK_NOTHROW( parseIntoConfig( argv, config ) )
 
-TestMain.cpp:165:
+TestMain.cpp:
 PASSED:
   REQUIRE( config.reporterName == "junit" )
 with expansion:
@@ -4441,14 +4441,14 @@
   debugger
   -b
 -------------------------------------------------------------------------------
-TestMain.cpp:170
+TestMain.cpp
 ...............................................................................
 
-TestMain.cpp:172:
+TestMain.cpp:
 PASSED:
   CHECK_NOTHROW( parseIntoConfig( argv, config ) )
 
-TestMain.cpp:174:
+TestMain.cpp:
 PASSED:
   REQUIRE( config.shouldDebugBreak == true )
 with expansion:
@@ -4459,14 +4459,14 @@
   debugger
   --break
 -------------------------------------------------------------------------------
-TestMain.cpp:176
+TestMain.cpp
 ...............................................................................
 
-TestMain.cpp:178:
+TestMain.cpp:
 PASSED:
   CHECK_NOTHROW( parseIntoConfig( argv, config ) )
 
-TestMain.cpp:180:
+TestMain.cpp:
 PASSED:
   REQUIRE( config.shouldDebugBreak )
 with expansion:
@@ -4477,14 +4477,14 @@
   abort
   -a aborts after first failure
 -------------------------------------------------------------------------------
-TestMain.cpp:185
+TestMain.cpp
 ...............................................................................
 
-TestMain.cpp:187:
+TestMain.cpp:
 PASSED:
   CHECK_NOTHROW( parseIntoConfig( argv, config ) )
 
-TestMain.cpp:189:
+TestMain.cpp:
 PASSED:
   REQUIRE( config.abortAfter == 1 )
 with expansion:
@@ -4495,14 +4495,14 @@
   abort
   -x 2 aborts after two failures
 -------------------------------------------------------------------------------
-TestMain.cpp:191
+TestMain.cpp
 ...............................................................................
 
-TestMain.cpp:193:
+TestMain.cpp:
 PASSED:
   CHECK_NOTHROW( parseIntoConfig( argv, config ) )
 
-TestMain.cpp:195:
+TestMain.cpp:
 PASSED:
   REQUIRE( config.abortAfter == 2 )
 with expansion:
@@ -4513,10 +4513,10 @@
   abort
   -x must be greater than zero
 -------------------------------------------------------------------------------
-TestMain.cpp:197
+TestMain.cpp
 ...............................................................................
 
-TestMain.cpp:199:
+TestMain.cpp:
 PASSED:
   REQUIRE_THAT( parseIntoConfigAndReturnError( argv, config ) Contains( "greater than zero" ) )
 with expansion:
@@ -4528,10 +4528,10 @@
   abort
   -x must be numeric
 -------------------------------------------------------------------------------
-TestMain.cpp:201
+TestMain.cpp
 ...............................................................................
 
-TestMain.cpp:203:
+TestMain.cpp:
 PASSED:
   REQUIRE_THAT( parseIntoConfigAndReturnError( argv, config ) Contains( "-x" ) )
 with expansion:
@@ -4543,14 +4543,14 @@
   nothrow
   -e
 -------------------------------------------------------------------------------
-TestMain.cpp:208
+TestMain.cpp
 ...............................................................................
 
-TestMain.cpp:210:
+TestMain.cpp:
 PASSED:
   CHECK_NOTHROW( parseIntoConfig( argv, config ) )
 
-TestMain.cpp:212:
+TestMain.cpp:
 PASSED:
   REQUIRE( config.noThrow == true )
 with expansion:
@@ -4561,14 +4561,14 @@
   nothrow
   --nothrow
 -------------------------------------------------------------------------------
-TestMain.cpp:214
+TestMain.cpp
 ...............................................................................
 
-TestMain.cpp:216:
+TestMain.cpp:
 PASSED:
   CHECK_NOTHROW( parseIntoConfig( argv, config ) )
 
-TestMain.cpp:218:
+TestMain.cpp:
 PASSED:
   REQUIRE( config.noThrow == true )
 with expansion:
@@ -4579,14 +4579,14 @@
   output filename
   -o filename
 -------------------------------------------------------------------------------
-TestMain.cpp:223
+TestMain.cpp
 ...............................................................................
 
-TestMain.cpp:225:
+TestMain.cpp:
 PASSED:
   CHECK_NOTHROW( parseIntoConfig( argv, config ) )
 
-TestMain.cpp:227:
+TestMain.cpp:
 PASSED:
   REQUIRE( config.outputFilename == "filename.ext" )
 with expansion:
@@ -4597,14 +4597,14 @@
   output filename
   --out
 -------------------------------------------------------------------------------
-TestMain.cpp:229
+TestMain.cpp
 ...............................................................................
 
-TestMain.cpp:231:
+TestMain.cpp:
 PASSED:
   CHECK_NOTHROW( parseIntoConfig( argv, config ) )
 
-TestMain.cpp:233:
+TestMain.cpp:
 PASSED:
   REQUIRE( config.outputFilename == "filename.ext" )
 with expansion:
@@ -4615,26 +4615,26 @@
   combinations
   Single character flags can be combined
 -------------------------------------------------------------------------------
-TestMain.cpp:238
+TestMain.cpp
 ...............................................................................
 
-TestMain.cpp:240:
+TestMain.cpp:
 PASSED:
   CHECK_NOTHROW( parseIntoConfig( argv, config ) )
 
-TestMain.cpp:242:
+TestMain.cpp:
 PASSED:
   CHECK( config.abortAfter == 1 )
 with expansion:
   1 == 1
 
-TestMain.cpp:243:
+TestMain.cpp:
 PASSED:
   CHECK( config.shouldDebugBreak )
 with expansion:
   true
 
-TestMain.cpp:244:
+TestMain.cpp:
 PASSED:
   CHECK( config.noThrow == true )
 with expansion:
@@ -4643,40 +4643,40 @@
 -------------------------------------------------------------------------------
 selftest/test filter
 -------------------------------------------------------------------------------
-TestMain.cpp:249
+TestMain.cpp
 ...............................................................................
 
-TestMain.cpp:253:
+TestMain.cpp:
 PASSED:
   CHECK( matchAny.shouldInclude( fakeTestCase( "any" ) ) )
 with expansion:
   true
 
-TestMain.cpp:254:
+TestMain.cpp:
 PASSED:
   CHECK( matchNone.shouldInclude( fakeTestCase( "any" ) ) == false )
 with expansion:
   false == false
 
-TestMain.cpp:259:
+TestMain.cpp:
 PASSED:
   CHECK( matchHidden.shouldInclude( fakeTestCase( "any" ) ) == false )
 with expansion:
   false == false
 
-TestMain.cpp:260:
+TestMain.cpp:
 PASSED:
   CHECK( matchNonHidden.shouldInclude( fakeTestCase( "any" ) ) )
 with expansion:
   true
 
-TestMain.cpp:262:
+TestMain.cpp:
 PASSED:
   CHECK( matchHidden.shouldInclude( fakeTestCase( "./any" ) ) )
 with expansion:
   true
 
-TestMain.cpp:263:
+TestMain.cpp:
 PASSED:
   CHECK( matchNonHidden.shouldInclude( fakeTestCase( "./any" ) ) == false )
 with expansion:
@@ -4685,28 +4685,28 @@
 -------------------------------------------------------------------------------
 selftest/test filters
 -------------------------------------------------------------------------------
-TestMain.cpp:266
+TestMain.cpp
 ...............................................................................
 
-TestMain.cpp:274:
+TestMain.cpp:
 PASSED:
   CHECK( matchHidden.shouldInclude( fakeTestCase( "./something" ) ) )
 with expansion:
   true
 
-TestMain.cpp:276:
+TestMain.cpp:
 PASSED:
   CHECK( filters.shouldInclude( fakeTestCase( "any" ) ) == false )
 with expansion:
   false == false
 
-TestMain.cpp:277:
+TestMain.cpp:
 PASSED:
   CHECK( filters.shouldInclude( fakeTestCase( "./something" ) ) )
 with expansion:
   true
 
-TestMain.cpp:278:
+TestMain.cpp:
 PASSED:
   CHECK( filters.shouldInclude( fakeTestCase( "./anything" ) ) == false )
 with expansion:
@@ -4715,16 +4715,16 @@
 -------------------------------------------------------------------------------
 selftest/filter/prefix wildcard
 -------------------------------------------------------------------------------
-TestMain.cpp:281
+TestMain.cpp
 ...............................................................................
 
-TestMain.cpp:284:
+TestMain.cpp:
 PASSED:
   CHECK( matchBadgers.shouldInclude( fakeTestCase( "big badger" ) ) )
 with expansion:
   true
 
-TestMain.cpp:285:
+TestMain.cpp:
 PASSED:
   CHECK( matchBadgers.shouldInclude( fakeTestCase( "little badgers" ) ) == false )
 with expansion:
@@ -4733,28 +4733,28 @@
 -------------------------------------------------------------------------------
 selftest/filter/wildcard at both ends
 -------------------------------------------------------------------------------
-TestMain.cpp:287
+TestMain.cpp
 ...............................................................................
 
-TestMain.cpp:290:
+TestMain.cpp:
 PASSED:
   CHECK( matchBadgers.shouldInclude( fakeTestCase( "big badger" ) ) )
 with expansion:
   true
 
-TestMain.cpp:291:
+TestMain.cpp:
 PASSED:
   CHECK( matchBadgers.shouldInclude( fakeTestCase( "little badgers" ) ) )
 with expansion:
   true
 
-TestMain.cpp:292:
+TestMain.cpp:
 PASSED:
   CHECK( matchBadgers.shouldInclude( fakeTestCase( "badgers are big" ) ) )
 with expansion:
   true
 
-TestMain.cpp:293:
+TestMain.cpp:
 PASSED:
   CHECK( matchBadgers.shouldInclude( fakeTestCase( "hedgehogs" ) ) == false )
 with expansion:
@@ -4764,52 +4764,52 @@
 selftest/tags
   one tag
 -------------------------------------------------------------------------------
-TestMain.cpp:310
+TestMain.cpp
 ...............................................................................
 
-TestMain.cpp:313:
+TestMain.cpp:
 PASSED:
   CHECK( oneTag.getTestCaseInfo().description == "" )
 with expansion:
   "" == ""
 
-TestMain.cpp:314:
+TestMain.cpp:
 PASSED:
   CHECK( oneTag.hasTag( "one" ) )
 with expansion:
   true
 
-TestMain.cpp:315:
+TestMain.cpp:
 PASSED:
   CHECK( oneTag.getTags().size() == 1 )
 with expansion:
   1 == 1
 
-TestMain.cpp:317:
+TestMain.cpp:
 PASSED:
   CHECK( oneTag.matchesTags( p1 ) == true )
 with expansion:
   true == true
 
-TestMain.cpp:318:
+TestMain.cpp:
 PASSED:
   CHECK( oneTag.matchesTags( p2 ) == true )
 with expansion:
   true == true
 
-TestMain.cpp:319:
+TestMain.cpp:
 PASSED:
   CHECK( oneTag.matchesTags( p3 ) == false )
 with expansion:
   false == false
 
-TestMain.cpp:320:
+TestMain.cpp:
 PASSED:
   CHECK( oneTag.matchesTags( p4 ) == false )
 with expansion:
   false == false
 
-TestMain.cpp:321:
+TestMain.cpp:
 PASSED:
   CHECK( oneTag.matchesTags( p5 ) == false )
 with expansion:
@@ -4819,70 +4819,70 @@
 selftest/tags
   two tags
 -------------------------------------------------------------------------------
-TestMain.cpp:324
+TestMain.cpp
 ...............................................................................
 
-TestMain.cpp:327:
+TestMain.cpp:
 PASSED:
   CHECK( twoTags.getTestCaseInfo().description == "" )
 with expansion:
   "" == ""
 
-TestMain.cpp:328:
+TestMain.cpp:
 PASSED:
   CHECK( twoTags.hasTag( "one" ) )
 with expansion:
   true
 
-TestMain.cpp:329:
+TestMain.cpp:
 PASSED:
   CHECK( twoTags.hasTag( "two" ) )
 with expansion:
   true
 
-TestMain.cpp:330:
+TestMain.cpp:
 PASSED:
   CHECK( twoTags.hasTag( "Two" ) )
 with expansion:
   true
 
-TestMain.cpp:331:
+TestMain.cpp:
 PASSED:
   CHECK( twoTags.hasTag( "three" ) == false )
 with expansion:
   false == false
 
-TestMain.cpp:332:
+TestMain.cpp:
 PASSED:
   CHECK( twoTags.getTags().size() == 2 )
 with expansion:
   2 == 2
 
-TestMain.cpp:334:
+TestMain.cpp:
 PASSED:
   CHECK( twoTags.matchesTags( p1 ) == true )
 with expansion:
   true == true
 
-TestMain.cpp:335:
+TestMain.cpp:
 PASSED:
   CHECK( twoTags.matchesTags( p2 ) == true )
 with expansion:
   true == true
 
-TestMain.cpp:336:
+TestMain.cpp:
 PASSED:
   CHECK( twoTags.matchesTags( p3 ) == true )
 with expansion:
   true == true
 
-TestMain.cpp:337:
+TestMain.cpp:
 PASSED:
   CHECK( twoTags.matchesTags( p4 ) == true )
 with expansion:
   true == true
 
-TestMain.cpp:338:
+TestMain.cpp:
 PASSED:
   CHECK( twoTags.matchesTags( p5 ) == true )
 with expansion:
@@ -4892,28 +4892,28 @@
 selftest/tags
   one tag with characters either side
 -------------------------------------------------------------------------------
-TestMain.cpp:341
+TestMain.cpp
 ...............................................................................
 
-TestMain.cpp:344:
+TestMain.cpp:
 PASSED:
   CHECK( oneTagWithExtras.getTestCaseInfo().description == "1234" )
 with expansion:
   "1234" == "1234"
 
-TestMain.cpp:345:
+TestMain.cpp:
 PASSED:
   CHECK( oneTagWithExtras.hasTag( "one" ) )
 with expansion:
   true
 
-TestMain.cpp:346:
+TestMain.cpp:
 PASSED:
   CHECK( oneTagWithExtras.hasTag( "two" ) == false )
 with expansion:
   false == false
 
-TestMain.cpp:347:
+TestMain.cpp:
 PASSED:
   CHECK( oneTagWithExtras.getTags().size() == 1 )
 with expansion:
@@ -4923,22 +4923,22 @@
 selftest/tags
   start of a tag, but not closed
 -------------------------------------------------------------------------------
-TestMain.cpp:350
+TestMain.cpp
 ...............................................................................
 
-TestMain.cpp:354:
+TestMain.cpp:
 PASSED:
   CHECK( oneTagOpen.getTestCaseInfo().description == "[one" )
 with expansion:
   "[one" == "[one"
 
-TestMain.cpp:355:
+TestMain.cpp:
 PASSED:
   CHECK( oneTagOpen.hasTag( "one" ) == false )
 with expansion:
   false == false
 
-TestMain.cpp:356:
+TestMain.cpp:
 PASSED:
   CHECK( oneTagOpen.getTags().size() == 0 )
 with expansion:
@@ -4948,28 +4948,28 @@
 selftest/tags
   hidden
 -------------------------------------------------------------------------------
-TestMain.cpp:359
+TestMain.cpp
 ...............................................................................
 
-TestMain.cpp:362:
+TestMain.cpp:
 PASSED:
   CHECK( oneTag.getTestCaseInfo().description == "" )
 with expansion:
   "" == ""
 
-TestMain.cpp:363:
+TestMain.cpp:
 PASSED:
   CHECK( oneTag.hasTag( "." ) )
 with expansion:
   true
 
-TestMain.cpp:364:
+TestMain.cpp:
 PASSED:
   CHECK( oneTag.isHidden() )
 with expansion:
   true
 
-TestMain.cpp:366:
+TestMain.cpp:
 PASSED:
   CHECK( oneTag.matchesTags( "~[.]" ) == false )
 with expansion:
@@ -4980,10 +4980,10 @@
   plain string
   No wrapping
 -------------------------------------------------------------------------------
-TestMain.cpp:378
+TestMain.cpp
 ...............................................................................
 
-TestMain.cpp:379:
+TestMain.cpp:
 PASSED:
   CHECK( Text( testString, TextAttributes().setWidth( 80 ) ).toString() == testString )
 with expansion:
@@ -4991,7 +4991,7 @@
   ==
   "one two three four"
 
-TestMain.cpp:380:
+TestMain.cpp:
 PASSED:
   CHECK( Text( testString, TextAttributes().setWidth( 18 ) ).toString() == testString )
 with expansion:
@@ -5004,10 +5004,10 @@
   plain string
   Wrapped once
 -------------------------------------------------------------------------------
-TestMain.cpp:382
+TestMain.cpp
 ...............................................................................
 
-TestMain.cpp:383:
+TestMain.cpp:
 PASSED:
   CHECK( Text( testString, TextAttributes().setWidth( 17 ) ).toString() == "one two three\nfour" )
 with expansion:
@@ -5017,7 +5017,7 @@
   "one two three
   four"
 
-TestMain.cpp:384:
+TestMain.cpp:
 PASSED:
   CHECK( Text( testString, TextAttributes().setWidth( 16 ) ).toString() == "one two three\nfour" )
 with expansion:
@@ -5027,7 +5027,7 @@
   "one two three
   four"
 
-TestMain.cpp:385:
+TestMain.cpp:
 PASSED:
   CHECK( Text( testString, TextAttributes().setWidth( 14 ) ).toString() == "one two three\nfour" )
 with expansion:
@@ -5037,7 +5037,7 @@
   "one two three
   four"
 
-TestMain.cpp:386:
+TestMain.cpp:
 PASSED:
   CHECK( Text( testString, TextAttributes().setWidth( 13 ) ).toString() == "one two three\nfour" )
 with expansion:
@@ -5047,7 +5047,7 @@
   "one two three
   four"
 
-TestMain.cpp:387:
+TestMain.cpp:
 PASSED:
   CHECK( Text( testString, TextAttributes().setWidth( 12 ) ).toString() == "one two\nthree four" )
 with expansion:
@@ -5062,10 +5062,10 @@
   plain string
   Wrapped twice
 -------------------------------------------------------------------------------
-TestMain.cpp:389
+TestMain.cpp
 ...............................................................................
 
-TestMain.cpp:390:
+TestMain.cpp:
 PASSED:
   CHECK( Text( testString, TextAttributes().setWidth( 9 ) ).toString() == "one two\nthree\nfour" )
 with expansion:
@@ -5077,7 +5077,7 @@
   three
   four"
 
-TestMain.cpp:391:
+TestMain.cpp:
 PASSED:
   CHECK( Text( testString, TextAttributes().setWidth( 8 ) ).toString() == "one two\nthree\nfour" )
 with expansion:
@@ -5089,7 +5089,7 @@
   three
   four"
 
-TestMain.cpp:392:
+TestMain.cpp:
 PASSED:
   CHECK( Text( testString, TextAttributes().setWidth( 7 ) ).toString() == "one two\nthree\nfour" )
 with expansion:
@@ -5106,10 +5106,10 @@
   plain string
   Wrapped three times
 -------------------------------------------------------------------------------
-TestMain.cpp:394
+TestMain.cpp
 ...............................................................................
 
-TestMain.cpp:395:
+TestMain.cpp:
 PASSED:
   CHECK( Text( testString, TextAttributes().setWidth( 6 ) ).toString() == "one\ntwo\nthree\nfour" )
 with expansion:
@@ -5123,7 +5123,7 @@
   three
   four"
 
-TestMain.cpp:396:
+TestMain.cpp:
 PASSED:
   CHECK( Text( testString, TextAttributes().setWidth( 5 ) ).toString() == "one\ntwo\nthree\nfour" )
 with expansion:
@@ -5142,10 +5142,10 @@
   plain string
   Short wrap
 -------------------------------------------------------------------------------
-TestMain.cpp:398
+TestMain.cpp
 ...............................................................................
 
-TestMain.cpp:399:
+TestMain.cpp:
 PASSED:
   CHECK( Text( "abcdef", TextAttributes().setWidth( 4 ) ).toString() == "abc-\ndef" )
 with expansion:
@@ -5155,7 +5155,7 @@
   "abc-
   def"
 
-TestMain.cpp:400:
+TestMain.cpp:
 PASSED:
   CHECK( Text( "abcdefg", TextAttributes().setWidth( 4 ) ).toString() == "abc-\ndefg" )
 with expansion:
@@ -5165,7 +5165,7 @@
   "abc-
   defg"
 
-TestMain.cpp:401:
+TestMain.cpp:
 PASSED:
   CHECK( Text( "abcdefgh", TextAttributes().setWidth( 4 ) ).toString() == "abc-\ndef-\ngh" )
 with expansion:
@@ -5177,7 +5177,7 @@
   def-
   gh"
 
-TestMain.cpp:403:
+TestMain.cpp:
 PASSED:
   CHECK( Text( testString, TextAttributes().setWidth( 4 ) ).toString() == "one\ntwo\nthr-\nee\nfour" )
 with expansion:
@@ -5193,7 +5193,7 @@
   ee
   four"
 
-TestMain.cpp:404:
+TestMain.cpp:
 PASSED:
   CHECK( Text( testString, TextAttributes().setWidth( 3 ) ).toString() == "one\ntwo\nth-\nree\nfo-\nur" )
 with expansion:
@@ -5216,34 +5216,34 @@
   plain string
   As container
 -------------------------------------------------------------------------------
-TestMain.cpp:406
+TestMain.cpp
 ...............................................................................
 
-TestMain.cpp:408:
+TestMain.cpp:
 PASSED:
   REQUIRE( text.size() == 4 )
 with expansion:
   4 == 4
 
-TestMain.cpp:409:
+TestMain.cpp:
 PASSED:
   CHECK( text[0] == "one" )
 with expansion:
   "one" == "one"
 
-TestMain.cpp:410:
+TestMain.cpp:
 PASSED:
   CHECK( text[1] == "two" )
 with expansion:
   "two" == "two"
 
-TestMain.cpp:411:
+TestMain.cpp:
 PASSED:
   CHECK( text[2] == "three" )
 with expansion:
   "three" == "three"
 
-TestMain.cpp:412:
+TestMain.cpp:
 PASSED:
   CHECK( text[3] == "four" )
 with expansion:
@@ -5254,10 +5254,10 @@
   plain string
   Indent first line differently
 -------------------------------------------------------------------------------
-TestMain.cpp:414
+TestMain.cpp
 ...............................................................................
 
-TestMain.cpp:419:
+TestMain.cpp:
 PASSED:
   CHECK( text.toString() == " one two\n    three\n    four" )
 with expansion:
@@ -5274,10 +5274,10 @@
   With newlines
   No wrapping
 -------------------------------------------------------------------------------
-TestMain.cpp:429
+TestMain.cpp
 ...............................................................................
 
-TestMain.cpp:430:
+TestMain.cpp:
 PASSED:
   CHECK( Text( testString, TextAttributes().setWidth( 80 ) ).toString() == testString )
 with expansion:
@@ -5287,7 +5287,7 @@
   "one two
   three four"
 
-TestMain.cpp:431:
+TestMain.cpp:
 PASSED:
   CHECK( Text( testString, TextAttributes().setWidth( 18 ) ).toString() == testString )
 with expansion:
@@ -5297,7 +5297,7 @@
   "one two
   three four"
 
-TestMain.cpp:432:
+TestMain.cpp:
 PASSED:
   CHECK( Text( testString, TextAttributes().setWidth( 10 ) ).toString() == testString )
 with expansion:
@@ -5312,10 +5312,10 @@
   With newlines
   Trailing newline
 -------------------------------------------------------------------------------
-TestMain.cpp:434
+TestMain.cpp
 ...............................................................................
 
-TestMain.cpp:435:
+TestMain.cpp:
 PASSED:
   CHECK( Text( "abcdef\n", TextAttributes().setWidth( 10 ) ).toString() == "abcdef\n" )
 with expansion:
@@ -5325,13 +5325,13 @@
   "abcdef
   "
 
-TestMain.cpp:436:
+TestMain.cpp:
 PASSED:
   CHECK( Text( "abcdef", TextAttributes().setWidth( 6 ) ).toString() == "abcdef" )
 with expansion:
   "abcdef" == "abcdef"
 
-TestMain.cpp:437:
+TestMain.cpp:
 PASSED:
   CHECK( Text( "abcdef\n", TextAttributes().setWidth( 6 ) ).toString() == "abcdef\n" )
 with expansion:
@@ -5346,10 +5346,10 @@
   With newlines
   Wrapped once
 -------------------------------------------------------------------------------
-TestMain.cpp:439
+TestMain.cpp
 ...............................................................................
 
-TestMain.cpp:440:
+TestMain.cpp:
 PASSED:
   CHECK( Text( testString, TextAttributes().setWidth( 9 ) ).toString() == "one two\nthree\nfour" )
 with expansion:
@@ -5361,7 +5361,7 @@
   three
   four"
 
-TestMain.cpp:441:
+TestMain.cpp:
 PASSED:
   CHECK( Text( testString, TextAttributes().setWidth( 8 ) ).toString() == "one two\nthree\nfour" )
 with expansion:
@@ -5373,7 +5373,7 @@
   three
   four"
 
-TestMain.cpp:442:
+TestMain.cpp:
 PASSED:
   CHECK( Text( testString, TextAttributes().setWidth( 7 ) ).toString() == "one two\nthree\nfour" )
 with expansion:
@@ -5390,10 +5390,10 @@
   With newlines
   Wrapped twice
 -------------------------------------------------------------------------------
-TestMain.cpp:444
+TestMain.cpp
 ...............................................................................
 
-TestMain.cpp:445:
+TestMain.cpp:
 PASSED:
   CHECK( Text( testString, TextAttributes().setWidth( 6 ) ).toString() == "one\ntwo\nthree\nfour" )
 with expansion:
@@ -5411,10 +5411,10 @@
 Long strings can be wrapped
   With tabs
 -------------------------------------------------------------------------------
-TestMain.cpp:449
+TestMain.cpp
 ...............................................................................
 
-TestMain.cpp:455:
+TestMain.cpp:
 PASSED:
   CHECK( Text( testString, TextAttributes().setWidth( 15 ) ).toString() == "one two three\n        four\n        five\n        six" )
 with expansion:
@@ -5433,7 +5433,7 @@
 -------------------------------------------------------------------------------
 Strings can be rendered with colour
 -------------------------------------------------------------------------------
-TestMain.cpp:534
+TestMain.cpp
 ...............................................................................
 
 
@@ -5442,16 +5442,16 @@
 -------------------------------------------------------------------------------
 Text can be formatted using the Text class
 -------------------------------------------------------------------------------
-TestMain.cpp:553
+TestMain.cpp
 ...............................................................................
 
-TestMain.cpp:555:
+TestMain.cpp:
 PASSED:
   CHECK( Text( "hi there" ).toString() == "hi there" )
 with expansion:
   "hi there" == "hi there"
 
-TestMain.cpp:560:
+TestMain.cpp:
 PASSED:
   CHECK( Text( "hi there", narrow ).toString() == "hi\nthere" )
 with expansion:
@@ -5464,10 +5464,10 @@
 -------------------------------------------------------------------------------
 ./succeeding/Tricky/std::pair
 -------------------------------------------------------------------------------
-TrickyTests.cpp:32
+TrickyTests.cpp
 ...............................................................................
 
-TrickyTests.cpp:37:
+TrickyTests.cpp:
 PASSED:
   REQUIRE( (std::pair<int, int>( 1, 2 )) == aNicePair )
 with expansion:
@@ -5476,10 +5476,10 @@
 -------------------------------------------------------------------------------
 ./inprogress/failing/Tricky/trailing expression
 -------------------------------------------------------------------------------
-TrickyTests.cpp:46
+TrickyTests.cpp
 ...............................................................................
 
-TrickyTests.cpp:55:
+TrickyTests.cpp:
 warning:
   Uncomment the code in this test to check that it gives a sensible compiler
   error
@@ -5490,10 +5490,10 @@
 -------------------------------------------------------------------------------
 ./inprogress/failing/Tricky/compound lhs
 -------------------------------------------------------------------------------
-TrickyTests.cpp:62
+TrickyTests.cpp
 ...............................................................................
 
-TrickyTests.cpp:71:
+TrickyTests.cpp:
 warning:
   Uncomment the code in this test to check that it gives a sensible compiler
   error
@@ -5504,15 +5504,15 @@
 -------------------------------------------------------------------------------
 ./failing/Tricky/non streamable type
 -------------------------------------------------------------------------------
-TrickyTests.cpp:88
+TrickyTests.cpp
 ...............................................................................
 
-TrickyTests.cpp:95: FAILED:
+TrickyTests.cpp: FAILED:
   CHECK( &o1 == &o2 )
 with expansion:
   0x<hex digits> == 0x<hex digits>
 
-TrickyTests.cpp:96: FAILED:
+TrickyTests.cpp: FAILED:
   CHECK( o1 == o2 )
 with expansion:
   {?} == {?}
@@ -5520,10 +5520,10 @@
 -------------------------------------------------------------------------------
 ./failing/string literals
 -------------------------------------------------------------------------------
-TrickyTests.cpp:104
+TrickyTests.cpp
 ...............................................................................
 
-TrickyTests.cpp:106: FAILED:
+TrickyTests.cpp: FAILED:
   REQUIRE( std::string( "first" ) == "second" )
 with expansion:
   "first" == "second"
@@ -5531,16 +5531,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/side-effects
 -------------------------------------------------------------------------------
-TrickyTests.cpp:115
+TrickyTests.cpp
 ...............................................................................
 
-TrickyTests.cpp:119:
+TrickyTests.cpp:
 PASSED:
   REQUIRE( i++ == 7 )
 with expansion:
   7 == 7
 
-TrickyTests.cpp:120:
+TrickyTests.cpp:
 PASSED:
   REQUIRE( i++ == 8 )
 with expansion:
@@ -5549,10 +5549,10 @@
 -------------------------------------------------------------------------------
 ./succeeding/koenig
 -------------------------------------------------------------------------------
-TrickyTests.cpp:183
+TrickyTests.cpp
 ...............................................................................
 
-TrickyTests.cpp:186:
+TrickyTests.cpp:
 PASSED:
   REQUIRE( 0x<hex digits> == o )
 with expansion:
@@ -5561,10 +5561,10 @@
 -------------------------------------------------------------------------------
 ./succeeding/non-const==
 -------------------------------------------------------------------------------
-TrickyTests.cpp:209
+TrickyTests.cpp
 ...............................................................................
 
-TrickyTests.cpp:212:
+TrickyTests.cpp:
 PASSED:
   REQUIRE( t == 1u )
 with expansion:
@@ -5573,10 +5573,10 @@
 -------------------------------------------------------------------------------
 ./succeeding/enum/bits
 -------------------------------------------------------------------------------
-TrickyTests.cpp:222
+TrickyTests.cpp
 ...............................................................................
 
-TrickyTests.cpp:224:
+TrickyTests.cpp:
 PASSED:
   REQUIRE( 0x<hex digits> == bit30and31 )
 with expansion:
@@ -5585,10 +5585,10 @@
 -------------------------------------------------------------------------------
 ./succeeding/boolean member
 -------------------------------------------------------------------------------
-TrickyTests.cpp:236
+TrickyTests.cpp
 ...............................................................................
 
-TrickyTests.cpp:239:
+TrickyTests.cpp:
 PASSED:
   REQUIRE( obj.prop != __null )
 with expansion:
@@ -5598,16 +5598,16 @@
 ./succeeding/unimplemented static bool
   compare to true
 -------------------------------------------------------------------------------
-TrickyTests.cpp:257
+TrickyTests.cpp
 ...............................................................................
 
-TrickyTests.cpp:259:
+TrickyTests.cpp:
 PASSED:
   REQUIRE( is_true<true>::value == true )
 with expansion:
   true == true
 
-TrickyTests.cpp:260:
+TrickyTests.cpp:
 PASSED:
   REQUIRE( true == is_true<true>::value )
 with expansion:
@@ -5617,16 +5617,16 @@
 ./succeeding/unimplemented static bool
   compare to false
 -------------------------------------------------------------------------------
-TrickyTests.cpp:262
+TrickyTests.cpp
 ...............................................................................
 
-TrickyTests.cpp:264:
+TrickyTests.cpp:
 PASSED:
   REQUIRE( is_true<false>::value == false )
 with expansion:
   false == false
 
-TrickyTests.cpp:265:
+TrickyTests.cpp:
 PASSED:
   REQUIRE( false == is_true<false>::value )
 with expansion:
@@ -5636,10 +5636,10 @@
 ./succeeding/unimplemented static bool
   negation
 -------------------------------------------------------------------------------
-TrickyTests.cpp:268
+TrickyTests.cpp
 ...............................................................................
 
-TrickyTests.cpp:270:
+TrickyTests.cpp:
 PASSED:
   REQUIRE( !is_true<false>::value )
 with expansion:
@@ -5649,10 +5649,10 @@
 ./succeeding/unimplemented static bool
   double negation
 -------------------------------------------------------------------------------
-TrickyTests.cpp:273
+TrickyTests.cpp
 ...............................................................................
 
-TrickyTests.cpp:275:
+TrickyTests.cpp:
 PASSED:
   REQUIRE( !!is_true<true>::value )
 with expansion:
@@ -5662,16 +5662,16 @@
 ./succeeding/unimplemented static bool
   direct
 -------------------------------------------------------------------------------
-TrickyTests.cpp:278
+TrickyTests.cpp
 ...............................................................................
 
-TrickyTests.cpp:280:
+TrickyTests.cpp:
 PASSED:
   REQUIRE( is_true<true>::value )
 with expansion:
   true
 
-TrickyTests.cpp:281:
+TrickyTests.cpp:
 PASSED:
   REQUIRE_FALSE( is_true<false>::value )
 with expansion:
@@ -5680,22 +5680,22 @@
 -------------------------------------------------------------------------------
 ./succeeding/SafeBool
 -------------------------------------------------------------------------------
-TrickyTests.cpp:308
+TrickyTests.cpp
 ...............................................................................
 
-TrickyTests.cpp:313:
+TrickyTests.cpp:
 PASSED:
   CHECK( True )
 with expansion:
   true
 
-TrickyTests.cpp:314:
+TrickyTests.cpp:
 PASSED:
   CHECK( !False )
 with expansion:
   true
 
-TrickyTests.cpp:315:
+TrickyTests.cpp:
 PASSED:
   CHECK_FALSE( False )
 with expansion:
@@ -5704,10 +5704,10 @@
 -------------------------------------------------------------------------------
 Assertions then sections
 -------------------------------------------------------------------------------
-TrickyTests.cpp:318
+TrickyTests.cpp
 ...............................................................................
 
-TrickyTests.cpp:323:
+TrickyTests.cpp:
 PASSED:
   REQUIRE( Catch::isTrue( true ) )
 with expansion:
@@ -5717,10 +5717,10 @@
 Assertions then sections
   A section
 -------------------------------------------------------------------------------
-TrickyTests.cpp:325
+TrickyTests.cpp
 ...............................................................................
 
-TrickyTests.cpp:327:
+TrickyTests.cpp:
 PASSED:
   REQUIRE( Catch::isTrue( true ) )
 with expansion:
@@ -5731,10 +5731,10 @@
   A section
   Another section
 -------------------------------------------------------------------------------
-TrickyTests.cpp:329
+TrickyTests.cpp
 ...............................................................................
 
-TrickyTests.cpp:331:
+TrickyTests.cpp:
 PASSED:
   REQUIRE( Catch::isTrue( true ) )
 with expansion:
@@ -5743,10 +5743,10 @@
 -------------------------------------------------------------------------------
 Assertions then sections
 -------------------------------------------------------------------------------
-TrickyTests.cpp:318
+TrickyTests.cpp
 ...............................................................................
 
-TrickyTests.cpp:323:
+TrickyTests.cpp:
 PASSED:
   REQUIRE( Catch::isTrue( true ) )
 with expansion:
@@ -5756,10 +5756,10 @@
 Assertions then sections
   A section
 -------------------------------------------------------------------------------
-TrickyTests.cpp:325
+TrickyTests.cpp
 ...............................................................................
 
-TrickyTests.cpp:327:
+TrickyTests.cpp:
 PASSED:
   REQUIRE( Catch::isTrue( true ) )
 with expansion:
@@ -5770,10 +5770,10 @@
   A section
   Another other section
 -------------------------------------------------------------------------------
-TrickyTests.cpp:333
+TrickyTests.cpp
 ...............................................................................
 
-TrickyTests.cpp:335:
+TrickyTests.cpp:
 PASSED:
   REQUIRE( Catch::isTrue( true ) )
 with expansion:
@@ -5782,10 +5782,10 @@
 -------------------------------------------------------------------------------
 non streamable - with conv. op
 -------------------------------------------------------------------------------
-TrickyTests.cpp:345
+TrickyTests.cpp
 ...............................................................................
 
-TrickyTests.cpp:349:
+TrickyTests.cpp:
 PASSED:
   REQUIRE( s == "7" )
 with expansion:
@@ -5794,10 +5794,10 @@
 -------------------------------------------------------------------------------
 Anonymous test case 1
 -------------------------------------------------------------------------------
-VariadicMacrosTests.cpp:13
+VariadicMacrosTests.cpp
 ...............................................................................
 
-VariadicMacrosTests.cpp:15:
+VariadicMacrosTests.cpp:
 PASSED:
 with message:
   anonymous test case
@@ -5805,10 +5805,10 @@
 -------------------------------------------------------------------------------
 Test case with one argument
 -------------------------------------------------------------------------------
-VariadicMacrosTests.cpp:18
+VariadicMacrosTests.cpp
 ...............................................................................
 
-VariadicMacrosTests.cpp:20:
+VariadicMacrosTests.cpp:
 PASSED:
 with message:
   no assertions
@@ -5817,10 +5817,10 @@
 Variadic macros
   Section with one argument
 -------------------------------------------------------------------------------
-VariadicMacrosTests.cpp:25
+VariadicMacrosTests.cpp
 ...............................................................................
 
-VariadicMacrosTests.cpp:27:
+VariadicMacrosTests.cpp:
 PASSED:
 with message:
   no assertions
@@ -5831,10 +5831,10 @@
       When: I do this
       Then: it should do this
 -------------------------------------------------------------------------------
-BDDTests.cpp:19
+BDDTests.cpp
 ...............................................................................
 
-BDDTests.cpp:21:
+BDDTests.cpp:
 PASSED:
   REQUIRE( itDoesThis() )
 with expansion:
@@ -5847,10 +5847,10 @@
       Then: it should do this
        And: do that
 -------------------------------------------------------------------------------
-BDDTests.cpp:22
+BDDTests.cpp
 ...............................................................................
 
-BDDTests.cpp:23:
+BDDTests.cpp:
 PASSED:
   REQUIRE( itDoesThat() )
 with expansion:
@@ -5860,10 +5860,10 @@
 Scenario: Vector resizing affects size and capacity
      Given: an empty vector
 -------------------------------------------------------------------------------
-BDDTests.cpp:30
+BDDTests.cpp
 ...............................................................................
 
-BDDTests.cpp:32:
+BDDTests.cpp:
 PASSED:
   REQUIRE( v.size() == 0 )
 with expansion:
@@ -5875,16 +5875,16 @@
       When: it is made larger
       Then: the size and capacity go up
 -------------------------------------------------------------------------------
-BDDTests.cpp:36
+BDDTests.cpp
 ...............................................................................
 
-BDDTests.cpp:37:
+BDDTests.cpp:
 PASSED:
   REQUIRE( v.size() == 10 )
 with expansion:
   10 == 10
 
-BDDTests.cpp:38:
+BDDTests.cpp:
 PASSED:
   REQUIRE( v.capacity() >= 10 )
 with expansion:
@@ -5898,16 +5898,16 @@
   And when: it is made smaller again
       Then: the size goes down but the capacity stays the same
 -------------------------------------------------------------------------------
-BDDTests.cpp:42
+BDDTests.cpp
 ...............................................................................
 
-BDDTests.cpp:43:
+BDDTests.cpp:
 PASSED:
   REQUIRE( v.size() == 5 )
 with expansion:
   5 == 5
 
-BDDTests.cpp:44:
+BDDTests.cpp:
 PASSED:
   REQUIRE( v.capacity() >= 10 )
 with expansion:
@@ -5917,10 +5917,10 @@
 Scenario: Vector resizing affects size and capacity
      Given: an empty vector
 -------------------------------------------------------------------------------
-BDDTests.cpp:30
+BDDTests.cpp
 ...............................................................................
 
-BDDTests.cpp:32:
+BDDTests.cpp:
 PASSED:
   REQUIRE( v.size() == 0 )
 with expansion:
@@ -5932,16 +5932,16 @@
       When: it is made larger
       Then: the size and capacity go up
 -------------------------------------------------------------------------------
-BDDTests.cpp:36
+BDDTests.cpp
 ...............................................................................
 
-BDDTests.cpp:37:
+BDDTests.cpp:
 PASSED:
   REQUIRE( v.size() == 10 )
 with expansion:
   10 == 10
 
-BDDTests.cpp:38:
+BDDTests.cpp:
 PASSED:
   REQUIRE( v.capacity() >= 10 )
 with expansion:
@@ -5951,10 +5951,10 @@
 Scenario: Vector resizing affects size and capacity
      Given: an empty vector
 -------------------------------------------------------------------------------
-BDDTests.cpp:30
+BDDTests.cpp
 ...............................................................................
 
-BDDTests.cpp:32:
+BDDTests.cpp:
 PASSED:
   REQUIRE( v.size() == 0 )
 with expansion:
@@ -5966,16 +5966,16 @@
       When: it is made larger
       Then: the size and capacity go up
 -------------------------------------------------------------------------------
-BDDTests.cpp:36
+BDDTests.cpp
 ...............................................................................
 
-BDDTests.cpp:37:
+BDDTests.cpp:
 PASSED:
   REQUIRE( v.size() == 10 )
 with expansion:
   10 == 10
 
-BDDTests.cpp:38:
+BDDTests.cpp:
 PASSED:
   REQUIRE( v.capacity() >= 10 )
 with expansion:
@@ -5985,10 +5985,10 @@
 Scenario: Vector resizing affects size and capacity
      Given: an empty vector
 -------------------------------------------------------------------------------
-BDDTests.cpp:30
+BDDTests.cpp
 ...............................................................................
 
-BDDTests.cpp:32:
+BDDTests.cpp:
 PASSED:
   REQUIRE( v.size() == 0 )
 with expansion:
@@ -5998,10 +5998,10 @@
 Scenario: Vector resizing affects size and capacity
      Given: an empty vector
 -------------------------------------------------------------------------------
-BDDTests.cpp:30
+BDDTests.cpp
 ...............................................................................
 
-BDDTests.cpp:32:
+BDDTests.cpp:
 PASSED:
   REQUIRE( v.size() == 0 )
 with expansion:
@@ -6013,16 +6013,16 @@
       When: we reserve more space
       Then: The capacity is increased but the size remains the same
 -------------------------------------------------------------------------------
-BDDTests.cpp:52
+BDDTests.cpp
 ...............................................................................
 
-BDDTests.cpp:53:
+BDDTests.cpp:
 PASSED:
   REQUIRE( v.capacity() >= 10 )
 with expansion:
   10 >= 10
 
-BDDTests.cpp:54:
+BDDTests.cpp:
 PASSED:
   REQUIRE( v.size() == 0 )
 with expansion:
@@ -6038,10 +6038,10 @@
       Then: The, deliberately very long and overly verbose (you see what I did
             there?) section names must wrap, along with an indent
 -------------------------------------------------------------------------------
-BDDTests.cpp:66
+BDDTests.cpp
 ...............................................................................
 
-BDDTests.cpp:67:
+BDDTests.cpp:
 PASSED:
 with message:
   boo!
@@ -6050,10 +6050,10 @@
 cmdline
   process name
 -------------------------------------------------------------------------------
-CmdLineTests.cpp:60
+CmdLineTests.cpp
 ...............................................................................
 
-CmdLineTests.cpp:64:
+CmdLineTests.cpp:
 PASSED:
   CHECK( config.processName == "test" )
 with expansion:
@@ -6063,10 +6063,10 @@
 cmdline
   arg separated by spaces
 -------------------------------------------------------------------------------
-CmdLineTests.cpp:66
+CmdLineTests.cpp
 ...............................................................................
 
-CmdLineTests.cpp:70:
+CmdLineTests.cpp:
 PASSED:
   CHECK( config.fileName == "filename.ext" )
 with expansion:
@@ -6076,10 +6076,10 @@
 cmdline
   arg separated by colon
 -------------------------------------------------------------------------------
-CmdLineTests.cpp:72
+CmdLineTests.cpp
 ...............................................................................
 
-CmdLineTests.cpp:76:
+CmdLineTests.cpp:
 PASSED:
   CHECK( config.fileName == "filename.ext" )
 with expansion:
@@ -6089,10 +6089,10 @@
 cmdline
   arg separated by =
 -------------------------------------------------------------------------------
-CmdLineTests.cpp:78
+CmdLineTests.cpp
 ...............................................................................
 
-CmdLineTests.cpp:82:
+CmdLineTests.cpp:
 PASSED:
   CHECK( config.fileName == "filename.ext" )
 with expansion:
@@ -6102,10 +6102,10 @@
 cmdline
   long opt
 -------------------------------------------------------------------------------
-CmdLineTests.cpp:84
+CmdLineTests.cpp
 ...............................................................................
 
-CmdLineTests.cpp:88:
+CmdLineTests.cpp:
 PASSED:
   CHECK( config.fileName == "%stdout" )
 with expansion:
@@ -6115,10 +6115,10 @@
 cmdline
   a number
 -------------------------------------------------------------------------------
-CmdLineTests.cpp:95
+CmdLineTests.cpp
 ...............................................................................
 
-CmdLineTests.cpp:99:
+CmdLineTests.cpp:
 PASSED:
   CHECK( config.number == 42 )
 with expansion:
@@ -6128,14 +6128,14 @@
 cmdline
   not a number
 -------------------------------------------------------------------------------
-CmdLineTests.cpp:101
+CmdLineTests.cpp
 ...............................................................................
 
-CmdLineTests.cpp:103:
+CmdLineTests.cpp:
 PASSED:
   CHECK_THROWS( parseInto( cli, argv, config ) )
 
-CmdLineTests.cpp:105:
+CmdLineTests.cpp:
 PASSED:
   CHECK( config.number == 0 )
 with expansion:
@@ -6145,22 +6145,22 @@
 cmdline
   two parsers
 -------------------------------------------------------------------------------
-CmdLineTests.cpp:108
+CmdLineTests.cpp
 ...............................................................................
 
-CmdLineTests.cpp:123:
+CmdLineTests.cpp:
 PASSED:
   CHECK( config1.number == 42 )
 with expansion:
   42 == 42
 
-CmdLineTests.cpp:125:
+CmdLineTests.cpp:
 PASSED:
   REQUIRE_FALSE( unusedTokens.empty() )
 with expansion:
   !false
 
-CmdLineTests.cpp:127:
+CmdLineTests.cpp:
 PASSED:
   CHECK( config2.description == "some text" )
 with expansion:
@@ -6171,10 +6171,10 @@
   methods
   in range
 -------------------------------------------------------------------------------
-CmdLineTests.cpp:136
+CmdLineTests.cpp
 ...............................................................................
 
-CmdLineTests.cpp:140:
+CmdLineTests.cpp:
 PASSED:
   REQUIRE( config.index == 3 )
 with expansion:
@@ -6185,10 +6185,10 @@
   methods
   out of range
 -------------------------------------------------------------------------------
-CmdLineTests.cpp:142
+CmdLineTests.cpp
 ...............................................................................
 
-CmdLineTests.cpp:145:
+CmdLineTests.cpp:
 PASSED:
   REQUIRE_THROWS( parseInto( cli, argv, config ) )
 
@@ -6197,10 +6197,10 @@
   flags
   set
 -------------------------------------------------------------------------------
-CmdLineTests.cpp:154
+CmdLineTests.cpp
 ...............................................................................
 
-CmdLineTests.cpp:158:
+CmdLineTests.cpp:
 PASSED:
   REQUIRE( config.flag )
 with expansion:
@@ -6211,10 +6211,10 @@
   flags
   not set
 -------------------------------------------------------------------------------
-CmdLineTests.cpp:160
+CmdLineTests.cpp
 ...............................................................................
 
-CmdLineTests.cpp:164:
+CmdLineTests.cpp:
 PASSED:
   REQUIRE( config.flag == false )
 with expansion:
@@ -6224,22 +6224,22 @@
 cmdline
   positional
 -------------------------------------------------------------------------------
-CmdLineTests.cpp:167
+CmdLineTests.cpp
 ...............................................................................
 
-CmdLineTests.cpp:185:
+CmdLineTests.cpp:
 PASSED:
   REQUIRE( config.firstPos == "1st" )
 with expansion:
   "1st" == "1st"
 
-CmdLineTests.cpp:186:
+CmdLineTests.cpp:
 PASSED:
   REQUIRE( config.secondPos == "2nd" )
 with expansion:
   "2nd" == "2nd"
 
-CmdLineTests.cpp:187:
+CmdLineTests.cpp:
 PASSED:
   REQUIRE( config.unpositional == "3rd" )
 with expansion:
@@ -6263,133 +6263,133 @@
     <testcase classname="TestClass" name="./succeeding/TestClass/succeedingCase" time="tbd"/>
     <testcase classname="TestClass" name="./failing/TestClass/failingCase" time="tbd">
       <failure message="&quot;hello&quot; == &quot;world&quot;" type="REQUIRE">
-ClassTests.cpp:28
+ClassTests.cpp
       </failure>
     </testcase>
     <testcase classname="Fixture" name="./succeeding/Fixture/succeedingCase" time="tbd"/>
     <testcase classname="Fixture" name="./failing/Fixture/failingCase" time="tbd">
       <failure message="1 == 2" type="REQUIRE">
-ClassTests.cpp:55
+ClassTests.cpp
       </failure>
     </testcase>
     <testcase classname="global" name="./succeeding/conditions/equality" time="tbd"/>
     <testcase classname="global" name="./failing/conditions/equality" time="tbd">
       <failure message="7 == 6" type="CHECK">
-ConditionTests.cpp:71
+ConditionTests.cpp
       </failure>
       <failure message="7 == 8" type="CHECK">
-ConditionTests.cpp:72
+ConditionTests.cpp
       </failure>
       <failure message="7 == 0" type="CHECK">
-ConditionTests.cpp:73
+ConditionTests.cpp
       </failure>
       <failure message="9.1 == Approx( 9.11 )" type="CHECK">
-ConditionTests.cpp:74
+ConditionTests.cpp
       </failure>
       <failure message="9.1 == Approx( 9 )" type="CHECK">
-ConditionTests.cpp:75
+ConditionTests.cpp
       </failure>
       <failure message="9.1 == Approx( 1 )" type="CHECK">
-ConditionTests.cpp:76
+ConditionTests.cpp
       </failure>
       <failure message="9.1 == Approx( 0 )" type="CHECK">
-ConditionTests.cpp:77
+ConditionTests.cpp
       </failure>
       <failure message="3.1415926535 == Approx( 3.1415 )" type="CHECK">
-ConditionTests.cpp:78
+ConditionTests.cpp
       </failure>
       <failure message="&quot;hello&quot; == &quot;goodbye&quot;" type="CHECK">
-ConditionTests.cpp:79
+ConditionTests.cpp
       </failure>
       <failure message="&quot;hello&quot; == &quot;hell&quot;" type="CHECK">
-ConditionTests.cpp:80
+ConditionTests.cpp
       </failure>
       <failure message="&quot;hello&quot; == &quot;hello1&quot;" type="CHECK">
-ConditionTests.cpp:81
+ConditionTests.cpp
       </failure>
       <failure message="5 == 6" type="CHECK">
-ConditionTests.cpp:82
+ConditionTests.cpp
       </failure>
       <failure message="1.3 == Approx( 1.301 )" type="CHECK">
-ConditionTests.cpp:85
+ConditionTests.cpp
       </failure>
     </testcase>
     <testcase classname="global" name="./succeeding/conditions/inequality" time="tbd"/>
     <testcase classname="global" name="./failing/conditions/inequality" time="tbd">
       <failure message="7 != 7" type="CHECK">
-ConditionTests.cpp:111
+ConditionTests.cpp
       </failure>
       <failure message="9.1 != Approx( 9.1 )" type="CHECK">
-ConditionTests.cpp:112
+ConditionTests.cpp
       </failure>
       <failure message="3.1415926535 != Approx( 3.14159 )" type="CHECK">
-ConditionTests.cpp:113
+ConditionTests.cpp
       </failure>
       <failure message="&quot;hello&quot; != &quot;hello&quot;" type="CHECK">
-ConditionTests.cpp:114
+ConditionTests.cpp
       </failure>
       <failure message="5 != 5" type="CHECK">
-ConditionTests.cpp:115
+ConditionTests.cpp
       </failure>
     </testcase>
     <testcase classname="global" name="./succeeding/conditions/ordered" time="tbd"/>
     <testcase classname="global" name="./failing/conditions/ordered" time="tbd">
       <failure message="7 > 7" type="CHECK">
-ConditionTests.cpp:152
+ConditionTests.cpp
       </failure>
       <failure message="7 &lt; 7" type="CHECK">
-ConditionTests.cpp:153
+ConditionTests.cpp
       </failure>
       <failure message="7 > 8" type="CHECK">
-ConditionTests.cpp:154
+ConditionTests.cpp
       </failure>
       <failure message="7 &lt; 6" type="CHECK">
-ConditionTests.cpp:155
+ConditionTests.cpp
       </failure>
       <failure message="7 &lt; 0" type="CHECK">
-ConditionTests.cpp:156
+ConditionTests.cpp
       </failure>
       <failure message="7 &lt; -1" type="CHECK">
-ConditionTests.cpp:157
+ConditionTests.cpp
       </failure>
       <failure message="7 >= 8" type="CHECK">
-ConditionTests.cpp:159
+ConditionTests.cpp
       </failure>
       <failure message="7 &lt;= 6" type="CHECK">
-ConditionTests.cpp:160
+ConditionTests.cpp
       </failure>
       <failure message="9.1 &lt; 9" type="CHECK">
-ConditionTests.cpp:162
+ConditionTests.cpp
       </failure>
       <failure message="9.1 > 10" type="CHECK">
-ConditionTests.cpp:163
+ConditionTests.cpp
       </failure>
       <failure message="9.1 > 9.199999999999999" type="CHECK">
-ConditionTests.cpp:164
+ConditionTests.cpp
       </failure>
       <failure message="&quot;hello&quot; > &quot;hello&quot;" type="CHECK">
-ConditionTests.cpp:166
+ConditionTests.cpp
       </failure>
       <failure message="&quot;hello&quot; &lt; &quot;hello&quot;" type="CHECK">
-ConditionTests.cpp:167
+ConditionTests.cpp
       </failure>
       <failure message="&quot;hello&quot; > &quot;hellp&quot;" type="CHECK">
-ConditionTests.cpp:168
+ConditionTests.cpp
       </failure>
       <failure message="&quot;hello&quot; > &quot;z&quot;" type="CHECK">
-ConditionTests.cpp:169
+ConditionTests.cpp
       </failure>
       <failure message="&quot;hello&quot; &lt; &quot;hellm&quot;" type="CHECK">
-ConditionTests.cpp:170
+ConditionTests.cpp
       </failure>
       <failure message="&quot;hello&quot; &lt; &quot;a&quot;" type="CHECK">
-ConditionTests.cpp:171
+ConditionTests.cpp
       </failure>
       <failure message="&quot;hello&quot; >= &quot;z&quot;" type="CHECK">
-ConditionTests.cpp:173
+ConditionTests.cpp
       </failure>
       <failure message="&quot;hello&quot; &lt;= &quot;a&quot;" type="CHECK">
-ConditionTests.cpp:174
+ConditionTests.cpp
       </failure>
     </testcase>
     <testcase classname="global" name="./succeeding/conditions/int literals" time="tbd"/>
@@ -6401,81 +6401,81 @@
     <testcase classname="global" name="./succeeding/conditions/not" time="tbd"/>
     <testcase classname="global" name="./failing/conditions/not" time="tbd">
       <failure message="false != false" type="CHECK">
-ConditionTests.cpp:337
+ConditionTests.cpp
       </failure>
       <failure message="true != true" type="CHECK">
-ConditionTests.cpp:338
+ConditionTests.cpp
       </failure>
       <failure message="false" type="CHECK">
-ConditionTests.cpp:339
+ConditionTests.cpp
       </failure>
       <failure message="!true" type="CHECK_FALSE">
-ConditionTests.cpp:340
+ConditionTests.cpp
       </failure>
       <failure message="false" type="CHECK">
-ConditionTests.cpp:342
+ConditionTests.cpp
       </failure>
       <failure message="!true" type="CHECK_FALSE">
-ConditionTests.cpp:343
+ConditionTests.cpp
       </failure>
       <failure message="false" type="CHECK">
-ConditionTests.cpp:345
+ConditionTests.cpp
       </failure>
       <failure message="!(1 == 1)" type="CHECK_FALSE">
-ConditionTests.cpp:346
+ConditionTests.cpp
       </failure>
     </testcase>
     <testcase classname="global" name="./succeeding/exceptions/explicit" time="tbd"/>
     <testcase classname="global" name="./failing/exceptions/explicit" time="tbd">
       <error message="thisThrows()" type="CHECK_THROWS_AS">
-ExceptionTests.cpp:40
+ExceptionTests.cpp
       </error>
       <failure message="thisDoesntThrow()" type="CHECK_THROWS_AS">
-ExceptionTests.cpp:41
+ExceptionTests.cpp
       </failure>
       <error message="thisThrows()" type="CHECK_NOTHROW">
-ExceptionTests.cpp:42
+ExceptionTests.cpp
       </error>
     </testcase>
     <testcase classname="global" name="./failing/exceptions/implicit" time="tbd">
       <error type="TEST_CASE">
-ExceptionTests.cpp:45
+ExceptionTests.cpp
       </error>
     </testcase>
     <testcase classname="global" name="./failing/exceptions/implicit/2" time="tbd">
       <error message="{Unknown expression after the reported line}">
-ExceptionTests.cpp:53
+ExceptionTests.cpp
       </error>
     </testcase>
     <testcase classname="global" name="./failing/exceptions/implicit/3" time="tbd">
       <error type="TEST_CASE">
-ExceptionTests.cpp:59
+ExceptionTests.cpp
       </error>
     </testcase>
     <testcase classname="global" name="./failing/exceptions/implicit/4" time="tbd">
       <error message="thisThrows() == 0" type="CHECK">
-ExceptionTests.cpp:68
+ExceptionTests.cpp
       </error>
     </testcase>
     <testcase classname="global" name="./succeeding/exceptions/implicit" time="tbd"/>
     <testcase classname="global" name="./failing/exceptions/custom" time="tbd">
       <error type="TEST_CASE">
-ExceptionTests.cpp:108
+ExceptionTests.cpp
       </error>
     </testcase>
     <testcase classname="global" name="./failing/exceptions/custom/nothrow" time="tbd">
       <error message="throwCustom()" type="REQUIRE_NOTHROW">
-ExceptionTests.cpp:121
+ExceptionTests.cpp
       </error>
     </testcase>
     <testcase classname="global" name="./failing/exceptions/custom/throw" time="tbd">
       <error message="throwCustom()" type="REQUIRE_THROWS_AS">
-ExceptionTests.cpp:126
+ExceptionTests.cpp
       </error>
     </testcase>
     <testcase classname="global" name="./failing/exceptions/custom/double" time="tbd">
       <error type="TEST_CASE">
-ExceptionTests.cpp:130
+ExceptionTests.cpp
       </error>
     </testcase>
     <testcase classname="global" name="./succeeding/exceptions/notimplemented" time="tbd"/>
@@ -6483,49 +6483,49 @@
     <testcase classname="global" name="./succeeding/generators/2" time="tbd"/>
     <testcase classname="global" name="./succeeding/message" time="tbd">
       <info type="INFO">
-MessageTests.cpp:13
+MessageTests.cpp
       </info>
       <warning type="WARN">
-MessageTests.cpp:14
+MessageTests.cpp
       </warning>
     </testcase>
     <testcase classname="global" name="./succeeding/succeed" time="tbd"/>
     <testcase classname="global" name="./failing/message/info/1" time="tbd">
       <info type="INFO">
-MessageTests.cpp:23
+MessageTests.cpp
       </info>
       <info type="INFO">
-MessageTests.cpp:24
+MessageTests.cpp
       </info>
       <failure message="2 == 1" type="REQUIRE">
-MessageTests.cpp:26
+MessageTests.cpp
       </failure>
     </testcase>
     <testcase classname="global" name="./mixed/message/info/2" time="tbd">
       <info type="INFO">
-MessageTests.cpp:37
+MessageTests.cpp
       </info>
       <failure message="2 == 1" type="CHECK">
-MessageTests.cpp:39
+MessageTests.cpp
       </failure>
       <info type="INFO">
-MessageTests.cpp:41
+MessageTests.cpp
       </info>
       <failure message="2 == 0" type="CHECK">
-MessageTests.cpp:43
+MessageTests.cpp
       </failure>
     </testcase>
     <testcase classname="global" name="./failing/message/fail" time="tbd">
       <failure type="FAIL">
-MessageTests.cpp:53
+MessageTests.cpp
       </failure>
     </testcase>
     <testcase classname="global" name="./failing/message/sections" time="tbd">
       <failure type="FAIL">
-MessageTests.cpp:60
+MessageTests.cpp
       </failure>
       <failure type="FAIL">
-MessageTests.cpp:65
+MessageTests.cpp
       </failure>
     </testcase>
     <testcase classname="global" name="./succeeding/message/sections/stdout" time="tbd">
@@ -6536,75 +6536,75 @@
     </testcase>
     <testcase classname="global" name="./mixed/message/scoped" time="tbd">
       <info type="INFO">
-MessageTests.cpp:86
+MessageTests.cpp
       </info>
       <info type="CAPTURE">
-MessageTests.cpp:87
+MessageTests.cpp
       </info>
       <failure message="10 &lt; 10" type="REQUIRE">
-MessageTests.cpp:88
+MessageTests.cpp
       </failure>
     </testcase>
     <testcase classname="global" name="./succeeding/nofail" time="tbd">
       <failure message="1 == 2" type="CHECK_NOFAIL">
-MessageTests.cpp:94
+MessageTests.cpp
       </failure>
     </testcase>
     <testcase classname="global" name="just info" time="tbd"/>
     <testcase classname="global" name="just failure" time="tbd">
       <failure type="FAIL">
-MessageTests.cpp:103
+MessageTests.cpp
       </failure>
     </testcase>
     <testcase classname="global" name="./succeeding/Misc/Sections" time="tbd"/>
     <testcase classname="global" name="./succeeding/Misc/Sections/nested" time="tbd"/>
     <testcase classname="global" name="./mixed/Misc/Sections/nested2" time="tbd">
       <failure message="1 == 2" type="REQUIRE">
-MiscTests.cpp:57
+MiscTests.cpp
       </failure>
     </testcase>
     <testcase classname="global" name="./Sections/nested/a/b" time="tbd"/>
     <testcase classname="global" name="./mixed/Misc/Sections/loops" time="tbd">
       <failure message="0 > 1" type="CHECK">
-MiscTests.cpp:99
+MiscTests.cpp
       </failure>
     </testcase>
     <testcase classname="global" name="./mixed/Misc/loops" time="tbd">
       <info type="INFO">
-MiscTests.cpp:110
+MiscTests.cpp
       </info>
       <failure message="1 == 0" type="CHECK">
-MiscTests.cpp:111
+MiscTests.cpp
       </failure>
       <info type="INFO">
-MiscTests.cpp:110
+MiscTests.cpp
       </info>
       <failure message="1 == 0" type="CHECK">
-MiscTests.cpp:111
+MiscTests.cpp
       </failure>
       <info type="INFO">
-MiscTests.cpp:110
+MiscTests.cpp
       </info>
       <failure message="1 == 0" type="CHECK">
-MiscTests.cpp:111
+MiscTests.cpp
       </failure>
       <info type="INFO">
-MiscTests.cpp:110
+MiscTests.cpp
       </info>
       <failure message="1 == 0" type="CHECK">
-MiscTests.cpp:111
+MiscTests.cpp
       </failure>
       <info type="INFO">
-MiscTests.cpp:110
+MiscTests.cpp
       </info>
       <failure message="1 == 0" type="CHECK">
-MiscTests.cpp:111
+MiscTests.cpp
       </failure>
       <info type="INFO">
-MiscTests.cpp:110
+MiscTests.cpp
       </info>
       <failure message="1 == 0" type="CHECK">
-MiscTests.cpp:111
+MiscTests.cpp
       </failure>
     </testcase>
     <testcase classname="global" name="./succeeding/Misc/stdout,stderr" time="tbd">
@@ -6618,62 +6618,62 @@
     <testcase classname="global" name="./succeeding/Misc/null strings" time="tbd"/>
     <testcase classname="global" name="./failing/info" time="tbd">
       <info type="INFO">
-MiscTests.cpp:135
+MiscTests.cpp
       </info>
       <info type="CAPTURE">
-MiscTests.cpp:137
+MiscTests.cpp
       </info>
       <failure message="false" type="REQUIRE">
-MiscTests.cpp:138
+MiscTests.cpp
       </failure>
     </testcase>
     <testcase classname="global" name="./succeeding/checkedif" time="tbd"/>
     <testcase classname="global" name="./failing/checkedif" time="tbd">
       <failure message="false" type="CHECKED_IF">
-MiscTests.cpp:143
+MiscTests.cpp
       </failure>
       <failure message="false" type="REQUIRE">
-MiscTests.cpp:156
+MiscTests.cpp
       </failure>
     </testcase>
     <testcase classname="global" name="./succeeding/checkedelse" time="tbd"/>
     <testcase classname="global" name="./failing/checkedelse" time="tbd">
       <failure message="false" type="CHECKED_ELSE">
-MiscTests.cpp:161
+MiscTests.cpp
       </failure>
       <failure message="false" type="REQUIRE">
-MiscTests.cpp:174
+MiscTests.cpp
       </failure>
     </testcase>
     <testcase classname="global" name="./misc/xmlentitycheck" time="tbd"/>
     <testcase classname="global" name="./manual/onechar" time="tbd">
       <info type="INFO">
-MiscTests.cpp:191
+MiscTests.cpp
       </info>
       <failure message="false" type="REQUIRE">
-MiscTests.cpp:192
+MiscTests.cpp
       </failure>
     </testcase>
     <testcase classname="global" name="./succeeding/atomic if" time="tbd"/>
     <testcase classname="global" name="./succeeding/matchers" time="tbd"/>
     <testcase classname="global" name="./failing/matchers/Contains" time="tbd">
       <failure message="&quot;this string contains 'abc' as a substring&quot; contains: &quot;not there&quot;" type="CHECK_THAT">
-MiscTests.cpp:221
+MiscTests.cpp
       </failure>
     </testcase>
     <testcase classname="global" name="./failing/matchers/StartsWith" time="tbd">
       <failure message="&quot;this string contains 'abc' as a substring&quot; starts with: &quot;string&quot;" type="CHECK_THAT">
-MiscTests.cpp:226
+MiscTests.cpp
       </failure>
     </testcase>
     <testcase classname="global" name="./failing/matchers/EndsWith" time="tbd">
       <failure message="&quot;this string contains 'abc' as a substring&quot; ends with: &quot;this&quot;" type="CHECK_THAT">
-MiscTests.cpp:231
+MiscTests.cpp
       </failure>
     </testcase>
     <testcase classname="global" name="./failing/matchers/Equals" time="tbd">
       <failure message="&quot;this string contains 'abc' as a substring&quot; equals: &quot;something else&quot;" type="CHECK_THAT">
-MiscTests.cpp:236
+MiscTests.cpp
       </failure>
     </testcase>
     <testcase classname="global" name="string" time="tbd"/>
@@ -6684,7 +6684,7 @@
     <testcase classname="global" name="empty" time="tbd"/>
     <testcase classname="global" name="Nice descriptive name" time="tbd">
       <warning type="WARN">
-MiscTests.cpp:277
+MiscTests.cpp
       </warning>
     </testcase>
     <testcase classname="global" name="first tag" time="tbd"/>
@@ -6722,25 +6722,25 @@
     <testcase classname="global" name="./succeeding/Tricky/std::pair" time="tbd"/>
     <testcase classname="global" name="./inprogress/failing/Tricky/trailing expression" time="tbd">
       <warning type="WARN">
-TrickyTests.cpp:55
+TrickyTests.cpp
       </warning>
     </testcase>
     <testcase classname="global" name="./inprogress/failing/Tricky/compound lhs" time="tbd">
       <warning type="WARN">
-TrickyTests.cpp:71
+TrickyTests.cpp
       </warning>
     </testcase>
     <testcase classname="global" name="./failing/Tricky/non streamable type" time="tbd">
       <failure message="0x<hex digits> == 0x<hex digits>" type="CHECK">
-TrickyTests.cpp:95
+TrickyTests.cpp
       </failure>
       <failure message="{?} == {?}" type="CHECK">
-TrickyTests.cpp:96
+TrickyTests.cpp
       </failure>
     </testcase>
     <testcase classname="global" name="./failing/string literals" time="tbd">
       <failure message="&quot;first&quot; == &quot;second&quot;" type="REQUIRE">
-TrickyTests.cpp:106
+TrickyTests.cpp
       </failure>
     </testcase>
     <testcase classname="global" name="./succeeding/side-effects" time="tbd"/>
@@ -6786,7 +6786,7 @@
 <Catch name="CatchSelfTest">
   <Group name="~dummy">
     <TestCase name="./succeeding/Approx/simple">
-ApproxTests.cpp" line="20">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ApproxTests.cpp" line="20">
         <Original>
           d == Approx( 1.23 )
         </Original>
@@ -6794,7 +6794,7 @@
           1.23 == Approx( 1.23 )
         </Expanded>
       </Expression>
-ApproxTests.cpp" line="21">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ApproxTests.cpp" line="21">
         <Original>
           d != Approx( 1.22 )
         </Original>
@@ -6802,7 +6802,7 @@
           1.23 != Approx( 1.22 )
         </Expanded>
       </Expression>
-ApproxTests.cpp" line="22">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ApproxTests.cpp" line="22">
         <Original>
           d != Approx( 1.24 )
         </Original>
@@ -6810,7 +6810,7 @@
           1.23 != Approx( 1.24 )
         </Expanded>
       </Expression>
-ApproxTests.cpp" line="24">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ApproxTests.cpp" line="24">
         <Original>
           Approx( d ) == 1.23
         </Original>
@@ -6818,7 +6818,7 @@
           Approx( 1.23 ) == 1.23
         </Expanded>
       </Expression>
-ApproxTests.cpp" line="25">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ApproxTests.cpp" line="25">
         <Original>
           Approx( d ) != 1.22
         </Original>
@@ -6826,7 +6826,7 @@
           Approx( 1.23 ) != 1.22
         </Expanded>
       </Expression>
-ApproxTests.cpp" line="26">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ApproxTests.cpp" line="26">
         <Original>
           Approx( d ) != 1.24
         </Original>
@@ -6837,7 +6837,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="./succeeding/Approx/epsilon">
-ApproxTests.cpp" line="38">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ApproxTests.cpp" line="38">
         <Original>
           d != Approx( 1.231 )
         </Original>
@@ -6845,7 +6845,7 @@
           1.23 != Approx( 1.231 )
         </Expanded>
       </Expression>
-ApproxTests.cpp" line="39">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ApproxTests.cpp" line="39">
         <Original>
           d == Approx( 1.231 ).epsilon( 0.1 )
         </Original>
@@ -6856,7 +6856,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="./succeeding/Approx/float">
-ApproxTests.cpp" line="49">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ApproxTests.cpp" line="49">
         <Original>
           1.23f == Approx( 1.23f )
         </Original>
@@ -6864,7 +6864,7 @@
           1.23 == Approx( 1.23 )
         </Expanded>
       </Expression>
-ApproxTests.cpp" line="50">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ApproxTests.cpp" line="50">
         <Original>
           0.0f == Approx( 0.0f )
         </Original>
@@ -6875,7 +6875,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="./succeeding/Approx/int">
-ApproxTests.cpp" line="60">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ApproxTests.cpp" line="60">
         <Original>
           1 == Approx( 1 )
         </Original>
@@ -6883,7 +6883,7 @@
           1 == Approx( 1 )
         </Expanded>
       </Expression>
-ApproxTests.cpp" line="61">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ApproxTests.cpp" line="61">
         <Original>
           0 == Approx( 0 )
         </Original>
@@ -6894,7 +6894,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="./succeeding/Approx/mixed">
-ApproxTests.cpp" line="75">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ApproxTests.cpp" line="75">
         <Original>
           1.0f == Approx( 1 )
         </Original>
@@ -6902,7 +6902,7 @@
           1 == Approx( 1 )
         </Expanded>
       </Expression>
-ApproxTests.cpp" line="76">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ApproxTests.cpp" line="76">
         <Original>
           0 == Approx( dZero)
         </Original>
@@ -6910,7 +6910,7 @@
           0 == Approx( 0 )
         </Expanded>
       </Expression>
-ApproxTests.cpp" line="77">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ApproxTests.cpp" line="77">
         <Original>
           0 == Approx( dSmall ).epsilon( 0.001 )
         </Original>
@@ -6918,7 +6918,7 @@
           0 == Approx( 1e-05 )
         </Expanded>
       </Expression>
-ApproxTests.cpp" line="78">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ApproxTests.cpp" line="78">
         <Original>
           1.234f == Approx( dMedium )
         </Original>
@@ -6926,7 +6926,7 @@
           1.234 == Approx( 1.234 )
         </Expanded>
       </Expression>
-ApproxTests.cpp" line="79">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ApproxTests.cpp" line="79">
         <Original>
           dMedium == Approx( 1.234f )
         </Original>
@@ -6937,7 +6937,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="./succeeding/Approx/custom">
-ApproxTests.cpp" line="93">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ApproxTests.cpp" line="93">
         <Original>
           d == approx( 1.23 )
         </Original>
@@ -6945,7 +6945,7 @@
           1.23 == Approx( 1.23 )
         </Expanded>
       </Expression>
-ApproxTests.cpp" line="94">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ApproxTests.cpp" line="94">
         <Original>
           d == approx( 1.22 )
         </Original>
@@ -6953,7 +6953,7 @@
           1.23 == Approx( 1.22 )
         </Expanded>
       </Expression>
-ApproxTests.cpp" line="95">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ApproxTests.cpp" line="95">
         <Original>
           d == approx( 1.24 )
         </Original>
@@ -6961,7 +6961,7 @@
           1.23 == Approx( 1.24 )
         </Expanded>
       </Expression>
-ApproxTests.cpp" line="96">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ApproxTests.cpp" line="96">
         <Original>
           d != approx( 1.25 )
         </Original>
@@ -6969,7 +6969,7 @@
           1.23 != Approx( 1.25 )
         </Expanded>
       </Expression>
-ApproxTests.cpp" line="98">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ApproxTests.cpp" line="98">
         <Original>
           approx( d ) == 1.23
         </Original>
@@ -6977,7 +6977,7 @@
           Approx( 1.23 ) == 1.23
         </Expanded>
       </Expression>
-ApproxTests.cpp" line="99">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ApproxTests.cpp" line="99">
         <Original>
           approx( d ) == 1.22
         </Original>
@@ -6985,7 +6985,7 @@
           Approx( 1.23 ) == 1.22
         </Expanded>
       </Expression>
-ApproxTests.cpp" line="100">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ApproxTests.cpp" line="100">
         <Original>
           approx( d ) == 1.24
         </Original>
@@ -6993,7 +6993,7 @@
           Approx( 1.23 ) == 1.24
         </Expanded>
       </Expression>
-ApproxTests.cpp" line="101">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ApproxTests.cpp" line="101">
         <Original>
           approx( d ) != 1.25
         </Original>
@@ -7004,7 +7004,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Approximate PI">
-ApproxTests.cpp" line="110">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ApproxTests.cpp" line="110">
         <Original>
           divide( 22, 7 ) == Approx( 3.141 ).epsilon( 0.001 )
         </Original>
@@ -7012,7 +7012,7 @@
           3.142857142857143 == Approx( 3.141 )
         </Expanded>
       </Expression>
-ApproxTests.cpp" line="111">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ApproxTests.cpp" line="111">
         <Original>
           divide( 22, 7 ) != Approx( 3.141 ).epsilon( 0.0001 )
         </Original>
@@ -7023,7 +7023,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="./succeeding/TestClass/succeedingCase">
-ClassTests.cpp" line="24">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ClassTests.cpp" line="24">
         <Original>
           s == &quot;hello&quot;
         </Original>
@@ -7034,7 +7034,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="./failing/TestClass/failingCase">
-ClassTests.cpp" line="28">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ClassTests.cpp" line="28">
         <Original>
           s == &quot;world&quot;
         </Original>
@@ -7045,7 +7045,7 @@
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="./succeeding/Fixture/succeedingCase">
-ClassTests.cpp" line="47">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ClassTests.cpp" line="47">
         <Original>
           m_a == 1
         </Original>
@@ -7056,7 +7056,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="./failing/Fixture/failingCase">
-ClassTests.cpp" line="55">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ClassTests.cpp" line="55">
         <Original>
           m_a == 2
         </Original>
@@ -7067,7 +7067,7 @@
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="./succeeding/conditions/equality">
-ConditionTests.cpp" line="55">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="55">
         <Original>
           data.int_seven == 7
         </Original>
@@ -7075,7 +7075,7 @@
           7 == 7
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="56">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="56">
         <Original>
           data.float_nine_point_one == Approx( 9.1f )
         </Original>
@@ -7083,7 +7083,7 @@
           9.1 == Approx( 9.1 )
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="57">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="57">
         <Original>
           data.double_pi == Approx( 3.1415926535 )
         </Original>
@@ -7091,7 +7091,7 @@
           3.1415926535 == Approx( 3.14159 )
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="58">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="58">
         <Original>
           data.str_hello == &quot;hello&quot;
         </Original>
@@ -7099,7 +7099,7 @@
           &quot;hello&quot; == &quot;hello&quot;
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="59">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="59">
         <Original>
           &quot;hello&quot; == data.str_hello
         </Original>
@@ -7107,7 +7107,7 @@
           &quot;hello&quot; == &quot;hello&quot;
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="60">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="60">
         <Original>
           data.str_hello.size() == 5
         </Original>
@@ -7115,7 +7115,7 @@
           5 == 5
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="63">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="63">
         <Original>
           x == Approx( 1.3 )
         </Original>
@@ -7126,7 +7126,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="./failing/conditions/equality">
-ConditionTests.cpp" line="71">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="71">
         <Original>
           data.int_seven == 6
         </Original>
@@ -7134,7 +7134,7 @@
           7 == 6
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="72">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="72">
         <Original>
           data.int_seven == 8
         </Original>
@@ -7142,7 +7142,7 @@
           7 == 8
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="73">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="73">
         <Original>
           data.int_seven == 0
         </Original>
@@ -7150,7 +7150,7 @@
           7 == 0
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="74">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="74">
         <Original>
           data.float_nine_point_one == Approx( 9.11f )
         </Original>
@@ -7158,7 +7158,7 @@
           9.1 == Approx( 9.11 )
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="75">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="75">
         <Original>
           data.float_nine_point_one == Approx( 9.0f )
         </Original>
@@ -7166,7 +7166,7 @@
           9.1 == Approx( 9 )
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="76">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="76">
         <Original>
           data.float_nine_point_one == Approx( 1 )
         </Original>
@@ -7174,7 +7174,7 @@
           9.1 == Approx( 1 )
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="77">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="77">
         <Original>
           data.float_nine_point_one == Approx( 0 )
         </Original>
@@ -7182,7 +7182,7 @@
           9.1 == Approx( 0 )
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="78">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="78">
         <Original>
           data.double_pi == Approx( 3.1415 )
         </Original>
@@ -7190,7 +7190,7 @@
           3.1415926535 == Approx( 3.1415 )
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="79">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="79">
         <Original>
           data.str_hello == &quot;goodbye&quot;
         </Original>
@@ -7198,7 +7198,7 @@
           &quot;hello&quot; == &quot;goodbye&quot;
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="80">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="80">
         <Original>
           data.str_hello == &quot;hell&quot;
         </Original>
@@ -7206,7 +7206,7 @@
           &quot;hello&quot; == &quot;hell&quot;
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="81">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="81">
         <Original>
           data.str_hello == &quot;hello1&quot;
         </Original>
@@ -7214,7 +7214,7 @@
           &quot;hello&quot; == &quot;hello1&quot;
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="82">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="82">
         <Original>
           data.str_hello.size() == 6
         </Original>
@@ -7222,7 +7222,7 @@
           5 == 6
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="85">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="85">
         <Original>
           x == Approx( 1.301 )
         </Original>
@@ -7233,7 +7233,7 @@
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="./succeeding/conditions/inequality">
-ConditionTests.cpp" line="93">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="93">
         <Original>
           data.int_seven != 6
         </Original>
@@ -7241,7 +7241,7 @@
           7 != 6
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="94">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="94">
         <Original>
           data.int_seven != 8
         </Original>
@@ -7249,7 +7249,7 @@
           7 != 8
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="95">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="95">
         <Original>
           data.float_nine_point_one != Approx( 9.11f )
         </Original>
@@ -7257,7 +7257,7 @@
           9.1 != Approx( 9.11 )
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="96">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="96">
         <Original>
           data.float_nine_point_one != Approx( 9.0f )
         </Original>
@@ -7265,7 +7265,7 @@
           9.1 != Approx( 9 )
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="97">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="97">
         <Original>
           data.float_nine_point_one != Approx( 1 )
         </Original>
@@ -7273,7 +7273,7 @@
           9.1 != Approx( 1 )
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="98">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="98">
         <Original>
           data.float_nine_point_one != Approx( 0 )
         </Original>
@@ -7281,7 +7281,7 @@
           9.1 != Approx( 0 )
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="99">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="99">
         <Original>
           data.double_pi != Approx( 3.1415 )
         </Original>
@@ -7289,7 +7289,7 @@
           3.1415926535 != Approx( 3.1415 )
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="100">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="100">
         <Original>
           data.str_hello != &quot;goodbye&quot;
         </Original>
@@ -7297,7 +7297,7 @@
           &quot;hello&quot; != &quot;goodbye&quot;
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="101">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="101">
         <Original>
           data.str_hello != &quot;hell&quot;
         </Original>
@@ -7305,7 +7305,7 @@
           &quot;hello&quot; != &quot;hell&quot;
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="102">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="102">
         <Original>
           data.str_hello != &quot;hello1&quot;
         </Original>
@@ -7313,7 +7313,7 @@
           &quot;hello&quot; != &quot;hello1&quot;
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="103">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="103">
         <Original>
           data.str_hello.size() != 6
         </Original>
@@ -7324,7 +7324,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="./failing/conditions/inequality">
-ConditionTests.cpp" line="111">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="111">
         <Original>
           data.int_seven != 7
         </Original>
@@ -7332,7 +7332,7 @@
           7 != 7
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="112">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="112">
         <Original>
           data.float_nine_point_one != Approx( 9.1f )
         </Original>
@@ -7340,7 +7340,7 @@
           9.1 != Approx( 9.1 )
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="113">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="113">
         <Original>
           data.double_pi != Approx( 3.1415926535 )
         </Original>
@@ -7348,7 +7348,7 @@
           3.1415926535 != Approx( 3.14159 )
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="114">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="114">
         <Original>
           data.str_hello != &quot;hello&quot;
         </Original>
@@ -7356,7 +7356,7 @@
           &quot;hello&quot; != &quot;hello&quot;
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="115">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="115">
         <Original>
           data.str_hello.size() != 5
         </Original>
@@ -7367,7 +7367,7 @@
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="./succeeding/conditions/ordered">
-ConditionTests.cpp" line="124">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="124">
         <Original>
           data.int_seven &lt; 8
         </Original>
@@ -7375,7 +7375,7 @@
           7 &lt; 8
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="125">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="125">
         <Original>
           data.int_seven > 6
         </Original>
@@ -7383,7 +7383,7 @@
           7 > 6
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="126">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="126">
         <Original>
           data.int_seven > 0
         </Original>
@@ -7391,7 +7391,7 @@
           7 > 0
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="127">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="127">
         <Original>
           data.int_seven > -1
         </Original>
@@ -7399,7 +7399,7 @@
           7 > -1
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="129">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="129">
         <Original>
           data.int_seven >= 7
         </Original>
@@ -7407,7 +7407,7 @@
           7 >= 7
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="130">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="130">
         <Original>
           data.int_seven >= 6
         </Original>
@@ -7415,7 +7415,7 @@
           7 >= 6
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="131">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="131">
         <Original>
           data.int_seven &lt;= 7
         </Original>
@@ -7423,7 +7423,7 @@
           7 &lt;= 7
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="132">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="132">
         <Original>
           data.int_seven &lt;= 8
         </Original>
@@ -7431,7 +7431,7 @@
           7 &lt;= 8
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="134">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="134">
         <Original>
           data.float_nine_point_one > 9
         </Original>
@@ -7439,7 +7439,7 @@
           9.1 > 9
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="135">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="135">
         <Original>
           data.float_nine_point_one &lt; 10
         </Original>
@@ -7447,7 +7447,7 @@
           9.1 &lt; 10
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="136">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="136">
         <Original>
           data.float_nine_point_one &lt; 9.2
         </Original>
@@ -7455,7 +7455,7 @@
           9.1 &lt; 9.199999999999999
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="138">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="138">
         <Original>
           data.str_hello &lt;= &quot;hello&quot;
         </Original>
@@ -7463,7 +7463,7 @@
           &quot;hello&quot; &lt;= &quot;hello&quot;
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="139">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="139">
         <Original>
           data.str_hello >= &quot;hello&quot;
         </Original>
@@ -7471,7 +7471,7 @@
           &quot;hello&quot; >= &quot;hello&quot;
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="141">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="141">
         <Original>
           data.str_hello &lt; &quot;hellp&quot;
         </Original>
@@ -7479,7 +7479,7 @@
           &quot;hello&quot; &lt; &quot;hellp&quot;
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="142">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="142">
         <Original>
           data.str_hello &lt; &quot;zebra&quot;
         </Original>
@@ -7487,7 +7487,7 @@
           &quot;hello&quot; &lt; &quot;zebra&quot;
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="143">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="143">
         <Original>
           data.str_hello > &quot;hellm&quot;
         </Original>
@@ -7495,7 +7495,7 @@
           &quot;hello&quot; > &quot;hellm&quot;
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="144">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="144">
         <Original>
           data.str_hello > &quot;a&quot;
         </Original>
@@ -7506,7 +7506,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="./failing/conditions/ordered">
-ConditionTests.cpp" line="152">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="152">
         <Original>
           data.int_seven > 7
         </Original>
@@ -7514,7 +7514,7 @@
           7 > 7
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="153">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="153">
         <Original>
           data.int_seven &lt; 7
         </Original>
@@ -7522,7 +7522,7 @@
           7 &lt; 7
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="154">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="154">
         <Original>
           data.int_seven > 8
         </Original>
@@ -7530,7 +7530,7 @@
           7 > 8
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="155">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="155">
         <Original>
           data.int_seven &lt; 6
         </Original>
@@ -7538,7 +7538,7 @@
           7 &lt; 6
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="156">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="156">
         <Original>
           data.int_seven &lt; 0
         </Original>
@@ -7546,7 +7546,7 @@
           7 &lt; 0
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="157">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="157">
         <Original>
           data.int_seven &lt; -1
         </Original>
@@ -7554,7 +7554,7 @@
           7 &lt; -1
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="159">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="159">
         <Original>
           data.int_seven >= 8
         </Original>
@@ -7562,7 +7562,7 @@
           7 >= 8
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="160">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="160">
         <Original>
           data.int_seven &lt;= 6
         </Original>
@@ -7570,7 +7570,7 @@
           7 &lt;= 6
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="162">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="162">
         <Original>
           data.float_nine_point_one &lt; 9
         </Original>
@@ -7578,7 +7578,7 @@
           9.1 &lt; 9
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="163">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="163">
         <Original>
           data.float_nine_point_one > 10
         </Original>
@@ -7586,7 +7586,7 @@
           9.1 > 10
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="164">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="164">
         <Original>
           data.float_nine_point_one > 9.2
         </Original>
@@ -7594,7 +7594,7 @@
           9.1 > 9.199999999999999
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="166">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="166">
         <Original>
           data.str_hello > &quot;hello&quot;
         </Original>
@@ -7602,7 +7602,7 @@
           &quot;hello&quot; > &quot;hello&quot;
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="167">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="167">
         <Original>
           data.str_hello &lt; &quot;hello&quot;
         </Original>
@@ -7610,7 +7610,7 @@
           &quot;hello&quot; &lt; &quot;hello&quot;
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="168">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="168">
         <Original>
           data.str_hello > &quot;hellp&quot;
         </Original>
@@ -7618,7 +7618,7 @@
           &quot;hello&quot; > &quot;hellp&quot;
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="169">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="169">
         <Original>
           data.str_hello > &quot;z&quot;
         </Original>
@@ -7626,7 +7626,7 @@
           &quot;hello&quot; > &quot;z&quot;
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="170">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="170">
         <Original>
           data.str_hello &lt; &quot;hellm&quot;
         </Original>
@@ -7634,7 +7634,7 @@
           &quot;hello&quot; &lt; &quot;hellm&quot;
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="171">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="171">
         <Original>
           data.str_hello &lt; &quot;a&quot;
         </Original>
@@ -7642,7 +7642,7 @@
           &quot;hello&quot; &lt; &quot;a&quot;
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="173">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="173">
         <Original>
           data.str_hello >= &quot;z&quot;
         </Original>
@@ -7650,7 +7650,7 @@
           &quot;hello&quot; >= &quot;z&quot;
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="174">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="174">
         <Original>
           data.str_hello &lt;= &quot;a&quot;
         </Original>
@@ -7661,7 +7661,7 @@
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="./succeeding/conditions/int literals">
-ConditionTests.cpp" line="188">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="188">
         <Original>
           i == 1
         </Original>
@@ -7669,7 +7669,7 @@
           1 == 1
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="189">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="189">
         <Original>
           ui == 2
         </Original>
@@ -7677,7 +7677,7 @@
           2 == 2
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="190">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="190">
         <Original>
           l == 3
         </Original>
@@ -7685,7 +7685,7 @@
           3 == 3
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="191">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="191">
         <Original>
           ul == 4
         </Original>
@@ -7693,7 +7693,7 @@
           4 == 4
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="192">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="192">
         <Original>
           c == 5
         </Original>
@@ -7701,7 +7701,7 @@
           5 == 5
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="193">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="193">
         <Original>
           uc == 6
         </Original>
@@ -7709,7 +7709,7 @@
           6 == 6
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="195">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="195">
         <Original>
           1 == i
         </Original>
@@ -7717,7 +7717,7 @@
           1 == 1
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="196">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="196">
         <Original>
           2 == ui
         </Original>
@@ -7725,7 +7725,7 @@
           2 == 2
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="197">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="197">
         <Original>
           3 == l
         </Original>
@@ -7733,7 +7733,7 @@
           3 == 3
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="198">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="198">
         <Original>
           4 == ul
         </Original>
@@ -7741,7 +7741,7 @@
           4 == 4
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="199">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="199">
         <Original>
           5 == c
         </Original>
@@ -7749,7 +7749,7 @@
           5 == 5
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="200">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="200">
         <Original>
           6 == uc
         </Original>
@@ -7757,7 +7757,7 @@
           6 == 6
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="202">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="202">
         <Original>
           (std::numeric_limits&lt;unsigned long>::max)() > ul
         </Original>
@@ -7768,7 +7768,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="./succeeding/conditions//long_to_unsigned_x">
-ConditionTests.cpp" line="226">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="226">
         <Original>
           long_var == unsigned_char_var
         </Original>
@@ -7776,7 +7776,7 @@
           1 == 1
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="227">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="227">
         <Original>
           long_var == unsigned_short_var
         </Original>
@@ -7784,7 +7784,7 @@
           1 == 1
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="228">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="228">
         <Original>
           long_var == unsigned_int_var
         </Original>
@@ -7792,7 +7792,7 @@
           1 == 1
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="229">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="229">
         <Original>
           long_var == unsigned_long_var
         </Original>
@@ -7803,7 +7803,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="./succeeding/conditions/const ints to int literal">
-ConditionTests.cpp" line="240">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="240">
         <Original>
           unsigned_char_var == 1
         </Original>
@@ -7811,7 +7811,7 @@
           1 == 1
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="241">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="241">
         <Original>
           unsigned_short_var == 1
         </Original>
@@ -7819,7 +7819,7 @@
           1 == 1
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="242">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="242">
         <Original>
           unsigned_int_var == 1
         </Original>
@@ -7827,7 +7827,7 @@
           1 == 1
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="243">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="243">
         <Original>
           unsigned_long_var == 1
         </Original>
@@ -7838,7 +7838,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="./succeeding/conditions/negative ints">
-ConditionTests.cpp" line="249">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="249">
         <Original>
           ( -1 > 2u )
         </Original>
@@ -7846,7 +7846,7 @@
           true
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="250">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="250">
         <Original>
           -1 > 2u
         </Original>
@@ -7854,7 +7854,7 @@
           -1 > 2
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="252">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="252">
         <Original>
           ( 2u &lt; -1 )
         </Original>
@@ -7862,7 +7862,7 @@
           true
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="253">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="253">
         <Original>
           2u &lt; -1
         </Original>
@@ -7870,7 +7870,7 @@
           2 &lt; -1
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="256">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="256">
         <Original>
           ( minInt > 2u )
         </Original>
@@ -7878,7 +7878,7 @@
           true
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="257">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="257">
         <Original>
           minInt > 2u
         </Original>
@@ -7889,7 +7889,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="./succeeding/conditions/computed ints">
-ConditionTests.cpp" line="272">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="272">
         <Original>
           54 == 6*9
         </Original>
@@ -7900,7 +7900,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="./succeeding/conditions/ptr">
-ConditionTests.cpp" line="288">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="288">
         <Original>
           p == __null
         </Original>
@@ -7908,7 +7908,7 @@
           __null == 0
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="289">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="289">
         <Original>
           p == pNULL
         </Original>
@@ -7916,7 +7916,7 @@
           __null == __null
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="294">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="294">
         <Original>
           p != __null
         </Original>
@@ -7924,7 +7924,7 @@
           0x<hex digits> != 0
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="297">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="297">
         <Original>
           cp != __null
         </Original>
@@ -7932,7 +7932,7 @@
           0x<hex digits> != 0
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="300">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="300">
         <Original>
           cpc != __null
         </Original>
@@ -7940,7 +7940,7 @@
           0x<hex digits> != 0
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="302">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="302">
         <Original>
           returnsNull() == __null
         </Original>
@@ -7948,7 +7948,7 @@
           {null string} == 0
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="303">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="303">
         <Original>
           returnsConstNull() == __null
         </Original>
@@ -7956,7 +7956,7 @@
           {null string} == 0
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="305">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="305">
         <Original>
           __null != p
         </Original>
@@ -7967,7 +7967,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="./succeeding/conditions/not">
-ConditionTests.cpp" line="320">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="320">
         <Original>
           false == false
         </Original>
@@ -7975,7 +7975,7 @@
           false == false
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="321">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="321">
         <Original>
           true == true
         </Original>
@@ -7983,7 +7983,7 @@
           true == true
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="322">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="322">
         <Original>
           !false
         </Original>
@@ -7991,7 +7991,7 @@
           true
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="323">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="323">
         <Original>
           !false
         </Original>
@@ -7999,7 +7999,7 @@
           !false
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="325">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="325">
         <Original>
           !falseValue
         </Original>
@@ -8007,7 +8007,7 @@
           true
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="326">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="326">
         <Original>
           !falseValue
         </Original>
@@ -8015,7 +8015,7 @@
           !false
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="328">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="328">
         <Original>
           !(1 == 2)
         </Original>
@@ -8023,7 +8023,7 @@
           true
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="329">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="329">
         <Original>
           !1 == 2
         </Original>
@@ -8034,7 +8034,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="./failing/conditions/not">
-ConditionTests.cpp" line="337">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="337">
         <Original>
           false != false
         </Original>
@@ -8042,7 +8042,7 @@
           false != false
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="338">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="338">
         <Original>
           true != true
         </Original>
@@ -8050,7 +8050,7 @@
           true != true
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="339">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="339">
         <Original>
           !true
         </Original>
@@ -8058,7 +8058,7 @@
           false
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="340">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="340">
         <Original>
           !true
         </Original>
@@ -8066,7 +8066,7 @@
           !true
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="342">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="342">
         <Original>
           !trueValue
         </Original>
@@ -8074,7 +8074,7 @@
           false
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="343">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="343">
         <Original>
           !trueValue
         </Original>
@@ -8082,7 +8082,7 @@
           !true
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="345">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="345">
         <Original>
           !(1 == 1)
         </Original>
@@ -8090,7 +8090,7 @@
           false
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="346">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" line="346">
         <Original>
           !1 == 1
         </Original>
@@ -8101,7 +8101,7 @@
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="./succeeding/exceptions/explicit">
-ExceptionTests.cpp" line="33">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ExceptionTests.cpp" line="33">
         <Original>
           thisThrows()
         </Original>
@@ -8109,7 +8109,7 @@
           thisThrows()
         </Expanded>
       </Expression>
-ExceptionTests.cpp" line="34">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ExceptionTests.cpp" line="34">
         <Original>
           thisDoesntThrow()
         </Original>
@@ -8117,7 +8117,7 @@
           thisDoesntThrow()
         </Expanded>
       </Expression>
-ExceptionTests.cpp" line="35">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ExceptionTests.cpp" line="35">
         <Original>
           thisThrows()
         </Original>
@@ -8128,18 +8128,18 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="./failing/exceptions/explicit">
-ExceptionTests.cpp" line="40">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ExceptionTests.cpp" line="40">
         <Original>
           thisThrows()
         </Original>
         <Expanded>
           thisThrows()
         </Expanded>
-ExceptionTests.cpp" line="40">
+        <Exception filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ExceptionTests.cpp" line="40">
           expected exception
         </Exception>
       </Expression>
-ExceptionTests.cpp" line="41">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ExceptionTests.cpp" line="41">
         <Original>
           thisDoesntThrow()
         </Original>
@@ -8147,27 +8147,27 @@
           thisDoesntThrow()
         </Expanded>
       </Expression>
-ExceptionTests.cpp" line="42">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ExceptionTests.cpp" line="42">
         <Original>
           thisThrows()
         </Original>
         <Expanded>
           thisThrows()
         </Expanded>
-ExceptionTests.cpp" line="42">
+        <Exception filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ExceptionTests.cpp" line="42">
           expected exception
         </Exception>
       </Expression>
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="./failing/exceptions/implicit">
-ExceptionTests.cpp" line="45">
+      <Exception filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ExceptionTests.cpp" line="45">
         unexpected exception
       </Exception>
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="./failing/exceptions/implicit/2">
-ExceptionTests.cpp" line="53">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ExceptionTests.cpp" line="53">
         <Original>
           1 == 1
         </Original>
@@ -8175,14 +8175,14 @@
           1 == 1
         </Expanded>
       </Expression>
-ExceptionTests.cpp" line="53">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ExceptionTests.cpp" line="53">
         <Original>
           {Unknown expression after the reported line}
         </Original>
         <Expanded>
           {Unknown expression after the reported line}
         </Expanded>
-ExceptionTests.cpp" line="53">
+        <Exception filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ExceptionTests.cpp" line="53">
           unexpected exception
         </Exception>
       </Expression>
@@ -8190,7 +8190,7 @@
     </TestCase>
     <TestCase name="./failing/exceptions/implicit/3">
       <Section name="section name">
-ExceptionTests.cpp" line="59">
+        <Exception filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ExceptionTests.cpp" line="59">
           unexpected exception
         </Exception>
         <OverallResults successes="0" failures="1"/>
@@ -8198,14 +8198,14 @@
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="./failing/exceptions/implicit/4">
-ExceptionTests.cpp" line="68">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ExceptionTests.cpp" line="68">
         <Original>
           thisThrows() == 0
         </Original>
         <Expanded>
           thisThrows() == 0
         </Expanded>
-ExceptionTests.cpp" line="68">
+        <Exception filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ExceptionTests.cpp" line="68">
           expected exception
         </Exception>
       </Expression>
@@ -8215,47 +8215,47 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="./failing/exceptions/custom">
-ExceptionTests.cpp" line="108">
+      <Exception filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ExceptionTests.cpp" line="108">
         custom exception
       </Exception>
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="./failing/exceptions/custom/nothrow">
-ExceptionTests.cpp" line="121">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ExceptionTests.cpp" line="121">
         <Original>
           throwCustom()
         </Original>
         <Expanded>
           throwCustom()
         </Expanded>
-ExceptionTests.cpp" line="121">
+        <Exception filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ExceptionTests.cpp" line="121">
           custom exception - not std
         </Exception>
       </Expression>
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="./failing/exceptions/custom/throw">
-ExceptionTests.cpp" line="126">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ExceptionTests.cpp" line="126">
         <Original>
           throwCustom()
         </Original>
         <Expanded>
           throwCustom()
         </Expanded>
-ExceptionTests.cpp" line="126">
+        <Exception filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ExceptionTests.cpp" line="126">
           custom exception - not std
         </Exception>
       </Expression>
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="./failing/exceptions/custom/double">
-ExceptionTests.cpp" line="130">
+      <Exception filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ExceptionTests.cpp" line="130">
         3.14
       </Exception>
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="./succeeding/exceptions/notimplemented">
-ExceptionTests.cpp" line="142">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ExceptionTests.cpp" line="142">
         <Original>
           thisFunctionNotImplemented( 7 )
         </Original>
@@ -8266,7 +8266,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="./succeeding/generators/1">
-GeneratorTests.cpp" line="26">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="26">
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -8274,7 +8274,7 @@
           2 == 2
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="27">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="27">
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -8282,7 +8282,7 @@
           200 == 200
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="26">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="26">
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -8290,7 +8290,7 @@
           4 == 4
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="27">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="27">
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -8298,7 +8298,7 @@
           200 == 200
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="26">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="26">
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -8306,7 +8306,7 @@
           6 == 6
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="27">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="27">
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -8314,7 +8314,7 @@
           200 == 200
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="26">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="26">
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -8322,7 +8322,7 @@
           8 == 8
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="27">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="27">
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -8330,7 +8330,7 @@
           200 == 200
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="26">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="26">
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -8338,7 +8338,7 @@
           10 == 10
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="27">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="27">
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -8346,7 +8346,7 @@
           200 == 200
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="26">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="26">
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -8354,7 +8354,7 @@
           30 == 30
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="27">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="27">
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -8362,7 +8362,7 @@
           200 == 200
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="26">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="26">
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -8370,7 +8370,7 @@
           40 == 40
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="27">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="27">
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -8378,7 +8378,7 @@
           200 == 200
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="26">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="26">
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -8386,7 +8386,7 @@
           42 == 42
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="27">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="27">
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -8394,7 +8394,7 @@
           200 == 200
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="26">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="26">
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -8402,7 +8402,7 @@
           72 == 72
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="27">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="27">
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -8410,7 +8410,7 @@
           200 == 200
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="26">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="26">
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -8418,7 +8418,7 @@
           2 == 2
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="27">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="27">
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -8426,7 +8426,7 @@
           202 == 202
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="26">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="26">
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -8434,7 +8434,7 @@
           4 == 4
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="27">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="27">
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -8442,7 +8442,7 @@
           202 == 202
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="26">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="26">
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -8450,7 +8450,7 @@
           6 == 6
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="27">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="27">
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -8458,7 +8458,7 @@
           202 == 202
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="26">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="26">
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -8466,7 +8466,7 @@
           8 == 8
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="27">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="27">
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -8474,7 +8474,7 @@
           202 == 202
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="26">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="26">
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -8482,7 +8482,7 @@
           10 == 10
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="27">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="27">
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -8490,7 +8490,7 @@
           202 == 202
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="26">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="26">
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -8498,7 +8498,7 @@
           30 == 30
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="27">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="27">
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -8506,7 +8506,7 @@
           202 == 202
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="26">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="26">
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -8514,7 +8514,7 @@
           40 == 40
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="27">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="27">
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -8522,7 +8522,7 @@
           202 == 202
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="26">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="26">
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -8530,7 +8530,7 @@
           42 == 42
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="27">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="27">
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -8538,7 +8538,7 @@
           202 == 202
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="26">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="26">
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -8546,7 +8546,7 @@
           72 == 72
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="27">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="27">
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -8554,7 +8554,7 @@
           202 == 202
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="26">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="26">
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -8562,7 +8562,7 @@
           2 == 2
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="27">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="27">
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -8570,7 +8570,7 @@
           204 == 204
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="26">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="26">
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -8578,7 +8578,7 @@
           4 == 4
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="27">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="27">
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -8586,7 +8586,7 @@
           204 == 204
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="26">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="26">
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -8594,7 +8594,7 @@
           6 == 6
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="27">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="27">
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -8602,7 +8602,7 @@
           204 == 204
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="26">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="26">
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -8610,7 +8610,7 @@
           8 == 8
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="27">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="27">
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -8618,7 +8618,7 @@
           204 == 204
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="26">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="26">
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -8626,7 +8626,7 @@
           10 == 10
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="27">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="27">
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -8634,7 +8634,7 @@
           204 == 204
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="26">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="26">
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -8642,7 +8642,7 @@
           30 == 30
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="27">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="27">
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -8650,7 +8650,7 @@
           204 == 204
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="26">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="26">
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -8658,7 +8658,7 @@
           40 == 40
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="27">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="27">
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -8666,7 +8666,7 @@
           204 == 204
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="26">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="26">
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -8674,7 +8674,7 @@
           42 == 42
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="27">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="27">
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -8682,7 +8682,7 @@
           204 == 204
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="26">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="26">
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -8690,7 +8690,7 @@
           72 == 72
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="27">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="27">
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -8698,7 +8698,7 @@
           204 == 204
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="26">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="26">
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -8706,7 +8706,7 @@
           2 == 2
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="27">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="27">
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -8714,7 +8714,7 @@
           206 == 206
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="26">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="26">
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -8722,7 +8722,7 @@
           4 == 4
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="27">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="27">
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -8730,7 +8730,7 @@
           206 == 206
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="26">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="26">
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -8738,7 +8738,7 @@
           6 == 6
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="27">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="27">
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -8746,7 +8746,7 @@
           206 == 206
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="26">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="26">
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -8754,7 +8754,7 @@
           8 == 8
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="27">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="27">
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -8762,7 +8762,7 @@
           206 == 206
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="26">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="26">
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -8770,7 +8770,7 @@
           10 == 10
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="27">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="27">
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -8778,7 +8778,7 @@
           206 == 206
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="26">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="26">
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -8786,7 +8786,7 @@
           30 == 30
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="27">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="27">
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -8794,7 +8794,7 @@
           206 == 206
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="26">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="26">
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -8802,7 +8802,7 @@
           40 == 40
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="27">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="27">
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -8810,7 +8810,7 @@
           206 == 206
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="26">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="26">
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -8818,7 +8818,7 @@
           42 == 42
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="27">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="27">
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -8826,7 +8826,7 @@
           206 == 206
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="26">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="26">
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -8834,7 +8834,7 @@
           72 == 72
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="27">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="27">
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -8842,7 +8842,7 @@
           206 == 206
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="26">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="26">
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -8850,7 +8850,7 @@
           2 == 2
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="27">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="27">
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -8858,7 +8858,7 @@
           208 == 208
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="26">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="26">
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -8866,7 +8866,7 @@
           4 == 4
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="27">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="27">
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -8874,7 +8874,7 @@
           208 == 208
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="26">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="26">
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -8882,7 +8882,7 @@
           6 == 6
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="27">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="27">
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -8890,7 +8890,7 @@
           208 == 208
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="26">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="26">
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -8898,7 +8898,7 @@
           8 == 8
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="27">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="27">
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -8906,7 +8906,7 @@
           208 == 208
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="26">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="26">
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -8914,7 +8914,7 @@
           10 == 10
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="27">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="27">
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -8922,7 +8922,7 @@
           208 == 208
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="26">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="26">
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -8930,7 +8930,7 @@
           30 == 30
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="27">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="27">
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -8938,7 +8938,7 @@
           208 == 208
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="26">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="26">
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -8946,7 +8946,7 @@
           40 == 40
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="27">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="27">
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -8954,7 +8954,7 @@
           208 == 208
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="26">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="26">
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -8962,7 +8962,7 @@
           42 == 42
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="27">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="27">
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -8970,7 +8970,7 @@
           208 == 208
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="26">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="26">
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -8978,7 +8978,7 @@
           72 == 72
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="27">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="27">
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -8986,7 +8986,7 @@
           208 == 208
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="26">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="26">
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -8994,7 +8994,7 @@
           2 == 2
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="27">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="27">
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -9002,7 +9002,7 @@
           210 == 210
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="26">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="26">
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -9010,7 +9010,7 @@
           4 == 4
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="27">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="27">
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -9018,7 +9018,7 @@
           210 == 210
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="26">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="26">
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -9026,7 +9026,7 @@
           6 == 6
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="27">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="27">
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -9034,7 +9034,7 @@
           210 == 210
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="26">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="26">
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -9042,7 +9042,7 @@
           8 == 8
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="27">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="27">
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -9050,7 +9050,7 @@
           210 == 210
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="26">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="26">
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -9058,7 +9058,7 @@
           10 == 10
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="27">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="27">
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -9066,7 +9066,7 @@
           210 == 210
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="26">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="26">
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -9074,7 +9074,7 @@
           30 == 30
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="27">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="27">
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -9082,7 +9082,7 @@
           210 == 210
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="26">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="26">
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -9090,7 +9090,7 @@
           40 == 40
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="27">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="27">
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -9098,7 +9098,7 @@
           210 == 210
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="26">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="26">
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -9106,7 +9106,7 @@
           42 == 42
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="27">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="27">
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -9114,7 +9114,7 @@
           210 == 210
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="26">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="26">
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -9122,7 +9122,7 @@
           72 == 72
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="27">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="27">
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -9130,7 +9130,7 @@
           210 == 210
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="26">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="26">
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -9138,7 +9138,7 @@
           2 == 2
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="27">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="27">
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -9146,7 +9146,7 @@
           212 == 212
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="26">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="26">
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -9154,7 +9154,7 @@
           4 == 4
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="27">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="27">
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -9162,7 +9162,7 @@
           212 == 212
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="26">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="26">
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -9170,7 +9170,7 @@
           6 == 6
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="27">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="27">
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -9178,7 +9178,7 @@
           212 == 212
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="26">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="26">
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -9186,7 +9186,7 @@
           8 == 8
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="27">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="27">
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -9194,7 +9194,7 @@
           212 == 212
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="26">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="26">
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -9202,7 +9202,7 @@
           10 == 10
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="27">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="27">
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -9210,7 +9210,7 @@
           212 == 212
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="26">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="26">
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -9218,7 +9218,7 @@
           30 == 30
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="27">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="27">
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -9226,7 +9226,7 @@
           212 == 212
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="26">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="26">
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -9234,7 +9234,7 @@
           40 == 40
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="27">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="27">
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -9242,7 +9242,7 @@
           212 == 212
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="26">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="26">
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -9250,7 +9250,7 @@
           42 == 42
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="27">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="27">
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -9258,7 +9258,7 @@
           212 == 212
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="26">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="26">
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -9266,7 +9266,7 @@
           72 == 72
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="27">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="27">
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -9274,7 +9274,7 @@
           212 == 212
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="26">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="26">
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -9282,7 +9282,7 @@
           2 == 2
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="27">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="27">
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -9290,7 +9290,7 @@
           214 == 214
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="26">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="26">
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -9298,7 +9298,7 @@
           4 == 4
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="27">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="27">
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -9306,7 +9306,7 @@
           214 == 214
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="26">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="26">
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -9314,7 +9314,7 @@
           6 == 6
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="27">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="27">
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -9322,7 +9322,7 @@
           214 == 214
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="26">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="26">
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -9330,7 +9330,7 @@
           8 == 8
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="27">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="27">
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -9338,7 +9338,7 @@
           214 == 214
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="26">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="26">
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -9346,7 +9346,7 @@
           10 == 10
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="27">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="27">
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -9354,7 +9354,7 @@
           214 == 214
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="26">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="26">
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -9362,7 +9362,7 @@
           30 == 30
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="27">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="27">
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -9370,7 +9370,7 @@
           214 == 214
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="26">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="26">
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -9378,7 +9378,7 @@
           40 == 40
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="27">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="27">
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -9386,7 +9386,7 @@
           214 == 214
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="26">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="26">
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -9394,7 +9394,7 @@
           42 == 42
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="27">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="27">
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -9402,7 +9402,7 @@
           214 == 214
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="26">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="26">
         <Original>
           multiply( i, 2 ) == i*2
         </Original>
@@ -9410,7 +9410,7 @@
           72 == 72
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="27">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="27">
         <Original>
           multiply( j, 2 ) == j*2
         </Original>
@@ -9421,7 +9421,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="./succeeding/generators/2">
-GeneratorTests.cpp" line="40">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="40">
         <Original>
           i->first == i->second-1
         </Original>
@@ -9429,7 +9429,7 @@
           0 == 0
         </Expanded>
       </Expression>
-GeneratorTests.cpp" line="40">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" line="40">
         <Original>
           i->first == i->second-1
         </Original>
@@ -9458,7 +9458,7 @@
       <Info>
         so should this
       </Info>
-MessageTests.cpp" line="26">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MessageTests.cpp" line="26">
         <Original>
           a == 1
         </Original>
@@ -9469,7 +9469,7 @@
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="./mixed/message/info/2">
-MessageTests.cpp" line="35">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MessageTests.cpp" line="33">
         <Original>
           a == 2
         </Original>
@@ -9480,7 +9480,7 @@
       <Info>
         this message should be logged
       </Info>
-MessageTests.cpp" line="39">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MessageTests.cpp" line="37">
         <Original>
           a == 1
         </Original>
@@ -9491,7 +9491,7 @@
       <Info>
         and this, but later
       </Info>
-MessageTests.cpp" line="43">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MessageTests.cpp" line="41">
         <Original>
           a == 0
         </Original>
@@ -9499,7 +9499,7 @@
           2 == 0
         </Expanded>
       </Expression>
-MessageTests.cpp" line="47">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MessageTests.cpp" line="45">
         <Original>
           a == 2
         </Original>
@@ -9540,7 +9540,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="./mixed/message/scoped">
-MessageTests.cpp" line="88">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MessageTests.cpp" line="86">
         <Original>
           i &lt; 10
         </Original>
@@ -9548,7 +9548,7 @@
           0 &lt; 10
         </Expanded>
       </Expression>
-MessageTests.cpp" line="88">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MessageTests.cpp" line="86">
         <Original>
           i &lt; 10
         </Original>
@@ -9556,7 +9556,7 @@
           1 &lt; 10
         </Expanded>
       </Expression>
-MessageTests.cpp" line="88">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MessageTests.cpp" line="86">
         <Original>
           i &lt; 10
         </Original>
@@ -9564,7 +9564,7 @@
           2 &lt; 10
         </Expanded>
       </Expression>
-MessageTests.cpp" line="88">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MessageTests.cpp" line="86">
         <Original>
           i &lt; 10
         </Original>
@@ -9572,7 +9572,7 @@
           3 &lt; 10
         </Expanded>
       </Expression>
-MessageTests.cpp" line="88">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MessageTests.cpp" line="86">
         <Original>
           i &lt; 10
         </Original>
@@ -9580,7 +9580,7 @@
           4 &lt; 10
         </Expanded>
       </Expression>
-MessageTests.cpp" line="88">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MessageTests.cpp" line="86">
         <Original>
           i &lt; 10
         </Original>
@@ -9588,7 +9588,7 @@
           5 &lt; 10
         </Expanded>
       </Expression>
-MessageTests.cpp" line="88">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MessageTests.cpp" line="86">
         <Original>
           i &lt; 10
         </Original>
@@ -9596,7 +9596,7 @@
           6 &lt; 10
         </Expanded>
       </Expression>
-MessageTests.cpp" line="88">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MessageTests.cpp" line="86">
         <Original>
           i &lt; 10
         </Original>
@@ -9604,7 +9604,7 @@
           7 &lt; 10
         </Expanded>
       </Expression>
-MessageTests.cpp" line="88">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MessageTests.cpp" line="86">
         <Original>
           i &lt; 10
         </Original>
@@ -9612,7 +9612,7 @@
           8 &lt; 10
         </Expanded>
       </Expression>
-MessageTests.cpp" line="88">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MessageTests.cpp" line="86">
         <Original>
           i &lt; 10
         </Original>
@@ -9626,7 +9626,7 @@
       <Info>
         i := 10
       </Info>
-MessageTests.cpp" line="88">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MessageTests.cpp" line="86">
         <Original>
           i &lt; 10
         </Original>
@@ -9637,7 +9637,7 @@
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="./succeeding/nofail">
-MessageTests.cpp" line="94">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MessageTests.cpp" line="92">
         <Original>
           1 == 2
         </Original>
@@ -9658,7 +9658,7 @@
     </TestCase>
     <TestCase name="./succeeding/Misc/Sections">
       <Section name="s1" description="doesn't equal">
-MiscTests.cpp" line="21">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" line="21">
           <Original>
             a != b
           </Original>
@@ -9666,7 +9666,7 @@
             1 != 2
           </Expanded>
         </Expression>
-MiscTests.cpp" line="22">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" line="22">
           <Original>
             b != a
           </Original>
@@ -9677,7 +9677,7 @@
         <OverallResults successes="2" failures="0"/>
       </Section>
       <Section name="s2" description="not equal">
-MiscTests.cpp" line="27">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" line="27">
           <Original>
             a != b
           </Original>
@@ -9691,7 +9691,7 @@
     </TestCase>
     <TestCase name="./succeeding/Misc/Sections/nested">
       <Section name="s1" description="doesn't equal">
-MiscTests.cpp" line="38">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" line="38">
           <Original>
             a != b
           </Original>
@@ -9699,7 +9699,7 @@
             1 != 2
           </Expanded>
         </Expression>
-MiscTests.cpp" line="39">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" line="39">
           <Original>
             b != a
           </Original>
@@ -9708,7 +9708,7 @@
           </Expanded>
         </Expression>
         <Section name="s2" description="not equal">
-MiscTests.cpp" line="43">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" line="43">
             <Original>
               a != b
             </Original>
@@ -9725,7 +9725,7 @@
     <TestCase name="./mixed/Misc/Sections/nested2">
       <Section name="s1" description="doesn't equal">
         <Section name="s2" description="equal">
-MiscTests.cpp" line="57">
+          <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" line="57">
             <Original>
               a == b
             </Original>
@@ -9739,7 +9739,7 @@
       </Section>
       <Section name="s1" description="doesn't equal">
         <Section name="s3" description="not equal">
-MiscTests.cpp" line="62">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" line="62">
             <Original>
               a != b
             </Original>
@@ -9753,7 +9753,7 @@
       </Section>
       <Section name="s1" description="doesn't equal">
         <Section name="s4" description="less than">
-MiscTests.cpp" line="66">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" line="66">
             <Original>
               a &lt; b
             </Original>
@@ -9790,7 +9790,7 @@
     </TestCase>
     <TestCase name="./mixed/Misc/Sections/loops">
       <Section name="s1" description="b is currently: 0">
-MiscTests.cpp" line="99">
+        <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" line="99">
           <Original>
             b > a
           </Original>
@@ -9806,7 +9806,7 @@
       <Info>
         Testing if fib[0] (1) is even
       </Info>
-MiscTests.cpp" line="111">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" line="111">
         <Original>
           ( fib[i] % 2 ) == 0
         </Original>
@@ -9817,7 +9817,7 @@
       <Info>
         Testing if fib[1] (1) is even
       </Info>
-MiscTests.cpp" line="111">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" line="111">
         <Original>
           ( fib[i] % 2 ) == 0
         </Original>
@@ -9825,7 +9825,7 @@
           1 == 0
         </Expanded>
       </Expression>
-MiscTests.cpp" line="111">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" line="111">
         <Original>
           ( fib[i] % 2 ) == 0
         </Original>
@@ -9836,7 +9836,7 @@
       <Info>
         Testing if fib[3] (3) is even
       </Info>
-MiscTests.cpp" line="111">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" line="111">
         <Original>
           ( fib[i] % 2 ) == 0
         </Original>
@@ -9847,7 +9847,7 @@
       <Info>
         Testing if fib[4] (5) is even
       </Info>
-MiscTests.cpp" line="111">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" line="111">
         <Original>
           ( fib[i] % 2 ) == 0
         </Original>
@@ -9855,7 +9855,7 @@
           1 == 0
         </Expanded>
       </Expression>
-MiscTests.cpp" line="111">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" line="111">
         <Original>
           ( fib[i] % 2 ) == 0
         </Original>
@@ -9866,7 +9866,7 @@
       <Info>
         Testing if fib[6] (13) is even
       </Info>
-MiscTests.cpp" line="111">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" line="111">
         <Original>
           ( fib[i] % 2 ) == 0
         </Original>
@@ -9877,7 +9877,7 @@
       <Info>
         Testing if fib[7] (21) is even
       </Info>
-MiscTests.cpp" line="111">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" line="111">
         <Original>
           ( fib[i] % 2 ) == 0
         </Original>
@@ -9891,7 +9891,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="./succeeding/Misc/null strings">
-MiscTests.cpp" line="129">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" line="129">
         <Original>
           makeString( false ) != static_cast&lt;char*>(__null)
         </Original>
@@ -9899,7 +9899,7 @@
           &quot;valid string&quot; != {null string}
         </Expanded>
       </Expression>
-MiscTests.cpp" line="130">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" line="130">
         <Original>
           makeString( true ) == static_cast&lt;char*>(__null)
         </Original>
@@ -9916,7 +9916,7 @@
       <Info>
         i := 7
       </Info>
-MiscTests.cpp" line="138">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" line="138">
         <Original>
           false
         </Original>
@@ -9927,7 +9927,7 @@
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="./succeeding/checkedif">
-MiscTests.cpp" line="143">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" line="143">
         <Original>
           flag
         </Original>
@@ -9935,7 +9935,7 @@
           true
         </Expanded>
       </Expression>
-MiscTests.cpp" line="151">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" line="151">
         <Original>
           testCheckedIf( true )
         </Original>
@@ -9946,7 +9946,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="./failing/checkedif">
-MiscTests.cpp" line="143">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" line="143">
         <Original>
           flag
         </Original>
@@ -9954,7 +9954,7 @@
           false
         </Expanded>
       </Expression>
-MiscTests.cpp" line="156">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" line="156">
         <Original>
           testCheckedIf( false )
         </Original>
@@ -9965,7 +9965,7 @@
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="./succeeding/checkedelse">
-MiscTests.cpp" line="161">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" line="161">
         <Original>
           flag
         </Original>
@@ -9973,7 +9973,7 @@
           true
         </Expanded>
       </Expression>
-MiscTests.cpp" line="169">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" line="169">
         <Original>
           testCheckedElse( true )
         </Original>
@@ -9984,7 +9984,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="./failing/checkedelse">
-MiscTests.cpp" line="161">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" line="161">
         <Original>
           flag
         </Original>
@@ -9992,7 +9992,7 @@
           false
         </Expanded>
       </Expression>
-MiscTests.cpp" line="174">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" line="174">
         <Original>
           testCheckedElse( false )
         </Original>
@@ -10015,7 +10015,7 @@
       <Info>
         3
       </Info>
-MiscTests.cpp" line="192">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" line="192">
         <Original>
           false
         </Original>
@@ -10026,7 +10026,7 @@
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="./succeeding/atomic if">
-MiscTests.cpp" line="202">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" line="202">
         <Original>
           x == 0
         </Original>
@@ -10037,7 +10037,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="./succeeding/matchers">
-MiscTests.cpp" line="212">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" line="212">
         <Original>
           testStringForMatching() Contains( &quot;string&quot; )
         </Original>
@@ -10045,7 +10045,7 @@
           &quot;this string contains 'abc' as a substring&quot; contains: &quot;string&quot;
         </Expanded>
       </Expression>
-MiscTests.cpp" line="213">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" line="213">
         <Original>
           testStringForMatching() Contains( &quot;abc&quot; )
         </Original>
@@ -10053,7 +10053,7 @@
           &quot;this string contains 'abc' as a substring&quot; contains: &quot;abc&quot;
         </Expanded>
       </Expression>
-MiscTests.cpp" line="215">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" line="215">
         <Original>
           testStringForMatching() StartsWith( &quot;this&quot; )
         </Original>
@@ -10061,7 +10061,7 @@
           &quot;this string contains 'abc' as a substring&quot; starts with: &quot;this&quot;
         </Expanded>
       </Expression>
-MiscTests.cpp" line="216">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" line="216">
         <Original>
           testStringForMatching() EndsWith( &quot;substring&quot; )
         </Original>
@@ -10072,7 +10072,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="./failing/matchers/Contains">
-MiscTests.cpp" line="221">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" line="221">
         <Original>
           testStringForMatching() Contains( &quot;not there&quot; )
         </Original>
@@ -10083,7 +10083,7 @@
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="./failing/matchers/StartsWith">
-MiscTests.cpp" line="226">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" line="226">
         <Original>
           testStringForMatching() StartsWith( &quot;string&quot; )
         </Original>
@@ -10094,7 +10094,7 @@
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="./failing/matchers/EndsWith">
-MiscTests.cpp" line="231">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" line="231">
         <Original>
           testStringForMatching() EndsWith( &quot;this&quot; )
         </Original>
@@ -10105,7 +10105,7 @@
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="./failing/matchers/Equals">
-MiscTests.cpp" line="236">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" line="236">
         <Original>
           testStringForMatching() Equals( &quot;something else&quot; )
         </Original>
@@ -10116,7 +10116,7 @@
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="string">
-MiscTests.cpp" line="240">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" line="240">
         <Original>
           &quot;&quot; Equals(__null)
         </Original>
@@ -10127,7 +10127,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="./succeeding/matchers/AllOf">
-MiscTests.cpp" line="244">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" line="244">
         <Original>
           testStringForMatching() AllOf( Catch::Contains( &quot;string&quot; ), Catch::Contains( &quot;abc&quot; ) )
         </Original>
@@ -10138,7 +10138,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="./succeeding/matchers/AnyOf">
-MiscTests.cpp" line="248">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" line="248">
         <Original>
           testStringForMatching() AnyOf( Catch::Contains( &quot;string&quot; ), Catch::Contains( &quot;not there&quot; ) )
         </Original>
@@ -10146,7 +10146,7 @@
           &quot;this string contains 'abc' as a substring&quot; ( contains: &quot;string&quot; or contains: &quot;not there&quot; )
         </Expanded>
       </Expression>
-MiscTests.cpp" line="249">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" line="249">
         <Original>
           testStringForMatching() AnyOf( Catch::Contains( &quot;not there&quot; ), Catch::Contains( &quot;string&quot; ) )
         </Original>
@@ -10157,7 +10157,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="./succeeding/matchers/Equals">
-MiscTests.cpp" line="254">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" line="254">
         <Original>
           testStringForMatching() Equals( &quot;this string contains 'abc' as a substring&quot; )
         </Original>
@@ -10168,7 +10168,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Factorials are computed">
-MiscTests.cpp" line="264">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" line="264">
         <Original>
           Factorial(0) == 1
         </Original>
@@ -10176,7 +10176,7 @@
           1 == 1
         </Expanded>
       </Expression>
-MiscTests.cpp" line="265">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" line="265">
         <Original>
           Factorial(1) == 1
         </Original>
@@ -10184,7 +10184,7 @@
           1 == 1
         </Expanded>
       </Expression>
-MiscTests.cpp" line="266">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" line="266">
         <Original>
           Factorial(2) == 2
         </Original>
@@ -10192,7 +10192,7 @@
           2 == 2
         </Expanded>
       </Expression>
-MiscTests.cpp" line="267">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" line="267">
         <Original>
           Factorial(3) == 6
         </Original>
@@ -10200,7 +10200,7 @@
           6 == 6
         </Expanded>
       </Expression>
-MiscTests.cpp" line="268">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" line="268">
         <Original>
           Factorial(10) == 3628800
         </Original>
@@ -10226,7 +10226,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="vectors can be sized and resized">
-MiscTests.cpp" line="299">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" line="299">
         <Original>
           v.size() == 5
         </Original>
@@ -10234,7 +10234,7 @@
           5 == 5
         </Expanded>
       </Expression>
-MiscTests.cpp" line="300">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" line="300">
         <Original>
           v.capacity() >= 5
         </Original>
@@ -10243,7 +10243,7 @@
         </Expanded>
       </Expression>
       <Section name="resizing bigger changes size and capacity">
-MiscTests.cpp" line="305">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" line="305">
           <Original>
             v.size() == 10
           </Original>
@@ -10251,7 +10251,7 @@
             10 == 10
           </Expanded>
         </Expression>
-MiscTests.cpp" line="306">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" line="306">
           <Original>
             v.capacity() >= 10
           </Original>
@@ -10261,7 +10261,7 @@
         </Expression>
         <OverallResults successes="2" failures="0"/>
       </Section>
-MiscTests.cpp" line="299">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" line="299">
         <Original>
           v.size() == 5
         </Original>
@@ -10269,7 +10269,7 @@
           5 == 5
         </Expanded>
       </Expression>
-MiscTests.cpp" line="300">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" line="300">
         <Original>
           v.capacity() >= 5
         </Original>
@@ -10278,7 +10278,7 @@
         </Expanded>
       </Expression>
       <Section name="resizing smaller changes size but not capacity">
-MiscTests.cpp" line="311">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" line="311">
           <Original>
             v.size() == 0
           </Original>
@@ -10286,7 +10286,7 @@
             0 == 0
           </Expanded>
         </Expression>
-MiscTests.cpp" line="312">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" line="312">
           <Original>
             v.capacity() >= 5
           </Original>
@@ -10295,7 +10295,7 @@
           </Expanded>
         </Expression>
         <Section name="We can use the 'swap trick' to reset the capacity">
-MiscTests.cpp" line="318">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" line="318">
             <Original>
               v.capacity() == 0
             </Original>
@@ -10307,7 +10307,7 @@
         </Section>
         <OverallResults successes="3" failures="0"/>
       </Section>
-MiscTests.cpp" line="299">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" line="299">
         <Original>
           v.size() == 5
         </Original>
@@ -10315,7 +10315,7 @@
           5 == 5
         </Expanded>
       </Expression>
-MiscTests.cpp" line="300">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" line="300">
         <Original>
           v.capacity() >= 5
         </Original>
@@ -10324,7 +10324,7 @@
         </Expanded>
       </Expression>
       <Section name="resizing smaller changes size but not capacity">
-MiscTests.cpp" line="311">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" line="311">
           <Original>
             v.size() == 0
           </Original>
@@ -10332,7 +10332,7 @@
             0 == 0
           </Expanded>
         </Expression>
-MiscTests.cpp" line="312">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" line="312">
           <Original>
             v.capacity() >= 5
           </Original>
@@ -10342,7 +10342,7 @@
         </Expression>
         <OverallResults successes="2" failures="0"/>
       </Section>
-MiscTests.cpp" line="299">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" line="299">
         <Original>
           v.size() == 5
         </Original>
@@ -10350,7 +10350,7 @@
           5 == 5
         </Expanded>
       </Expression>
-MiscTests.cpp" line="300">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" line="300">
         <Original>
           v.capacity() >= 5
         </Original>
@@ -10359,7 +10359,7 @@
         </Expanded>
       </Expression>
       <Section name="reserving bigger changes capacity but not size">
-MiscTests.cpp" line="324">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" line="324">
           <Original>
             v.size() == 5
           </Original>
@@ -10367,7 +10367,7 @@
             5 == 5
           </Expanded>
         </Expression>
-MiscTests.cpp" line="325">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" line="325">
           <Original>
             v.capacity() >= 10
           </Original>
@@ -10377,7 +10377,7 @@
         </Expression>
         <OverallResults successes="2" failures="0"/>
       </Section>
-MiscTests.cpp" line="299">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" line="299">
         <Original>
           v.size() == 5
         </Original>
@@ -10385,7 +10385,7 @@
           5 == 5
         </Expanded>
       </Expression>
-MiscTests.cpp" line="300">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" line="300">
         <Original>
           v.capacity() >= 5
         </Original>
@@ -10394,7 +10394,7 @@
         </Expanded>
       </Expression>
       <Section name="reserving smaller does not change size or capacity">
-MiscTests.cpp" line="330">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" line="330">
           <Original>
             v.size() == 5
           </Original>
@@ -10402,7 +10402,7 @@
             5 == 5
           </Expanded>
         </Expression>
-MiscTests.cpp" line="331">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" line="331">
           <Original>
             v.capacity() >= 5
           </Original>
@@ -10432,7 +10432,7 @@
       </Section>
       <Section name="selftest/test counts" description="Number of test cases that run is fixed">
         <Section name="selftest/test counts/succeeding tests" description="Number of 'succeeding' tests is fixed">
-TestMain.cpp" line="41">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="41">
             <Original>
               totals.assertions.passed == 296
             </Original>
@@ -10440,7 +10440,7 @@
               296 == 296
             </Expanded>
           </Expression>
-TestMain.cpp" line="42">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="42">
             <Original>
               totals.assertions.failed == 0
             </Original>
@@ -10454,7 +10454,7 @@
       </Section>
       <Section name="selftest/test counts" description="Number of test cases that run is fixed">
         <Section name="selftest/test counts/failing tests" description="Number of 'failing' tests is fixed">
-TestMain.cpp" line="48">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="48">
             <Original>
               totals.assertions.passed == 1
             </Original>
@@ -10462,7 +10462,7 @@
               1 == 1
             </Expanded>
           </Expression>
-TestMain.cpp" line="49">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="49">
             <Original>
               totals.assertions.failed == 74
             </Original>
@@ -10477,7 +10477,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="meta/Misc/Sections">
-TestMain.cpp" line="58">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="58">
         <Original>
           totals.assertions.passed == 2
         </Original>
@@ -10485,7 +10485,7 @@
           2 == 2
         </Expanded>
       </Expression>
-TestMain.cpp" line="59">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="59">
         <Original>
           totals.assertions.failed == 1
         </Original>
@@ -10497,7 +10497,7 @@
     </TestCase>
     <TestCase name="Process can be configured on command line">
       <Section name="default - no arguments">
-TestMain.cpp" line="98">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="98">
           <Original>
             parseIntoConfig( argv, config )
           </Original>
@@ -10505,7 +10505,7 @@
             parseIntoConfig( argv, config )
           </Expanded>
         </Expression>
-TestMain.cpp" line="100">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="100">
           <Original>
             config.shouldDebugBreak == false
           </Original>
@@ -10513,7 +10513,7 @@
             false == false
           </Expanded>
         </Expression>
-TestMain.cpp" line="101">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="101">
           <Original>
             config.abortAfter == -1
           </Original>
@@ -10521,7 +10521,7 @@
             -1 == -1
           </Expanded>
         </Expression>
-TestMain.cpp" line="102">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="102">
           <Original>
             config.noThrow == false
           </Original>
@@ -10529,7 +10529,7 @@
             false == false
           </Expanded>
         </Expression>
-TestMain.cpp" line="103">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="103">
           <Original>
             config.reporterName.empty()
           </Original>
@@ -10541,7 +10541,7 @@
       </Section>
       <Section name="test lists">
         <Section name="1 test" description="Specify one test case using">
-TestMain.cpp" line="109">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="109">
             <Original>
               parseIntoConfig( argv, config )
             </Original>
@@ -10549,7 +10549,7 @@
               parseIntoConfig( argv, config )
             </Expanded>
           </Expression>
-TestMain.cpp" line="112">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="112">
             <Original>
               cfg.filters().size() == 1
             </Original>
@@ -10557,7 +10557,7 @@
               1 == 1
             </Expanded>
           </Expression>
-TestMain.cpp" line="113">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="113">
             <Original>
               cfg.filters()[0].shouldInclude( fakeTestCase( &quot;notIncluded&quot; ) ) == false
             </Original>
@@ -10565,7 +10565,7 @@
               false == false
             </Expanded>
           </Expression>
-TestMain.cpp" line="114">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="114">
             <Original>
               cfg.filters()[0].shouldInclude( fakeTestCase( &quot;test1&quot; ) )
             </Original>
@@ -10579,7 +10579,7 @@
       </Section>
       <Section name="test lists">
         <Section name="Specify one test case exclusion using exclude:">
-TestMain.cpp" line="118">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="118">
             <Original>
               parseIntoConfig( argv, config )
             </Original>
@@ -10587,7 +10587,7 @@
               parseIntoConfig( argv, config )
             </Expanded>
           </Expression>
-TestMain.cpp" line="121">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="121">
             <Original>
               cfg.filters().size() == 1
             </Original>
@@ -10595,7 +10595,7 @@
               1 == 1
             </Expanded>
           </Expression>
-TestMain.cpp" line="122">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="122">
             <Original>
               cfg.filters()[0].shouldInclude( fakeTestCase( &quot;test1&quot; ) ) == false
             </Original>
@@ -10603,7 +10603,7 @@
               false == false
             </Expanded>
           </Expression>
-TestMain.cpp" line="123">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="123">
             <Original>
               cfg.filters()[0].shouldInclude( fakeTestCase( &quot;alwaysIncluded&quot; ) )
             </Original>
@@ -10617,7 +10617,7 @@
       </Section>
       <Section name="test lists">
         <Section name="Specify one test case exclusion using ~">
-TestMain.cpp" line="128">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="128">
             <Original>
               parseIntoConfig( argv, config )
             </Original>
@@ -10625,7 +10625,7 @@
               parseIntoConfig( argv, config )
             </Expanded>
           </Expression>
-TestMain.cpp" line="131">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="131">
             <Original>
               cfg.filters().size() == 1
             </Original>
@@ -10633,7 +10633,7 @@
               1 == 1
             </Expanded>
           </Expression>
-TestMain.cpp" line="132">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="132">
             <Original>
               cfg.filters()[0].shouldInclude( fakeTestCase( &quot;test1&quot; ) ) == false
             </Original>
@@ -10641,7 +10641,7 @@
               false == false
             </Expanded>
           </Expression>
-TestMain.cpp" line="133">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="133">
             <Original>
               cfg.filters()[0].shouldInclude( fakeTestCase( &quot;alwaysIncluded&quot; ) )
             </Original>
@@ -10655,7 +10655,7 @@
       </Section>
       <Section name="test lists">
         <Section name="Specify two test cases using -t">
-TestMain.cpp" line="138">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="138">
             <Original>
               parseIntoConfig( argv, config )
             </Original>
@@ -10663,7 +10663,7 @@
               parseIntoConfig( argv, config )
             </Expanded>
           </Expression>
-TestMain.cpp" line="141">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="141">
             <Original>
               cfg.filters().size() == 1
             </Original>
@@ -10671,7 +10671,7 @@
               1 == 1
             </Expanded>
           </Expression>
-TestMain.cpp" line="142">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="142">
             <Original>
               cfg.filters()[0].shouldInclude( fakeTestCase( &quot;notIncluded&quot; ) ) == false
             </Original>
@@ -10679,7 +10679,7 @@
               false == false
             </Expanded>
           </Expression>
-TestMain.cpp" line="143">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="143">
             <Original>
               cfg.filters()[0].shouldInclude( fakeTestCase( &quot;test1&quot; ) )
             </Original>
@@ -10687,7 +10687,7 @@
               true
             </Expanded>
           </Expression>
-TestMain.cpp" line="144">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="144">
             <Original>
               cfg.filters()[0].shouldInclude( fakeTestCase( &quot;test2&quot; ) )
             </Original>
@@ -10704,7 +10704,7 @@
       </Section>
       <Section name="reporter">
         <Section name="-r/console">
-TestMain.cpp" line="151">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="151">
             <Original>
               parseIntoConfig( argv, config )
             </Original>
@@ -10712,7 +10712,7 @@
               parseIntoConfig( argv, config )
             </Expanded>
           </Expression>
-TestMain.cpp" line="153">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="153">
             <Original>
               config.reporterName == &quot;console&quot;
             </Original>
@@ -10726,7 +10726,7 @@
       </Section>
       <Section name="reporter">
         <Section name="-r/xml">
-TestMain.cpp" line="157">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="157">
             <Original>
               parseIntoConfig( argv, config )
             </Original>
@@ -10734,7 +10734,7 @@
               parseIntoConfig( argv, config )
             </Expanded>
           </Expression>
-TestMain.cpp" line="159">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="159">
             <Original>
               config.reporterName == &quot;xml&quot;
             </Original>
@@ -10748,7 +10748,7 @@
       </Section>
       <Section name="reporter">
         <Section name="--reporter/junit">
-TestMain.cpp" line="163">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="163">
             <Original>
               parseIntoConfig( argv, config )
             </Original>
@@ -10756,7 +10756,7 @@
               parseIntoConfig( argv, config )
             </Expanded>
           </Expression>
-TestMain.cpp" line="165">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="165">
             <Original>
               config.reporterName == &quot;junit&quot;
             </Original>
@@ -10773,7 +10773,7 @@
       </Section>
       <Section name="debugger">
         <Section name="-b">
-TestMain.cpp" line="172">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="172">
             <Original>
               parseIntoConfig( argv, config )
             </Original>
@@ -10781,7 +10781,7 @@
               parseIntoConfig( argv, config )
             </Expanded>
           </Expression>
-TestMain.cpp" line="174">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="174">
             <Original>
               config.shouldDebugBreak == true
             </Original>
@@ -10795,7 +10795,7 @@
       </Section>
       <Section name="debugger">
         <Section name="--break">
-TestMain.cpp" line="178">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="178">
             <Original>
               parseIntoConfig( argv, config )
             </Original>
@@ -10803,7 +10803,7 @@
               parseIntoConfig( argv, config )
             </Expanded>
           </Expression>
-TestMain.cpp" line="180">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="180">
             <Original>
               config.shouldDebugBreak
             </Original>
@@ -10820,7 +10820,7 @@
       </Section>
       <Section name="abort">
         <Section name="-a aborts after first failure">
-TestMain.cpp" line="187">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="187">
             <Original>
               parseIntoConfig( argv, config )
             </Original>
@@ -10828,7 +10828,7 @@
               parseIntoConfig( argv, config )
             </Expanded>
           </Expression>
-TestMain.cpp" line="189">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="189">
             <Original>
               config.abortAfter == 1
             </Original>
@@ -10842,7 +10842,7 @@
       </Section>
       <Section name="abort">
         <Section name="-x 2 aborts after two failures">
-TestMain.cpp" line="193">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="193">
             <Original>
               parseIntoConfig( argv, config )
             </Original>
@@ -10850,7 +10850,7 @@
               parseIntoConfig( argv, config )
             </Expanded>
           </Expression>
-TestMain.cpp" line="195">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="195">
             <Original>
               config.abortAfter == 2
             </Original>
@@ -10864,7 +10864,7 @@
       </Section>
       <Section name="abort">
         <Section name="-x must be greater than zero">
-TestMain.cpp" line="199">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="199">
             <Original>
               parseIntoConfigAndReturnError( argv, config ) Contains( &quot;greater than zero&quot; )
             </Original>
@@ -10878,7 +10878,7 @@
       </Section>
       <Section name="abort">
         <Section name="-x must be numeric">
-TestMain.cpp" line="203">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="203">
             <Original>
               parseIntoConfigAndReturnError( argv, config ) Contains( &quot;-x&quot; )
             </Original>
@@ -10895,7 +10895,7 @@
       </Section>
       <Section name="nothrow">
         <Section name="-e">
-TestMain.cpp" line="210">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="210">
             <Original>
               parseIntoConfig( argv, config )
             </Original>
@@ -10903,7 +10903,7 @@
               parseIntoConfig( argv, config )
             </Expanded>
           </Expression>
-TestMain.cpp" line="212">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="212">
             <Original>
               config.noThrow == true
             </Original>
@@ -10917,7 +10917,7 @@
       </Section>
       <Section name="nothrow">
         <Section name="--nothrow">
-TestMain.cpp" line="216">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="216">
             <Original>
               parseIntoConfig( argv, config )
             </Original>
@@ -10925,7 +10925,7 @@
               parseIntoConfig( argv, config )
             </Expanded>
           </Expression>
-TestMain.cpp" line="218">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="218">
             <Original>
               config.noThrow == true
             </Original>
@@ -10942,7 +10942,7 @@
       </Section>
       <Section name="output filename">
         <Section name="-o filename">
-TestMain.cpp" line="225">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="225">
             <Original>
               parseIntoConfig( argv, config )
             </Original>
@@ -10950,7 +10950,7 @@
               parseIntoConfig( argv, config )
             </Expanded>
           </Expression>
-TestMain.cpp" line="227">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="227">
             <Original>
               config.outputFilename == &quot;filename.ext&quot;
             </Original>
@@ -10964,7 +10964,7 @@
       </Section>
       <Section name="output filename">
         <Section name="--out">
-TestMain.cpp" line="231">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="231">
             <Original>
               parseIntoConfig( argv, config )
             </Original>
@@ -10972,7 +10972,7 @@
               parseIntoConfig( argv, config )
             </Expanded>
           </Expression>
-TestMain.cpp" line="233">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="233">
             <Original>
               config.outputFilename == &quot;filename.ext&quot;
             </Original>
@@ -10989,7 +10989,7 @@
       </Section>
       <Section name="combinations">
         <Section name="Single character flags can be combined">
-TestMain.cpp" line="240">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="240">
             <Original>
               parseIntoConfig( argv, config )
             </Original>
@@ -10997,7 +10997,7 @@
               parseIntoConfig( argv, config )
             </Expanded>
           </Expression>
-TestMain.cpp" line="242">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="242">
             <Original>
               config.abortAfter == 1
             </Original>
@@ -11005,7 +11005,7 @@
               1 == 1
             </Expanded>
           </Expression>
-TestMain.cpp" line="243">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="243">
             <Original>
               config.shouldDebugBreak
             </Original>
@@ -11013,7 +11013,7 @@
               true
             </Expanded>
           </Expression>
-TestMain.cpp" line="244">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="244">
             <Original>
               config.noThrow == true
             </Original>
@@ -11028,7 +11028,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="selftest/test filter">
-TestMain.cpp" line="253">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="253">
         <Original>
           matchAny.shouldInclude( fakeTestCase( &quot;any&quot; ) )
         </Original>
@@ -11036,7 +11036,7 @@
           true
         </Expanded>
       </Expression>
-TestMain.cpp" line="254">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="254">
         <Original>
           matchNone.shouldInclude( fakeTestCase( &quot;any&quot; ) ) == false
         </Original>
@@ -11044,7 +11044,7 @@
           false == false
         </Expanded>
       </Expression>
-TestMain.cpp" line="259">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="259">
         <Original>
           matchHidden.shouldInclude( fakeTestCase( &quot;any&quot; ) ) == false
         </Original>
@@ -11052,7 +11052,7 @@
           false == false
         </Expanded>
       </Expression>
-TestMain.cpp" line="260">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="260">
         <Original>
           matchNonHidden.shouldInclude( fakeTestCase( &quot;any&quot; ) )
         </Original>
@@ -11060,7 +11060,7 @@
           true
         </Expanded>
       </Expression>
-TestMain.cpp" line="262">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="262">
         <Original>
           matchHidden.shouldInclude( fakeTestCase( &quot;./any&quot; ) )
         </Original>
@@ -11068,7 +11068,7 @@
           true
         </Expanded>
       </Expression>
-TestMain.cpp" line="263">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="263">
         <Original>
           matchNonHidden.shouldInclude( fakeTestCase( &quot;./any&quot; ) ) == false
         </Original>
@@ -11079,7 +11079,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="selftest/test filters">
-TestMain.cpp" line="274">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="274">
         <Original>
           matchHidden.shouldInclude( fakeTestCase( &quot;./something&quot; ) )
         </Original>
@@ -11087,7 +11087,7 @@
           true
         </Expanded>
       </Expression>
-TestMain.cpp" line="276">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="276">
         <Original>
           filters.shouldInclude( fakeTestCase( &quot;any&quot; ) ) == false
         </Original>
@@ -11095,7 +11095,7 @@
           false == false
         </Expanded>
       </Expression>
-TestMain.cpp" line="277">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="277">
         <Original>
           filters.shouldInclude( fakeTestCase( &quot;./something&quot; ) )
         </Original>
@@ -11103,7 +11103,7 @@
           true
         </Expanded>
       </Expression>
-TestMain.cpp" line="278">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="278">
         <Original>
           filters.shouldInclude( fakeTestCase( &quot;./anything&quot; ) ) == false
         </Original>
@@ -11114,7 +11114,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="selftest/filter/prefix wildcard">
-TestMain.cpp" line="284">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="284">
         <Original>
           matchBadgers.shouldInclude( fakeTestCase( &quot;big badger&quot; ) )
         </Original>
@@ -11122,7 +11122,7 @@
           true
         </Expanded>
       </Expression>
-TestMain.cpp" line="285">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="285">
         <Original>
           matchBadgers.shouldInclude( fakeTestCase( &quot;little badgers&quot; ) ) == false
         </Original>
@@ -11133,7 +11133,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="selftest/filter/wildcard at both ends">
-TestMain.cpp" line="290">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="290">
         <Original>
           matchBadgers.shouldInclude( fakeTestCase( &quot;big badger&quot; ) )
         </Original>
@@ -11141,7 +11141,7 @@
           true
         </Expanded>
       </Expression>
-TestMain.cpp" line="291">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="291">
         <Original>
           matchBadgers.shouldInclude( fakeTestCase( &quot;little badgers&quot; ) )
         </Original>
@@ -11149,7 +11149,7 @@
           true
         </Expanded>
       </Expression>
-TestMain.cpp" line="292">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="292">
         <Original>
           matchBadgers.shouldInclude( fakeTestCase( &quot;badgers are big&quot; ) )
         </Original>
@@ -11157,7 +11157,7 @@
           true
         </Expanded>
       </Expression>
-TestMain.cpp" line="293">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="293">
         <Original>
           matchBadgers.shouldInclude( fakeTestCase( &quot;hedgehogs&quot; ) ) == false
         </Original>
@@ -11169,7 +11169,7 @@
     </TestCase>
     <TestCase name="selftest/tags">
       <Section name="one tag">
-TestMain.cpp" line="313">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="313">
           <Original>
             oneTag.getTestCaseInfo().description == &quot;&quot;
           </Original>
@@ -11177,7 +11177,7 @@
             &quot;&quot; == &quot;&quot;
           </Expanded>
         </Expression>
-TestMain.cpp" line="314">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="314">
           <Original>
             oneTag.hasTag( &quot;one&quot; )
           </Original>
@@ -11185,7 +11185,7 @@
             true
           </Expanded>
         </Expression>
-TestMain.cpp" line="315">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="315">
           <Original>
             oneTag.getTags().size() == 1
           </Original>
@@ -11193,7 +11193,7 @@
             1 == 1
           </Expanded>
         </Expression>
-TestMain.cpp" line="317">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="317">
           <Original>
             oneTag.matchesTags( p1 ) == true
           </Original>
@@ -11201,7 +11201,7 @@
             true == true
           </Expanded>
         </Expression>
-TestMain.cpp" line="318">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="318">
           <Original>
             oneTag.matchesTags( p2 ) == true
           </Original>
@@ -11209,7 +11209,7 @@
             true == true
           </Expanded>
         </Expression>
-TestMain.cpp" line="319">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="319">
           <Original>
             oneTag.matchesTags( p3 ) == false
           </Original>
@@ -11217,7 +11217,7 @@
             false == false
           </Expanded>
         </Expression>
-TestMain.cpp" line="320">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="320">
           <Original>
             oneTag.matchesTags( p4 ) == false
           </Original>
@@ -11225,7 +11225,7 @@
             false == false
           </Expanded>
         </Expression>
-TestMain.cpp" line="321">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="321">
           <Original>
             oneTag.matchesTags( p5 ) == false
           </Original>
@@ -11236,7 +11236,7 @@
         <OverallResults successes="8" failures="0"/>
       </Section>
       <Section name="two tags">
-TestMain.cpp" line="327">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="327">
           <Original>
             twoTags.getTestCaseInfo().description == &quot;&quot;
           </Original>
@@ -11244,7 +11244,7 @@
             &quot;&quot; == &quot;&quot;
           </Expanded>
         </Expression>
-TestMain.cpp" line="328">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="328">
           <Original>
             twoTags.hasTag( &quot;one&quot; )
           </Original>
@@ -11252,7 +11252,7 @@
             true
           </Expanded>
         </Expression>
-TestMain.cpp" line="329">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="329">
           <Original>
             twoTags.hasTag( &quot;two&quot; )
           </Original>
@@ -11260,7 +11260,7 @@
             true
           </Expanded>
         </Expression>
-TestMain.cpp" line="330">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="330">
           <Original>
             twoTags.hasTag( &quot;Two&quot; )
           </Original>
@@ -11268,7 +11268,7 @@
             true
           </Expanded>
         </Expression>
-TestMain.cpp" line="331">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="331">
           <Original>
             twoTags.hasTag( &quot;three&quot; ) == false
           </Original>
@@ -11276,7 +11276,7 @@
             false == false
           </Expanded>
         </Expression>
-TestMain.cpp" line="332">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="332">
           <Original>
             twoTags.getTags().size() == 2
           </Original>
@@ -11284,7 +11284,7 @@
             2 == 2
           </Expanded>
         </Expression>
-TestMain.cpp" line="334">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="334">
           <Original>
             twoTags.matchesTags( p1 ) == true
           </Original>
@@ -11292,7 +11292,7 @@
             true == true
           </Expanded>
         </Expression>
-TestMain.cpp" line="335">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="335">
           <Original>
             twoTags.matchesTags( p2 ) == true
           </Original>
@@ -11300,7 +11300,7 @@
             true == true
           </Expanded>
         </Expression>
-TestMain.cpp" line="336">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="336">
           <Original>
             twoTags.matchesTags( p3 ) == true
           </Original>
@@ -11308,7 +11308,7 @@
             true == true
           </Expanded>
         </Expression>
-TestMain.cpp" line="337">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="337">
           <Original>
             twoTags.matchesTags( p4 ) == true
           </Original>
@@ -11316,7 +11316,7 @@
             true == true
           </Expanded>
         </Expression>
-TestMain.cpp" line="338">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="338">
           <Original>
             twoTags.matchesTags( p5 ) == true
           </Original>
@@ -11327,7 +11327,7 @@
         <OverallResults successes="11" failures="0"/>
       </Section>
       <Section name="one tag with characters either side">
-TestMain.cpp" line="344">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="344">
           <Original>
             oneTagWithExtras.getTestCaseInfo().description == &quot;1234&quot;
           </Original>
@@ -11335,7 +11335,7 @@
             &quot;1234&quot; == &quot;1234&quot;
           </Expanded>
         </Expression>
-TestMain.cpp" line="345">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="345">
           <Original>
             oneTagWithExtras.hasTag( &quot;one&quot; )
           </Original>
@@ -11343,7 +11343,7 @@
             true
           </Expanded>
         </Expression>
-TestMain.cpp" line="346">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="346">
           <Original>
             oneTagWithExtras.hasTag( &quot;two&quot; ) == false
           </Original>
@@ -11351,7 +11351,7 @@
             false == false
           </Expanded>
         </Expression>
-TestMain.cpp" line="347">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="347">
           <Original>
             oneTagWithExtras.getTags().size() == 1
           </Original>
@@ -11362,7 +11362,7 @@
         <OverallResults successes="4" failures="0"/>
       </Section>
       <Section name="start of a tag, but not closed">
-TestMain.cpp" line="354">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="354">
           <Original>
             oneTagOpen.getTestCaseInfo().description == &quot;[one&quot;
           </Original>
@@ -11370,7 +11370,7 @@
             &quot;[one&quot; == &quot;[one&quot;
           </Expanded>
         </Expression>
-TestMain.cpp" line="355">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="355">
           <Original>
             oneTagOpen.hasTag( &quot;one&quot; ) == false
           </Original>
@@ -11378,7 +11378,7 @@
             false == false
           </Expanded>
         </Expression>
-TestMain.cpp" line="356">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="356">
           <Original>
             oneTagOpen.getTags().size() == 0
           </Original>
@@ -11389,7 +11389,7 @@
         <OverallResults successes="3" failures="0"/>
       </Section>
       <Section name="hidden">
-TestMain.cpp" line="362">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="362">
           <Original>
             oneTag.getTestCaseInfo().description == &quot;&quot;
           </Original>
@@ -11397,7 +11397,7 @@
             &quot;&quot; == &quot;&quot;
           </Expanded>
         </Expression>
-TestMain.cpp" line="363">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="363">
           <Original>
             oneTag.hasTag( &quot;.&quot; )
           </Original>
@@ -11405,7 +11405,7 @@
             true
           </Expanded>
         </Expression>
-TestMain.cpp" line="364">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="364">
           <Original>
             oneTag.isHidden()
           </Original>
@@ -11413,7 +11413,7 @@
             true
           </Expanded>
         </Expression>
-TestMain.cpp" line="366">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="366">
           <Original>
             oneTag.matchesTags( &quot;~[.]&quot; ) == false
           </Original>
@@ -11428,7 +11428,7 @@
     <TestCase name="Long strings can be wrapped">
       <Section name="plain string">
         <Section name="No wrapping">
-TestMain.cpp" line="379">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="379">
             <Original>
               Text( testString, TextAttributes().setWidth( 80 ) ).toString() == testString
             </Original>
@@ -11438,7 +11438,7 @@
 &quot;one two three four&quot;
             </Expanded>
           </Expression>
-TestMain.cpp" line="380">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="380">
             <Original>
               Text( testString, TextAttributes().setWidth( 18 ) ).toString() == testString
             </Original>
@@ -11454,7 +11454,7 @@
       </Section>
       <Section name="plain string">
         <Section name="Wrapped once">
-TestMain.cpp" line="383">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="383">
             <Original>
               Text( testString, TextAttributes().setWidth( 17 ) ).toString() == &quot;one two three\nfour&quot;
             </Original>
@@ -11466,7 +11466,7 @@
 four&quot;
             </Expanded>
           </Expression>
-TestMain.cpp" line="384">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="384">
             <Original>
               Text( testString, TextAttributes().setWidth( 16 ) ).toString() == &quot;one two three\nfour&quot;
             </Original>
@@ -11478,7 +11478,7 @@
 four&quot;
             </Expanded>
           </Expression>
-TestMain.cpp" line="385">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="385">
             <Original>
               Text( testString, TextAttributes().setWidth( 14 ) ).toString() == &quot;one two three\nfour&quot;
             </Original>
@@ -11490,7 +11490,7 @@
 four&quot;
             </Expanded>
           </Expression>
-TestMain.cpp" line="386">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="386">
             <Original>
               Text( testString, TextAttributes().setWidth( 13 ) ).toString() == &quot;one two three\nfour&quot;
             </Original>
@@ -11502,7 +11502,7 @@
 four&quot;
             </Expanded>
           </Expression>
-TestMain.cpp" line="387">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="387">
             <Original>
               Text( testString, TextAttributes().setWidth( 12 ) ).toString() == &quot;one two\nthree four&quot;
             </Original>
@@ -11520,7 +11520,7 @@
       </Section>
       <Section name="plain string">
         <Section name="Wrapped twice">
-TestMain.cpp" line="390">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="390">
             <Original>
               Text( testString, TextAttributes().setWidth( 9 ) ).toString() == &quot;one two\nthree\nfour&quot;
             </Original>
@@ -11534,7 +11534,7 @@
 four&quot;
             </Expanded>
           </Expression>
-TestMain.cpp" line="391">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="391">
             <Original>
               Text( testString, TextAttributes().setWidth( 8 ) ).toString() == &quot;one two\nthree\nfour&quot;
             </Original>
@@ -11548,7 +11548,7 @@
 four&quot;
             </Expanded>
           </Expression>
-TestMain.cpp" line="392">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="392">
             <Original>
               Text( testString, TextAttributes().setWidth( 7 ) ).toString() == &quot;one two\nthree\nfour&quot;
             </Original>
@@ -11568,7 +11568,7 @@
       </Section>
       <Section name="plain string">
         <Section name="Wrapped three times">
-TestMain.cpp" line="395">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="395">
             <Original>
               Text( testString, TextAttributes().setWidth( 6 ) ).toString() == &quot;one\ntwo\nthree\nfour&quot;
             </Original>
@@ -11584,7 +11584,7 @@
 four&quot;
             </Expanded>
           </Expression>
-TestMain.cpp" line="396">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="396">
             <Original>
               Text( testString, TextAttributes().setWidth( 5 ) ).toString() == &quot;one\ntwo\nthree\nfour&quot;
             </Original>
@@ -11606,7 +11606,7 @@
       </Section>
       <Section name="plain string">
         <Section name="Short wrap">
-TestMain.cpp" line="399">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="399">
             <Original>
               Text( &quot;abcdef&quot;, TextAttributes().setWidth( 4 ) ).toString() == &quot;abc-\ndef&quot;
             </Original>
@@ -11618,7 +11618,7 @@
 def&quot;
             </Expanded>
           </Expression>
-TestMain.cpp" line="400">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="400">
             <Original>
               Text( &quot;abcdefg&quot;, TextAttributes().setWidth( 4 ) ).toString() == &quot;abc-\ndefg&quot;
             </Original>
@@ -11630,7 +11630,7 @@
 defg&quot;
             </Expanded>
           </Expression>
-TestMain.cpp" line="401">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="401">
             <Original>
               Text( &quot;abcdefgh&quot;, TextAttributes().setWidth( 4 ) ).toString() == &quot;abc-\ndef-\ngh&quot;
             </Original>
@@ -11644,7 +11644,7 @@
 gh&quot;
             </Expanded>
           </Expression>
-TestMain.cpp" line="403">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="403">
             <Original>
               Text( testString, TextAttributes().setWidth( 4 ) ).toString() == &quot;one\ntwo\nthr-\nee\nfour&quot;
             </Original>
@@ -11662,7 +11662,7 @@
 four&quot;
             </Expanded>
           </Expression>
-TestMain.cpp" line="404">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="404">
             <Original>
               Text( testString, TextAttributes().setWidth( 3 ) ).toString() == &quot;one\ntwo\nth-\nree\nfo-\nur&quot;
             </Original>
@@ -11688,7 +11688,7 @@
       </Section>
       <Section name="plain string">
         <Section name="As container">
-TestMain.cpp" line="408">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="408">
             <Original>
               text.size() == 4
             </Original>
@@ -11696,7 +11696,7 @@
               4 == 4
             </Expanded>
           </Expression>
-TestMain.cpp" line="409">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="409">
             <Original>
               text[0] == &quot;one&quot;
             </Original>
@@ -11704,7 +11704,7 @@
               &quot;one&quot; == &quot;one&quot;
             </Expanded>
           </Expression>
-TestMain.cpp" line="410">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="410">
             <Original>
               text[1] == &quot;two&quot;
             </Original>
@@ -11712,7 +11712,7 @@
               &quot;two&quot; == &quot;two&quot;
             </Expanded>
           </Expression>
-TestMain.cpp" line="411">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="411">
             <Original>
               text[2] == &quot;three&quot;
             </Original>
@@ -11720,7 +11720,7 @@
               &quot;three&quot; == &quot;three&quot;
             </Expanded>
           </Expression>
-TestMain.cpp" line="412">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="412">
             <Original>
               text[3] == &quot;four&quot;
             </Original>
@@ -11734,7 +11734,7 @@
       </Section>
       <Section name="plain string">
         <Section name="Indent first line differently">
-TestMain.cpp" line="419">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="419">
             <Original>
               text.toString() == &quot; one two\n    three\n    four&quot;
             </Original>
@@ -11757,7 +11757,7 @@
       </Section>
       <Section name="With newlines">
         <Section name="No wrapping">
-TestMain.cpp" line="430">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="430">
             <Original>
               Text( testString, TextAttributes().setWidth( 80 ) ).toString() == testString
             </Original>
@@ -11769,7 +11769,7 @@
 three four&quot;
             </Expanded>
           </Expression>
-TestMain.cpp" line="431">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="431">
             <Original>
               Text( testString, TextAttributes().setWidth( 18 ) ).toString() == testString
             </Original>
@@ -11781,7 +11781,7 @@
 three four&quot;
             </Expanded>
           </Expression>
-TestMain.cpp" line="432">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="432">
             <Original>
               Text( testString, TextAttributes().setWidth( 10 ) ).toString() == testString
             </Original>
@@ -11799,7 +11799,7 @@
       </Section>
       <Section name="With newlines">
         <Section name="Trailing newline">
-TestMain.cpp" line="435">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="435">
             <Original>
               Text( &quot;abcdef\n&quot;, TextAttributes().setWidth( 10 ) ).toString() == &quot;abcdef\n&quot;
             </Original>
@@ -11811,7 +11811,7 @@
 &quot;
             </Expanded>
           </Expression>
-TestMain.cpp" line="436">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="436">
             <Original>
               Text( &quot;abcdef&quot;, TextAttributes().setWidth( 6 ) ).toString() == &quot;abcdef&quot;
             </Original>
@@ -11819,7 +11819,7 @@
               &quot;abcdef&quot; == &quot;abcdef&quot;
             </Expanded>
           </Expression>
-TestMain.cpp" line="437">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="437">
             <Original>
               Text( &quot;abcdef\n&quot;, TextAttributes().setWidth( 6 ) ).toString() == &quot;abcdef\n&quot;
             </Original>
@@ -11837,7 +11837,7 @@
       </Section>
       <Section name="With newlines">
         <Section name="Wrapped once">
-TestMain.cpp" line="440">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="440">
             <Original>
               Text( testString, TextAttributes().setWidth( 9 ) ).toString() == &quot;one two\nthree\nfour&quot;
             </Original>
@@ -11851,7 +11851,7 @@
 four&quot;
             </Expanded>
           </Expression>
-TestMain.cpp" line="441">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="441">
             <Original>
               Text( testString, TextAttributes().setWidth( 8 ) ).toString() == &quot;one two\nthree\nfour&quot;
             </Original>
@@ -11865,7 +11865,7 @@
 four&quot;
             </Expanded>
           </Expression>
-TestMain.cpp" line="442">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="442">
             <Original>
               Text( testString, TextAttributes().setWidth( 7 ) ).toString() == &quot;one two\nthree\nfour&quot;
             </Original>
@@ -11885,7 +11885,7 @@
       </Section>
       <Section name="With newlines">
         <Section name="Wrapped twice">
-TestMain.cpp" line="445">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="445">
             <Original>
               Text( testString, TextAttributes().setWidth( 6 ) ).toString() == &quot;one\ntwo\nthree\nfour&quot;
             </Original>
@@ -11909,7 +11909,7 @@
         <OverallResults successes="0" failures="0"/>
       </Section>
       <Section name="With tabs">
-TestMain.cpp" line="455">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="455">
           <Original>
             Text( testString, TextAttributes().setWidth( 15 ) ).toString() == &quot;one two three\n        four\n        five\n        six&quot;
           </Original>
@@ -11933,7 +11933,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Text can be formatted using the Text class">
-TestMain.cpp" line="555">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="555">
         <Original>
           Text( &quot;hi there&quot; ).toString() == &quot;hi there&quot;
         </Original>
@@ -11941,7 +11941,7 @@
           &quot;hi there&quot; == &quot;hi there&quot;
         </Expanded>
       </Expression>
-TestMain.cpp" line="560">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" line="560">
         <Original>
           Text( &quot;hi there&quot;, narrow ).toString() == &quot;hi\nthere&quot;
         </Original>
@@ -11956,7 +11956,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="./succeeding/Tricky/std::pair">
-TrickyTests.cpp" line="37">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TrickyTests.cpp" line="37">
         <Original>
           (std::pair&lt;int, int>( 1, 2 )) == aNicePair
         </Original>
@@ -11979,7 +11979,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="./failing/Tricky/non streamable type">
-TrickyTests.cpp" line="95">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TrickyTests.cpp" line="90">
         <Original>
           &amp;o1 == &amp;o2
         </Original>
@@ -11987,7 +11987,7 @@
           0x<hex digits> == 0x<hex digits>
         </Expanded>
       </Expression>
-TrickyTests.cpp" line="96">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TrickyTests.cpp" line="91">
         <Original>
           o1 == o2
         </Original>
@@ -11998,7 +11998,7 @@
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="./failing/string literals">
-TrickyTests.cpp" line="106">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TrickyTests.cpp" line="101">
         <Original>
           std::string( &quot;first&quot; ) == &quot;second&quot;
         </Original>
@@ -12009,7 +12009,7 @@
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="./succeeding/side-effects">
-TrickyTests.cpp" line="119">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TrickyTests.cpp" line="114">
         <Original>
           i++ == 7
         </Original>
@@ -12017,7 +12017,7 @@
           7 == 7
         </Expanded>
       </Expression>
-TrickyTests.cpp" line="120">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TrickyTests.cpp" line="115">
         <Original>
           i++ == 8
         </Original>
@@ -12028,7 +12028,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="./succeeding/koenig">
-TrickyTests.cpp" line="186">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TrickyTests.cpp" line="181">
         <Original>
           0x<hex digits> == o
         </Original>
@@ -12039,7 +12039,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="./succeeding/non-const==">
-TrickyTests.cpp" line="212">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TrickyTests.cpp" line="207">
         <Original>
           t == 1u
         </Original>
@@ -12050,7 +12050,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="./succeeding/enum/bits">
-TrickyTests.cpp" line="224">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TrickyTests.cpp" line="219">
         <Original>
           0x<hex digits> == bit30and31
         </Original>
@@ -12061,7 +12061,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="./succeeding/boolean member">
-TrickyTests.cpp" line="239">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TrickyTests.cpp" line="234">
         <Original>
           obj.prop != __null
         </Original>
@@ -12073,7 +12073,7 @@
     </TestCase>
     <TestCase name="./succeeding/unimplemented static bool">
       <Section name="compare to true">
-TrickyTests.cpp" line="259">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TrickyTests.cpp" line="254">
           <Original>
             is_true&lt;true>::value == true
           </Original>
@@ -12081,7 +12081,7 @@
             true == true
           </Expanded>
         </Expression>
-TrickyTests.cpp" line="260">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TrickyTests.cpp" line="255">
           <Original>
             true == is_true&lt;true>::value
           </Original>
@@ -12092,7 +12092,7 @@
         <OverallResults successes="2" failures="0"/>
       </Section>
       <Section name="compare to false">
-TrickyTests.cpp" line="264">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TrickyTests.cpp" line="259">
           <Original>
             is_true&lt;false>::value == false
           </Original>
@@ -12100,7 +12100,7 @@
             false == false
           </Expanded>
         </Expression>
-TrickyTests.cpp" line="265">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TrickyTests.cpp" line="260">
           <Original>
             false == is_true&lt;false>::value
           </Original>
@@ -12111,7 +12111,7 @@
         <OverallResults successes="2" failures="0"/>
       </Section>
       <Section name="negation">
-TrickyTests.cpp" line="270">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TrickyTests.cpp" line="265">
           <Original>
             !is_true&lt;false>::value
           </Original>
@@ -12122,7 +12122,7 @@
         <OverallResults successes="1" failures="0"/>
       </Section>
       <Section name="double negation">
-TrickyTests.cpp" line="275">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TrickyTests.cpp" line="270">
           <Original>
             !!is_true&lt;true>::value
           </Original>
@@ -12133,7 +12133,7 @@
         <OverallResults successes="1" failures="0"/>
       </Section>
       <Section name="direct">
-TrickyTests.cpp" line="280">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TrickyTests.cpp" line="275">
           <Original>
             is_true&lt;true>::value
           </Original>
@@ -12141,7 +12141,7 @@
             true
           </Expanded>
         </Expression>
-TrickyTests.cpp" line="281">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TrickyTests.cpp" line="276">
           <Original>
             !is_true&lt;false>::value
           </Original>
@@ -12154,7 +12154,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="./succeeding/SafeBool">
-TrickyTests.cpp" line="313">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TrickyTests.cpp" line="308">
         <Original>
           True
         </Original>
@@ -12162,7 +12162,7 @@
           true
         </Expanded>
       </Expression>
-TrickyTests.cpp" line="314">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TrickyTests.cpp" line="309">
         <Original>
           !False
         </Original>
@@ -12170,7 +12170,7 @@
           true
         </Expanded>
       </Expression>
-TrickyTests.cpp" line="315">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TrickyTests.cpp" line="310">
         <Original>
           !False
         </Original>
@@ -12181,7 +12181,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Assertions then sections">
-TrickyTests.cpp" line="323">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TrickyTests.cpp" line="318">
         <Original>
           Catch::isTrue( true )
         </Original>
@@ -12190,7 +12190,7 @@
         </Expanded>
       </Expression>
       <Section name="A section">
-TrickyTests.cpp" line="327">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TrickyTests.cpp" line="322">
           <Original>
             Catch::isTrue( true )
           </Original>
@@ -12199,7 +12199,7 @@
           </Expanded>
         </Expression>
         <Section name="Another section">
-TrickyTests.cpp" line="331">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TrickyTests.cpp" line="326">
             <Original>
               Catch::isTrue( true )
             </Original>
@@ -12211,7 +12211,7 @@
         </Section>
         <OverallResults successes="2" failures="0"/>
       </Section>
-TrickyTests.cpp" line="323">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TrickyTests.cpp" line="318">
         <Original>
           Catch::isTrue( true )
         </Original>
@@ -12220,7 +12220,7 @@
         </Expanded>
       </Expression>
       <Section name="A section">
-TrickyTests.cpp" line="327">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TrickyTests.cpp" line="322">
           <Original>
             Catch::isTrue( true )
           </Original>
@@ -12229,7 +12229,7 @@
           </Expanded>
         </Expression>
         <Section name="Another other section">
-TrickyTests.cpp" line="335">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TrickyTests.cpp" line="330">
             <Original>
               Catch::isTrue( true )
             </Original>
@@ -12244,7 +12244,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="non streamable - with conv. op">
-TrickyTests.cpp" line="349">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TrickyTests.cpp" line="344">
         <Original>
           s == &quot;7&quot;
         </Original>
@@ -12270,7 +12270,7 @@
       <Section name="   Given: This stuff exists">
         <Section name="    When: I do this">
           <Section name="    Then: it should do this">
-BDDTests.cpp" line="21">
+            <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/BDDTests.cpp" line="21">
               <Original>
                 itDoesThis()
               </Original>
@@ -12279,7 +12279,7 @@
               </Expanded>
             </Expression>
             <Section name="     And: do that">
-BDDTests.cpp" line="23">
+              <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/BDDTests.cpp" line="23">
                 <Original>
                   itDoesThat()
                 </Original>
@@ -12299,7 +12299,7 @@
     </TestCase>
     <TestCase name="Scenario: Vector resizing affects size and capacity">
       <Section name="   Given: an empty vector">
-BDDTests.cpp" line="32">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/BDDTests.cpp" line="32">
           <Original>
             v.size() == 0
           </Original>
@@ -12309,7 +12309,7 @@
         </Expression>
         <Section name="    When: it is made larger">
           <Section name="    Then: the size and capacity go up">
-BDDTests.cpp" line="37">
+            <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/BDDTests.cpp" line="37">
               <Original>
                 v.size() == 10
               </Original>
@@ -12317,7 +12317,7 @@
                 10 == 10
               </Expanded>
             </Expression>
-BDDTests.cpp" line="38">
+            <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/BDDTests.cpp" line="38">
               <Original>
                 v.capacity() >= 10
               </Original>
@@ -12327,7 +12327,7 @@
             </Expression>
             <Section name="And when: it is made smaller again">
               <Section name="    Then: the size goes down but the capacity stays the same">
-BDDTests.cpp" line="43">
+                <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/BDDTests.cpp" line="43">
                   <Original>
                     v.size() == 5
                   </Original>
@@ -12335,7 +12335,7 @@
                     5 == 5
                   </Expanded>
                 </Expression>
-BDDTests.cpp" line="44">
+                <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/BDDTests.cpp" line="44">
                   <Original>
                     v.capacity() >= 10
                   </Original>
@@ -12354,7 +12354,7 @@
         <OverallResults successes="5" failures="0"/>
       </Section>
       <Section name="   Given: an empty vector">
-BDDTests.cpp" line="32">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/BDDTests.cpp" line="32">
           <Original>
             v.size() == 0
           </Original>
@@ -12364,7 +12364,7 @@
         </Expression>
         <Section name="    When: it is made larger">
           <Section name="    Then: the size and capacity go up">
-BDDTests.cpp" line="37">
+            <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/BDDTests.cpp" line="37">
               <Original>
                 v.size() == 10
               </Original>
@@ -12372,7 +12372,7 @@
                 10 == 10
               </Expanded>
             </Expression>
-BDDTests.cpp" line="38">
+            <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/BDDTests.cpp" line="38">
               <Original>
                 v.capacity() >= 10
               </Original>
@@ -12390,7 +12390,7 @@
         <OverallResults successes="3" failures="0"/>
       </Section>
       <Section name="   Given: an empty vector">
-BDDTests.cpp" line="32">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/BDDTests.cpp" line="32">
           <Original>
             v.size() == 0
           </Original>
@@ -12400,7 +12400,7 @@
         </Expression>
         <Section name="    When: it is made larger">
           <Section name="    Then: the size and capacity go up">
-BDDTests.cpp" line="37">
+            <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/BDDTests.cpp" line="37">
               <Original>
                 v.size() == 10
               </Original>
@@ -12408,7 +12408,7 @@
                 10 == 10
               </Expanded>
             </Expression>
-BDDTests.cpp" line="38">
+            <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/BDDTests.cpp" line="38">
               <Original>
                 v.capacity() >= 10
               </Original>
@@ -12423,7 +12423,7 @@
         <OverallResults successes="3" failures="0"/>
       </Section>
       <Section name="   Given: an empty vector">
-BDDTests.cpp" line="32">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/BDDTests.cpp" line="32">
           <Original>
             v.size() == 0
           </Original>
@@ -12437,7 +12437,7 @@
         <OverallResults successes="1" failures="0"/>
       </Section>
       <Section name="   Given: an empty vector">
-BDDTests.cpp" line="32">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/BDDTests.cpp" line="32">
           <Original>
             v.size() == 0
           </Original>
@@ -12447,7 +12447,7 @@
         </Expression>
         <Section name="    When: we reserve more space">
           <Section name="    Then: The capacity is increased but the size remains the same">
-BDDTests.cpp" line="53">
+            <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/BDDTests.cpp" line="53">
               <Original>
                 v.capacity() >= 10
               </Original>
@@ -12455,7 +12455,7 @@
                 10 >= 10
               </Expanded>
             </Expression>
-BDDTests.cpp" line="54">
+            <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/BDDTests.cpp" line="54">
               <Original>
                 v.size() == 0
               </Original>
@@ -12485,7 +12485,7 @@
     </TestCase>
     <TestCase name="cmdline">
       <Section name="process name">
-CmdLineTests.cpp" line="64">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/CmdLineTests.cpp" line="64">
           <Original>
             config.processName == &quot;test&quot;
           </Original>
@@ -12496,7 +12496,7 @@
         <OverallResults successes="1" failures="0"/>
       </Section>
       <Section name="arg separated by spaces">
-CmdLineTests.cpp" line="70">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/CmdLineTests.cpp" line="70">
           <Original>
             config.fileName == &quot;filename.ext&quot;
           </Original>
@@ -12507,7 +12507,7 @@
         <OverallResults successes="1" failures="0"/>
       </Section>
       <Section name="arg separated by colon">
-CmdLineTests.cpp" line="76">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/CmdLineTests.cpp" line="76">
           <Original>
             config.fileName == &quot;filename.ext&quot;
           </Original>
@@ -12518,7 +12518,7 @@
         <OverallResults successes="1" failures="0"/>
       </Section>
       <Section name="arg separated by =">
-CmdLineTests.cpp" line="82">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/CmdLineTests.cpp" line="82">
           <Original>
             config.fileName == &quot;filename.ext&quot;
           </Original>
@@ -12529,7 +12529,7 @@
         <OverallResults successes="1" failures="0"/>
       </Section>
       <Section name="long opt">
-CmdLineTests.cpp" line="88">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/CmdLineTests.cpp" line="88">
           <Original>
             config.fileName == &quot;%stdout&quot;
           </Original>
@@ -12540,7 +12540,7 @@
         <OverallResults successes="1" failures="0"/>
       </Section>
       <Section name="a number">
-CmdLineTests.cpp" line="99">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/CmdLineTests.cpp" line="99">
           <Original>
             config.number == 42
           </Original>
@@ -12551,7 +12551,7 @@
         <OverallResults successes="1" failures="0"/>
       </Section>
       <Section name="not a number">
-CmdLineTests.cpp" line="103">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/CmdLineTests.cpp" line="103">
           <Original>
             parseInto( cli, argv, config )
           </Original>
@@ -12559,7 +12559,7 @@
             parseInto( cli, argv, config )
           </Expanded>
         </Expression>
-CmdLineTests.cpp" line="105">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/CmdLineTests.cpp" line="105">
           <Original>
             config.number == 0
           </Original>
@@ -12570,7 +12570,7 @@
         <OverallResults successes="2" failures="0"/>
       </Section>
       <Section name="two parsers">
-CmdLineTests.cpp" line="123">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/CmdLineTests.cpp" line="123">
           <Original>
             config1.number == 42
           </Original>
@@ -12578,7 +12578,7 @@
             42 == 42
           </Expanded>
         </Expression>
-CmdLineTests.cpp" line="125">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/CmdLineTests.cpp" line="125">
           <Original>
             !unusedTokens.empty()
           </Original>
@@ -12586,7 +12586,7 @@
             !false
           </Expanded>
         </Expression>
-CmdLineTests.cpp" line="127">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/CmdLineTests.cpp" line="127">
           <Original>
             config2.description == &quot;some text&quot;
           </Original>
@@ -12598,7 +12598,7 @@
       </Section>
       <Section name="methods">
         <Section name="in range">
-CmdLineTests.cpp" line="140">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/CmdLineTests.cpp" line="140">
             <Original>
               config.index == 3
             </Original>
@@ -12612,7 +12612,7 @@
       </Section>
       <Section name="methods">
         <Section name="out of range">
-CmdLineTests.cpp" line="145">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/CmdLineTests.cpp" line="145">
             <Original>
               parseInto( cli, argv, config )
             </Original>
@@ -12629,7 +12629,7 @@
       </Section>
       <Section name="flags">
         <Section name="set">
-CmdLineTests.cpp" line="158">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/CmdLineTests.cpp" line="158">
             <Original>
               config.flag
             </Original>
@@ -12643,7 +12643,7 @@
       </Section>
       <Section name="flags">
         <Section name="not set">
-CmdLineTests.cpp" line="164">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/CmdLineTests.cpp" line="164">
             <Original>
               config.flag == false
             </Original>
@@ -12659,7 +12659,7 @@
         <OverallResults successes="0" failures="0"/>
       </Section>
       <Section name="positional">
-CmdLineTests.cpp" line="185">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/CmdLineTests.cpp" line="185">
           <Original>
             config.firstPos == &quot;1st&quot;
           </Original>
@@ -12667,7 +12667,7 @@
             &quot;1st&quot; == &quot;1st&quot;
           </Expanded>
         </Expression>
-CmdLineTests.cpp" line="186">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/CmdLineTests.cpp" line="186">
           <Original>
             config.secondPos == &quot;2nd&quot;
           </Original>
@@ -12675,7 +12675,7 @@
             &quot;2nd&quot; == &quot;2nd&quot;
           </Expanded>
         </Expression>
-CmdLineTests.cpp" line="187">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/CmdLineTests.cpp" line="187">
           <Original>
             config.unpositional == &quot;3rd&quot;
           </Original>
@@ -12695,266 +12695,266 @@
 [Started group: '~dummy']
 
 [Running: ./succeeding/Approx/simple]
-ApproxTests.cpp:20: d == Approx( 1.23 ) succeeded for: 1.23 == Approx( 1.23 )
-ApproxTests.cpp:21: d != Approx( 1.22 ) succeeded for: 1.23 != Approx( 1.22 )
-ApproxTests.cpp:22: d != Approx( 1.24 ) succeeded for: 1.23 != Approx( 1.24 )
-ApproxTests.cpp:24: Approx( d ) == 1.23 succeeded for: Approx( 1.23 ) == 1.23
-ApproxTests.cpp:25: Approx( d ) != 1.22 succeeded for: Approx( 1.23 ) != 1.22
-ApproxTests.cpp:26: Approx( d ) != 1.24 succeeded for: Approx( 1.23 ) != 1.24
+ApproxTests.cpp: d == Approx( 1.23 ) succeeded for: 1.23 == Approx( 1.23 )
+ApproxTests.cpp: d != Approx( 1.22 ) succeeded for: 1.23 != Approx( 1.22 )
+ApproxTests.cpp: d != Approx( 1.24 ) succeeded for: 1.23 != Approx( 1.24 )
+ApproxTests.cpp: Approx( d ) == 1.23 succeeded for: Approx( 1.23 ) == 1.23
+ApproxTests.cpp: Approx( d ) != 1.22 succeeded for: Approx( 1.23 ) != 1.22
+ApproxTests.cpp: Approx( d ) != 1.24 succeeded for: Approx( 1.23 ) != 1.24
 [Finished: './succeeding/Approx/simple' All tests passed (6 assertions in 1 test case)]
 
 [Running: ./succeeding/Approx/epsilon]
-ApproxTests.cpp:38: d != Approx( 1.231 ) succeeded for: 1.23 != Approx( 1.231 )
-ApproxTests.cpp:39: d == Approx( 1.231 ).epsilon( 0.1 ) succeeded for: 1.23 == Approx( 1.231 )
+ApproxTests.cpp: d != Approx( 1.231 ) succeeded for: 1.23 != Approx( 1.231 )
+ApproxTests.cpp: d == Approx( 1.231 ).epsilon( 0.1 ) succeeded for: 1.23 == Approx( 1.231 )
 [Finished: './succeeding/Approx/epsilon' All tests passed (2 assertions in 1 test case)]
 
 [Running: ./succeeding/Approx/float]
-ApproxTests.cpp:49: 1.23f == Approx( 1.23f ) succeeded for: 1.23 == Approx( 1.23 )
-ApproxTests.cpp:50: 0.0f == Approx( 0.0f ) succeeded for: 0 == Approx( 0 )
+ApproxTests.cpp: 1.23f == Approx( 1.23f ) succeeded for: 1.23 == Approx( 1.23 )
+ApproxTests.cpp: 0.0f == Approx( 0.0f ) succeeded for: 0 == Approx( 0 )
 [Finished: './succeeding/Approx/float' All tests passed (2 assertions in 1 test case)]
 
 [Running: ./succeeding/Approx/int]
-ApproxTests.cpp:60: 1 == Approx( 1 ) succeeded
-ApproxTests.cpp:61: 0 == Approx( 0 ) succeeded
+ApproxTests.cpp: 1 == Approx( 1 ) succeeded
+ApproxTests.cpp: 0 == Approx( 0 ) succeeded
 [Finished: './succeeding/Approx/int' All tests passed (2 assertions in 1 test case)]
 
 [Running: ./succeeding/Approx/mixed]
-ApproxTests.cpp:75: 1.0f == Approx( 1 ) succeeded for: 1 == Approx( 1 )
-ApproxTests.cpp:76: 0 == Approx( dZero) succeeded for: 0 == Approx( 0 )
-ApproxTests.cpp:77: 0 == Approx( dSmall ).epsilon( 0.001 ) succeeded for: 0 == Approx( 1e-05 )
-ApproxTests.cpp:78: 1.234f == Approx( dMedium ) succeeded for: 1.234 == Approx( 1.234 )
-ApproxTests.cpp:79: dMedium == Approx( 1.234f ) succeeded for: 1.234 == Approx( 1.234 )
+ApproxTests.cpp: 1.0f == Approx( 1 ) succeeded for: 1 == Approx( 1 )
+ApproxTests.cpp: 0 == Approx( dZero) succeeded for: 0 == Approx( 0 )
+ApproxTests.cpp: 0 == Approx( dSmall ).epsilon( 0.001 ) succeeded for: 0 == Approx( 1e-05 )
+ApproxTests.cpp: 1.234f == Approx( dMedium ) succeeded for: 1.234 == Approx( 1.234 )
+ApproxTests.cpp: dMedium == Approx( 1.234f ) succeeded for: 1.234 == Approx( 1.234 )
 [Finished: './succeeding/Approx/mixed' All tests passed (5 assertions in 1 test case)]
 
 [Running: ./succeeding/Approx/custom]
-ApproxTests.cpp:93: d == approx( 1.23 ) succeeded for: 1.23 == Approx( 1.23 )
-ApproxTests.cpp:94: d == approx( 1.22 ) succeeded for: 1.23 == Approx( 1.22 )
-ApproxTests.cpp:95: d == approx( 1.24 ) succeeded for: 1.23 == Approx( 1.24 )
-ApproxTests.cpp:96: d != approx( 1.25 ) succeeded for: 1.23 != Approx( 1.25 )
-ApproxTests.cpp:98: approx( d ) == 1.23 succeeded for: Approx( 1.23 ) == 1.23
-ApproxTests.cpp:99: approx( d ) == 1.22 succeeded for: Approx( 1.23 ) == 1.22
-ApproxTests.cpp:100: approx( d ) == 1.24 succeeded for: Approx( 1.23 ) == 1.24
-ApproxTests.cpp:101: approx( d ) != 1.25 succeeded for: Approx( 1.23 ) != 1.25
+ApproxTests.cpp: d == approx( 1.23 ) succeeded for: 1.23 == Approx( 1.23 )
+ApproxTests.cpp: d == approx( 1.22 ) succeeded for: 1.23 == Approx( 1.22 )
+ApproxTests.cpp: d == approx( 1.24 ) succeeded for: 1.23 == Approx( 1.24 )
+ApproxTests.cpp: d != approx( 1.25 ) succeeded for: 1.23 != Approx( 1.25 )
+ApproxTests.cpp: approx( d ) == 1.23 succeeded for: Approx( 1.23 ) == 1.23
+ApproxTests.cpp: approx( d ) == 1.22 succeeded for: Approx( 1.23 ) == 1.22
+ApproxTests.cpp: approx( d ) == 1.24 succeeded for: Approx( 1.23 ) == 1.24
+ApproxTests.cpp: approx( d ) != 1.25 succeeded for: Approx( 1.23 ) != 1.25
 [Finished: './succeeding/Approx/custom' All tests passed (8 assertions in 1 test case)]
 
 [Running: Approximate PI]
-ApproxTests.cpp:110: divide( 22, 7 ) == Approx( 3.141 ).epsilon( 0.001 ) succeeded for: 3.142857142857143 == Approx( 3.141 )
-ApproxTests.cpp:111: divide( 22, 7 ) != Approx( 3.141 ).epsilon( 0.0001 ) succeeded for: 3.142857142857143 != Approx( 3.141 )
+ApproxTests.cpp: divide( 22, 7 ) == Approx( 3.141 ).epsilon( 0.001 ) succeeded for: 3.142857142857143 == Approx( 3.141 )
+ApproxTests.cpp: divide( 22, 7 ) != Approx( 3.141 ).epsilon( 0.0001 ) succeeded for: 3.142857142857143 != Approx( 3.141 )
 [Finished: 'Approximate PI' All tests passed (2 assertions in 1 test case)]
 
 [Running: ./succeeding/TestClass/succeedingCase]
-ClassTests.cpp:24: s == "hello" succeeded for: "hello" == "hello"
+ClassTests.cpp: s == "hello" succeeded for: "hello" == "hello"
 [Finished: './succeeding/TestClass/succeedingCase' All tests passed (1 assertion in 1 test case)]
 
 [Running: ./failing/TestClass/failingCase]
-ClassTests.cpp:28: s == "world" failed for: "hello" == "world"
+ClassTests.cpp: s == "world" failed for: "hello" == "world"
 [Finished: './failing/TestClass/failingCase' 1 test case failed (1 assertion failed)]
 
 [Running: ./succeeding/Fixture/succeedingCase]
-ClassTests.cpp:47: m_a == 1 succeeded for: 1 == 1
+ClassTests.cpp: m_a == 1 succeeded for: 1 == 1
 [Finished: './succeeding/Fixture/succeedingCase' All tests passed (1 assertion in 1 test case)]
 
 [Running: ./failing/Fixture/failingCase]
-ClassTests.cpp:55: m_a == 2 failed for: 1 == 2
+ClassTests.cpp: m_a == 2 failed for: 1 == 2
 [Finished: './failing/Fixture/failingCase' 1 test case failed (1 assertion failed)]
 
 [Running: ./succeeding/conditions/equality]
-ConditionTests.cpp:55: data.int_seven == 7 succeeded for: 7 == 7
-ConditionTests.cpp:56: data.float_nine_point_one == Approx( 9.1f ) succeeded for: 9.1 == Approx( 9.1 )
-ConditionTests.cpp:57: data.double_pi == Approx( 3.1415926535 ) succeeded for: 3.1415926535 == Approx( 3.14159 )
-ConditionTests.cpp:58: data.str_hello == "hello" succeeded for: "hello" == "hello"
-ConditionTests.cpp:59: "hello" == data.str_hello succeeded for: "hello" == "hello"
-ConditionTests.cpp:60: data.str_hello.size() == 5 succeeded for: 5 == 5
-ConditionTests.cpp:63: x == Approx( 1.3 ) succeeded for: 1.3 == Approx( 1.3 )
+ConditionTests.cpp: data.int_seven == 7 succeeded for: 7 == 7
+ConditionTests.cpp: data.float_nine_point_one == Approx( 9.1f ) succeeded for: 9.1 == Approx( 9.1 )
+ConditionTests.cpp: data.double_pi == Approx( 3.1415926535 ) succeeded for: 3.1415926535 == Approx( 3.14159 )
+ConditionTests.cpp: data.str_hello == "hello" succeeded for: "hello" == "hello"
+ConditionTests.cpp: "hello" == data.str_hello succeeded for: "hello" == "hello"
+ConditionTests.cpp: data.str_hello.size() == 5 succeeded for: 5 == 5
+ConditionTests.cpp: x == Approx( 1.3 ) succeeded for: 1.3 == Approx( 1.3 )
 [Finished: './succeeding/conditions/equality' All tests passed (7 assertions in 1 test case)]
 
 [Running: ./failing/conditions/equality]
-ConditionTests.cpp:71: data.int_seven == 6 failed for: 7 == 6
-ConditionTests.cpp:72: data.int_seven == 8 failed for: 7 == 8
-ConditionTests.cpp:73: data.int_seven == 0 failed for: 7 == 0
-ConditionTests.cpp:74: data.float_nine_point_one == Approx( 9.11f ) failed for: 9.1 == Approx( 9.11 )
-ConditionTests.cpp:75: data.float_nine_point_one == Approx( 9.0f ) failed for: 9.1 == Approx( 9 )
-ConditionTests.cpp:76: data.float_nine_point_one == Approx( 1 ) failed for: 9.1 == Approx( 1 )
-ConditionTests.cpp:77: data.float_nine_point_one == Approx( 0 ) failed for: 9.1 == Approx( 0 )
-ConditionTests.cpp:78: data.double_pi == Approx( 3.1415 ) failed for: 3.1415926535 == Approx( 3.1415 )
-ConditionTests.cpp:79: data.str_hello == "goodbye" failed for: "hello" == "goodbye"
-ConditionTests.cpp:80: data.str_hello == "hell" failed for: "hello" == "hell"
-ConditionTests.cpp:81: data.str_hello == "hello1" failed for: "hello" == "hello1"
-ConditionTests.cpp:82: data.str_hello.size() == 6 failed for: 5 == 6
-ConditionTests.cpp:85: x == Approx( 1.301 ) failed for: 1.3 == Approx( 1.301 )
+ConditionTests.cpp: data.int_seven == 6 failed for: 7 == 6
+ConditionTests.cpp: data.int_seven == 8 failed for: 7 == 8
+ConditionTests.cpp: data.int_seven == 0 failed for: 7 == 0
+ConditionTests.cpp: data.float_nine_point_one == Approx( 9.11f ) failed for: 9.1 == Approx( 9.11 )
+ConditionTests.cpp: data.float_nine_point_one == Approx( 9.0f ) failed for: 9.1 == Approx( 9 )
+ConditionTests.cpp: data.float_nine_point_one == Approx( 1 ) failed for: 9.1 == Approx( 1 )
+ConditionTests.cpp: data.float_nine_point_one == Approx( 0 ) failed for: 9.1 == Approx( 0 )
+ConditionTests.cpp: data.double_pi == Approx( 3.1415 ) failed for: 3.1415926535 == Approx( 3.1415 )
+ConditionTests.cpp: data.str_hello == "goodbye" failed for: "hello" == "goodbye"
+ConditionTests.cpp: data.str_hello == "hell" failed for: "hello" == "hell"
+ConditionTests.cpp: data.str_hello == "hello1" failed for: "hello" == "hello1"
+ConditionTests.cpp: data.str_hello.size() == 6 failed for: 5 == 6
+ConditionTests.cpp: x == Approx( 1.301 ) failed for: 1.3 == Approx( 1.301 )
 [Finished: './failing/conditions/equality' 1 test case failed (All 13 assertions failed)]
 
 [Running: ./succeeding/conditions/inequality]
-ConditionTests.cpp:93: data.int_seven != 6 succeeded for: 7 != 6
-ConditionTests.cpp:94: data.int_seven != 8 succeeded for: 7 != 8
-ConditionTests.cpp:95: data.float_nine_point_one != Approx( 9.11f ) succeeded for: 9.1 != Approx( 9.11 )
-ConditionTests.cpp:96: data.float_nine_point_one != Approx( 9.0f ) succeeded for: 9.1 != Approx( 9 )
-ConditionTests.cpp:97: data.float_nine_point_one != Approx( 1 ) succeeded for: 9.1 != Approx( 1 )
-ConditionTests.cpp:98: data.float_nine_point_one != Approx( 0 ) succeeded for: 9.1 != Approx( 0 )
-ConditionTests.cpp:99: data.double_pi != Approx( 3.1415 ) succeeded for: 3.1415926535 != Approx( 3.1415 )
-ConditionTests.cpp:100: data.str_hello != "goodbye" succeeded for: "hello" != "goodbye"
-ConditionTests.cpp:101: data.str_hello != "hell" succeeded for: "hello" != "hell"
-ConditionTests.cpp:102: data.str_hello != "hello1" succeeded for: "hello" != "hello1"
-ConditionTests.cpp:103: data.str_hello.size() != 6 succeeded for: 5 != 6
+ConditionTests.cpp: data.int_seven != 6 succeeded for: 7 != 6
+ConditionTests.cpp: data.int_seven != 8 succeeded for: 7 != 8
+ConditionTests.cpp: data.float_nine_point_one != Approx( 9.11f ) succeeded for: 9.1 != Approx( 9.11 )
+ConditionTests.cpp: data.float_nine_point_one != Approx( 9.0f ) succeeded for: 9.1 != Approx( 9 )
+ConditionTests.cpp: data.float_nine_point_one != Approx( 1 ) succeeded for: 9.1 != Approx( 1 )
+ConditionTests.cpp: data.float_nine_point_one != Approx( 0 ) succeeded for: 9.1 != Approx( 0 )
+ConditionTests.cpp: data.double_pi != Approx( 3.1415 ) succeeded for: 3.1415926535 != Approx( 3.1415 )
+ConditionTests.cpp: data.str_hello != "goodbye" succeeded for: "hello" != "goodbye"
+ConditionTests.cpp: data.str_hello != "hell" succeeded for: "hello" != "hell"
+ConditionTests.cpp: data.str_hello != "hello1" succeeded for: "hello" != "hello1"
+ConditionTests.cpp: data.str_hello.size() != 6 succeeded for: 5 != 6
 [Finished: './succeeding/conditions/inequality' All tests passed (11 assertions in 1 test case)]
 
 [Running: ./failing/conditions/inequality]
-ConditionTests.cpp:111: data.int_seven != 7 failed for: 7 != 7
-ConditionTests.cpp:112: data.float_nine_point_one != Approx( 9.1f ) failed for: 9.1 != Approx( 9.1 )
-ConditionTests.cpp:113: data.double_pi != Approx( 3.1415926535 ) failed for: 3.1415926535 != Approx( 3.14159 )
-ConditionTests.cpp:114: data.str_hello != "hello" failed for: "hello" != "hello"
-ConditionTests.cpp:115: data.str_hello.size() != 5 failed for: 5 != 5
+ConditionTests.cpp: data.int_seven != 7 failed for: 7 != 7
+ConditionTests.cpp: data.float_nine_point_one != Approx( 9.1f ) failed for: 9.1 != Approx( 9.1 )
+ConditionTests.cpp: data.double_pi != Approx( 3.1415926535 ) failed for: 3.1415926535 != Approx( 3.14159 )
+ConditionTests.cpp: data.str_hello != "hello" failed for: "hello" != "hello"
+ConditionTests.cpp: data.str_hello.size() != 5 failed for: 5 != 5
 [Finished: './failing/conditions/inequality' 1 test case failed (All 5 assertions failed)]
 
 [Running: ./succeeding/conditions/ordered]
-ConditionTests.cpp:124: data.int_seven < 8 succeeded for: 7 < 8
-ConditionTests.cpp:125: data.int_seven > 6 succeeded for: 7 > 6
-ConditionTests.cpp:126: data.int_seven > 0 succeeded for: 7 > 0
-ConditionTests.cpp:127: data.int_seven > -1 succeeded for: 7 > -1
-ConditionTests.cpp:129: data.int_seven >= 7 succeeded for: 7 >= 7
-ConditionTests.cpp:130: data.int_seven >= 6 succeeded for: 7 >= 6
-ConditionTests.cpp:131: data.int_seven <= 7 succeeded for: 7 <= 7
-ConditionTests.cpp:132: data.int_seven <= 8 succeeded for: 7 <= 8
-ConditionTests.cpp:134: data.float_nine_point_one > 9 succeeded for: 9.1 > 9
-ConditionTests.cpp:135: data.float_nine_point_one < 10 succeeded for: 9.1 < 10
-ConditionTests.cpp:136: data.float_nine_point_one < 9.2 succeeded for: 9.1 < 9.199999999999999
-ConditionTests.cpp:138: data.str_hello <= "hello" succeeded for: "hello" <= "hello"
-ConditionTests.cpp:139: data.str_hello >= "hello" succeeded for: "hello" >= "hello"
-ConditionTests.cpp:141: data.str_hello < "hellp" succeeded for: "hello" < "hellp"
-ConditionTests.cpp:142: data.str_hello < "zebra" succeeded for: "hello" < "zebra"
-ConditionTests.cpp:143: data.str_hello > "hellm" succeeded for: "hello" > "hellm"
-ConditionTests.cpp:144: data.str_hello > "a" succeeded for: "hello" > "a"
+ConditionTests.cpp: data.int_seven < 8 succeeded for: 7 < 8
+ConditionTests.cpp: data.int_seven > 6 succeeded for: 7 > 6
+ConditionTests.cpp: data.int_seven > 0 succeeded for: 7 > 0
+ConditionTests.cpp: data.int_seven > -1 succeeded for: 7 > -1
+ConditionTests.cpp: data.int_seven >= 7 succeeded for: 7 >= 7
+ConditionTests.cpp: data.int_seven >= 6 succeeded for: 7 >= 6
+ConditionTests.cpp: data.int_seven <= 7 succeeded for: 7 <= 7
+ConditionTests.cpp: data.int_seven <= 8 succeeded for: 7 <= 8
+ConditionTests.cpp: data.float_nine_point_one > 9 succeeded for: 9.1 > 9
+ConditionTests.cpp: data.float_nine_point_one < 10 succeeded for: 9.1 < 10
+ConditionTests.cpp: data.float_nine_point_one < 9.2 succeeded for: 9.1 < 9.199999999999999
+ConditionTests.cpp: data.str_hello <= "hello" succeeded for: "hello" <= "hello"
+ConditionTests.cpp: data.str_hello >= "hello" succeeded for: "hello" >= "hello"
+ConditionTests.cpp: data.str_hello < "hellp" succeeded for: "hello" < "hellp"
+ConditionTests.cpp: data.str_hello < "zebra" succeeded for: "hello" < "zebra"
+ConditionTests.cpp: data.str_hello > "hellm" succeeded for: "hello" > "hellm"
+ConditionTests.cpp: data.str_hello > "a" succeeded for: "hello" > "a"
 [Finished: './succeeding/conditions/ordered' All tests passed (17 assertions in 1 test case)]
 
 [Running: ./failing/conditions/ordered]
-ConditionTests.cpp:152: data.int_seven > 7 failed for: 7 > 7
-ConditionTests.cpp:153: data.int_seven < 7 failed for: 7 < 7
-ConditionTests.cpp:154: data.int_seven > 8 failed for: 7 > 8
-ConditionTests.cpp:155: data.int_seven < 6 failed for: 7 < 6
-ConditionTests.cpp:156: data.int_seven < 0 failed for: 7 < 0
-ConditionTests.cpp:157: data.int_seven < -1 failed for: 7 < -1
-ConditionTests.cpp:159: data.int_seven >= 8 failed for: 7 >= 8
-ConditionTests.cpp:160: data.int_seven <= 6 failed for: 7 <= 6
-ConditionTests.cpp:162: data.float_nine_point_one < 9 failed for: 9.1 < 9
-ConditionTests.cpp:163: data.float_nine_point_one > 10 failed for: 9.1 > 10
-ConditionTests.cpp:164: data.float_nine_point_one > 9.2 failed for: 9.1 > 9.199999999999999
-ConditionTests.cpp:166: data.str_hello > "hello" failed for: "hello" > "hello"
-ConditionTests.cpp:167: data.str_hello < "hello" failed for: "hello" < "hello"
-ConditionTests.cpp:168: data.str_hello > "hellp" failed for: "hello" > "hellp"
-ConditionTests.cpp:169: data.str_hello > "z" failed for: "hello" > "z"
-ConditionTests.cpp:170: data.str_hello < "hellm" failed for: "hello" < "hellm"
-ConditionTests.cpp:171: data.str_hello < "a" failed for: "hello" < "a"
-ConditionTests.cpp:173: data.str_hello >= "z" failed for: "hello" >= "z"
-ConditionTests.cpp:174: data.str_hello <= "a" failed for: "hello" <= "a"
+ConditionTests.cpp: data.int_seven > 7 failed for: 7 > 7
+ConditionTests.cpp: data.int_seven < 7 failed for: 7 < 7
+ConditionTests.cpp: data.int_seven > 8 failed for: 7 > 8
+ConditionTests.cpp: data.int_seven < 6 failed for: 7 < 6
+ConditionTests.cpp: data.int_seven < 0 failed for: 7 < 0
+ConditionTests.cpp: data.int_seven < -1 failed for: 7 < -1
+ConditionTests.cpp: data.int_seven >= 8 failed for: 7 >= 8
+ConditionTests.cpp: data.int_seven <= 6 failed for: 7 <= 6
+ConditionTests.cpp: data.float_nine_point_one < 9 failed for: 9.1 < 9
+ConditionTests.cpp: data.float_nine_point_one > 10 failed for: 9.1 > 10
+ConditionTests.cpp: data.float_nine_point_one > 9.2 failed for: 9.1 > 9.199999999999999
+ConditionTests.cpp: data.str_hello > "hello" failed for: "hello" > "hello"
+ConditionTests.cpp: data.str_hello < "hello" failed for: "hello" < "hello"
+ConditionTests.cpp: data.str_hello > "hellp" failed for: "hello" > "hellp"
+ConditionTests.cpp: data.str_hello > "z" failed for: "hello" > "z"
+ConditionTests.cpp: data.str_hello < "hellm" failed for: "hello" < "hellm"
+ConditionTests.cpp: data.str_hello < "a" failed for: "hello" < "a"
+ConditionTests.cpp: data.str_hello >= "z" failed for: "hello" >= "z"
+ConditionTests.cpp: data.str_hello <= "a" failed for: "hello" <= "a"
 [Finished: './failing/conditions/ordered' 1 test case failed (All 19 assertions failed)]
 
 [Running: ./succeeding/conditions/int literals]
-ConditionTests.cpp:188: i == 1 succeeded for: 1 == 1
-ConditionTests.cpp:189: ui == 2 succeeded for: 2 == 2
-ConditionTests.cpp:190: l == 3 succeeded for: 3 == 3
-ConditionTests.cpp:191: ul == 4 succeeded for: 4 == 4
-ConditionTests.cpp:192: c == 5 succeeded for: 5 == 5
-ConditionTests.cpp:193: uc == 6 succeeded for: 6 == 6
-ConditionTests.cpp:195: 1 == i succeeded for: 1 == 1
-ConditionTests.cpp:196: 2 == ui succeeded for: 2 == 2
-ConditionTests.cpp:197: 3 == l succeeded for: 3 == 3
-ConditionTests.cpp:198: 4 == ul succeeded for: 4 == 4
-ConditionTests.cpp:199: 5 == c succeeded for: 5 == 5
-ConditionTests.cpp:200: 6 == uc succeeded for: 6 == 6
-ConditionTests.cpp:202: (std::numeric_limits<unsigned long>::max)() > ul succeeded for: 0x<hex digits> > 4
+ConditionTests.cpp: i == 1 succeeded for: 1 == 1
+ConditionTests.cpp: ui == 2 succeeded for: 2 == 2
+ConditionTests.cpp: l == 3 succeeded for: 3 == 3
+ConditionTests.cpp: ul == 4 succeeded for: 4 == 4
+ConditionTests.cpp: c == 5 succeeded for: 5 == 5
+ConditionTests.cpp: uc == 6 succeeded for: 6 == 6
+ConditionTests.cpp: 1 == i succeeded for: 1 == 1
+ConditionTests.cpp: 2 == ui succeeded for: 2 == 2
+ConditionTests.cpp: 3 == l succeeded for: 3 == 3
+ConditionTests.cpp: 4 == ul succeeded for: 4 == 4
+ConditionTests.cpp: 5 == c succeeded for: 5 == 5
+ConditionTests.cpp: 6 == uc succeeded for: 6 == 6
+ConditionTests.cpp: (std::numeric_limits<unsigned long>::max)() > ul succeeded for: 0x<hex digits> > 4
 [Finished: './succeeding/conditions/int literals' All tests passed (13 assertions in 1 test case)]
 
 [Running: ./succeeding/conditions//long_to_unsigned_x]
-ConditionTests.cpp:226: long_var == unsigned_char_var succeeded for: 1 == 1
-ConditionTests.cpp:227: long_var == unsigned_short_var succeeded for: 1 == 1
-ConditionTests.cpp:228: long_var == unsigned_int_var succeeded for: 1 == 1
-ConditionTests.cpp:229: long_var == unsigned_long_var succeeded for: 1 == 1
+ConditionTests.cpp: long_var == unsigned_char_var succeeded for: 1 == 1
+ConditionTests.cpp: long_var == unsigned_short_var succeeded for: 1 == 1
+ConditionTests.cpp: long_var == unsigned_int_var succeeded for: 1 == 1
+ConditionTests.cpp: long_var == unsigned_long_var succeeded for: 1 == 1
 [Finished: './succeeding/conditions//long_to_unsigned_x' All tests passed (4 assertions in 1 test case)]
 
 [Running: ./succeeding/conditions/const ints to int literal]
-ConditionTests.cpp:240: unsigned_char_var == 1 succeeded for: 1 == 1
-ConditionTests.cpp:241: unsigned_short_var == 1 succeeded for: 1 == 1
-ConditionTests.cpp:242: unsigned_int_var == 1 succeeded for: 1 == 1
-ConditionTests.cpp:243: unsigned_long_var == 1 succeeded for: 1 == 1
+ConditionTests.cpp: unsigned_char_var == 1 succeeded for: 1 == 1
+ConditionTests.cpp: unsigned_short_var == 1 succeeded for: 1 == 1
+ConditionTests.cpp: unsigned_int_var == 1 succeeded for: 1 == 1
+ConditionTests.cpp: unsigned_long_var == 1 succeeded for: 1 == 1
 [Finished: './succeeding/conditions/const ints to int literal' All tests passed (4 assertions in 1 test case)]
 
 [Running: ./succeeding/conditions/negative ints]
-ConditionTests.cpp:249: ( -1 > 2u ) succeeded for: true
-ConditionTests.cpp:250: -1 > 2u succeeded for: -1 > 2
-ConditionTests.cpp:252: ( 2u < -1 ) succeeded for: true
-ConditionTests.cpp:253: 2u < -1 succeeded for: 2 < -1
-ConditionTests.cpp:256: ( minInt > 2u ) succeeded for: true
-ConditionTests.cpp:257: minInt > 2u succeeded for: -2147483648 > 2
+ConditionTests.cpp: ( -1 > 2u ) succeeded for: true
+ConditionTests.cpp: -1 > 2u succeeded for: -1 > 2
+ConditionTests.cpp: ( 2u < -1 ) succeeded for: true
+ConditionTests.cpp: 2u < -1 succeeded for: 2 < -1
+ConditionTests.cpp: ( minInt > 2u ) succeeded for: true
+ConditionTests.cpp: minInt > 2u succeeded for: -2147483648 > 2
 [Finished: './succeeding/conditions/negative ints' All tests passed (6 assertions in 1 test case)]
 
 [Running: ./succeeding/conditions/computed ints]
-ConditionTests.cpp:272: 54 == 6*9 succeeded for: 54 == 54
+ConditionTests.cpp: 54 == 6*9 succeeded for: 54 == 54
 [Finished: './succeeding/conditions/computed ints' All tests passed (1 assertion in 1 test case)]
 
 [Running: ./succeeding/conditions/ptr]
-ConditionTests.cpp:288: p == __null succeeded for: __null == 0
-ConditionTests.cpp:289: p == pNULL succeeded for: __null == __null
-ConditionTests.cpp:294: p != __null succeeded for: 0x<hex digits> != 0
-ConditionTests.cpp:297: cp != __null succeeded for: 0x<hex digits> != 0
-ConditionTests.cpp:300: cpc != __null succeeded for: 0x<hex digits> != 0
-ConditionTests.cpp:302: returnsNull() == __null succeeded for: {null string} == 0
-ConditionTests.cpp:303: returnsConstNull() == __null succeeded for: {null string} == 0
-ConditionTests.cpp:305: __null != p succeeded for: 0 != 0x<hex digits>
+ConditionTests.cpp: p == __null succeeded for: __null == 0
+ConditionTests.cpp: p == pNULL succeeded for: __null == __null
+ConditionTests.cpp: p != __null succeeded for: 0x<hex digits> != 0
+ConditionTests.cpp: cp != __null succeeded for: 0x<hex digits> != 0
+ConditionTests.cpp: cpc != __null succeeded for: 0x<hex digits> != 0
+ConditionTests.cpp: returnsNull() == __null succeeded for: {null string} == 0
+ConditionTests.cpp: returnsConstNull() == __null succeeded for: {null string} == 0
+ConditionTests.cpp: __null != p succeeded for: 0 != 0x<hex digits>
 [Finished: './succeeding/conditions/ptr' All tests passed (8 assertions in 1 test case)]
 
 [Running: ./succeeding/conditions/not]
-ConditionTests.cpp:320: false == false succeeded
-ConditionTests.cpp:321: true == true succeeded
-ConditionTests.cpp:322: !false succeeded for: true
-ConditionTests.cpp:323: !false succeeded
-ConditionTests.cpp:325: !falseValue succeeded for: true
-ConditionTests.cpp:326: !falseValue succeeded for: !false
-ConditionTests.cpp:328: !(1 == 2) succeeded for: true
-ConditionTests.cpp:329: !1 == 2 succeeded for: !(1 == 2)
+ConditionTests.cpp: false == false succeeded
+ConditionTests.cpp: true == true succeeded
+ConditionTests.cpp: !false succeeded for: true
+ConditionTests.cpp: !false succeeded
+ConditionTests.cpp: !falseValue succeeded for: true
+ConditionTests.cpp: !falseValue succeeded for: !false
+ConditionTests.cpp: !(1 == 2) succeeded for: true
+ConditionTests.cpp: !1 == 2 succeeded for: !(1 == 2)
 [Finished: './succeeding/conditions/not' All tests passed (8 assertions in 1 test case)]
 
 [Running: ./failing/conditions/not]
-ConditionTests.cpp:337: false != false failed
-ConditionTests.cpp:338: true != true failed
-ConditionTests.cpp:339: !true failed for: false
-ConditionTests.cpp:340: !true failed
-ConditionTests.cpp:342: !trueValue failed for: false
-ConditionTests.cpp:343: !trueValue failed for: !true
-ConditionTests.cpp:345: !(1 == 1) failed for: false
-ConditionTests.cpp:346: !1 == 1 failed for: !(1 == 1)
+ConditionTests.cpp: false != false failed
+ConditionTests.cpp: true != true failed
+ConditionTests.cpp: !true failed for: false
+ConditionTests.cpp: !true failed
+ConditionTests.cpp: !trueValue failed for: false
+ConditionTests.cpp: !trueValue failed for: !true
+ConditionTests.cpp: !(1 == 1) failed for: false
+ConditionTests.cpp: !1 == 1 failed for: !(1 == 1)
 [Finished: './failing/conditions/not' 1 test case failed (All 8 assertions failed)]
 
 [Running: ./succeeding/exceptions/explicit]
-ExceptionTests.cpp:33: thisThrows() succeeded
-ExceptionTests.cpp:34: thisDoesntThrow() succeeded
-ExceptionTests.cpp:35: thisThrows() succeeded
+ExceptionTests.cpp: thisThrows() succeeded
+ExceptionTests.cpp: thisDoesntThrow() succeeded
+ExceptionTests.cpp: thisThrows() succeeded
 [Finished: './succeeding/exceptions/explicit' All tests passed (3 assertions in 1 test case)]
 
 [Running: ./failing/exceptions/explicit]
-ExceptionTests.cpp:40: thisThrows() failed with unexpected exception with message: 'expected exception'
-ExceptionTests.cpp:41: thisDoesntThrow() failed because no exception was thrown where one was expected
-ExceptionTests.cpp:42: thisThrows() failed with unexpected exception with message: 'expected exception'
+ExceptionTests.cpp: thisThrows() failed with unexpected exception with message: 'expected exception'
+ExceptionTests.cpp: thisDoesntThrow() failed because no exception was thrown where one was expected
+ExceptionTests.cpp: thisThrows() failed with unexpected exception with message: 'expected exception'
 [Finished: './failing/exceptions/explicit' 1 test case failed (All 3 assertions failed)]
 
 [Running: ./failing/exceptions/implicit]
-ExceptionTests.cpp:45: Unexpected exception with message: 'unexpected exception'
+ExceptionTests.cpp: Unexpected exception with message: 'unexpected exception'
 [Finished: './failing/exceptions/implicit' 1 test case failed (1 assertion failed)]
 
 [Running: ./failing/exceptions/implicit/2]
-ExceptionTests.cpp:53: 1 == 1 succeeded
-ExceptionTests.cpp:53: {Unknown expression after the reported line} failed with unexpected exception with message: 'unexpected exception'
+ExceptionTests.cpp: 1 == 1 succeeded
+ExceptionTests.cpp: {Unknown expression after the reported line} failed with unexpected exception with message: 'unexpected exception'
 [Finished: './failing/exceptions/implicit/2' 1 test case failed (1 of 2 assertions failed)]
 
 [Running: ./failing/exceptions/implicit/3]
 
 [Started section: 'section name']
-ExceptionTests.cpp:59: Unexpected exception with message: 'unexpected exception'
+ExceptionTests.cpp: Unexpected exception with message: 'unexpected exception'
 [End of section: 'section name' 1 assertion failed]
 
 [Finished: './failing/exceptions/implicit/3' 1 test case failed (1 assertion failed)]
 
 [Running: ./failing/exceptions/implicit/4]
-ExceptionTests.cpp:68: thisThrows() == 0 failed with unexpected exception with message: 'expected exception'
+ExceptionTests.cpp: thisThrows() == 0 failed with unexpected exception with message: 'expected exception'
 [Finished: './failing/exceptions/implicit/4' 1 test case failed (1 assertion failed)]
 
 [Running: ./succeeding/exceptions/implicit]
@@ -12964,216 +12964,216 @@
 [Finished: './succeeding/exceptions/implicit' 1 test case failed (1 assertion failed)]
 
 [Running: ./failing/exceptions/custom]
-ExceptionTests.cpp:108: Unexpected exception with message: 'custom exception'
+ExceptionTests.cpp: Unexpected exception with message: 'custom exception'
 [Finished: './failing/exceptions/custom' 1 test case failed (1 assertion failed)]
 
 [Running: ./failing/exceptions/custom/nothrow]
-ExceptionTests.cpp:121: throwCustom() failed with unexpected exception with message: 'custom exception - not std'
+ExceptionTests.cpp: throwCustom() failed with unexpected exception with message: 'custom exception - not std'
 [Finished: './failing/exceptions/custom/nothrow' 1 test case failed (1 assertion failed)]
 
 [Running: ./failing/exceptions/custom/throw]
-ExceptionTests.cpp:126: throwCustom() failed with unexpected exception with message: 'custom exception - not std'
+ExceptionTests.cpp: throwCustom() failed with unexpected exception with message: 'custom exception - not std'
 [Finished: './failing/exceptions/custom/throw' 1 test case failed (1 assertion failed)]
 
 [Running: ./failing/exceptions/custom/double]
-ExceptionTests.cpp:130: Unexpected exception with message: '3.14'
+ExceptionTests.cpp: Unexpected exception with message: '3.14'
 [Finished: './failing/exceptions/custom/double' 1 test case failed (1 assertion failed)]
 
 [Running: ./succeeding/exceptions/notimplemented]
-ExceptionTests.cpp:142: thisFunctionNotImplemented( 7 ) succeeded
+ExceptionTests.cpp: thisFunctionNotImplemented( 7 ) succeeded
 [Finished: './succeeding/exceptions/notimplemented' All tests passed (1 assertion in 1 test case)]
 
 [Running: ./succeeding/generators/1]
-GeneratorTests.cpp:26: multiply( i, 2 ) == i*2 succeeded for: 2 == 2
-GeneratorTests.cpp:27: multiply( j, 2 ) == j*2 succeeded for: 200 == 200
-GeneratorTests.cpp:26: multiply( i, 2 ) == i*2 succeeded for: 4 == 4
-GeneratorTests.cpp:27: multiply( j, 2 ) == j*2 succeeded for: 200 == 200
-GeneratorTests.cpp:26: multiply( i, 2 ) == i*2 succeeded for: 6 == 6
-GeneratorTests.cpp:27: multiply( j, 2 ) == j*2 succeeded for: 200 == 200
-GeneratorTests.cpp:26: multiply( i, 2 ) == i*2 succeeded for: 8 == 8
-GeneratorTests.cpp:27: multiply( j, 2 ) == j*2 succeeded for: 200 == 200
-GeneratorTests.cpp:26: multiply( i, 2 ) == i*2 succeeded for: 10 == 10
-GeneratorTests.cpp:27: multiply( j, 2 ) == j*2 succeeded for: 200 == 200
-GeneratorTests.cpp:26: multiply( i, 2 ) == i*2 succeeded for: 30 == 30
-GeneratorTests.cpp:27: multiply( j, 2 ) == j*2 succeeded for: 200 == 200
-GeneratorTests.cpp:26: multiply( i, 2 ) == i*2 succeeded for: 40 == 40
-GeneratorTests.cpp:27: multiply( j, 2 ) == j*2 succeeded for: 200 == 200
-GeneratorTests.cpp:26: multiply( i, 2 ) == i*2 succeeded for: 42 == 42
-GeneratorTests.cpp:27: multiply( j, 2 ) == j*2 succeeded for: 200 == 200
-GeneratorTests.cpp:26: multiply( i, 2 ) == i*2 succeeded for: 72 == 72
-GeneratorTests.cpp:27: multiply( j, 2 ) == j*2 succeeded for: 200 == 200
-GeneratorTests.cpp:26: multiply( i, 2 ) == i*2 succeeded for: 2 == 2
-GeneratorTests.cpp:27: multiply( j, 2 ) == j*2 succeeded for: 202 == 202
-GeneratorTests.cpp:26: multiply( i, 2 ) == i*2 succeeded for: 4 == 4
-GeneratorTests.cpp:27: multiply( j, 2 ) == j*2 succeeded for: 202 == 202
-GeneratorTests.cpp:26: multiply( i, 2 ) == i*2 succeeded for: 6 == 6
-GeneratorTests.cpp:27: multiply( j, 2 ) == j*2 succeeded for: 202 == 202
-GeneratorTests.cpp:26: multiply( i, 2 ) == i*2 succeeded for: 8 == 8
-GeneratorTests.cpp:27: multiply( j, 2 ) == j*2 succeeded for: 202 == 202
-GeneratorTests.cpp:26: multiply( i, 2 ) == i*2 succeeded for: 10 == 10
-GeneratorTests.cpp:27: multiply( j, 2 ) == j*2 succeeded for: 202 == 202
-GeneratorTests.cpp:26: multiply( i, 2 ) == i*2 succeeded for: 30 == 30
-GeneratorTests.cpp:27: multiply( j, 2 ) == j*2 succeeded for: 202 == 202
-GeneratorTests.cpp:26: multiply( i, 2 ) == i*2 succeeded for: 40 == 40
-GeneratorTests.cpp:27: multiply( j, 2 ) == j*2 succeeded for: 202 == 202
-GeneratorTests.cpp:26: multiply( i, 2 ) == i*2 succeeded for: 42 == 42
-GeneratorTests.cpp:27: multiply( j, 2 ) == j*2 succeeded for: 202 == 202
-GeneratorTests.cpp:26: multiply( i, 2 ) == i*2 succeeded for: 72 == 72
-GeneratorTests.cpp:27: multiply( j, 2 ) == j*2 succeeded for: 202 == 202
-GeneratorTests.cpp:26: multiply( i, 2 ) == i*2 succeeded for: 2 == 2
-GeneratorTests.cpp:27: multiply( j, 2 ) == j*2 succeeded for: 204 == 204
-GeneratorTests.cpp:26: multiply( i, 2 ) == i*2 succeeded for: 4 == 4
-GeneratorTests.cpp:27: multiply( j, 2 ) == j*2 succeeded for: 204 == 204
-GeneratorTests.cpp:26: multiply( i, 2 ) == i*2 succeeded for: 6 == 6
-GeneratorTests.cpp:27: multiply( j, 2 ) == j*2 succeeded for: 204 == 204
-GeneratorTests.cpp:26: multiply( i, 2 ) == i*2 succeeded for: 8 == 8
-GeneratorTests.cpp:27: multiply( j, 2 ) == j*2 succeeded for: 204 == 204
-GeneratorTests.cpp:26: multiply( i, 2 ) == i*2 succeeded for: 10 == 10
-GeneratorTests.cpp:27: multiply( j, 2 ) == j*2 succeeded for: 204 == 204
-GeneratorTests.cpp:26: multiply( i, 2 ) == i*2 succeeded for: 30 == 30
-GeneratorTests.cpp:27: multiply( j, 2 ) == j*2 succeeded for: 204 == 204
-GeneratorTests.cpp:26: multiply( i, 2 ) == i*2 succeeded for: 40 == 40
-GeneratorTests.cpp:27: multiply( j, 2 ) == j*2 succeeded for: 204 == 204
-GeneratorTests.cpp:26: multiply( i, 2 ) == i*2 succeeded for: 42 == 42
-GeneratorTests.cpp:27: multiply( j, 2 ) == j*2 succeeded for: 204 == 204
-GeneratorTests.cpp:26: multiply( i, 2 ) == i*2 succeeded for: 72 == 72
-GeneratorTests.cpp:27: multiply( j, 2 ) == j*2 succeeded for: 204 == 204
-GeneratorTests.cpp:26: multiply( i, 2 ) == i*2 succeeded for: 2 == 2
-GeneratorTests.cpp:27: multiply( j, 2 ) == j*2 succeeded for: 206 == 206
-GeneratorTests.cpp:26: multiply( i, 2 ) == i*2 succeeded for: 4 == 4
-GeneratorTests.cpp:27: multiply( j, 2 ) == j*2 succeeded for: 206 == 206
-GeneratorTests.cpp:26: multiply( i, 2 ) == i*2 succeeded for: 6 == 6
-GeneratorTests.cpp:27: multiply( j, 2 ) == j*2 succeeded for: 206 == 206
-GeneratorTests.cpp:26: multiply( i, 2 ) == i*2 succeeded for: 8 == 8
-GeneratorTests.cpp:27: multiply( j, 2 ) == j*2 succeeded for: 206 == 206
-GeneratorTests.cpp:26: multiply( i, 2 ) == i*2 succeeded for: 10 == 10
-GeneratorTests.cpp:27: multiply( j, 2 ) == j*2 succeeded for: 206 == 206
-GeneratorTests.cpp:26: multiply( i, 2 ) == i*2 succeeded for: 30 == 30
-GeneratorTests.cpp:27: multiply( j, 2 ) == j*2 succeeded for: 206 == 206
-GeneratorTests.cpp:26: multiply( i, 2 ) == i*2 succeeded for: 40 == 40
-GeneratorTests.cpp:27: multiply( j, 2 ) == j*2 succeeded for: 206 == 206
-GeneratorTests.cpp:26: multiply( i, 2 ) == i*2 succeeded for: 42 == 42
-GeneratorTests.cpp:27: multiply( j, 2 ) == j*2 succeeded for: 206 == 206
-GeneratorTests.cpp:26: multiply( i, 2 ) == i*2 succeeded for: 72 == 72
-GeneratorTests.cpp:27: multiply( j, 2 ) == j*2 succeeded for: 206 == 206
-GeneratorTests.cpp:26: multiply( i, 2 ) == i*2 succeeded for: 2 == 2
-GeneratorTests.cpp:27: multiply( j, 2 ) == j*2 succeeded for: 208 == 208
-GeneratorTests.cpp:26: multiply( i, 2 ) == i*2 succeeded for: 4 == 4
-GeneratorTests.cpp:27: multiply( j, 2 ) == j*2 succeeded for: 208 == 208
-GeneratorTests.cpp:26: multiply( i, 2 ) == i*2 succeeded for: 6 == 6
-GeneratorTests.cpp:27: multiply( j, 2 ) == j*2 succeeded for: 208 == 208
-GeneratorTests.cpp:26: multiply( i, 2 ) == i*2 succeeded for: 8 == 8
-GeneratorTests.cpp:27: multiply( j, 2 ) == j*2 succeeded for: 208 == 208
-GeneratorTests.cpp:26: multiply( i, 2 ) == i*2 succeeded for: 10 == 10
-GeneratorTests.cpp:27: multiply( j, 2 ) == j*2 succeeded for: 208 == 208
-GeneratorTests.cpp:26: multiply( i, 2 ) == i*2 succeeded for: 30 == 30
-GeneratorTests.cpp:27: multiply( j, 2 ) == j*2 succeeded for: 208 == 208
-GeneratorTests.cpp:26: multiply( i, 2 ) == i*2 succeeded for: 40 == 40
-GeneratorTests.cpp:27: multiply( j, 2 ) == j*2 succeeded for: 208 == 208
-GeneratorTests.cpp:26: multiply( i, 2 ) == i*2 succeeded for: 42 == 42
-GeneratorTests.cpp:27: multiply( j, 2 ) == j*2 succeeded for: 208 == 208
-GeneratorTests.cpp:26: multiply( i, 2 ) == i*2 succeeded for: 72 == 72
-GeneratorTests.cpp:27: multiply( j, 2 ) == j*2 succeeded for: 208 == 208
-GeneratorTests.cpp:26: multiply( i, 2 ) == i*2 succeeded for: 2 == 2
-GeneratorTests.cpp:27: multiply( j, 2 ) == j*2 succeeded for: 210 == 210
-GeneratorTests.cpp:26: multiply( i, 2 ) == i*2 succeeded for: 4 == 4
-GeneratorTests.cpp:27: multiply( j, 2 ) == j*2 succeeded for: 210 == 210
-GeneratorTests.cpp:26: multiply( i, 2 ) == i*2 succeeded for: 6 == 6
-GeneratorTests.cpp:27: multiply( j, 2 ) == j*2 succeeded for: 210 == 210
-GeneratorTests.cpp:26: multiply( i, 2 ) == i*2 succeeded for: 8 == 8
-GeneratorTests.cpp:27: multiply( j, 2 ) == j*2 succeeded for: 210 == 210
-GeneratorTests.cpp:26: multiply( i, 2 ) == i*2 succeeded for: 10 == 10
-GeneratorTests.cpp:27: multiply( j, 2 ) == j*2 succeeded for: 210 == 210
-GeneratorTests.cpp:26: multiply( i, 2 ) == i*2 succeeded for: 30 == 30
-GeneratorTests.cpp:27: multiply( j, 2 ) == j*2 succeeded for: 210 == 210
-GeneratorTests.cpp:26: multiply( i, 2 ) == i*2 succeeded for: 40 == 40
-GeneratorTests.cpp:27: multiply( j, 2 ) == j*2 succeeded for: 210 == 210
-GeneratorTests.cpp:26: multiply( i, 2 ) == i*2 succeeded for: 42 == 42
-GeneratorTests.cpp:27: multiply( j, 2 ) == j*2 succeeded for: 210 == 210
-GeneratorTests.cpp:26: multiply( i, 2 ) == i*2 succeeded for: 72 == 72
-GeneratorTests.cpp:27: multiply( j, 2 ) == j*2 succeeded for: 210 == 210
-GeneratorTests.cpp:26: multiply( i, 2 ) == i*2 succeeded for: 2 == 2
-GeneratorTests.cpp:27: multiply( j, 2 ) == j*2 succeeded for: 212 == 212
-GeneratorTests.cpp:26: multiply( i, 2 ) == i*2 succeeded for: 4 == 4
-GeneratorTests.cpp:27: multiply( j, 2 ) == j*2 succeeded for: 212 == 212
-GeneratorTests.cpp:26: multiply( i, 2 ) == i*2 succeeded for: 6 == 6
-GeneratorTests.cpp:27: multiply( j, 2 ) == j*2 succeeded for: 212 == 212
-GeneratorTests.cpp:26: multiply( i, 2 ) == i*2 succeeded for: 8 == 8
-GeneratorTests.cpp:27: multiply( j, 2 ) == j*2 succeeded for: 212 == 212
-GeneratorTests.cpp:26: multiply( i, 2 ) == i*2 succeeded for: 10 == 10
-GeneratorTests.cpp:27: multiply( j, 2 ) == j*2 succeeded for: 212 == 212
-GeneratorTests.cpp:26: multiply( i, 2 ) == i*2 succeeded for: 30 == 30
-GeneratorTests.cpp:27: multiply( j, 2 ) == j*2 succeeded for: 212 == 212
-GeneratorTests.cpp:26: multiply( i, 2 ) == i*2 succeeded for: 40 == 40
-GeneratorTests.cpp:27: multiply( j, 2 ) == j*2 succeeded for: 212 == 212
-GeneratorTests.cpp:26: multiply( i, 2 ) == i*2 succeeded for: 42 == 42
-GeneratorTests.cpp:27: multiply( j, 2 ) == j*2 succeeded for: 212 == 212
-GeneratorTests.cpp:26: multiply( i, 2 ) == i*2 succeeded for: 72 == 72
-GeneratorTests.cpp:27: multiply( j, 2 ) == j*2 succeeded for: 212 == 212
-GeneratorTests.cpp:26: multiply( i, 2 ) == i*2 succeeded for: 2 == 2
-GeneratorTests.cpp:27: multiply( j, 2 ) == j*2 succeeded for: 214 == 214
-GeneratorTests.cpp:26: multiply( i, 2 ) == i*2 succeeded for: 4 == 4
-GeneratorTests.cpp:27: multiply( j, 2 ) == j*2 succeeded for: 214 == 214
-GeneratorTests.cpp:26: multiply( i, 2 ) == i*2 succeeded for: 6 == 6
-GeneratorTests.cpp:27: multiply( j, 2 ) == j*2 succeeded for: 214 == 214
-GeneratorTests.cpp:26: multiply( i, 2 ) == i*2 succeeded for: 8 == 8
-GeneratorTests.cpp:27: multiply( j, 2 ) == j*2 succeeded for: 214 == 214
-GeneratorTests.cpp:26: multiply( i, 2 ) == i*2 succeeded for: 10 == 10
-GeneratorTests.cpp:27: multiply( j, 2 ) == j*2 succeeded for: 214 == 214
-GeneratorTests.cpp:26: multiply( i, 2 ) == i*2 succeeded for: 30 == 30
-GeneratorTests.cpp:27: multiply( j, 2 ) == j*2 succeeded for: 214 == 214
-GeneratorTests.cpp:26: multiply( i, 2 ) == i*2 succeeded for: 40 == 40
-GeneratorTests.cpp:27: multiply( j, 2 ) == j*2 succeeded for: 214 == 214
-GeneratorTests.cpp:26: multiply( i, 2 ) == i*2 succeeded for: 42 == 42
-GeneratorTests.cpp:27: multiply( j, 2 ) == j*2 succeeded for: 214 == 214
-GeneratorTests.cpp:26: multiply( i, 2 ) == i*2 succeeded for: 72 == 72
-GeneratorTests.cpp:27: multiply( j, 2 ) == j*2 succeeded for: 214 == 214
+GeneratorTests.cpp: multiply( i, 2 ) == i*2 succeeded for: 2 == 2
+GeneratorTests.cpp: multiply( j, 2 ) == j*2 succeeded for: 200 == 200
+GeneratorTests.cpp: multiply( i, 2 ) == i*2 succeeded for: 4 == 4
+GeneratorTests.cpp: multiply( j, 2 ) == j*2 succeeded for: 200 == 200
+GeneratorTests.cpp: multiply( i, 2 ) == i*2 succeeded for: 6 == 6
+GeneratorTests.cpp: multiply( j, 2 ) == j*2 succeeded for: 200 == 200
+GeneratorTests.cpp: multiply( i, 2 ) == i*2 succeeded for: 8 == 8
+GeneratorTests.cpp: multiply( j, 2 ) == j*2 succeeded for: 200 == 200
+GeneratorTests.cpp: multiply( i, 2 ) == i*2 succeeded for: 10 == 10
+GeneratorTests.cpp: multiply( j, 2 ) == j*2 succeeded for: 200 == 200
+GeneratorTests.cpp: multiply( i, 2 ) == i*2 succeeded for: 30 == 30
+GeneratorTests.cpp: multiply( j, 2 ) == j*2 succeeded for: 200 == 200
+GeneratorTests.cpp: multiply( i, 2 ) == i*2 succeeded for: 40 == 40
+GeneratorTests.cpp: multiply( j, 2 ) == j*2 succeeded for: 200 == 200
+GeneratorTests.cpp: multiply( i, 2 ) == i*2 succeeded for: 42 == 42
+GeneratorTests.cpp: multiply( j, 2 ) == j*2 succeeded for: 200 == 200
+GeneratorTests.cpp: multiply( i, 2 ) == i*2 succeeded for: 72 == 72
+GeneratorTests.cpp: multiply( j, 2 ) == j*2 succeeded for: 200 == 200
+GeneratorTests.cpp: multiply( i, 2 ) == i*2 succeeded for: 2 == 2
+GeneratorTests.cpp: multiply( j, 2 ) == j*2 succeeded for: 202 == 202
+GeneratorTests.cpp: multiply( i, 2 ) == i*2 succeeded for: 4 == 4
+GeneratorTests.cpp: multiply( j, 2 ) == j*2 succeeded for: 202 == 202
+GeneratorTests.cpp: multiply( i, 2 ) == i*2 succeeded for: 6 == 6
+GeneratorTests.cpp: multiply( j, 2 ) == j*2 succeeded for: 202 == 202
+GeneratorTests.cpp: multiply( i, 2 ) == i*2 succeeded for: 8 == 8
+GeneratorTests.cpp: multiply( j, 2 ) == j*2 succeeded for: 202 == 202
+GeneratorTests.cpp: multiply( i, 2 ) == i*2 succeeded for: 10 == 10
+GeneratorTests.cpp: multiply( j, 2 ) == j*2 succeeded for: 202 == 202
+GeneratorTests.cpp: multiply( i, 2 ) == i*2 succeeded for: 30 == 30
+GeneratorTests.cpp: multiply( j, 2 ) == j*2 succeeded for: 202 == 202
+GeneratorTests.cpp: multiply( i, 2 ) == i*2 succeeded for: 40 == 40
+GeneratorTests.cpp: multiply( j, 2 ) == j*2 succeeded for: 202 == 202
+GeneratorTests.cpp: multiply( i, 2 ) == i*2 succeeded for: 42 == 42
+GeneratorTests.cpp: multiply( j, 2 ) == j*2 succeeded for: 202 == 202
+GeneratorTests.cpp: multiply( i, 2 ) == i*2 succeeded for: 72 == 72
+GeneratorTests.cpp: multiply( j, 2 ) == j*2 succeeded for: 202 == 202
+GeneratorTests.cpp: multiply( i, 2 ) == i*2 succeeded for: 2 == 2
+GeneratorTests.cpp: multiply( j, 2 ) == j*2 succeeded for: 204 == 204
+GeneratorTests.cpp: multiply( i, 2 ) == i*2 succeeded for: 4 == 4
+GeneratorTests.cpp: multiply( j, 2 ) == j*2 succeeded for: 204 == 204
+GeneratorTests.cpp: multiply( i, 2 ) == i*2 succeeded for: 6 == 6
+GeneratorTests.cpp: multiply( j, 2 ) == j*2 succeeded for: 204 == 204
+GeneratorTests.cpp: multiply( i, 2 ) == i*2 succeeded for: 8 == 8
+GeneratorTests.cpp: multiply( j, 2 ) == j*2 succeeded for: 204 == 204
+GeneratorTests.cpp: multiply( i, 2 ) == i*2 succeeded for: 10 == 10
+GeneratorTests.cpp: multiply( j, 2 ) == j*2 succeeded for: 204 == 204
+GeneratorTests.cpp: multiply( i, 2 ) == i*2 succeeded for: 30 == 30
+GeneratorTests.cpp: multiply( j, 2 ) == j*2 succeeded for: 204 == 204
+GeneratorTests.cpp: multiply( i, 2 ) == i*2 succeeded for: 40 == 40
+GeneratorTests.cpp: multiply( j, 2 ) == j*2 succeeded for: 204 == 204
+GeneratorTests.cpp: multiply( i, 2 ) == i*2 succeeded for: 42 == 42
+GeneratorTests.cpp: multiply( j, 2 ) == j*2 succeeded for: 204 == 204
+GeneratorTests.cpp: multiply( i, 2 ) == i*2 succeeded for: 72 == 72
+GeneratorTests.cpp: multiply( j, 2 ) == j*2 succeeded for: 204 == 204
+GeneratorTests.cpp: multiply( i, 2 ) == i*2 succeeded for: 2 == 2
+GeneratorTests.cpp: multiply( j, 2 ) == j*2 succeeded for: 206 == 206
+GeneratorTests.cpp: multiply( i, 2 ) == i*2 succeeded for: 4 == 4
+GeneratorTests.cpp: multiply( j, 2 ) == j*2 succeeded for: 206 == 206
+GeneratorTests.cpp: multiply( i, 2 ) == i*2 succeeded for: 6 == 6
+GeneratorTests.cpp: multiply( j, 2 ) == j*2 succeeded for: 206 == 206
+GeneratorTests.cpp: multiply( i, 2 ) == i*2 succeeded for: 8 == 8
+GeneratorTests.cpp: multiply( j, 2 ) == j*2 succeeded for: 206 == 206
+GeneratorTests.cpp: multiply( i, 2 ) == i*2 succeeded for: 10 == 10
+GeneratorTests.cpp: multiply( j, 2 ) == j*2 succeeded for: 206 == 206
+GeneratorTests.cpp: multiply( i, 2 ) == i*2 succeeded for: 30 == 30
+GeneratorTests.cpp: multiply( j, 2 ) == j*2 succeeded for: 206 == 206
+GeneratorTests.cpp: multiply( i, 2 ) == i*2 succeeded for: 40 == 40
+GeneratorTests.cpp: multiply( j, 2 ) == j*2 succeeded for: 206 == 206
+GeneratorTests.cpp: multiply( i, 2 ) == i*2 succeeded for: 42 == 42
+GeneratorTests.cpp: multiply( j, 2 ) == j*2 succeeded for: 206 == 206
+GeneratorTests.cpp: multiply( i, 2 ) == i*2 succeeded for: 72 == 72
+GeneratorTests.cpp: multiply( j, 2 ) == j*2 succeeded for: 206 == 206
+GeneratorTests.cpp: multiply( i, 2 ) == i*2 succeeded for: 2 == 2
+GeneratorTests.cpp: multiply( j, 2 ) == j*2 succeeded for: 208 == 208
+GeneratorTests.cpp: multiply( i, 2 ) == i*2 succeeded for: 4 == 4
+GeneratorTests.cpp: multiply( j, 2 ) == j*2 succeeded for: 208 == 208
+GeneratorTests.cpp: multiply( i, 2 ) == i*2 succeeded for: 6 == 6
+GeneratorTests.cpp: multiply( j, 2 ) == j*2 succeeded for: 208 == 208
+GeneratorTests.cpp: multiply( i, 2 ) == i*2 succeeded for: 8 == 8
+GeneratorTests.cpp: multiply( j, 2 ) == j*2 succeeded for: 208 == 208
+GeneratorTests.cpp: multiply( i, 2 ) == i*2 succeeded for: 10 == 10
+GeneratorTests.cpp: multiply( j, 2 ) == j*2 succeeded for: 208 == 208
+GeneratorTests.cpp: multiply( i, 2 ) == i*2 succeeded for: 30 == 30
+GeneratorTests.cpp: multiply( j, 2 ) == j*2 succeeded for: 208 == 208
+GeneratorTests.cpp: multiply( i, 2 ) == i*2 succeeded for: 40 == 40
+GeneratorTests.cpp: multiply( j, 2 ) == j*2 succeeded for: 208 == 208
+GeneratorTests.cpp: multiply( i, 2 ) == i*2 succeeded for: 42 == 42
+GeneratorTests.cpp: multiply( j, 2 ) == j*2 succeeded for: 208 == 208
+GeneratorTests.cpp: multiply( i, 2 ) == i*2 succeeded for: 72 == 72
+GeneratorTests.cpp: multiply( j, 2 ) == j*2 succeeded for: 208 == 208
+GeneratorTests.cpp: multiply( i, 2 ) == i*2 succeeded for: 2 == 2
+GeneratorTests.cpp: multiply( j, 2 ) == j*2 succeeded for: 210 == 210
+GeneratorTests.cpp: multiply( i, 2 ) == i*2 succeeded for: 4 == 4
+GeneratorTests.cpp: multiply( j, 2 ) == j*2 succeeded for: 210 == 210
+GeneratorTests.cpp: multiply( i, 2 ) == i*2 succeeded for: 6 == 6
+GeneratorTests.cpp: multiply( j, 2 ) == j*2 succeeded for: 210 == 210
+GeneratorTests.cpp: multiply( i, 2 ) == i*2 succeeded for: 8 == 8
+GeneratorTests.cpp: multiply( j, 2 ) == j*2 succeeded for: 210 == 210
+GeneratorTests.cpp: multiply( i, 2 ) == i*2 succeeded for: 10 == 10
+GeneratorTests.cpp: multiply( j, 2 ) == j*2 succeeded for: 210 == 210
+GeneratorTests.cpp: multiply( i, 2 ) == i*2 succeeded for: 30 == 30
+GeneratorTests.cpp: multiply( j, 2 ) == j*2 succeeded for: 210 == 210
+GeneratorTests.cpp: multiply( i, 2 ) == i*2 succeeded for: 40 == 40
+GeneratorTests.cpp: multiply( j, 2 ) == j*2 succeeded for: 210 == 210
+GeneratorTests.cpp: multiply( i, 2 ) == i*2 succeeded for: 42 == 42
+GeneratorTests.cpp: multiply( j, 2 ) == j*2 succeeded for: 210 == 210
+GeneratorTests.cpp: multiply( i, 2 ) == i*2 succeeded for: 72 == 72
+GeneratorTests.cpp: multiply( j, 2 ) == j*2 succeeded for: 210 == 210
+GeneratorTests.cpp: multiply( i, 2 ) == i*2 succeeded for: 2 == 2
+GeneratorTests.cpp: multiply( j, 2 ) == j*2 succeeded for: 212 == 212
+GeneratorTests.cpp: multiply( i, 2 ) == i*2 succeeded for: 4 == 4
+GeneratorTests.cpp: multiply( j, 2 ) == j*2 succeeded for: 212 == 212
+GeneratorTests.cpp: multiply( i, 2 ) == i*2 succeeded for: 6 == 6
+GeneratorTests.cpp: multiply( j, 2 ) == j*2 succeeded for: 212 == 212
+GeneratorTests.cpp: multiply( i, 2 ) == i*2 succeeded for: 8 == 8
+GeneratorTests.cpp: multiply( j, 2 ) == j*2 succeeded for: 212 == 212
+GeneratorTests.cpp: multiply( i, 2 ) == i*2 succeeded for: 10 == 10
+GeneratorTests.cpp: multiply( j, 2 ) == j*2 succeeded for: 212 == 212
+GeneratorTests.cpp: multiply( i, 2 ) == i*2 succeeded for: 30 == 30
+GeneratorTests.cpp: multiply( j, 2 ) == j*2 succeeded for: 212 == 212
+GeneratorTests.cpp: multiply( i, 2 ) == i*2 succeeded for: 40 == 40
+GeneratorTests.cpp: multiply( j, 2 ) == j*2 succeeded for: 212 == 212
+GeneratorTests.cpp: multiply( i, 2 ) == i*2 succeeded for: 42 == 42
+GeneratorTests.cpp: multiply( j, 2 ) == j*2 succeeded for: 212 == 212
+GeneratorTests.cpp: multiply( i, 2 ) == i*2 succeeded for: 72 == 72
+GeneratorTests.cpp: multiply( j, 2 ) == j*2 succeeded for: 212 == 212
+GeneratorTests.cpp: multiply( i, 2 ) == i*2 succeeded for: 2 == 2
+GeneratorTests.cpp: multiply( j, 2 ) == j*2 succeeded for: 214 == 214
+GeneratorTests.cpp: multiply( i, 2 ) == i*2 succeeded for: 4 == 4
+GeneratorTests.cpp: multiply( j, 2 ) == j*2 succeeded for: 214 == 214
+GeneratorTests.cpp: multiply( i, 2 ) == i*2 succeeded for: 6 == 6
+GeneratorTests.cpp: multiply( j, 2 ) == j*2 succeeded for: 214 == 214
+GeneratorTests.cpp: multiply( i, 2 ) == i*2 succeeded for: 8 == 8
+GeneratorTests.cpp: multiply( j, 2 ) == j*2 succeeded for: 214 == 214
+GeneratorTests.cpp: multiply( i, 2 ) == i*2 succeeded for: 10 == 10
+GeneratorTests.cpp: multiply( j, 2 ) == j*2 succeeded for: 214 == 214
+GeneratorTests.cpp: multiply( i, 2 ) == i*2 succeeded for: 30 == 30
+GeneratorTests.cpp: multiply( j, 2 ) == j*2 succeeded for: 214 == 214
+GeneratorTests.cpp: multiply( i, 2 ) == i*2 succeeded for: 40 == 40
+GeneratorTests.cpp: multiply( j, 2 ) == j*2 succeeded for: 214 == 214
+GeneratorTests.cpp: multiply( i, 2 ) == i*2 succeeded for: 42 == 42
+GeneratorTests.cpp: multiply( j, 2 ) == j*2 succeeded for: 214 == 214
+GeneratorTests.cpp: multiply( i, 2 ) == i*2 succeeded for: 72 == 72
+GeneratorTests.cpp: multiply( j, 2 ) == j*2 succeeded for: 214 == 214
 [Finished: './succeeding/generators/1' All tests passed (144 assertions in 1 test case)]
 
 [Running: ./succeeding/generators/2]
-GeneratorTests.cpp:40: i->first == i->second-1 succeeded for: 0 == 0
-GeneratorTests.cpp:40: i->first == i->second-1 succeeded for: 2 == 2
+GeneratorTests.cpp: i->first == i->second-1 succeeded for: 0 == 0
+GeneratorTests.cpp: i->first == i->second-1 succeeded for: 2 == 2
 [Finished: './succeeding/generators/2' All tests passed (2 assertions in 1 test case)]
 
 [Running: ./succeeding/message]
-MessageTests.cpp:13: [info: this is a message]
-MessageTests.cpp:14: [warning: this is a warning]
+MessageTests.cpp: [info: this is a message]
+MessageTests.cpp: [warning: this is a warning]
 
 No assertions in test case, './succeeding/message'
 
 [Finished: './succeeding/message' 1 test case failed (1 assertion failed)]
 
 [Running: ./succeeding/succeed]
-MessageTests.cpp:18:  succeeded
+MessageTests.cpp:  succeeded
 [with message: this is a success]
 [Finished: './succeeding/succeed' All tests passed (1 assertion in 1 test case)]
 
 [Running: ./failing/message/info/1]
-MessageTests.cpp:23: [info: this message should be logged]
-MessageTests.cpp:24: [info: so should this]
-MessageTests.cpp:26: a == 1 failed for: 2 == 1
+MessageTests.cpp: [info: this message should be logged]
+MessageTests.cpp: [info: so should this]
+MessageTests.cpp: a == 1 failed for: 2 == 1
 [Finished: './failing/message/info/1' 1 test case failed (1 assertion failed)]
 
 [Running: ./mixed/message/info/2]
-MessageTests.cpp:35: a == 2 succeeded for: 2 == 2
-MessageTests.cpp:37: [info: this message should be logged]
-MessageTests.cpp:39: a == 1 failed for: 2 == 1
-MessageTests.cpp:41: [info: and this, but later]
-MessageTests.cpp:43: a == 0 failed for: 2 == 0
-MessageTests.cpp:47: a == 2 succeeded for: 2 == 2
+MessageTests.cpp: a == 2 succeeded for: 2 == 2
+MessageTests.cpp: [info: this message should be logged]
+MessageTests.cpp: a == 1 failed for: 2 == 1
+MessageTests.cpp: [info: and this, but later]
+MessageTests.cpp: a == 0 failed for: 2 == 0
+MessageTests.cpp: a == 2 succeeded for: 2 == 2
 [Finished: './mixed/message/info/2' 1 test case failed (2 of 4 assertions failed)]
 
 [Running: ./failing/message/fail]
-MessageTests.cpp:53: failed with message: 'This is a failure'
+MessageTests.cpp: failed with message: 'This is a failure'
 [Finished: './failing/message/fail' 1 test case failed (1 assertion failed)]
 
 [Running: ./failing/message/sections]
 [Started section: 'one']
-MessageTests.cpp:60: failed with message: 'Message from section one'
+MessageTests.cpp: failed with message: 'Message from section one'
 [End of section: 'one' 1 assertion failed]
 
 [Started section: 'two']
-MessageTests.cpp:65: failed with message: 'Message from section two'
+MessageTests.cpp: failed with message: 'Message from section two'
 [End of section: 'two' 1 assertion failed]
 
 [Finished: './failing/message/sections' 1 test case failed (All 2 assertions failed)]
@@ -13196,23 +13196,23 @@
 [Finished: './succeeding/message/sections/stdout' 1 test case failed (All 2 assertions failed)]
 
 [Running: ./mixed/message/scoped]
-MessageTests.cpp:88: i < 10 succeeded for: 0 < 10
-MessageTests.cpp:88: i < 10 succeeded for: 1 < 10
-MessageTests.cpp:88: i < 10 succeeded for: 2 < 10
-MessageTests.cpp:88: i < 10 succeeded for: 3 < 10
-MessageTests.cpp:88: i < 10 succeeded for: 4 < 10
-MessageTests.cpp:88: i < 10 succeeded for: 5 < 10
-MessageTests.cpp:88: i < 10 succeeded for: 6 < 10
-MessageTests.cpp:88: i < 10 succeeded for: 7 < 10
-MessageTests.cpp:88: i < 10 succeeded for: 8 < 10
-MessageTests.cpp:88: i < 10 succeeded for: 9 < 10
-MessageTests.cpp:86: [info: current counter 10]
-MessageTests.cpp:87: [info: i := 10]
-MessageTests.cpp:88: i < 10 failed for: 10 < 10
+MessageTests.cpp: i < 10 succeeded for: 0 < 10
+MessageTests.cpp: i < 10 succeeded for: 1 < 10
+MessageTests.cpp: i < 10 succeeded for: 2 < 10
+MessageTests.cpp: i < 10 succeeded for: 3 < 10
+MessageTests.cpp: i < 10 succeeded for: 4 < 10
+MessageTests.cpp: i < 10 succeeded for: 5 < 10
+MessageTests.cpp: i < 10 succeeded for: 6 < 10
+MessageTests.cpp: i < 10 succeeded for: 7 < 10
+MessageTests.cpp: i < 10 succeeded for: 8 < 10
+MessageTests.cpp: i < 10 succeeded for: 9 < 10
+MessageTests.cpp: [info: current counter 10]
+MessageTests.cpp: [info: i := 10]
+MessageTests.cpp: i < 10 failed for: 10 < 10
 [Finished: './mixed/message/scoped' 1 test case failed (1 of 11 assertions failed)]
 
 [Running: ./succeeding/nofail]
-MessageTests.cpp:94: 1 == 2 failed - but was ok
+MessageTests.cpp: 1 == 2 failed - but was ok
 
 No assertions in test case, './succeeding/nofail'
 
@@ -13225,27 +13225,27 @@
 [Finished: 'just info' 1 test case failed (1 assertion failed)]
 
 [Running: just failure]
-MessageTests.cpp:103: failed with message: 'Previous info should not be seen'
+MessageTests.cpp: failed with message: 'Previous info should not be seen'
 [Finished: 'just failure' 1 test case failed (1 assertion failed)]
 
 [Running: ./succeeding/Misc/Sections]
 [Started section: 's1']
-MiscTests.cpp:21: a != b succeeded for: 1 != 2
-MiscTests.cpp:22: b != a succeeded for: 2 != 1
+MiscTests.cpp: a != b succeeded for: 1 != 2
+MiscTests.cpp: b != a succeeded for: 2 != 1
 [End of section: 's1' All 2 assertions passed]
 
 [Started section: 's2']
-MiscTests.cpp:27: a != b succeeded for: 1 != 2
+MiscTests.cpp: a != b succeeded for: 1 != 2
 [End of section: 's2' 1 assertion passed]
 
 [Finished: './succeeding/Misc/Sections' All tests passed (3 assertions in 1 test case)]
 
 [Running: ./succeeding/Misc/Sections/nested]
 [Started section: 's1']
-MiscTests.cpp:38: a != b succeeded for: 1 != 2
-MiscTests.cpp:39: b != a succeeded for: 2 != 1
+MiscTests.cpp: a != b succeeded for: 1 != 2
+MiscTests.cpp: b != a succeeded for: 2 != 1
 [Started section: 's2']
-MiscTests.cpp:43: a != b succeeded for: 1 != 2
+MiscTests.cpp: a != b succeeded for: 1 != 2
 [End of section: 's2' 1 assertion passed]
 
 [End of section: 's1' All 3 assertions passed]
@@ -13255,21 +13255,21 @@
 [Running: ./mixed/Misc/Sections/nested2]
 [Started section: 's1']
 [Started section: 's2']
-MiscTests.cpp:57: a == b failed for: 1 == 2
+MiscTests.cpp: a == b failed for: 1 == 2
 [End of section: 's2' 1 assertion failed]
 
 [End of section: 's1' 1 assertion failed]
 
 [Started section: 's1']
 [Started section: 's3']
-MiscTests.cpp:62: a != b succeeded for: 1 != 2
+MiscTests.cpp: a != b succeeded for: 1 != 2
 [End of section: 's3' 1 assertion passed]
 
 [End of section: 's1' 1 assertion passed]
 
 [Started section: 's1']
 [Started section: 's4']
-MiscTests.cpp:66: a < b succeeded for: 1 < 2
+MiscTests.cpp: a < b succeeded for: 1 < 2
 [End of section: 's4' 1 assertion passed]
 
 [End of section: 's1' 1 assertion passed]
@@ -13305,26 +13305,26 @@
 
 [Running: ./mixed/Misc/Sections/loops]
 [Started section: 's1']
-MiscTests.cpp:99: b > a failed for: 0 > 1
+MiscTests.cpp: b > a failed for: 0 > 1
 [End of section: 's1' 1 assertion failed]
 
 [Finished: './mixed/Misc/Sections/loops' 1 test case failed (1 assertion failed)]
 
 [Running: ./mixed/Misc/loops]
-MiscTests.cpp:110: [info: Testing if fib[0] (1) is even]
-MiscTests.cpp:111: ( fib[i] % 2 ) == 0 failed for: 1 == 0
-MiscTests.cpp:110: [info: Testing if fib[1] (1) is even]
-MiscTests.cpp:111: ( fib[i] % 2 ) == 0 failed for: 1 == 0
-MiscTests.cpp:111: ( fib[i] % 2 ) == 0 succeeded for: 0 == 0
-MiscTests.cpp:110: [info: Testing if fib[3] (3) is even]
-MiscTests.cpp:111: ( fib[i] % 2 ) == 0 failed for: 1 == 0
-MiscTests.cpp:110: [info: Testing if fib[4] (5) is even]
-MiscTests.cpp:111: ( fib[i] % 2 ) == 0 failed for: 1 == 0
-MiscTests.cpp:111: ( fib[i] % 2 ) == 0 succeeded for: 0 == 0
-MiscTests.cpp:110: [info: Testing if fib[6] (13) is even]
-MiscTests.cpp:111: ( fib[i] % 2 ) == 0 failed for: 1 == 0
-MiscTests.cpp:110: [info: Testing if fib[7] (21) is even]
-MiscTests.cpp:111: ( fib[i] % 2 ) == 0 failed for: 1 == 0
+MiscTests.cpp: [info: Testing if fib[0] (1) is even]
+MiscTests.cpp: ( fib[i] % 2 ) == 0 failed for: 1 == 0
+MiscTests.cpp: [info: Testing if fib[1] (1) is even]
+MiscTests.cpp: ( fib[i] % 2 ) == 0 failed for: 1 == 0
+MiscTests.cpp: ( fib[i] % 2 ) == 0 succeeded for: 0 == 0
+MiscTests.cpp: [info: Testing if fib[3] (3) is even]
+MiscTests.cpp: ( fib[i] % 2 ) == 0 failed for: 1 == 0
+MiscTests.cpp: [info: Testing if fib[4] (5) is even]
+MiscTests.cpp: ( fib[i] % 2 ) == 0 failed for: 1 == 0
+MiscTests.cpp: ( fib[i] % 2 ) == 0 succeeded for: 0 == 0
+MiscTests.cpp: [info: Testing if fib[6] (13) is even]
+MiscTests.cpp: ( fib[i] % 2 ) == 0 failed for: 1 == 0
+MiscTests.cpp: [info: Testing if fib[7] (21) is even]
+MiscTests.cpp: ( fib[i] % 2 ) == 0 failed for: 1 == 0
 [Finished: './mixed/Misc/loops' 1 test case failed (6 of 8 assertions failed)]
 Some information
 An error
@@ -13336,34 +13336,34 @@
 [Finished: './succeeding/Misc/stdout,stderr' 1 test case failed (1 assertion failed)]
 
 [Running: ./succeeding/Misc/null strings]
-MiscTests.cpp:129: makeString( false ) != static_cast<char*>(__null) succeeded for: "valid string" != {null string}
-MiscTests.cpp:130: makeString( true ) == static_cast<char*>(__null) succeeded for: {null string} == {null string}
+MiscTests.cpp: makeString( false ) != static_cast<char*>(__null) succeeded for: "valid string" != {null string}
+MiscTests.cpp: makeString( true ) == static_cast<char*>(__null) succeeded for: {null string} == {null string}
 [Finished: './succeeding/Misc/null strings' All tests passed (2 assertions in 1 test case)]
 
 [Running: ./failing/info]
-MiscTests.cpp:135: [info: hi]
-MiscTests.cpp:137: [info: i := 7]
-MiscTests.cpp:138: false failed
+MiscTests.cpp: [info: hi]
+MiscTests.cpp: [info: i := 7]
+MiscTests.cpp: false failed
 [Finished: './failing/info' 1 test case failed (1 assertion failed)]
 
 [Running: ./succeeding/checkedif]
-MiscTests.cpp:143: flag succeeded for: true
-MiscTests.cpp:151: testCheckedIf( true ) succeeded for: true
+MiscTests.cpp: flag succeeded for: true
+MiscTests.cpp: testCheckedIf( true ) succeeded for: true
 [Finished: './succeeding/checkedif' All tests passed (2 assertions in 1 test case)]
 
 [Running: ./failing/checkedif]
-MiscTests.cpp:143: flag failed for: false
-MiscTests.cpp:156: testCheckedIf( false ) failed for: false
+MiscTests.cpp: flag failed for: false
+MiscTests.cpp: testCheckedIf( false ) failed for: false
 [Finished: './failing/checkedif' 1 test case failed (All 2 assertions failed)]
 
 [Running: ./succeeding/checkedelse]
-MiscTests.cpp:161: flag succeeded for: true
-MiscTests.cpp:169: testCheckedElse( true ) succeeded for: true
+MiscTests.cpp: flag succeeded for: true
+MiscTests.cpp: testCheckedElse( true ) succeeded for: true
 [Finished: './succeeding/checkedelse' All tests passed (2 assertions in 1 test case)]
 
 [Running: ./failing/checkedelse]
-MiscTests.cpp:161: flag failed for: false
-MiscTests.cpp:174: testCheckedElse( false ) failed for: false
+MiscTests.cpp: flag failed for: false
+MiscTests.cpp: testCheckedElse( false ) failed for: false
 [Finished: './failing/checkedelse' 1 test case failed (All 2 assertions failed)]
 
 [Running: ./misc/xmlentitycheck]
@@ -13382,72 +13382,72 @@
 [Finished: './misc/xmlentitycheck' 1 test case failed (All 2 assertions failed)]
 
 [Running: ./manual/onechar]
-MiscTests.cpp:191: [info: 3]
-MiscTests.cpp:192: false failed
+MiscTests.cpp: [info: 3]
+MiscTests.cpp: false failed
 [Finished: './manual/onechar' 1 test case failed (1 assertion failed)]
 
 [Running: ./succeeding/atomic if]
-MiscTests.cpp:202: x == 0 succeeded for: 0 == 0
+MiscTests.cpp: x == 0 succeeded for: 0 == 0
 [Finished: './succeeding/atomic if' All tests passed (1 assertion in 1 test case)]
 
 [Running: ./succeeding/matchers]
-MiscTests.cpp:212: testStringForMatching() Contains( "string" ) succeeded for:
+MiscTests.cpp: testStringForMatching() Contains( "string" ) succeeded for:
 	"this string contains 'abc' as a substring" contains: "string"
-MiscTests.cpp:213: testStringForMatching() Contains( "abc" ) succeeded for:
+MiscTests.cpp: testStringForMatching() Contains( "abc" ) succeeded for:
 	"this string contains 'abc' as a substring" contains: "abc"
-MiscTests.cpp:215: testStringForMatching() StartsWith( "this" ) succeeded for:
+MiscTests.cpp: testStringForMatching() StartsWith( "this" ) succeeded for:
 	"this string contains 'abc' as a substring" starts with: "this"
-MiscTests.cpp:216: testStringForMatching() EndsWith( "substring" ) succeeded for:
+MiscTests.cpp: testStringForMatching() EndsWith( "substring" ) succeeded for:
 	"this string contains 'abc' as a substring" ends with: "substring"
 [Finished: './succeeding/matchers' All tests passed (4 assertions in 1 test case)]
 
 [Running: ./failing/matchers/Contains]
-MiscTests.cpp:221: testStringForMatching() Contains( "not there" ) failed for:
+MiscTests.cpp: testStringForMatching() Contains( "not there" ) failed for:
 	"this string contains 'abc' as a substring" contains: "not there"
 [Finished: './failing/matchers/Contains' 1 test case failed (1 assertion failed)]
 
 [Running: ./failing/matchers/StartsWith]
-MiscTests.cpp:226: testStringForMatching() StartsWith( "string" ) failed for:
+MiscTests.cpp: testStringForMatching() StartsWith( "string" ) failed for:
 	"this string contains 'abc' as a substring" starts with: "string"
 [Finished: './failing/matchers/StartsWith' 1 test case failed (1 assertion failed)]
 
 [Running: ./failing/matchers/EndsWith]
-MiscTests.cpp:231: testStringForMatching() EndsWith( "this" ) failed for:
+MiscTests.cpp: testStringForMatching() EndsWith( "this" ) failed for:
 	"this string contains 'abc' as a substring" ends with: "this"
 [Finished: './failing/matchers/EndsWith' 1 test case failed (1 assertion failed)]
 
 [Running: ./failing/matchers/Equals]
-MiscTests.cpp:236: testStringForMatching() Equals( "something else" ) failed for:
+MiscTests.cpp: testStringForMatching() Equals( "something else" ) failed for:
 	"this string contains 'abc' as a substring" equals: "something else"
 [Finished: './failing/matchers/Equals' 1 test case failed (1 assertion failed)]
 
 [Running: string]
-MiscTests.cpp:240: "" Equals(__null) succeeded for: "" equals: ""
+MiscTests.cpp: "" Equals(__null) succeeded for: "" equals: ""
 [Finished: 'string' All tests passed (1 assertion in 1 test case)]
 
 [Running: ./succeeding/matchers/AllOf]
-MiscTests.cpp:244: testStringForMatching() AllOf( Catch::Contains( "string" ), Catch::Contains( "abc" ) ) succeeded for:
+MiscTests.cpp: testStringForMatching() AllOf( Catch::Contains( "string" ), Catch::Contains( "abc" ) ) succeeded for:
 "this string contains 'abc' as a substring" ( contains: "string" and contains: "abc" )
 [Finished: './succeeding/matchers/AllOf' All tests passed (1 assertion in 1 test case)]
 
 [Running: ./succeeding/matchers/AnyOf]
-MiscTests.cpp:248: testStringForMatching() AnyOf( Catch::Contains( "string" ), Catch::Contains( "not there" ) ) succeeded for:
+MiscTests.cpp: testStringForMatching() AnyOf( Catch::Contains( "string" ), Catch::Contains( "not there" ) ) succeeded for:
 "this string contains 'abc' as a substring" ( contains: "string" or contains: "not there" )
-MiscTests.cpp:249: testStringForMatching() AnyOf( Catch::Contains( "not there" ), Catch::Contains( "string" ) ) succeeded for:
+MiscTests.cpp: testStringForMatching() AnyOf( Catch::Contains( "not there" ), Catch::Contains( "string" ) ) succeeded for:
 "this string contains 'abc' as a substring" ( contains: "not there" or contains: "string" )
 [Finished: './succeeding/matchers/AnyOf' All tests passed (2 assertions in 1 test case)]
 
 [Running: ./succeeding/matchers/Equals]
-MiscTests.cpp:254: testStringForMatching() Equals( "this string contains 'abc' as a substring" ) succeeded for:
+MiscTests.cpp: testStringForMatching() Equals( "this string contains 'abc' as a substring" ) succeeded for:
 "this string contains 'abc' as a substring" equals: "this string contains 'abc' as a substring"
 [Finished: './succeeding/matchers/Equals' All tests passed (1 assertion in 1 test case)]
 
 [Running: Factorials are computed]
-MiscTests.cpp:264: Factorial(0) == 1 succeeded for: 1 == 1
-MiscTests.cpp:265: Factorial(1) == 1 succeeded for: 1 == 1
-MiscTests.cpp:266: Factorial(2) == 2 succeeded for: 2 == 2
-MiscTests.cpp:267: Factorial(3) == 6 succeeded for: 6 == 6
-MiscTests.cpp:268: Factorial(10) == 3628800 succeeded for: 0x<hex digits> == 3628800
+MiscTests.cpp: Factorial(0) == 1 succeeded for: 1 == 1
+MiscTests.cpp: Factorial(1) == 1 succeeded for: 1 == 1
+MiscTests.cpp: Factorial(2) == 2 succeeded for: 2 == 2
+MiscTests.cpp: Factorial(3) == 6 succeeded for: 6 == 6
+MiscTests.cpp: Factorial(10) == 3628800 succeeded for: 0x<hex digits> == 3628800
 [Finished: 'Factorials are computed' All tests passed (5 assertions in 1 test case)]
 
 [Running: empty]
@@ -13457,7 +13457,7 @@
 [Finished: 'empty' 1 test case failed (1 assertion failed)]
 
 [Running: Nice descriptive name]
-MiscTests.cpp:277: [warning: This one ran]
+MiscTests.cpp: [warning: This one ran]
 
 No assertions in test case, 'Nice descriptive name'
 
@@ -13476,43 +13476,43 @@
 [Finished: 'second tag' 1 test case failed (1 assertion failed)]
 
 [Running: vectors can be sized and resized]
-MiscTests.cpp:299: v.size() == 5 succeeded for: 5 == 5
-MiscTests.cpp:300: v.capacity() >= 5 succeeded for: 5 >= 5
+MiscTests.cpp: v.size() == 5 succeeded for: 5 == 5
+MiscTests.cpp: v.capacity() >= 5 succeeded for: 5 >= 5
 [Started section: 'resizing bigger changes size and capacity']
-MiscTests.cpp:305: v.size() == 10 succeeded for: 10 == 10
-MiscTests.cpp:306: v.capacity() >= 10 succeeded for: 10 >= 10
+MiscTests.cpp: v.size() == 10 succeeded for: 10 == 10
+MiscTests.cpp: v.capacity() >= 10 succeeded for: 10 >= 10
 [End of section: 'resizing bigger changes size and capacity' All 2 assertions passed]
 
-MiscTests.cpp:299: v.size() == 5 succeeded for: 5 == 5
-MiscTests.cpp:300: v.capacity() >= 5 succeeded for: 5 >= 5
+MiscTests.cpp: v.size() == 5 succeeded for: 5 == 5
+MiscTests.cpp: v.capacity() >= 5 succeeded for: 5 >= 5
 [Started section: 'resizing smaller changes size but not capacity']
-MiscTests.cpp:311: v.size() == 0 succeeded for: 0 == 0
-MiscTests.cpp:312: v.capacity() >= 5 succeeded for: 5 >= 5
+MiscTests.cpp: v.size() == 0 succeeded for: 0 == 0
+MiscTests.cpp: v.capacity() >= 5 succeeded for: 5 >= 5
 [Started section: 'We can use the 'swap trick' to reset the capacity']
-MiscTests.cpp:318: v.capacity() == 0 succeeded for: 0 == 0
+MiscTests.cpp: v.capacity() == 0 succeeded for: 0 == 0
 [End of section: 'We can use the 'swap trick' to reset the capacity' 1 assertion passed]
 
 [End of section: 'resizing smaller changes size but not capacity' All 3 assertions passed]
 
-MiscTests.cpp:299: v.size() == 5 succeeded for: 5 == 5
-MiscTests.cpp:300: v.capacity() >= 5 succeeded for: 5 >= 5
+MiscTests.cpp: v.size() == 5 succeeded for: 5 == 5
+MiscTests.cpp: v.capacity() >= 5 succeeded for: 5 >= 5
 [Started section: 'resizing smaller changes size but not capacity']
-MiscTests.cpp:311: v.size() == 0 succeeded for: 0 == 0
-MiscTests.cpp:312: v.capacity() >= 5 succeeded for: 5 >= 5
+MiscTests.cpp: v.size() == 0 succeeded for: 0 == 0
+MiscTests.cpp: v.capacity() >= 5 succeeded for: 5 >= 5
 [End of section: 'resizing smaller changes size but not capacity' All 2 assertions passed]
 
-MiscTests.cpp:299: v.size() == 5 succeeded for: 5 == 5
-MiscTests.cpp:300: v.capacity() >= 5 succeeded for: 5 >= 5
+MiscTests.cpp: v.size() == 5 succeeded for: 5 == 5
+MiscTests.cpp: v.capacity() >= 5 succeeded for: 5 >= 5
 [Started section: 'reserving bigger changes capacity but not size']
-MiscTests.cpp:324: v.size() == 5 succeeded for: 5 == 5
-MiscTests.cpp:325: v.capacity() >= 10 succeeded for: 10 >= 10
+MiscTests.cpp: v.size() == 5 succeeded for: 5 == 5
+MiscTests.cpp: v.capacity() >= 10 succeeded for: 10 >= 10
 [End of section: 'reserving bigger changes capacity but not size' All 2 assertions passed]
 
-MiscTests.cpp:299: v.size() == 5 succeeded for: 5 == 5
-MiscTests.cpp:300: v.capacity() >= 5 succeeded for: 5 >= 5
+MiscTests.cpp: v.size() == 5 succeeded for: 5 == 5
+MiscTests.cpp: v.capacity() >= 5 succeeded for: 5 >= 5
 [Started section: 'reserving smaller does not change size or capacity']
-MiscTests.cpp:330: v.size() == 5 succeeded for: 5 == 5
-MiscTests.cpp:331: v.capacity() >= 5 succeeded for: 5 >= 5
+MiscTests.cpp: v.size() == 5 succeeded for: 5 == 5
+MiscTests.cpp: v.capacity() >= 5 succeeded for: 5 >= 5
 [End of section: 'reserving smaller does not change size or capacity' All 2 assertions passed]
 
 [Finished: 'vectors can be sized and resized' All tests passed (21 assertions in 1 test case)]
@@ -13520,59 +13520,59 @@
 [Running: selftest/main]
 [Started section: 'selftest/expected result']
 [Started section: 'selftest/expected result/failing tests']
-catch_self_test.hpp:120:  succeeded
+catch_self_test.hpp:  succeeded
 [with message: Tests failed, as expected]
-catch_self_test.hpp:120:  succeeded
+catch_self_test.hpp:  succeeded
 [with message: Tests failed, as expected]
-catch_self_test.hpp:120:  succeeded
+catch_self_test.hpp:  succeeded
 [with message: Tests failed, as expected]
-catch_self_test.hpp:120:  succeeded
+catch_self_test.hpp:  succeeded
 [with message: Tests failed, as expected]
-catch_self_test.hpp:120:  succeeded
+catch_self_test.hpp:  succeeded
 [with message: Tests failed, as expected]
-catch_self_test.hpp:120:  succeeded
+catch_self_test.hpp:  succeeded
 [with message: Tests failed, as expected]
-catch_self_test.hpp:120:  succeeded
+catch_self_test.hpp:  succeeded
 [with message: Tests failed, as expected]
-catch_self_test.hpp:120:  succeeded
+catch_self_test.hpp:  succeeded
 [with message: Tests failed, as expected]
-catch_self_test.hpp:120:  succeeded
+catch_self_test.hpp:  succeeded
 [with message: Tests failed, as expected]
-catch_self_test.hpp:120:  succeeded
+catch_self_test.hpp:  succeeded
 [with message: Tests failed, as expected]
-catch_self_test.hpp:120:  succeeded
+catch_self_test.hpp:  succeeded
 [with message: Tests failed, as expected]
-catch_self_test.hpp:120:  succeeded
+catch_self_test.hpp:  succeeded
 [with message: Tests failed, as expected]
-catch_self_test.hpp:120:  succeeded
+catch_self_test.hpp:  succeeded
 [with message: Tests failed, as expected]
-catch_self_test.hpp:120:  succeeded
+catch_self_test.hpp:  succeeded
 [with message: Tests failed, as expected]
-catch_self_test.hpp:120:  succeeded
+catch_self_test.hpp:  succeeded
 [with message: Tests failed, as expected]
-catch_self_test.hpp:120:  succeeded
+catch_self_test.hpp:  succeeded
 [with message: Tests failed, as expected]
-catch_self_test.hpp:120:  succeeded
+catch_self_test.hpp:  succeeded
 [with message: Tests failed, as expected]
-catch_self_test.hpp:120:  succeeded
+catch_self_test.hpp:  succeeded
 [with message: Tests failed, as expected]
-catch_self_test.hpp:120:  succeeded
+catch_self_test.hpp:  succeeded
 [with message: Tests failed, as expected]
-catch_self_test.hpp:120:  succeeded
+catch_self_test.hpp:  succeeded
 [with message: Tests failed, as expected]
-catch_self_test.hpp:120:  succeeded
+catch_self_test.hpp:  succeeded
 [with message: Tests failed, as expected]
-catch_self_test.hpp:120:  succeeded
+catch_self_test.hpp:  succeeded
 [with message: Tests failed, as expected]
-catch_self_test.hpp:120:  succeeded
+catch_self_test.hpp:  succeeded
 [with message: Tests failed, as expected]
-catch_self_test.hpp:120:  succeeded
+catch_self_test.hpp:  succeeded
 [with message: Tests failed, as expected]
-catch_self_test.hpp:120:  succeeded
+catch_self_test.hpp:  succeeded
 [with message: Tests failed, as expected]
-catch_self_test.hpp:120:  succeeded
+catch_self_test.hpp:  succeeded
 [with message: Tests failed, as expected]
-catch_self_test.hpp:120:  succeeded
+catch_self_test.hpp:  succeeded
 [with message: Tests failed, as expected]
 [End of section: 'selftest/expected result/failing tests' All 27 assertions passed]
 
@@ -13580,101 +13580,101 @@
 
 [Started section: 'selftest/expected result']
 [Started section: 'selftest/expected result/succeeding tests']
-catch_self_test.hpp:109:  succeeded
+catch_self_test.hpp:  succeeded
 [with message: Tests passed, as expected]
-catch_self_test.hpp:109:  succeeded
+catch_self_test.hpp:  succeeded
 [with message: Tests passed, as expected]
-catch_self_test.hpp:109:  succeeded
+catch_self_test.hpp:  succeeded
 [with message: Tests passed, as expected]
-catch_self_test.hpp:109:  succeeded
+catch_self_test.hpp:  succeeded
 [with message: Tests passed, as expected]
-catch_self_test.hpp:109:  succeeded
+catch_self_test.hpp:  succeeded
 [with message: Tests passed, as expected]
-catch_self_test.hpp:109:  succeeded
+catch_self_test.hpp:  succeeded
 [with message: Tests passed, as expected]
-catch_self_test.hpp:109:  succeeded
+catch_self_test.hpp:  succeeded
 [with message: Tests passed, as expected]
-catch_self_test.hpp:109:  succeeded
+catch_self_test.hpp:  succeeded
 [with message: Tests passed, as expected]
-catch_self_test.hpp:109:  succeeded
+catch_self_test.hpp:  succeeded
 [with message: Tests passed, as expected]
-catch_self_test.hpp:109:  succeeded
+catch_self_test.hpp:  succeeded
 [with message: Tests passed, as expected]
-catch_self_test.hpp:109:  succeeded
+catch_self_test.hpp:  succeeded
 [with message: Tests passed, as expected]
-catch_self_test.hpp:109:  succeeded
+catch_self_test.hpp:  succeeded
 [with message: Tests passed, as expected]
-catch_self_test.hpp:109:  succeeded
+catch_self_test.hpp:  succeeded
 [with message: Tests passed, as expected]
-catch_self_test.hpp:109:  succeeded
+catch_self_test.hpp:  succeeded
 [with message: Tests passed, as expected]
-catch_self_test.hpp:109:  succeeded
+catch_self_test.hpp:  succeeded
 [with message: Tests passed, as expected]
-catch_self_test.hpp:109:  succeeded
+catch_self_test.hpp:  succeeded
 [with message: Tests passed, as expected]
-catch_self_test.hpp:109:  succeeded
+catch_self_test.hpp:  succeeded
 [with message: Tests passed, as expected]
-catch_self_test.hpp:109:  succeeded
+catch_self_test.hpp:  succeeded
 [with message: Tests passed, as expected]
-catch_self_test.hpp:109:  succeeded
+catch_self_test.hpp:  succeeded
 [with message: Tests passed, as expected]
-catch_self_test.hpp:109:  succeeded
+catch_self_test.hpp:  succeeded
 [with message: Tests passed, as expected]
-catch_self_test.hpp:109:  succeeded
+catch_self_test.hpp:  succeeded
 [with message: Tests passed, as expected]
-catch_self_test.hpp:109:  succeeded
+catch_self_test.hpp:  succeeded
 [with message: Tests passed, as expected]
-catch_self_test.hpp:109:  succeeded
+catch_self_test.hpp:  succeeded
 [with message: Tests passed, as expected]
-catch_self_test.hpp:109:  succeeded
+catch_self_test.hpp:  succeeded
 [with message: Tests passed, as expected]
-catch_self_test.hpp:109:  succeeded
+catch_self_test.hpp:  succeeded
 [with message: Tests passed, as expected]
 Message from section one
 Message from section two
-catch_self_test.hpp:109:  succeeded
+catch_self_test.hpp:  succeeded
 [with message: Tests passed, as expected]
-catch_self_test.hpp:109:  succeeded
+catch_self_test.hpp:  succeeded
 [with message: Tests passed, as expected]
-catch_self_test.hpp:109:  succeeded
+catch_self_test.hpp:  succeeded
 [with message: Tests passed, as expected]
-catch_self_test.hpp:109:  succeeded
+catch_self_test.hpp:  succeeded
 [with message: Tests passed, as expected]
 Some information
 An error
-catch_self_test.hpp:109:  succeeded
+catch_self_test.hpp:  succeeded
 [with message: Tests passed, as expected]
-catch_self_test.hpp:109:  succeeded
+catch_self_test.hpp:  succeeded
 [with message: Tests passed, as expected]
-catch_self_test.hpp:109:  succeeded
+catch_self_test.hpp:  succeeded
 [with message: Tests passed, as expected]
-catch_self_test.hpp:109:  succeeded
+catch_self_test.hpp:  succeeded
 [with message: Tests passed, as expected]
-catch_self_test.hpp:109:  succeeded
+catch_self_test.hpp:  succeeded
 [with message: Tests passed, as expected]
-catch_self_test.hpp:109:  succeeded
+catch_self_test.hpp:  succeeded
 [with message: Tests passed, as expected]
-catch_self_test.hpp:109:  succeeded
+catch_self_test.hpp:  succeeded
 [with message: Tests passed, as expected]
-catch_self_test.hpp:109:  succeeded
+catch_self_test.hpp:  succeeded
 [with message: Tests passed, as expected]
-catch_self_test.hpp:109:  succeeded
+catch_self_test.hpp:  succeeded
 [with message: Tests passed, as expected]
-catch_self_test.hpp:109:  succeeded
+catch_self_test.hpp:  succeeded
 [with message: Tests passed, as expected]
-catch_self_test.hpp:109:  succeeded
+catch_self_test.hpp:  succeeded
 [with message: Tests passed, as expected]
-catch_self_test.hpp:109:  succeeded
+catch_self_test.hpp:  succeeded
 [with message: Tests passed, as expected]
-catch_self_test.hpp:109:  succeeded
+catch_self_test.hpp:  succeeded
 [with message: Tests passed, as expected]
-catch_self_test.hpp:109:  succeeded
+catch_self_test.hpp:  succeeded
 [with message: Tests passed, as expected]
-catch_self_test.hpp:109:  succeeded
+catch_self_test.hpp:  succeeded
 [with message: Tests passed, as expected]
-catch_self_test.hpp:109:  succeeded
+catch_self_test.hpp:  succeeded
 [with message: Tests passed, as expected]
-catch_self_test.hpp:109:  succeeded
+catch_self_test.hpp:  succeeded
 [with message: Tests passed, as expected]
 [End of section: 'selftest/expected result/succeeding tests' All 46 assertions passed]
 
@@ -13686,16 +13686,16 @@
 An error
 [Started section: 'selftest/test counts']
 [Started section: 'selftest/test counts/succeeding tests']
-TestMain.cpp:41: totals.assertions.passed == 296 succeeded for: 296 == 296
-TestMain.cpp:42: totals.assertions.failed == 0 succeeded for: 0 == 0
+TestMain.cpp: totals.assertions.passed == 296 succeeded for: 296 == 296
+TestMain.cpp: totals.assertions.failed == 0 succeeded for: 0 == 0
 [End of section: 'selftest/test counts/succeeding tests' All 2 assertions passed]
 
 [End of section: 'selftest/test counts' All 2 assertions passed]
 
 [Started section: 'selftest/test counts']
 [Started section: 'selftest/test counts/failing tests']
-TestMain.cpp:48: totals.assertions.passed == 1 succeeded for: 1 == 1
-TestMain.cpp:49: totals.assertions.failed == 74 succeeded for: 74 == 74
+TestMain.cpp: totals.assertions.passed == 1 succeeded for: 1 == 1
+TestMain.cpp: totals.assertions.failed == 74 succeeded for: 74 == 74
 [End of section: 'selftest/test counts/failing tests' All 2 assertions passed]
 
 [End of section: 'selftest/test counts' All 2 assertions passed]
@@ -13703,119 +13703,119 @@
 [Finished: 'selftest/main' All tests passed (77 assertions in 1 test case)]
 
 [Running: meta/Misc/Sections]
-TestMain.cpp:58: totals.assertions.passed == 2 succeeded for: 2 == 2
-TestMain.cpp:59: totals.assertions.failed == 1 succeeded for: 1 == 1
+TestMain.cpp: totals.assertions.passed == 2 succeeded for: 2 == 2
+TestMain.cpp: totals.assertions.failed == 1 succeeded for: 1 == 1
 [Finished: 'meta/Misc/Sections' All tests passed (2 assertions in 1 test case)]
 
 [Running: Process can be configured on command line]
 [Started section: 'default - no arguments']
-TestMain.cpp:98: parseIntoConfig( argv, config ) succeeded
-TestMain.cpp:100: config.shouldDebugBreak == false succeeded for: false == false
-TestMain.cpp:101: config.abortAfter == -1 succeeded for: -1 == -1
-TestMain.cpp:102: config.noThrow == false succeeded for: false == false
-TestMain.cpp:103: config.reporterName.empty() succeeded for: true
+TestMain.cpp: parseIntoConfig( argv, config ) succeeded
+TestMain.cpp: config.shouldDebugBreak == false succeeded for: false == false
+TestMain.cpp: config.abortAfter == -1 succeeded for: -1 == -1
+TestMain.cpp: config.noThrow == false succeeded for: false == false
+TestMain.cpp: config.reporterName.empty() succeeded for: true
 [End of section: 'default - no arguments' All 5 assertions passed]
 
 [Started section: 'test lists']
 [Started section: '1 test']
-TestMain.cpp:109: parseIntoConfig( argv, config ) succeeded
-TestMain.cpp:112: cfg.filters().size() == 1 succeeded for: 1 == 1
-TestMain.cpp:113: cfg.filters()[0].shouldInclude( fakeTestCase( "notIncluded" ) ) == false succeeded for: false == false
-TestMain.cpp:114: cfg.filters()[0].shouldInclude( fakeTestCase( "test1" ) ) succeeded for: true
+TestMain.cpp: parseIntoConfig( argv, config ) succeeded
+TestMain.cpp: cfg.filters().size() == 1 succeeded for: 1 == 1
+TestMain.cpp: cfg.filters()[0].shouldInclude( fakeTestCase( "notIncluded" ) ) == false succeeded for: false == false
+TestMain.cpp: cfg.filters()[0].shouldInclude( fakeTestCase( "test1" ) ) succeeded for: true
 [End of section: '1 test' All 4 assertions passed]
 
 [End of section: 'test lists' All 4 assertions passed]
 
 [Started section: 'test lists']
 [Started section: 'Specify one test case exclusion using exclude:']
-TestMain.cpp:118: parseIntoConfig( argv, config ) succeeded
-TestMain.cpp:121: cfg.filters().size() == 1 succeeded for: 1 == 1
-TestMain.cpp:122: cfg.filters()[0].shouldInclude( fakeTestCase( "test1" ) ) == false succeeded for: false == false
-TestMain.cpp:123: cfg.filters()[0].shouldInclude( fakeTestCase( "alwaysIncluded" ) ) succeeded for: true
+TestMain.cpp: parseIntoConfig( argv, config ) succeeded
+TestMain.cpp: cfg.filters().size() == 1 succeeded for: 1 == 1
+TestMain.cpp: cfg.filters()[0].shouldInclude( fakeTestCase( "test1" ) ) == false succeeded for: false == false
+TestMain.cpp: cfg.filters()[0].shouldInclude( fakeTestCase( "alwaysIncluded" ) ) succeeded for: true
 [End of section: 'Specify one test case exclusion using exclude:' All 4 assertions passed]
 
 [End of section: 'test lists' All 4 assertions passed]
 
 [Started section: 'test lists']
 [Started section: 'Specify one test case exclusion using ~']
-TestMain.cpp:128: parseIntoConfig( argv, config ) succeeded
-TestMain.cpp:131: cfg.filters().size() == 1 succeeded for: 1 == 1
-TestMain.cpp:132: cfg.filters()[0].shouldInclude( fakeTestCase( "test1" ) ) == false succeeded for: false == false
-TestMain.cpp:133: cfg.filters()[0].shouldInclude( fakeTestCase( "alwaysIncluded" ) ) succeeded for: true
+TestMain.cpp: parseIntoConfig( argv, config ) succeeded
+TestMain.cpp: cfg.filters().size() == 1 succeeded for: 1 == 1
+TestMain.cpp: cfg.filters()[0].shouldInclude( fakeTestCase( "test1" ) ) == false succeeded for: false == false
+TestMain.cpp: cfg.filters()[0].shouldInclude( fakeTestCase( "alwaysIncluded" ) ) succeeded for: true
 [End of section: 'Specify one test case exclusion using ~' All 4 assertions passed]
 
 [End of section: 'test lists' All 4 assertions passed]
 
 [Started section: 'test lists']
 [Started section: 'Specify two test cases using -t']
-TestMain.cpp:138: parseIntoConfig( argv, config ) succeeded
-TestMain.cpp:141: cfg.filters().size() == 1 succeeded for: 1 == 1
-TestMain.cpp:142: cfg.filters()[0].shouldInclude( fakeTestCase( "notIncluded" ) ) == false succeeded for: false == false
-TestMain.cpp:143: cfg.filters()[0].shouldInclude( fakeTestCase( "test1" ) ) succeeded for: true
-TestMain.cpp:144: cfg.filters()[0].shouldInclude( fakeTestCase( "test2" ) ) succeeded for: true
+TestMain.cpp: parseIntoConfig( argv, config ) succeeded
+TestMain.cpp: cfg.filters().size() == 1 succeeded for: 1 == 1
+TestMain.cpp: cfg.filters()[0].shouldInclude( fakeTestCase( "notIncluded" ) ) == false succeeded for: false == false
+TestMain.cpp: cfg.filters()[0].shouldInclude( fakeTestCase( "test1" ) ) succeeded for: true
+TestMain.cpp: cfg.filters()[0].shouldInclude( fakeTestCase( "test2" ) ) succeeded for: true
 [End of section: 'Specify two test cases using -t' All 5 assertions passed]
 
 [End of section: 'test lists' All 5 assertions passed]
 
 [Started section: 'reporter']
 [Started section: '-r/console']
-TestMain.cpp:151: parseIntoConfig( argv, config ) succeeded
-TestMain.cpp:153: config.reporterName == "console" succeeded for: "console" == "console"
+TestMain.cpp: parseIntoConfig( argv, config ) succeeded
+TestMain.cpp: config.reporterName == "console" succeeded for: "console" == "console"
 [End of section: '-r/console' All 2 assertions passed]
 
 [End of section: 'reporter' All 2 assertions passed]
 
 [Started section: 'reporter']
 [Started section: '-r/xml']
-TestMain.cpp:157: parseIntoConfig( argv, config ) succeeded
-TestMain.cpp:159: config.reporterName == "xml" succeeded for: "xml" == "xml"
+TestMain.cpp: parseIntoConfig( argv, config ) succeeded
+TestMain.cpp: config.reporterName == "xml" succeeded for: "xml" == "xml"
 [End of section: '-r/xml' All 2 assertions passed]
 
 [End of section: 'reporter' All 2 assertions passed]
 
 [Started section: 'reporter']
 [Started section: '--reporter/junit']
-TestMain.cpp:163: parseIntoConfig( argv, config ) succeeded
-TestMain.cpp:165: config.reporterName == "junit" succeeded for: "junit" == "junit"
+TestMain.cpp: parseIntoConfig( argv, config ) succeeded
+TestMain.cpp: config.reporterName == "junit" succeeded for: "junit" == "junit"
 [End of section: '--reporter/junit' All 2 assertions passed]
 
 [End of section: 'reporter' All 2 assertions passed]
 
 [Started section: 'debugger']
 [Started section: '-b']
-TestMain.cpp:172: parseIntoConfig( argv, config ) succeeded
-TestMain.cpp:174: config.shouldDebugBreak == true succeeded for: true == true
+TestMain.cpp: parseIntoConfig( argv, config ) succeeded
+TestMain.cpp: config.shouldDebugBreak == true succeeded for: true == true
 [End of section: '-b' All 2 assertions passed]
 
 [End of section: 'debugger' All 2 assertions passed]
 
 [Started section: 'debugger']
 [Started section: '--break']
-TestMain.cpp:178: parseIntoConfig( argv, config ) succeeded
-TestMain.cpp:180: config.shouldDebugBreak succeeded for: true
+TestMain.cpp: parseIntoConfig( argv, config ) succeeded
+TestMain.cpp: config.shouldDebugBreak succeeded for: true
 [End of section: '--break' All 2 assertions passed]
 
 [End of section: 'debugger' All 2 assertions passed]
 
 [Started section: 'abort']
 [Started section: '-a aborts after first failure']
-TestMain.cpp:187: parseIntoConfig( argv, config ) succeeded
-TestMain.cpp:189: config.abortAfter == 1 succeeded for: 1 == 1
+TestMain.cpp: parseIntoConfig( argv, config ) succeeded
+TestMain.cpp: config.abortAfter == 1 succeeded for: 1 == 1
 [End of section: '-a aborts after first failure' All 2 assertions passed]
 
 [End of section: 'abort' All 2 assertions passed]
 
 [Started section: 'abort']
 [Started section: '-x 2 aborts after two failures']
-TestMain.cpp:193: parseIntoConfig( argv, config ) succeeded
-TestMain.cpp:195: config.abortAfter == 2 succeeded for: 2 == 2
+TestMain.cpp: parseIntoConfig( argv, config ) succeeded
+TestMain.cpp: config.abortAfter == 2 succeeded for: 2 == 2
 [End of section: '-x 2 aborts after two failures' All 2 assertions passed]
 
 [End of section: 'abort' All 2 assertions passed]
 
 [Started section: 'abort']
 [Started section: '-x must be greater than zero']
-TestMain.cpp:199: parseIntoConfigAndReturnError( argv, config ) Contains( "greater than zero" ) succeeded for:
+TestMain.cpp: parseIntoConfigAndReturnError( argv, config ) Contains( "greater than zero" ) succeeded for:
 "Value after -x or --abortAfter must be greater than zero while parsing: (-x, --abortx <number of failures>)" contains: "greater than zero"
 [End of section: '-x must be greater than zero' 1 assertion passed]
 
@@ -13823,7 +13823,7 @@
 
 [Started section: 'abort']
 [Started section: '-x must be numeric']
-TestMain.cpp:203: parseIntoConfigAndReturnError( argv, config ) Contains( "-x" ) succeeded for:
+TestMain.cpp: parseIntoConfigAndReturnError( argv, config ) Contains( "-x" ) succeeded for:
 "Unable to convert oops to destination type while parsing: (-x, --abortx <number of failures>)" contains: "-x"
 [End of section: '-x must be numeric' 1 assertion passed]
 
@@ -13831,42 +13831,42 @@
 
 [Started section: 'nothrow']
 [Started section: '-e']
-TestMain.cpp:210: parseIntoConfig( argv, config ) succeeded
-TestMain.cpp:212: config.noThrow == true succeeded for: true == true
+TestMain.cpp: parseIntoConfig( argv, config ) succeeded
+TestMain.cpp: config.noThrow == true succeeded for: true == true
 [End of section: '-e' All 2 assertions passed]
 
 [End of section: 'nothrow' All 2 assertions passed]
 
 [Started section: 'nothrow']
 [Started section: '--nothrow']
-TestMain.cpp:216: parseIntoConfig( argv, config ) succeeded
-TestMain.cpp:218: config.noThrow == true succeeded for: true == true
+TestMain.cpp: parseIntoConfig( argv, config ) succeeded
+TestMain.cpp: config.noThrow == true succeeded for: true == true
 [End of section: '--nothrow' All 2 assertions passed]
 
 [End of section: 'nothrow' All 2 assertions passed]
 
 [Started section: 'output filename']
 [Started section: '-o filename']
-TestMain.cpp:225: parseIntoConfig( argv, config ) succeeded
-TestMain.cpp:227: config.outputFilename == "filename.ext" succeeded for: "filename.ext" == "filename.ext"
+TestMain.cpp: parseIntoConfig( argv, config ) succeeded
+TestMain.cpp: config.outputFilename == "filename.ext" succeeded for: "filename.ext" == "filename.ext"
 [End of section: '-o filename' All 2 assertions passed]
 
 [End of section: 'output filename' All 2 assertions passed]
 
 [Started section: 'output filename']
 [Started section: '--out']
-TestMain.cpp:231: parseIntoConfig( argv, config ) succeeded
-TestMain.cpp:233: config.outputFilename == "filename.ext" succeeded for: "filename.ext" == "filename.ext"
+TestMain.cpp: parseIntoConfig( argv, config ) succeeded
+TestMain.cpp: config.outputFilename == "filename.ext" succeeded for: "filename.ext" == "filename.ext"
 [End of section: '--out' All 2 assertions passed]
 
 [End of section: 'output filename' All 2 assertions passed]
 
 [Started section: 'combinations']
 [Started section: 'Single character flags can be combined']
-TestMain.cpp:240: parseIntoConfig( argv, config ) succeeded
-TestMain.cpp:242: config.abortAfter == 1 succeeded for: 1 == 1
-TestMain.cpp:243: config.shouldDebugBreak succeeded for: true
-TestMain.cpp:244: config.noThrow == true succeeded for: true == true
+TestMain.cpp: parseIntoConfig( argv, config ) succeeded
+TestMain.cpp: config.abortAfter == 1 succeeded for: 1 == 1
+TestMain.cpp: config.shouldDebugBreak succeeded for: true
+TestMain.cpp: config.noThrow == true succeeded for: true == true
 [End of section: 'Single character flags can be combined' All 4 assertions passed]
 
 [End of section: 'combinations' All 4 assertions passed]
@@ -13874,77 +13874,77 @@
 [Finished: 'Process can be configured on command line' All tests passed (50 assertions in 1 test case)]
 
 [Running: selftest/test filter]
-TestMain.cpp:253: matchAny.shouldInclude( fakeTestCase( "any" ) ) succeeded for: true
-TestMain.cpp:254: matchNone.shouldInclude( fakeTestCase( "any" ) ) == false succeeded for: false == false
-TestMain.cpp:259: matchHidden.shouldInclude( fakeTestCase( "any" ) ) == false succeeded for: false == false
-TestMain.cpp:260: matchNonHidden.shouldInclude( fakeTestCase( "any" ) ) succeeded for: true
-TestMain.cpp:262: matchHidden.shouldInclude( fakeTestCase( "./any" ) ) succeeded for: true
-TestMain.cpp:263: matchNonHidden.shouldInclude( fakeTestCase( "./any" ) ) == false succeeded for: false == false
+TestMain.cpp: matchAny.shouldInclude( fakeTestCase( "any" ) ) succeeded for: true
+TestMain.cpp: matchNone.shouldInclude( fakeTestCase( "any" ) ) == false succeeded for: false == false
+TestMain.cpp: matchHidden.shouldInclude( fakeTestCase( "any" ) ) == false succeeded for: false == false
+TestMain.cpp: matchNonHidden.shouldInclude( fakeTestCase( "any" ) ) succeeded for: true
+TestMain.cpp: matchHidden.shouldInclude( fakeTestCase( "./any" ) ) succeeded for: true
+TestMain.cpp: matchNonHidden.shouldInclude( fakeTestCase( "./any" ) ) == false succeeded for: false == false
 [Finished: 'selftest/test filter' All tests passed (6 assertions in 1 test case)]
 
 [Running: selftest/test filters]
-TestMain.cpp:274: matchHidden.shouldInclude( fakeTestCase( "./something" ) ) succeeded for: true
-TestMain.cpp:276: filters.shouldInclude( fakeTestCase( "any" ) ) == false succeeded for: false == false
-TestMain.cpp:277: filters.shouldInclude( fakeTestCase( "./something" ) ) succeeded for: true
-TestMain.cpp:278: filters.shouldInclude( fakeTestCase( "./anything" ) ) == false succeeded for: false == false
+TestMain.cpp: matchHidden.shouldInclude( fakeTestCase( "./something" ) ) succeeded for: true
+TestMain.cpp: filters.shouldInclude( fakeTestCase( "any" ) ) == false succeeded for: false == false
+TestMain.cpp: filters.shouldInclude( fakeTestCase( "./something" ) ) succeeded for: true
+TestMain.cpp: filters.shouldInclude( fakeTestCase( "./anything" ) ) == false succeeded for: false == false
 [Finished: 'selftest/test filters' All tests passed (4 assertions in 1 test case)]
 
 [Running: selftest/filter/prefix wildcard]
-TestMain.cpp:284: matchBadgers.shouldInclude( fakeTestCase( "big badger" ) ) succeeded for: true
-TestMain.cpp:285: matchBadgers.shouldInclude( fakeTestCase( "little badgers" ) ) == false succeeded for: false == false
+TestMain.cpp: matchBadgers.shouldInclude( fakeTestCase( "big badger" ) ) succeeded for: true
+TestMain.cpp: matchBadgers.shouldInclude( fakeTestCase( "little badgers" ) ) == false succeeded for: false == false
 [Finished: 'selftest/filter/prefix wildcard' All tests passed (2 assertions in 1 test case)]
 
 [Running: selftest/filter/wildcard at both ends]
-TestMain.cpp:290: matchBadgers.shouldInclude( fakeTestCase( "big badger" ) ) succeeded for: true
-TestMain.cpp:291: matchBadgers.shouldInclude( fakeTestCase( "little badgers" ) ) succeeded for: true
-TestMain.cpp:292: matchBadgers.shouldInclude( fakeTestCase( "badgers are big" ) ) succeeded for: true
-TestMain.cpp:293: matchBadgers.shouldInclude( fakeTestCase( "hedgehogs" ) ) == false succeeded for: false == false
+TestMain.cpp: matchBadgers.shouldInclude( fakeTestCase( "big badger" ) ) succeeded for: true
+TestMain.cpp: matchBadgers.shouldInclude( fakeTestCase( "little badgers" ) ) succeeded for: true
+TestMain.cpp: matchBadgers.shouldInclude( fakeTestCase( "badgers are big" ) ) succeeded for: true
+TestMain.cpp: matchBadgers.shouldInclude( fakeTestCase( "hedgehogs" ) ) == false succeeded for: false == false
 [Finished: 'selftest/filter/wildcard at both ends' All tests passed (4 assertions in 1 test case)]
 
 [Running: selftest/tags]
 [Started section: 'one tag']
-TestMain.cpp:313: oneTag.getTestCaseInfo().description == "" succeeded for: "" == ""
-TestMain.cpp:314: oneTag.hasTag( "one" ) succeeded for: true
-TestMain.cpp:315: oneTag.getTags().size() == 1 succeeded for: 1 == 1
-TestMain.cpp:317: oneTag.matchesTags( p1 ) == true succeeded for: true == true
-TestMain.cpp:318: oneTag.matchesTags( p2 ) == true succeeded for: true == true
-TestMain.cpp:319: oneTag.matchesTags( p3 ) == false succeeded for: false == false
-TestMain.cpp:320: oneTag.matchesTags( p4 ) == false succeeded for: false == false
-TestMain.cpp:321: oneTag.matchesTags( p5 ) == false succeeded for: false == false
+TestMain.cpp: oneTag.getTestCaseInfo().description == "" succeeded for: "" == ""
+TestMain.cpp: oneTag.hasTag( "one" ) succeeded for: true
+TestMain.cpp: oneTag.getTags().size() == 1 succeeded for: 1 == 1
+TestMain.cpp: oneTag.matchesTags( p1 ) == true succeeded for: true == true
+TestMain.cpp: oneTag.matchesTags( p2 ) == true succeeded for: true == true
+TestMain.cpp: oneTag.matchesTags( p3 ) == false succeeded for: false == false
+TestMain.cpp: oneTag.matchesTags( p4 ) == false succeeded for: false == false
+TestMain.cpp: oneTag.matchesTags( p5 ) == false succeeded for: false == false
 [End of section: 'one tag' All 8 assertions passed]
 
 [Started section: 'two tags']
-TestMain.cpp:327: twoTags.getTestCaseInfo().description == "" succeeded for: "" == ""
-TestMain.cpp:328: twoTags.hasTag( "one" ) succeeded for: true
-TestMain.cpp:329: twoTags.hasTag( "two" ) succeeded for: true
-TestMain.cpp:330: twoTags.hasTag( "Two" ) succeeded for: true
-TestMain.cpp:331: twoTags.hasTag( "three" ) == false succeeded for: false == false
-TestMain.cpp:332: twoTags.getTags().size() == 2 succeeded for: 2 == 2
-TestMain.cpp:334: twoTags.matchesTags( p1 ) == true succeeded for: true == true
-TestMain.cpp:335: twoTags.matchesTags( p2 ) == true succeeded for: true == true
-TestMain.cpp:336: twoTags.matchesTags( p3 ) == true succeeded for: true == true
-TestMain.cpp:337: twoTags.matchesTags( p4 ) == true succeeded for: true == true
-TestMain.cpp:338: twoTags.matchesTags( p5 ) == true succeeded for: true == true
+TestMain.cpp: twoTags.getTestCaseInfo().description == "" succeeded for: "" == ""
+TestMain.cpp: twoTags.hasTag( "one" ) succeeded for: true
+TestMain.cpp: twoTags.hasTag( "two" ) succeeded for: true
+TestMain.cpp: twoTags.hasTag( "Two" ) succeeded for: true
+TestMain.cpp: twoTags.hasTag( "three" ) == false succeeded for: false == false
+TestMain.cpp: twoTags.getTags().size() == 2 succeeded for: 2 == 2
+TestMain.cpp: twoTags.matchesTags( p1 ) == true succeeded for: true == true
+TestMain.cpp: twoTags.matchesTags( p2 ) == true succeeded for: true == true
+TestMain.cpp: twoTags.matchesTags( p3 ) == true succeeded for: true == true
+TestMain.cpp: twoTags.matchesTags( p4 ) == true succeeded for: true == true
+TestMain.cpp: twoTags.matchesTags( p5 ) == true succeeded for: true == true
 [End of section: 'two tags' All 11 assertions passed]
 
 [Started section: 'one tag with characters either side']
-TestMain.cpp:344: oneTagWithExtras.getTestCaseInfo().description == "1234" succeeded for: "1234" == "1234"
-TestMain.cpp:345: oneTagWithExtras.hasTag( "one" ) succeeded for: true
-TestMain.cpp:346: oneTagWithExtras.hasTag( "two" ) == false succeeded for: false == false
-TestMain.cpp:347: oneTagWithExtras.getTags().size() == 1 succeeded for: 1 == 1
+TestMain.cpp: oneTagWithExtras.getTestCaseInfo().description == "1234" succeeded for: "1234" == "1234"
+TestMain.cpp: oneTagWithExtras.hasTag( "one" ) succeeded for: true
+TestMain.cpp: oneTagWithExtras.hasTag( "two" ) == false succeeded for: false == false
+TestMain.cpp: oneTagWithExtras.getTags().size() == 1 succeeded for: 1 == 1
 [End of section: 'one tag with characters either side' All 4 assertions passed]
 
 [Started section: 'start of a tag, but not closed']
-TestMain.cpp:354: oneTagOpen.getTestCaseInfo().description == "[one" succeeded for: "[one" == "[one"
-TestMain.cpp:355: oneTagOpen.hasTag( "one" ) == false succeeded for: false == false
-TestMain.cpp:356: oneTagOpen.getTags().size() == 0 succeeded for: 0 == 0
+TestMain.cpp: oneTagOpen.getTestCaseInfo().description == "[one" succeeded for: "[one" == "[one"
+TestMain.cpp: oneTagOpen.hasTag( "one" ) == false succeeded for: false == false
+TestMain.cpp: oneTagOpen.getTags().size() == 0 succeeded for: 0 == 0
 [End of section: 'start of a tag, but not closed' All 3 assertions passed]
 
 [Started section: 'hidden']
-TestMain.cpp:362: oneTag.getTestCaseInfo().description == "" succeeded for: "" == ""
-TestMain.cpp:363: oneTag.hasTag( "." ) succeeded for: true
-TestMain.cpp:364: oneTag.isHidden() succeeded for: true
-TestMain.cpp:366: oneTag.matchesTags( "~[.]" ) == false succeeded for: false == false
+TestMain.cpp: oneTag.getTestCaseInfo().description == "" succeeded for: "" == ""
+TestMain.cpp: oneTag.hasTag( "." ) succeeded for: true
+TestMain.cpp: oneTag.isHidden() succeeded for: true
+TestMain.cpp: oneTag.matchesTags( "~[.]" ) == false succeeded for: false == false
 [End of section: 'hidden' All 4 assertions passed]
 
 [Finished: 'selftest/tags' All tests passed (30 assertions in 1 test case)]
@@ -13952,11 +13952,11 @@
 [Running: Long strings can be wrapped]
 [Started section: 'plain string']
 [Started section: 'No wrapping']
-TestMain.cpp:379: Text( testString, TextAttributes().setWidth( 80 ) ).toString() == testString succeeded for:
+TestMain.cpp: Text( testString, TextAttributes().setWidth( 80 ) ).toString() == testString succeeded for:
 	"one two three four"
 ==
 "one two three four"
-TestMain.cpp:380: Text( testString, TextAttributes().setWidth( 18 ) ).toString() == testString succeeded for:
+TestMain.cpp: Text( testString, TextAttributes().setWidth( 18 ) ).toString() == testString succeeded for:
 	"one two three four"
 ==
 "one two three four"
@@ -13966,31 +13966,31 @@
 
 [Started section: 'plain string']
 [Started section: 'Wrapped once']
-TestMain.cpp:383: Text( testString, TextAttributes().setWidth( 17 ) ).toString() == "one two three\nfour" succeeded for:
+TestMain.cpp: Text( testString, TextAttributes().setWidth( 17 ) ).toString() == "one two three\nfour" succeeded for:
 	"one two three
 four"
 ==
 "one two three
 four"
-TestMain.cpp:384: Text( testString, TextAttributes().setWidth( 16 ) ).toString() == "one two three\nfour" succeeded for:
+TestMain.cpp: Text( testString, TextAttributes().setWidth( 16 ) ).toString() == "one two three\nfour" succeeded for:
 	"one two three
 four"
 ==
 "one two three
 four"
-TestMain.cpp:385: Text( testString, TextAttributes().setWidth( 14 ) ).toString() == "one two three\nfour" succeeded for:
+TestMain.cpp: Text( testString, TextAttributes().setWidth( 14 ) ).toString() == "one two three\nfour" succeeded for:
 	"one two three
 four"
 ==
 "one two three
 four"
-TestMain.cpp:386: Text( testString, TextAttributes().setWidth( 13 ) ).toString() == "one two three\nfour" succeeded for:
+TestMain.cpp: Text( testString, TextAttributes().setWidth( 13 ) ).toString() == "one two three\nfour" succeeded for:
 	"one two three
 four"
 ==
 "one two three
 four"
-TestMain.cpp:387: Text( testString, TextAttributes().setWidth( 12 ) ).toString() == "one two\nthree four" succeeded for:
+TestMain.cpp: Text( testString, TextAttributes().setWidth( 12 ) ).toString() == "one two\nthree four" succeeded for:
 	"one two
 three four"
 ==
@@ -14002,7 +14002,7 @@
 
 [Started section: 'plain string']
 [Started section: 'Wrapped twice']
-TestMain.cpp:390: Text( testString, TextAttributes().setWidth( 9 ) ).toString() == "one two\nthree\nfour" succeeded for:
+TestMain.cpp: Text( testString, TextAttributes().setWidth( 9 ) ).toString() == "one two\nthree\nfour" succeeded for:
 	"one two
 three
 four"
@@ -14010,7 +14010,7 @@
 "one two
 three
 four"
-TestMain.cpp:391: Text( testString, TextAttributes().setWidth( 8 ) ).toString() == "one two\nthree\nfour" succeeded for:
+TestMain.cpp: Text( testString, TextAttributes().setWidth( 8 ) ).toString() == "one two\nthree\nfour" succeeded for:
 	"one two
 three
 four"
@@ -14018,7 +14018,7 @@
 "one two
 three
 four"
-TestMain.cpp:392: Text( testString, TextAttributes().setWidth( 7 ) ).toString() == "one two\nthree\nfour" succeeded for:
+TestMain.cpp: Text( testString, TextAttributes().setWidth( 7 ) ).toString() == "one two\nthree\nfour" succeeded for:
 	"one two
 three
 four"
@@ -14032,7 +14032,7 @@
 
 [Started section: 'plain string']
 [Started section: 'Wrapped three times']
-TestMain.cpp:395: Text( testString, TextAttributes().setWidth( 6 ) ).toString() == "one\ntwo\nthree\nfour" succeeded for:
+TestMain.cpp: Text( testString, TextAttributes().setWidth( 6 ) ).toString() == "one\ntwo\nthree\nfour" succeeded for:
 	"one
 two
 three
@@ -14042,7 +14042,7 @@
 two
 three
 four"
-TestMain.cpp:396: Text( testString, TextAttributes().setWidth( 5 ) ).toString() == "one\ntwo\nthree\nfour" succeeded for:
+TestMain.cpp: Text( testString, TextAttributes().setWidth( 5 ) ).toString() == "one\ntwo\nthree\nfour" succeeded for:
 	"one
 two
 three
@@ -14058,24 +14058,24 @@
 
 [Started section: 'plain string']
 [Started section: 'Short wrap']
-TestMain.cpp:399: Text( "abcdef", TextAttributes().setWidth( 4 ) ).toString() == "abc-\ndef" succeeded for: "abc-
+TestMain.cpp: Text( "abcdef", TextAttributes().setWidth( 4 ) ).toString() == "abc-\ndef" succeeded for: "abc-
 def"
 ==
 "abc-
 def"
-TestMain.cpp:400: Text( "abcdefg", TextAttributes().setWidth( 4 ) ).toString() == "abc-\ndefg" succeeded for: "abc-
+TestMain.cpp: Text( "abcdefg", TextAttributes().setWidth( 4 ) ).toString() == "abc-\ndefg" succeeded for: "abc-
 defg"
 ==
 "abc-
 defg"
-TestMain.cpp:401: Text( "abcdefgh", TextAttributes().setWidth( 4 ) ).toString() == "abc-\ndef-\ngh" succeeded for: "abc-
+TestMain.cpp: Text( "abcdefgh", TextAttributes().setWidth( 4 ) ).toString() == "abc-\ndef-\ngh" succeeded for: "abc-
 def-
 gh"
 ==
 "abc-
 def-
 gh"
-TestMain.cpp:403: Text( testString, TextAttributes().setWidth( 4 ) ).toString() == "one\ntwo\nthr-\nee\nfour" succeeded for:
+TestMain.cpp: Text( testString, TextAttributes().setWidth( 4 ) ).toString() == "one\ntwo\nthr-\nee\nfour" succeeded for:
 	"one
 two
 thr-
@@ -14087,7 +14087,7 @@
 thr-
 ee
 four"
-TestMain.cpp:404: Text( testString, TextAttributes().setWidth( 3 ) ).toString() == "one\ntwo\nth-\nree\nfo-\nur" succeeded for:
+TestMain.cpp: Text( testString, TextAttributes().setWidth( 3 ) ).toString() == "one\ntwo\nth-\nree\nfo-\nur" succeeded for:
 	"one
 two
 th-
@@ -14107,18 +14107,18 @@
 
 [Started section: 'plain string']
 [Started section: 'As container']
-TestMain.cpp:408: text.size() == 4 succeeded for: 4 == 4
-TestMain.cpp:409: text[0] == "one" succeeded for: "one" == "one"
-TestMain.cpp:410: text[1] == "two" succeeded for: "two" == "two"
-TestMain.cpp:411: text[2] == "three" succeeded for: "three" == "three"
-TestMain.cpp:412: text[3] == "four" succeeded for: "four" == "four"
+TestMain.cpp: text.size() == 4 succeeded for: 4 == 4
+TestMain.cpp: text[0] == "one" succeeded for: "one" == "one"
+TestMain.cpp: text[1] == "two" succeeded for: "two" == "two"
+TestMain.cpp: text[2] == "three" succeeded for: "three" == "three"
+TestMain.cpp: text[3] == "four" succeeded for: "four" == "four"
 [End of section: 'As container' All 5 assertions passed]
 
 [End of section: 'plain string' All 5 assertions passed]
 
 [Started section: 'plain string']
 [Started section: 'Indent first line differently']
-TestMain.cpp:419: text.toString() == " one two\n    three\n    four" succeeded for:
+TestMain.cpp: text.toString() == " one two\n    three\n    four" succeeded for:
 	" one two
     three
     four"
@@ -14132,19 +14132,19 @@
 
 [Started section: 'With newlines']
 [Started section: 'No wrapping']
-TestMain.cpp:430: Text( testString, TextAttributes().setWidth( 80 ) ).toString() == testString succeeded for:
+TestMain.cpp: Text( testString, TextAttributes().setWidth( 80 ) ).toString() == testString succeeded for:
 	"one two
 three four"
 ==
 "one two
 three four"
-TestMain.cpp:431: Text( testString, TextAttributes().setWidth( 18 ) ).toString() == testString succeeded for:
+TestMain.cpp: Text( testString, TextAttributes().setWidth( 18 ) ).toString() == testString succeeded for:
 	"one two
 three four"
 ==
 "one two
 three four"
-TestMain.cpp:432: Text( testString, TextAttributes().setWidth( 10 ) ).toString() == testString succeeded for:
+TestMain.cpp: Text( testString, TextAttributes().setWidth( 10 ) ).toString() == testString succeeded for:
 	"one two
 three four"
 ==
@@ -14156,13 +14156,13 @@
 
 [Started section: 'With newlines']
 [Started section: 'Trailing newline']
-TestMain.cpp:435: Text( "abcdef\n", TextAttributes().setWidth( 10 ) ).toString() == "abcdef\n" succeeded for: "abcdef
+TestMain.cpp: Text( "abcdef\n", TextAttributes().setWidth( 10 ) ).toString() == "abcdef\n" succeeded for: "abcdef
 "
 ==
 "abcdef
 "
-TestMain.cpp:436: Text( "abcdef", TextAttributes().setWidth( 6 ) ).toString() == "abcdef" succeeded for: "abcdef" == "abcdef"
-TestMain.cpp:437: Text( "abcdef\n", TextAttributes().setWidth( 6 ) ).toString() == "abcdef\n" succeeded for: "abcdef
+TestMain.cpp: Text( "abcdef", TextAttributes().setWidth( 6 ) ).toString() == "abcdef" succeeded for: "abcdef" == "abcdef"
+TestMain.cpp: Text( "abcdef\n", TextAttributes().setWidth( 6 ) ).toString() == "abcdef\n" succeeded for: "abcdef
 "
 ==
 "abcdef
@@ -14173,7 +14173,7 @@
 
 [Started section: 'With newlines']
 [Started section: 'Wrapped once']
-TestMain.cpp:440: Text( testString, TextAttributes().setWidth( 9 ) ).toString() == "one two\nthree\nfour" succeeded for:
+TestMain.cpp: Text( testString, TextAttributes().setWidth( 9 ) ).toString() == "one two\nthree\nfour" succeeded for:
 	"one two
 three
 four"
@@ -14181,7 +14181,7 @@
 "one two
 three
 four"
-TestMain.cpp:441: Text( testString, TextAttributes().setWidth( 8 ) ).toString() == "one two\nthree\nfour" succeeded for:
+TestMain.cpp: Text( testString, TextAttributes().setWidth( 8 ) ).toString() == "one two\nthree\nfour" succeeded for:
 	"one two
 three
 four"
@@ -14189,7 +14189,7 @@
 "one two
 three
 four"
-TestMain.cpp:442: Text( testString, TextAttributes().setWidth( 7 ) ).toString() == "one two\nthree\nfour" succeeded for:
+TestMain.cpp: Text( testString, TextAttributes().setWidth( 7 ) ).toString() == "one two\nthree\nfour" succeeded for:
 	"one two
 three
 four"
@@ -14203,7 +14203,7 @@
 
 [Started section: 'With newlines']
 [Started section: 'Wrapped twice']
-TestMain.cpp:445: Text( testString, TextAttributes().setWidth( 6 ) ).toString() == "one\ntwo\nthree\nfour" succeeded for:
+TestMain.cpp: Text( testString, TextAttributes().setWidth( 6 ) ).toString() == "one\ntwo\nthree\nfour" succeeded for:
 	"one
 two
 three
@@ -14218,7 +14218,7 @@
 [End of section: 'With newlines' 1 assertion passed]
 
 [Started section: 'With tabs']
-TestMain.cpp:455: Text( testString, TextAttributes().setWidth( 15 ) ).toString() == "one two three\n        four\n        five\n        six" succeeded for:
+TestMain.cpp: Text( testString, TextAttributes().setWidth( 15 ) ).toString() == "one two three\n        four\n        five\n        six" succeeded for:
 "one two three
         four
         five
@@ -14241,8 +14241,8 @@
 [Finished: 'Strings can be rendered with colour' 1 test case failed (1 assertion failed)]
 
 [Running: Text can be formatted using the Text class]
-TestMain.cpp:555: Text( "hi there" ).toString() == "hi there" succeeded for: "hi there" == "hi there"
-TestMain.cpp:560: Text( "hi there", narrow ).toString() == "hi\nthere" succeeded for: "hi
+TestMain.cpp: Text( "hi there" ).toString() == "hi there" succeeded for: "hi there" == "hi there"
+TestMain.cpp: Text( "hi there", narrow ).toString() == "hi\nthere" succeeded for: "hi
 there"
 ==
 "hi
@@ -14250,100 +14250,100 @@
 [Finished: 'Text can be formatted using the Text class' All tests passed (2 assertions in 1 test case)]
 
 [Running: ./succeeding/Tricky/std::pair]
-TrickyTests.cpp:37: (std::pair<int, int>( 1, 2 )) == aNicePair succeeded for: std::pair( 1, 2 ) == std::pair( 1, 2 )
+TrickyTests.cpp: (std::pair<int, int>( 1, 2 )) == aNicePair succeeded for: std::pair( 1, 2 ) == std::pair( 1, 2 )
 [Finished: './succeeding/Tricky/std::pair' All tests passed (1 assertion in 1 test case)]
 
 [Running: ./inprogress/failing/Tricky/trailing expression]
-TrickyTests.cpp:55: [warning: Uncomment the code in this test to check that it gives a sensible compiler error]
+TrickyTests.cpp: [warning: Uncomment the code in this test to check that it gives a sensible compiler error]
 
 No assertions in test case, './inprogress/failing/Tricky/trailing expression'
 
 [Finished: './inprogress/failing/Tricky/trailing expression' 1 test case failed (1 assertion failed)]
 
 [Running: ./inprogress/failing/Tricky/compound lhs]
-TrickyTests.cpp:71: [warning: Uncomment the code in this test to check that it gives a sensible compiler error]
+TrickyTests.cpp: [warning: Uncomment the code in this test to check that it gives a sensible compiler error]
 
 No assertions in test case, './inprogress/failing/Tricky/compound lhs'
 
 [Finished: './inprogress/failing/Tricky/compound lhs' 1 test case failed (1 assertion failed)]
 
 [Running: ./failing/Tricky/non streamable type]
-TrickyTests.cpp:95: &o1 == &o2 failed for: 0x<hex digits> == 0x<hex digits>
-TrickyTests.cpp:96: o1 == o2 failed for: {?} == {?}
+TrickyTests.cpp: &o1 == &o2 failed for: 0x<hex digits> == 0x<hex digits>
+TrickyTests.cpp: o1 == o2 failed for: {?} == {?}
 [Finished: './failing/Tricky/non streamable type' 1 test case failed (All 2 assertions failed)]
 
 [Running: ./failing/string literals]
-TrickyTests.cpp:106: std::string( "first" ) == "second" failed for: "first" == "second"
+TrickyTests.cpp: std::string( "first" ) == "second" failed for: "first" == "second"
 [Finished: './failing/string literals' 1 test case failed (1 assertion failed)]
 
 [Running: ./succeeding/side-effects]
-TrickyTests.cpp:119: i++ == 7 succeeded for: 7 == 7
-TrickyTests.cpp:120: i++ == 8 succeeded for: 8 == 8
+TrickyTests.cpp: i++ == 7 succeeded for: 7 == 7
+TrickyTests.cpp: i++ == 8 succeeded for: 8 == 8
 [Finished: './succeeding/side-effects' All tests passed (2 assertions in 1 test case)]
 
 [Running: ./succeeding/koenig]
-TrickyTests.cpp:186: 0x<hex digits> == o succeeded for: 0x<hex digits> == {?}
+TrickyTests.cpp: 0x<hex digits> == o succeeded for: 0x<hex digits> == {?}
 [Finished: './succeeding/koenig' All tests passed (1 assertion in 1 test case)]
 
 [Running: ./succeeding/non-const==]
-TrickyTests.cpp:212: t == 1u succeeded for: {?} == 1
+TrickyTests.cpp: t == 1u succeeded for: {?} == 1
 [Finished: './succeeding/non-const==' All tests passed (1 assertion in 1 test case)]
 
 [Running: ./succeeding/enum/bits]
-TrickyTests.cpp:224: 0x<hex digits> == bit30and31 succeeded for: 0x<hex digits> == 3221225472
+TrickyTests.cpp: 0x<hex digits> == bit30and31 succeeded for: 0x<hex digits> == 3221225472
 [Finished: './succeeding/enum/bits' All tests passed (1 assertion in 1 test case)]
 
 [Running: ./succeeding/boolean member]
-TrickyTests.cpp:239: obj.prop != __null succeeded for: 0x<hex digits> != 0
+TrickyTests.cpp: obj.prop != __null succeeded for: 0x<hex digits> != 0
 [Finished: './succeeding/boolean member' All tests passed (1 assertion in 1 test case)]
 
 [Running: ./succeeding/unimplemented static bool]
 [Started section: 'compare to true']
-TrickyTests.cpp:259: is_true<true>::value == true succeeded for: true == true
-TrickyTests.cpp:260: true == is_true<true>::value succeeded for: true == true
+TrickyTests.cpp: is_true<true>::value == true succeeded for: true == true
+TrickyTests.cpp: true == is_true<true>::value succeeded for: true == true
 [End of section: 'compare to true' All 2 assertions passed]
 
 [Started section: 'compare to false']
-TrickyTests.cpp:264: is_true<false>::value == false succeeded for: false == false
-TrickyTests.cpp:265: false == is_true<false>::value succeeded for: false == false
+TrickyTests.cpp: is_true<false>::value == false succeeded for: false == false
+TrickyTests.cpp: false == is_true<false>::value succeeded for: false == false
 [End of section: 'compare to false' All 2 assertions passed]
 
 [Started section: 'negation']
-TrickyTests.cpp:270: !is_true<false>::value succeeded for: true
+TrickyTests.cpp: !is_true<false>::value succeeded for: true
 [End of section: 'negation' 1 assertion passed]
 
 [Started section: 'double negation']
-TrickyTests.cpp:275: !!is_true<true>::value succeeded for: true
+TrickyTests.cpp: !!is_true<true>::value succeeded for: true
 [End of section: 'double negation' 1 assertion passed]
 
 [Started section: 'direct']
-TrickyTests.cpp:280: is_true<true>::value succeeded for: true
-TrickyTests.cpp:281: !is_true<false>::value succeeded for: !false
+TrickyTests.cpp: is_true<true>::value succeeded for: true
+TrickyTests.cpp: !is_true<false>::value succeeded for: !false
 [End of section: 'direct' All 2 assertions passed]
 
 [Finished: './succeeding/unimplemented static bool' All tests passed (8 assertions in 1 test case)]
 
 [Running: ./succeeding/SafeBool]
-TrickyTests.cpp:313: True succeeded for: true
-TrickyTests.cpp:314: !False succeeded for: true
-TrickyTests.cpp:315: !False succeeded for: !false
+TrickyTests.cpp: True succeeded for: true
+TrickyTests.cpp: !False succeeded for: true
+TrickyTests.cpp: !False succeeded for: !false
 [Finished: './succeeding/SafeBool' All tests passed (3 assertions in 1 test case)]
 
 [Running: Assertions then sections]
-TrickyTests.cpp:323: Catch::isTrue( true ) succeeded for: true
+TrickyTests.cpp: Catch::isTrue( true ) succeeded for: true
 [Started section: 'A section']
-TrickyTests.cpp:327: Catch::isTrue( true ) succeeded for: true
+TrickyTests.cpp: Catch::isTrue( true ) succeeded for: true
 [Started section: 'Another section']
-TrickyTests.cpp:331: Catch::isTrue( true ) succeeded for: true
+TrickyTests.cpp: Catch::isTrue( true ) succeeded for: true
 [End of section: 'Another section' 1 assertion passed]
 
 [End of section: 'A section' All 2 assertions passed]
 
-TrickyTests.cpp:323: Catch::isTrue( true ) succeeded for: true
+TrickyTests.cpp: Catch::isTrue( true ) succeeded for: true
 [Started section: 'A section']
-TrickyTests.cpp:327: Catch::isTrue( true ) succeeded for: true
+TrickyTests.cpp: Catch::isTrue( true ) succeeded for: true
 [Started section: 'Another other section']
-TrickyTests.cpp:335: Catch::isTrue( true ) succeeded for: true
+TrickyTests.cpp: Catch::isTrue( true ) succeeded for: true
 [End of section: 'Another other section' 1 assertion passed]
 
 [End of section: 'A section' All 2 assertions passed]
@@ -14351,22 +14351,22 @@
 [Finished: 'Assertions then sections' All tests passed (6 assertions in 1 test case)]
 
 [Running: non streamable - with conv. op]
-TrickyTests.cpp:349: s == "7" succeeded for: "7" == "7"
+TrickyTests.cpp: s == "7" succeeded for: "7" == "7"
 [Finished: 'non streamable - with conv. op' All tests passed (1 assertion in 1 test case)]
 
 [Running: Anonymous test case 1]
-VariadicMacrosTests.cpp:15:  succeeded
+VariadicMacrosTests.cpp:  succeeded
 [with message: anonymous test case]
 [Finished: 'Anonymous test case 1' All tests passed (1 assertion in 1 test case)]
 
 [Running: Test case with one argument]
-VariadicMacrosTests.cpp:20:  succeeded
+VariadicMacrosTests.cpp:  succeeded
 [with message: no assertions]
 [Finished: 'Test case with one argument' All tests passed (1 assertion in 1 test case)]
 
 [Running: Variadic macros]
 [Started section: 'Section with one argument']
-VariadicMacrosTests.cpp:27:  succeeded
+VariadicMacrosTests.cpp:  succeeded
 [with message: no assertions]
 [End of section: 'Section with one argument' 1 assertion passed]
 
@@ -14376,9 +14376,9 @@
 [Started section: '   Given: This stuff exists']
 [Started section: '    When: I do this']
 [Started section: '    Then: it should do this']
-BDDTests.cpp:21: itDoesThis() succeeded for: true
+BDDTests.cpp: itDoesThis() succeeded for: true
 [Started section: '     And: do that']
-BDDTests.cpp:23: itDoesThat() succeeded for: true
+BDDTests.cpp: itDoesThat() succeeded for: true
 [End of section: '     And: do that' 1 assertion passed]
 
 [End of section: '    Then: it should do this' All 2 assertions passed]
@@ -14391,15 +14391,15 @@
 
 [Running: Scenario: Vector resizing affects size and capacity]
 [Started section: '   Given: an empty vector']
-BDDTests.cpp:32: v.size() == 0 succeeded for: 0 == 0
+BDDTests.cpp: v.size() == 0 succeeded for: 0 == 0
 [Started section: '    When: it is made larger']
 [Started section: '    Then: the size and capacity go up']
-BDDTests.cpp:37: v.size() == 10 succeeded for: 10 == 10
-BDDTests.cpp:38: v.capacity() >= 10 succeeded for: 10 >= 10
+BDDTests.cpp: v.size() == 10 succeeded for: 10 == 10
+BDDTests.cpp: v.capacity() >= 10 succeeded for: 10 >= 10
 [Started section: 'And when: it is made smaller again']
 [Started section: '    Then: the size goes down but the capacity stays the same']
-BDDTests.cpp:43: v.size() == 5 succeeded for: 5 == 5
-BDDTests.cpp:44: v.capacity() >= 10 succeeded for: 10 >= 10
+BDDTests.cpp: v.size() == 5 succeeded for: 5 == 5
+BDDTests.cpp: v.capacity() >= 10 succeeded for: 10 >= 10
 [End of section: '    Then: the size goes down but the capacity stays the same' All 2 assertions passed]
 
 [End of section: 'And when: it is made smaller again' All 2 assertions passed]
@@ -14411,11 +14411,11 @@
 [End of section: '   Given: an empty vector' All 5 assertions passed]
 
 [Started section: '   Given: an empty vector']
-BDDTests.cpp:32: v.size() == 0 succeeded for: 0 == 0
+BDDTests.cpp: v.size() == 0 succeeded for: 0 == 0
 [Started section: '    When: it is made larger']
 [Started section: '    Then: the size and capacity go up']
-BDDTests.cpp:37: v.size() == 10 succeeded for: 10 == 10
-BDDTests.cpp:38: v.capacity() >= 10 succeeded for: 10 >= 10
+BDDTests.cpp: v.size() == 10 succeeded for: 10 == 10
+BDDTests.cpp: v.capacity() >= 10 succeeded for: 10 >= 10
 [End of section: '    Then: the size and capacity go up' All 2 assertions passed]
 
 [End of section: '    When: it is made larger' All 2 assertions passed]
@@ -14423,11 +14423,11 @@
 [End of section: '   Given: an empty vector' All 3 assertions passed]
 
 [Started section: '   Given: an empty vector']
-BDDTests.cpp:32: v.size() == 0 succeeded for: 0 == 0
+BDDTests.cpp: v.size() == 0 succeeded for: 0 == 0
 [Started section: '    When: it is made larger']
 [Started section: '    Then: the size and capacity go up']
-BDDTests.cpp:37: v.size() == 10 succeeded for: 10 == 10
-BDDTests.cpp:38: v.capacity() >= 10 succeeded for: 10 >= 10
+BDDTests.cpp: v.size() == 10 succeeded for: 10 == 10
+BDDTests.cpp: v.capacity() >= 10 succeeded for: 10 >= 10
 [End of section: '    Then: the size and capacity go up' All 2 assertions passed]
 
 [End of section: '    When: it is made larger' All 2 assertions passed]
@@ -14435,15 +14435,15 @@
 [End of section: '   Given: an empty vector' All 3 assertions passed]
 
 [Started section: '   Given: an empty vector']
-BDDTests.cpp:32: v.size() == 0 succeeded for: 0 == 0
+BDDTests.cpp: v.size() == 0 succeeded for: 0 == 0
 [End of section: '   Given: an empty vector' 1 assertion passed]
 
 [Started section: '   Given: an empty vector']
-BDDTests.cpp:32: v.size() == 0 succeeded for: 0 == 0
+BDDTests.cpp: v.size() == 0 succeeded for: 0 == 0
 [Started section: '    When: we reserve more space']
 [Started section: '    Then: The capacity is increased but the size remains the same']
-BDDTests.cpp:53: v.capacity() >= 10 succeeded for: 10 >= 10
-BDDTests.cpp:54: v.size() == 0 succeeded for: 0 == 0
+BDDTests.cpp: v.capacity() >= 10 succeeded for: 10 >= 10
+BDDTests.cpp: v.size() == 0 succeeded for: 0 == 0
 [End of section: '    Then: The capacity is increased but the size remains the same' All 2 assertions passed]
 
 [End of section: '    When: we reserve more space' All 2 assertions passed]
@@ -14456,7 +14456,7 @@
 [Started section: '   Given: A section name that is so long that it cannot fit in a single console width']
 [Started section: '    When: The test headers are printed as part of the normal running of the scenario']
 [Started section: '    Then: The, deliberately very long and overly verbose (you see what I did there?) section names must wrap, along with an indent']
-BDDTests.cpp:67:  succeeded
+BDDTests.cpp:  succeeded
 [with message: boo!]
 [End of section: '    Then: The, deliberately very long and overly verbose (you see what I did there?) section names must wrap, along with an indent' 1 assertion passed]
 
@@ -14468,72 +14468,72 @@
 
 [Running: cmdline]
 [Started section: 'process name']
-CmdLineTests.cpp:64: config.processName == "test" succeeded for: "test" == "test"
+CmdLineTests.cpp: config.processName == "test" succeeded for: "test" == "test"
 [End of section: 'process name' 1 assertion passed]
 
 [Started section: 'arg separated by spaces']
-CmdLineTests.cpp:70: config.fileName == "filename.ext" succeeded for: "filename.ext" == "filename.ext"
+CmdLineTests.cpp: config.fileName == "filename.ext" succeeded for: "filename.ext" == "filename.ext"
 [End of section: 'arg separated by spaces' 1 assertion passed]
 
 [Started section: 'arg separated by colon']
-CmdLineTests.cpp:76: config.fileName == "filename.ext" succeeded for: "filename.ext" == "filename.ext"
+CmdLineTests.cpp: config.fileName == "filename.ext" succeeded for: "filename.ext" == "filename.ext"
 [End of section: 'arg separated by colon' 1 assertion passed]
 
 [Started section: 'arg separated by =']
-CmdLineTests.cpp:82: config.fileName == "filename.ext" succeeded for: "filename.ext" == "filename.ext"
+CmdLineTests.cpp: config.fileName == "filename.ext" succeeded for: "filename.ext" == "filename.ext"
 [End of section: 'arg separated by =' 1 assertion passed]
 
 [Started section: 'long opt']
-CmdLineTests.cpp:88: config.fileName == "%stdout" succeeded for: "%stdout" == "%stdout"
+CmdLineTests.cpp: config.fileName == "%stdout" succeeded for: "%stdout" == "%stdout"
 [End of section: 'long opt' 1 assertion passed]
 
 [Started section: 'a number']
-CmdLineTests.cpp:99: config.number == 42 succeeded for: 42 == 42
+CmdLineTests.cpp: config.number == 42 succeeded for: 42 == 42
 [End of section: 'a number' 1 assertion passed]
 
 [Started section: 'not a number']
-CmdLineTests.cpp:103: parseInto( cli, argv, config ) succeeded
-CmdLineTests.cpp:105: config.number == 0 succeeded for: 0 == 0
+CmdLineTests.cpp: parseInto( cli, argv, config ) succeeded
+CmdLineTests.cpp: config.number == 0 succeeded for: 0 == 0
 [End of section: 'not a number' All 2 assertions passed]
 
 [Started section: 'two parsers']
-CmdLineTests.cpp:123: config1.number == 42 succeeded for: 42 == 42
-CmdLineTests.cpp:125: !unusedTokens.empty() succeeded for: !false
-CmdLineTests.cpp:127: config2.description == "some text" succeeded for: "some text" == "some text"
+CmdLineTests.cpp: config1.number == 42 succeeded for: 42 == 42
+CmdLineTests.cpp: !unusedTokens.empty() succeeded for: !false
+CmdLineTests.cpp: config2.description == "some text" succeeded for: "some text" == "some text"
 [End of section: 'two parsers' All 3 assertions passed]
 
 [Started section: 'methods']
 [Started section: 'in range']
-CmdLineTests.cpp:140: config.index == 3 succeeded for: 3 == 3
+CmdLineTests.cpp: config.index == 3 succeeded for: 3 == 3
 [End of section: 'in range' 1 assertion passed]
 
 [End of section: 'methods' 1 assertion passed]
 
 [Started section: 'methods']
 [Started section: 'out of range']
-CmdLineTests.cpp:145: parseInto( cli, argv, config ) succeeded
+CmdLineTests.cpp: parseInto( cli, argv, config ) succeeded
 [End of section: 'out of range' 1 assertion passed]
 
 [End of section: 'methods' 1 assertion passed]
 
 [Started section: 'flags']
 [Started section: 'set']
-CmdLineTests.cpp:158: config.flag succeeded for: true
+CmdLineTests.cpp: config.flag succeeded for: true
 [End of section: 'set' 1 assertion passed]
 
 [End of section: 'flags' 1 assertion passed]
 
 [Started section: 'flags']
 [Started section: 'not set']
-CmdLineTests.cpp:164: config.flag == false succeeded for: false == false
+CmdLineTests.cpp: config.flag == false succeeded for: false == false
 [End of section: 'not set' 1 assertion passed]
 
 [End of section: 'flags' 1 assertion passed]
 
 [Started section: 'positional']
-CmdLineTests.cpp:185: config.firstPos == "1st" succeeded for: "1st" == "1st"
-CmdLineTests.cpp:186: config.secondPos == "2nd" succeeded for: "2nd" == "2nd"
-CmdLineTests.cpp:187: config.unpositional == "3rd" succeeded for: "3rd" == "3rd"
+CmdLineTests.cpp: config.firstPos == "1st" succeeded for: "1st" == "1st"
+CmdLineTests.cpp: config.secondPos == "2nd" succeeded for: "2nd" == "2nd"
+CmdLineTests.cpp: config.unpositional == "3rd" succeeded for: "3rd" == "3rd"
 [End of section: 'positional' All 3 assertions passed]
 
 [Finished: 'cmdline' All tests passed (18 assertions in 1 test case)]
diff --git a/scripts/approvalTests.py b/scripts/approvalTests.py
index d0eba1c..4572590 100644
--- a/scripts/approvalTests.py
+++ b/scripts/approvalTests.py
@@ -5,7 +5,7 @@
 
 from scriptCommon import catchPath
 
-filenameParser = re.compile( r'\s*.*/(.*\..pp)(.*)' )
+filenameParser = re.compile( r'\s*.*/(.*\..pp):([0-9]*)(.*)' )
 hexParser = re.compile( r'(.*)\b(0[xX][0-9a-fA-F]+)\b(.*)' )
 
 #catchPath = os.path.dirname(os.path.realpath( os.path.dirname(sys.argv[0])))
@@ -34,7 +34,7 @@
 for line in rawFile:
 	m = filenameParser.match( line )
 	if m:
-		line = m.group(1) + m.group(2)
+		line = m.group(1) + m.group(3)
 
 	while True:
 		m = hexParser.match( line )