diff --git a/projects/SelfTest/Baselines/xml.sw.approved.txt b/projects/SelfTest/Baselines/xml.sw.approved.txt
index b7638216..974c212d 100644
--- a/projects/SelfTest/Baselines/xml.sw.approved.txt
+++ b/projects/SelfTest/Baselines/xml.sw.approved.txt
@@ -15,7 +15,7 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="'Not' checks that should fail">
+    <TestCase name="'Not' checks that should fail" tags="[.][failing][hide]">
       <Expression success="false" type="CHECK" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           false != false
@@ -149,7 +149,7 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="(unimplemented) static bools can be evaluated">
+    <TestCase name="(unimplemented) static bools can be evaluated" tags="[Tricky]">
       <Section name="compare to true">
         <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/TrickyTests.cpp" >
           <Original>
@@ -231,7 +231,7 @@
       </Section>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="A METHOD_AS_TEST_CASE based test run that fails">
+    <TestCase name="A METHOD_AS_TEST_CASE based test run that fails" tags="[.][class][failing][hide]">
       <Expression success="false" type="REQUIRE" filename="projects/<exe-name>/ClassTests.cpp" >
         <Original>
           s == "world"
@@ -242,7 +242,7 @@
       </Expression>
       <OverallResult success="false"/>
     </TestCase>
-    <TestCase name="A METHOD_AS_TEST_CASE based test run that succeeds">
+    <TestCase name="A METHOD_AS_TEST_CASE based test run that succeeds" tags="[class]">
       <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ClassTests.cpp" >
         <Original>
           s == "hello"
@@ -253,7 +253,7 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="A TEST_CASE_METHOD based test run that fails">
+    <TestCase name="A TEST_CASE_METHOD based test run that fails" tags="[.][class][failing][hide]">
       <Expression success="false" type="REQUIRE" filename="projects/<exe-name>/ClassTests.cpp" >
         <Original>
           m_a == 2
@@ -264,7 +264,7 @@
       </Expression>
       <OverallResult success="false"/>
     </TestCase>
-    <TestCase name="A TEST_CASE_METHOD based test run that succeeds">
+    <TestCase name="A TEST_CASE_METHOD based test run that succeeds" tags="[class]">
       <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ClassTests.cpp" >
         <Original>
           m_a == 1
@@ -275,7 +275,7 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="A couple of nested sections followed by a failure">
+    <TestCase name="A couple of nested sections followed by a failure" tags="[.][failing][hide]">
       <Section name="Outer">
         <Section name="Inner">
           <OverallResults successes="1" failures="0" expectedFailures="0"/>
@@ -287,7 +287,7 @@
       </Failure>
       <OverallResult success="false"/>
     </TestCase>
-    <TestCase name="A failing expression with a non streamable type is still captured">
+    <TestCase name="A failing expression with a non streamable type is still captured" tags="[.][Tricky][failing][hide]">
       <Expression success="false" type="CHECK" filename="projects/<exe-name>/TrickyTests.cpp" >
         <Original>
           &amp;o1 == &amp;o2
@@ -306,7 +306,7 @@
       </Expression>
       <OverallResult success="false"/>
     </TestCase>
-    <TestCase name="AllOf matcher">
+    <TestCase name="AllOf matcher" tags="[matchers]">
       <Expression success="true" type="CHECK_THAT" filename="projects/<exe-name>/MiscTests.cpp" >
         <Original>
           testStringForMatching(), AllOf( Catch::Contains( "string" ), Catch::Contains( "abc" ) )
@@ -317,10 +317,10 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="An empty test with no assertions">
+    <TestCase name="An empty test with no assertions" tags="[empty]">
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="An expression with side-effects should only be evaluated once">
+    <TestCase name="An expression with side-effects should only be evaluated once" tags="[Tricky]">
       <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/TrickyTests.cpp" >
         <Original>
           i++ == 7
@@ -339,7 +339,7 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="An unchecked exception reports the line of the last assertion">
+    <TestCase name="An unchecked exception reports the line of the last assertion" tags="[!throws][.][failing][hide]">
       <Expression success="true" type="CHECK" filename="projects/<exe-name>/ExceptionTests.cpp" >
         <Original>
           1 == 1
@@ -364,7 +364,7 @@
     <TestCase name="Anonymous test case 1">
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="AnyOf matcher">
+    <TestCase name="AnyOf matcher" tags="[matchers]">
       <Expression success="true" type="CHECK_THAT" filename="projects/<exe-name>/MiscTests.cpp" >
         <Original>
           testStringForMatching(), AnyOf( Catch::Contains( "string" ), Catch::Contains( "not there" ) )
@@ -383,7 +383,7 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Approximate PI">
+    <TestCase name="Approximate PI" tags="[Approx][PI]">
       <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ApproxTests.cpp" >
         <Original>
           divide( 22, 7 ) == Approx( 3.141 ).epsilon( 0.001 )
@@ -402,7 +402,7 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Approximate comparisons with different epsilons">
+    <TestCase name="Approximate comparisons with different epsilons" tags="[Approx]">
       <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ApproxTests.cpp" >
         <Original>
           d != Approx( 1.231 )
@@ -421,7 +421,7 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Approximate comparisons with floats">
+    <TestCase name="Approximate comparisons with floats" tags="[Approx]">
       <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ApproxTests.cpp" >
         <Original>
           1.23f == Approx( 1.23f )
