Index: tests/Makefile.am
===================================================================
--- tests/Makefile.am	(revision 9506c704946ca74a10747460a7b64c9a3a6a05c4)
+++ tests/Makefile.am	(revision b8b64c3491eaabb200d19c9745cf2694fcf26af0)
@@ -72,5 +72,9 @@
 	concurrency/actors/poison \
 	concurrency/actors/static \
-	concurrency/actors/types
+	concurrency/actors/types \
+	io/away_fair \
+	io/comp_basic \
+	io/comp_fair \
+	io/many_read
 
 # Tests that need investigation from the CFA team about why they require lax wflags.  Goal is to eliminate this list.
@@ -79,16 +83,4 @@
 	include/includes \
 	include/stdincludes \
-	include/vector-collections \
-	include/vector-fstream \
-	include/vector-sequence \
-	io/away_fair \
-	io/comp_basic \
-	io/comp_fair \
-	io/manipulatorsInput \
-	io/manipulatorsInput-uchunk \
-	io/many_read \
-	raii/ctor-autogen \
-	raii/dtor-early-exit \
-	raii/init_once \
 	references \
 	tuple/tupleCast \
Index: tests/io/comp_basic.cfa
===================================================================
--- tests/io/comp_basic.cfa	(revision 9506c704946ca74a10747460a7b64c9a3a6a05c4)
+++ tests/io/comp_basic.cfa	(revision b8b64c3491eaabb200d19c9745cf2694fcf26af0)
@@ -75,5 +75,5 @@
 // takes its sweet time so the Reader has to block
 thread Writer {};
