--- a/tests/PPAbstractParserTest.st	Fri Oct 03 01:59:10 2014 +0100
+++ b/tests/PPAbstractParserTest.st	Fri Oct 03 02:33:08 2014 +0100
@@ -20,6 +20,12 @@
 	^ self name = #PPAbstractParserTest
 ! !
 
+!PPAbstractParserTest methodsFor:'context'!
+
+context
+	^ PPContext new
+! !
+
 !PPAbstractParserTest methodsFor:'utilities'!
 
 assert: aParser fail: aCollection
@@ -27,17 +33,20 @@
 !
 
 assert: aParser fail: aCollection end: anInteger
-	| stream result |
+	| stream result context |
 	self 
 		assert: aParser isPetitParser
 		description: 'Parser invalid'.
 	stream := aCollection asPetitStream.
-	result := aParser parse: stream.
+	context := self context.
+	
+	
+	result := aParser parse: stream withContext: context.
 	self 
 		assert: result isPetitFailure
 		description: 'Parser did not fail'.
 	self
-		assert: stream position = anInteger
+		assert: context position = anInteger
 		description: 'Parser failed at wrong position'.
 	^ result
 !
@@ -55,18 +64,17 @@
 !
 
 assert: aParser parse: aCollection to: aTargetObject end: anInteger
-	| stream result |
-	self 
-		assert: aParser isPetitParser
-		description: 'Parser invalid'.
+	| stream result context |
+
+	self assert: aParser isPetitParser description: 'Parser invalid'.
 	stream := aCollection asPetitStream.
-	result := aParser parse: stream.
+	context := self context.
+	
+	result := aParser parse: stream withContext: context.
 	aTargetObject isNil
 		ifTrue: [ self deny: result isPetitFailure ]
-		ifFalse: [ self assert: result = aTargetObject ].
-	self 
-		assert: stream position = anInteger
-		description: 'Parser accepted at wrong position'.
+		ifFalse: [ self assert: result equals: aTargetObject ].
+	self assert: context position = anInteger description: 'Parser accepted at wrong position'.
 	^ result
 !
 
@@ -76,10 +84,14 @@
 
 assert: aParser parse: aParserObject toToken: aStartInteger stop: aStopInteger end: anEndInteger
 	| token |
-	token := self assert: aParser parse: aParserObject to: nil end: anEndInteger.
+	token := self
+		assert: aParser
+		parse: aParserObject
+		to: nil
+		end: anEndInteger.
 	self assert: (token isKindOf: PPToken).
-	self assert: (token start = aStartInteger).
-	self assert: (token stop = aStopInteger).
+	self assert: token start equals: aStartInteger.
+	self assert: token stop equals: aStopInteger.
 	^ token
 ! !