cleaned up tests

59 files changed, 557 insertions, 280 deletions

diff --git a/ocaml/test/dune b/ocaml/test/dune
index 3f23caa..8087a38 100644
--- a/ocaml/test/dune
+++ b/ocaml/test/dune
@@ -1,288 +1,288 @@
-(test
- (name test_nock)
- (modules test_nock)
- (libraries nock_lib zarith))
-
-(test
- (name test_serial)
- (modules test_serial)
- (libraries nock_lib zarith))
-
-(test
- (name test_jam_debug)
- (modules test_jam_debug)
- (libraries nock_lib zarith))
-
-(test
- (name bench_nock)
- (modules bench_nock)
- (libraries nock_lib zarith unix))
-
-(test
- (name bench_serial)
- (modules bench_serial)
- (libraries nock_lib zarith unix))
-
-(executable
- (name bench_cue_pill)
- (modules bench_cue_pill)
- (libraries nock_lib unix))
-
-(executable
- (name test_roundtrip)
- (modules test_roundtrip)
- (libraries nock_lib zarith))
-
-(executable
- (name test_bench_one)
- (modules test_bench_one)
- (libraries nock_lib zarith))
-
-(executable
- (name jam_compare)
- (modules jam_compare)
- (libraries nock_lib zarith))
-
-(executable
- (name test_hex)
- (libraries nock_lib))
-
-(executable
- (name test_eventlog)
- (modules test_eventlog)
- (libraries nock_lib eio_main))
-
-(executable
- (name test_state)
- (modules test_state)
- (libraries nock_lib eio_main unix))
-
-(executable
- (name test_multicore)
- (modules test_multicore)
- (libraries nock_lib eio_main unix))
-
-(executable
- (name test_runtime)
- (modules test_runtime)
- (libraries nock_lib io_drivers eio_main unix))
-
-(executable
- (name test_parallel_nock)
- (modules test_parallel_nock)
- (libraries nock_lib eio_main unix domainslib))
-
-(executable
- (name test_ames)
- (modules test_ames)
- (libraries nock_lib io_drivers eio_main unix))
-
-(executable
- (name test_http)
- (modules test_http)
- (libraries nock_lib io_drivers eio_main unix))
-
-(executable
- (name test_clay)
- (modules test_clay)
- (libraries nock_lib io_drivers eio_main unix))
-
-(executable
- (name test_dill_iris)
- (modules test_dill_iris)
- (libraries nock_lib io_drivers eio_main unix))
-
-(executable
- (name test_arvo)
- (modules test_arvo)
- (libraries nock_lib eio_main unix))
-
-(executable
- (name test_arvo_structure)
- (modules test_arvo_structure)
- (libraries nock_lib eio_main unix))
-
-(executable
- (name test_poke_formulas)
- (modules test_poke_formulas)
- (libraries nock_lib eio_main unix))
-
-(executable
- (name test_arms)
- (modules test_arms)
- (libraries nock_lib eio_main unix))
-
-(executable
- (name test_pill_depth)
- (modules test_pill_depth)
- (libraries nock_lib eio_main unix))
-
-(executable
- (name test_real_arvo)
- (modules test_real_arvo)
- (libraries nock_lib eio_main unix))
-
-(executable
- (name test_cvere_poke)
- (modules test_cvere_poke)
- (libraries nock_lib eio_main unix))
-
-(executable
- (name test_arvo_real_poke)
- (modules test_arvo_real_poke)
- (libraries nock_lib eio_main unix))
-
-(executable
- (name test_solid_structure)
- (modules test_solid_structure)
- (libraries nock_lib eio_main unix))
-
-(executable
- (name test_boot_solid_events)
- (modules test_boot_solid_events)
- (libraries nock_lib eio_main unix))
-
-(executable
- (name test_poke_solid_arvo)
- (modules test_poke_solid_arvo)
- (libraries nock_lib eio_main unix))
-
-(executable
- (name test_brass_cue)
- (modules test_brass_cue)
- (libraries nock_lib eio_main unix))
-
-(executable
- (name test_arvo_poke_correct)
- (modules test_arvo_poke_correct)
- (libraries nock_lib eio_main unix))
-
-(executable
- (name test_arvo_slots)
- (modules test_arvo_slots)
- (libraries nock_lib eio_main unix))
-
-(executable
- (name test_ivory_boot)
- (modules test_ivory_boot)
- (libraries nock_lib eio_main unix))
-
-(executable
- (name test_ivory_structure)
- (modules test_ivory_structure)
- (libraries nock_lib eio_main unix))
-
-(executable
- (name test_solid_boot)
- (modules test_solid_boot)
- (libraries nock_lib eio_main unix))
-
-(executable
- (name cache_solid)
- (modules cache_solid)
- (libraries nock_lib eio_main unix))
-
-(executable
- (name test_boot_arvo_properly)
- (modules test_boot_arvo_properly)
- (libraries nock_lib eio_main unix))
-
-(executable
- (name inspect_boot_events)
- (modules inspect_boot_events)
- (libraries nock_lib eio_main unix))
-
-(executable
- (name inspect_events_simple)
- (modules inspect_events_simple)
- (libraries nock_lib eio_main unix))
-
-(executable
- (name test_solid_cvere_pattern)
- (modules test_solid_cvere_pattern)
- (libraries nock_lib eio_main unix))
-
-(executable
- (name explore_kernel_structure)
- (modules explore_kernel_structure)
- (libraries nock_lib eio_main unix))
-
-(executable
- (name test_slam_directly)
- (modules test_slam_directly)
- (libraries nock_lib eio_main unix))
-
-(executable
- (name test_boot_with_slam)
- (modules test_boot_with_slam)
- (libraries nock_lib eio_main unix))
-
-(executable
- (name inspect_event4_detail)
- (modules inspect_event4_detail)
- (libraries nock_lib eio_main unix))
-
-(executable
- (name compare_events_3_4)
- (modules compare_events_3_4)
- (libraries nock_lib eio_main unix))
-
-(executable
- (name examine_event3_effects)
- (modules examine_event3_effects)
- (libraries nock_lib eio_main unix))
-
-(executable
- (name test_functional_bios)
- (modules test_functional_bios)
- (libraries nock_lib eio_main unix))
-
-(executable
- (name debug_event4_slam)
- (modules debug_event4_slam)
- (libraries nock_lib eio_main unix))
-
-(executable
- (name test_event4_slot42)
- (modules test_event4_slot42)
- (libraries nock_lib eio_main unix))
-
-(executable
- (name test_correct_boot)
- (modules test_correct_boot)
- (libraries nock_lib eio_main unix))
-
-(executable
- (name parse_solid_pill)
- (modules parse_solid_pill)
- (libraries nock_lib eio_main unix))
-
-(executable
- (name examine_pill_events)
- (modules examine_pill_events)
- (libraries nock_lib eio_main unix))
-
-(executable
- (name test_life_on_bot)
- (modules test_life_on_bot)
- (libraries nock_lib eio_main unix))
+; (test
+;  (name test_nock)
+;  (modules test_nock)
+;  (libraries nock_lib zarith))
+
+; (test
+;  (name test_serial)
+;  (modules test_serial)
+;  (libraries nock_lib zarith))
+
+; (test
+;  (name test_jam_debug)
+;  (modules test_jam_debug)
+;  (libraries nock_lib zarith))
+
+; (test
+;  (name bench_nock)
+;  (modules bench_nock)
+;  (libraries nock_lib zarith unix))
+
+; (test
+;  (name bench_serial)
+;  (modules bench_serial)
+;  (libraries nock_lib zarith unix))
+
+; (executable
+;  (name bench_cue_pill)
+;  (modules bench_cue_pill)
+;  (libraries nock_lib unix))
+
+; (executable
+;  (name test_roundtrip)
+;  (modules test_roundtrip)
+;  (libraries nock_lib zarith))
+
+; (executable
+;  (name test_bench_one)
+;  (modules test_bench_one)
+;  (libraries nock_lib zarith))
+
+; (executable
+;  (name jam_compare)
+;  (modules jam_compare)
+;  (libraries nock_lib zarith))
+
+; (executable
+;  (name test_hex)
+;  (libraries nock_lib))
+
+; (executable
+;  (name test_eventlog)
+;  (modules test_eventlog)
+;  (libraries nock_lib eio_main))
+
+; (executable
+;  (name test_state)
+;  (modules test_state)
+;  (libraries nock_lib eio_main unix))
+
+; (executable
+;  (name test_multicore)
+;  (modules test_multicore)
+;  (libraries nock_lib eio_main unix))
+
+; (executable
+;  (name test_runtime)
+;  (modules test_runtime)
+;  (libraries nock_lib io_drivers eio_main unix))
+
+; (executable
+;  (name test_parallel_nock)
+;  (modules test_parallel_nock)
+;  (libraries nock_lib eio_main unix domainslib))
+
+; (executable
+;  (name test_ames)
+;  (modules test_ames)
+;  (libraries nock_lib io_drivers eio_main unix))
+
+; (executable
+;  (name test_http)
+;  (modules test_http)
+;  (libraries nock_lib io_drivers eio_main unix))
+
+; (executable
+;  (name test_clay)
+;  (modules test_clay)
+;  (libraries nock_lib io_drivers eio_main unix))
+
+; (executable
+;  (name test_dill_iris)
+;  (modules test_dill_iris)
+;  (libraries nock_lib io_drivers eio_main unix))
+
+; (executable
+;  (name test_arvo)
+;  (modules test_arvo)
+;  (libraries nock_lib eio_main unix))
+
+; (executable
+;  (name test_arvo_structure)
+;  (modules test_arvo_structure)
+;  (libraries nock_lib eio_main unix))
+
+; (executable
+;  (name test_poke_formulas)
+;  (modules test_poke_formulas)
+;  (libraries nock_lib eio_main unix))
+
+; (executable
+;  (name test_arms)
+;  (modules test_arms)
+;  (libraries nock_lib eio_main unix))
+
+; (executable
+;  (name test_pill_depth)
+;  (modules test_pill_depth)
+;  (libraries nock_lib eio_main unix))
+
+; (executable
+;  (name test_real_arvo)
+;  (modules test_real_arvo)
+;  (libraries nock_lib eio_main unix))
+
+; (executable
+;  (name test_cvere_poke)
+;  (modules test_cvere_poke)
+;  (libraries nock_lib eio_main unix))
+
+; (executable
+;  (name test_arvo_real_poke)
+;  (modules test_arvo_real_poke)
+;  (libraries nock_lib eio_main unix))
+
+; (executable
+;  (name test_solid_structure)
+;  (modules test_solid_structure)
+;  (libraries nock_lib eio_main unix))
+
+; (executable
+;  (name test_boot_solid_events)
+;  (modules test_boot_solid_events)
+;  (libraries nock_lib eio_main unix))
+
+; (executable
+;  (name test_poke_solid_arvo)
+;  (modules test_poke_solid_arvo)
+;  (libraries nock_lib eio_main unix))
+
+; (executable
+;  (name test_brass_cue)
+;  (modules test_brass_cue)
+;  (libraries nock_lib eio_main unix))
+
+; (executable
+;  (name test_arvo_poke_correct)
+;  (modules test_arvo_poke_correct)
+;  (libraries nock_lib eio_main unix))
+
+; (executable
+;  (name test_arvo_slots)
+;  (modules test_arvo_slots)
+;  (libraries nock_lib eio_main unix))
+
+; (executable
+;  (name test_ivory_boot)
+;  (modules test_ivory_boot)
+;  (libraries nock_lib eio_main unix))
+
+; (executable
+;  (name test_ivory_structure)
+;  (modules test_ivory_structure)
+;  (libraries nock_lib eio_main unix))
+
+; (executable
+;  (name test_solid_boot)
+;  (modules test_solid_boot)
+;  (libraries nock_lib eio_main unix))
+
+; (executable
+;  (name cache_solid)
+;  (modules cache_solid)
+;  (libraries nock_lib eio_main unix))
+
+; (executable
+;  (name test_boot_arvo_properly)
+;  (modules test_boot_arvo_properly)
+;  (libraries nock_lib eio_main unix))
+
+; (executable
+;  (name inspect_boot_events)
+;  (modules inspect_boot_events)
+;  (libraries nock_lib eio_main unix))
+
+; (executable
+;  (name inspect_events_simple)
+;  (modules inspect_events_simple)
+;  (libraries nock_lib eio_main unix))
+
+; (executable
+;  (name test_solid_cvere_pattern)
+;  (modules test_solid_cvere_pattern)
+;  (libraries nock_lib eio_main unix))
+
+; (executable
+;  (name explore_kernel_structure)
+;  (modules explore_kernel_structure)
+;  (libraries nock_lib eio_main unix))
+
+; (executable
+;  (name test_slam_directly)
+;  (modules test_slam_directly)
+;  (libraries nock_lib eio_main unix))
+
+; (executable
+;  (name test_boot_with_slam)
+;  (modules test_boot_with_slam)
+;  (libraries nock_lib eio_main unix))
+
+; (executable
+;  (name inspect_event4_detail)
+;  (modules inspect_event4_detail)
+;  (libraries nock_lib eio_main unix))
+
+; (executable
+;  (name compare_events_3_4)
+;  (modules compare_events_3_4)
+;  (libraries nock_lib eio_main unix))
+
+; (executable
+;  (name examine_event3_effects)
+;  (modules examine_event3_effects)
+;  (libraries nock_lib eio_main unix))
+
+; (executable
+;  (name test_functional_bios)
+;  (modules test_functional_bios)
+;  (libraries nock_lib eio_main unix))
+
+; (executable
+;  (name debug_event4_slam)
+;  (modules debug_event4_slam)
+;  (libraries nock_lib eio_main unix))
+
+; (executable
+;  (name test_event4_slot42)
+;  (modules test_event4_slot42)
+;  (libraries nock_lib eio_main unix))
+
+; (executable
+;  (name test_correct_boot)
+;  (modules test_correct_boot)
+;  (libraries nock_lib eio_main unix))
+
+; (executable
+;  (name parse_solid_pill)
+;  (modules parse_solid_pill)
+;  (libraries nock_lib eio_main unix))
+
+; (executable
+;  (name examine_pill_events)
+;  (modules examine_pill_events)
+;  (libraries nock_lib eio_main unix))
+
+; (executable
+;  (name test_life_on_bot)
+;  (modules test_life_on_bot)
+;  (libraries nock_lib eio_main unix))
 
 (executable
  (name test_two_stage_boot)
  (modules test_two_stage_boot)
  (libraries nock_lib eio_main unix))
 