@@ -440,7 +440,7 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Approximate comparisons with ints">
+    <TestCase name="Approximate comparisons with ints" tags="[Approx]">
       <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ApproxTests.cpp" >
         <Original>
           1 == Approx( 1 )
@@ -459,7 +459,7 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Approximate comparisons with mixed numeric types">
+    <TestCase name="Approximate comparisons with mixed numeric types" tags="[Approx]">
       <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ApproxTests.cpp" >
         <Original>
           1.0f == Approx( 1 )
@@ -502,7 +502,7 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Assertions then sections">
+    <TestCase name="Assertions then sections" tags="[Tricky]">
       <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/TrickyTests.cpp" >
         <Original>
           Catch::alwaysTrue()
@@ -689,7 +689,7 @@
       </Section>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Comparing function pointers">
+    <TestCase name="Comparing function pointers" tags="[Tricky][function pointer]">
       <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/TrickyTests.cpp" >
         <Original>
           a
@@ -708,7 +708,7 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Comparing member function pointers">
+    <TestCase name="Comparing member function pointers" tags="[Tricky][member function pointer]">
       <Expression success="true" type="CHECK" filename="projects/<exe-name>/TrickyTests.cpp" >
         <Original>
           m == &amp;S::f
@@ -892,7 +892,7 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Contains string matcher">
+    <TestCase name="Contains string matcher" tags="[.][failing][hide][matchers]">
       <Expression success="false" type="CHECK_THAT" filename="projects/<exe-name>/MiscTests.cpp" >
         <Original>
           testStringForMatching(), Contains( "not there" )
@@ -903,7 +903,7 @@
       </Expression>
       <OverallResult success="false"/>
     </TestCase>
-    <TestCase name="Custom exceptions can be translated when testing for nothrow">
+    <TestCase name="Custom exceptions can be translated when testing for nothrow" tags="[!throws][.][failing][hide]">
       <Expression success="false" type="REQUIRE_NOTHROW" filename="projects/<exe-name>/ExceptionTests.cpp" >
         <Original>
           throwCustom()
@@ -917,7 +917,7 @@
       </Expression>
       <OverallResult success="false"/>
     </TestCase>
-    <TestCase name="Custom exceptions can be translated when testing for throwing as something else">
+    <TestCase name="Custom exceptions can be translated when testing for throwing as something else" tags="[!throws][.][failing][hide]">
       <Expression success="false" type="REQUIRE_THROWS_AS" filename="projects/<exe-name>/ExceptionTests.cpp" >
         <Original>
           throwCustom()
@@ -931,13 +931,13 @@
       </Expression>
       <OverallResult success="false"/>
     </TestCase>
-    <TestCase name="Custom std-exceptions can be custom translated">
+    <TestCase name="Custom std-exceptions can be custom translated" tags="[!throws][.][failing][hide]">
       <Exception filename="projects/<exe-name>/ExceptionTests.cpp" >
         custom std exception
       </Exception>
       <OverallResult success="false"/>
     </TestCase>
-    <TestCase name="Demonstrate that a non-const == is not used">
+    <TestCase name="Demonstrate that a non-const == is not used" tags="[Tricky]">
       <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/TrickyTests.cpp" >
         <Original>
           t == 1u
@@ -948,7 +948,7 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="EndsWith string matcher">
+    <TestCase name="EndsWith string matcher" tags="[.][failing][hide][matchers]">
       <Expression success="false" type="CHECK_THAT" filename="projects/<exe-name>/MiscTests.cpp" >
         <Original>
           testStringForMatching(), EndsWith( "this" )
@@ -959,7 +959,7 @@
       </Expression>
       <OverallResult success="false"/>
     </TestCase>
-    <TestCase name="Equality checks that should fail">
+    <TestCase name="Equality checks that should fail" tags="[!mayfail][.][failing][hide]">
       <Expression success="false" type="CHECK" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           data.int_seven == 6
@@ -1125,7 +1125,7 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Equals">
+    <TestCase name="Equals" tags="[matchers]">
       <Expression success="true" type="CHECK_THAT" filename="projects/<exe-name>/MiscTests.cpp" >
         <Original>
           testStringForMatching(), Equals( "this string contains 'abc' as a substring" )
@@ -1136,7 +1136,7 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Equals string matcher">
+    <TestCase name="Equals string matcher" tags="[.][failing][hide][matchers]">
       <Expression success="false" type="CHECK_THAT" filename="projects/<exe-name>/MiscTests.cpp" >
         <Original>
           testStringForMatching(), Equals( "something else" )
@@ -1147,7 +1147,7 @@
       </Expression>
       <OverallResult success="false"/>
     </TestCase>
-    <TestCase name="Equals string matcher, with NULL">
+    <TestCase name="Equals string matcher, with NULL" tags="[matchers]">
       <Expression success="true" type="REQUIRE_THAT" filename="projects/<exe-name>/MiscTests.cpp" >
         <Original>
           "", Equals(0)
@@ -1158,7 +1158,7 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Exception messages can be tested for">
+    <TestCase name="Exception messages can be tested for" tags="[!throws]">
       <Section name="exact match">
         <Expression success="true" type="REQUIRE_THROWS_WITH" filename="projects/<exe-name>/ExceptionTests.cpp" >
           <Original>
