diff --git a/projects/SelfTest/Baselines/console.std.approved.txt b/projects/SelfTest/Baselines/console.std.approved.txt
index dbaca8ba..6f0b0a2c 100644
--- a/projects/SelfTest/Baselines/console.std.approved.txt
+++ b/projects/SelfTest/Baselines/console.std.approved.txt
@@ -494,7 +494,27 @@ explicitly with message:
   Message from section two
 
 Message from section one
+-------------------------------------------------------------------------------
+Standard output from all sections is reported
+  one
+-------------------------------------------------------------------------------
+MessageTests.cpp:<line number>
+...............................................................................
+
+
+No assertions in section 'one'
+
 Message from section two
+-------------------------------------------------------------------------------
+Standard output from all sections is reported
+  two
+-------------------------------------------------------------------------------
+MessageTests.cpp:<line number>
+...............................................................................
+
+
+No assertions in section 'two'
+
 -------------------------------------------------------------------------------
 SCOPED_INFO is reset for each loop
 -------------------------------------------------------------------------------
@@ -558,6 +578,38 @@ MiscTests.cpp:<line number>: FAILED:
 with expansion:
   1 == 2
 
+-------------------------------------------------------------------------------
+even more nested SECTION tests
+  c
+  d (leaf)
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
+
+
+No assertions in section 'd (leaf)'
+
+-------------------------------------------------------------------------------
+even more nested SECTION tests
+  c
+  e (leaf)
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
+
+
+No assertions in section 'e (leaf)'
+
+-------------------------------------------------------------------------------
+even more nested SECTION tests
+  f (leaf)
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
+
+
+No assertions in section 'f (leaf)'
+
 -------------------------------------------------------------------------------
 looped SECTION tests
   s1
@@ -652,6 +704,26 @@ MiscTests.cpp:<line number>: FAILED:
 with expansion:
   false
 
+-------------------------------------------------------------------------------
+xmlentitycheck
+  embedded xml
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
+
+
+No assertions in section 'embedded xml'
+
+-------------------------------------------------------------------------------
+xmlentitycheck
+  encoded chars
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
+
+
+No assertions in section 'encoded chars'
+
 -------------------------------------------------------------------------------
 send a single char to INFO
 -------------------------------------------------------------------------------
@@ -797,6 +869,6 @@ with expansion:
   "first" == "second"
 
 ===============================================================================
-test cases: 159 | 119 passed | 39 failed |  1 failed as expected
-assertions: 788 | 695 passed | 80 failed | 13 failed as expected
+test cases: 160 | 117 passed | 42 failed |  1 failed as expected
+assertions: 927 | 827 passed | 87 failed | 13 failed as expected
 
diff --git a/projects/SelfTest/Baselines/console.sw.approved.txt b/projects/SelfTest/Baselines/console.sw.approved.txt
index 82702ecf..2d07e380 100644
--- a/projects/SelfTest/Baselines/console.sw.approved.txt
+++ b/projects/SelfTest/Baselines/console.sw.approved.txt
@@ -1216,15 +1216,6 @@ ExceptionTests.cpp:<line number>: FAILED:
 due to unexpected exception with message:
   expected exception
 
--------------------------------------------------------------------------------
-When unchecked exceptions are thrown, but caught, they do not affect the test
--------------------------------------------------------------------------------
-ExceptionTests.cpp:<line number>
-...............................................................................
-
-
-No assertions in test case 'When unchecked exceptions are thrown, but caught, they do not affect the test'
-
 -------------------------------------------------------------------------------
 Unexpected custom exceptions can be translated
 -------------------------------------------------------------------------------
@@ -2668,9 +2659,6 @@ warning:
   this is a message
   this is a warning
 
-
-No assertions in test case 'INFO and WARN do not abort tests'
-
 -------------------------------------------------------------------------------
 SUCCEED counts as a test pass
 -------------------------------------------------------------------------------
@@ -2782,27 +2770,7 @@ explicitly with message:
   Message from section two
 
 Message from section one
--------------------------------------------------------------------------------
-Standard output from all sections is reported
-  one
--------------------------------------------------------------------------------
-MessageTests.cpp:<line number>
-...............................................................................
-
-
-No assertions in section 'one'
-
 Message from section two
--------------------------------------------------------------------------------
-Standard output from all sections is reported
-  two
--------------------------------------------------------------------------------
-MessageTests.cpp:<line number>
-...............................................................................
-
-
-No assertions in section 'two'
-
 -------------------------------------------------------------------------------
 SCOPED_INFO is reset for each loop
 -------------------------------------------------------------------------------
@@ -2917,18 +2885,6 @@ MessageTests.cpp:<line number>:
 FAILED - but was ok:
   CHECK_NOFAIL( 1 == 2 )
 
-
-No assertions in test case 'The NO_FAIL macro reports a failure but does not fail the test'
-
--------------------------------------------------------------------------------
-just info
--------------------------------------------------------------------------------
-MessageTests.cpp:<line number>
-...............................................................................
-
-
-No assertions in test case 'just info'
-
 -------------------------------------------------------------------------------
 just failure
 -------------------------------------------------------------------------------
@@ -2965,9 +2921,6 @@ MessageTests.cpp:<line number>:
 warning:
   toString(p): 0x<hex digits>
 
-
-No assertions in test case 'Pointers can be converted to strings'
-
 -------------------------------------------------------------------------------
 random SECTION tests
   s1
@@ -3047,36 +3000,32 @@ with expansion:
   1 == 2
 
 -------------------------------------------------------------------------------
-even more nested SECTION tests
-  c
-  d (leaf)
+more nested SECTION tests
+  s1
+  s3
 -------------------------------------------------------------------------------
 MiscTests.cpp:<line number>
 ...............................................................................
 
-
-No assertions in section 'd (leaf)'
+MiscTests.cpp:<line number>:
+PASSED:
+  REQUIRE( a != b )
+with expansion:
+  1 != 2
 
 -------------------------------------------------------------------------------
-even more nested SECTION tests
-  c
-  e (leaf)
+more nested SECTION tests
+  s1
+  s4
 -------------------------------------------------------------------------------
 MiscTests.cpp:<line number>
 ...............................................................................
 
-
-No assertions in section 'e (leaf)'
-
--------------------------------------------------------------------------------
-even more nested SECTION tests
-  f (leaf)
--------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
-...............................................................................
-
-
-No assertions in section 'f (leaf)'
+MiscTests.cpp:<line number>:
+PASSED:
+  REQUIRE( a < b )
+with expansion:
+  1 < 2
 
 -------------------------------------------------------------------------------
 looped SECTION tests
@@ -3156,15 +3105,6 @@ with message:
 
 A string sent directly to stdout
 A string sent directly to stderr
--------------------------------------------------------------------------------
-Sends stuff to stdout and stderr
--------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
-...............................................................................
-
-
-No assertions in test case 'Sends stuff to stdout and stderr'
-
 -------------------------------------------------------------------------------
 null strings
 -------------------------------------------------------------------------------
@@ -3251,26 +3191,6 @@ MiscTests.cpp:<line number>: FAILED:
 with expansion:
   false
 
--------------------------------------------------------------------------------
-xmlentitycheck
-  embedded xml
--------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
-...............................................................................
-
-
-No assertions in section 'embedded xml'
-
--------------------------------------------------------------------------------
-xmlentitycheck
-  encoded chars
--------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
-...............................................................................
-
-
-No assertions in section 'encoded chars'
-
 -------------------------------------------------------------------------------
 send a single char to INFO
 -------------------------------------------------------------------------------
