diff --git a/mips/src/components/reg_file.rs b/mips/src/components/reg_file.rs
index 53847bb4..56f849a4 100644
--- a/mips/src/components/reg_file.rs
+++ b/mips/src/components/reg_file.rs
@@ -305,7 +305,7 @@ mod test {
             ],
         };
 
-        let mut simulator = Simulator::new(cs);
+        let mut simulator = Simulator::new(cs).unwrap();
 
         assert_eq!(simulator.cycle, 1);
 
diff --git a/riscv/src/components/alu.rs b/riscv/src/components/alu.rs
index 12cf2dc8..b36d9546 100644
--- a/riscv/src/components/alu.rs
+++ b/riscv/src/components/alu.rs
@@ -175,7 +175,7 @@ mod test {
             ],
         };
 
-        let mut simulator = Simulator::new(cs);
+        let mut simulator = Simulator::new(cs).unwrap();
         assert_eq!(simulator.cycle, 1);
 
         // outputs
diff --git a/riscv/src/components/branch_logic.rs b/riscv/src/components/branch_logic.rs
index ebf3fef7..daafea63 100644
--- a/riscv/src/components/branch_logic.rs
+++ b/riscv/src/components/branch_logic.rs
@@ -186,7 +186,7 @@ mod test {
             ],
         };
 
-        let mut simulator = Simulator::new(cs);
+        let mut simulator = Simulator::new(cs).unwrap();
         assert_eq!(simulator.cycle, 1);
 
         // outputs
@@ -241,7 +241,7 @@ mod test {
             ],
         };
 
-        let mut simulator = Simulator::new(cs);
+        let mut simulator = Simulator::new(cs).unwrap();
         assert_eq!(simulator.cycle, 1);
 
         // outputs
@@ -296,7 +296,7 @@ mod test {
             ],
         };
 
-        let mut simulator = Simulator::new(cs);
+        let mut simulator = Simulator::new(cs).unwrap();
         assert_eq!(simulator.cycle, 1);
 
         // outputs
@@ -358,7 +358,7 @@ mod test {
             ],
         };
 
-        let mut simulator = Simulator::new(cs);
+        let mut simulator = Simulator::new(cs).unwrap();
         assert_eq!(simulator.cycle, 1);
 
         // outputs
@@ -420,7 +420,7 @@ mod test {
             ],
         };
 
-        let mut simulator = Simulator::new(cs);
+        let mut simulator = Simulator::new(cs).unwrap();
         assert_eq!(simulator.cycle, 1);
 
         // outputs
@@ -482,7 +482,7 @@ mod test {
             ],
         };
 
-        let mut simulator = Simulator::new(cs);
+        let mut simulator = Simulator::new(cs).unwrap();
         assert_eq!(simulator.cycle, 1);
 
         // outputs
@@ -551,7 +551,7 @@ mod test {
             ],
         };
 
-        let mut simulator = Simulator::new(cs);
+        let mut simulator = Simulator::new(cs).unwrap();
         assert_eq!(simulator.cycle, 1);
 
         // outputs
@@ -590,7 +590,7 @@ mod test {
             ],
         };
 
-        let mut simulator = Simulator::new(cs);
+        let mut simulator = Simulator::new(cs).unwrap();
         assert_eq!(simulator.cycle, 1);
 
         // outputs
diff --git a/riscv/src/components/decoder.rs b/riscv/src/components/decoder.rs
index 3520d8c0..68822467 100644
--- a/riscv/src/components/decoder.rs
+++ b/riscv/src/components/decoder.rs
@@ -493,7 +493,7 @@ mod test {
                 }),
             ],
         };
-        let mut simulator = Simulator::new(cs);
+        let mut simulator = Simulator::new(cs).unwrap();
 
         // outputs
         let wb_mux = &Input::new("decoder", "wb_mux");
@@ -1089,7 +1089,7 @@ mod test {
                 }),
             ],
         };
-        let mut simulator = Simulator::new(cs);
+        let mut simulator = Simulator::new(cs).unwrap();
 
         // outputs
         let wb_mux = &Input::new("decoder", "wb_mux");
@@ -1608,7 +1608,7 @@ mod test {
                 }),
             ],
         };
-        let mut simulator = Simulator::new(cs);
+        let mut simulator = Simulator::new(cs).unwrap();
 
         // outputs
         let wb_mux = &Input::new("decoder", "wb_mux");
@@ -2151,7 +2151,7 @@ mod test {
                 }),
             ],
         };
-        let mut simulator = Simulator::new(cs);
+        let mut simulator = Simulator::new(cs).unwrap();
 
         // outputs
         let wb_mux = &Input::new("decoder", "wb_mux");
diff --git a/riscv/src/components/instr_mem.rs b/riscv/src/components/instr_mem.rs
index e4b2e13b..3e1473f4 100644
--- a/riscv/src/components/instr_mem.rs
+++ b/riscv/src/components/instr_mem.rs
@@ -87,7 +87,7 @@ mod test {
             ],
         };
 
-        let mut simulator = Simulator::new(cs);
+        let mut simulator = Simulator::new(cs).unwrap();
         assert_eq!(simulator.cycle, 1);
 
         // outputs
diff --git a/riscv/src/components/lsb_zero.rs b/riscv/src/components/lsb_zero.rs
index a0e2e469..3b9746a1 100644
--- a/riscv/src/components/lsb_zero.rs
+++ b/riscv/src/components/lsb_zero.rs
@@ -70,7 +70,7 @@ mod test {
             ],
         };
 
-        let mut simulator = Simulator::new(cs);
+        let mut simulator = Simulator::new(cs).unwrap();
         assert_eq!(simulator.cycle, 1);
 
         // outputs
diff --git a/riscv/src/components/reg_file.rs b/riscv/src/components/reg_file.rs
index 566773e2..5ba75dce 100644
--- a/riscv/src/components/reg_file.rs
+++ b/riscv/src/components/reg_file.rs
@@ -253,7 +253,7 @@ mod test {
             ],
         };
 
-        let mut simulator = Simulator::new(cs);
+        let mut simulator = Simulator::new(cs).unwrap();
 
         assert_eq!(simulator.cycle, 1);
 
diff --git a/riscv/src/components/sign_zero_ext.rs b/riscv/src/components/sign_zero_ext.rs
index 3df1b108..ae9470ee 100644
--- a/riscv/src/components/sign_zero_ext.rs
+++ b/riscv/src/components/sign_zero_ext.rs
@@ -99,7 +99,7 @@ mod test {
             ],
         };
 
-        let mut simulator = Simulator::new(cs);
+        let mut simulator = Simulator::new(cs).unwrap();
         assert_eq!(simulator.cycle, 1);
         let szext = &Input::new("szext", "out");
         let val = 0b100000000000;
diff --git a/riscv/src/main.rs b/riscv/src/main.rs
index 78cd2b8a..030d00ba 100644
--- a/riscv/src/main.rs
+++ b/riscv/src/main.rs
@@ -8,5 +8,5 @@ fn main() {
     let _cs = ComponentStore::load_file(&path);
 
     #[cfg(feature = "gui-vizia")]
-    syncrim::gui_vizia::gui(&_cs, &path);
+    syncrim::gui_vizia::gui(_cs, &path);
 }