--- a/compiler/tests/extras/stx_goodies_petitparser_compiler_tests_extras.st	Fri Jul 24 15:06:54 2015 +0100
+++ b/compiler/tests/extras/stx_goodies_petitparser_compiler_tests_extras.st	Mon Aug 17 12:13:16 2015 +0100
@@ -57,10 +57,11 @@
      by searching along the inheritance chain of all of my classes."
 
     ^ #(
-        #'stx:goodies/petitparser'    "PPCompositeParser - superclass of PPExpressionGrammar"
+        #'stx:goodies/petitparser'    "PPCompositeParser - superclass of PPCLRPParser"
         #'stx:goodies/petitparser/parsers/java'    "PPJavaLexiconTest - superclass of PPCompiledJavaSyntaxTest"
-        #'stx:goodies/petitparser/tests'    "PPAbstractParserTest - superclass of PPCCompiledJavaVerificationTest"
-        #'stx:goodies/sunit'    "TestAsserter - superclass of PPCCompiledJavaVerificationTest"
+        #'stx:goodies/petitparser/parsers/smalltalk/tests'    "PPSmalltalkGrammarTests - superclass of PPCSmalltalkGrammarTests"
+        #'stx:goodies/petitparser/tests'    "PPAbstractParserTest - superclass of PPCAbstractParserTest"
+        #'stx:goodies/sunit'    "TestAsserter - superclass of PPCAbstractParserTest"
         #'stx:libbasic'    "LibraryDefinition - superclass of stx_goodies_petitparser_compiler_tests_extras"
     )
 !
@@ -76,8 +77,8 @@
      by searching all classes (and their packages) which are referenced by my classes."
 
     ^ #(
-        #'stx:goodies/petitparser/compiler'    "PPCArguments - referenced by PPCSmalltalkTests>>setUp"
-        #'stx:goodies/petitparser/parsers/smalltalk'    "PPSmalltalkGrammar - referenced by PPCSmalltalkVerificationTest>>smalltalkGrammar"
+        #'stx:goodies/petitparser/compiler'    "PPCArguments - referenced by PPCSmalltalkTests>>configuration"
+        #'stx:goodies/petitparser/parsers/smalltalk'    "PPSmalltalkGrammar - referenced by PPCSmalltalkGrammarTests>>petitParserClass"
         #'stx:libbasic2'    "Random - referenced by PPCResources>>expressionOfSize:stream:"
     )
 !
@@ -102,37 +103,63 @@
 
     ^ #(
         "<className> or (<className> attributes...) in load order"
+        (PPCAbstractParserTest autoload)
         (PPCCompiledJavaVerificationTest autoload)
-        (PPCExpressionsVerificationTest autoload)
+        (PPCCompositeParserTest autoload)
+        PPCLRPNode
+        PPCLRPParser
+        (PPCLRPParserSmokeTest autoload)
+        (PPCLRPSourcesResource autoload)
         (PPCResources autoload)
+        (PPCSetUpBeforeTearDownAfterResource autoload)
+        (PPCSmalltalkGrammarTests autoload)
+        (PPCSmalltalkParserTests autoload)
         (PPCSmalltalkTests autoload)
-        (PPCSmalltalkVerificationTest autoload)
-        (PPCompiledExpressionGrammarResource autoload)
-        (PPCompiledExpressionGrammarTest autoload)
         (PPCompiledJavaResource autoload)
         (PPCompiledJavaSyntaxTest autoload)
-        (PPCompiledSmalltalkGrammarResource autoload)
-        (PPCompiledSmalltalkGrammarTests autoload)
-        (PPCompiledSmalltalkParserResource autoload)
-        (PPCompiledSmalltalkParserTests autoload)
         PPExpressionGrammar
         (PPExpressionGrammarTest autoload)
         PPLL1ExpressionGrammar
         (PPLL1ExpressionGrammarTest autoload)
-        (PPTokenizedExpressionGrammarResource autoload)
-        (PPTokenizedExpressionGrammarTest autoload)
-        (PPTokenizedLL1ExpressionGrammarResource autoload)
-        (PPTokenizedLL1ExpressionGrammarTest autoload)
-        (PPTokenizedSmalltalkGrammarResource autoload)
-        (PPTokenizedSmalltalkGrammarTests autoload)
-        (PPTokenizedSmalltalkParserResource autoload)
-        (PPTokenizedSmalltalkParserTests autoload)
         #'stx_goodies_petitparser_compiler_tests_extras'
-        (PPCompiledExpressionsVerificationTest autoload)
-        (PPCompiledSmalltalkVerificationTest autoload)
-        (PPTokenizedExpressionsVerificationTest autoload)
-        (PPTokenizedSmalltalkParserVerificationTest autoload)
-        (PPTokenizedSmalltalkVerificationTest autoload)
+        (PPCExpressionGrammarTest autoload)
+        (PPCExpressionGrammarVerificationTest autoload)
+        (PPCLL1ExpressionGrammarTest autoload)
+        PPCLRPAction
+        PPCLRPContainedElement
+        (PPCLRPParserVerificationTest autoload)
+        PPCLRPSpawn
+        (#'PPCSmalltalkGrammarTests_Tokenized' autoload)
+        (#'PPCSmalltalkGrammarTests_Universal' autoload)
+        (PPCSmalltalkGrammarVerificationTest autoload)
+        (#'PPCSmalltalkParserTests_Tokenized' autoload)
+        (#'PPCSmalltalkParserTests_Universal' autoload)
+        (PPCSmalltalkParserVerificationTest autoload)
+        (#'PPCExpressionGrammarTest_Tokenized' autoload)
+        (#'PPCExpressionGrammarTest_Universal' autoload)
+        (#'PPCLL1ExpressionGrammarTest_Tokenized' autoload)
+        (#'PPCLL1ExpressionGrammarTest_Universal' autoload)
+        PPCLRPComment
+        PPCLRPErrorNode
+        PPCLRPEvent
+        PPCLRPMachine
+        PPCLRPOnEntry
+        PPCLRPOnExit
+        (#'PPCLRPParserVerificationTest_Tokenized' autoload)
+        (#'PPCLRPParserVerificationTest_Universal' autoload)
+        PPCLRPRunning
+        PPCLRPState
+        PPCLRPTransition
+        PPCLRPVariable
+        (#'PPCSmalltalkGrammarVerificationTest_Tokenized' autoload)
+        (#'PPCSmalltalkGrammarVerificationTest_Universal' autoload)
+        (#'PPCSmalltalkParserVerificationTest_Tokenized' autoload)
+        (#'PPCSmalltalkParserVerificationTest_Universal' autoload)
+        (#'PPExpressionGrammarVerificationTest_Tokenized' autoload)
+        (#'PPExpressionGrammarVerificationTest_Universal' autoload)
+        PPCLRPEpsilonTransition
+        PPCLRPTimeoutTransition
+        PPCLRPWildcardTransition
     )
 !