--- a/compiler/tests/stx_goodies_petitparser_compiler_tests.st	Tue May 12 01:24:03 2015 +0100
+++ b/compiler/tests/stx_goodies_petitparser_compiler_tests.st	Thu May 21 14:12:22 2015 +0100
@@ -56,7 +56,6 @@
      by searching along the inheritance chain of all of my classes."
 
     ^ #(
-        #'stx:goodies/petitparser'    "PPCompositeParser - superclass of PPExpressionGrammar"
         #'stx:goodies/petitparser/tests'    "PPAbstractParserTest - superclass of PPCCodeGeneratorTest"
         #'stx:goodies/sunit'    "TestAsserter - superclass of PPCCodeGeneratorTest"
         #'stx:libbasic'    "LibraryDefinition - superclass of stx_goodies_petitparser_compiler_tests"
@@ -74,7 +73,8 @@
      by searching all classes (and their packages) which are referenced by my classes."
 
     ^ #(
-        #'stx:goodies/petitparser/compiler'    "PPCAbstractCharacterNode - referenced by PPCPrototype1OptimizingTest>>testForwarding"
+        #'stx:goodies/petitparser'    "PPCharSetPredicate - referenced by PPCCodeGeneratorTest>>testCharSetPredicateNode"
+        #'stx:goodies/petitparser/compiler'    "PPCAbstractLiteralNode - referenced by PPCNodeFirstFollowNextTests>>testFirst1"
         #'stx:goodies/petitparser/parsers/java'    "PPJavaWhitespaceParser - referenced by PPCMergingVisitorTest>>javaWsNode"
     )
 !
@@ -114,32 +114,23 @@
         PPCCopyVisitorTest
         PPCGuardTest
         PPCInliningVisitorTest
-        PPCLL1OptimizingTest
-        PPCLL1Test
         PPCLL1VisitorTest
+        PPCLTokenizingOptimizationTest
         PPCMergingVisitorTest
         PPCMockCompiler
         PPCNodeFirstFollowNextTests
         PPCNodeTest
         PPCOptimizeChoicesTest
-        PPCPrototype1OptimizingTest
-        PPCPrototype1Test
         PPCRecognizerComponentDetectorTest
         PPCRecognizerComponentVisitorTest
         PPCSpecializingVisitorTest
         PPCTokenDetectorTest
+        PPCTokenGuardTest
         PPCTokenizingCodeGeneratorTest
+        PPCTokenizingTest
         PPCTokenizingVisitorTest
-        PPCompiledExpressionGrammarResource
-        PPCompiledExpressionGrammarTest
-        PPExpressionGrammar
-        PPExpressionGrammarTest
-        PPLL1ExpressionGrammar
-        PPLL1ExpressionGrammarTest
-        PPTokenizedExpressionGrammarResource
-        PPTokenizedExpressionGrammarTest
-        PPTokenizedLL1ExpressionGrammarResource
-        PPTokenizedLL1ExpressionGrammarTest
+        PPCUniversalOptimizationTest
+        PPCUniversalTest
         #'stx_goodies_petitparser_compiler_tests'
     )
 !