--- a/src/JavaMonitorsTests.st	Wed Nov 30 14:15:44 2011 +0000
+++ b/src/JavaMonitorsTests.st	Wed Nov 30 19:52:16 2011 +0000
@@ -71,7 +71,7 @@
 
 testIssSemaphoreSignalledAutomaticallyOnStop
     | t1  t2  mon |
-    mon := JavaMonitor new.
+    mon := JavaMonitor for: self.
     t1 := [
                 mon enter.
                 self assert: (mon isOwnedBy: t1) message: 'mon was not owned by t1 in t1'.
@@ -190,7 +190,7 @@
 
 testBruteForceEnter
     | mon  threads  cleanupThread |
-    mon := JavaMonitor new.
+    mon := JavaMonitor for:self.
     threads := OrderedCollection new.
     20 timesRepeat: [
         | t |
@@ -221,7 +221,7 @@
 
 testOneThread
     | mon  thread |
-    mon := JavaMonitor new.
+    mon := JavaMonitor for:self.
     thread := [
                 self assert: mon isAcquired not
                     message: 'monitor was acquired at the beginning'.
@@ -254,7 +254,7 @@
 
 testOneThreadMultipleTimes
     | mon  t  count |
-    mon := JavaMonitor new.
+    mon := JavaMonitor for:self.
     count := 5.
     t := [
                 count timesRepeat: [ mon enter ].
@@ -273,21 +273,24 @@
 
 testTwoThreadMultipleTimes
     | mon  t1  t2 |
-    mon := JavaMonitor new.
+    mon := JavaMonitor for:self.
     t1 := [
                 mon enter.
                 mon enter.
-                self assert: (mon isOwnedBy: t1) message: 'mon was not owned by t1 after multiple enter'.
+                self assert: (mon isOwnedBy: t1)
+                    message: 'mon was not owned by t1 after multiple enter'.
                 mon exit.
                 t1 stop.
-                self assert: (mon isOwnedBy: t1) message:'mon was not owned by t1 after single exit'.
+                self assert: (mon isOwnedBy: t1)
+                    message: 'mon was not owned by t1 after single exit'.
                 mon exit.
                 self waitForDyingThread: t2.
                 self waitForAndResumeThisProcess
             ] newProcess.
     t2 := [
                 self waitForStoppingThread: t1.
-                self assert: (mon isOwnedBy: t1) message: 'mon was not owned by t1 after stop'.
+                self assert: (mon isOwnedBy: t1)
+                    message: 'mon was not owned by t1 after stop'.
                 t1 resume.
             ] newProcess.
     t1 resume.
@@ -303,7 +306,7 @@
     "this took me a while :)"
     
     | mon  t1  t2 |
-    mon := JavaMonitor new.
+    mon := JavaMonitor for:self.
     t1 := [
                 t1 stop.
                 mon enter.
@@ -347,7 +350,7 @@
 
 testManyThreadsWaitNotifyAll
     | mon  threads |
-    mon := JavaMonitor new.
+    mon := JavaMonitor for:self.
     threads := OrderedCollection new.
     2 timesRepeat: [
         | t |
@@ -361,7 +364,7 @@
                     'notified and alive' infoPrintCR.
                     self assert: (mon isOwnedBy: t)
                         message: 'thread was not owned by t after wait'.
-                        mon exit.
+                    mon exit.
                     'dying' infoPrintCR.
                 ] newProcess.
         threads add: t.
@@ -399,7 +402,7 @@
 
 testOneThreadWaitMultipleEnters
     | mon  t |
-    mon := JavaMonitor new.
+    mon := JavaMonitor for:self.
     t := [
                 mon enter.
                 mon enter.
@@ -431,7 +434,7 @@
 
 testOneThreadWaitNotify
     | mon  t |
-    mon := JavaMonitor new.
+    mon := JavaMonitor for:self.
     t := [
                 mon enter.
                 self assert: (mon isOwnedBy: t)
@@ -455,7 +458,7 @@
 
 testOneThreadWaitTimeout
     | mon  t |
-    mon := JavaMonitor new.
+    mon := JavaMonitor for:self.
     t := [
                 mon enter.
                 self assert: (mon isOwnedBy: t)