@@ -3462,15 +3382,6 @@ PASSED:
 with expansion:
   3628800 (0x<hex digits>) == 3628800 (0x<hex digits>)
 
--------------------------------------------------------------------------------
-An empty test with no assertions
--------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
-...............................................................................
-
-
-No assertions in test case 'An empty test with no assertions'
-
 -------------------------------------------------------------------------------
 Nice descriptive name
 -------------------------------------------------------------------------------
@@ -3481,27 +3392,6 @@ MiscTests.cpp:<line number>:
 warning:
   This one ran
 
-
-No assertions in test case 'Nice descriptive name'
-
--------------------------------------------------------------------------------
-first tag
--------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
-...............................................................................
-
-
-No assertions in test case 'first tag'
-
--------------------------------------------------------------------------------
-second tag
--------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
-...............................................................................
-
-
-No assertions in test case 'second tag'
-
 -------------------------------------------------------------------------------
 vectors can be sized and resized
 -------------------------------------------------------------------------------
@@ -4917,15 +4807,6 @@ with expansion:
 
 hello
 hello
--------------------------------------------------------------------------------
-Strings can be rendered with colour
--------------------------------------------------------------------------------
-TestMain.cpp:<line number>
-...............................................................................
-
-
-No assertions in test case 'Strings can be rendered with colour'
-
 -------------------------------------------------------------------------------
 Text can be formatted using the Text class
 -------------------------------------------------------------------------------
@@ -5983,9 +5864,6 @@ warning:
   Uncomment the code in this test to check that it gives a sensible compiler
   error
 
-
-No assertions in test case 'Where there is more to the expression after the RHS'
-
 -------------------------------------------------------------------------------
 Where the LHS is not a simple value
 -------------------------------------------------------------------------------
@@ -5997,9 +5875,6 @@ warning:
   Uncomment the code in this test to check that it gives a sensible compiler
   error
 
-
-No assertions in test case 'Where the LHS is not a simple value'
-
 -------------------------------------------------------------------------------
 A failing expression with a non streamable type is still captured
 -------------------------------------------------------------------------------
@@ -6464,6 +6339,1004 @@ with expansion:
   ==
   "{ StringMaker<has_maker_and_toString> }"
 
