Index: tests/unified_locking/.expect/fast_block_lock.txt
===================================================================
--- tests/unified_locking/.expect/fast_block_lock.txt	(revision f75e25bacd14e7d28dac1228e86806938c10a4a1)
+++ tests/unified_locking/.expect/fast_block_lock.txt	(revision f75e25bacd14e7d28dac1228e86806938c10a4a1)
@@ -0,0 +1,3 @@
+Starting
+Done!
+Match!
Index: tests/unified_locking/.expect/locks.txt
===================================================================
--- tests/unified_locking/.expect/locks.txt	(revision f6737ae19bf4f9053f2ef5f69b96769a3bb2ee18)
+++ tests/unified_locking/.expect/locks.txt	(revision f75e25bacd14e7d28dac1228e86806938c10a4a1)
@@ -23,2 +23,4 @@
 Start Test 12: locked condition variable wait/notify with front()
 Done Test 12
+Start Test 13: fast block lock and fast cond var single wait/notify
+Done Test 13
Index: tests/unified_locking/fast_block_lock.cfa
===================================================================
--- tests/unified_locking/fast_block_lock.cfa	(revision f75e25bacd14e7d28dac1228e86806938c10a4a1)
+++ tests/unified_locking/fast_block_lock.cfa	(revision f75e25bacd14e7d28dac1228e86806938c10a4a1)
@@ -0,0 +1,8 @@
+#include <locks.hfa>
+
+#define LOCK fast_block_lock
+#include "mutex_test.hfa"
+
+int main() {
+    test();
+}
Index: tests/unified_locking/locks.cfa
===================================================================
--- tests/unified_locking/locks.cfa	(revision f6737ae19bf4f9053f2ef5f69b96769a3bb2ee18)
+++ tests/unified_locking/locks.cfa	(revision f75e25bacd14e7d28dac1228e86806938c10a4a1)
@@ -18,4 +18,7 @@
 condition_variable( linear_backoff_then_block_lock ) c_l;
 
+fast_block_lock f;
+fast_cond_var( fast_block_lock ) f_c_f;
+
 thread T_C_M_WS1 {};
 
@@ -99,4 +102,18 @@
 		}
 		unlock(l);
+	}
+}
+
+thread T_F_C_F_WS1 {};
+
+void main( T_F_C_F_WS1 & this ) {
+	for (unsigned int i = 0; i < num_times; i++) {
+		lock(f);
+		if(empty(f_c_f) && i != num_times - 1) {
+			wait(f_c_f,f);
+		}else{
+			notify_one(f_c_f);
+			unlock(f);
+		}
 	}
 }
@@ -322,3 +339,10 @@
 	}
 	printf("Done Test 12\n");
-}
+
+	printf("Start Test 13: fast block lock and fast cond var single wait/notify\n");
+	{
+		T_F_C_F_WS1 t1[2];
+	}
+	printf("Done Test 13\n");
+	
+}