--- a/compiler/tests/extras/stx_goodies_petitparser_compiler_tests_extras.st	Thu Jul 30 08:37:37 2015 +0100
+++ b/compiler/tests/extras/stx_goodies_petitparser_compiler_tests_extras.st	Thu Jul 30 17:31:18 2015 +0100
@@ -83,12 +83,8 @@
      by searching along the inheritance chain of all of my classes."
 
     ^ #(
-        #'stx:goodies/petitparser'    "PPCompositeParser - superclass of PPExpressionGrammar"
-        #'stx:goodies/petitparser/parsers/java'    "PPJavaLexiconTest - superclass of PPCompiledJavaSyntaxTest"
-        #'stx:goodies/petitparser/parsers/smalltalk/tests'    "PPSmalltalkGrammarTests - superclass of PPCSmalltalkGrammarTests"
-        #'stx:goodies/petitparser/tests'    "PPAbstractParserTest - superclass of PPCAbstractParserTest"
-        #'stx:goodies/sunit'    "TestAsserter - extended"
-        #'stx:libbasic'    "LibraryDefinition - superclass of stx_goodies_petitparser_compiler_tests_extras"
+        #'stx:goodies/petitparser'    "PPCompositeParser - superclass of PPCLRPParser"
+        #'stx:libbasic'    "Autoload - superclass of PPCAbstractParserTest"
     )
 !
 
@@ -103,9 +99,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 PPCSmalltalkGrammarTests>>petitParserClass"
-        #'stx:libbasic2'    "Random - referenced by PPCResources>>expressionOfSize:stream:"
+        #'stx:goodies/petitparser/parsers/smalltalk'    "PPSmalltalkParser - referenced by PPCLRPParser>>block"
+        #'stx:goodies/sunit'    "TestCase - referenced by stx_goodies_petitparser_compiler_tests_extras class>>additionalClassAttributesFor:"
     )
 !
 
@@ -129,40 +124,57 @@
 
     ^ #(
         "<className> or (<className> attributes...) in load order"
+        PPCLRPNode
+        PPCLRPParser
+        (#'stx_goodies_petitparser_compiler_tests_extras' autoload)
+        PPCLRPAction
+        PPCLRPContainedElement
+        PPCLRPSpawn
+        PPCLRPComment
+        PPCLRPEvent
+        PPCLRPMachine
+        PPCLRPOnEntry
+        PPCLRPOnExit
+        PPCLRPRunning
+        PPCLRPState
+        PPCLRPTransition
+        PPCLRPVariable
+        PPCLRPEpsilonTransition
+        PPCLRPTimeoutTransition
+        PPCLRPWildcardTransition
         (PPCAbstractParserTest autoload)
         (PPCCompiledJavaVerificationTest autoload)
         (PPCCompositeParserTest autoload)
+        (PPCExpressionGrammarTest autoload)
+        (#'PPCExpressionGrammarTest_Tokenized' autoload)
+        (#'PPCExpressionGrammarTest_Universal' autoload)
+        (PPCExpressionGrammarVerificationTest autoload)
+        (PPCLL1ExpressionGrammarTest autoload)
+        (#'PPCLL1ExpressionGrammarTest_Tokenized' autoload)
+        (#'PPCLL1ExpressionGrammarTest_Universal' autoload)
         (PPCResources autoload)
         (PPCSetUpBeforeTearDownAfterResource autoload)
         (PPCSmalltalkGrammarTests autoload)
+        (#'PPCSmalltalkGrammarTests_Tokenized' autoload)
+        (#'PPCSmalltalkGrammarTests_Universal' autoload)
+        (PPCSmalltalkGrammarVerificationTest autoload)
+        (#'PPCSmalltalkGrammarVerificationTest_Tokenized' autoload)
+        (#'PPCSmalltalkGrammarVerificationTest_Universal' autoload)
         (PPCSmalltalkParserTests autoload)
+        (#'PPCSmalltalkParserTests_Tokenized' autoload)
+        (#'PPCSmalltalkParserTests_Universal' autoload)
+        (PPCSmalltalkParserVerificationTest autoload)
+        (#'PPCSmalltalkParserVerificationTest_Tokenized' autoload)
+        (#'PPCSmalltalkParserVerificationTest_Universal' autoload)
         (PPCSmalltalkTests autoload)
         (PPCompiledJavaResource autoload)
         (PPCompiledJavaSyntaxTest autoload)
         (PPExpressionGrammar autoload)
         (PPExpressionGrammarTest autoload)
+        (#'PPExpressionGrammarVerificationTest_Tokenized' autoload)
+        (#'PPExpressionGrammarVerificationTest_Universal' autoload)
         (PPLL1ExpressionGrammar autoload)
         (PPLL1ExpressionGrammarTest autoload)
-        (#'stx_goodies_petitparser_compiler_tests_extras' autoload)
-        (PPCExpressionGrammarTest autoload)
-        (PPCExpressionGrammarVerificationTest autoload)
-        (PPCLL1ExpressionGrammarTest autoload)
-        (#'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)
-        (#'PPCSmalltalkGrammarVerificationTest_Tokenized' autoload)
-        (#'PPCSmalltalkGrammarVerificationTest_Universal' autoload)
-        (#'PPCSmalltalkParserVerificationTest_Tokenized' autoload)
-        (#'PPCSmalltalkParserVerificationTest_Universal' autoload)
-        (#'PPExpressionGrammarVerificationTest_Tokenized' autoload)
-        (#'PPExpressionGrammarVerificationTest_Universal' autoload)
     )
 !
 
@@ -171,7 +183,6 @@
      A correponding method with real names must be present in my concrete subclasses"
 
     ^ #(
-        'TestResource class' availableFor:
     )
 ! !