+-------------------------------------------------------------------------------
+Tracker
+-------------------------------------------------------------------------------
+PartTrackerTests.cpp:<line number>
+...............................................................................
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( testCase.isOpen() )
+with expansion:
+  true
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( s1.isOpen() )
+with expansion:
+  true
+
+-------------------------------------------------------------------------------
+Tracker
+  successfully close one section
+-------------------------------------------------------------------------------
+PartTrackerTests.cpp:<line number>
+...............................................................................
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( s1.isSuccessfullyCompleted() )
+with expansion:
+  true
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( testCase.isComplete() == false )
+with expansion:
+  false == false
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( ctx.completedCycle() )
+with expansion:
+  true
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( testCase.isSuccessfullyCompleted() )
+with expansion:
+  true
+
+-------------------------------------------------------------------------------
+Tracker
+-------------------------------------------------------------------------------
+PartTrackerTests.cpp:<line number>
+...............................................................................
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( testCase.isOpen() )
+with expansion:
+  true
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( s1.isOpen() )
+with expansion:
+  true
+
+-------------------------------------------------------------------------------
+Tracker
+  fail one section
+-------------------------------------------------------------------------------
+PartTrackerTests.cpp:<line number>
+...............................................................................
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( s1.isComplete() )
+with expansion:
+  true
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( s1.isSuccessfullyCompleted() == false )
+with expansion:
+  false == false
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( testCase.isComplete() == false )
+with expansion:
+  false == false
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( ctx.completedCycle() )
+with expansion:
+  true
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( testCase.isSuccessfullyCompleted() == false )
+with expansion:
+  false == false
+
+-------------------------------------------------------------------------------
+Tracker
+  fail one section
+  re-enter after failed section
+-------------------------------------------------------------------------------
+PartTrackerTests.cpp:<line number>
+...............................................................................
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( testCase2.isOpen() )
+with expansion:
+  true
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( s1b.isOpen() == false )
+with expansion:
+  false == false
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( ctx.completedCycle() )
+with expansion:
+  true
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( testCase.isComplete() )
+with expansion:
+  true
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( testCase.isSuccessfullyCompleted() )
+with expansion:
+  true
+
+-------------------------------------------------------------------------------
+Tracker
+-------------------------------------------------------------------------------
+PartTrackerTests.cpp:<line number>
+...............................................................................
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( testCase.isOpen() )
+with expansion:
+  true
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( s1.isOpen() )
+with expansion:
+  true
+
+-------------------------------------------------------------------------------
+Tracker
+  fail one section
+-------------------------------------------------------------------------------
+PartTrackerTests.cpp:<line number>
+...............................................................................
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( s1.isComplete() )
+with expansion:
+  true
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( s1.isSuccessfullyCompleted() == false )
+with expansion:
+  false == false
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( testCase.isComplete() == false )
+with expansion:
+  false == false
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( ctx.completedCycle() )
+with expansion:
+  true
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( testCase.isSuccessfullyCompleted() == false )
+with expansion:
+  false == false
+
+-------------------------------------------------------------------------------
+Tracker
+  fail one section
+  re-enter after failed section and find next section
+-------------------------------------------------------------------------------
+PartTrackerTests.cpp:<line number>
+...............................................................................
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( testCase2.isOpen() )
+with expansion:
+  true
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( s1b.isOpen() == false )
+with expansion:
+  false == false
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( s2.isOpen() )
+with expansion:
+  true
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( ctx.completedCycle() )
+with expansion:
+  true
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( testCase.isComplete() )
+with expansion:
+  true
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( testCase.isSuccessfullyCompleted() )
+with expansion:
+  true
+
+-------------------------------------------------------------------------------
+Tracker
+-------------------------------------------------------------------------------
+PartTrackerTests.cpp:<line number>
+...............................................................................
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( testCase.isOpen() )
+with expansion:
+  true
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( s1.isOpen() )
+with expansion:
+  true
+
+-------------------------------------------------------------------------------
+Tracker
+  successfully close one section, then find another
+-------------------------------------------------------------------------------
+PartTrackerTests.cpp:<line number>
+...............................................................................
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( s2.isOpen() == false )
+with expansion:
+  false == false
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( testCase.isComplete() == false )
+with expansion:
+  false == false
+
+-------------------------------------------------------------------------------
+Tracker
+  successfully close one section, then find another
+  Re-enter - skips S1 and enters S2
+-------------------------------------------------------------------------------
+PartTrackerTests.cpp:<line number>
+...............................................................................
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( testCase2.isOpen() )
+with expansion:
+  true
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( s1b.isOpen() == false )
+with expansion:
+  false == false
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( s2b.isOpen() )
+with expansion:
+  true
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( ctx.completedCycle() == false )
+with expansion:
+  false == false
+
+-------------------------------------------------------------------------------
+Tracker
+  successfully close one section, then find another
+  Re-enter - skips S1 and enters S2
+  Successfully close S2
+-------------------------------------------------------------------------------
+PartTrackerTests.cpp:<line number>
+...............................................................................
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( ctx.completedCycle() )
+with expansion:
+  true
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( s2b.isSuccessfullyCompleted() )
+with expansion:
+  true
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( testCase2.isComplete() == false )
+with expansion:
+  false == false
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( testCase2.isSuccessfullyCompleted() )
+with expansion:
+  true
+
+-------------------------------------------------------------------------------
+Tracker
+-------------------------------------------------------------------------------
+PartTrackerTests.cpp:<line number>
+...............................................................................
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( testCase.isOpen() )
+with expansion:
+  true
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( s1.isOpen() )
+with expansion:
+  true
+
+-------------------------------------------------------------------------------
+Tracker
+  successfully close one section, then find another
+-------------------------------------------------------------------------------
+PartTrackerTests.cpp:<line number>
+...............................................................................
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( s2.isOpen() == false )
+with expansion:
+  false == false
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( testCase.isComplete() == false )
+with expansion:
+  false == false
+
+-------------------------------------------------------------------------------
+Tracker
+  successfully close one section, then find another
+  Re-enter - skips S1 and enters S2
+-------------------------------------------------------------------------------
+PartTrackerTests.cpp:<line number>
+...............................................................................
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( testCase2.isOpen() )
+with expansion:
+  true
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( s1b.isOpen() == false )
+with expansion:
+  false == false
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( s2b.isOpen() )
+with expansion:
+  true
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( ctx.completedCycle() == false )
+with expansion:
+  false == false
+
+-------------------------------------------------------------------------------
+Tracker
+  successfully close one section, then find another
+  Re-enter - skips S1 and enters S2
+  fail S2
+-------------------------------------------------------------------------------
+PartTrackerTests.cpp:<line number>
+...............................................................................
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( ctx.completedCycle() )
+with expansion:
+  true
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( s2b.isComplete() )
+with expansion:
+  true
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( s2b.isSuccessfullyCompleted() == false )
+with expansion:
+  false == false
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( testCase2.isSuccessfullyCompleted() == false )
+with expansion:
+  false == false
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( testCase3.isOpen() )
+with expansion:
+  true
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( s1c.isOpen() == false )
+with expansion:
+  false == false
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( s2c.isOpen() == false )
+with expansion:
+  false == false
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( testCase3.isSuccessfullyCompleted() )
+with expansion:
+  true
+
+-------------------------------------------------------------------------------
+Tracker
+-------------------------------------------------------------------------------
+PartTrackerTests.cpp:<line number>
+...............................................................................
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( testCase.isOpen() )
+with expansion:
+  true
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( s1.isOpen() )
+with expansion:
+  true
+
+-------------------------------------------------------------------------------
+Tracker
+  open a nested section
+-------------------------------------------------------------------------------
+PartTrackerTests.cpp:<line number>
+...............................................................................
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( s2.isOpen() )
+with expansion:
+  true
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( s2.isComplete() )
+with expansion:
+  true
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( s1.isComplete() == false )
+with expansion:
+  false == false
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( s1.isComplete() )
+with expansion:
+  true
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( testCase.isComplete() == false )
+with expansion:
+  false == false
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( testCase.isComplete() )
+with expansion:
+  true
+
+-------------------------------------------------------------------------------
+Tracker
+-------------------------------------------------------------------------------
+PartTrackerTests.cpp:<line number>
+...............................................................................
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( testCase.isOpen() )
+with expansion:
+  true
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( s1.isOpen() )
+with expansion:
+  true
+
+-------------------------------------------------------------------------------
+Tracker
+  start a generator
+-------------------------------------------------------------------------------
+PartTrackerTests.cpp:<line number>
+...............................................................................
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( g1.isOpen() )
+with expansion:
+  true
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( g1.index() == 0 )
+with expansion:
+  0 == 0
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( g1.isComplete() == false )
+with expansion:
+  false == false
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( s1.isComplete() == false )
+with expansion:
+  false == false
+
+-------------------------------------------------------------------------------
+Tracker
+  start a generator
+  close outer section
+-------------------------------------------------------------------------------
+PartTrackerTests.cpp:<line number>
+...............................................................................
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( s1.isComplete() == false )
+with expansion:
+  false == false
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( testCase.isSuccessfullyCompleted() == false )
+with expansion:
+  false == false
+
+-------------------------------------------------------------------------------
+Tracker
+  start a generator
+  close outer section
+  Re-enter for second generation
+-------------------------------------------------------------------------------
+PartTrackerTests.cpp:<line number>
+...............................................................................
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( testCase2.isOpen() )
+with expansion:
+  true
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( s1b.isOpen() )
+with expansion:
+  true
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( g1b.isOpen() )
+with expansion:
+  true
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( g1b.index() == 1 )
+with expansion:
+  1 == 1
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( s1.isComplete() == false )
+with expansion:
+  false == false
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( s1b.isComplete() )
+with expansion:
+  true
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( g1b.isComplete() )
+with expansion:
+  true
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( testCase2.isComplete() )
+with expansion:
+  true
+
+-------------------------------------------------------------------------------
+Tracker
+-------------------------------------------------------------------------------
+PartTrackerTests.cpp:<line number>
+...............................................................................
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( testCase.isOpen() )
+with expansion:
+  true
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( s1.isOpen() )
+with expansion:
+  true
+
+-------------------------------------------------------------------------------
+Tracker
+  start a generator
+-------------------------------------------------------------------------------
+PartTrackerTests.cpp:<line number>
+...............................................................................
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( g1.isOpen() )
+with expansion:
+  true
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( g1.index() == 0 )
+with expansion:
+  0 == 0
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( g1.isComplete() == false )
+with expansion:
+  false == false
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( s1.isComplete() == false )
+with expansion:
+  false == false
+
+-------------------------------------------------------------------------------
+Tracker
+  start a generator
+  Start a new inner section
+-------------------------------------------------------------------------------
+PartTrackerTests.cpp:<line number>
+...............................................................................
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( s2.isOpen() )
+with expansion:
+  true
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( s2.isComplete() )
+with expansion:
+  true
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( s1.isComplete() == false )
+with expansion:
+  false == false
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( testCase.isComplete() == false )
+with expansion:
+  false == false
+
+-------------------------------------------------------------------------------
+Tracker
+  start a generator
+  Start a new inner section
+  Re-enter for second generation
+-------------------------------------------------------------------------------
+PartTrackerTests.cpp:<line number>
+...............................................................................
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( testCase2.isOpen() )
+with expansion:
+  true
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( s1b.isOpen() )
+with expansion:
+  true
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( g1b.isOpen() )
+with expansion:
+  true
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( g1b.index() == 1 )
+with expansion:
+  1 == 1
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( s2b.isOpen() )
+with expansion:
+  true
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( s2b.isComplete() )
+with expansion:
+  true
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( g1b.isComplete() )
+with expansion:
+  true
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( s1b.isComplete() )
+with expansion:
+  true
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( testCase2.isComplete() )
+with expansion:
+  true
+
+-------------------------------------------------------------------------------
+Tracker
+-------------------------------------------------------------------------------
+PartTrackerTests.cpp:<line number>
+...............................................................................
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( testCase.isOpen() )
+with expansion:
+  true
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( s1.isOpen() )
+with expansion:
+  true
+
+-------------------------------------------------------------------------------
+Tracker
+  start a generator
+-------------------------------------------------------------------------------
+PartTrackerTests.cpp:<line number>
+...............................................................................
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( g1.isOpen() )
+with expansion:
+  true
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( g1.index() == 0 )
+with expansion:
+  0 == 0
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( g1.isComplete() == false )
+with expansion:
+  false == false
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( s1.isComplete() == false )
+with expansion:
+  false == false
+
+-------------------------------------------------------------------------------
+Tracker
+  start a generator
+  Fail an inner section
+-------------------------------------------------------------------------------
+PartTrackerTests.cpp:<line number>
+...............................................................................
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( s2.isOpen() )
+with expansion:
+  true
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( s2.isComplete() )
+with expansion:
+  true
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( s2.isSuccessfullyCompleted() == false )
+with expansion:
+  false == false
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( s1.isComplete() == false )
+with expansion:
+  false == false
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( testCase.isComplete() == false )
+with expansion:
+  false == false
+
+-------------------------------------------------------------------------------
+Tracker
+  start a generator
+  Fail an inner section
+  Re-enter for second generation
+-------------------------------------------------------------------------------
+PartTrackerTests.cpp:<line number>
+...............................................................................
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( testCase2.isOpen() )
+with expansion:
+  true
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( s1b.isOpen() )
+with expansion:
+  true
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( g1b.isOpen() )
+with expansion:
+  true
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( g1b.index() == 0 )
+with expansion:
+  0 == 0
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( s2b.isOpen() == false )
+with expansion:
+  false == false
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( g1b.isComplete() == false )
+with expansion:
+  false == false
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( s1b.isComplete() == false )
+with expansion:
+  false == false
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( testCase2.isComplete() == false )
+with expansion:
+  false == false
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( testCase3.isOpen() )
+with expansion:
+  true
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( s1c.isOpen() )
+with expansion:
+  true
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( g1c.isOpen() )
+with expansion:
+  true
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( g1c.index() == 1 )
+with expansion:
+  1 == 1
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( s2c.isOpen() )
+with expansion:
+  true
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( s2c.isComplete() )
+with expansion:
+  true
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( g1c.isComplete() )
+with expansion:
+  true
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( s1c.isComplete() )
+with expansion:
+  true
+
+PartTrackerTests.cpp:<line number>:
+PASSED:
+  REQUIRE( testCase3.isComplete() )
+with expansion:
+  true
+
 -------------------------------------------------------------------------------
 std::pair<int,std::string> -> toString
 -------------------------------------------------------------------------------