@@ -1218,7 +1218,7 @@
       </Section>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Expected exceptions that don't throw or unexpected exceptions fail the test">
+    <TestCase name="Expected exceptions that don't throw or unexpected exceptions fail the test" tags="[!throws][.][failing][hide]">
       <Expression success="false" type="CHECK_THROWS_AS" filename="projects/<exe-name>/ExceptionTests.cpp" >
         <Original>
           thisThrows()
@@ -1251,17 +1251,17 @@
       </Expression>
       <OverallResult success="false"/>
     </TestCase>
-    <TestCase name="FAIL aborts the test">
+    <TestCase name="FAIL aborts the test" tags="[.][failing][hide][messages]">
       <Failure>
         This is a failure
       </Failure>
       <OverallResult success="false"/>
     </TestCase>
-    <TestCase name="FAIL does not require an argument">
+    <TestCase name="FAIL does not require an argument" tags="[.][failing][hide][messages]">
       <Failure/>
       <OverallResult success="false"/>
     </TestCase>
-    <TestCase name="Factorials are computed">
+    <TestCase name="Factorials are computed" tags="[factorial]">
       <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/MiscTests.cpp" >
         <Original>
           Factorial(0) == 1
@@ -1304,7 +1304,7 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Generator over a range of pairs">
+    <TestCase name="Generator over a range of pairs" tags="[generators]">
       <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           i->first == i->second-1
@@ -1323,7 +1323,7 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Generators over two ranges">
+    <TestCase name="Generators over two ranges" tags="[generators]">
       <Expression success="true" type="CATCH_REQUIRE" filename="projects/<exe-name>/GeneratorTests.cpp" >
         <Original>
           multiply( i, 2 ) == i*2
@@ -2478,7 +2478,7 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Greater-than inequalities with different epsilons">
+    <TestCase name="Greater-than inequalities with different epsilons" tags="[Approx]">
       <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ApproxTests.cpp" >
         <Original>
           d >= Approx( 1.22 )
@@ -2513,7 +2513,7 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="INFO and WARN do not abort tests">
+    <TestCase name="INFO and WARN do not abort tests" tags="[.][hide][messages]">
       <Info>
         this is a message
       </Info>
@@ -2522,7 +2522,7 @@
       </Warning>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="INFO gets logged on failure">
+    <TestCase name="INFO gets logged on failure" tags="[.][failing][hide][messages]">
       <Info>
         this message should be logged
       </Info>
@@ -2539,7 +2539,7 @@
       </Expression>
       <OverallResult success="false"/>
     </TestCase>
-    <TestCase name="INFO gets logged on failure, even if captured before successful assertions">
+    <TestCase name="INFO gets logged on failure, even if captured before successful assertions" tags="[.][failing][hide][messages]">
       <Expression success="true" type="CHECK" filename="projects/<exe-name>/MessageTests.cpp" >
         <Original>
           a == 2
@@ -2580,7 +2580,7 @@
       </Expression>
       <OverallResult success="false"/>
     </TestCase>
-    <TestCase name="Inequality checks that should fail">
+    <TestCase name="Inequality checks that should fail" tags="[!shouldfail][.][failing][hide]">
       <Expression success="false" type="CHECK" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           data.int_seven != 7
@@ -2714,7 +2714,7 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Less-than inequalities with different epsilons">
+    <TestCase name="Less-than inequalities with different epsilons" tags="[Approx]">
       <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ApproxTests.cpp" >
         <Original>
           d &lt;= Approx( 1.24 )
@@ -2749,7 +2749,7 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Long strings can be wrapped">
+    <TestCase name="Long strings can be wrapped" tags="[wrap]">
       <Section name="plain string">
         <Section name="No wrapping">
           <Expression success="true" type="CHECK" filename="projects/<exe-name>/TestMain.cpp" >
@@ -3342,7 +3342,7 @@ re>"
       </Section>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Long text is truncted">
+    <TestCase name="Long text is truncted" tags="[Text][Truncated]">
       <Expression success="true" type="CHECK_THAT" filename="projects/<exe-name>/TestMain.cpp" >
         <Original>
           t.toString(), EndsWith( "... message truncated due to excessive size" )
@@ -4356,7 +4356,7 @@ re>"
     <TestCase name="ManuallyRegistered">
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Matchers can be (AllOf) composed with the &amp;&amp; operator">
+    <TestCase name="Matchers can be (AllOf) composed with the &amp;&amp; operator" tags="[matchers][operator&amp;&amp;][operators]">
       <Expression success="true" type="CHECK_THAT" filename="projects/<exe-name>/MiscTests.cpp" >
         <Original>
           testStringForMatching(), Contains( "string" ) &amp;&amp; Contains( "abc" ) &amp;&amp; Contains( "substring" ) &amp;&amp; Contains( "contains" )
@@ -4367,7 +4367,7 @@ re>"
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Matchers can be (AnyOf) composed with the || operator">
+    <TestCase name="Matchers can be (AnyOf) composed with the || operator" tags="[matchers][operators][operator||]">
       <Expression success="true" type="CHECK_THAT" filename="projects/<exe-name>/MiscTests.cpp" >
         <Original>
           testStringForMatching(), Contains( "string" ) || Contains( "different" ) || Contains( "random" )
