--- a/compiler/tests/extras/stx_goodies_petitparser_compiler_tests_extras.st	Wed Aug 26 23:34:48 2015 +0100
+++ b/compiler/tests/extras/stx_goodies_petitparser_compiler_tests_extras.st	Sat Aug 29 07:56:14 2015 +0100
@@ -84,11 +84,10 @@
 
     ^ #(
         #'stx:goodies/petitparser'    "PPCompositeParser - superclass of PPCLRPParser"
-        #'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 - superclass of PPCAbstractParserTest"
-        #'stx:libbasic'    "LibraryDefinition - superclass of stx_goodies_petitparser_compiler_tests_extras"
+        #'stx:goodies/petitparser/parsers/java'    "PPJavaWhitespaceParser - extended"
+        #'stx:goodies/petitparser/tests'    "PPAbstractParserTest - superclass of PPCLRPCompiledParserSmokeTest"
+        #'stx:goodies/sunit'    "TestAsserter - superclass of PPCLRPCompiledParserSmokeTest"
+        #'stx:libbasic'    "Autoload - superclass of PPCAbstractParserTest"
     )
 !
 
@@ -103,9 +102,8 @@
      by searching all classes (and their packages) which are referenced by my classes."
 
     ^ #(
-        #'stx:goodies/petitparser/compiler'    "PPCConfiguration - referenced by PPCExpressionGrammarTest_Tokenized>>compilerConfiguration"
-        #'stx:goodies/petitparser/parsers/smalltalk'    "PPSmalltalkGrammar - referenced by PPCSmalltalkGrammarTests>>petitParserClass"
-        #'stx:libbasic2'    "Random - referenced by PPCResources>>expressionOfSize:stream:"
+        #'stx:goodies/petitparser/compiler'    "PPCConfiguration - referenced by PPCLRPCompiledParserSmokeTest_Universal>>compilerConfiguration"
+        #'stx:goodies/petitparser/parsers/smalltalk'    "PPSmalltalkParser - referenced by PPCLRPParser>>methodizeBlock:withArguments:"
     )
 !
 
@@ -129,43 +127,15 @@
 
     ^ #(
         "<className> or (<className> attributes...) in load order"
-        (PPCAbstractParserTest autoload)
-        (PPCCompiledJavaVerificationTest autoload)
-        (PPCCompositeParserTest autoload)
-        (PPCJavaTests autoload)
         PPCLRPNode
         PPCLRPParser
         PPCLRPParserSmokeTest
         PPCLRPSourcesResource
-        (PPCResources autoload)
-        (PPCSetUpBeforeTearDownAfterResource autoload)
-        (PPCSmalltalkGrammarTests autoload)
-        (PPCSmalltalkParserTests autoload)
-        (PPCSmalltalkTests autoload)
-        (PPCompiledJavaResource autoload)
-        (PPCompiledJavaSyntaxTest autoload)
-        (PPExpressionGrammar autoload)
-        (PPExpressionGrammarTest autoload)
-        (PPLL1ExpressionGrammar autoload)
-        (PPLL1ExpressionGrammarTest autoload)
         (#'stx_goodies_petitparser_compiler_tests_extras' autoload)
-        (PPCExpressionGrammarTest autoload)
-        (PPCExpressionGrammarVerificationTest autoload)
-        (PPCLL1ExpressionGrammarTest autoload)
         PPCLRPAction
         PPCLRPCompiledParserSmokeTest
         PPCLRPContainedElement
         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
         #'PPCLRPCompiledParserSmokeTest_Universal'
         PPCLRPErrorNode
@@ -177,15 +147,43 @@
         PPCLRPState
         PPCLRPTransition
         PPCLRPVariable
-        (#'PPCSmalltalkGrammarVerificationTest_Tokenized' autoload)
-        (#'PPCSmalltalkGrammarVerificationTest_Universal' autoload)
-        (#'PPCSmalltalkParserVerificationTest_Tokenized' autoload)
-        (#'PPCSmalltalkParserVerificationTest_Universal' autoload)
-        (#'PPExpressionGrammarVerificationTest_Tokenized' autoload)
-        (#'PPExpressionGrammarVerificationTest_Universal' autoload)
         PPCLRPEpsilonTransition
         PPCLRPTimeoutTransition
         PPCLRPWildcardTransition
+        (PPCAbstractParserTest autoload)
+        (PPCCompiledJavaVerificationTest autoload)
+        (PPCCompositeParserTest autoload)
+        (PPCExpressionGrammarTest autoload)
+        (#'PPCExpressionGrammarTest_Tokenized' autoload)
+        (#'PPCExpressionGrammarTest_Universal' autoload)
+        (PPCExpressionGrammarVerificationTest autoload)
+        (PPCJavaTests 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)
     )
 !