Index: tests/unified_locking/timeout_lock.cfa
===================================================================
--- tests/unified_locking/timeout_lock.cfa	(revision 7404cdc59f1eeab6e0d58b026654d7e98ca5cfe2)
+++ tests/unified_locking/timeout_lock.cfa	(revision b984d5470f80f236dfd2f338e0cd3f1267371d1f)
@@ -6,17 +6,17 @@
 #include "kernel.cfa"
 
-multiple_acquisition_lock m;
-condition_variable( multiple_acquisition_lock ) c_m;
-
-semaphore s; // used for barrier like behaviour
+multiple_acquisition_lock m, n;
+condition_variable( multiple_acquisition_lock ) c_m, c_n;
 
 const unsigned int NoOfTimes = 20;
 
-void block() {
-	if (s.count == 0) {
-		P(s);
+void block() { // used for barrier like behaviour
+	lock(n);
+	if (empty( c_n )) {
+		wait( c_n, n );
 	} else {
-		V(s);
+		notify_one( c_n );
 	}
+	unlock(n);
 }
 
@@ -80,5 +80,4 @@
 
 	printf("Start Test 2: testing timeout vs signalling with varying timeout durations\n");
-	s{ 0 };
 	{
 		T1 t1;