@@ -4386,7 +4386,7 @@ re>"
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Matchers can be composed with both &amp;&amp; and ||">
+    <TestCase name="Matchers can be composed with both &amp;&amp; and ||" tags="[matchers][operator&amp;&amp;][operators][operator||]">
       <Expression success="true" type="CHECK_THAT" filename="projects/<exe-name>/MiscTests.cpp" >
         <Original>
           testStringForMatching(), ( Contains( "string" ) || Contains( "different" ) ) &amp;&amp; Contains( "substring" )
@@ -4397,7 +4397,7 @@ re>"
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Matchers can be composed with both &amp;&amp; and || - failing">
+    <TestCase name="Matchers can be composed with both &amp;&amp; and || - failing" tags="[.][.failing][hide][matchers][operator&amp;&amp;][operators][operator||]">
       <Expression success="false" type="CHECK_THAT" filename="projects/<exe-name>/MiscTests.cpp" >
         <Original>
           testStringForMatching(), ( Contains( "string" ) || Contains( "different" ) ) &amp;&amp; Contains( "random" )
@@ -4408,7 +4408,7 @@ re>"
       </Expression>
       <OverallResult success="false"/>
     </TestCase>
-    <TestCase name="Matchers can be negated (Not) with the ! operator">
+    <TestCase name="Matchers can be negated (Not) with the ! operator" tags="[matchers][not][operators]">
       <Expression success="true" type="CHECK_THAT" filename="projects/<exe-name>/MiscTests.cpp" >
         <Original>
           testStringForMatching(), !Contains( "different" )
@@ -4419,7 +4419,7 @@ re>"
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Matchers can be negated (Not) with the ! operator - failing">
+    <TestCase name="Matchers can be negated (Not) with the ! operator - failing" tags="[.][.failing][hide][matchers][not][operators]">
       <Expression success="false" type="CHECK_THAT" filename="projects/<exe-name>/MiscTests.cpp" >
         <Original>
           testStringForMatching(), !Contains( "substring" )
@@ -4430,7 +4430,7 @@ re>"
       </Expression>
       <OverallResult success="false"/>
     </TestCase>
-    <TestCase name="Mismatching exception messages failing the test">
+    <TestCase name="Mismatching exception messages failing the test" tags="[!throws][.][failing][hide]">
       <Expression success="true" type="REQUIRE_THROWS_WITH" filename="projects/<exe-name>/ExceptionTests.cpp" >
         <Original>
           thisThrows(), "expected exception"
@@ -4449,19 +4449,19 @@ re>"
       </Expression>
       <OverallResult success="false"/>
     </TestCase>
-    <TestCase name="Nice descriptive name">
+    <TestCase name="Nice descriptive name" tags="[.][hide][tag1][tag2][tag3]">
       <Warning>
         This one ran
       </Warning>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Non-std exceptions can be translated">
+    <TestCase name="Non-std exceptions can be translated" tags="[!throws][.][failing][hide]">
       <Exception filename="projects/<exe-name>/ExceptionTests.cpp" >
         custom exception
       </Exception>
       <OverallResult success="false"/>
     </TestCase>
-    <TestCase name="NotImplemented exception">
+    <TestCase name="NotImplemented exception" tags="[!throws]">
       <Expression success="true" type="REQUIRE_THROWS" filename="projects/<exe-name>/ExceptionTests.cpp" >
         <Original>
           thisFunctionNotImplemented( 7 )
@@ -4472,7 +4472,7 @@ re>"
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Objects that evaluated in boolean contexts can be checked">
+    <TestCase name="Objects that evaluated in boolean contexts can be checked" tags="[SafeBool][Tricky]">
       <Expression success="true" type="CHECK" filename="projects/<exe-name>/TrickyTests.cpp" >
         <Original>
           True
@@ -4499,7 +4499,7 @@ re>"
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Operators at different namespace levels not hijacked by Koenig lookup">
+    <TestCase name="Operators at different namespace levels not hijacked by Koenig lookup" tags="[Tricky]">
       <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/TrickyTests.cpp" >
         <Original>
           0x<hex digits> == o
@@ -4510,7 +4510,7 @@ re>"
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Ordering comparison checks that should fail">
+    <TestCase name="Ordering comparison checks that should fail" tags="[.][failing][hide]">
       <Expression success="false" type="CHECK" filename="projects/<exe-name>/ConditionTests.cpp" >
         <Original>
           data.int_seven > 7
@@ -4804,7 +4804,7 @@ re>"
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Output from all sections is reported">
+    <TestCase name="Output from all sections is reported" tags="[.][failing][hide][messages]">
       <Section name="one">
         <Failure>
           Message from section one
@@ -5995,7 +5995,7 @@ re>"
       </Section>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Parsing a std::pair">
+    <TestCase name="Parsing a std::pair" tags="[Tricky][std::pair]">
       <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/TrickyTests.cpp" >
         <Original>
           (std::pair&lt;int, int>( 1, 2 )) == aNicePair
@@ -6073,7 +6073,7 @@ re>"
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Pointers can be converted to strings">
+    <TestCase name="Pointers can be converted to strings" tags="[.][hide][messages]">
       <Warning>
         actual address of p: 0x<hex digits>
       </Warning>
@@ -6082,7 +6082,7 @@ re>"
       </Warning>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Process can be configured on command line">
