Index: tests/concurrent/coroutineYield.cfa
===================================================================
--- tests/concurrent/coroutineYield.cfa	(revision fec63b21f5efc819f13b798d37a05390d81a66ee)
+++ tests/concurrent/coroutineYield.cfa	(revision edc6ea2cfa679ce9cb9bc42816103d2f2e03fcd1)
@@ -38,6 +38,6 @@
 
 
+Coroutine c;
 int main(int argc, char* argv[]) {
-	Coroutine c;
 	for(int i = 0; TEST(i < N); i++) {
 		#if !defined(TEST_FOREVER)
Index: tests/exceptions/cancel/coroutine.cfa
===================================================================
--- tests/exceptions/cancel/coroutine.cfa	(revision fec63b21f5efc819f13b798d37a05390d81a66ee)
+++ tests/exceptions/cancel/coroutine.cfa	(revision edc6ea2cfa679ce9cb9bc42816103d2f2e03fcd1)
@@ -25,5 +25,5 @@
 		resume(cancel);
 		printf("4");
-	} catchResume (SomeCoroutineCancelled * error) {
+	} catchResume (CoroutineCancelled(WillCancel) * error) {
 		printf("2");
 		if ((virtual internal_error *)error->the_exception) {
Index: tests/exceptions/cancel/thread.cfa
===================================================================
--- tests/exceptions/cancel/thread.cfa	(revision fec63b21f5efc819f13b798d37a05390d81a66ee)
+++ tests/exceptions/cancel/thread.cfa	(revision edc6ea2cfa679ce9cb9bc42816103d2f2e03fcd1)
@@ -26,5 +26,5 @@
 		join(cancel);
 		printf("4");
-	} catchResume (SomeThreadCancelled * error) {
+	} catchResume (ThreadCancelled(WillCancel) * error) {
 		printf("2");
 		if ((virtual internal_error *)error->the_exception) {
@@ -43,5 +43,5 @@
 		}
 		printf("4");
-	} catchResume (SomeThreadCancelled * error) {
+	} catchResume (ThreadCancelled(WillCancel) * error) {
 		printf("2");
 		if ((virtual internal_error *)error->the_exception) {