diff --git a/src/runtime2/tests/mod.rs b/src/runtime2/tests/mod.rs
index bd77094a301b7c01383b7da4faa7cb00425ddec9..e9b3ec0cf3d9df25958d38610dc9bbc125527af9 100644
--- a/src/runtime2/tests/mod.rs
+++ b/src/runtime2/tests/mod.rs
@@ -24,7 +24,7 @@ fn test_component_creation() {
         auto b = 5 + a;
     }
     ").expect("compilation");
-    let rt = Runtime::new(1, true, pd);
+    let rt = Runtime::new(1, true, pd).unwrap();
 
     for _i in 0..20 {
         create_component(&rt, "", "nothing_at_all", no_args());
@@ -81,7 +81,7 @@ fn test_component_communication() {
         new sender(o_mrmm, 5, 5);
         new receiver(i_mrmm, 5, 5);
     }").expect("compilation");
-    let rt = Runtime::new(3, true, pd);
+    let rt = Runtime::new(3, true, pd).unwrap();
     create_component(&rt, "", "constructor", no_args());
 }
 
@@ -130,7 +130,7 @@ fn test_intermediate_messenger() {
         new constructor_template<s64>();
     }
     ").expect("compilation");
-    let rt = Runtime::new(3, true, pd);
+    let rt = Runtime::new(3, true, pd).unwrap();
     create_component(&rt, "", "constructor", no_args());
 }
 
@@ -172,7 +172,7 @@ fn test_simple_select() {
     }
 
     composite constructor() {
-        auto num_sends = 15;
+        auto num_sends = 1;
         channel tx_a -> rx_a;
         channel tx_b -> rx_b;
         new sender(tx_a, num_sends);
@@ -180,7 +180,7 @@ fn test_simple_select() {
         new sender(tx_b, num_sends);
     }
     ").expect("compilation");
-    let rt = Runtime::new(3, false, pd);
+    let rt = Runtime::new(3, true, pd).unwrap();
     create_component(&rt, "", "constructor", no_args());
 }
 
@@ -202,7 +202,7 @@ fn test_unguarded_select() {
         }
     }
     ").expect("compilation");
-    let rt = Runtime::new(3, false, pd);
+    let rt = Runtime::new(3, false, pd).unwrap();
     create_component(&rt, "", "constructor_outside_select", no_args());
     create_component(&rt, "", "constructor_inside_select", no_args());
 }
@@ -218,7 +218,7 @@ fn test_empty_select() {
         }
     }
     ").expect("compilation");
-    let rt = Runtime::new(3, false, pd);
+    let rt = Runtime::new(3, false, pd).unwrap();
     create_component(&rt, "", "constructor", no_args());
 }
 
@@ -244,6 +244,6 @@ fn test_random_u32_temporary_thingo() {
         new random_taker(rx, num_values);
     }
     ").expect("compilation");
-    let rt = Runtime::new(1, true, pd);
+    let rt = Runtime::new(1, true, pd).unwrap();
     create_component(&rt, "", "constructor", no_args());
 }
\ No newline at end of file