Index: tests/concurrency/channels/daisy_chain.cfa
===================================================================
--- tests/concurrency/channels/daisy_chain.cfa	(revision d829c6dd7604997eb490d631335c27505c6d749c)
+++ tests/concurrency/channels/daisy_chain.cfa	(revision c2c171747f6a76789fe7e2861bf8ed06b7f0d080)
@@ -19,8 +19,9 @@
 void main(Task & this) {
     size_t runs = 0;
+    int token = 0;
     try{
         for ( ;; ) {
-            remove( *chain );
-            insert( *chain, 0 );
+            token << *chain;
+            token >> *chain;
             runs++;
         }
@@ -59,5 +60,5 @@
     Channel chainChan{ 1 };
 
-    insert( chainChan, 0 );
+    ((int)0) >> chainChan;
 
     chain = &chainChan;    
Index: tests/concurrency/waituntil/repeat_close.cfa
===================================================================
--- tests/concurrency/waituntil/repeat_close.cfa	(revision d829c6dd7604997eb490d631335c27505c6d749c)
+++ tests/concurrency/waituntil/repeat_close.cfa	(revision c2c171747f6a76789fe7e2861bf8ed06b7f0d080)
@@ -26,6 +26,5 @@
 }
 
-
-thread Consumer {}; 
+thread Consumer {};
 void main( Consumer & this ) {
     long long int in, A_removes = 0, B_removes = 0, C_removes = 0, D_removes = 0, E_removes = 0, F_removes = 0;
@@ -93,5 +92,5 @@
         {
             Producer p[ num_thds / 2 ];
-            Consumer c[ 1 ];
+            Consumer c[ num_thds / 2 ];
             sleep(time`s);
             close(A);