-(executable
- (name test_life_formula)
- (modules test_life_formula)
- (libraries nock_lib))
+; (executable
+;  (name test_life_formula)
+;  (modules test_life_formula)
+;  (libraries nock_lib))
 
-(executable
- (name examine_ivory)
- (modules examine_ivory)
- (libraries nock_lib eio_main))
+; (executable
+;  (name examine_ivory)
+;  (modules examine_ivory)
+;  (libraries nock_lib eio_main))
 
-(executable
- (name test_two_phase_boot)
- (modules test_two_phase_boot)
- (libraries nock_lib eio_main))
+; (executable
+;  (name test_two_phase_boot)
+;  (modules test_two_phase_boot)
+;  (libraries nock_lib eio_main))
diff --git a/ocaml/test/bench_cue_pill.ml b/ocaml/test/old/bench_cue_pill.ml
index 064f0c5..064f0c5 100644
--- a/ocaml/test/bench_cue_pill.ml
+++ b/ocaml/test/old/bench_cue_pill.ml
diff --git a/ocaml/test/bench_nock.ml b/ocaml/test/old/bench_nock.ml
index a71b3da..a71b3da 100644
--- a/ocaml/test/bench_nock.ml
+++ b/ocaml/test/old/bench_nock.ml
diff --git a/ocaml/test/bench_serial.ml b/ocaml/test/old/bench_serial.ml
index a8e5bdf..a8e5bdf 100644
--- a/ocaml/test/bench_serial.ml
+++ b/ocaml/test/old/bench_serial.ml
diff --git a/ocaml/test/cache_solid.ml b/ocaml/test/old/cache_solid.ml
index 7ad7df0..7ad7df0 100644
--- a/ocaml/test/cache_solid.ml
+++ b/ocaml/test/old/cache_solid.ml
diff --git a/ocaml/test/compare_events_3_4.ml b/ocaml/test/old/compare_events_3_4.ml
index b134d68..b134d68 100644
--- a/ocaml/test/compare_events_3_4.ml
+++ b/ocaml/test/old/compare_events_3_4.ml
diff --git a/ocaml/test/debug_event4_slam.ml b/ocaml/test/old/debug_event4_slam.ml
index 3aa2150..3aa2150 100644
--- a/ocaml/test/debug_event4_slam.ml
+++ b/ocaml/test/old/debug_event4_slam.ml
diff --git a/ocaml/test/examine_event3_effects.ml b/ocaml/test/old/examine_event3_effects.ml
index de2fec3..de2fec3 100644
--- a/ocaml/test/examine_event3_effects.ml
+++ b/ocaml/test/old/examine_event3_effects.ml
diff --git a/ocaml/test/examine_ivory.ml b/ocaml/test/old/examine_ivory.ml
index 490f735..490f735 100644
--- a/ocaml/test/examine_ivory.ml
+++ b/ocaml/test/old/examine_ivory.ml
diff --git a/ocaml/test/examine_pill_events.ml b/ocaml/test/old/examine_pill_events.ml
index 8a11117..8a11117 100644
--- a/ocaml/test/examine_pill_events.ml
+++ b/ocaml/test/old/examine_pill_events.ml
diff --git a/ocaml/test/explore_kernel_structure.ml b/ocaml/test/old/explore_kernel_structure.ml
index 513d47f..513d47f 100644
--- a/ocaml/test/explore_kernel_structure.ml
+++ b/ocaml/test/old/explore_kernel_structure.ml
diff --git a/ocaml/test/inspect_boot_events.ml b/ocaml/test/old/inspect_boot_events.ml
index 0a7ba92..0a7ba92 100644
--- a/ocaml/test/inspect_boot_events.ml
+++ b/ocaml/test/old/inspect_boot_events.ml
diff --git a/ocaml/test/inspect_event4_detail.ml b/ocaml/test/old/inspect_event4_detail.ml
index 4f4f30a..4f4f30a 100644
--- a/ocaml/test/inspect_event4_detail.ml
+++ b/ocaml/test/old/inspect_event4_detail.ml
diff --git a/ocaml/test/inspect_events_simple.ml b/ocaml/test/old/inspect_events_simple.ml
index 0cb05c9..0cb05c9 100644
--- a/ocaml/test/inspect_events_simple.ml
+++ b/ocaml/test/old/inspect_events_simple.ml
diff --git a/ocaml/test/jam_compare.ml b/ocaml/test/old/jam_compare.ml
index bdbc306..bdbc306 100644
--- a/ocaml/test/jam_compare.ml
+++ b/ocaml/test/old/jam_compare.ml
diff --git a/ocaml/test/parse_solid_pill.ml b/ocaml/test/old/parse_solid_pill.ml
index ef10785..ef10785 100644
--- a/ocaml/test/parse_solid_pill.ml
+++ b/ocaml/test/old/parse_solid_pill.ml
diff --git a/ocaml/test/test_ames.ml b/ocaml/test/old/test_ames.ml
index d50a799..d50a799 100644
--- a/ocaml/test/test_ames.ml
+++ b/ocaml/test/old/test_ames.ml
diff --git a/ocaml/test/test_arms.ml b/ocaml/test/old/test_arms.ml
index 0847f6f..0847f6f 100644
--- a/ocaml/test/test_arms.ml
+++ b/ocaml/test/old/test_arms.ml
diff --git a/ocaml/test/test_arvo.ml b/ocaml/test/old/test_arvo.ml
index 8325589..8325589 100644
--- a/ocaml/test/test_arvo.ml
+++ b/ocaml/test/old/test_arvo.ml
diff --git a/ocaml/test/test_arvo_poke_correct.ml b/ocaml/test/old/test_arvo_poke_correct.ml
index 23259b9..23259b9 100644
--- a/ocaml/test/test_arvo_poke_correct.ml
+++ b/ocaml/test/old/test_arvo_poke_correct.ml
diff --git a/ocaml/test/test_arvo_real_poke.ml b/ocaml/test/old/test_arvo_real_poke.ml
index af707fe..af707fe 100644
--- a/ocaml/test/test_arvo_real_poke.ml
+++ b/ocaml/test/old/test_arvo_real_poke.ml
diff --git a/ocaml/test/test_arvo_slots.ml b/ocaml/test/old/test_arvo_slots.ml
index 5ec9f76..5ec9f76 100644
--- a/ocaml/test/test_arvo_slots.ml
+++ b/ocaml/test/old/test_arvo_slots.ml
diff --git a/ocaml/test/test_arvo_structure.ml b/ocaml/test/old/test_arvo_structure.ml
index cbd9f65..cbd9f65 100644
--- a/ocaml/test/test_arvo_structure.ml
+++ b/ocaml/test/old/test_arvo_structure.ml
diff --git a/ocaml/test/test_bench_one.ml b/ocaml/test/old/test_bench_one.ml
index 1a73be5..1a73be5 100644
--- a/ocaml/test/test_bench_one.ml
+++ b/ocaml/test/old/test_bench_one.ml
diff --git a/ocaml/test/test_boot_arvo_properly.ml b/ocaml/test/old/test_boot_arvo_properly.ml
index 559264f..559264f 100644
--- a/ocaml/test/test_boot_arvo_properly.ml
+++ b/ocaml/test/old/test_boot_arvo_properly.ml
diff --git a/ocaml/test/test_boot_solid_events.ml b/ocaml/test/old/test_boot_solid_events.ml
index 41fd32c..41fd32c 100644
--- a/ocaml/test/test_boot_solid_events.ml
+++ b/ocaml/test/old/test_boot_solid_events.ml
diff --git a/ocaml/test/test_boot_with_slam.ml b/ocaml/test/old/test_boot_with_slam.ml
index c87c5c8..c87c5c8 100644
--- a/ocaml/test/test_boot_with_slam.ml
+++ b/ocaml/test/old/test_boot_with_slam.ml
diff --git a/ocaml/test/test_brass_cue.ml b/ocaml/test/old/test_brass_cue.ml
index 0a431cf..0a431cf 100644
--- a/ocaml/test/test_brass_cue.ml
+++ b/ocaml/test/old/test_brass_cue.ml
diff --git a/ocaml/test/test_clay.ml b/ocaml/test/old/test_clay.ml
index 8312f05..8312f05 100644
--- a/ocaml/test/test_clay.ml
+++ b/ocaml/test/old/test_clay.ml
diff --git a/ocaml/test/test_correct_boot.ml b/ocaml/test/old/test_correct_boot.ml
index c778d1b..c778d1b 100644
--- a/ocaml/test/test_correct_boot.ml
+++ b/ocaml/test/old/test_correct_boot.ml
diff --git a/ocaml/test/test_cvere_poke.ml b/ocaml/test/old/test_cvere_poke.ml
index 28b0c78..28b0c78 100644
--- a/ocaml/test/test_cvere_poke.ml
+++ b/ocaml/test/old/test_cvere_poke.ml
diff --git a/ocaml/test/test_dill_iris.ml b/ocaml/test/old/test_dill_iris.ml
index ed974ae..ed974ae 100644
--- a/ocaml/test/test_dill_iris.ml
+++ b/ocaml/test/old/test_dill_iris.ml
diff --git a/ocaml/test/test_event4_slot42.ml b/ocaml/test/old/test_event4_slot42.ml
index ce98863..ce98863 100644
--- a/ocaml/test/test_event4_slot42.ml
+++ b/ocaml/test/old/test_event4_slot42.ml
diff --git a/ocaml/test/test_eventlog.ml b/ocaml/test/old/test_eventlog.ml
index fd0e496..fd0e496 100644
--- a/ocaml/test/test_eventlog.ml
+++ b/ocaml/test/old/test_eventlog.ml
diff --git a/ocaml/test/test_functional_bios.ml b/ocaml/test/old/test_functional_bios.ml
index 5679c3f..5679c3f 100644
--- a/ocaml/test/test_functional_bios.ml
+++ b/ocaml/test/old/test_functional_bios.ml
diff --git a/ocaml/test/test_hex.ml b/ocaml/test/old/test_hex.ml
index a228682..a228682 100644
--- a/ocaml/test/test_hex.ml
+++ b/ocaml/test/old/test_hex.ml
diff --git a/ocaml/test/test_http.ml b/ocaml/test/old/test_http.ml
index 0649a86..0649a86 100644
--- a/ocaml/test/test_http.ml
+++ b/ocaml/test/old/test_http.ml
diff --git a/ocaml/test/test_ivory_boot.ml b/ocaml/test/old/test_ivory_boot.ml
index f9d511a..f9d511a 100644
--- a/ocaml/test/test_ivory_boot.ml
+++ b/ocaml/test/old/test_ivory_boot.ml
diff --git a/ocaml/test/test_ivory_structure.ml b/ocaml/test/old/test_ivory_structure.ml
index 2ed76a9..2ed76a9 100644
--- a/ocaml/test/test_ivory_structure.ml
+++ b/ocaml/test/old/test_ivory_structure.ml
diff --git a/ocaml/test/test_jam_debug.ml b/ocaml/test/old/test_jam_debug.ml
index cad3ee9..cad3ee9 100644
--- a/ocaml/test/test_jam_debug.ml
+++ b/ocaml/test/old/test_jam_debug.ml
diff --git a/ocaml/test/test_life_formula.ml b/ocaml/test/old/test_life_formula.ml
index 722154b..722154b 100644
--- a/ocaml/test/test_life_formula.ml
+++ b/ocaml/test/old/test_life_formula.ml
diff --git a/ocaml/test/test_life_on_bot.ml b/ocaml/test/old/test_life_on_bot.ml
index 1625a53..1625a53 100644
--- a/ocaml/test/test_life_on_bot.ml
+++ b/ocaml/test/old/test_life_on_bot.ml
diff --git a/ocaml/test/test_multicore.ml b/ocaml/test/old/test_multicore.ml
index e2a846b..e2a846b 100644
--- a/ocaml/test/test_multicore.ml
+++ b/ocaml/test/old/test_multicore.ml
diff --git a/ocaml/test/test_nock.ml b/ocaml/test/old/test_nock.ml
index 73f2ce2..73f2ce2 100644
--- a/ocaml/test/test_nock.ml
+++ b/ocaml/test/old/test_nock.ml
diff --git a/ocaml/test/test_parallel_nock.ml b/ocaml/test/old/test_parallel_nock.ml
index 2f3d39a..2f3d39a 100644
--- a/ocaml/test/test_parallel_nock.ml
+++ b/ocaml/test/old/test_parallel_nock.ml
diff --git a/ocaml/test/test_pill_depth.ml b/ocaml/test/old/test_pill_depth.ml
index 329465b..329465b 100644
--- a/ocaml/test/test_pill_depth.ml
+++ b/ocaml/test/old/test_pill_depth.ml
diff --git a/ocaml/test/test_poke_formulas.ml b/ocaml/test/old/test_poke_formulas.ml
index 54c08ff..54c08ff 100644
--- a/ocaml/test/test_poke_formulas.ml
+++ b/ocaml/test/old/test_poke_formulas.ml
diff --git a/ocaml/test/test_poke_solid_arvo.ml b/ocaml/test/old/test_poke_solid_arvo.ml
index e81c41f..e81c41f 100644
--- a/ocaml/test/test_poke_solid_arvo.ml
+++ b/ocaml/test/old/test_poke_solid_arvo.ml
diff --git a/ocaml/test/test_real_arvo.ml b/ocaml/test/old/test_real_arvo.ml
index 0c052d7..0c052d7 100644
--- a/ocaml/test/test_real_arvo.ml
+++ b/ocaml/test/old/test_real_arvo.ml
diff --git a/ocaml/test/test_roundtrip.ml b/ocaml/test/old/test_roundtrip.ml
index 4a4e635..4a4e635 100644
--- a/ocaml/test/test_roundtrip.ml
+++ b/ocaml/test/old/test_roundtrip.ml
diff --git a/ocaml/test/test_runtime.ml b/ocaml/test/old/test_runtime.ml
index ff0514c..ff0514c 100644
--- a/ocaml/test/test_runtime.ml
+++ b/ocaml/test/old/test_runtime.ml
diff --git a/ocaml/test/test_serial.ml b/ocaml/test/old/test_serial.ml
index fca30f8..fca30f8 100644
--- a/ocaml/test/test_serial.ml
+++ b/ocaml/test/old/test_serial.ml
diff --git a/ocaml/test/test_slam_directly.ml b/ocaml/test/old/test_slam_directly.ml
index d7248f5..d7248f5 100644
--- a/ocaml/test/test_slam_directly.ml
+++ b/ocaml/test/old/test_slam_directly.ml
diff --git a/ocaml/test/test_solid_boot.ml b/ocaml/test/old/test_solid_boot.ml
index 08382da..08382da 100644
--- a/ocaml/test/test_solid_boot.ml
+++ b/ocaml/test/old/test_solid_boot.ml
diff --git a/ocaml/test/test_solid_cvere_pattern.ml b/ocaml/test/old/test_solid_cvere_pattern.ml
index a0a4c58..a0a4c58 100644
--- a/ocaml/test/test_solid_cvere_pattern.ml
+++ b/ocaml/test/old/test_solid_cvere_pattern.ml
diff --git a/ocaml/test/test_solid_structure.ml b/ocaml/test/old/test_solid_structure.ml
index 21a9433..21a9433 100644
--- a/ocaml/test/test_solid_structure.ml
+++ b/ocaml/test/old/test_solid_structure.ml
diff --git a/ocaml/test/test_state.ml b/ocaml/test/old/test_state.ml
index 1c841c8..1c841c8 100644
--- a/ocaml/test/test_state.ml
+++ b/ocaml/test/old/test_state.ml
diff --git a/ocaml/test/test_two_phase_boot.ml b/ocaml/test/old/test_two_phase_boot.ml
index 0669b92..0669b92 100644
--- a/ocaml/test/test_two_phase_boot.ml
+++ b/ocaml/test/old/test_two_phase_boot.ml
diff --git a/ocaml/test/old/test_two_stage_boot.ml b/ocaml/test/old/test_two_stage_boot.ml
new file mode 100644
index 0000000..62d262d
--- /dev/null
+++ b/ocaml/test/old/test_two_stage_boot.ml
@@ -0,0 +1,277 @@
+(* Two-Stage Boot Test - Exactly like C Vere *)
+
+open Nock_lib
+
+let () = Printf.printf "\n═══════════════════════════════════════════════════════\n";
+         Printf.printf " Two-Stage Boot Test (C Vere Pattern)\n";
+         Printf.printf "═══════════════════════════════════════════════════════\n\n"
+
+(* Stage 1: Boot ivory pill with null *)
+let stage1_ivory_boot env =
+  Printf.printf "╔═══════════════════════════════════════╗\n";
+  Printf.printf "║  STAGE 1: Ivory Pill Bootstrap       ║\n";
+  Printf.printf "╔═══════════════════════════════════════╗\n\n";
+
+  (* Load ivory pill *)
+  Printf.printf "[1] Loading ivory.pill...\n%!";
+  let fs = Eio.Stdenv.fs env in
+  let pill_bytes = Eio.Path.(load (fs / "ivory.pill")) |> Bytes.of_string in
+  Printf.printf "    Size: %d bytes (%.1f MB)\n%!"
+    (Bytes.length pill_bytes)
+    (float_of_int (Bytes.length pill_bytes) /. 1024.0 /. 1024.0);
+
+  Printf.printf "[2] Cuing ivory pill...\n%!";
+  let start = Unix.gettimeofday () in
+  let pill = Serial.cue pill_bytes in
+  let elapsed = Unix.gettimeofday () -. start in
+  Printf.printf "    ✓ Cued in %.2fs\n\n%!" elapsed;
+
+  (* Check ivory structure: ["ivory" core] *)
+  Printf.printf "[3] Parsing ivory pill structure...\n%!";
+  match pill with
+  | Noun.Cell (tag, core) ->
+      (* Check tag *)
+      let tag_str = match tag with
+        | Noun.Atom z ->
+            let bytes = Z.to_bits z in
+            if String.length bytes <= 10 then bytes else "too-long"
+        | _ -> "not-atom"
+      in
+      Printf.printf "    Tag: '%s'\n" tag_str;
+      Printf.printf "    Core: %s\n\n" (if Noun.is_cell core then "cell" else "atom");
+
+      (* KEY DISCOVERY: The ivory pill tail IS the Arvo core! *)
+      Printf.printf "[4] Using ivory pill tail (Arvo core) for bootstrap...\n%!";
+      Printf.printf "    Ivory structure: [\"ivory\" ARVO_CORE]\n";
+      Printf.printf "    The tail is a CELL, not null!\n\n";
+
+      Printf.printf "[5] Running u3v_life() on Arvo core...\n%!";
+      Printf.printf "    Formula: [2 [0 3] [0 2]]\n";
+      Printf.printf "    Subject: Arvo core (cell)\n%!";
+
+      begin try
+        let start = Unix.gettimeofday () in
+        let kernel = Boot.life core in
+        let elapsed = Unix.gettimeofday () -. start in
+
+        Printf.printf "    ✓ SUCCESS! Kernel built in %.4fs\n\n" elapsed;
+
+        (* Verify kernel has poke at slot 23 *)
+        Printf.printf "[6] Verifying kernel structure...\n%!";
+        begin try
+          let poke = Noun.slot (Z.of_int 23) kernel in
+          Printf.printf "    ✓ Has poke gate at slot 23\n";
+
+          (* Check structure at known slots to verify correctness *)
+          Printf.printf "    Checking structural properties:\n";
+
+          (* Slot 2: should be battery (cell) *)
+          let slot2 = Noun.slot (Z.of_int 2) kernel in
+          Printf.printf "      Slot 2 (battery): %s\n"
+            (if Noun.is_cell slot2 then "cell ✓" else "atom ✗");
+
+          (* Slot 3: should be payload (cell) *)
+          let slot3 = Noun.slot (Z.of_int 3) kernel in
+          Printf.printf "      Slot 3 (payload): %s\n"
+            (if Noun.is_cell slot3 then "cell ✓" else "atom ✗");
+
+          (* Poke should be a cell (it's a gate) *)
+          Printf.printf "      Slot 23 (poke): %s\n"
+            (if Noun.is_cell poke then "cell (gate) ✓" else "atom ✗");
+
+          (* Check head of poke (should be battery) *)
+          if Noun.is_cell poke then begin
+            let poke_battery = Noun.head poke in
+            Printf.printf "      Poke battery: %s\n"
+              (if Noun.is_cell poke_battery then "cell ✓" else "atom ✗")
+          end;
+
+          (* Compute mugs of small sub-structures for verification *)
+          Printf.printf "    Computing mugs of sub-structures:\n";
+          let slot2_mug = Noun.mug slot2 in
+          let slot3_mug = Noun.mug slot3 in
+          let poke_mug = Noun.mug poke in
+          Printf.printf "      Slot 2 mug: 0x%lx\n" slot2_mug;
+          Printf.printf "      Slot 3 mug: 0x%lx\n" slot3_mug;
+          Printf.printf "      Poke mug: 0x%lx\n" poke_mug;
+
+          Printf.printf "\n";
+          Printf.printf "╔═══════════════════════════════════════╗\n";
+          Printf.printf "║  ✓ STAGE 1 COMPLETE!                  ║\n";
+          Printf.printf "╚═══════════════════════════════════════╝\n\n";
+
+          Printf.printf "⚠️  To verify correctness, compare these mugs with C:\n";
+          Printf.printf "    Run the C test and check if mugs match!\n\n";
+
+          (* Print cache stats *)
+          Noun.MugCache.stats ();
+
+          Some kernel
+
+        with _ ->
+          Printf.printf "    ✗ No slot 23 - kernel invalid\n\n";
+          None
+        end
+
+      with
+      | Noun.Exit ->
+          Printf.printf "    ✗ FAILED: Nock Exit\n\n";
+          None
+      | e ->
+          Printf.printf "    ✗ FAILED: %s\n\n" (Printexc.to_string e);
+          None
+      end
+
+  | Noun.Atom _ ->
+      Printf.printf "    ✗ Pill is atom (expected cell)\n\n";
+      None
+
+(* Stage 2: Boot solid pill events *)
+(* let stage2_solid_boot env _ivory_kernel = *)
+  (* Printf.printf "\n╔═══════════════════════════════════════╗\n"; *)
+  (* Printf.printf "║  STAGE 2: Solid Pill Events          ║\n"; *)
+  (* Printf.printf "╚═══════════════════════════════════════╝\n\n"; *)
+
+  (* Load solid pill *)
+  (* Printf.printf "[1] Loading solid.pill...\n%!"; *)
+  (* let fs = Eio.Stdenv.fs env in *)
+  (* let pill_bytes = Eio.Path.(load (fs / "solid.pill")) |> Bytes.of_string in *)
+  (* Printf.printf "    Size: %d bytes (%.1f MB)\n%!" *)
+    (* (Bytes.length pill_bytes) *)
+    (* (float_of_int (Bytes.length pill_bytes) /. 1024.0 /. 1024.0); *)
+
+  (* Printf.printf "[2] Cuing solid pill...\n%!"; *)
+  (* let start = Unix.gettimeofday () in *)
+  (* let pill = Serial.cue pill_bytes in *)
+  (* let elapsed = Unix.gettimeofday () -. start in *)
+  (* Printf.printf "    ✓ Cued in %.2fs\n\n%!" elapsed; *)
+
+  (* Parse structure: [%pill %solid [bot mod use]] *)
+  (* Printf.printf "[3] Parsing solid pill structure...\n%!"; *)
+  (* match pill with *)
+  (* | Noun.Cell (_tag, rest) -> *)
+      (* begin match rest with *)
+      (* | Noun.Cell (_typ, rest2) -> *)
+          (* Printf.printf "    Tag: pill\n"; *)
+          (* Printf.printf "    Type: solid\n"; *)
+
+          (* begin match rest2 with *)
+          (* | Noun.Cell (bot, rest3) -> *)
+              (* Count bot events *)
+              (* let rec count_list acc n = *)
+                (* match n with *)
+                (* | Noun.Atom _ -> acc *)
+                (* | Noun.Cell (_, rest) -> count_list (acc + 1) rest *)
+              (* in *)
+              (* let bot_count = count_list 0 bot in *)
+              (* Printf.printf "    Bot events: %d\n" bot_count; *)
+
+              (* begin match rest3 with *)
+              (* | Noun.Cell (mod_, rest4) -> *)
+                  (* let mod_count = count_list 0 mod_ in *)
+                  (* Printf.printf "    Mod events: %d\n" mod_count; *)
+
+                  (* begin match rest4 with *)
+                  (* | Noun.Cell (use, _) -> *)
+                      (* let use_count = count_list 0 use in *)
+                      (* Printf.printf "    Use events: %d\n" use_count; *)
+
+                      (* let total = bot_count + mod_count + use_count in *)
+                      (* Printf.printf "    Total: %d events\n\n" total; *)
+
+                      (* Concatenate all events into a single list *)
+                      (* Printf.printf "[4] Concatenating all events...\n%!"; *)
+                      (* let rec append_lists l1 l2 = *)
+                        (* match l1 with *)
+                        (* | Noun.Atom _ -> l2 *)
+                        (* | Noun.Cell (h, t) -> Noun.cell h (append_lists t l2) *)
+                      (* in *)
+                      (* let all_events = append_lists bot (append_lists mod_ use) in *)
+                      (* Printf.printf "    ✓ Event list built\n\n"; *)
+
+                      (* Now run u3v_boot on all events *)
+                      (* Printf.printf "[5] Running u3v_boot() on %d events...\n%!" total; *)
+                      (* Printf.printf "    This will call u3v_life() with the event list\n%!"; *)
+
+                      (* begin try *)
+                        (* let start = Unix.gettimeofday () in *)
+
+                        (* Call the lifecycle formula on the event list *)
+                        (* Printf.printf "    Running [2 [0 3] [0 2]] on event list...\n%!"; *)
+                        (* let kernel = Boot.life all_events in *)
+
+                        (* let elapsed = Unix.gettimeofday () -. start in *)
+                        (* Printf.printf "    ✓ SUCCESS! Kernel updated in %.4fs\n\n" elapsed; *)
+
+                        (* Verify kernel *)
+                        (* Printf.printf "[6] Verifying updated kernel...\n%!"; *)
+                        (* begin try *)
+                          (* let _poke = Noun.slot (Z.of_int 23) kernel in *)
+                          (* Printf.printf "    ✓ Has poke gate at slot 23\n\n"; *)
+
+                          (* Printf.printf "╔═══════════════════════════════════════╗\n"; *)
+                          (* Printf.printf "║  🎉🎉🎉 FULL BOOT SUCCESS! 🎉🎉🎉    ║\n"; *)
+                          (* Printf.printf "╚═══════════════════════════════════════╝\n\n"; *)
+
+                          (* Printf.printf "Boot sequence complete:\n"; *)
+                          (* Printf.printf "  1. Stage 1: Ivory pill with null → Initial kernel\n"; *)
+                          (* Printf.printf "  2. Stage 2: Solid pill %d events → Updated kernel\n" total; *)
+                          (* Printf.printf "  3. Kernel is ready to receive pokes!\n\n"; *)
+
+                          (* true *)
+
+                        (* with _ -> *)
+                          (* Printf.printf "    ✗ No slot 23 in updated kernel\n\n"; *)
+                          (* false *)
+                        (* end *)
+
+                      (* with *)
+                      (* | Noun.Exit -> *)
+                          (* Printf.printf "    ✗ FAILED: Nock Exit during lifecycle\n\n"; *)
+                          (* false *)
+
+                      (* | e -> *)
+                          (* Printf.printf "    ✗ FAILED: %s\n\n" (Printexc.to_string e); *)
+                          (* false *)
+                      (* end *)
+
+                  (* | Noun.Atom _ -> *)
+                      (* Printf.printf "    ✗ rest4 is atom (expected use)\n"; *)
+                      (* false *)
+                  (* end *)
+
+              (* | Noun.Atom _ -> *)
+                  (* Printf.printf "    ✗ rest3 is atom (expected [mod use])\n"; *)
+                  (* false *)
+              (* end *)
+
+          (* | Noun.Atom _ -> *)
+              (* Printf.printf "    ✗ rest2 is atom (expected [bot mod use])\n"; *)
+              (* false *)
+          (* end *)
+
+      (* | Noun.Atom _ -> *)
+          (* Printf.printf "    ✗ rest is atom (expected [type ...])\n"; *)
+          (* false *)
+      (* end *)
+
+  (* | Noun.Atom _ -> *)
+      (* Printf.printf "    ✗ Pill is atom (expected cell)\n"; *)
+      (* false *)
+
+(* Main test *)
+let main env =
+  (* Stage 1: Ivory *)
+      let _success = stage1_ivory_boot env in ()
+  (* match stage1_ivory_boot env with *)
+  (* | Some ivory_kernel -> *)
+      (* Stage 2: Solid *)
+      (* let _success = stage2_solid_boot env ivory_kernel in *)
+      (* () *)
+
+  (* | None -> *)
+      (* Printf.printf "╔═══════════════════════════════════════╗\n"; *)
+      (* Printf.printf "║  ✗ STAGE 1 FAILED - Cannot continue  ║\n"; *)
+      (* Printf.printf "╚═══════════════════════════════════════╝\n\n" *)
+
+let () = Eio_main.run main