+    <TestCase name="Process can be configured on command line" tags="[command-line][config]">
       <Section name="default - no arguments">
         <Expression success="true" type="CHECK_NOTHROW" filename="projects/<exe-name>/TestMain.cpp" >
           <Original>
@@ -6668,7 +6668,7 @@ re>"
       </Section>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="SCOPED_INFO is reset for each loop">
+    <TestCase name="SCOPED_INFO is reset for each loop" tags="[.][failing][hide][messages]">
       <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/MessageTests.cpp" >
         <Original>
           i &lt; 10
@@ -6765,13 +6765,13 @@ re>"
       </Expression>
       <OverallResult success="false"/>
     </TestCase>
-    <TestCase name="SUCCEED counts as a test pass">
+    <TestCase name="SUCCEED counts as a test pass" tags="[messages]">
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="SUCCESS does not require an argument">
+    <TestCase name="SUCCESS does not require an argument" tags="[.][hide][messages]">
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Scenario: BDD tests requiring Fixtures to provide commonly-accessed data or methods">
+    <TestCase name="Scenario: BDD tests requiring Fixtures to provide commonly-accessed data or methods" tags="[bdd][fixtures]">
       <Section name="Given: No operations precede me">
         <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/BDDTests.cpp" >
           <Original>
@@ -6799,7 +6799,7 @@ re>"
       </Section>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Scenario: Do that thing with the thing">
+    <TestCase name="Scenario: Do that thing with the thing" tags="[Tags]">
       <Section name="Given: This stuff exists">
         <Section name="When: I do this">
           <Section name="Then: it should do this">
@@ -6830,7 +6830,7 @@ re>"
       </Section>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Scenario: This is a really long scenario name to see how the list command deals with wrapping">
+    <TestCase name="Scenario: This is a really long scenario name to see how the list command deals with wrapping" tags="[anotherReallyLongTagNameButThisOneHasNoObviousWrapPointsSoShouldSplitWithinAWordUsingADashCharacter][long][lots][one very long tag name that should cause line wrapping writing out using the list command][tags][verbose][very long tags]">
       <Section name="Given: A section name that is so long that it cannot fit in a single console width">
         <Section name="When: The test headers are printed as part of the normal running of the scenario">
           <Section name="Then: The, deliberately very long and overly verbose (you see what I did there?) section names must wrap, along with an indent">
@@ -6842,7 +6842,7 @@ re>"
       </Section>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Scenario: Vector resizing affects size and capacity">
+    <TestCase name="Scenario: Vector resizing affects size and capacity" tags="[bdd][capacity][size][vector]">
       <Section name="Given: an empty vector">
         <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/BDDTests.cpp" >
           <Original>
@@ -6933,7 +6933,7 @@ re>"
       </Section>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Sends stuff to stdout and stderr">
+    <TestCase name="Sends stuff to stdout and stderr" tags="[.][hide]">
       <OverallResult success="true">
         <StdOut>
 A string sent directly to stdout
@@ -6943,7 +6943,7 @@ A string sent directly to stderr
         </StdErr>
       </OverallResult>
     </TestCase>
-    <TestCase name="Some simple comparisons between doubles">
+    <TestCase name="Some simple comparisons between doubles" tags="[Approx]">
       <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ApproxTests.cpp" >
         <Original>
           d == Approx( 1.23 )
@@ -6994,7 +6994,7 @@ A string sent directly to stderr
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Standard output from all sections is reported">
+    <TestCase name="Standard output from all sections is reported" tags="[.][hide][messages]">
       <Section name="one">
         <OverallResults successes="0" failures="1" expectedFailures="0"/>
       </Section>
@@ -7008,7 +7008,7 @@ Message from section two
         </StdOut>
       </OverallResult>
     </TestCase>
-    <TestCase name="StartsWith string matcher">
+    <TestCase name="StartsWith string matcher" tags="[.][failing][hide][matchers]">
       <Expression success="false" type="CHECK_THAT" filename="projects/<exe-name>/MiscTests.cpp" >
         <Original>
           testStringForMatching(), StartsWith( "string" )
@@ -7019,7 +7019,7 @@ Message from section two
       </Expression>
       <OverallResult success="false"/>
     </TestCase>
-    <TestCase name="String matchers">
+    <TestCase name="String matchers" tags="[matchers]">
       <Expression success="true" type="REQUIRE_THAT" filename="projects/<exe-name>/MiscTests.cpp" >
         <Original>
           testStringForMatching(), Contains( "string" )
@@ -7054,7 +7054,7 @@ Message from section two
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Strings can be rendered with colour">
+    <TestCase name="Strings can be rendered with colour" tags="[.][.colour][hide]">
       <OverallResult success="true">
         <StdOut>
 hello
@@ -7062,7 +7062,7 @@ hello
         </StdOut>
       </OverallResult>
     </TestCase>
-    <TestCase name="Tabs and newlines show in output">
+    <TestCase name="Tabs and newlines show in output" tags="[.][failing][hide][whitespace]">
       <Expression success="false" type="CHECK" filename="projects/<exe-name>/MiscTests.cpp" >
         <Original>
           s1 == s2
@@ -7164,7 +7164,7 @@ hello
     <TestCase name="Test case with one argument">
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Test enum bit values">
+    <TestCase name="Test enum bit values" tags="[Tricky]">
       <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/TrickyTests.cpp" >
         <Original>
           0x<hex digits> == bit30and31
