--- a/RegressionTests__ContextTest2.st	Mon May 07 14:01:27 2012 +0200
+++ b/RegressionTests__ContextTest2.st	Mon May 07 14:26:30 2012 +0200
@@ -338,12 +338,12 @@
     arg := x.
 
     p := [
-	[
-	    lockSet critical:[set add:arg].
-	    arg perform:#x .
-	] valueNowOrOnUnwindDo:[
-	    lockSet critical:[set remove:arg].
-	].
+        [
+            lockSet critical:[set add:arg].
+            arg perform:#x .
+        ] ensure:[
+            lockSet critical:[set remove:arg].
+        ].
     ] fork.
 
     "
@@ -360,12 +360,12 @@
     x := 1 @ 1.
 
     p := [:arg |
-	[
-	    lockSet critical:[set add:arg].
-	    arg perform:#x.
-	] valueNowOrOnUnwindDo:[
-	    lockSet critical:[set remove:arg].
-	].
+        [
+            lockSet critical:[set add:arg].
+            arg perform:#x.
+        ] ensure:[
+            lockSet critical:[set remove:arg].
+        ].
     ] forkWith:(Array with:x).
 
     "
@@ -382,12 +382,13 @@
     x := 1 @ 1.
 
     p := [:arg |
-	[
-	    lockSet critical:[set add:arg].
-	    arg perform:#x: with:1234.
-	] valueNowOrOnUnwindDo:[
-	    lockSet critical:[set remove:arg].
-	].
+        [
+            lockSet critical:[set add:arg].
+            arg perform:#x: with:1234.
+            lockSet critical:[set rehash].
+        ] ensure:[
+            lockSet critical:[set remove:arg].
+        ].
     ] forkWith:(Array with:x).
 
     "
@@ -451,11 +452,11 @@
 
     |ex|
 
-    ex := self newExceptionFrom:someone.
+    ex := self newException.
 someone exceptionObjectIs:ex.
     ^ (ex
         suspendedContext:thisContext sender
-        parameter:someone)
+        parameter:someone originator:someone)
             raiseRequest.
 ! !