@@ -8170,6 +9043,6 @@ with expansion:
   true
 
 ===============================================================================
-test cases: 159 | 103 passed |  55 failed |  1 failed as expected
-assertions: 808 | 695 passed | 100 failed | 13 failed as expected
+test cases: 160 | 120 passed | 39 failed |  1 failed as expected
+assertions: 920 | 827 passed | 80 failed | 13 failed as expected
 
diff --git a/projects/SelfTest/Baselines/junit.sw.approved.txt b/projects/SelfTest/Baselines/junit.sw.approved.txt
index 6c6e5208..94f59b8e 100644
--- a/projects/SelfTest/Baselines/junit.sw.approved.txt
+++ b/projects/SelfTest/Baselines/junit.sw.approved.txt
@@ -1,5 +1,5 @@
 <testsuites>
-  <testsuite name="CatchSelfTest" errors="12" failures="88" tests="808" hostname="tbd" time="{duration}" timestamp="tbd">
+  <testsuite name="CatchSelfTest" errors="12" failures="68" tests="920" hostname="tbd" time="{duration}" timestamp="tbd">
     <testcase classname="global" name="toString(enum)" time="{duration}"/>
     <testcase classname="global" name="toString(enum w/operator&lt;&lt;)" time="{duration}"/>
     <testcase classname="global" name="toString(enum class)" time="{duration}"/>
@@ -341,6 +341,8 @@ MessageTests.cpp:<line number>
 MiscTests.cpp:<line number>
       </failure>
     </testcase>
+    <testcase classname="more nested SECTION tests" name="s1/s3" time="{duration}"/>
+    <testcase classname="more nested SECTION tests" name="s1/s4" time="{duration}"/>
     <testcase classname="looped SECTION tests" name="s1" time="{duration}">
       <failure message="0 > 1" type="CHECK">
 MiscTests.cpp:<line number>
@@ -566,6 +568,23 @@ TrickyTests.cpp:<line number>
     <testcase classname="global" name="toString( vectors&lt;has_toString )" time="{duration}"/>
     <testcase classname="global" name="toString( vectors&lt;has_maker )" time="{duration}"/>
     <testcase classname="global" name="toString( vectors&lt;has_maker_and_toString )" time="{duration}"/>
+    <testcase classname="Tracker" name="root" time="{duration}"/>
+    <testcase classname="Tracker" name="successfully close one section" time="{duration}"/>
+    <testcase classname="Tracker" name="fail one section" time="{duration}"/>
+    <testcase classname="Tracker" name="fail one section/re-enter after failed section" time="{duration}"/>
+    <testcase classname="Tracker" name="fail one section/re-enter after failed section and find next section" time="{duration}"/>
+    <testcase classname="Tracker" name="successfully close one section, then find another" time="{duration}"/>
+    <testcase classname="Tracker" name="successfully close one section, then find another/Re-enter - skips S1 and enters S2" time="{duration}"/>
+    <testcase classname="Tracker" name="successfully close one section, then find another/Re-enter - skips S1 and enters S2/Successfully close S2" time="{duration}"/>
+    <testcase classname="Tracker" name="successfully close one section, then find another/Re-enter - skips S1 and enters S2/fail S2" time="{duration}"/>
+    <testcase classname="Tracker" name="open a nested section" time="{duration}"/>
+    <testcase classname="Tracker" name="start a generator" time="{duration}"/>
+    <testcase classname="Tracker" name="start a generator/close outer section" time="{duration}"/>
+    <testcase classname="Tracker" name="start a generator/close outer section/Re-enter for second generation" time="{duration}"/>
+    <testcase classname="Tracker" name="start a generator/Start a new inner section" time="{duration}"/>
+    <testcase classname="Tracker" name="start a generator/Start a new inner section/Re-enter for second generation" time="{duration}"/>
+    <testcase classname="Tracker" name="start a generator/Fail an inner section" time="{duration}"/>
+    <testcase classname="Tracker" name="start a generator/Fail an inner section/Re-enter for second generation" time="{duration}"/>
     <testcase classname="global" name="std::pair&lt;int,std::string> -> toString" time="{duration}"/>
     <testcase classname="global" name="std::pair&lt;int,const std::string> -> toString" time="{duration}"/>
     <testcase classname="global" name="std::vector&lt;std::pair&lt;std::string,int> > -> toString" time="{duration}"/>
diff --git a/projects/SelfTest/Baselines/xml.sw.approved.txt b/projects/SelfTest/Baselines/xml.sw.approved.txt
index 3d20d996..56695fe1 100644
--- a/projects/SelfTest/Baselines/xml.sw.approved.txt
+++ b/projects/SelfTest/Baselines/xml.sw.approved.txt
@@ -1543,7 +1543,7 @@
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="When unchecked exceptions are thrown, but caught, they do not affect the test">
-      <OverallResult success="false"/>
+      <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Unexpected custom exceptions can be translated">
       <Exception filename="projects/SelfTest/ExceptionTests.cpp" >
@@ -2856,7 +2856,7 @@
       <Warning>
         this is a warning
       </Warning>