@@ -7198,7 +7198,7 @@ there"
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="The NO_FAIL macro reports a failure but does not fail the test">
+    <TestCase name="The NO_FAIL macro reports a failure but does not fail the test" tags="[messages]">
       <Expression success="false" type="CHECK_NOFAIL" filename="projects/<exe-name>/MessageTests.cpp" >
         <Original>
           1 == 2
@@ -7209,7 +7209,7 @@ there"
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="This test 'should' fail but doesn't">
+    <TestCase name="This test 'should' fail but doesn't" tags="[!shouldfail][.][failing][hide]">
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="Tracker">
@@ -8318,13 +8318,13 @@ there"
       </Section>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Unexpected exceptions can be translated">
+    <TestCase name="Unexpected exceptions can be translated" tags="[!throws][.][failing][hide]">
       <Exception filename="projects/<exe-name>/ExceptionTests.cpp" >
         3.14
       </Exception>
       <OverallResult success="false"/>
     </TestCase>
-    <TestCase name="Use a custom approx">
+    <TestCase name="Use a custom approx" tags="[Approx][custom]">
       <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ApproxTests.cpp" >
         <Original>
           d == approx( 1.23 )
@@ -8391,13 +8391,13 @@ there"
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Variadic macros">
+    <TestCase name="Variadic macros" tags="[sections][variadic]">
       <Section name="Section with one argument">
         <OverallResults successes="1" failures="0" expectedFailures="0"/>
       </Section>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="When checked exceptions are thrown they can be expected or unexpected">
+    <TestCase name="When checked exceptions are thrown they can be expected or unexpected" tags="[!throws]">
       <Expression success="true" type="REQUIRE_THROWS_AS" filename="projects/<exe-name>/ExceptionTests.cpp" >
         <Original>
           thisThrows()
@@ -8424,13 +8424,13 @@ there"
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="When unchecked exceptions are thrown directly they are always failures">
+    <TestCase name="When unchecked exceptions are thrown directly they are always failures" tags="[!throws][.][failing][hide]">
       <Exception filename="projects/<exe-name>/ExceptionTests.cpp" >
         unexpected exception
       </Exception>
       <OverallResult success="false"/>
     </TestCase>
-    <TestCase name="When unchecked exceptions are thrown during a CHECK the test should continue">
+    <TestCase name="When unchecked exceptions are thrown during a CHECK the test should continue" tags="[!throws][.][failing][hide]">
       <Expression success="false" type="CHECK" filename="projects/<exe-name>/ExceptionTests.cpp" >
         <Original>
           thisThrows() == 0
@@ -8444,7 +8444,7 @@ there"
       </Expression>
       <OverallResult success="false"/>
     </TestCase>
-    <TestCase name="When unchecked exceptions are thrown during a REQUIRE the test should abort fail">
+    <TestCase name="When unchecked exceptions are thrown during a REQUIRE the test should abort fail" tags="[!throws][.][failing][hide]">
       <Expression success="false" type="REQUIRE" filename="projects/<exe-name>/ExceptionTests.cpp" >
         <Original>
           thisThrows() == 0
@@ -8458,7 +8458,7 @@ there"
       </Expression>
       <OverallResult success="false"/>
     </TestCase>
-    <TestCase name="When unchecked exceptions are thrown from functions they are always failures">
+    <TestCase name="When unchecked exceptions are thrown from functions they are always failures" tags="[!throws][.][failing][hide]">
       <Expression success="false" type="CHECK" filename="projects/<exe-name>/ExceptionTests.cpp" >
         <Original>
           thisThrows() == 0
@@ -8472,7 +8472,7 @@ there"
       </Expression>
       <OverallResult success="false"/>
     </TestCase>
-    <TestCase name="When unchecked exceptions are thrown from sections they are always failures">
+    <TestCase name="When unchecked exceptions are thrown from sections they are always failures" tags="[!throws][.][failing][hide]">
       <Section name="section name">
         <Exception filename="projects/<exe-name>/ExceptionTests.cpp" >
           unexpected exception
@@ -8481,31 +8481,31 @@ there"
       </Section>
       <OverallResult success="false"/>
     </TestCase>
-    <TestCase name="When unchecked exceptions are thrown, but caught, they do not affect the test">
+    <TestCase name="When unchecked exceptions are thrown, but caught, they do not affect the test" tags="[!throws]">
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Where the LHS is not a simple value">
+    <TestCase name="Where the LHS is not a simple value" tags="[.][Tricky][failing][hide]">
       <Warning>
         Uncomment the code in this test to check that it gives a sensible compiler error
       </Warning>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Where there is more to the expression after the RHS">
+    <TestCase name="Where there is more to the expression after the RHS" tags="[.][Tricky][failing][hide]">
       <Warning>
         Uncomment the code in this test to check that it gives a sensible compiler error
       </Warning>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="X/level/0/a">
+    <TestCase name="X/level/0/a" tags="[Tricky]">
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="X/level/0/b">
+    <TestCase name="X/level/0/b" tags="[Tricky][fizz]">
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="X/level/1/a">
+    <TestCase name="X/level/1/a" tags="[Tricky]">
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="X/level/1/b">
+    <TestCase name="X/level/1/b" tags="[Tricky]">
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="XmlEncode">
@@ -8621,7 +8621,7 @@ there"
       </Section>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="atomic if">
