--- a/compiler/tests/extras/Make.proto	Tue Aug 18 16:57:08 2015 +0100
+++ b/compiler/tests/extras/Make.proto	Tue Aug 18 21:47:50 2015 +0100
@@ -136,7 +136,6 @@
 $(OUTDIR)PPCLRPContainedElement.$(O) PPCLRPContainedElement.$(H): PPCLRPContainedElement.st $(INCLUDE_TOP)/stx/goodies/petitparser/compiler/tests/extras/PPCLRPNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)PPCLRPSpawn.$(O) PPCLRPSpawn.$(H): PPCLRPSpawn.st $(INCLUDE_TOP)/stx/goodies/petitparser/compiler/tests/extras/PPCLRPNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)PPCLRPComment.$(O) PPCLRPComment.$(H): PPCLRPComment.st $(INCLUDE_TOP)/stx/goodies/petitparser/compiler/tests/extras/PPCLRPContainedElement.$(H) $(INCLUDE_TOP)/stx/goodies/petitparser/compiler/tests/extras/PPCLRPNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)PPCLRPCompiledParserSmokeTest_Tokenized.$(O) PPCLRPCompiledParserSmokeTest_Tokenized.$(H): PPCLRPCompiledParserSmokeTest_Tokenized.st $(INCLUDE_TOP)/stx/goodies/petitparser/compiler/tests/extras/PPCLRPCompiledParserSmokeTest.$(H) $(INCLUDE_TOP)/stx/goodies/petitparser/compiler/tests/extras/PPCLRPParserSmokeTest.$(H) $(INCLUDE_TOP)/stx/goodies/petitparser/tests/PPAbstractParserTest.$(H) $(INCLUDE_TOP)/stx/goodies/petitparser/tests/PPCompositeParserTest.$(H) $(INCLUDE_TOP)/stx/goodies/sunit/TestAsserter.$(H) $(INCLUDE_TOP)/stx/goodies/sunit/TestCase.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)PPCLRPCompiledParserSmokeTest_Universal.$(O) PPCLRPCompiledParserSmokeTest_Universal.$(H): PPCLRPCompiledParserSmokeTest_Universal.st $(INCLUDE_TOP)/stx/goodies/petitparser/compiler/tests/extras/PPCLRPCompiledParserSmokeTest.$(H) $(INCLUDE_TOP)/stx/goodies/petitparser/compiler/tests/extras/PPCLRPParserSmokeTest.$(H) $(INCLUDE_TOP)/stx/goodies/petitparser/tests/PPAbstractParserTest.$(H) $(INCLUDE_TOP)/stx/goodies/petitparser/tests/PPCompositeParserTest.$(H) $(INCLUDE_TOP)/stx/goodies/sunit/TestAsserter.$(H) $(INCLUDE_TOP)/stx/goodies/sunit/TestCase.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)PPCLRPErrorNode.$(O) PPCLRPErrorNode.$(H): PPCLRPErrorNode.st $(INCLUDE_TOP)/stx/goodies/petitparser/compiler/tests/extras/PPCLRPContainedElement.$(H) $(INCLUDE_TOP)/stx/goodies/petitparser/compiler/tests/extras/PPCLRPNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)PPCLRPEvent.$(O) PPCLRPEvent.$(H): PPCLRPEvent.st $(INCLUDE_TOP)/stx/goodies/petitparser/compiler/tests/extras/PPCLRPContainedElement.$(H) $(INCLUDE_TOP)/stx/goodies/petitparser/compiler/tests/extras/PPCLRPNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)

--- a/compiler/tests/extras/Make.spec	Tue Aug 18 16:57:08 2015 +0100
+++ b/compiler/tests/extras/Make.spec	Tue Aug 18 21:47:50 2015 +0100
@@ -60,7 +60,6 @@
 	PPCLRPContainedElement \
 	PPCLRPSpawn \
 	PPCLRPComment \
-	PPCLRPCompiledParserSmokeTest_Tokenized \
 	PPCLRPCompiledParserSmokeTest_Universal \
 	PPCLRPErrorNode \
 	PPCLRPEvent \