-void main(Writer & this) {
+void main(Writer &) {
 	for(TIMES) {
 		block( globals.bar );
Index: tests/io/comp_fair.cfa
===================================================================
--- tests/io/comp_fair.cfa	(revision 9506c704946ca74a10747460a7b64c9a3a6a05c4)
+++ tests/io/comp_fair.cfa	(revision b8b64c3491eaabb200d19c9745cf2694fcf26af0)
@@ -95,5 +95,5 @@
 // takes its sweet time so the Reader has to block
 thread Writer {};
-void main(Writer & this) {
+void main(Writer &) {
 	for(TIMES) {
 		block( globals.bar );
Index: tests/io/manipulatorsInput-uchunk.cfa
===================================================================
--- tests/io/manipulatorsInput-uchunk.cfa	(revision 9506c704946ca74a10747460a7b64c9a3a6a05c4)
+++ tests/io/manipulatorsInput-uchunk.cfa	(revision b8b64c3491eaabb200d19c9745cf2694fcf26af0)
@@ -117,5 +117,5 @@
     }
 
-#else 
+#else
     #define xstr(s) str(s)
     #define str(s) #s
@@ -180,6 +180,7 @@
 
     // not used
-    static int true_main(const char * path, const char * env[]) { return 0; }
-
+    static int true_main(const char *, const char * []) { return 0; }
+    __attribute__((unused)) static void check_main(const char *);
+    __attribute__((unused)) static void print_status(int);
 
 #endif
Index: tests/io/manipulatorsInput.cfa
===================================================================
--- tests/io/manipulatorsInput.cfa	(revision 9506c704946ca74a10747460a7b64c9a3a6a05c4)
+++ tests/io/manipulatorsInput.cfa	(revision b8b64c3491eaabb200d19c9745cf2694fcf26af0)
@@ -81,5 +81,5 @@
 		scanf( "%[^\n]\n", s );							printf( "16 %s\n", s );				// |get this line\n|
 		scanf( "%[^%%]%%\n", s );						printf( "17 %s\n", s );				// |@# this line 1)-{}%\n|
-		scanf( "%*[^%%]%%\n", s );						printf( "18 %s\n", s );				// |@# this line 1)-{}%\n|
+		scanf( "%*[^%%]%%\n" );							printf( "18 %s\n", s );				// |@# this line 1)-{}%\n|
 
 		scanf( "%*[ \f\n\r\t\v]" );						// ignore whitespace				// ||
@@ -92,5 +92,5 @@
 		scanf( "X%[^Y]Y", s );							printf( "22 %s\n", s );				// |X		ZC44%Y|
 		scanf( "%*[ \f\n\r\t\v]" );						// ignore whitespace				// |\n|
-		scanf( "X%*[^Y]Y", s );							printf( "23 %s\n", s );				// |X		ZC44%Y|
+		scanf( "X%*[^Y]Y" );							printf( "23 %s\n", s );				// |X		ZC44%Y|
 		scanf( "\n" );									// must start next line				// |\n|
 
@@ -105,5 +105,5 @@
 		scanf( "X%cY", &ch );							printf( "27 %c\n", ch );			// |x|
 		scanf( "%*[ \f\n\r\t\v]" );						// ignore whitespace				// |\n|
-		scanf( "X%*cY", &ch );							printf( "28 %c\n", ch );			// |x|
+		scanf( "X%*cY" );								printf( "28 %c\n", ch );			// |x|
 		scanf( "\n" );									// must start next line				// |\n|
 	}
Index: tests/io/many_read.cfa
===================================================================
--- tests/io/many_read.cfa	(revision 9506c704946ca74a10747460a7b64c9a3a6a05c4)
+++ tests/io/many_read.cfa	(revision b8b64c3491eaabb200d19c9745cf2694fcf26af0)
@@ -95,5 +95,5 @@
 #endif
 
-void main(reader & this) {
+void main(reader &) {
 	for(50) {
 		char data[size];
Index: tests/raii/ctor-autogen.cfa
===================================================================
--- tests/raii/ctor-autogen.cfa	(revision 9506c704946ca74a10747460a7b64c9a3a6a05c4)
+++ tests/raii/ctor-autogen.cfa	(revision b8b64c3491eaabb200d19c9745cf2694fcf26af0)
@@ -1,5 +1,5 @@
 // TODO: add error cases (e.g., use of field constructors for managed types, etc.)
 
-enum Color { R, G, B };
+enum Colour { R, G, B };
 
 // empty struct/union should have generated ctor/dtors
@@ -21,5 +21,5 @@
 // struct/union with members with generated ctor/dtors should themselves have generated ctor/dtors
 union PopulatedUnion {
-	Color c;
+	Colour c;
 	U u;
 	S s;
@@ -27,5 +27,5 @@
 
 struct PopulatedStruct {
-	Color c;
+	Colour c;
 	U u;
 	S s;
@@ -109,8 +109,8 @@
 	S s;
 	U u;
-	Color e;
+	Colour e = R;
 
-	// identity(R);  Color constant should be Color which is otype
-	identity(e);  // Color should be an otype
+	// identity(R);  Colour constant should be Colour which is otype
+	identity(e);  // Colour should be an otype
 	identity(u);  // U should be an otype
 	identity(s);  // S should be an otype
@@ -139,6 +139,6 @@
 	identity(dsi);
 	identity(dsd);
-	// identity(dui); // xxx - codegen errors in generated thunk _temp3 (Box-pass-generated assignment return-temporary)
-	// identity(dud);
+	identity(dui);
+	identity(dud);
 	identity(dssi);
 	identity(dssf);
Index: tests/raii/dtor-early-exit.cfa
===================================================================
--- tests/raii/dtor-early-exit.cfa	(revision 9506c704946ca74a10747460a7b64c9a3a6a05c4)
+++ tests/raii/dtor-early-exit.cfa	(revision b8b64c3491eaabb200d19c9745cf2694fcf26af0)
@@ -23,8 +23,8 @@
 };
 
-// don't want these called
-void ?{}(A & a) { assert( false ); }
 void ?{}(A & a, const char * name) { a.name = name; sout | "construct " | name; a.x = (int*)malloc(); }
-void ?{}(A & a, const char * name, int * ptr) { assert( false ); }
+// Don't want these called:
+void ?{}(A &) { assert( false ); }
+void ?{}(A &, const char *, int *) { assert( false ); }
 
 A ?=?(A & a, A b) {  sout | "assign " | a.name | " " | b.name; return a; }
@@ -110,8 +110,8 @@
 				if (j == 0) {
 					sout | "continue L2";
-					continue; // destruct y - missing because object that needs to be destructed is not a part of this block, it's a part of the for's block
+					continue L2;  // destruct y - missing because object that needs to be destructed is not a part of this block, it's a part of the for's block
 				} else if (j == 1) {
 					sout | "break L2";
-					break;  // destruct y
+					break L2;  // destruct y
 				} else if (i == 1) {
 					sout | "continue L1";
@@ -222,4 +222,5 @@
 		if(true) continue;
 		int t = 0;
+		(void)t;
 	}
 }
Index: tests/raii/init_once.cfa
===================================================================
--- tests/raii/init_once.cfa	(revision 9506c704946ca74a10747460a7b64c9a3a6a05c4)
+++ tests/raii/init_once.cfa	(revision b8b64c3491eaabb200d19c9745cf2694fcf26af0)
@@ -75,5 +75,5 @@
 }
 
-void ?{}(init_once & x, init_once other) {
+void ?{}(init_once & x, init_once) {
 	x{};  // reuse default ctor
 }
@@ -131,5 +131,6 @@
 				init_once x;
 				init_once y = x;
-			} // fall through
+			}
+				fallthrough;
 			default: {
 				init_once x;