--- a/compiler/tests/extras/PPCCompositeParserTest.st	Mon Sep 07 08:20:46 2015 +0100
+++ b/compiler/tests/extras/PPCCompositeParserTest.st	Mon Sep 07 11:53:38 2015 +0100
@@ -29,6 +29,22 @@
 
 !PPCCompositeParserTest class methodsFor:'utilities'!
 
+generateTests
+    "Regenerate all generated test cases"
+
+    {
+
+        PPExpressionGrammarTest .
+
+        PPSmalltalkGrammarTests .
+        PPSmalltalkParserTests .
+
+
+    } do:[:each | self generateTestsFor: each ]
+
+    "Created: / 07-09-2015 / 11:28:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
 generateTestsFor: baseTestClass
     | compiledBaseTestClassName |
 
@@ -80,8 +96,8 @@
         category: 'PetitCompiler-Extras-Tests-Misc'.
 
     compiledUniversalTestClass compile: 
-'compilerConfiguration
-    ^ PPCConfiguration universal'
+'compiler
+    ^ PPCCompiler newWithOptions: #( #tokenize: false ) '
     classified: 'accessing'.
     
                              
@@ -92,11 +108,12 @@
         category: 'PetitCompiler-Extras-Tests-Misc'.
 
     compiledTokenizedTestClass compile: 
-'compilerConfiguration
-    ^ PPCConfiguration tokenizing'
+'compiler
+    ^ PPCCompiler newWithOptions: #( #tokenize: false )'
     classified: 'accessing'.
 
     "Created: / 31-07-2015 / 07:26:01 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 07-09-2015 / 12:58:23 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !PPCCompositeParserTest methodsFor:'accessing'!
@@ -173,7 +190,7 @@
     compiler := self compiler.
     compiler options parserName: self compiledParserClassName.
     time := Time millisecondsToRun: [
-        self petitParser compileUsingCompiler:compiler.
+        compiler compile: self petitParser.
     ].
     Transcript show: self petitParserClass name ; show:' compiled in: '; show: time asString; show: 'ms'; cr.