+    <TestCase name="atomic if" tags="[0][failing]">
       <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/MiscTests.cpp" >
         <Original>
           x == 0
@@ -8632,7 +8632,7 @@ there"
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="boolean member">
+    <TestCase name="boolean member" tags="[Tricky]">
       <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/TrickyTests.cpp" >
         <Original>
           obj.prop != 0
@@ -8662,7 +8662,7 @@ there"
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="checkedElse, failing">
+    <TestCase name="checkedElse, failing" tags="[.][failing][hide]">
       <Expression success="false" type="CHECKED_ELSE" filename="projects/<exe-name>/MiscTests.cpp" >
         <Original>
           flag
@@ -8700,7 +8700,7 @@ there"
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="checkedIf, failing">
+    <TestCase name="checkedIf, failing" tags="[.][failing][hide]">
       <Expression success="false" type="CHECKED_IF" filename="projects/<exe-name>/MiscTests.cpp" >
         <Original>
           flag
@@ -8789,7 +8789,7 @@ there"
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="even more nested SECTION tests">
+    <TestCase name="even more nested SECTION tests" tags="[sections]">
       <Section name="c">
         <Section name="d (leaf)">
           <OverallResults successes="1" failures="0" expectedFailures="0"/>
@@ -8807,19 +8807,19 @@ there"
       </Section>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="first tag">
+    <TestCase name="first tag" tags="[tag1]">
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="just failure">
+    <TestCase name="just failure" tags="[.][fail][hide][isolated info][messages]">
       <Failure>
         Previous info should not be seen
       </Failure>
       <OverallResult success="false"/>
     </TestCase>
-    <TestCase name="just info">
+    <TestCase name="just info" tags="[info][isolated info][messages]">
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="looped SECTION tests">
+    <TestCase name="looped SECTION tests" tags="[.][failing][hide][sections]">
       <Section name="s1" description="b is currently: 0">
         <Expression success="false" type="CHECK" filename="projects/<exe-name>/MiscTests.cpp" >
           <Original>
@@ -8833,7 +8833,7 @@ there"
       </Section>
       <OverallResult success="false"/>
     </TestCase>
-    <TestCase name="looped tests">
+    <TestCase name="looped tests" tags="[.][failing][hide]">
       <Info>
         Testing if fib[0] (1) is even
       </Info>
@@ -8918,7 +8918,7 @@ there"
       </Expression>
       <OverallResult success="false"/>
     </TestCase>
-    <TestCase name="more nested SECTION tests">
+    <TestCase name="more nested SECTION tests" tags="[.][failing][hide][sections]">
       <Section name="s1" description="doesn't equal">
         <Section name="s2" description="equal">
           <Expression success="false" type="REQUIRE" filename="projects/<exe-name>/MiscTests.cpp" >
@@ -8963,7 +8963,7 @@ there"
       </Section>
       <OverallResult success="false"/>
     </TestCase>
-    <TestCase name="nested SECTION tests">
+    <TestCase name="nested SECTION tests" tags="[.][failing][hide][sections]">
       <Section name="s1" description="doesn't equal">
         <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/MiscTests.cpp" >
           <Original>
@@ -8996,7 +8996,7 @@ there"
       </Section>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="non streamable - with conv. op">
+    <TestCase name="non streamable - with conv. op" tags="[Tricky]">
       <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/TrickyTests.cpp" >
         <Original>
           s == "7"
@@ -9007,7 +9007,7 @@ there"
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="not allowed">
+    <TestCase name="not allowed" tags="[!throws]">
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="null strings">
@@ -9029,7 +9029,7 @@ there"
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="pair&lt;pair&lt;int,const char *,pair&lt;std::string,int> > -> toString">
+    <TestCase name="pair&lt;pair&lt;int,const char *,pair&lt;std::string,int> > -> toString" tags="[pair][toString]">
       <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ToStringPair.cpp" >
         <Original>
           Catch::toString( pair ) == "{ { 42, \"Arthur\" }, { \"Ford\", 24 } }"
@@ -9042,7 +9042,7 @@ there"
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="pointer to class">
+    <TestCase name="pointer to class" tags="[Tricky]">
       <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/TrickyTests.cpp" >
         <Original>
           p == 0
@@ -9053,7 +9053,7 @@ there"
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="random SECTION tests">
+    <TestCase name="random SECTION tests" tags="[.][failing][hide][sections]">
       <Section name="s1" description="doesn't equal">
         <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/MiscTests.cpp" >
           <Original>
@@ -9222,10 +9222,10 @@ there"
       </Section>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="second tag">
+    <TestCase name="second tag" tags="[tag2]">
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="send a single char to INFO">
+    <TestCase name="send a single char to INFO" tags="[.][failing][hide]">
       <Info>
         3
       </Info>
@@ -9239,7 +9239,7 @@ there"
       </Expression>
       <OverallResult success="false"/>
     </TestCase>
-    <TestCase name="sends information to INFO">
+    <TestCase name="sends information to INFO" tags="[.][failing][hide]">
       <Info>
         hi
       </Info>
@@ -9256,7 +9256,7 @@ there"
       </Expression>
       <OverallResult success="false"/>
     </TestCase>
-    <TestCase name="std::pair&lt;int,const std::string> -> toString">
+    <TestCase name="std::pair&lt;int,const std::string> -> toString" tags="[pair][toString]">
       <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ToStringPair.cpp" >
         <Original>
           Catch::toString(value) == "{ 34, \"xyzzy\" }"