@@ -88,7 +87,6 @@
     $(OUTDIR_SLASH)PPCLRPContainedElement.$(O) \
     $(OUTDIR_SLASH)PPCLRPSpawn.$(O) \
     $(OUTDIR_SLASH)PPCLRPComment.$(O) \
-    $(OUTDIR_SLASH)PPCLRPCompiledParserSmokeTest_Tokenized.$(O) \
     $(OUTDIR_SLASH)PPCLRPCompiledParserSmokeTest_Universal.$(O) \
     $(OUTDIR_SLASH)PPCLRPErrorNode.$(O) \
     $(OUTDIR_SLASH)PPCLRPEvent.$(O) \

--- a/compiler/tests/extras/PPCLRPCompiledParserSmokeTest.st	Tue Aug 18 16:57:08 2015 +0100
+++ b/compiler/tests/extras/PPCLRPCompiledParserSmokeTest.st	Tue Aug 18 21:47:50 2015 +0100
@@ -61,12 +61,6 @@
     "Modified: / 29-07-2015 / 18:43:08 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
-parserInstanceFor: aSymbol
-    ^ self parserClass new startSymbol: aSymbol
-
-    "Modified: / 29-07-2015 / 18:43:43 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
 petitParser
     ^ self petitParserClass new
 

--- a/compiler/tests/extras/PPCLRPCompiledParserSmokeTest_Tokenized.st	Tue Aug 18 16:57:08 2015 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-"{ Package: 'stx:goodies/petitparser/compiler/tests/extras' }"
-
-"{ NameSpace: Smalltalk }"
-
-PPCLRPCompiledParserSmokeTest subclass:#PPCLRPCompiledParserSmokeTest_Tokenized
-	instanceVariableNames:''
-	classVariableNames:''
-	poolDictionaries:''
-	category:'PetitCompiler-Extras-Tests-LRP'
-!
-
-
-!PPCLRPCompiledParserSmokeTest_Tokenized methodsFor:'accessing'!
-
-compilerConfiguration
-    ^ PPCConfiguration tokenizing
-! !
-
-!PPCLRPCompiledParserSmokeTest_Tokenized class methodsFor:'documentation'!
-
-version_HG
-
-    ^ '$Changeset: <not expanded> $'
-! !
-

--- a/compiler/tests/extras/abbrev.stc	Tue Aug 18 16:57:08 2015 +0100
+++ b/compiler/tests/extras/abbrev.stc	Tue Aug 18 21:47:50 2015 +0100
@@ -5,13 +5,14 @@
 PPCLRPParser PPCLRPParser stx:goodies/petitparser/compiler/tests/extras 'PetitCompiler-Extras-Tests-LRP' 0
 PPCLRPParserSmokeTest PPCLRPParserSmokeTest stx:goodies/petitparser/compiler/tests/extras 'PetitCompiler-Extras-Tests-LRP' 1
 PPCLRPSourcesResource PPCLRPSourcesResource stx:goodies/petitparser/compiler/tests/extras 'PetitCompiler-Extras-Tests-LRP' 1
+PPCResources PPCResources stx:goodies/petitparser/compiler/tests/extras 'PetitCompiler-Extras-Tests-Support' 1
+PPCSetUpBeforeTearDownAfterResource PPCSetUpBeforeTearDownAfterResource stx:goodies/petitparser/compiler/tests/extras 'PetitCompiler-Extras-Tests-Support' 2
 stx_goodies_petitparser_compiler_tests_extras stx_goodies_petitparser_compiler_tests_extras stx:goodies/petitparser/compiler/tests/extras '* Projects & Packages *' 3
 PPCLRPAction PPCLRPAction stx:goodies/petitparser/compiler/tests/extras 'PetitCompiler-Extras-Tests-LRP' 0
 PPCLRPCompiledParserSmokeTest PPCLRPCompiledParserSmokeTest stx:goodies/petitparser/compiler/tests/extras 'PetitCompiler-Extras-Tests-LRP' 1
 PPCLRPContainedElement PPCLRPContainedElement stx:goodies/petitparser/compiler/tests/extras 'PetitCompiler-Extras-Tests-LRP' 0
 PPCLRPSpawn PPCLRPSpawn stx:goodies/petitparser/compiler/tests/extras 'PetitCompiler-Extras-Tests-LRP' 0
 PPCLRPComment PPCLRPComment stx:goodies/petitparser/compiler/tests/extras 'PetitCompiler-Extras-Tests-LRP' 0