-      <OverallResult success="false"/>
+      <OverallResult success="true"/>
     </TestCase>
     <TestCase name="SUCCEED counts as a test pass">
       <OverallResult success="true"/>
@@ -2949,12 +2949,12 @@
     </TestCase>
     <TestCase name="Standard output from all sections is reported">
       <Section name="one">
-        <OverallResults successes="0" failures="1" expectedFailures="0"/>
+        <OverallResults successes="0" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="two">
-        <OverallResults successes="0" failures="1" expectedFailures="0"/>
+        <OverallResults successes="0" failures="0" expectedFailures="0"/>
       </Section>
-      <OverallResult success="false"/>
+      <OverallResult success="true"/>
     </TestCase>
     <TestCase name="SCOPED_INFO is reset for each loop">
       <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MessageTests.cpp" >
@@ -3062,10 +3062,10 @@
           1 == 2
         </Expanded>
       </Expression>
-      <OverallResult success="false"/>
+      <OverallResult success="true"/>
     </TestCase>
     <TestCase name="just info">
-      <OverallResult success="false"/>
+      <OverallResult success="true"/>
     </TestCase>
     <TestCase name="just failure">
       <Failure>
@@ -3097,7 +3097,7 @@
       <Warning>
         toString(p): 0x<hex digits>
       </Warning>
-      <OverallResult success="false"/>
+      <OverallResult success="true"/>
     </TestCase>
     <TestCase name="random SECTION tests">
       <Section name="s1" description="doesn't equal">
@@ -3180,25 +3180,53 @@
         </Section>
         <OverallResults successes="0" failures="1" expectedFailures="0"/>
       </Section>
+      <Section name="s1" description="doesn't equal">
+        <Section name="s3" description="not equal">
+          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" >
+            <Original>
+              a != b
+            </Original>
+            <Expanded>
+              1 != 2
+            </Expanded>
+          </Expression>
+          <OverallResults successes="1" failures="0" expectedFailures="0"/>
+        </Section>
+        <OverallResults successes="1" failures="0" expectedFailures="0"/>
+      </Section>
+      <Section name="s1" description="doesn't equal">
+        <Section name="s4" description="less than">
+          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" >
+            <Original>
+              a &lt; b
+            </Original>
+            <Expanded>
+              1 &lt; 2
+            </Expanded>
+          </Expression>
+          <OverallResults successes="1" failures="0" expectedFailures="0"/>
+        </Section>
+        <OverallResults successes="1" failures="0" expectedFailures="0"/>
+      </Section>
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="even more nested SECTION tests">
       <Section name="c">
         <Section name="d (leaf)">
-          <OverallResults successes="0" failures="1" expectedFailures="0"/>
+          <OverallResults successes="0" failures="0" expectedFailures="0"/>
         </Section>
-        <OverallResults successes="0" failures="1" expectedFailures="0"/>
+        <OverallResults successes="0" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="c">
         <Section name="e (leaf)">
-          <OverallResults successes="0" failures="1" expectedFailures="0"/>
+          <OverallResults successes="0" failures="0" expectedFailures="0"/>
         </Section>
-        <OverallResults successes="0" failures="1" expectedFailures="0"/>
+        <OverallResults successes="0" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="f (leaf)">
-        <OverallResults successes="0" failures="1" expectedFailures="0"/>
+        <OverallResults successes="0" failures="0" expectedFailures="0"/>
       </Section>
-      <OverallResult success="false"/>
+      <OverallResult success="true"/>
     </TestCase>
     <TestCase name="looped SECTION tests">
       <Section name="s1" description="b is currently: 0">
@@ -3300,7 +3328,7 @@
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="Sends stuff to stdout and stderr">
-      <OverallResult success="false"/>
+      <OverallResult success="true"/>
     </TestCase>
     <TestCase name="null strings">
       <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" >
@@ -3399,12 +3427,12 @@
     </TestCase>
     <TestCase name="xmlentitycheck">
       <Section name="embedded xml" description="&lt;test>it should be possible to embed xml characters, such as &lt;, &quot; or &amp;, or even whole &lt;xml>documents&lt;/xml> within an attribute&lt;/test>">
-        <OverallResults successes="0" failures="1" expectedFailures="0"/>
+        <OverallResults successes="0" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="encoded chars" description="these should all be encoded: &amp;&amp;&amp;&quot;&quot;&quot;&lt;&lt;&lt;&amp;&quot;&lt;&lt;&amp;&quot;">
-        <OverallResults successes="0" failures="1" expectedFailures="0"/>
+        <OverallResults successes="0" failures="0" expectedFailures="0"/>
       </Section>
-      <OverallResult success="false"/>
+      <OverallResult success="true"/>
     </TestCase>
     <TestCase name="send a single char to INFO">
       <Info>
@@ -3606,19 +3634,19 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="An empty test with no assertions">
-      <OverallResult success="false"/>
+      <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Nice descriptive name">
       <Warning>
         This one ran
       </Warning>
-      <OverallResult success="false"/>
+      <OverallResult success="true"/>
     </TestCase>
     <TestCase name="first tag">
-      <OverallResult success="false"/>
+      <OverallResult success="true"/>
     </TestCase>
     <TestCase name="second tag">
-      <OverallResult success="false"/>
+      <OverallResult success="true"/>
     </TestCase>
     <TestCase name="vectors can be sized and resized">
       <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" >
@@ -5140,7 +5168,7 @@ four"
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Strings can be rendered with colour">
-      <OverallResult success="false"/>
+      <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Text can be formatted using the Text class">
       <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" >
@@ -6191,13 +6219,13 @@ there"
       <Warning>
         Uncomment the code in this test to check that it gives a sensible compiler error
       </Warning>
-      <OverallResult success="false"/>
+      <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Where the LHS is not a simple value">
       <Warning>
         Uncomment the code in this test to check that it gives a sensible compiler error
       </Warning>
-      <OverallResult success="false"/>
+      <OverallResult success="true"/>
     </TestCase>
     <TestCase name="A failing expression with a non streamable type is still captured">
       <Expression success="false" type="CHECK" filename="projects/SelfTest/TrickyTests.cpp" >
