diff --git a/hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__diverse_cfg_children@llvm14.snap b/hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__test_fns__diverse_cfg_children@llvm14.snap
similarity index 100%
rename from hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__diverse_cfg_children@llvm14.snap
rename to hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__test_fns__diverse_cfg_children@llvm14.snap
diff --git a/hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__diverse_cfg_children@pre-mem2reg@llvm14.snap b/hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__test_fns__diverse_cfg_children@pre-mem2reg@llvm14.snap
similarity index 100%
rename from hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__diverse_cfg_children@pre-mem2reg@llvm14.snap
rename to hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__test_fns__diverse_cfg_children@pre-mem2reg@llvm14.snap
diff --git a/hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__diverse_dfg_children@llvm14.snap b/hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__test_fns__diverse_dfg_children@llvm14.snap
similarity index 100%
rename from hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__diverse_dfg_children@llvm14.snap
rename to hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__test_fns__diverse_dfg_children@llvm14.snap
diff --git a/hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__diverse_dfg_children@pre-mem2reg@llvm14.snap b/hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__test_fns__diverse_dfg_children@pre-mem2reg@llvm14.snap
similarity index 100%
rename from hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__diverse_dfg_children@pre-mem2reg@llvm14.snap
rename to hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__test_fns__diverse_dfg_children@pre-mem2reg@llvm14.snap
diff --git a/hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__diverse_module_children@llvm14.snap b/hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__test_fns__diverse_module_children@llvm14.snap
similarity index 100%
rename from hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__diverse_module_children@llvm14.snap
rename to hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__test_fns__diverse_module_children@llvm14.snap
diff --git a/hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__diverse_module_children@pre-mem2reg@llvm14.snap b/hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__test_fns__diverse_module_children@pre-mem2reg@llvm14.snap
similarity index 100%
rename from hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__diverse_module_children@pre-mem2reg@llvm14.snap
rename to hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__test_fns__diverse_module_children@pre-mem2reg@llvm14.snap
diff --git a/hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__emit_hugr_call@llvm14.snap b/hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__test_fns__emit_hugr_call@llvm14.snap
similarity index 100%
rename from hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__emit_hugr_call@llvm14.snap
rename to hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__test_fns__emit_hugr_call@llvm14.snap
diff --git a/hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__emit_hugr_call@pre-mem2reg@llvm14.snap b/hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__test_fns__emit_hugr_call@pre-mem2reg@llvm14.snap
similarity index 100%
rename from hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__emit_hugr_call@pre-mem2reg@llvm14.snap
rename to hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__test_fns__emit_hugr_call@pre-mem2reg@llvm14.snap
diff --git a/hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__emit_hugr_call_indirect@llvm14.snap b/hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__test_fns__emit_hugr_call_indirect@llvm14.snap
similarity index 100%
rename from hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__emit_hugr_call_indirect@llvm14.snap
rename to hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__test_fns__emit_hugr_call_indirect@llvm14.snap
diff --git a/hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__emit_hugr_call_indirect@pre-mem2reg@llvm14.snap b/hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__test_fns__emit_hugr_call_indirect@pre-mem2reg@llvm14.snap
similarity index 100%
rename from hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__emit_hugr_call_indirect@pre-mem2reg@llvm14.snap
rename to hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__test_fns__emit_hugr_call_indirect@pre-mem2reg@llvm14.snap
diff --git a/hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__emit_hugr_conditional@llvm14.snap b/hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__test_fns__emit_hugr_conditional@llvm14.snap
similarity index 100%
rename from hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__emit_hugr_conditional@llvm14.snap
rename to hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__test_fns__emit_hugr_conditional@llvm14.snap
diff --git a/hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__emit_hugr_conditional@pre-mem2reg@llvm14.snap b/hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__test_fns__emit_hugr_conditional@pre-mem2reg@llvm14.snap
similarity index 100%
rename from hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__emit_hugr_conditional@pre-mem2reg@llvm14.snap
rename to hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__test_fns__emit_hugr_conditional@pre-mem2reg@llvm14.snap
diff --git a/hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__emit_hugr_custom_op@llvm14.snap b/hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__test_fns__emit_hugr_custom_op@llvm14.snap
similarity index 100%
rename from hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__emit_hugr_custom_op@llvm14.snap
rename to hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__test_fns__emit_hugr_custom_op@llvm14.snap
diff --git a/hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__emit_hugr_custom_op@pre-mem2reg@llvm14.snap b/hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__test_fns__emit_hugr_custom_op@pre-mem2reg@llvm14.snap
similarity index 100%
rename from hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__emit_hugr_custom_op@pre-mem2reg@llvm14.snap
rename to hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__test_fns__emit_hugr_custom_op@pre-mem2reg@llvm14.snap
diff --git a/hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__emit_hugr_dfg@llvm14.snap b/hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__test_fns__emit_hugr_dfg@llvm14.snap
similarity index 100%
rename from hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__emit_hugr_dfg@llvm14.snap
rename to hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__test_fns__emit_hugr_dfg@llvm14.snap
diff --git a/hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__emit_hugr_dfg@pre-mem2reg@llvm14.snap b/hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__test_fns__emit_hugr_dfg@pre-mem2reg@llvm14.snap
similarity index 100%
rename from hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__emit_hugr_dfg@pre-mem2reg@llvm14.snap
rename to hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__test_fns__emit_hugr_dfg@pre-mem2reg@llvm14.snap
diff --git a/hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__emit_hugr_load_constant@llvm14.snap b/hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__test_fns__emit_hugr_load_constant@llvm14.snap
similarity index 100%
rename from hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__emit_hugr_load_constant@llvm14.snap
rename to hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__test_fns__emit_hugr_load_constant@llvm14.snap
diff --git a/hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__emit_hugr_load_constant@pre-mem2reg@llvm14.snap b/hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__test_fns__emit_hugr_load_constant@pre-mem2reg@llvm14.snap
similarity index 100%
rename from hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__emit_hugr_load_constant@pre-mem2reg@llvm14.snap
rename to hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__test_fns__emit_hugr_load_constant@pre-mem2reg@llvm14.snap
diff --git a/hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__emit_hugr_tag@llvm14.snap b/hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__test_fns__emit_hugr_tag@llvm14.snap
similarity index 100%
rename from hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__emit_hugr_tag@llvm14.snap
rename to hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__test_fns__emit_hugr_tag@llvm14.snap
diff --git a/hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__emit_hugr_tag@pre-mem2reg@llvm14.snap b/hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__test_fns__emit_hugr_tag@pre-mem2reg@llvm14.snap
similarity index 100%
rename from hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__emit_hugr_tag@pre-mem2reg@llvm14.snap
rename to hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__test_fns__emit_hugr_tag@pre-mem2reg@llvm14.snap
diff --git a/hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__load_function@llvm14.snap b/hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__test_fns__load_function@llvm14.snap
similarity index 100%
rename from hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__load_function@llvm14.snap
rename to hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__test_fns__load_function@llvm14.snap
diff --git a/hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__load_function@pre-mem2reg@llvm14.snap b/hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__test_fns__load_function@pre-mem2reg@llvm14.snap
similarity index 100%
rename from hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__load_function@pre-mem2reg@llvm14.snap
rename to hugr-llvm/src/emit/snapshots/hugr_llvm__emit__test__test_fns__load_function@pre-mem2reg@llvm14.snap