-PPCLRPCompiledParserSmokeTest_Tokenized PPCLRPCompiledParserSmokeTest_Tokenized stx:goodies/petitparser/compiler/tests/extras 'PetitCompiler-Extras-Tests-LRP' 1
 PPCLRPCompiledParserSmokeTest_Universal PPCLRPCompiledParserSmokeTest_Universal stx:goodies/petitparser/compiler/tests/extras 'PetitCompiler-Extras-Tests-LRP' 1
 PPCLRPErrorNode PPCLRPErrorNode stx:goodies/petitparser/compiler/tests/extras 'PetitCompiler-Extras-Tests-LRP' 0
 PPCLRPEvent PPCLRPEvent stx:goodies/petitparser/compiler/tests/extras 'PetitCompiler-Extras-Tests-LRP' 0
@@ -35,8 +36,6 @@
 PPCLL1ExpressionGrammarTest PPCLL1ExpressionGrammarTest stx:goodies/petitparser/compiler/tests/extras 'PetitCompiler-Extras-Tests-Expressions' 1
 PPCLL1ExpressionGrammarTest_Tokenized PPCLL1ExpressionGrammarTest_Tokenized stx:goodies/petitparser/compiler/tests/extras 'PetitCompiler-Extras-Tests-Expressions' 1
 PPCLL1ExpressionGrammarTest_Universal PPCLL1ExpressionGrammarTest_Universal stx:goodies/petitparser/compiler/tests/extras 'PetitCompiler-Extras-Tests-Expressions' 1
-PPCResources PPCResources stx:goodies/petitparser/compiler/tests/extras 'PetitCompiler-Extras-Tests-Support' 1
-PPCSetUpBeforeTearDownAfterResource PPCSetUpBeforeTearDownAfterResource stx:goodies/petitparser/compiler/tests/extras 'PetitCompiler-Extras-Tests-Support' 2
 PPCSmalltalkGrammarTests PPCSmalltalkGrammarTests stx:goodies/petitparser/compiler/tests/extras 'PetitCompiler-Extras-Tests-Smalltalk' 1
 PPCSmalltalkGrammarTests_Tokenized PPCSmalltalkGrammarTests_Tokenized stx:goodies/petitparser/compiler/tests/extras 'PetitCompiler-Extras-Tests-Smalltalk' 1
 PPCSmalltalkGrammarTests_Universal PPCSmalltalkGrammarTests_Universal stx:goodies/petitparser/compiler/tests/extras 'PetitCompiler-Extras-Tests-Smalltalk' 1