@@ -6617,6 +6645,1112 @@ there"
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
+    <TestCase name="Tracker">
+      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+        <Original>
+          testCase.isOpen()
+        </Original>
+        <Expanded>
+          true
+        </Expanded>
+      </Expression>
+      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+        <Original>
+          s1.isOpen()
+        </Original>
+        <Expanded>
+          true
+        </Expanded>
+      </Expression>
+      <Section name="successfully close one section">
+        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+          <Original>
+            s1.isSuccessfullyCompleted()
+          </Original>
+          <Expanded>
+            true
+          </Expanded>
+        </Expression>
+        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+          <Original>
+            testCase.isComplete() == false
+          </Original>
+          <Expanded>
+            false == false
+          </Expanded>
+        </Expression>
+        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+          <Original>
+            ctx.completedCycle()
+          </Original>
+          <Expanded>
+            true
+          </Expanded>
+        </Expression>
+        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+          <Original>
+            testCase.isSuccessfullyCompleted()
+          </Original>
+          <Expanded>
+            true
+          </Expanded>
+        </Expression>
+        <OverallResults successes="4" failures="0" expectedFailures="0"/>
+      </Section>
+      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+        <Original>
+          testCase.isOpen()
+        </Original>
+        <Expanded>
+          true
+        </Expanded>
+      </Expression>
+      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+        <Original>
+          s1.isOpen()
+        </Original>
+        <Expanded>
+          true
+        </Expanded>
+      </Expression>
+      <Section name="fail one section">
+        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+          <Original>
+            s1.isComplete()
+          </Original>
+          <Expanded>
+            true
+          </Expanded>
+        </Expression>
+        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+          <Original>
+            s1.isSuccessfullyCompleted() == false
+          </Original>
+          <Expanded>
+            false == false
+          </Expanded>
+        </Expression>
+        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+          <Original>
+            testCase.isComplete() == false
+          </Original>
+          <Expanded>
+            false == false
+          </Expanded>
+        </Expression>
+        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+          <Original>
+            ctx.completedCycle()
+          </Original>
+          <Expanded>
+            true
+          </Expanded>
+        </Expression>
+        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+          <Original>
+            testCase.isSuccessfullyCompleted() == false
+          </Original>
+          <Expanded>
+            false == false
+          </Expanded>
+        </Expression>
+        <Section name="re-enter after failed section">
+          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+            <Original>
+              testCase2.isOpen()
+            </Original>
+            <Expanded>
+              true
+            </Expanded>
+          </Expression>
+          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+            <Original>
+              s1b.isOpen() == false
+            </Original>
+            <Expanded>
+              false == false
+            </Expanded>
+          </Expression>
+          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+            <Original>
+              ctx.completedCycle()
+            </Original>
+            <Expanded>
+              true
+            </Expanded>
+          </Expression>
+          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+            <Original>
+              testCase.isComplete()
+            </Original>
+            <Expanded>
+              true
+            </Expanded>
+          </Expression>
+          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+            <Original>
+              testCase.isSuccessfullyCompleted()
+            </Original>
+            <Expanded>
+              true
+            </Expanded>
+          </Expression>
+          <OverallResults successes="5" failures="0" expectedFailures="0"/>
+        </Section>
+        <OverallResults successes="10" failures="0" expectedFailures="0"/>
+      </Section>
+      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+        <Original>
+          testCase.isOpen()
+        </Original>
+        <Expanded>
+          true
+        </Expanded>
+      </Expression>
+      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+        <Original>
+          s1.isOpen()
+        </Original>
+        <Expanded>
+          true
+        </Expanded>
+      </Expression>
+      <Section name="fail one section">
+        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+          <Original>
+            s1.isComplete()
+          </Original>
+          <Expanded>
+            true
+          </Expanded>
+        </Expression>
+        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+          <Original>
+            s1.isSuccessfullyCompleted() == false
+          </Original>
+          <Expanded>
+            false == false
+          </Expanded>
+        </Expression>
+        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+          <Original>
+            testCase.isComplete() == false
+          </Original>
+          <Expanded>
+            false == false
+          </Expanded>
+        </Expression>
+        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+          <Original>
+            ctx.completedCycle()
+          </Original>
+          <Expanded>
+            true
+          </Expanded>
+        </Expression>
+        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+          <Original>
+            testCase.isSuccessfullyCompleted() == false
+          </Original>
+          <Expanded>
+            false == false
+          </Expanded>
+        </Expression>
+        <Section name="re-enter after failed section and find next section">
+          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+            <Original>
+              testCase2.isOpen()
+            </Original>
+            <Expanded>
+              true
+            </Expanded>
+          </Expression>
+          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+            <Original>
+              s1b.isOpen() == false
+            </Original>
+            <Expanded>
+              false == false
+            </Expanded>
+          </Expression>
+          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+            <Original>
+              s2.isOpen()
+            </Original>
+            <Expanded>
+              true
+            </Expanded>
+          </Expression>
+          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+            <Original>
+              ctx.completedCycle()
+            </Original>
+            <Expanded>
+              true
+            </Expanded>
+          </Expression>
+          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+            <Original>
+              testCase.isComplete()
+            </Original>
+            <Expanded>
+              true
+            </Expanded>
+          </Expression>
+          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+            <Original>
+              testCase.isSuccessfullyCompleted()
+            </Original>
+            <Expanded>
+              true
+            </Expanded>
+          </Expression>
+          <OverallResults successes="6" failures="0" expectedFailures="0"/>
+        </Section>
+        <OverallResults successes="11" failures="0" expectedFailures="0"/>
+      </Section>
+      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+        <Original>
+          testCase.isOpen()
+        </Original>
+        <Expanded>
+          true
+        </Expanded>
+      </Expression>
+      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+        <Original>
+          s1.isOpen()
+        </Original>
+        <Expanded>
+          true
+        </Expanded>
+      </Expression>
+      <Section name="successfully close one section, then find another">
+        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+          <Original>
+            s2.isOpen() == false
+          </Original>
+          <Expanded>
+            false == false
+          </Expanded>
+        </Expression>
+        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+          <Original>
+            testCase.isComplete() == false
+          </Original>
+          <Expanded>
+            false == false
+          </Expanded>
+        </Expression>
+        <Section name="Re-enter - skips S1 and enters S2">
+          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+            <Original>
+              testCase2.isOpen()
+            </Original>
+            <Expanded>
+              true
+            </Expanded>
+          </Expression>
+          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+            <Original>
+              s1b.isOpen() == false
+            </Original>
+            <Expanded>
+              false == false
+            </Expanded>
+          </Expression>
+          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+            <Original>
+              s2b.isOpen()
+            </Original>
+            <Expanded>
+              true
+            </Expanded>
+          </Expression>
+          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+            <Original>
+              ctx.completedCycle() == false
+            </Original>
+            <Expanded>
+              false == false
+            </Expanded>
+          </Expression>
+          <Section name="Successfully close S2">
+            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+              <Original>
+                ctx.completedCycle()
+              </Original>
+              <Expanded>
+                true
+              </Expanded>
+            </Expression>
+            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+              <Original>
+                s2b.isSuccessfullyCompleted()
+              </Original>
+              <Expanded>
+                true
+              </Expanded>
+            </Expression>
+            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+              <Original>
+                testCase2.isComplete() == false
+              </Original>
+              <Expanded>
+                false == false
+              </Expanded>
+            </Expression>
+            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+              <Original>
+                testCase2.isSuccessfullyCompleted()
+              </Original>
+              <Expanded>
+                true
+              </Expanded>
+            </Expression>
+            <OverallResults successes="4" failures="0" expectedFailures="0"/>
+          </Section>
+          <OverallResults successes="8" failures="0" expectedFailures="0"/>
+        </Section>
+        <OverallResults successes="10" failures="0" expectedFailures="0"/>
+      </Section>
+      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+        <Original>
+          testCase.isOpen()
+        </Original>
+        <Expanded>
+          true
+        </Expanded>
+      </Expression>
+      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+        <Original>
+          s1.isOpen()
+        </Original>
+        <Expanded>
+          true
+        </Expanded>
+      </Expression>
+      <Section name="successfully close one section, then find another">
+        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+          <Original>
+            s2.isOpen() == false
+          </Original>
+          <Expanded>
+            false == false
+          </Expanded>
+        </Expression>
+        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+          <Original>
+            testCase.isComplete() == false
+          </Original>
+          <Expanded>
+            false == false
+          </Expanded>
+        </Expression>
+        <Section name="Re-enter - skips S1 and enters S2">
+          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+            <Original>
+              testCase2.isOpen()
+            </Original>
+            <Expanded>
+              true
+            </Expanded>
+          </Expression>
+          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+            <Original>
+              s1b.isOpen() == false
+            </Original>
+            <Expanded>
+              false == false
+            </Expanded>
+          </Expression>
+          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+            <Original>
+              s2b.isOpen()
+            </Original>
+            <Expanded>
+              true
+            </Expanded>
+          </Expression>
+          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+            <Original>
+              ctx.completedCycle() == false
+            </Original>
+            <Expanded>
+              false == false
+            </Expanded>
+          </Expression>
+          <Section name="fail S2">
+            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+              <Original>
+                ctx.completedCycle()
+              </Original>
+              <Expanded>
+                true
+              </Expanded>
+            </Expression>
+            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+              <Original>
+                s2b.isComplete()
+              </Original>
+              <Expanded>
+                true
+              </Expanded>
+            </Expression>
+            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+              <Original>
+                s2b.isSuccessfullyCompleted() == false
+              </Original>
+              <Expanded>
+                false == false
+              </Expanded>
+            </Expression>
+            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+              <Original>
+                testCase2.isSuccessfullyCompleted() == false
+              </Original>
+              <Expanded>
+                false == false
+              </Expanded>
+            </Expression>
+            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+              <Original>
+                testCase3.isOpen()
+              </Original>
+              <Expanded>
+                true
+              </Expanded>
+            </Expression>
+            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+              <Original>
+                s1c.isOpen() == false
+              </Original>
+              <Expanded>
+                false == false
+              </Expanded>
+            </Expression>
+            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+              <Original>
+                s2c.isOpen() == false
+              </Original>
+              <Expanded>
+                false == false
+              </Expanded>
+            </Expression>
+            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+              <Original>
+                testCase3.isSuccessfullyCompleted()
+              </Original>
+              <Expanded>
+                true
+              </Expanded>
+            </Expression>
+            <OverallResults successes="8" failures="0" expectedFailures="0"/>
+          </Section>
+          <OverallResults successes="12" failures="0" expectedFailures="0"/>
+        </Section>
+        <OverallResults successes="14" failures="0" expectedFailures="0"/>
+      </Section>
+      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+        <Original>
+          testCase.isOpen()
+        </Original>
+        <Expanded>
+          true
+        </Expanded>
+      </Expression>
+      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+        <Original>
+          s1.isOpen()
+        </Original>
+        <Expanded>
+          true
+        </Expanded>
+      </Expression>
+      <Section name="open a nested section">
+        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+          <Original>
+            s2.isOpen()
+          </Original>
+          <Expanded>
+            true
+          </Expanded>
+        </Expression>
+        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+          <Original>
+            s2.isComplete()
+          </Original>
+          <Expanded>
+            true
+          </Expanded>
+        </Expression>
+        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+          <Original>
+            s1.isComplete() == false
+          </Original>
+          <Expanded>
+            false == false
+          </Expanded>
+        </Expression>
+        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+          <Original>
+            s1.isComplete()
+          </Original>
+          <Expanded>
+            true
+          </Expanded>
+        </Expression>
+        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+          <Original>
+            testCase.isComplete() == false
+          </Original>
+          <Expanded>
+            false == false
+          </Expanded>
+        </Expression>
+        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+          <Original>
+            testCase.isComplete()
+          </Original>
+          <Expanded>
+            true
+          </Expanded>
+        </Expression>
+        <OverallResults successes="6" failures="0" expectedFailures="0"/>
+      </Section>
+      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+        <Original>
+          testCase.isOpen()
+        </Original>
+        <Expanded>
+          true
+        </Expanded>
+      </Expression>
+      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+        <Original>
+          s1.isOpen()
+        </Original>
+        <Expanded>
+          true
+        </Expanded>
+      </Expression>
+      <Section name="start a generator">
+        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+          <Original>
+            g1.isOpen()
+          </Original>
+          <Expanded>
+            true
+          </Expanded>
+        </Expression>
+        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+          <Original>
+            g1.index() == 0
+          </Original>
+          <Expanded>
+            0 == 0
+          </Expanded>
+        </Expression>
+        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+          <Original>
+            g1.isComplete() == false
+          </Original>
+          <Expanded>
+            false == false
+          </Expanded>
+        </Expression>
+        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+          <Original>
+            s1.isComplete() == false
+          </Original>
+          <Expanded>
+            false == false
+          </Expanded>
+        </Expression>
+        <Section name="close outer section">
+          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+            <Original>
+              s1.isComplete() == false
+            </Original>
+            <Expanded>
+              false == false
+            </Expanded>
+          </Expression>
+          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+            <Original>
+              testCase.isSuccessfullyCompleted() == false
+            </Original>
+            <Expanded>
+              false == false
+            </Expanded>
+          </Expression>
+          <Section name="Re-enter for second generation">
+            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+              <Original>
+                testCase2.isOpen()
+              </Original>
+              <Expanded>
+                true
+              </Expanded>
+            </Expression>
+            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+              <Original>
+                s1b.isOpen()
+              </Original>
+              <Expanded>
+                true
+              </Expanded>
+            </Expression>
+            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+              <Original>
+                g1b.isOpen()
+              </Original>
+              <Expanded>
+                true
+              </Expanded>
+            </Expression>
+            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+              <Original>
+                g1b.index() == 1
+              </Original>
+              <Expanded>
+                1 == 1
+              </Expanded>
+            </Expression>
+            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+              <Original>
+                s1.isComplete() == false
+              </Original>
+              <Expanded>
+                false == false
+              </Expanded>
+            </Expression>
+            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+              <Original>
+                s1b.isComplete()
+              </Original>
+              <Expanded>
+                true
+              </Expanded>
+            </Expression>
+            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+              <Original>
+                g1b.isComplete()
+              </Original>
+              <Expanded>
+                true
+              </Expanded>
+            </Expression>
+            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+              <Original>
+                testCase2.isComplete()
+              </Original>
+              <Expanded>
+                true
+              </Expanded>
+            </Expression>
+            <OverallResults successes="8" failures="0" expectedFailures="0"/>
+          </Section>
+          <OverallResults successes="10" failures="0" expectedFailures="0"/>
+        </Section>
+        <OverallResults successes="14" failures="0" expectedFailures="0"/>
+      </Section>
+      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+        <Original>
+          testCase.isOpen()
+        </Original>
+        <Expanded>
+          true
+        </Expanded>
+      </Expression>
+      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+        <Original>
+          s1.isOpen()
+        </Original>
+        <Expanded>
+          true
+        </Expanded>
+      </Expression>
+      <Section name="start a generator">
+        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+          <Original>
+            g1.isOpen()
+          </Original>
+          <Expanded>
+            true
+          </Expanded>
+        </Expression>
+        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+          <Original>
+            g1.index() == 0
+          </Original>
+          <Expanded>
+            0 == 0
+          </Expanded>
+        </Expression>
+        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+          <Original>
+            g1.isComplete() == false
+          </Original>
+          <Expanded>
+            false == false
+          </Expanded>
+        </Expression>
+        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+          <Original>
+            s1.isComplete() == false
+          </Original>
+          <Expanded>
+            false == false
+          </Expanded>
+        </Expression>
+        <Section name="Start a new inner section">
+          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+            <Original>
+              s2.isOpen()
+            </Original>
+            <Expanded>
+              true
+            </Expanded>
+          </Expression>
+          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+            <Original>
+              s2.isComplete()
+            </Original>
+            <Expanded>
+              true
+            </Expanded>
+          </Expression>
+          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+            <Original>
+              s1.isComplete() == false
+            </Original>
+            <Expanded>
+              false == false
+            </Expanded>
+          </Expression>
+          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+            <Original>
+              testCase.isComplete() == false
+            </Original>
+            <Expanded>
+              false == false
+            </Expanded>
+          </Expression>
+          <Section name="Re-enter for second generation">
+            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+              <Original>
+                testCase2.isOpen()
+              </Original>
+              <Expanded>
+                true
+              </Expanded>
+            </Expression>
+            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+              <Original>
+                s1b.isOpen()
+              </Original>
+              <Expanded>
+                true
+              </Expanded>
+            </Expression>
+            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+              <Original>
+                g1b.isOpen()
+              </Original>
+              <Expanded>
+                true
+              </Expanded>
+            </Expression>
+            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+              <Original>
+                g1b.index() == 1
+              </Original>
+              <Expanded>
+                1 == 1
+              </Expanded>
+            </Expression>
+            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+              <Original>
+                s2b.isOpen()
+              </Original>
+              <Expanded>
+                true
+              </Expanded>
+            </Expression>
+            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+              <Original>
+                s2b.isComplete()
+              </Original>
+              <Expanded>
+                true
+              </Expanded>
+            </Expression>
+            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+              <Original>
+                g1b.isComplete()
+              </Original>
+              <Expanded>
+                true
+              </Expanded>
+            </Expression>
+            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+              <Original>
+                s1b.isComplete()
+              </Original>
+              <Expanded>
+                true
+              </Expanded>
+            </Expression>
+            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+              <Original>
+                testCase2.isComplete()
+              </Original>
+              <Expanded>
+                true
+              </Expanded>
+            </Expression>
+            <OverallResults successes="9" failures="0" expectedFailures="0"/>
+          </Section>
+          <OverallResults successes="13" failures="0" expectedFailures="0"/>
+        </Section>
+        <OverallResults successes="17" failures="0" expectedFailures="0"/>
+      </Section>
+      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+        <Original>
+          testCase.isOpen()
+        </Original>
+        <Expanded>
+          true
+        </Expanded>
+      </Expression>
+      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+        <Original>
+          s1.isOpen()
+        </Original>
+        <Expanded>
+          true
+        </Expanded>
+      </Expression>
+      <Section name="start a generator">
+        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+          <Original>
+            g1.isOpen()
+          </Original>
+          <Expanded>
+            true
+          </Expanded>
+        </Expression>
+        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+          <Original>
+            g1.index() == 0
+          </Original>
+          <Expanded>
+            0 == 0
+          </Expanded>
+        </Expression>
+        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+          <Original>
+            g1.isComplete() == false
+          </Original>
+          <Expanded>
+            false == false
+          </Expanded>
+        </Expression>
+        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+          <Original>
+            s1.isComplete() == false
+          </Original>
+          <Expanded>
+            false == false
+          </Expanded>
+        </Expression>
+        <Section name="Fail an inner section">
+          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+            <Original>
+              s2.isOpen()
+            </Original>
+            <Expanded>
+              true
+            </Expanded>
+          </Expression>
+          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+            <Original>
+              s2.isComplete()
+            </Original>
+            <Expanded>
+              true
+            </Expanded>
+          </Expression>
+          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+            <Original>
+              s2.isSuccessfullyCompleted() == false
+            </Original>
+            <Expanded>
+              false == false
+            </Expanded>
+          </Expression>
+          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+            <Original>
+              s1.isComplete() == false
+            </Original>
+            <Expanded>
+              false == false
+            </Expanded>
+          </Expression>
+          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+            <Original>
+              testCase.isComplete() == false
+            </Original>
+            <Expanded>
+              false == false
+            </Expanded>
+          </Expression>
+          <Section name="Re-enter for second generation">
+            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+              <Original>
+                testCase2.isOpen()
+              </Original>
+              <Expanded>
+                true
+              </Expanded>
+            </Expression>
+            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+              <Original>
+                s1b.isOpen()
+              </Original>
+              <Expanded>
+                true
+              </Expanded>
+            </Expression>
+            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+              <Original>
+                g1b.isOpen()
+              </Original>
+              <Expanded>
+                true
+              </Expanded>
+            </Expression>
+            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+              <Original>
+                g1b.index() == 0
+              </Original>
+              <Expanded>
+                0 == 0
+              </Expanded>
+            </Expression>
+            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+              <Original>
+                s2b.isOpen() == false
+              </Original>
+              <Expanded>
+                false == false
+              </Expanded>
+            </Expression>
+            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+              <Original>
+                g1b.isComplete() == false
+              </Original>
+              <Expanded>
+                false == false
+              </Expanded>
+            </Expression>
+            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+              <Original>
+                s1b.isComplete() == false
+              </Original>
+              <Expanded>
+                false == false
+              </Expanded>
+            </Expression>
+            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+              <Original>
+                testCase2.isComplete() == false
+              </Original>
+              <Expanded>
+                false == false
+              </Expanded>
+            </Expression>
+            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+              <Original>
+                testCase3.isOpen()
+              </Original>
+              <Expanded>
+                true
+              </Expanded>
+            </Expression>
+            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+              <Original>
+                s1c.isOpen()
+              </Original>
+              <Expanded>
+                true
+              </Expanded>
+            </Expression>
+            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+              <Original>
+                g1c.isOpen()
+              </Original>
+              <Expanded>
+                true
+              </Expanded>
+            </Expression>
+            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+              <Original>
+                g1c.index() == 1
+              </Original>
+              <Expanded>
+                1 == 1
+              </Expanded>
+            </Expression>
+            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+              <Original>
+                s2c.isOpen()
+              </Original>
+              <Expanded>
+                true
+              </Expanded>
+            </Expression>
+            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+              <Original>
+                s2c.isComplete()
+              </Original>
+              <Expanded>
+                true
+              </Expanded>
+            </Expression>
+            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+              <Original>
+                g1c.isComplete()
+              </Original>
+              <Expanded>
+                true
+              </Expanded>
+            </Expression>
+            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+              <Original>
+                s1c.isComplete()
+              </Original>
+              <Expanded>
+                true
+              </Expanded>
+            </Expression>
+            <Expression success="true" type="REQUIRE" filename="projects/SelfTest/PartTrackerTests.cpp" >
+              <Original>
+                testCase3.isComplete()
+              </Original>
+              <Expanded>
+                true
+              </Expanded>
+            </Expression>
+            <OverallResults successes="17" failures="0" expectedFailures="0"/>
+          </Section>
+          <OverallResults successes="22" failures="0" expectedFailures="0"/>
+        </Section>
+        <OverallResults successes="26" failures="0" expectedFailures="0"/>
+      </Section>
+      <OverallResult success="true"/>
+    </TestCase>
     <TestCase name="std::pair&lt;int,std::string> -> toString">
       <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ToStringPair.cpp" >
         <Original>
@@ -8463,7 +9597,7 @@ there"
       </Section>
       <OverallResult success="true"/>
     </TestCase>
-    <OverallResults successes="695" failures="100" expectedFailures="13"/>
+    <OverallResults successes="827" failures="80" expectedFailures="13"/>
   </Group>
-  <OverallResults successes="695" failures="100" expectedFailures="13"/>
+  <OverallResults successes="827" failures="80" expectedFailures="13"/>
 </Catch>