Index: tests/unified_locking/.expect/timeout_lock.txt
===================================================================
--- tests/unified_locking/.expect/timeout_lock.txt	(revision 7404cdc59f1eeab6e0d58b026654d7e98ca5cfe2)
+++ tests/unified_locking/.expect/timeout_lock.txt	(revision 7404cdc59f1eeab6e0d58b026654d7e98ca5cfe2)
@@ -0,0 +1,4 @@
+Start Test 1: surface testing condition variable timeout routines
+Done Test 1
+Start Test 2: testing timeout vs signalling with varying timeout durations
+Done Test 2
Index: tests/unified_locking/timeout_lock.cfa
===================================================================
--- tests/unified_locking/timeout_lock.cfa	(revision 090a7c53db0d6d3e6332f455573fe3ab0c9f4336)
+++ tests/unified_locking/timeout_lock.cfa	(revision 7404cdc59f1eeab6e0d58b026654d7e98ca5cfe2)
@@ -33,5 +33,5 @@
 
 	for ( unsigned int i = 0; i < NoOfTimes + 3; i += 1 ) {
-	    if ( wait( c_m, m, 1`s ) ) {
+	    if ( wait( c_m, m, 1000000`ns ) ) { 
 			// printf("Thread: %p signalled\n", active_thread()); // removed since can't expect non deterministic output
 	    } else {
@@ -51,18 +51,18 @@
 	// Test calls which occur increasingly close to timeout value.
 
-	sleep( 100000000`ns );
+	sleep( 100000`ns );
 	notify_one(c_m);
 	block();
 
-	sleep( 500000000`ns );
+	sleep( 500000`ns );
 	notify_one(c_m);
 	block();
 
-	sleep( 900000000`ns );
+	sleep( 900000`ns );
 	notify_one(c_m);
 	block();
 
 	for ( unsigned int i = 0; i < NoOfTimes; i += 1 ) {
-	    sleep( 999700000`ns );
+	    sleep( 999700`ns );
 		notify_one(c_m);
 	    block();
@@ -73,5 +73,5 @@
 	processor p[2];
 	printf("Start Test 1: surface testing condition variable timeout routines\n");
-	wait( c_m, 1`ns );														// bool wait( condition_variable(L) & this, Duration duration );
+	wait( c_m, 1`ns );														// bool wait( condition_variable(L) & this, Duration duration );	
 	wait( c_m, 10, 1`ns );													// bool wait( condition_variable(L) & this, uintptr_t info, Duration duration );
 	lock(m); wait( c_m, m, 1`ns ); unlock(m); 								// bool wait( condition_variable(L) & this, L & l, Duration duration );
Index: sts/unified_locking/timeout_lock.txt
===================================================================
--- tests/unified_locking/timeout_lock.txt	(revision 090a7c53db0d6d3e6332f455573fe3ab0c9f4336)
+++ 	(revision )
@@ -1,4 +1,0 @@
-Start Test 1: surface testing condition variable timeout routines
-Done Test 1
-Start Test 2: testing timeout vs signalling with varying timeout durations
-Done Test 2