diff --git a/tests/cpu/jsmoo/testdata/disabled/98.json b/tests/cpu/jsmoo/testdata/98.json
similarity index 100%
rename from tests/cpu/jsmoo/testdata/disabled/98.json
rename to tests/cpu/jsmoo/testdata/98.json
diff --git a/tests/cpu/jsmoo/testdata/disabled/99.json b/tests/cpu/jsmoo/testdata/99.json
similarity index 100%
rename from tests/cpu/jsmoo/testdata/disabled/99.json
rename to tests/cpu/jsmoo/testdata/99.json
diff --git a/tests/cpu/jsmoo/testdata/disabled/9a.json b/tests/cpu/jsmoo/testdata/9a.json
similarity index 100%
rename from tests/cpu/jsmoo/testdata/disabled/9a.json
rename to tests/cpu/jsmoo/testdata/9a.json
diff --git a/tests/cpu/jsmoo/testdata/disabled/9b.json b/tests/cpu/jsmoo/testdata/9b.json
similarity index 100%
rename from tests/cpu/jsmoo/testdata/disabled/9b.json
rename to tests/cpu/jsmoo/testdata/9b.json
diff --git a/tests/cpu/jsmoo/testdata/disabled/9c.json b/tests/cpu/jsmoo/testdata/9c.json
similarity index 100%
rename from tests/cpu/jsmoo/testdata/disabled/9c.json
rename to tests/cpu/jsmoo/testdata/9c.json
diff --git a/tests/cpu/jsmoo/testdata/disabled/9d.json b/tests/cpu/jsmoo/testdata/9d.json
similarity index 100%
rename from tests/cpu/jsmoo/testdata/disabled/9d.json
rename to tests/cpu/jsmoo/testdata/9d.json
diff --git a/tests/cpu/jsmoo/tests.rs b/tests/cpu/jsmoo/tests.rs
index bb27bb5..0694a1a 100644
--- a/tests/cpu/jsmoo/tests.rs
+++ b/tests/cpu/jsmoo/tests.rs
@@ -37,16 +37,16 @@ fn test_jsmoo_test(filename: &str) {
 
         processor.run_next_instruction();
 
-        assert_eq!(processor.registers.a, test_case.r#final.a);
-        assert_eq!(processor.registers.b, test_case.r#final.b);
-        assert_eq!(processor.registers.c, test_case.r#final.c);
-        assert_eq!(processor.registers.d, test_case.r#final.d);
-        assert_eq!(processor.registers.e, test_case.r#final.e);
-        assert_eq!(processor.registers.get_raw_flag_bits(), test_case.r#final.f);
-        assert_eq!(processor.registers.h, test_case.r#final.h);
-        assert_eq!(processor.registers.l, test_case.r#final.l);
-        assert_eq!(processor.registers.program_counter, test_case.r#final.pc);
-        assert_eq!(processor.registers.stack_pointer, test_case.r#final.sp);
+        assert_eq!(processor.registers.a, test_case.r#final.a, "register a value was incorrect");
+        assert_eq!(processor.registers.b, test_case.r#final.b, "register b value was incorrect");
+        assert_eq!(processor.registers.c, test_case.r#final.c, "register c value was incorrect");
+        assert_eq!(processor.registers.d, test_case.r#final.d, "register d value was incorrect");
+        assert_eq!(processor.registers.e, test_case.r#final.e, "register e value was incorrect");
+        assert_eq!(processor.registers.get_raw_flag_bits(), test_case.r#final.f, "register f value was incorrect");
+        assert_eq!(processor.registers.h, test_case.r#final.h, "register h value was incorrect");
+        assert_eq!(processor.registers.l, test_case.r#final.l, "register l value was incorrect");
+        assert_eq!(processor.registers.program_counter, test_case.r#final.pc, "program counter was incorrect");
+        assert_eq!(processor.registers.stack_pointer, test_case.r#final.sp, "stack pointer was incorrect");
 
         for (addr, value) in test_case.r#final.ram {
             let stored_val = processor