Index: tests/concurrency/actors/dynamic.cfa
===================================================================
--- tests/concurrency/actors/dynamic.cfa	(revision bdf4cd9e6ac8eafbab8e28e064469f5b3f9f879d)
+++ tests/concurrency/actors/dynamic.cfa	(revision 50be8af55788ecaebbb85845d1e11234cd6a5cb6)
@@ -36,21 +36,19 @@
 	  case 2:
 		if ( strcmp( argv[1], "d" ) != 0 ) {			// default ?
-			Times = atoi( argv[1] );
-			if ( Times < 1 ) goto Usage;
+			Times = ato( argv[1] );
+			if ( Times < 1 ) fallthru default;
 		} // if
 	  case 1:											// use defaults
 		break;
 	  default:
-	  Usage:
-		sout | "Usage: " | argv[0] | " [ times (> 0) ]";
-		exit( EXIT_FAILURE );
+		exit | "Usage: " | argv[0] | " [ times (> 0) ]";
 	} // switch
 
-    printf("starting\n");
+    sout | "starting";
 
     executor e{ 0, 1, 1, false };
     start_actor_system( e );
 
-    printf("started\n");
+    sout | "started";
 
     derived_msg * d_msg = alloc();
@@ -60,9 +58,9 @@
     *d_actor | *d_msg;
 
-    printf("stopping\n");
+    sout | "stopping";
 
     stop_actor_system();
 
-    printf("stopped\n");
+    sout | "stopped";
 
     return 0;
Index: tests/concurrency/actors/executor.cfa
===================================================================
--- tests/concurrency/actors/executor.cfa	(revision bdf4cd9e6ac8eafbab8e28e064469f5b3f9f879d)
+++ tests/concurrency/actors/executor.cfa	(revision 50be8af55788ecaebbb85845d1e11234cd6a5cb6)
@@ -40,37 +40,36 @@
 	  case 7:
 		if ( strcmp( argv[6], "d" ) != 0 ) {			// default ?
-			BufSize = atoi( argv[6] );
-			if ( BufSize < 0 ) goto Usage;
+			BufSize = ato( argv[6] );
+			if ( BufSize < 0 ) fallthru default;
 		} // if
 	  case 6:
 		if ( strcmp( argv[5], "d" ) != 0 ) {			// default ?
-			Batch = atoi( argv[5] );
-			if ( Batch < 1 ) goto Usage;
+			Batch = ato( argv[5] );
+			if ( Batch < 1 ) fallthru default;
 		} // if
 	  case 5:
 		if ( strcmp( argv[4], "d" ) != 0 ) {			// default ?
-			Processors = atoi( argv[4] );
-			if ( Processors < 1 ) goto Usage;
+			Processors = ato( argv[4] );
+			if ( Processors < 1 ) fallthru default;
 		} // if
 	  case 4:
 		if ( strcmp( argv[3], "d" ) != 0 ) {			// default ?
-			Rounds = atoi( argv[3] );
-			if ( Rounds < 1 ) goto Usage;
+			Rounds = ato( argv[3] );
+			if ( Rounds < 1 ) fallthru default;
 		} // if
 	  case 3:
 		if ( strcmp( argv[2], "d" ) != 0 ) {			// default ?
-			Set = atoi( argv[2] );
-			if ( Set < 1 ) goto Usage;
+			Set = ato( argv[2] );
+			if ( Set < 1 ) fallthru default;
 		} // if
 	  case 2:
 		if ( strcmp( argv[1], "d" ) != 0 ) {			// default ?
-			Actors = atoi( argv[1] );
-			if ( Actors < 1 || Actors <= Set || Actors % Set != 0 ) goto Usage;
+			Actors = ato( argv[1] );
+			if ( Actors < 1 || Actors <= Set || Actors % Set != 0 ) fallthru default;
 		} // if
 	  case 1:											// use defaults
 		break;
 	  default:
-	  Usage:
-		sout | "Usage: " | argv[0]
+		exit | "Usage: " | argv[0]
              | " [ actors (> 0 && > set && actors % set == 0 ) | 'd' (default " | Actors
 			 | ") ] [ set (> 0) | 'd' (default " | Set
@@ -80,14 +79,13 @@
 			 | ") ] [ buffer size (>= 0) | 'd' (default " | BufSize
 			 | ") ]" ;
-		exit( EXIT_FAILURE );
 	} // switch
 
     executor e{ Processors, Processors, Processors == 1 ? 1 : Processors * 512, true };
 
-    printf("starting\n");
+    sout | "starting";
 
     start_actor_system( e );
 
-    printf("started\n");
+    sout | "started";
 
     d_actor actors[ Actors ];
@@ -97,9 +95,9 @@
 	} // for
 
-    printf("stopping\n");
+    sout | "stopping";
 
     stop_actor_system();
 
-    printf("stopped\n");
+    sout | "stopped";
 
     return 0;
Index: tests/concurrency/actors/matrix.cfa
===================================================================
--- tests/concurrency/actors/matrix.cfa	(revision bdf4cd9e6ac8eafbab8e28e064469f5b3f9f879d)
+++ tests/concurrency/actors/matrix.cfa	(revision 50be8af55788ecaebbb85845d1e11234cd6a5cb6)
@@ -5,5 +5,5 @@
 #include <stdio.h>
 
-unsigned int xr = 500, xc = 500, yc = 500, Processors = 1; // default values
+int xr = 500, xc = 500, yc = 500, Processors = 1; // default values, must be signed
 
 struct derived_actor { inline actor; };
@@ -38,27 +38,26 @@
 	  case 5:
 		if ( strcmp( argv[4], "d" ) != 0 ) {			// default ?
-			Processors = atoi( argv[4] );
-			if ( Processors < 1 ) goto Usage;
+			Processors = ato( argv[4] );
+			if ( Processors < 1 ) fallthru default;
 		} // if
 	  case 4:
 		if ( strcmp( argv[3], "d" ) != 0 ) {			// default ?
-			xr = atoi( argv[3] );
-			if ( xr < 1 ) goto Usage;
+			xr = ato( argv[3] );
+			if ( xr < 1 ) fallthru default;
 		} // if
 	  case 3:
 		if ( strcmp( argv[2], "d" ) != 0 ) {			// default ?
-			xc = atoi( argv[2] );
-			if ( xc < 1 ) goto Usage;
+			xc = ato( argv[2] );
+			if ( xc < 1 ) fallthru default;
 		} // if
 	  case 2:
 		if ( strcmp( argv[1], "d" ) != 0 ) {			// default ?
-			yc = atoi( argv[1] );
-			if ( yc < 1 ) goto Usage;
+			yc = ato( argv[1] );
+			if ( yc < 1 ) fallthru default;
 		} // if
 	  case 1:											// use defaults
 		break;
 	  default:
-	  Usage:
-		sout | "Usage: " | argv[0]
+		exit | "Usage: " | argv[0]
 			 | " [ yc (> 0) | 'd' (default " | yc
 			 | ") ] [ xc (> 0) | 'd' (default " | xc
@@ -66,5 +65,4 @@
 			 | ") ] [ processors (> 0) | 'd' (default " | Processors
 			 | ") ]" ;
-		exit( EXIT_FAILURE );
 	} // switch
 
@@ -90,9 +88,9 @@
     executor e{ Processors, Processors, Processors == 1 ? 1 : Processors * 16, true };
 
-    printf("starting\n");
+    sout | "starting";
 
     start_actor_system( e );
 
-    printf("started\n");
+    sout | "started";
 
     derived_msg messages[xr];
@@ -108,9 +106,9 @@
 	} // for
 
-    printf("stopping\n");
+    sout | "stopping";
 
     stop_actor_system();
 
-    printf("stopped\n");
+    sout | "stopped";
 
     for ( r = 0; r < xr; r += 1 ) {						// deallocate X and Z matrices
@@ -121,5 +119,3 @@
         free( Y[r] );
 	} // for