@@ -9267,7 +9267,7 @@ there"
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="std::pair&lt;int,std::string> -> toString">
+    <TestCase name="std::pair&lt;int,std::string> -> toString" tags="[pair][toString]">
       <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ToStringPair.cpp" >
         <Original>
           Catch::toString( value ) == "{ 34, \"xyzzy\" }"
@@ -9278,7 +9278,7 @@ there"
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="std::vector&lt;std::pair&lt;std::string,int> > -> toString">
+    <TestCase name="std::vector&lt;std::pair&lt;std::string,int> > -> toString" tags="[pair][toString]">
       <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ToStringPair.cpp" >
         <Original>
           Catch::toString( pr ) == "{ { \"green\", 55 } }"
@@ -9291,7 +9291,7 @@ there"
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="string literals of different sizes can be compared">
+    <TestCase name="string literals of different sizes can be compared" tags="[.][Tricky][failing][hide]">
       <Expression success="false" type="REQUIRE" filename="projects/<exe-name>/TrickyTests.cpp" >
         <Original>
           std::string( "first" ) == "second"
@@ -9302,7 +9302,7 @@ there"
       </Expression>
       <OverallResult success="false"/>
     </TestCase>
-    <TestCase name="toString on const wchar_t const pointer returns the string contents">
+    <TestCase name="toString on const wchar_t const pointer returns the string contents" tags="[toString]">
       <Expression success="true" type="CHECK" filename="projects/<exe-name>/MiscTests.cpp" >
         <Original>
           result == "\"wide load\""
@@ -9313,7 +9313,7 @@ there"
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="toString on const wchar_t pointer returns the string contents">
+    <TestCase name="toString on const wchar_t pointer returns the string contents" tags="[toString]">
       <Expression success="true" type="CHECK" filename="projects/<exe-name>/MiscTests.cpp" >
         <Original>
           result == "\"wide load\""
@@ -9324,7 +9324,7 @@ there"
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="toString on wchar_t const pointer returns the string contents">
+    <TestCase name="toString on wchar_t const pointer returns the string contents" tags="[toString]">
       <Expression success="true" type="CHECK" filename="projects/<exe-name>/MiscTests.cpp" >
         <Original>
           result == "\"wide load\""
@@ -9335,7 +9335,7 @@ there"
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="toString on wchar_t returns the string contents">
+    <TestCase name="toString on wchar_t returns the string contents" tags="[toString]">
       <Expression success="true" type="CHECK" filename="projects/<exe-name>/MiscTests.cpp" >
         <Original>
           result == "\"wide load\""
@@ -9346,7 +9346,7 @@ there"
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="toString( has_maker )">
+    <TestCase name="toString( has_maker )" description="toString]">
       <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ToStringWhich.cpp" >
         <Original>
           Catch::toString( item ) == "StringMaker&lt;has_maker>"
@@ -9359,7 +9359,7 @@ there"
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="toString( has_maker_and_toString )">
+    <TestCase name="toString( has_maker_and_toString )" tags="[.][hide][toString]">
       <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ToStringWhich.cpp" >
         <Original>
           Catch::toString( item ) == "toString( has_maker_and_toString )"
@@ -9372,7 +9372,7 @@ there"
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="toString( has_toString )">
+    <TestCase name="toString( has_toString )" tags="[toString]">
       <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ToStringWhich.cpp" >
         <Original>
           Catch::toString( item ) == "toString( has_toString )"
@@ -9385,7 +9385,7 @@ there"
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="toString( vectors&lt;has_maker )">
+    <TestCase name="toString( vectors&lt;has_maker )" tags="[toString]">
       <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ToStringWhich.cpp" >
         <Original>
           Catch::toString( v ) == "{ StringMaker&lt;has_maker> }"
@@ -9398,7 +9398,7 @@ there"
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="toString(enum w/operator&lt;&lt;)">
+    <TestCase name="toString(enum w/operator&lt;&lt;)" tags="[enum][toString]">
       <Expression success="true" type="CHECK" filename="projects/<exe-name>/EnumToString.cpp" >
         <Original>
           Catch::toString(e0) == "E2{0}"
@@ -9417,7 +9417,7 @@ there"
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="toString(enum)">
+    <TestCase name="toString(enum)" tags="[enum][toString]">
       <Expression success="true" type="CHECK" filename="projects/<exe-name>/EnumToString.cpp" >
         <Original>
           Catch::toString(e0) == "0"
@@ -9436,7 +9436,7 @@ there"
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="vector&lt;int> -> toString">
+    <TestCase name="vector&lt;int> -> toString" tags="[toString][vector]">
       <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ToStringVector.cpp" >
         <Original>
           Catch::toString(vv) == "{  }"
@@ -9463,7 +9463,7 @@ there"
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="vector&lt;string> -> toString">
+    <TestCase name="vector&lt;string> -> toString" tags="[toString][vector]">
       <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ToStringVector.cpp" >
         <Original>
           Catch::toString(vv) == "{  }"
@@ -9492,7 +9492,7 @@ there"
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="vectors can be sized and resized">
+    <TestCase name="vectors can be sized and resized" tags="[vector]">
       <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/MiscTests.cpp" >
         <Original>
           v.size() == 5