--- a/tests/PPExtensionTest.st	Fri Oct 03 01:59:10 2014 +0100
+++ b/tests/PPExtensionTest.st	Fri Oct 03 02:33:08 2014 +0100
@@ -40,7 +40,7 @@
 	self assert: parser parse: 'sa' to: '' end: 1.
 	self assert: parser parse: 'saa' to: '' end: 1.
 	
-	parser := [ :stream | stream upTo: $s. PPFailure message: 'stream' at: stream position ] asParser.
+	parser := [ :stream | stream upTo: $s. PPFailure message: 'stream' context: stream ] asParser.
 	self assert: parser fail: ''.
 	self assert: parser fail: 's'.
 	self assert: parser fail: 'as'
@@ -50,7 +50,7 @@
 testEpsilon
 	| parser |
 	parser := nil asParser.
-	self assert: parser asParser = parser
+	self assert: parser asParser equals: parser
 !
 
 testOrdered
@@ -67,16 +67,16 @@
 testParser
 	| parser |
 	parser := $a asParser.
-	self assert: parser asParser = parser
+	self assert: parser asParser equals: parser
 !
 
 testRange
-        | parser |
-        parser := ($a to: $c) asParser.
-        self assert: parser parse: 'a' to: $a.
-        self assert: parser parse: 'b' to: $b.
-        self assert: parser parse: 'c' to: $c.
-        self assert: parser fail: 'd'
+	| parser |
+	parser := $a - $c.
+	self assert: parser parse: 'a' to: $a.
+	self assert: parser parse: 'b' to: $b.
+	self assert: parser parse: 'c' to: $c.
+	self assert: parser fail: 'd'
 !
 
 testSequence
@@ -123,19 +123,19 @@
 testStream
 	| stream |
 	stream := 'abc' readStream asPetitStream.
-	self assert: (stream class = PPStream).
-	self assert: (stream printString = '·abc').
-	self assert: (stream peek) = $a.
-	self assert: (stream uncheckedPeek = $a).
-	self assert: (stream next) = $a.
-	self assert: (stream printString = 'a·bc').
-	self assert: (stream asPetitStream = stream)
+	self assert: stream class equals: PPStream.
+	self assert: stream printString equals: '·abc'.
+	self assert: stream peek equals: $a.
+	self assert: stream uncheckedPeek equals: $a.
+	self assert: stream next equals: $a.
+	self assert: stream printString equals: 'a·bc'.
+	self assert: stream asPetitStream equals: stream
 !
 
 testText
 	| stream |
 	stream := 'abc' asText asPetitStream.
-	self assert: stream class = PPStream
+	self assert: stream class equals: PPStream
 ! !
 
 !PPExtensionTest class methodsFor:'documentation'!