-
-    return 0;
 }
Index: tests/concurrency/actors/pingpong.cfa
===================================================================
--- tests/concurrency/actors/pingpong.cfa	(revision bdf4cd9e6ac8eafbab8e28e064469f5b3f9f879d)
+++ tests/concurrency/actors/pingpong.cfa	(revision 50be8af55788ecaebbb85845d1e11234cd6a5cb6)
@@ -42,5 +42,5 @@
 
 int main( int argc, char * argv[] ) {
-    printf("start\n");
+    sout | "start";
 
     processor p[Processors - 1];
@@ -56,5 +56,4 @@
     stop_actor_system();
 
-    printf("end\n");
-    return 0;
+    sout | "end";
 }
Index: tests/concurrency/actors/static.cfa
===================================================================
--- tests/concurrency/actors/static.cfa	(revision bdf4cd9e6ac8eafbab8e28e064469f5b3f9f879d)
+++ tests/concurrency/actors/static.cfa	(revision 50be8af55788ecaebbb85845d1e11234cd6a5cb6)
@@ -33,21 +33,19 @@
 	  case 2:
 		if ( strcmp( argv[1], "d" ) != 0 ) {			// default ?
-			Times = atoi( argv[1] );
-			if ( Times < 1 ) goto Usage;
+			Times = ato( argv[1] );
+			if ( Times < 1 ) fallthru default;
 		} // if
 	  case 1:											// use defaults
 		break;
 	  default:
-	  Usage:
-		sout | "Usage: " | argv[0] | " [ times (> 0) ]";
-		exit( EXIT_FAILURE );
+		exit | "Usage: " | argv[0] | " [ times (> 0) ]";
 	} // switch
 
-    printf("starting\n");
+    sout | "starting";
 
     executor e{ 0, 1, 1, false };
     start_actor_system( e );
 
-    printf("started\n");
+    sout | "started";
 
     derived_msg msg;
@@ -57,9 +55,9 @@
     actor | msg;
 
-    printf("stopping\n");
+    sout | "stopping";
 
     stop_actor_system();
 
-    printf("stopped\n");
+    sout | "stopped";
 
     return 0;
Index: tests/concurrency/actors/types.cfa
===================================================================
--- tests/concurrency/actors/types.cfa	(revision bdf4cd9e6ac8eafbab8e28e064469f5b3f9f879d)
+++ tests/concurrency/actors/types.cfa	(revision 50be8af55788ecaebbb85845d1e11234cd6a5cb6)
@@ -62,9 +62,9 @@
 
 int main( int argc, char * argv[] ) {
-    printf("start\n");
+    sout | "start";
 
     processor p[Processors - 1];
 
-    printf("basic test\n"); 
+    sout | "basic test"; 
     start_actor_system( Processors ); // test passing number of processors
     derived_actor a;
@@ -75,5 +75,5 @@
     stop_actor_system();
 
-    printf("same message and different actors test\n");
+    sout | "same message and different actors test";
     start_actor_system(); // let system detect # of processors
     derived_actor2 d_ac2_0, d_ac2_1;
@@ -86,5 +86,5 @@
     
     {
-        printf("same message and different actor types test\n");
+        sout | "same message and different actor types test";
         executor e{ 0, Processors, Processors == 1 ? 1 : Processors * 4, false };
         start_actor_system( e ); // pass an explicit executor
@@ -99,5 +99,5 @@
 
     {
-        printf("different message types, one actor test\n");
+        sout | "different message types, one actor test";
         executor e{ 1, Processors, Processors == 1 ? 1 : Processors * 4, true };
         start_actor_system( Processors );
@@ -112,5 +112,5 @@
 
     {
-        printf("nested inheritance actor test\n");
+        sout | "nested inheritance actor test";
         executor e{ 1, Processors, Processors == 1 ? 1 : Processors * 4, true };
         start_actor_system( Processors );
@@ -124,5 +124,4 @@
     } // RAII to clean up executor
 
-    printf("end\n");
-    return 0;
+    sout | "end";
 }