--- a/compiler/tests/PPCOverlappingTokensTest.st	Mon Sep 07 08:03:02 2015 +0100
+++ b/compiler/tests/PPCOverlappingTokensTest.st	Mon Sep 07 08:20:46 2015 +0100
@@ -3,7 +3,7 @@
 "{ NameSpace: Smalltalk }"
 
 PPAbstractParserTest subclass:#PPCOverlappingTokensTest
-	instanceVariableNames:'parser result context node options configuration fooToken idToken
+	instanceVariableNames:'parser result context node options compiler fooToken idToken
 		keywordToken p unaryToken assignmentToken'
 	classVariableNames:''
 	poolDictionaries:''
@@ -34,7 +34,9 @@
 !
 
 compile: aPPParser
-    parser := aPPParser compileWithConfiguration: configuration
+    parser := aPPParser compileUsingCompiler: compiler
+
+    "Modified: / 07-09-2015 / 10:08:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 context	
@@ -42,21 +44,28 @@
 !
 
 setUp
-    options := PPCCompilationOptions default
-        profile: true;
-        tokenize: true;
-        yourself.
-        
-    configuration := PPCConfiguration new.
-    configuration context options: options.
-        
+    options := (PPCCompilationOptions default)
+            profile:true;
+            tokenize:true;
+            yourself.
+    compiler := PPCCompiler new.
+    compiler context options:options.
     self cleanClass.
-    
-    fooToken := 'foo' asParser token trim name: 'foo'; yourself.
-    idToken := (#word asParser plus) token trim name: 'id'; yourself.
-    unaryToken := (#word asParser plus, $: asParser not) token trim name: 'unary'; yourself.
-    keywordToken := (#word asParser plus, $: asParser) token trim name: 'kw'; yourself.
-    assignmentToken := (':=' asParser) token trim name: 'assignment'; yourself.
+    fooToken := ('foo' asParser token trim)
+            name:'foo';
+            yourself.
+    idToken := ((#word asParser plus) token trim)
+            name:'id';
+            yourself.
+    unaryToken := ((#word asParser plus , $: asParser not) token trim)
+            name:'unary';
+            yourself.
+    keywordToken := ((#word asParser plus , $: asParser) token trim)
+            name:'kw';
+            yourself.
+    assignmentToken := ((':=' asParser) token trim)
+            name:'assignment';
+            yourself.
 
     "Modified: / 04-09-2015 / 16:21:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !