Index: tests/concurrent/mutexstmt/locks.cfa
===================================================================
--- tests/concurrent/mutexstmt/locks.cfa	(revision f57f6ea0123dde6ef60d03a36bc14b98636c0d45)
+++ tests/concurrent/mutexstmt/locks.cfa	(revision 623d1c82a303ef12ad4e404e9aff8f8f81e42dec)
@@ -1,4 +1,5 @@
 #include <mutex_stmt.hfa>
 #include <locks.hfa>
+#include <stats.hfa>
 
 const unsigned int num_times = 10000;
@@ -59,74 +60,4 @@
 }
 
-thread T_Mutex_Scoped {};
-
-void main( T_Mutex_Scoped & this ) {
-	for (unsigned int i = 0; i < num_times; i++) {
-		{
-			scoped_lock(single_acquisition_lock) s{m1};
-			count++;
-		}
-		{
-			scoped_lock(single_acquisition_lock) s{m1};
-			assert(!insideFlag);
-			insideFlag = true;
-			assert(insideFlag);
-			insideFlag = false;
-		}
-	}
-}
-
-thread T_Multi_Scoped {};
-
-void main( T_Multi_Scoped & this ) {
-	for (unsigned int i = 0; i < num_times; i++) {
-		{
-			scoped_lock(single_acquisition_lock) s{m1};
-			assert(!insideFlag);
-			insideFlag = true;
-			assert(insideFlag);
-			insideFlag = false;
-		}
-		{
-			scoped_lock(single_acquisition_lock) s1{m1};
-			scoped_lock(single_acquisition_lock) s2{m2};
-			scoped_lock(single_acquisition_lock) s3{m3};
-			scoped_lock(single_acquisition_lock) s4{m4};
-			scoped_lock(single_acquisition_lock) s5{m5};
-			assert(!insideFlag);
-			insideFlag = true;
-			assert(insideFlag);
-			insideFlag = false;
-		}
-		{
-			scoped_lock(single_acquisition_lock) s1{m1};
-			scoped_lock(single_acquisition_lock) s3{m3};
-			assert(!insideFlag);
-			insideFlag = true;
-			assert(insideFlag);
-			insideFlag = false;
-		}
-		{
-			scoped_lock(single_acquisition_lock) s1{m1};
-			scoped_lock(single_acquisition_lock) s2{m2};
-			scoped_lock(single_acquisition_lock) s4{m4};
-			assert(!insideFlag);
-			insideFlag = true;
-			assert(insideFlag);
-			insideFlag = false;
-		}
-		{
-			scoped_lock(single_acquisition_lock) s1{m1};
-			scoped_lock(single_acquisition_lock) s3{m3};
-			scoped_lock(single_acquisition_lock) s4{m4};
-			scoped_lock(single_acquisition_lock) s5{m5};
-			assert(!insideFlag);
-			insideFlag = true;
-			assert(insideFlag);
-			insideFlag = false;
-		}
-	}
-}
-
 int num_tasks = 10;
 int main() {
@@ -144,16 +75,3 @@
 	}
 	printf("End Test: multi lock deadlock/mutual exclusion\n");
-	
-	count = 0;
-	printf("Start Test: single scoped lock mutual exclusion\n");
-	{
-		T_Mutex_Scoped t[10];
-	}
-	assert(count == num_tasks * num_times);
-	printf("End Test: single scoped lock mutual exclusion\n");
-	printf("Start Test: multi scoped lock deadlock/mutual exclusion\n");
-	{
-		T_Multi_Scoped t[10];
-	}
-	printf("End Test: multi scoped lock deadlock/mutual exclusion\n");	
 }