--- a/compiler/tests/extras/bc.mak	Tue Aug 18 16:57:08 2015 +0100
+++ b/compiler/tests/extras/bc.mak	Tue Aug 18 21:47:50 2015 +0100
@@ -83,7 +83,6 @@
 $(OUTDIR)PPCLRPContainedElement.$(O) PPCLRPContainedElement.$(H): PPCLRPContainedElement.st $(INCLUDE_TOP)\stx\goodies\petitparser\compiler\tests\extras\PPCLRPNode.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)PPCLRPSpawn.$(O) PPCLRPSpawn.$(H): PPCLRPSpawn.st $(INCLUDE_TOP)\stx\goodies\petitparser\compiler\tests\extras\PPCLRPNode.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)PPCLRPComment.$(O) PPCLRPComment.$(H): PPCLRPComment.st $(INCLUDE_TOP)\stx\goodies\petitparser\compiler\tests\extras\PPCLRPContainedElement.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\compiler\tests\extras\PPCLRPNode.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)PPCLRPCompiledParserSmokeTest_Tokenized.$(O) PPCLRPCompiledParserSmokeTest_Tokenized.$(H): PPCLRPCompiledParserSmokeTest_Tokenized.st $(INCLUDE_TOP)\stx\goodies\petitparser\compiler\tests\extras\PPCLRPCompiledParserSmokeTest.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\compiler\tests\extras\PPCLRPParserSmokeTest.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\tests\PPAbstractParserTest.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\tests\PPCompositeParserTest.$(H) $(INCLUDE_TOP)\stx\goodies\sunit\TestAsserter.$(H) $(INCLUDE_TOP)\stx\goodies\sunit\TestCase.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)PPCLRPCompiledParserSmokeTest_Universal.$(O) PPCLRPCompiledParserSmokeTest_Universal.$(H): PPCLRPCompiledParserSmokeTest_Universal.st $(INCLUDE_TOP)\stx\goodies\petitparser\compiler\tests\extras\PPCLRPCompiledParserSmokeTest.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\compiler\tests\extras\PPCLRPParserSmokeTest.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\tests\PPAbstractParserTest.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\tests\PPCompositeParserTest.$(H) $(INCLUDE_TOP)\stx\goodies\sunit\TestAsserter.$(H) $(INCLUDE_TOP)\stx\goodies\sunit\TestCase.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)PPCLRPErrorNode.$(O) PPCLRPErrorNode.$(H): PPCLRPErrorNode.st $(INCLUDE_TOP)\stx\goodies\petitparser\compiler\tests\extras\PPCLRPContainedElement.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\compiler\tests\extras\PPCLRPNode.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)PPCLRPEvent.$(O) PPCLRPEvent.$(H): PPCLRPEvent.st $(INCLUDE_TOP)\stx\goodies\petitparser\compiler\tests\extras\PPCLRPContainedElement.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\compiler\tests\extras\PPCLRPNode.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)

--- a/compiler/tests/extras/libInit.cc	Tue Aug 18 16:57:08 2015 +0100
+++ b/compiler/tests/extras/libInit.cc	Tue Aug 18 21:47:50 2015 +0100
@@ -36,7 +36,6 @@
 _PPCLRPContainedElement_Init(pass,__pRT__,snd);
 _PPCLRPSpawn_Init(pass,__pRT__,snd);
 _PPCLRPComment_Init(pass,__pRT__,snd);
-_PPCLRPCompiledParserSmokeTest_137Tokenized_Init(pass,__pRT__,snd);
 _PPCLRPCompiledParserSmokeTest_137Universal_Init(pass,__pRT__,snd);
 _PPCLRPErrorNode_Init(pass,__pRT__,snd);
 _PPCLRPEvent_Init(pass,__pRT__,snd);

--- a/compiler/tests/extras/stx_goodies_petitparser_compiler_tests_extras.st	Tue Aug 18 16:57:08 2015 +0100
+++ b/compiler/tests/extras/stx_goodies_petitparser_compiler_tests_extras.st	Tue Aug 18 21:47:50 2015 +0100
@@ -130,13 +130,14 @@
         PPCLRPParser
         PPCLRPParserSmokeTest
         PPCLRPSourcesResource
+        (PPCResources autoload)
+        (PPCSetUpBeforeTearDownAfterResource autoload)
         (#'stx_goodies_petitparser_compiler_tests_extras' autoload)
         PPCLRPAction
         PPCLRPCompiledParserSmokeTest
         PPCLRPContainedElement
         PPCLRPSpawn
         PPCLRPComment
-        #'PPCLRPCompiledParserSmokeTest_Tokenized'
         #'PPCLRPCompiledParserSmokeTest_Universal'
         PPCLRPErrorNode
         PPCLRPEvent
@@ -160,8 +161,6 @@
         (PPCLL1ExpressionGrammarTest autoload)
         (#'PPCLL1ExpressionGrammarTest_Tokenized' autoload)
         (#'PPCLL1ExpressionGrammarTest_Universal' autoload)
-        (PPCResources autoload)
-        (PPCSetUpBeforeTearDownAfterResource autoload)
         (PPCSmalltalkGrammarTests autoload)
         (#'PPCSmalltalkGrammarTests_Tokenized' autoload)
         (#'PPCSmalltalkGrammarTests_Universal' autoload)