From e1dd23d96c567985cd5bca53819a6937eba07d37 Mon Sep 17 00:00:00 2001
From: Nicolas Abril <nicolas.abril@protonmail.ch>
Date: Wed, 15 May 2024 00:25:46 +0200
Subject: [PATCH] Update tests to use .bend extension, fix test uite

---
 .gitignore                                        |  1 +
 README.md                                         |  2 --
 examples/merge_sort.bend                          | 15 ---------------
 tests/golden_tests.rs                             |  4 ++--
 tests/golden_tests/cli/compile_all.args           |  2 +-
 .../cli/{compile_all.hvm => compile_all.bend}     |  0
 tests/golden_tests/cli/compile_inline.args        |  2 +-
 .../{compile_inline.hvm => compile_inline.bend}   |  0
 tests/golden_tests/cli/compile_no_opts.args       |  3 +--
 .../{compile_no_opts.hvm => compile_no_opts.bend} |  0
 tests/golden_tests/cli/compile_pre_reduce.args    |  2 +-
 ...ile_pre_reduce.hvm => compile_pre_reduce.bend} |  0
 tests/golden_tests/cli/compile_strict_loop.args   |  2 +-
 ...e_strict_loop.hvm => compile_strict_loop.bend} |  0
 tests/golden_tests/cli/compile_wrong_opt.args     |  2 +-
 ...mpile_wrong_opt.hvm => compile_wrong_opt.bend} |  0
 tests/golden_tests/cli/debug_list_map.args        |  2 +-
 .../{debug_list_map.hvm => debug_list_map.bend}   |  0
 tests/golden_tests/cli/debug_u60_to_nat.args      |  2 +-
 ...debug_u60_to_nat.hvm => debug_u60_to_nat.bend} |  0
 tests/golden_tests/cli/desugar_bool_scott.args    |  2 +-
 ...gar_bool_scott.hvm => desugar_bool_scott.bend} |  0
 tests/golden_tests/cli/desugar_bool_tagged.args   |  3 ---
 tests/golden_tests/cli/desugar_bool_tagged.hvm    |  3 ---
 .../cli/desugar_float_combinators.args            |  2 +-
 ...inators.hvm => desugar_float_combinators.bend} |  0
 .../cli/desugar_linearize_matches.args            |  2 +-
 ...matches.hvm => desugar_linearize_matches.bend} |  0
 .../cli/desugar_linearize_matches_alt.args        |  2 +-
 ...alt.hvm => desugar_linearize_matches_alt.bend} |  0
 tests/golden_tests/cli/desugar_merge.args         |  2 +-
 .../cli/{desugar_merge.hvm => desugar_merge.bend} |  0
 tests/golden_tests/cli/desugar_prune.args         |  2 +-
 .../cli/{desugar_prune.hvm => desugar_prune.bend} |  0
 tests/golden_tests/cli/run_add.args               |  2 +-
 .../cli/{run_add.hvm => run_add.bend}             |  0
 tests/golden_tests/cli/run_pretty.args            |  2 +-
 .../cli/{run_pretty.hvm => run_pretty.bend}       |  0
 tests/golden_tests/cli/warn_and_err.args          |  2 +-
 .../cli/{warn_and_err.hvm => warn_and_err.bend}   |  0
 .../compile_entrypoint/{foo.hvm => foo.bend}      |  0
 .../{360_no_scope.hvm => 360_no_scope.bend}       |  0
 .../compile_file/{add_args.hvm => add_args.bend}  |  0
 .../compile_file/{addition.hvm => addition.bend}  |  0
 .../{addition_const.hvm => addition_const.bend}   |  0
 .../{ask_outside_do.hvm => ask_outside_do.bend}   |  0
 .../{church_one.hvm => church_one.bend}           |  0
 .../{church_zero.hvm => church_zero.bend}         |  0
 .../{complicated_dup.hvm => complicated_dup.bend} |  0
 .../compile_file/{crlf.hvm => crlf.bend}          |  0
 ...clic_global_lam.hvm => cyclic_global_lam.bend} |  0
 .../{dup_apply.hvm => dup_apply.bend}             |  0
 .../{dup_global_lam.hvm => dup_global_lam.bend}   |  0
 .../{erased_dup.hvm => erased_dup.bend}           |  0
 ...data_def_name.hvm => error_data_def_name.bend} |  0
 .../{error_messages.hvm => error_messages.bend}   |  0
 .../compile_file/{f24_oper.hvm => f24_oper.bend}  |  0
 .../compile_file/{fst_snd.hvm => fst_snd.bend}    |  0
 .../{global_lam.hvm => global_lam.bend}           |  0
 .../{huge_tree.hvm => huge_tree.bend}             |  0
 .../compile_file/{i24_oper.hvm => i24_oper.bend}  |  0
 .../golden_tests/compile_file/{id.hvm => id.bend} |  0
 .../{infer_dup.hvm => infer_dup.bend}             |  0
 .../compile_file/{inlining.hvm => inlining.bend}  |  0
 .../{just_a_name.hvm => just_a_name.bend}         |  0
 .../{just_data.hvm => just_data.bend}             |  0
 .../{just_paren.hvm => just_paren.bend}           |  0
 .../{just_rule_paren.hvm => just_rule_paren.bend} |  0
 ...let_substitution.hvm => let_substitution.bend} |  0
 .../compile_file/{let_tup.hvm => let_tup.bend}    |  0
 .../compile_file/{lets.hvm => lets.bend}          |  0
 .../{long_name.hvm => long_name.bend}             |  0
 .../compile_file/{match.hvm => match.bend}        |  0
 .../{missing_adt_eq.hvm => missing_adt_eq.bend}   |  0
 .../{missing_ctrs.hvm => missing_ctrs.bend}       |  0
 .../{missing_pat.hvm => missing_pat.bend}         |  0
 ...ords.hvm => names_starting_with_keywords.bend} |  0
 ...rong_arity.hvm => nested_ctr_wrong_arity.bend} |  0
 .../{nested_let.hvm => nested_let.bend}           |  0
 ...number_too_large.hvm => number_too_large.bend} |  0
 .../compile_file/{nums.hvm => nums.bend}          |  0
 .../compile_file/{op2.hvm => op2.bend}            |  0
 .../{redex_order.hvm => redex_order.bend}         |  0
 ...r_recursive.hvm => redex_order_recursive.bend} |  0
 .../{ref_to_main.hvm => ref_to_main.bend}         |  0
 .../{ref_to_ref.hvm => ref_to_ref.bend}           |  0
 ...ated_bind_rule.hvm => repeated_bind_rule.bend} |  0
 .../{simple_tup.hvm => simple_tup.bend}           |  0
 ..._all_patterns.hvm => switch_all_patterns.bend} |  0
 ...n_switch_arg.hvm => switch_in_switch_arg.bend} |  0
 ...ped_lambda.hvm => switch_unscoped_lambda.bend} |  0
 .../compile_file/{tup.hvm => tup.bend}            |  0
 .../compile_file/{tup_add.hvm => tup_add.bend}    |  0
 ...unscoped_var.hvm => unbound_unscoped_var.bend} |  0
 .../{unbound_var.hvm => unbound_var.bend}         |  0
 ...bound_var_scope.hvm => unbound_var_scope.bend} |  0
 ..._pattern.hvm => unbound_with_tup_pattern.bend} |  0
 .../{underscore.hvm => underscore.bend}           |  0
 ...cted_top_char.hvm => unexpected_top_char.bend} |  0
 ...unscoped_dup_use.hvm => unscoped_dup_use.bend} |  0
 ...mbinator.hvm => unscoped_supercombinator.bend} |  0
 .../{unused_let.hvm => unused_let.bend}           |  0
 ...nscoped_bind.hvm => unused_unscoped_bind.bend} |  0
 .../{vicious_circles.hvm => vicious_circles.bend} |  0
 .../{warn_and_err.hvm => warn_and_err.bend}       |  0
 ...e_parse_err.hvm => with_clause_parse_err.bend} |  0
 .../{wrong_ctr_arity.hvm => wrong_ctr_arity.bend} |  0
 ...ctr_var_arity.hvm => wrong_ctr_var_arity.bend} |  0
 .../{wrong_nums.hvm => wrong_nums.bend}           |  0
 ...icode_escape.hvm => wrong_unicode_escape.bend} |  0
 .../{addition.hvm => addition.bend}               |  0
 ...addition_var_fst.hvm => addition_var_fst.bend} |  0
 .../{adt_option_and.hvm => adt_option_and.bend}   |  0
 .../{adt_string.hvm => adt_string.bend}           |  0
 .../compile_file_o_all/{and.hvm => and.bend}      |  0
 ..._let.hvm => bad_parens_making_erased_let.bend} |  0
 .../compile_file_o_all/{bool.hvm => bool.bend}    |  0
 .../{cyclic_dup.hvm => cyclic_dup.bend}           |  0
 .../{double_main.hvm => double_main.bend}         |  0
 .../{eta_chain.hvm => eta_chain.bend}             |  0
 .../compile_file_o_all/{ex0.hvm => ex0.bend}      |  0
 .../compile_file_o_all/{ex2.hvm => ex2.bend}      |  0
 .../{example.hvm => example.bend}                 |  0
 .../compile_file_o_all/{exp.hvm => exp.bend}      |  0
 .../compile_file_o_all/{expr.hvm => expr.bend}    |  0
 ...d_match_pred.hvm => extracted_match_pred.bend} |  0
 .../compile_file_o_all/{fst.hvm => fst.bend}      |  0
 .../{fst_fst.hvm => fst_fst.bend}                 |  0
 .../{hvm1_main.hvm => hvm1_main.bend}             |  0
 .../{inline_app.hvm => inline_app.bend}           |  0
 .../{inlining.hvm => inlining.bend}               |  0
 .../{linearize_match.hvm => linearize_match.bend} |  0
 .../{list_merge_sort.hvm => list_merge_sort.bend} |  0
 .../{list_reverse.hvm => list_reverse.bend}       |  0
 .../{long_str_file.hvm => long_str_file.bend}     |  0
 ...haustive.hvm => match_adt_non_exhaustive.bend} |  0
 ...tion.hvm => match_dup_and_reconstruction.bend} |  0
 ...rization.hvm => match_mult_linearization.bend} |  0
 ...icit_bind.hvm => match_num_explicit_bind.bend} |  0
 .../{match_tup.hvm => match_tup.bend}             |  0
 ...rge_definitions.hvm => merge_definitions.bend} |  0
 ...exhaustive_and.hvm => non_exhaustive_and.bend} |  0
 ...es.hvm => non_exhaustive_different_types.bend} |  0
 ...ve_pattern.hvm => non_exhaustive_pattern.bend} |  0
 ...haustive_tree.hvm => non_exhaustive_tree.bend} |  0
 ...ern_with_var.hvm => num_pattern_with_var.bend} |  0
 ...ive.hvm => recursive_combinator_inactive.bend} |  0
 ...trucation.hvm => repeated_name_trucation.bend} |  0
 ...truction.hvm => scrutinee_reconstruction.bend} |  0
 .../{self_ref.hvm => self_ref.bend}               |  0
 .../compile_file_o_all/{snd.hvm => snd.bend}      |  0
 .../{spacing.hvm => spacing.bend}                 |  0
 .../{spacing2.hvm => spacing2.bend}               |  0
 .../compile_file_o_all/{str.hvm => str.bend}      |  0
 .../{sum_predicates.hvm => sum_predicates.bend}   |  0
 .../{tagged_dup.hvm => tagged_dup.bend}           |  0
 .../{tagged_lam.hvm => tagged_lam.bend}           |  0
 .../{tagged_sup.hvm => tagged_sup.bend}           |  0
 .../{unapplied_eta.hvm => unapplied_eta.bend}     |  0
 .../{unscoped_eta.hvm => unscoped_eta.bend}       |  0
 .../{var_shadows_ref.hvm => var_shadows_ref.bend} |  0
 .../{weekday.hvm => weekday.bend}                 |  0
 .../{bitonic_sort.hvm => bitonic_sort.bend}       |  0
 .../{list_reverse.hvm => list_reverse.bend}       |  0
 .../{redex_order.hvm => redex_order.bend}         |  0
 .../{sum_tree.hvm => sum_tree.bend}               |  0
 .../{bind_syntax.hvm => bind_syntax.bend}         |  0
 .../{combinators.hvm => combinators.bend}         |  0
 .../{deref_loop.hvm => deref_loop.bend}           |  0
 ...p_linearization.hvm => dup_linearization.bend} |  0
 ...austive_limit.hvm => non_exaustive_limit.bend} |  0
 .../{switch_with_use.hvm => switch_with_use.bend} |  0
 .../desugar_file/{use_id.hvm => use_id.bend}      |  0
 .../{use_shadow.hvm => use_shadow.bend}           |  0
 .../{used_once_names.hvm => used_once_names.bend} |  0
 .../{adt_tup_era.hvm => adt_tup_era.bend}         |  0
 .../encode_pattern_match/{and3.hvm => and3.bend}  |  0
 .../encode_pattern_match/{bool.hvm => bool.bend}  |  0
 .../{bool_tup.hvm => bool_tup.bend}               |  0
 .../encode_pattern_match/{box.hvm => box.bend}    |  0
 .../{common.hvm => common.bend}                   |  0
 .../{concat.hvm => concat.bend}                   |  0
 .../{concat_def.hvm => concat_def.bend}           |  0
 .../{def_tups.hvm => def_tups.bend}               |  0
 ...definition_merge.hvm => definition_merge.bend} |  0
 .../encode_pattern_match/{expr.hvm => expr.bend}  |  0
 .../{flatten_era_pat.hvm => flatten_era_pat.bend} |  0
 .../{is_some_some.hvm => is_some_some.bend}       |  0
 .../{list_merge_sort.hvm => list_merge_sort.bend} |  0
 ...n.hvm => list_str_encoding_undeclared_fn.bend} |  0
 ....hvm => list_str_encoding_undeclared_map.bend} |  0
 ..._in_arm.hvm => match_adt_unscoped_in_arm.bend} |  0
 ..._lambda.hvm => match_adt_unscoped_lambda.bend} |  0
 ...scoped_var.hvm => match_adt_unscoped_var.bend} |  0
 ...rization.hvm => match_auto_linearization.bend} |  0
 .../{match_bind.hvm => match_bind.bend}           |  0
 ...p_parser.hvm => match_num_adt_tup_parser.bend} |  0
 .../{match_num_pred.hvm => match_num_pred.bend}   |  0
 .../{match_syntax.hvm => match_syntax.bend}       |  0
 .../{merge_recursive.hvm => merge_recursive.bend} |  0
 .../{no_patterns.hvm => no_patterns.bend}         |  0
 ...hing_fst_arg.hvm => non_matching_fst_arg.bend} |  0
 .../{ntup_sum.hvm => ntup_sum.bend}               |  0
 ...h_encoding.hvm => pattern_match_encoding.bend} |  0
 ...n_switch_arg.hvm => switch_in_switch_arg.bend} |  0
 .../{var_only.hvm => var_only.bend}               |  0
 .../{weekday.hvm => weekday.bend}                 |  0
 ..._unscoped.hvm => recursive_with_unscoped.bend} |  0
 tests/golden_tests/io/{load.hvm => load.bend}     |  0
 .../io/{load_fail.hvm => load_fail.bend}          |  0
 tests/golden_tests/io/{store.hvm => store.bend}   |  0
 .../io/{store_fail.hvm => store_fail.bend}        |  0
 .../{church_mul.hvm => church_mul.bend}           |  0
 .../mutual_recursion/{a_b_c.hvm => a_b_c.bend}    |  0
 .../mutual_recursion/{len.hvm => len.bend}        |  0
 .../mutual_recursion/{merged.hvm => merged.bend}  |  0
 .../{multiple.hvm => multiple.bend}               |  0
 .../{odd_even.hvm => odd_even.bend}               |  0
 .../parse_file/{imp_map.hvm => imp_map.bend}      |  0
 .../{imp_program.hvm => imp_program.bend}         |  0
 ...peated_adt_name.hvm => repeated_adt_name.bend} |  0
 .../{scape_chars.hvm => scape_chars.bend}         |  0
 .../readback_lnet/{addition.hvm => addition.bend} |  0
 .../readback_lnet/{bad_net.hvm => bad_net.bend}   |  0
 .../readback_lnet/{bad_net1.hvm => bad_net1.bend} |  0
 .../readback_lnet/{bad_net3.hvm => bad_net3.bend} |  0
 .../{complicated_dup.hvm => complicated_dup.bend} |  0
 .../readback_lnet/{fst_snd.hvm => fst_snd.bend}   |  0
 .../readback_lnet/{id.hvm => id.bend}             |  0
 .../{invalid_op2_op2.hvm => invalid_op2_op2.bend} |  0
 .../readback_lnet/{match.hvm => match.bend}       |  0
 .../{nested_let.hvm => nested_let.bend}           |  0
 .../{nested_tup.hvm => nested_tup.bend}           |  0
 .../readback_lnet/{number.hvm => number.bend}     |  0
 .../{simple_tup.hvm => simple_tup.bend}           |  0
 .../readback_lnet/{tup_add.hvm => tup_add.bend}   |  0
 .../run_entrypoint/{foo.hvm => foo.bend}          |  0
 .../{360_no_scope.hvm => 360_no_scope.bend}       |  0
 .../run_file/{addition.hvm => addition.bend}      |  0
 .../run_file/{adt_match.hvm => adt_match.bend}    |  0
 ...tch_wrong_tag.hvm => adt_match_wrong_tag.bend} |  0
 .../{adt_option_and.hvm => adt_option_and.bend}   |  0
 .../{adt_wrong_tag.hvm => adt_wrong_tag.bend}     |  0
 tests/golden_tests/run_file/{and.hvm => and.bend} |  0
 .../run_file/{bend_fold.hvm => bend_fold.bend}    |  0
 .../{bitonic_sort.hvm => bitonic_sort.bend}       |  0
 ...bitonic_sort_lam.hvm => bitonic_sort_lam.bend} |  0
 tests/golden_tests/run_file/{box.hvm => box.bend} |  0
 ...ment.hvm => branch_statements_assignment.bend} |  0
 .../run_file/{callcc.hvm => callcc.bend}          |  0
 .../run_file/{chars.hvm => chars.bend}            |  0
 .../{chars_forall.hvm => chars_forall.bend}       |  0
 .../{chars_lambda.hvm => chars_lambda.bend}       |  0
 .../{def_bool_num.hvm => def_bool_num.bend}       |  0
 .../{def_num_bool.hvm => def_num_bool.bend}       |  0
 .../run_file/{def_tups.hvm => def_tups.bend}      |  0
 .../{do_block_mixed.hvm => do_block_mixed.bend}   |  0
 .../{dup_global_lam.hvm => dup_global_lam.bend}   |  0
 .../run_file/{empty.hvm => empty.bend}            |  0
 ...ed_side_effect.hvm => erased_side_effect.bend} |  0
 ...escape_sequences.hvm => escape_sequences.bend} |  0
 tests/golden_tests/run_file/{eta.hvm => eta.bend} |  0
 .../run_file/{example.hvm => example.bend}        |  0
 tests/golden_tests/run_file/{exp.hvm => exp.bend} |  0
 ...d_match_pred.hvm => extracted_match_pred.bend} |  0
 ...vectorization.hvm => field_vectorization.bend} |  0
 .../{id_underscore.hvm => id_underscore.bend}     |  0
 ...d_tree_sum.hvm => kind_compiled_tree_sum.bend} |  0
 .../run_file/{lam_op2.hvm => lam_op2.bend}        |  0
 .../{lam_op2_nested.hvm => lam_op2_nested.bend}   |  0
 ...let_tup_readback.hvm => let_tup_readback.bend} |  0
 .../{linearize_match.hvm => linearize_match.bend} |  0
 .../{list_resugar.hvm => list_resugar.bend}       |  0
 .../{list_reverse.hvm => list_reverse.bend}       |  0
 .../run_file/{list_take.hvm => list_take.bend}    |  0
 .../{list_to_tree.hvm => list_to_tree.bend}       |  0
 .../run_file/{match.hvm => match.bend}            |  0
 .../{match_builtins.hvm => match_builtins.bend}   |  0
 ...rization.hvm => match_mult_linearization.bend} |  0
 ...p_parser.hvm => match_num_adt_tup_parser.bend} |  0
 ...icit_bind.hvm => match_num_explicit_bind.bend} |  0
 ...num_to_char.hvm => match_num_num_to_char.bend} |  0
 ...cc_complex.hvm => match_num_succ_complex.bend} |  0
 .../run_file/{match_str.hvm => match_str.bend}    |  0
 .../run_file/{match_sup.hvm => match_sup.bend}    |  0
 .../run_file/{match_vars.hvm => match_vars.bend}  |  0
 .../run_file/{merge_sort.hvm => merge_sort.bend}  |  0
 .../{mixed_syntax.hvm => mixed_syntax.bend}       |  0
 .../{names_hyphen.hvm => names_hyphen.bend}       |  0
 ...en_toplevel.hvm => names_hyphen_toplevel.bend} |  0
 .../run_file/{nat_add.hvm => nat_add.bend}        |  0
 .../{nat_add_num.hvm => nat_add_num.bend}         |  0
 ...and_string.hvm => nested_list_and_string.bend} |  0
 .../run_file/{nested_str.hvm => nested_str.bend}  |  0
 ...missing_var.hvm => num_match_missing_var.bend} |  0
 .../run_file/{num_pred.hvm => num_pred.bend}      |  0
 ...erride_list_ctr.hvm => override_list_ctr.bend} |  0
 ...override_str_ctr.hvm => override_str_ctr.bend} |  0
 .../golden_tests/run_file/{pred.hvm => pred.bend} |  0
 .../run_file/{queue.hvm => queue.bend}            |  0
 .../{radix_sort_ctr.hvm => radix_sort_ctr.bend}   |  0
 ...back_hvm1_main.hvm => readback_hvm1_main.bend} |  0
 ...other_ctr.hvm => readback_list_other_ctr.bend} |  0
 .../{recursive_bind.hvm => recursive_bind.bend}   |  0
 ...e_combinator.hvm => recursive_combinator.bend} |  0
 ...ested.hvm => recursive_combinator_nested.bend} |  0
 ...tch_native.hvm => recursive_match_native.bend} |  0
 .../{ref_resolution.hvm => ref_resolution.bend}   |  0
 ...uncation.hvm => repeated_name_truncation.bend} |  0
 ...opeless_discard.hvm => scopeless_discard.bend} |  0
 .../run_file/{str_concat.hvm => str_concat.bend}  |  0
 .../run_file/{str_inc.hvm => str_inc.bend}        |  0
 .../{str_inc_eta.hvm => str_inc_eta.bend}         |  0
 .../run_file/{str_len.hvm => str_len.bend}        |  0
 .../run_file/{sum_tree.hvm => sum_tree.bend}      |  0
 .../run_file/{sup_app.hvm => sup_app.bend}        |  0
 .../golden_tests/run_file/sup_reconstruction.bend |  1 +
 ...rposed_is_even.hvm => superposed_is_even.bend} |  0
 .../run_file/{tagged_lam.hvm => tagged_lam.bend}  |  0
 ...tup_list_strings.hvm => tup_list_strings.bend} |  0
 ...reconstruction.hvm => tup_reconstruction.bend} |  0
 .../run_file/{tuple_rots.hvm => tuple_rots.bend}  |  0
 .../{unaplied_str.hvm => unaplied_str.bend}       |  0
 ...ed_never_used.hvm => unscoped_never_used.bend} |  0
 .../{unused_dup_var.hvm => unused_dup_var.bend}   |  0
 .../run_file/{world.hvm => world.bend}            |  0
 .../{wrong_string.hvm => wrong_string.bend}       |  0
 .../run_lazy/{addition.hvm => addition.bend}      |  0
 .../run_lazy/{adt_match.hvm => adt_match.bend}    |  0
 ...tch_wrong_tag.hvm => adt_match_wrong_tag.bend} |  0
 .../{adt_option_and.hvm => adt_option_and.bend}   |  0
 .../{adt_wrong_tag.hvm => adt_wrong_tag.bend}     |  0
 tests/golden_tests/run_lazy/{and.hvm => and.bend} |  0
 .../{bitonic_sort.hvm => bitonic_sort.bend}       |  0
 ...bitonic_sort_lam.hvm => bitonic_sort_lam.bend} |  0
 tests/golden_tests/run_lazy/{box.hvm => box.bend} |  0
 .../golden_tests/run_lazy/{box2.hvm => box2.bend} |  0
 .../run_lazy/{callcc.hvm => callcc.bend}          |  0
 .../run_lazy/{chars.hvm => chars.bend}            |  0
 .../run_lazy/{def_tups.hvm => def_tups.bend}      |  0
 .../{dup_global_lam.hvm => dup_global_lam.bend}   |  0
 tests/golden_tests/run_lazy/{eta.hvm => eta.bend} |  0
 .../run_lazy/{example.hvm => example.bend}        |  0
 tests/golden_tests/run_lazy/{exp.hvm => exp.bend} |  0
 ...d_match_pred.hvm => extracted_match_pred.bend} |  0
 ...vectorization.hvm => field_vectorization.bend} |  0
 .../run_lazy/{lam_op2.hvm => lam_op2.bend}        |  0
 .../{lam_op2_nested.hvm => lam_op2_nested.bend}   |  0
 ...let_tup_readback.hvm => let_tup_readback.bend} |  0
 .../{linearize_match.hvm => linearize_match.bend} |  0
 .../{list_resugar.hvm => list_resugar.bend}       |  0
 .../{list_reverse.hvm => list_reverse.bend}       |  0
 .../run_lazy/{list_take.hvm => list_take.bend}    |  0
 .../{list_to_tree.hvm => list_to_tree.bend}       |  0
 .../run_lazy/{match.hvm => match.bend}            |  0
 .../{match_builtins.hvm => match_builtins.bend}   |  0
 ...rization.hvm => match_mult_linearization.bend} |  0
 ...icit_bind.hvm => match_num_explicit_bind.bend} |  0
 .../run_lazy/{merge_sort.hvm => merge_sort.bend}  |  0
 ...and_string.hvm => nested_list_and_string.bend} |  0
 .../run_lazy/{nested_str.hvm => nested_str.bend}  |  0
 .../run_lazy/{num_pred.hvm => num_pred.bend}      |  0
 .../run_lazy/{queue.hvm => queue.bend}            |  0
 .../{radix_sort_ctr.hvm => radix_sort_ctr.bend}   |  0
 ...tch_native.hvm => recursive_match_native.bend} |  0
 ...opeless_discard.hvm => scopeless_discard.bend} |  0
 .../run_lazy/{str_concat.hvm => str_concat.bend}  |  0
 .../run_lazy/{str_inc.hvm => str_inc.bend}        |  0
 .../{str_inc_eta.hvm => str_inc_eta.bend}         |  0
 .../run_lazy/{str_len.hvm => str_len.bend}        |  0
 .../run_lazy/{sum_tree.hvm => sum_tree.bend}      |  0
 .../run_lazy/{sup_app.hvm => sup_app.bend}        |  0
 .../sup_reconstruction.bend}                      |  0
 .../golden_tests/run_lazy/sup_reconstruction.hvm  |  1 -
 ...rposed_is_even.hvm => superposed_is_even.bend} |  0
 .../run_lazy/{tagged_lam.hvm => tagged_lam.bend}  |  0
 ...reconstruction.hvm => tup_reconstruction.bend} |  0
 .../run_lazy/{tuple_rots.hvm => tuple_rots.bend}  |  0
 .../{unaplied_str.hvm => unaplied_str.bend}       |  0
 .../{unused_dup_var.hvm => unused_dup_var.bend}   |  0
 .../run_lazy/{world.hvm => world.bend}            |  0
 .../{wrong_string.hvm => wrong_string.bend}       |  0
 .../scott_triggers_unused/{test.hvm => test.bend} |  0
 .../{adt_tup_era.hvm => adt_tup_era.bend}         |  0
 .../{already_flat.hvm => already_flat.bend}       |  0
 .../{bits_dec.hvm => bits_dec.bend}               |  0
 ...mplex_with_case.hvm => complex_with_case.bend} |  0
 ...uble_unwrap_box.hvm => double_unwrap_box.bend} |  0
 ..._unwrap_maybe.hvm => double_unwrap_maybe.bend} |  0
 ...th_terminal.hvm => flatten_with_terminal.bend} |  0
 ...ize_match_all.hvm => linearize_match_all.bend} |  0
 .../{match_str.hvm => match_str.bend}             |  0
 .../simplify_matches/{nested.hvm => nested.bend}  |  0
 .../{nested2.hvm => nested2.bend}                 |  0
 .../{nested_0ary.hvm => nested_0ary.bend}         |  0
 ...ndant_with_era.hvm => redundant_with_era.bend} |  0
 .../{wrong_fn_arity.hvm => wrong_fn_arity.bend}   |  0
 ...le_all.hvm.snap => cli__compile_all.bend.snap} |  2 +-
 ...ine.hvm.snap => cli__compile_inline.bend.snap} |  2 +-
 tests/snapshots/cli__compile_no_opts.bend.snap    |  5 +++++
 tests/snapshots/cli__compile_no_opts.hvm.snap     | 10 ----------
 ...hvm.snap => cli__compile_pre_reduce.bend.snap} |  2 +-
 ...vm.snap => cli__compile_strict_loop.bend.snap} |  2 +-
 ....hvm.snap => cli__compile_wrong_opt.bend.snap} |  2 +-
 ...map.hvm.snap => cli__debug_list_map.bend.snap} |  2 +-
 ...t.hvm.snap => cli__debug_u60_to_nat.bend.snap} |  2 +-
 ...hvm.snap => cli__desugar_bool_scott.bend.snap} |  2 +-
 tests/snapshots/cli__desugar_bool_tagged.hvm.snap |  8 --------
 ...p => cli__desugar_float_combinators.bend.snap} |  2 +-
 ...p => cli__desugar_linearize_matches.bend.snap} |  2 +-
 ... cli__desugar_linearize_matches_alt.bend.snap} |  2 +-
 .../cli__desugar_linearize_matches_extra.hvm.snap |  5 -----
 ...erge.hvm.snap => cli__desugar_merge.bend.snap} |  2 +-
 tests/snapshots/cli__desugar_prune.bend.snap      |  5 +++++
 tests/snapshots/cli__desugar_prune.hvm.snap       |  5 -----
 ...i__run_add.hvm.snap => cli__run_add.bend.snap} |  2 +-
 ..._pretty.hvm.snap => cli__run_pretty.bend.snap} |  2 +-
 ...d_err.hvm.snap => cli__warn_and_err.bend.snap} |  2 +-
 ...hvm.snap => compile_entrypoint__foo.bend.snap} |  2 +-
 ....snap => compile_file__360_no_scope.bend.snap} |  4 ++--
 ....hvm.snap => compile_file__add_args.bend.snap} |  2 +-
 ....hvm.snap => compile_file__addition.bend.snap} |  2 +-
 ...nap => compile_file__addition_const.bend.snap} |  2 +-
 ...nap => compile_file__ask_outside_do.bend.snap} |  2 +-
 ...vm.snap => compile_file__church_one.bend.snap} |  2 +-
 .../snapshots/compile_file__church_zero.bend.snap |  5 +++++
 .../snapshots/compile_file__church_zero.hvm.snap  |  5 -----
 ...ap => compile_file__complicated_dup.bend.snap} |  2 +-
 ...crlf.hvm.snap => compile_file__crlf.bend.snap} |  2 +-
 ... => compile_file__cyclic_global_lam.bend.snap} |  2 +-
 ...hvm.snap => compile_file__dup_apply.bend.snap} |  2 +-
 ...nap => compile_file__dup_global_lam.bend.snap} |  2 +-
 .../snapshots/compile_file__erased_dup.bend.snap  |  5 +++++
 tests/snapshots/compile_file__erased_dup.hvm.snap |  5 -----
 ...> compile_file__error_data_def_name.bend.snap} |  2 +-
 ...nap => compile_file__error_messages.bend.snap} |  2 +-
 ....hvm.snap => compile_file__f24_oper.bend.snap} |  2 +-
 ...d.hvm.snap => compile_file__fst_snd.bend.snap} |  2 +-
 ...vm.snap => compile_file__global_lam.bend.snap} |  2 +-
 ...hvm.snap => compile_file__huge_tree.bend.snap} |  2 +-
 ....hvm.snap => compile_file__i24_oper.bend.snap} |  2 +-
 ...le__id.hvm.snap => compile_file__id.bend.snap} |  2 +-
 ...hvm.snap => compile_file__infer_dup.bend.snap} |  2 +-
 ....hvm.snap => compile_file__inlining.bend.snap} |  2 +-
 ...m.snap => compile_file__just_a_name.bend.snap} |  4 ++--
 ...hvm.snap => compile_file__just_data.bend.snap} |  4 ++--
 ...vm.snap => compile_file__just_paren.bend.snap} |  4 ++--
 ...ap => compile_file__just_rule_paren.bend.snap} |  4 ++--
 .../compile_file__let_substitution.bend.snap      |  5 +++++
 .../compile_file__let_substitution.hvm.snap       |  5 -----
 ...p.hvm.snap => compile_file__let_tup.bend.snap} |  2 +-
 ...lets.hvm.snap => compile_file__lets.bend.snap} |  2 +-
 ...hvm.snap => compile_file__long_name.bend.snap} |  2 +-
 ...tch.hvm.snap => compile_file__match.bend.snap} |  2 +-
 ...nap => compile_file__missing_adt_eq.bend.snap} |  4 ++--
 ....snap => compile_file__missing_ctrs.bend.snap} |  4 ++--
 ...m.snap => compile_file__missing_pat.bend.snap} |  4 ++--
 ..._file__names_starting_with_keywords.bend.snap} |  2 +-
 ...ompile_file__nested_ctr_wrong_arity.bend.snap} |  2 +-
 ...vm.snap => compile_file__nested_let.bend.snap} |  2 +-
 ...p => compile_file__number_too_large.bend.snap} |  4 ++--
 ...nums.hvm.snap => compile_file__nums.bend.snap} |  2 +-
 ...__op2.hvm.snap => compile_file__op2.bend.snap} |  2 +-
 ...m.snap => compile_file__redex_order.bend.snap} |  2 +-
 ...compile_file__redex_order_recursive.bend.snap} |  2 +-
 ...m.snap => compile_file__ref_to_main.bend.snap} |  2 +-
 ...vm.snap => compile_file__ref_to_ref.bend.snap} |  2 +-
 ...=> compile_file__repeated_bind_rule.bend.snap} |  2 +-
 .../snapshots/compile_file__simple_tup.bend.snap  |  5 +++++
 tests/snapshots/compile_file__simple_tup.hvm.snap |  5 -----
 ...> compile_file__switch_all_patterns.bend.snap} |  4 ++--
 ... compile_file__switch_in_switch_arg.bend.snap} |  2 +-
 ...ompile_file__switch_unscoped_lambda.bend.snap} |  2 +-
 ...__tup.hvm.snap => compile_file__tup.bend.snap} |  2 +-
 ...d.hvm.snap => compile_file__tup_add.bend.snap} |  2 +-
 ... compile_file__unbound_unscoped_var.bend.snap} |  2 +-
 ...m.snap => compile_file__unbound_var.bend.snap} |  2 +-
 ... => compile_file__unbound_var_scope.bend.snap} |  2 +-
 ...pile_file__unbound_with_tup_pattern.bend.snap} |  2 +-
 ...vm.snap => compile_file__underscore.bend.snap} |  2 +-
 ...> compile_file__unexpected_top_char.bend.snap} |  4 ++--
 ...p => compile_file__unscoped_dup_use.bend.snap} |  2 +-
 ...pile_file__unscoped_supercombinator.bend.snap} |  2 +-
 ...vm.snap => compile_file__unused_let.bend.snap} |  2 +-
 ... compile_file__unused_unscoped_bind.bend.snap} |  2 +-
 ...ap => compile_file__vicious_circles.bend.snap} |  2 +-
 ....snap => compile_file__warn_and_err.bend.snap} |  2 +-
 ...compile_file__with_clause_parse_err.bend.snap} |  4 ++--
 ...ap => compile_file__wrong_ctr_arity.bend.snap} |  2 +-
 ...> compile_file__wrong_ctr_var_arity.bend.snap} |  2 +-
 ...vm.snap => compile_file__wrong_nums.bend.snap} |  4 ++--
 ... compile_file__wrong_unicode_escape.bend.snap} |  4 ++--
 ...nap => compile_file_o_all__addition.bend.snap} |  2 +-
 ...ompile_file_o_all__addition_var_fst.bend.snap} |  2 +-
 ... compile_file_o_all__adt_option_and.bend.snap} |  2 +-
 ...p => compile_file_o_all__adt_string.bend.snap} |  4 ++--
 ...hvm.snap => compile_file_o_all__and.bend.snap} |  2 +-
 ...o_all__bad_parens_making_erased_let.bend.snap} |  2 +-
 ...vm.snap => compile_file_o_all__bool.bend.snap} |  2 +-
 ...p => compile_file_o_all__cyclic_dup.bend.snap} |  2 +-
 ... => compile_file_o_all__double_main.bend.snap} |  2 +-
 ...ap => compile_file_o_all__eta_chain.bend.snap} |  2 +-
 ...hvm.snap => compile_file_o_all__ex0.bend.snap} |  2 +-
 ...hvm.snap => compile_file_o_all__ex2.bend.snap} |  2 +-
 ...snap => compile_file_o_all__example.bend.snap} |  2 +-
 ...hvm.snap => compile_file_o_all__exp.bend.snap} |  2 +-
 ...vm.snap => compile_file_o_all__expr.bend.snap} |  2 +-
 ...le_file_o_all__extracted_match_pred.bend.snap} |  2 +-
 ...hvm.snap => compile_file_o_all__fst.bend.snap} |  2 +-
 ...snap => compile_file_o_all__fst_fst.bend.snap} |  2 +-
 .../compile_file_o_all__hvm1_main.bend.snap       |  5 +++++
 .../compile_file_o_all__hvm1_main.hvm.snap        |  5 -----
 ...p => compile_file_o_all__inline_app.bend.snap} |  2 +-
 ...nap => compile_file_o_all__inlining.bend.snap} |  2 +-
 ...compile_file_o_all__linearize_match.bend.snap} |  2 +-
 ...compile_file_o_all__list_merge_sort.bend.snap} |  2 +-
 ...=> compile_file_o_all__list_reverse.bend.snap} |  2 +-
 ...> compile_file_o_all__long_str_file.bend.snap} |  2 +-
 ...ile_o_all__match_adt_non_exhaustive.bend.snap} |  2 +-
 ...o_all__match_dup_and_reconstruction.bend.snap} |  2 +-
 ...ile_o_all__match_mult_linearization.bend.snap} |  2 +-
 ...file_o_all__match_num_explicit_bind.bend.snap} |  2 +-
 ...ap => compile_file_o_all__match_tup.bend.snap} |  2 +-
 ...mpile_file_o_all__merge_definitions.bend.snap} |  2 +-
 ...pile_file_o_all__non_exhaustive_and.bend.snap} |  2 +-
 ...all__non_exhaustive_different_types.bend.snap} |  2 +-
 ..._file_o_all__non_exhaustive_pattern.bend.snap} |  2 +-
 ...ile_file_o_all__non_exhaustive_tree.bend.snap} |  2 +-
 ...le_file_o_all__num_pattern_with_var.bend.snap} |  2 +-
 ..._all__recursive_combinator_inactive.bend.snap} |  2 +-
 ...file_o_all__repeated_name_trucation.bend.snap} |  2 +-
 ...ile_o_all__scrutinee_reconstruction.bend.snap} |  2 +-
 ...nap => compile_file_o_all__self_ref.bend.snap} |  2 +-
 ...hvm.snap => compile_file_o_all__snd.bend.snap} |  2 +-
 ...snap => compile_file_o_all__spacing.bend.snap} |  2 +-
 ...nap => compile_file_o_all__spacing2.bend.snap} |  2 +-
 ...hvm.snap => compile_file_o_all__str.bend.snap} |  2 +-
 ... compile_file_o_all__sum_predicates.bend.snap} |  2 +-
 ...p => compile_file_o_all__tagged_dup.bend.snap} |  4 ++--
 ...p => compile_file_o_all__tagged_lam.bend.snap} |  4 ++--
 ...p => compile_file_o_all__tagged_sup.bend.snap} |  4 ++--
 ...> compile_file_o_all__unapplied_eta.bend.snap} |  2 +-
 .../compile_file_o_all__unscoped_eta.bend.snap    |  5 +++++
 .../compile_file_o_all__unscoped_eta.hvm.snap     |  5 -----
 ...compile_file_o_all__var_shadows_ref.bend.snap} |  2 +-
 ...snap => compile_file_o_all__weekday.bend.snap} |  2 +-
 ...compile_file_o_no_all__bitonic_sort.bend.snap} |  2 +-
 ...compile_file_o_no_all__list_reverse.bend.snap} |  2 +-
 ... compile_file_o_no_all__redex_order.bend.snap} |  2 +-
 ... => compile_file_o_no_all__sum_tree.bend.snap} |  2 +-
 ...m.snap => desugar_file__bind_syntax.bend.snap} |  2 +-
 ...m.snap => desugar_file__combinators.bend.snap} |  2 +-
 ...vm.snap => desugar_file__deref_loop.bend.snap} |  2 +-
 ... => desugar_file__dup_linearization.bend.snap} |  2 +-
 ...> desugar_file__non_exaustive_limit.bend.snap} |  2 +-
 ...ap => desugar_file__switch_with_use.bend.snap} |  2 +-
 ...id.hvm.snap => desugar_file__use_id.bend.snap} |  2 +-
 ...vm.snap => desugar_file__use_shadow.bend.snap} |  2 +-
 ...ap => desugar_file__used_once_names.bend.snap} |  2 +-
 ...> encode_pattern_match__adt_tup_era.bend.snap} |  2 +-
 ....snap => encode_pattern_match__and3.bend.snap} |  2 +-
 ....snap => encode_pattern_match__bool.bend.snap} |  2 +-
 ...p => encode_pattern_match__bool_tup.bend.snap} |  2 +-
 ...m.snap => encode_pattern_match__box.bend.snap} |  2 +-
 ...nap => encode_pattern_match__common.bend.snap} |  2 +-
 ...nap => encode_pattern_match__concat.bend.snap} |  2 +-
 ...=> encode_pattern_match__concat_def.bend.snap} |  2 +-
 ...p => encode_pattern_match__def_tups.bend.snap} |  2 +-
 ...ode_pattern_match__definition_merge.bend.snap} |  2 +-
 ....snap => encode_pattern_match__expr.bend.snap} |  2 +-
 ...code_pattern_match__flatten_era_pat.bend.snap} |  2 +-
 ... encode_pattern_match__is_some_some.bend.snap} |  2 +-
 ...code_pattern_match__list_merge_sort.bend.snap} |  2 +-
 ...ch__list_str_encoding_undeclared_fn.bend.snap} |  2 +-
 ...h__list_str_encoding_undeclared_map.bend.snap} |  2 +-
 ...rn_match__match_adt_unscoped_in_arm.bend.snap} |  2 +-
 ...rn_match__match_adt_unscoped_lambda.bend.snap} |  2 +-
 ...ttern_match__match_adt_unscoped_var.bend.snap} |  2 +-
 ...ern_match__match_auto_linearization.bend.snap} |  2 +-
 ...=> encode_pattern_match__match_bind.bend.snap} |  2 +-
 ...ern_match__match_num_adt_tup_parser.bend.snap} |  2 +-
 ...ncode_pattern_match__match_num_pred.bend.snap} |  2 +-
 ... encode_pattern_match__match_syntax.bend.snap} |  2 +-
 ...code_pattern_match__merge_recursive.bend.snap} |  2 +-
 ...> encode_pattern_match__no_patterns.bend.snap} |  2 +-
 ...pattern_match__non_matching_fst_arg.bend.snap} |  2 +-
 ...p => encode_pattern_match__ntup_sum.bend.snap} |  2 +-
 ...ttern_match__pattern_match_encoding.bend.snap} |  2 +-
 ...pattern_match__switch_in_switch_arg.bend.snap} |  2 +-
 ...p => encode_pattern_match__var_only.bend.snap} |  2 +-
 ...ap => encode_pattern_match__weekday.bend.snap} |  2 +-
 ...tree.hvm.snap => examples__all_tree.bend.snap} |  2 +-
 .../examples__alloc_small_tree.bend.snap          |  5 +++++
 .../snapshots/examples__alloc_small_tree.hvm.snap |  5 -----
 ....hvm.snap => examples__bitonic_sort.bend.snap} |  2 +-
 ...t.hvm.snap => examples__bubble_sort.bend.snap} |  2 +-
 ...callcc.hvm.snap => examples__callcc.bend.snap} |  2 +-
 ...ample.hvm.snap => examples__example.bend.snap} |  2 +-
 ...ples__fib.hvm.snap => examples__fib.bend.snap} |  2 +-
 ...dd.hvm.snap => examples__fusing_add.bend.snap} |  2 +-
 ...ot.hvm.snap => examples__fusing_not.bend.snap} |  2 +-
 ...tree.hvm.snap => examples__gen_tree.bend.snap} |  2 +-
 tests/snapshots/examples__hello_world.hvm.snap    |  5 -----
 ...on.hvm.snap => examples__neg_fusion.bend.snap} |  2 +-
 tests/snapshots/examples__queue.bend.snap         |  5 +++++
 tests/snapshots/examples__queue.hvm.snap          |  5 -----
 ...rt.hvm.snap => examples__quick_sort.bend.snap} |  2 +-
 ...rt.hvm.snap => examples__radix_sort.bend.snap} |  2 +-
 tests/snapshots/examples__sat_solver.hvm.snap     |  5 -----
 .../hangs__recursive_with_unscoped.hvm.snap       |  5 -----
 tests/snapshots/io__load.hvm.snap                 |  8 --------
 tests/snapshots/io__load_fail.hvm.snap            |  8 --------
 tests/snapshots/io__store.hvm.snap                |  8 --------
 tests/snapshots/io__store_fail.hvm.snap           |  8 --------
 ...snap => linear_readback__church_mul.bend.snap} |  2 +-
 ...hvm.snap => mutual_recursion__a_b_c.bend.snap} |  2 +-
 ...n.hvm.snap => mutual_recursion__len.bend.snap} |  2 +-
 ...vm.snap => mutual_recursion__merged.bend.snap} |  2 +-
 ....snap => mutual_recursion__multiple.bend.snap} |  2 +-
 ....snap => mutual_recursion__odd_even.bend.snap} |  2 +-
 ...map.hvm.snap => parse_file__imp_map.bend.snap} |  2 +-
 ...hvm.snap => parse_file__imp_program.bend.snap} |  2 +-
 ...ap => parse_file__repeated_adt_name.bend.snap} |  4 ++--
 ...hvm.snap => parse_file__scape_chars.bend.snap} |  2 +-
 tests/snapshots/readback_lnet__addition.bend.snap |  5 +++++
 tests/snapshots/readback_lnet__addition.hvm.snap  |  5 -----
 ....hvm.snap => readback_lnet__bad_net.bend.snap} |  2 +-
 tests/snapshots/readback_lnet__bad_net1.bend.snap |  5 +++++
 tests/snapshots/readback_lnet__bad_net1.hvm.snap  |  5 -----
 tests/snapshots/readback_lnet__bad_net3.bend.snap |  5 +++++
 tests/snapshots/readback_lnet__bad_net3.hvm.snap  |  5 -----
 ...p => readback_lnet__complicated_dup.bend.snap} |  2 +-
 ....hvm.snap => readback_lnet__fst_snd.bend.snap} |  2 +-
 tests/snapshots/readback_lnet__id.bend.snap       |  5 +++++
 tests/snapshots/readback_lnet__id.hvm.snap        |  5 -----
 ...p => readback_lnet__invalid_op2_op2.bend.snap} |  2 +-
 ...ch.hvm.snap => readback_lnet__match.bend.snap} |  2 +-
 .../snapshots/readback_lnet__nested_let.bend.snap |  5 +++++
 .../snapshots/readback_lnet__nested_let.hvm.snap  |  5 -----
 .../snapshots/readback_lnet__nested_tup.bend.snap |  5 +++++
 .../snapshots/readback_lnet__nested_tup.hvm.snap  |  5 -----
 tests/snapshots/readback_lnet__number.bend.snap   |  5 +++++
 tests/snapshots/readback_lnet__number.hvm.snap    |  5 -----
 .../snapshots/readback_lnet__simple_tup.bend.snap |  5 +++++
 .../snapshots/readback_lnet__simple_tup.hvm.snap  |  5 -----
 tests/snapshots/readback_lnet__tup_add.bend.snap  |  5 +++++
 tests/snapshots/readback_lnet__tup_add.hvm.snap   |  5 -----
 tests/snapshots/run_entrypoint__foo.hvm.snap      |  5 -----
 ....hvm.snap => run_file__360_no_scope.bend.snap} |  4 ++--
 tests/snapshots/run_file__addition.bend.snap      |  5 +++++
 tests/snapshots/run_file__addition.hvm.snap       |  5 -----
 tests/snapshots/run_file__adt_match.bend.snap     |  5 +++++
 tests/snapshots/run_file__adt_match.hvm.snap      |  5 -----
 ...ap => run_file__adt_match_wrong_tag.bend.snap} |  4 ++--
 ...vm.snap => run_file__adt_option_and.bend.snap} |  2 +-
 ...hvm.snap => run_file__adt_wrong_tag.bend.snap} |  4 ++--
 ...file__and.hvm.snap => run_file__and.bend.snap} |  2 +-
 tests/snapshots/run_file__bend_fold.hvm.snap      |  5 -----
 tests/snapshots/run_file__bitonic_sort.bend.snap  |  5 +++++
 tests/snapshots/run_file__bitonic_sort.hvm.snap   |  5 -----
 .../run_file__bitonic_sort_lam.bend.snap          |  5 +++++
 .../snapshots/run_file__bitonic_sort_lam.hvm.snap |  5 -----
 ...file__box.hvm.snap => run_file__box.bend.snap} |  2 +-
 ..._file__branch_statements_assignment.bend.snap} |  2 +-
 tests/snapshots/run_file__callcc.bend.snap        |  5 +++++
 tests/snapshots/run_file__callcc.hvm.snap         |  5 -----
 ...__chars.hvm.snap => run_file__chars.bend.snap} |  2 +-
 tests/snapshots/run_file__chars_forall.bend.snap  |  5 +++++
 tests/snapshots/run_file__chars_forall.hvm.snap   |  5 -----
 tests/snapshots/run_file__chars_lambda.bend.snap  |  5 +++++
 tests/snapshots/run_file__chars_lambda.hvm.snap   |  5 -----
 ....hvm.snap => run_file__def_bool_num.bend.snap} |  2 +-
 ....hvm.snap => run_file__def_num_bool.bend.snap} |  2 +-
 tests/snapshots/run_file__def_tups.bend.snap      |  5 +++++
 tests/snapshots/run_file__def_tups.hvm.snap       |  5 -----
 .../snapshots/run_file__do_block_mixed.bend.snap  |  5 +++++
 tests/snapshots/run_file__do_block_mixed.hvm.snap |  5 -----
 .../snapshots/run_file__dup_global_lam.bend.snap  |  5 +++++
 tests/snapshots/run_file__dup_global_lam.hvm.snap |  5 -----
 ...__empty.hvm.snap => run_file__empty.bend.snap} |  2 +-
 .../run_file__erased_side_effect.bend.snap        |  5 +++++
 .../run_file__erased_side_effect.hvm.snap         |  5 -----
 ....snap => run_file__escape_sequences.bend.snap} |  2 +-
 tests/snapshots/run_file__eta.bend.snap           |  5 +++++
 tests/snapshots/run_file__eta.hvm.snap            |  5 -----
 tests/snapshots/run_file__example.bend.snap       |  5 +++++
 tests/snapshots/run_file__example.hvm.snap        |  5 -----
 ...file__exp.hvm.snap => run_file__exp.bend.snap} |  2 +-
 .../run_file__extracted_match_pred.bend.snap      |  5 +++++
 .../run_file__extracted_match_pred.hvm.snap       |  5 -----
 .../run_file__field_vectorization.bend.snap       |  5 +++++
 .../run_file__field_vectorization.hvm.snap        |  5 -----
 tests/snapshots/run_file__id_underscore.bend.snap |  5 +++++
 tests/snapshots/run_file__id_underscore.hvm.snap  |  5 -----
 .../run_file__kind_compiled_tree_sum.bend.snap    |  5 +++++
 .../run_file__kind_compiled_tree_sum.hvm.snap     |  5 -----
 tests/snapshots/run_file__lam_op2.bend.snap       |  5 +++++
 tests/snapshots/run_file__lam_op2.hvm.snap        |  5 -----
 ...vm.snap => run_file__lam_op2_nested.bend.snap} |  2 +-
 ....snap => run_file__let_tup_readback.bend.snap} |  2 +-
 ...m.snap => run_file__linearize_match.bend.snap} |  2 +-
 ....hvm.snap => run_file__list_resugar.bend.snap} |  2 +-
 ....hvm.snap => run_file__list_reverse.bend.snap} |  2 +-
 ...ake.hvm.snap => run_file__list_take.bend.snap} |  2 +-
 tests/snapshots/run_file__list_to_tree.bend.snap  |  5 +++++
 tests/snapshots/run_file__list_to_tree.hvm.snap   |  5 -----
 tests/snapshots/run_file__log.hvm.snap            | 13 -------------
 tests/snapshots/run_file__match.bend.snap         |  5 +++++
 tests/snapshots/run_file__match.hvm.snap          |  5 -----
 ...vm.snap => run_file__match_builtins.bend.snap} |  2 +-
 ... run_file__match_mult_linearization.bend.snap} |  2 +-
 ... run_file__match_num_adt_tup_parser.bend.snap} |  2 +-
 ...> run_file__match_num_explicit_bind.bend.snap} |  2 +-
 ... => run_file__match_num_num_to_char.bend.snap} |  2 +-
 ...=> run_file__match_num_succ_complex.bend.snap} |  2 +-
 ...str.hvm.snap => run_file__match_str.bend.snap} |  2 +-
 ...sup.hvm.snap => run_file__match_sup.bend.snap} |  4 ++--
 ...rs.hvm.snap => run_file__match_vars.bend.snap} |  2 +-
 tests/snapshots/run_file__merge_sort.bend.snap    |  5 +++++
 tests/snapshots/run_file__merge_sort.hvm.snap     |  5 -----
 tests/snapshots/run_file__mixed_syntax.bend.snap  |  5 +++++
 tests/snapshots/run_file__mixed_syntax.hvm.snap   |  5 -----
 tests/snapshots/run_file__names_hyphen.bend.snap  |  5 +++++
 tests/snapshots/run_file__names_hyphen.hvm.snap   |  5 -----
 .../run_file__names_hyphen_toplevel.bend.snap     |  5 +++++
 .../run_file__names_hyphen_toplevel.hvm.snap      |  5 -----
 ...t_add.hvm.snap => run_file__nat_add.bend.snap} |  2 +-
 ...m.hvm.snap => run_file__nat_add_num.bend.snap} |  2 +-
 ...=> run_file__nested_list_and_string.bend.snap} |  2 +-
 ...tr.hvm.snap => run_file__nested_str.bend.snap} |  2 +-
 ... => run_file__num_match_missing_var.bend.snap} |  4 ++--
 tests/snapshots/run_file__num_pred.bend.snap      |  5 +++++
 tests/snapshots/run_file__num_pred.hvm.snap       |  5 -----
 ...snap => run_file__override_list_ctr.bend.snap} |  2 +-
 ....snap => run_file__override_str_ctr.bend.snap} |  2 +-
 tests/snapshots/run_file__pred.bend.snap          |  5 +++++
 tests/snapshots/run_file__pred.hvm.snap           |  5 -----
 tests/snapshots/run_file__print.hvm.snap          | 11 -----------
 ...__queue.hvm.snap => run_file__queue.bend.snap} |  2 +-
 .../snapshots/run_file__radix_sort_ctr.bend.snap  |  5 +++++
 tests/snapshots/run_file__radix_sort_ctr.hvm.snap |  5 -----
 ...nap => run_file__readback_hvm1_main.bend.snap} |  2 +-
 ...> run_file__readback_list_other_ctr.bend.snap} |  2 +-
 .../snapshots/run_file__recursive_bind.bend.snap  |  5 +++++
 tests/snapshots/run_file__recursive_bind.hvm.snap |  5 -----
 .../run_file__recursive_combinator.bend.snap      |  5 +++++
 .../run_file__recursive_combinator.hvm.snap       |  5 -----
 ...n_file__recursive_combinator_nested.bend.snap} |  4 ++--
 .../run_file__recursive_match_native.bend.snap    |  5 +++++
 .../run_file__recursive_match_native.hvm.snap     |  5 -----
 .../snapshots/run_file__ref_resolution.bend.snap  |  5 +++++
 tests/snapshots/run_file__ref_resolution.hvm.snap |  5 -----
 ... run_file__repeated_name_truncation.bend.snap} |  2 +-
 .../run_file__scopeless_discard.bend.snap         |  5 +++++
 .../run_file__scopeless_discard.hvm.snap          |  5 -----
 ...at.hvm.snap => run_file__str_concat.bend.snap} |  2 +-
 ...r_inc.hvm.snap => run_file__str_inc.bend.snap} |  4 ++--
 ...a.hvm.snap => run_file__str_inc_eta.bend.snap} |  4 ++--
 tests/snapshots/run_file__str_len.bend.snap       |  5 +++++
 tests/snapshots/run_file__str_len.hvm.snap        |  5 -----
 tests/snapshots/run_file__sum_tree.bend.snap      |  5 +++++
 tests/snapshots/run_file__sum_tree.hvm.snap       |  5 -----
 tests/snapshots/run_file__sup_app.bend.snap       |  5 +++++
 tests/snapshots/run_file__sup_app.hvm.snap        |  5 -----
 .../run_file__sup_reconstruction.bend.snap        |  5 +++++
 .../run_file__sup_reconstruction.hvm.snap         |  8 --------
 .../run_file__superposed_is_even.bend.snap        |  5 +++++
 .../run_file__superposed_is_even.hvm.snap         |  5 -----
 ...am.hvm.snap => run_file__tagged_lam.bend.snap} |  4 ++--
 ....snap => run_file__tup_list_strings.bend.snap} |  2 +-
 .../run_file__tup_reconstruction.bend.snap        |  5 +++++
 .../run_file__tup_reconstruction.hvm.snap         |  5 -----
 ...ts.hvm.snap => run_file__tuple_rots.bend.snap} |  2 +-
 ....hvm.snap => run_file__unaplied_str.bend.snap} |  2 +-
 ...ap => run_file__unscoped_never_used.bend.snap} |  2 +-
 .../snapshots/run_file__unused_dup_var.bend.snap  |  5 +++++
 tests/snapshots/run_file__unused_dup_var.hvm.snap |  5 -----
 ...__world.hvm.snap => run_file__world.bend.snap} |  2 +-
 ....hvm.snap => run_file__wrong_string.bend.snap} |  2 +-
 tests/snapshots/run_lazy__addition.hvm.snap       |  5 -----
 tests/snapshots/run_lazy__adt_match.hvm.snap      |  5 -----
 .../run_lazy__adt_match_wrong_tag.hvm.snap        |  9 ---------
 tests/snapshots/run_lazy__adt_option_and.hvm.snap |  5 -----
 tests/snapshots/run_lazy__adt_wrong_tag.hvm.snap  |  9 ---------
 tests/snapshots/run_lazy__and.hvm.snap            |  5 -----
 tests/snapshots/run_lazy__bitonic_sort.hvm.snap   |  5 -----
 .../snapshots/run_lazy__bitonic_sort_lam.hvm.snap |  5 -----
 tests/snapshots/run_lazy__box.hvm.snap            |  5 -----
 tests/snapshots/run_lazy__box2.hvm.snap           |  5 -----
 tests/snapshots/run_lazy__callcc.hvm.snap         |  5 -----
 tests/snapshots/run_lazy__chars.hvm.snap          |  5 -----
 tests/snapshots/run_lazy__def_tups.hvm.snap       |  5 -----
 tests/snapshots/run_lazy__dup_global_lam.hvm.snap |  5 -----
 tests/snapshots/run_lazy__eta.hvm.snap            |  5 -----
 tests/snapshots/run_lazy__example.hvm.snap        |  5 -----
 tests/snapshots/run_lazy__exp.hvm.snap            |  5 -----
 .../run_lazy__extracted_match_pred.hvm.snap       |  5 -----
 .../run_lazy__field_vectorization.hvm.snap        |  5 -----
 tests/snapshots/run_lazy__lam_op2.hvm.snap        |  5 -----
 tests/snapshots/run_lazy__lam_op2_nested.hvm.snap |  5 -----
 .../snapshots/run_lazy__let_tup_readback.hvm.snap |  5 -----
 .../snapshots/run_lazy__linearize_match.hvm.snap  |  5 -----
 tests/snapshots/run_lazy__list_resugar.hvm.snap   |  5 -----
 tests/snapshots/run_lazy__list_reverse.hvm.snap   |  5 -----
 tests/snapshots/run_lazy__list_take.hvm.snap      |  5 -----
 tests/snapshots/run_lazy__list_to_tree.hvm.snap   |  5 -----
 tests/snapshots/run_lazy__match.hvm.snap          |  5 -----
 tests/snapshots/run_lazy__match_builtins.hvm.snap |  5 -----
 .../run_lazy__match_mult_linearization.hvm.snap   |  5 -----
 .../run_lazy__match_num_explicit_bind.hvm.snap    |  5 -----
 tests/snapshots/run_lazy__merge_sort.hvm.snap     |  5 -----
 .../run_lazy__nested_list_and_string.hvm.snap     |  5 -----
 tests/snapshots/run_lazy__nested_str.hvm.snap     |  5 -----
 tests/snapshots/run_lazy__num_pred.hvm.snap       |  5 -----
 tests/snapshots/run_lazy__queue.hvm.snap          |  5 -----
 tests/snapshots/run_lazy__radix_sort_ctr.hvm.snap |  5 -----
 .../run_lazy__recursive_match_native.hvm.snap     |  5 -----
 .../run_lazy__scopeless_discard.hvm.snap          |  5 -----
 tests/snapshots/run_lazy__str_concat.hvm.snap     |  5 -----
 tests/snapshots/run_lazy__str_inc.hvm.snap        |  5 -----
 tests/snapshots/run_lazy__str_inc_eta.hvm.snap    |  5 -----
 tests/snapshots/run_lazy__str_len.hvm.snap        |  5 -----
 tests/snapshots/run_lazy__sum_tree.hvm.snap       |  5 -----
 tests/snapshots/run_lazy__sup_app.hvm.snap        |  5 -----
 .../run_lazy__sup_reconstruction.hvm.snap         |  5 -----
 .../run_lazy__superposed_is_even.hvm.snap         |  5 -----
 tests/snapshots/run_lazy__tagged_lam.hvm.snap     |  5 -----
 .../run_lazy__tup_reconstruction.hvm.snap         |  5 -----
 tests/snapshots/run_lazy__tuple_rots.hvm.snap     |  5 -----
 tests/snapshots/run_lazy__unaplied_str.hvm.snap   |  5 -----
 tests/snapshots/run_lazy__unused_dup_var.hvm.snap |  5 -----
 tests/snapshots/run_lazy__world.hvm.snap          |  5 -----
 tests/snapshots/run_lazy__wrong_string.hvm.snap   |  5 -----
 ...snap => scott_triggers_unused__test.bend.snap} |  2 +-
 ...ap => simplify_matches__adt_tup_era.bend.snap} |  2 +-
 ...p => simplify_matches__already_flat.bend.snap} |  2 +-
 ....snap => simplify_matches__bits_dec.bend.snap} |  2 +-
 ...simplify_matches__complex_with_case.bend.snap} |  2 +-
 ...simplify_matches__double_unwrap_box.bend.snap} |  2 +-
 ...mplify_matches__double_unwrap_maybe.bend.snap} |  2 +-
 ...lify_matches__flatten_with_terminal.bend.snap} |  2 +-
 ...mplify_matches__linearize_match_all.bend.snap} |  2 +-
 ...snap => simplify_matches__match_str.bend.snap} |  2 +-
 ...vm.snap => simplify_matches__nested.bend.snap} |  2 +-
 ...m.snap => simplify_matches__nested2.bend.snap} |  2 +-
 ...ap => simplify_matches__nested_0ary.bend.snap} |  2 +-
 ...implify_matches__redundant_with_era.bend.snap} |  2 +-
 ...=> simplify_matches__wrong_fn_arity.bend.snap} |  2 +-
 848 files changed, 607 insertions(+), 1010 deletions(-)
 delete mode 100644 examples/merge_sort.bend
 rename tests/golden_tests/cli/{compile_all.hvm => compile_all.bend} (100%)
 rename tests/golden_tests/cli/{compile_inline.hvm => compile_inline.bend} (100%)
 rename tests/golden_tests/cli/{compile_no_opts.hvm => compile_no_opts.bend} (100%)
 rename tests/golden_tests/cli/{compile_pre_reduce.hvm => compile_pre_reduce.bend} (100%)
 rename tests/golden_tests/cli/{compile_strict_loop.hvm => compile_strict_loop.bend} (100%)
 rename tests/golden_tests/cli/{compile_wrong_opt.hvm => compile_wrong_opt.bend} (100%)
 rename tests/golden_tests/cli/{debug_list_map.hvm => debug_list_map.bend} (100%)
 rename tests/golden_tests/cli/{debug_u60_to_nat.hvm => debug_u60_to_nat.bend} (100%)
 rename tests/golden_tests/cli/{desugar_bool_scott.hvm => desugar_bool_scott.bend} (100%)
 delete mode 100644 tests/golden_tests/cli/desugar_bool_tagged.args
 delete mode 100644 tests/golden_tests/cli/desugar_bool_tagged.hvm
 rename tests/golden_tests/cli/{desugar_float_combinators.hvm => desugar_float_combinators.bend} (100%)
 rename tests/golden_tests/cli/{desugar_linearize_matches.hvm => desugar_linearize_matches.bend} (100%)
 rename tests/golden_tests/cli/{desugar_linearize_matches_alt.hvm => desugar_linearize_matches_alt.bend} (100%)
 rename tests/golden_tests/cli/{desugar_merge.hvm => desugar_merge.bend} (100%)
 rename tests/golden_tests/cli/{desugar_prune.hvm => desugar_prune.bend} (100%)
 rename tests/golden_tests/cli/{run_add.hvm => run_add.bend} (100%)
 rename tests/golden_tests/cli/{run_pretty.hvm => run_pretty.bend} (100%)
 rename tests/golden_tests/cli/{warn_and_err.hvm => warn_and_err.bend} (100%)
 rename tests/golden_tests/compile_entrypoint/{foo.hvm => foo.bend} (100%)
 rename tests/golden_tests/compile_file/{360_no_scope.hvm => 360_no_scope.bend} (100%)
 rename tests/golden_tests/compile_file/{add_args.hvm => add_args.bend} (100%)
 rename tests/golden_tests/compile_file/{addition.hvm => addition.bend} (100%)
 rename tests/golden_tests/compile_file/{addition_const.hvm => addition_const.bend} (100%)
 rename tests/golden_tests/compile_file/{ask_outside_do.hvm => ask_outside_do.bend} (100%)
 rename tests/golden_tests/compile_file/{church_one.hvm => church_one.bend} (100%)
 rename tests/golden_tests/compile_file/{church_zero.hvm => church_zero.bend} (100%)
 rename tests/golden_tests/compile_file/{complicated_dup.hvm => complicated_dup.bend} (100%)
 rename tests/golden_tests/compile_file/{crlf.hvm => crlf.bend} (100%)
 rename tests/golden_tests/compile_file/{cyclic_global_lam.hvm => cyclic_global_lam.bend} (100%)
 rename tests/golden_tests/compile_file/{dup_apply.hvm => dup_apply.bend} (100%)
 rename tests/golden_tests/compile_file/{dup_global_lam.hvm => dup_global_lam.bend} (100%)
 rename tests/golden_tests/compile_file/{erased_dup.hvm => erased_dup.bend} (100%)
 rename tests/golden_tests/compile_file/{error_data_def_name.hvm => error_data_def_name.bend} (100%)
 rename tests/golden_tests/compile_file/{error_messages.hvm => error_messages.bend} (100%)
 rename tests/golden_tests/compile_file/{f24_oper.hvm => f24_oper.bend} (100%)
 rename tests/golden_tests/compile_file/{fst_snd.hvm => fst_snd.bend} (100%)
 rename tests/golden_tests/compile_file/{global_lam.hvm => global_lam.bend} (100%)
 rename tests/golden_tests/compile_file/{huge_tree.hvm => huge_tree.bend} (100%)
 rename tests/golden_tests/compile_file/{i24_oper.hvm => i24_oper.bend} (100%)
 rename tests/golden_tests/compile_file/{id.hvm => id.bend} (100%)
 rename tests/golden_tests/compile_file/{infer_dup.hvm => infer_dup.bend} (100%)
 rename tests/golden_tests/compile_file/{inlining.hvm => inlining.bend} (100%)
 rename tests/golden_tests/compile_file/{just_a_name.hvm => just_a_name.bend} (100%)
 rename tests/golden_tests/compile_file/{just_data.hvm => just_data.bend} (100%)
 rename tests/golden_tests/compile_file/{just_paren.hvm => just_paren.bend} (100%)
 rename tests/golden_tests/compile_file/{just_rule_paren.hvm => just_rule_paren.bend} (100%)
 rename tests/golden_tests/compile_file/{let_substitution.hvm => let_substitution.bend} (100%)
 rename tests/golden_tests/compile_file/{let_tup.hvm => let_tup.bend} (100%)
 rename tests/golden_tests/compile_file/{lets.hvm => lets.bend} (100%)
 rename tests/golden_tests/compile_file/{long_name.hvm => long_name.bend} (100%)
 rename tests/golden_tests/compile_file/{match.hvm => match.bend} (100%)
 rename tests/golden_tests/compile_file/{missing_adt_eq.hvm => missing_adt_eq.bend} (100%)
 rename tests/golden_tests/compile_file/{missing_ctrs.hvm => missing_ctrs.bend} (100%)
 rename tests/golden_tests/compile_file/{missing_pat.hvm => missing_pat.bend} (100%)
 rename tests/golden_tests/compile_file/{names_starting_with_keywords.hvm => names_starting_with_keywords.bend} (100%)
 rename tests/golden_tests/compile_file/{nested_ctr_wrong_arity.hvm => nested_ctr_wrong_arity.bend} (100%)
 rename tests/golden_tests/compile_file/{nested_let.hvm => nested_let.bend} (100%)
 rename tests/golden_tests/compile_file/{number_too_large.hvm => number_too_large.bend} (100%)
 rename tests/golden_tests/compile_file/{nums.hvm => nums.bend} (100%)
 rename tests/golden_tests/compile_file/{op2.hvm => op2.bend} (100%)
 rename tests/golden_tests/compile_file/{redex_order.hvm => redex_order.bend} (100%)
 rename tests/golden_tests/compile_file/{redex_order_recursive.hvm => redex_order_recursive.bend} (100%)
 rename tests/golden_tests/compile_file/{ref_to_main.hvm => ref_to_main.bend} (100%)
 rename tests/golden_tests/compile_file/{ref_to_ref.hvm => ref_to_ref.bend} (100%)
 rename tests/golden_tests/compile_file/{repeated_bind_rule.hvm => repeated_bind_rule.bend} (100%)
 rename tests/golden_tests/compile_file/{simple_tup.hvm => simple_tup.bend} (100%)
 rename tests/golden_tests/compile_file/{switch_all_patterns.hvm => switch_all_patterns.bend} (100%)
 rename tests/golden_tests/compile_file/{switch_in_switch_arg.hvm => switch_in_switch_arg.bend} (100%)
 rename tests/golden_tests/compile_file/{switch_unscoped_lambda.hvm => switch_unscoped_lambda.bend} (100%)
 rename tests/golden_tests/compile_file/{tup.hvm => tup.bend} (100%)
 rename tests/golden_tests/compile_file/{tup_add.hvm => tup_add.bend} (100%)
 rename tests/golden_tests/compile_file/{unbound_unscoped_var.hvm => unbound_unscoped_var.bend} (100%)
 rename tests/golden_tests/compile_file/{unbound_var.hvm => unbound_var.bend} (100%)
 rename tests/golden_tests/compile_file/{unbound_var_scope.hvm => unbound_var_scope.bend} (100%)
 rename tests/golden_tests/compile_file/{unbound_with_tup_pattern.hvm => unbound_with_tup_pattern.bend} (100%)
 rename tests/golden_tests/compile_file/{underscore.hvm => underscore.bend} (100%)
 rename tests/golden_tests/compile_file/{unexpected_top_char.hvm => unexpected_top_char.bend} (100%)
 rename tests/golden_tests/compile_file/{unscoped_dup_use.hvm => unscoped_dup_use.bend} (100%)
 rename tests/golden_tests/compile_file/{unscoped_supercombinator.hvm => unscoped_supercombinator.bend} (100%)
 rename tests/golden_tests/compile_file/{unused_let.hvm => unused_let.bend} (100%)
 rename tests/golden_tests/compile_file/{unused_unscoped_bind.hvm => unused_unscoped_bind.bend} (100%)
 rename tests/golden_tests/compile_file/{vicious_circles.hvm => vicious_circles.bend} (100%)
 rename tests/golden_tests/compile_file/{warn_and_err.hvm => warn_and_err.bend} (100%)
 rename tests/golden_tests/compile_file/{with_clause_parse_err.hvm => with_clause_parse_err.bend} (100%)
 rename tests/golden_tests/compile_file/{wrong_ctr_arity.hvm => wrong_ctr_arity.bend} (100%)
 rename tests/golden_tests/compile_file/{wrong_ctr_var_arity.hvm => wrong_ctr_var_arity.bend} (100%)
 rename tests/golden_tests/compile_file/{wrong_nums.hvm => wrong_nums.bend} (100%)
 rename tests/golden_tests/compile_file/{wrong_unicode_escape.hvm => wrong_unicode_escape.bend} (100%)
 rename tests/golden_tests/compile_file_o_all/{addition.hvm => addition.bend} (100%)
 rename tests/golden_tests/compile_file_o_all/{addition_var_fst.hvm => addition_var_fst.bend} (100%)
 rename tests/golden_tests/compile_file_o_all/{adt_option_and.hvm => adt_option_and.bend} (100%)
 rename tests/golden_tests/compile_file_o_all/{adt_string.hvm => adt_string.bend} (100%)
 rename tests/golden_tests/compile_file_o_all/{and.hvm => and.bend} (100%)
 rename tests/golden_tests/compile_file_o_all/{bad_parens_making_erased_let.hvm => bad_parens_making_erased_let.bend} (100%)
 rename tests/golden_tests/compile_file_o_all/{bool.hvm => bool.bend} (100%)
 rename tests/golden_tests/compile_file_o_all/{cyclic_dup.hvm => cyclic_dup.bend} (100%)
 rename tests/golden_tests/compile_file_o_all/{double_main.hvm => double_main.bend} (100%)
 rename tests/golden_tests/compile_file_o_all/{eta_chain.hvm => eta_chain.bend} (100%)
 rename tests/golden_tests/compile_file_o_all/{ex0.hvm => ex0.bend} (100%)
 rename tests/golden_tests/compile_file_o_all/{ex2.hvm => ex2.bend} (100%)
 rename tests/golden_tests/compile_file_o_all/{example.hvm => example.bend} (100%)
 rename tests/golden_tests/compile_file_o_all/{exp.hvm => exp.bend} (100%)
 rename tests/golden_tests/compile_file_o_all/{expr.hvm => expr.bend} (100%)
 rename tests/golden_tests/compile_file_o_all/{extracted_match_pred.hvm => extracted_match_pred.bend} (100%)
 rename tests/golden_tests/compile_file_o_all/{fst.hvm => fst.bend} (100%)
 rename tests/golden_tests/compile_file_o_all/{fst_fst.hvm => fst_fst.bend} (100%)
 rename tests/golden_tests/compile_file_o_all/{hvm1_main.hvm => hvm1_main.bend} (100%)
 rename tests/golden_tests/compile_file_o_all/{inline_app.hvm => inline_app.bend} (100%)
 rename tests/golden_tests/compile_file_o_all/{inlining.hvm => inlining.bend} (100%)
 rename tests/golden_tests/compile_file_o_all/{linearize_match.hvm => linearize_match.bend} (100%)
 rename tests/golden_tests/compile_file_o_all/{list_merge_sort.hvm => list_merge_sort.bend} (100%)
 rename tests/golden_tests/compile_file_o_all/{list_reverse.hvm => list_reverse.bend} (100%)
 rename tests/golden_tests/compile_file_o_all/{long_str_file.hvm => long_str_file.bend} (100%)
 rename tests/golden_tests/compile_file_o_all/{match_adt_non_exhaustive.hvm => match_adt_non_exhaustive.bend} (100%)
 rename tests/golden_tests/compile_file_o_all/{match_dup_and_reconstruction.hvm => match_dup_and_reconstruction.bend} (100%)
 rename tests/golden_tests/compile_file_o_all/{match_mult_linearization.hvm => match_mult_linearization.bend} (100%)
 rename tests/golden_tests/compile_file_o_all/{match_num_explicit_bind.hvm => match_num_explicit_bind.bend} (100%)
 rename tests/golden_tests/compile_file_o_all/{match_tup.hvm => match_tup.bend} (100%)
 rename tests/golden_tests/compile_file_o_all/{merge_definitions.hvm => merge_definitions.bend} (100%)
 rename tests/golden_tests/compile_file_o_all/{non_exhaustive_and.hvm => non_exhaustive_and.bend} (100%)
 rename tests/golden_tests/compile_file_o_all/{non_exhaustive_different_types.hvm => non_exhaustive_different_types.bend} (100%)
 rename tests/golden_tests/compile_file_o_all/{non_exhaustive_pattern.hvm => non_exhaustive_pattern.bend} (100%)
 rename tests/golden_tests/compile_file_o_all/{non_exhaustive_tree.hvm => non_exhaustive_tree.bend} (100%)
 rename tests/golden_tests/compile_file_o_all/{num_pattern_with_var.hvm => num_pattern_with_var.bend} (100%)
 rename tests/golden_tests/compile_file_o_all/{recursive_combinator_inactive.hvm => recursive_combinator_inactive.bend} (100%)
 rename tests/golden_tests/compile_file_o_all/{repeated_name_trucation.hvm => repeated_name_trucation.bend} (100%)
 rename tests/golden_tests/compile_file_o_all/{scrutinee_reconstruction.hvm => scrutinee_reconstruction.bend} (100%)
 rename tests/golden_tests/compile_file_o_all/{self_ref.hvm => self_ref.bend} (100%)
 rename tests/golden_tests/compile_file_o_all/{snd.hvm => snd.bend} (100%)
 rename tests/golden_tests/compile_file_o_all/{spacing.hvm => spacing.bend} (100%)
 rename tests/golden_tests/compile_file_o_all/{spacing2.hvm => spacing2.bend} (100%)
 rename tests/golden_tests/compile_file_o_all/{str.hvm => str.bend} (100%)
 rename tests/golden_tests/compile_file_o_all/{sum_predicates.hvm => sum_predicates.bend} (100%)
 rename tests/golden_tests/compile_file_o_all/{tagged_dup.hvm => tagged_dup.bend} (100%)
 rename tests/golden_tests/compile_file_o_all/{tagged_lam.hvm => tagged_lam.bend} (100%)
 rename tests/golden_tests/compile_file_o_all/{tagged_sup.hvm => tagged_sup.bend} (100%)
 rename tests/golden_tests/compile_file_o_all/{unapplied_eta.hvm => unapplied_eta.bend} (100%)
 rename tests/golden_tests/compile_file_o_all/{unscoped_eta.hvm => unscoped_eta.bend} (100%)
 rename tests/golden_tests/compile_file_o_all/{var_shadows_ref.hvm => var_shadows_ref.bend} (100%)
 rename tests/golden_tests/compile_file_o_all/{weekday.hvm => weekday.bend} (100%)
 rename tests/golden_tests/compile_file_o_no_all/{bitonic_sort.hvm => bitonic_sort.bend} (100%)
 rename tests/golden_tests/compile_file_o_no_all/{list_reverse.hvm => list_reverse.bend} (100%)
 rename tests/golden_tests/compile_file_o_no_all/{redex_order.hvm => redex_order.bend} (100%)
 rename tests/golden_tests/compile_file_o_no_all/{sum_tree.hvm => sum_tree.bend} (100%)
 rename tests/golden_tests/desugar_file/{bind_syntax.hvm => bind_syntax.bend} (100%)
 rename tests/golden_tests/desugar_file/{combinators.hvm => combinators.bend} (100%)
 rename tests/golden_tests/desugar_file/{deref_loop.hvm => deref_loop.bend} (100%)
 rename tests/golden_tests/desugar_file/{dup_linearization.hvm => dup_linearization.bend} (100%)
 rename tests/golden_tests/desugar_file/{non_exaustive_limit.hvm => non_exaustive_limit.bend} (100%)
 rename tests/golden_tests/desugar_file/{switch_with_use.hvm => switch_with_use.bend} (100%)
 rename tests/golden_tests/desugar_file/{use_id.hvm => use_id.bend} (100%)
 rename tests/golden_tests/desugar_file/{use_shadow.hvm => use_shadow.bend} (100%)
 rename tests/golden_tests/desugar_file/{used_once_names.hvm => used_once_names.bend} (100%)
 rename tests/golden_tests/encode_pattern_match/{adt_tup_era.hvm => adt_tup_era.bend} (100%)
 rename tests/golden_tests/encode_pattern_match/{and3.hvm => and3.bend} (100%)
 rename tests/golden_tests/encode_pattern_match/{bool.hvm => bool.bend} (100%)
 rename tests/golden_tests/encode_pattern_match/{bool_tup.hvm => bool_tup.bend} (100%)
 rename tests/golden_tests/encode_pattern_match/{box.hvm => box.bend} (100%)
 rename tests/golden_tests/encode_pattern_match/{common.hvm => common.bend} (100%)
 rename tests/golden_tests/encode_pattern_match/{concat.hvm => concat.bend} (100%)
 rename tests/golden_tests/encode_pattern_match/{concat_def.hvm => concat_def.bend} (100%)
 rename tests/golden_tests/encode_pattern_match/{def_tups.hvm => def_tups.bend} (100%)
 rename tests/golden_tests/encode_pattern_match/{definition_merge.hvm => definition_merge.bend} (100%)
 rename tests/golden_tests/encode_pattern_match/{expr.hvm => expr.bend} (100%)
 rename tests/golden_tests/encode_pattern_match/{flatten_era_pat.hvm => flatten_era_pat.bend} (100%)
 rename tests/golden_tests/encode_pattern_match/{is_some_some.hvm => is_some_some.bend} (100%)
 rename tests/golden_tests/encode_pattern_match/{list_merge_sort.hvm => list_merge_sort.bend} (100%)
 rename tests/golden_tests/encode_pattern_match/{list_str_encoding_undeclared_fn.hvm => list_str_encoding_undeclared_fn.bend} (100%)
 rename tests/golden_tests/encode_pattern_match/{list_str_encoding_undeclared_map.hvm => list_str_encoding_undeclared_map.bend} (100%)
 rename tests/golden_tests/encode_pattern_match/{match_adt_unscoped_in_arm.hvm => match_adt_unscoped_in_arm.bend} (100%)
 rename tests/golden_tests/encode_pattern_match/{match_adt_unscoped_lambda.hvm => match_adt_unscoped_lambda.bend} (100%)
 rename tests/golden_tests/encode_pattern_match/{match_adt_unscoped_var.hvm => match_adt_unscoped_var.bend} (100%)
 rename tests/golden_tests/encode_pattern_match/{match_auto_linearization.hvm => match_auto_linearization.bend} (100%)
 rename tests/golden_tests/encode_pattern_match/{match_bind.hvm => match_bind.bend} (100%)
 rename tests/golden_tests/encode_pattern_match/{match_num_adt_tup_parser.hvm => match_num_adt_tup_parser.bend} (100%)
 rename tests/golden_tests/encode_pattern_match/{match_num_pred.hvm => match_num_pred.bend} (100%)
 rename tests/golden_tests/encode_pattern_match/{match_syntax.hvm => match_syntax.bend} (100%)
 rename tests/golden_tests/encode_pattern_match/{merge_recursive.hvm => merge_recursive.bend} (100%)
 rename tests/golden_tests/encode_pattern_match/{no_patterns.hvm => no_patterns.bend} (100%)
 rename tests/golden_tests/encode_pattern_match/{non_matching_fst_arg.hvm => non_matching_fst_arg.bend} (100%)
 rename tests/golden_tests/encode_pattern_match/{ntup_sum.hvm => ntup_sum.bend} (100%)
 rename tests/golden_tests/encode_pattern_match/{pattern_match_encoding.hvm => pattern_match_encoding.bend} (100%)
 rename tests/golden_tests/encode_pattern_match/{switch_in_switch_arg.hvm => switch_in_switch_arg.bend} (100%)
 rename tests/golden_tests/encode_pattern_match/{var_only.hvm => var_only.bend} (100%)
 rename tests/golden_tests/encode_pattern_match/{weekday.hvm => weekday.bend} (100%)
 rename tests/golden_tests/hangs/{recursive_with_unscoped.hvm => recursive_with_unscoped.bend} (100%)
 rename tests/golden_tests/io/{load.hvm => load.bend} (100%)
 rename tests/golden_tests/io/{load_fail.hvm => load_fail.bend} (100%)
 rename tests/golden_tests/io/{store.hvm => store.bend} (100%)
 rename tests/golden_tests/io/{store_fail.hvm => store_fail.bend} (100%)
 rename tests/golden_tests/linear_readback/{church_mul.hvm => church_mul.bend} (100%)
 rename tests/golden_tests/mutual_recursion/{a_b_c.hvm => a_b_c.bend} (100%)
 rename tests/golden_tests/mutual_recursion/{len.hvm => len.bend} (100%)
 rename tests/golden_tests/mutual_recursion/{merged.hvm => merged.bend} (100%)
 rename tests/golden_tests/mutual_recursion/{multiple.hvm => multiple.bend} (100%)
 rename tests/golden_tests/mutual_recursion/{odd_even.hvm => odd_even.bend} (100%)
 rename tests/golden_tests/parse_file/{imp_map.hvm => imp_map.bend} (100%)
 rename tests/golden_tests/parse_file/{imp_program.hvm => imp_program.bend} (100%)
 rename tests/golden_tests/parse_file/{repeated_adt_name.hvm => repeated_adt_name.bend} (100%)
 rename tests/golden_tests/parse_file/{scape_chars.hvm => scape_chars.bend} (100%)
 rename tests/golden_tests/readback_lnet/{addition.hvm => addition.bend} (100%)
 rename tests/golden_tests/readback_lnet/{bad_net.hvm => bad_net.bend} (100%)
 rename tests/golden_tests/readback_lnet/{bad_net1.hvm => bad_net1.bend} (100%)
 rename tests/golden_tests/readback_lnet/{bad_net3.hvm => bad_net3.bend} (100%)
 rename tests/golden_tests/readback_lnet/{complicated_dup.hvm => complicated_dup.bend} (100%)
 rename tests/golden_tests/readback_lnet/{fst_snd.hvm => fst_snd.bend} (100%)
 rename tests/golden_tests/readback_lnet/{id.hvm => id.bend} (100%)
 rename tests/golden_tests/readback_lnet/{invalid_op2_op2.hvm => invalid_op2_op2.bend} (100%)
 rename tests/golden_tests/readback_lnet/{match.hvm => match.bend} (100%)
 rename tests/golden_tests/readback_lnet/{nested_let.hvm => nested_let.bend} (100%)
 rename tests/golden_tests/readback_lnet/{nested_tup.hvm => nested_tup.bend} (100%)
 rename tests/golden_tests/readback_lnet/{number.hvm => number.bend} (100%)
 rename tests/golden_tests/readback_lnet/{simple_tup.hvm => simple_tup.bend} (100%)
 rename tests/golden_tests/readback_lnet/{tup_add.hvm => tup_add.bend} (100%)
 rename tests/golden_tests/run_entrypoint/{foo.hvm => foo.bend} (100%)
 rename tests/golden_tests/run_file/{360_no_scope.hvm => 360_no_scope.bend} (100%)
 rename tests/golden_tests/run_file/{addition.hvm => addition.bend} (100%)
 rename tests/golden_tests/run_file/{adt_match.hvm => adt_match.bend} (100%)
 rename tests/golden_tests/run_file/{adt_match_wrong_tag.hvm => adt_match_wrong_tag.bend} (100%)
 rename tests/golden_tests/run_file/{adt_option_and.hvm => adt_option_and.bend} (100%)
 rename tests/golden_tests/run_file/{adt_wrong_tag.hvm => adt_wrong_tag.bend} (100%)
 rename tests/golden_tests/run_file/{and.hvm => and.bend} (100%)
 rename tests/golden_tests/run_file/{bend_fold.hvm => bend_fold.bend} (100%)
 rename tests/golden_tests/run_file/{bitonic_sort.hvm => bitonic_sort.bend} (100%)
 rename tests/golden_tests/run_file/{bitonic_sort_lam.hvm => bitonic_sort_lam.bend} (100%)
 rename tests/golden_tests/run_file/{box.hvm => box.bend} (100%)
 rename tests/golden_tests/run_file/{branch_statements_assignment.hvm => branch_statements_assignment.bend} (100%)
 rename tests/golden_tests/run_file/{callcc.hvm => callcc.bend} (100%)
 rename tests/golden_tests/run_file/{chars.hvm => chars.bend} (100%)
 rename tests/golden_tests/run_file/{chars_forall.hvm => chars_forall.bend} (100%)
 rename tests/golden_tests/run_file/{chars_lambda.hvm => chars_lambda.bend} (100%)
 rename tests/golden_tests/run_file/{def_bool_num.hvm => def_bool_num.bend} (100%)
 rename tests/golden_tests/run_file/{def_num_bool.hvm => def_num_bool.bend} (100%)
 rename tests/golden_tests/run_file/{def_tups.hvm => def_tups.bend} (100%)
 rename tests/golden_tests/run_file/{do_block_mixed.hvm => do_block_mixed.bend} (100%)
 rename tests/golden_tests/run_file/{dup_global_lam.hvm => dup_global_lam.bend} (100%)
 rename tests/golden_tests/run_file/{empty.hvm => empty.bend} (100%)
 rename tests/golden_tests/run_file/{erased_side_effect.hvm => erased_side_effect.bend} (100%)
 rename tests/golden_tests/run_file/{escape_sequences.hvm => escape_sequences.bend} (100%)
 rename tests/golden_tests/run_file/{eta.hvm => eta.bend} (100%)
 rename tests/golden_tests/run_file/{example.hvm => example.bend} (100%)
 rename tests/golden_tests/run_file/{exp.hvm => exp.bend} (100%)
 rename tests/golden_tests/run_file/{extracted_match_pred.hvm => extracted_match_pred.bend} (100%)
 rename tests/golden_tests/run_file/{field_vectorization.hvm => field_vectorization.bend} (100%)
 rename tests/golden_tests/run_file/{id_underscore.hvm => id_underscore.bend} (100%)
 rename tests/golden_tests/run_file/{kind_compiled_tree_sum.hvm => kind_compiled_tree_sum.bend} (100%)
 rename tests/golden_tests/run_file/{lam_op2.hvm => lam_op2.bend} (100%)
 rename tests/golden_tests/run_file/{lam_op2_nested.hvm => lam_op2_nested.bend} (100%)
 rename tests/golden_tests/run_file/{let_tup_readback.hvm => let_tup_readback.bend} (100%)
 rename tests/golden_tests/run_file/{linearize_match.hvm => linearize_match.bend} (100%)
 rename tests/golden_tests/run_file/{list_resugar.hvm => list_resugar.bend} (100%)
 rename tests/golden_tests/run_file/{list_reverse.hvm => list_reverse.bend} (100%)
 rename tests/golden_tests/run_file/{list_take.hvm => list_take.bend} (100%)
 rename tests/golden_tests/run_file/{list_to_tree.hvm => list_to_tree.bend} (100%)
 rename tests/golden_tests/run_file/{match.hvm => match.bend} (100%)
 rename tests/golden_tests/run_file/{match_builtins.hvm => match_builtins.bend} (100%)
 rename tests/golden_tests/run_file/{match_mult_linearization.hvm => match_mult_linearization.bend} (100%)
 rename tests/golden_tests/run_file/{match_num_adt_tup_parser.hvm => match_num_adt_tup_parser.bend} (100%)
 rename tests/golden_tests/run_file/{match_num_explicit_bind.hvm => match_num_explicit_bind.bend} (100%)
 rename tests/golden_tests/run_file/{match_num_num_to_char.hvm => match_num_num_to_char.bend} (100%)
 rename tests/golden_tests/run_file/{match_num_succ_complex.hvm => match_num_succ_complex.bend} (100%)
 rename tests/golden_tests/run_file/{match_str.hvm => match_str.bend} (100%)
 rename tests/golden_tests/run_file/{match_sup.hvm => match_sup.bend} (100%)
 rename tests/golden_tests/run_file/{match_vars.hvm => match_vars.bend} (100%)
 rename tests/golden_tests/run_file/{merge_sort.hvm => merge_sort.bend} (100%)
 rename tests/golden_tests/run_file/{mixed_syntax.hvm => mixed_syntax.bend} (100%)
 rename tests/golden_tests/run_file/{names_hyphen.hvm => names_hyphen.bend} (100%)
 rename tests/golden_tests/run_file/{names_hyphen_toplevel.hvm => names_hyphen_toplevel.bend} (100%)
 rename tests/golden_tests/run_file/{nat_add.hvm => nat_add.bend} (100%)
 rename tests/golden_tests/run_file/{nat_add_num.hvm => nat_add_num.bend} (100%)
 rename tests/golden_tests/run_file/{nested_list_and_string.hvm => nested_list_and_string.bend} (100%)
 rename tests/golden_tests/run_file/{nested_str.hvm => nested_str.bend} (100%)
 rename tests/golden_tests/run_file/{num_match_missing_var.hvm => num_match_missing_var.bend} (100%)
 rename tests/golden_tests/run_file/{num_pred.hvm => num_pred.bend} (100%)
 rename tests/golden_tests/run_file/{override_list_ctr.hvm => override_list_ctr.bend} (100%)
 rename tests/golden_tests/run_file/{override_str_ctr.hvm => override_str_ctr.bend} (100%)
 rename tests/golden_tests/run_file/{pred.hvm => pred.bend} (100%)
 rename tests/golden_tests/run_file/{queue.hvm => queue.bend} (100%)
 rename tests/golden_tests/run_file/{radix_sort_ctr.hvm => radix_sort_ctr.bend} (100%)
 rename tests/golden_tests/run_file/{readback_hvm1_main.hvm => readback_hvm1_main.bend} (100%)
 rename tests/golden_tests/run_file/{readback_list_other_ctr.hvm => readback_list_other_ctr.bend} (100%)
 rename tests/golden_tests/run_file/{recursive_bind.hvm => recursive_bind.bend} (100%)
 rename tests/golden_tests/run_file/{recursive_combinator.hvm => recursive_combinator.bend} (100%)
 rename tests/golden_tests/run_file/{recursive_combinator_nested.hvm => recursive_combinator_nested.bend} (100%)
 rename tests/golden_tests/run_file/{recursive_match_native.hvm => recursive_match_native.bend} (100%)
 rename tests/golden_tests/run_file/{ref_resolution.hvm => ref_resolution.bend} (100%)
 rename tests/golden_tests/run_file/{repeated_name_truncation.hvm => repeated_name_truncation.bend} (100%)
 rename tests/golden_tests/run_file/{scopeless_discard.hvm => scopeless_discard.bend} (100%)
 rename tests/golden_tests/run_file/{str_concat.hvm => str_concat.bend} (100%)
 rename tests/golden_tests/run_file/{str_inc.hvm => str_inc.bend} (100%)
 rename tests/golden_tests/run_file/{str_inc_eta.hvm => str_inc_eta.bend} (100%)
 rename tests/golden_tests/run_file/{str_len.hvm => str_len.bend} (100%)
 rename tests/golden_tests/run_file/{sum_tree.hvm => sum_tree.bend} (100%)
 rename tests/golden_tests/run_file/{sup_app.hvm => sup_app.bend} (100%)
 create mode 100644 tests/golden_tests/run_file/sup_reconstruction.bend
 rename tests/golden_tests/run_file/{superposed_is_even.hvm => superposed_is_even.bend} (100%)
 rename tests/golden_tests/run_file/{tagged_lam.hvm => tagged_lam.bend} (100%)
 rename tests/golden_tests/run_file/{tup_list_strings.hvm => tup_list_strings.bend} (100%)
 rename tests/golden_tests/run_file/{tup_reconstruction.hvm => tup_reconstruction.bend} (100%)
 rename tests/golden_tests/run_file/{tuple_rots.hvm => tuple_rots.bend} (100%)
 rename tests/golden_tests/run_file/{unaplied_str.hvm => unaplied_str.bend} (100%)
 rename tests/golden_tests/run_file/{unscoped_never_used.hvm => unscoped_never_used.bend} (100%)
 rename tests/golden_tests/run_file/{unused_dup_var.hvm => unused_dup_var.bend} (100%)
 rename tests/golden_tests/run_file/{world.hvm => world.bend} (100%)
 rename tests/golden_tests/run_file/{wrong_string.hvm => wrong_string.bend} (100%)
 rename tests/golden_tests/run_lazy/{addition.hvm => addition.bend} (100%)
 rename tests/golden_tests/run_lazy/{adt_match.hvm => adt_match.bend} (100%)
 rename tests/golden_tests/run_lazy/{adt_match_wrong_tag.hvm => adt_match_wrong_tag.bend} (100%)
 rename tests/golden_tests/run_lazy/{adt_option_and.hvm => adt_option_and.bend} (100%)
 rename tests/golden_tests/run_lazy/{adt_wrong_tag.hvm => adt_wrong_tag.bend} (100%)
 rename tests/golden_tests/run_lazy/{and.hvm => and.bend} (100%)
 rename tests/golden_tests/run_lazy/{bitonic_sort.hvm => bitonic_sort.bend} (100%)
 rename tests/golden_tests/run_lazy/{bitonic_sort_lam.hvm => bitonic_sort_lam.bend} (100%)
 rename tests/golden_tests/run_lazy/{box.hvm => box.bend} (100%)
 rename tests/golden_tests/run_lazy/{box2.hvm => box2.bend} (100%)
 rename tests/golden_tests/run_lazy/{callcc.hvm => callcc.bend} (100%)
 rename tests/golden_tests/run_lazy/{chars.hvm => chars.bend} (100%)
 rename tests/golden_tests/run_lazy/{def_tups.hvm => def_tups.bend} (100%)
 rename tests/golden_tests/run_lazy/{dup_global_lam.hvm => dup_global_lam.bend} (100%)
 rename tests/golden_tests/run_lazy/{eta.hvm => eta.bend} (100%)
 rename tests/golden_tests/run_lazy/{example.hvm => example.bend} (100%)
 rename tests/golden_tests/run_lazy/{exp.hvm => exp.bend} (100%)
 rename tests/golden_tests/run_lazy/{extracted_match_pred.hvm => extracted_match_pred.bend} (100%)
 rename tests/golden_tests/run_lazy/{field_vectorization.hvm => field_vectorization.bend} (100%)
 rename tests/golden_tests/run_lazy/{lam_op2.hvm => lam_op2.bend} (100%)
 rename tests/golden_tests/run_lazy/{lam_op2_nested.hvm => lam_op2_nested.bend} (100%)
 rename tests/golden_tests/run_lazy/{let_tup_readback.hvm => let_tup_readback.bend} (100%)
 rename tests/golden_tests/run_lazy/{linearize_match.hvm => linearize_match.bend} (100%)
 rename tests/golden_tests/run_lazy/{list_resugar.hvm => list_resugar.bend} (100%)
 rename tests/golden_tests/run_lazy/{list_reverse.hvm => list_reverse.bend} (100%)
 rename tests/golden_tests/run_lazy/{list_take.hvm => list_take.bend} (100%)
 rename tests/golden_tests/run_lazy/{list_to_tree.hvm => list_to_tree.bend} (100%)
 rename tests/golden_tests/run_lazy/{match.hvm => match.bend} (100%)
 rename tests/golden_tests/run_lazy/{match_builtins.hvm => match_builtins.bend} (100%)
 rename tests/golden_tests/run_lazy/{match_mult_linearization.hvm => match_mult_linearization.bend} (100%)
 rename tests/golden_tests/run_lazy/{match_num_explicit_bind.hvm => match_num_explicit_bind.bend} (100%)
 rename tests/golden_tests/run_lazy/{merge_sort.hvm => merge_sort.bend} (100%)
 rename tests/golden_tests/run_lazy/{nested_list_and_string.hvm => nested_list_and_string.bend} (100%)
 rename tests/golden_tests/run_lazy/{nested_str.hvm => nested_str.bend} (100%)
 rename tests/golden_tests/run_lazy/{num_pred.hvm => num_pred.bend} (100%)
 rename tests/golden_tests/run_lazy/{queue.hvm => queue.bend} (100%)
 rename tests/golden_tests/run_lazy/{radix_sort_ctr.hvm => radix_sort_ctr.bend} (100%)
 rename tests/golden_tests/run_lazy/{recursive_match_native.hvm => recursive_match_native.bend} (100%)
 rename tests/golden_tests/run_lazy/{scopeless_discard.hvm => scopeless_discard.bend} (100%)
 rename tests/golden_tests/run_lazy/{str_concat.hvm => str_concat.bend} (100%)
 rename tests/golden_tests/run_lazy/{str_inc.hvm => str_inc.bend} (100%)
 rename tests/golden_tests/run_lazy/{str_inc_eta.hvm => str_inc_eta.bend} (100%)
 rename tests/golden_tests/run_lazy/{str_len.hvm => str_len.bend} (100%)
 rename tests/golden_tests/run_lazy/{sum_tree.hvm => sum_tree.bend} (100%)
 rename tests/golden_tests/run_lazy/{sup_app.hvm => sup_app.bend} (100%)
 rename tests/golden_tests/{run_file/sup_reconstruction.hvm => run_lazy/sup_reconstruction.bend} (100%)
 delete mode 100644 tests/golden_tests/run_lazy/sup_reconstruction.hvm
 rename tests/golden_tests/run_lazy/{superposed_is_even.hvm => superposed_is_even.bend} (100%)
 rename tests/golden_tests/run_lazy/{tagged_lam.hvm => tagged_lam.bend} (100%)
 rename tests/golden_tests/run_lazy/{tup_reconstruction.hvm => tup_reconstruction.bend} (100%)
 rename tests/golden_tests/run_lazy/{tuple_rots.hvm => tuple_rots.bend} (100%)
 rename tests/golden_tests/run_lazy/{unaplied_str.hvm => unaplied_str.bend} (100%)
 rename tests/golden_tests/run_lazy/{unused_dup_var.hvm => unused_dup_var.bend} (100%)
 rename tests/golden_tests/run_lazy/{world.hvm => world.bend} (100%)
 rename tests/golden_tests/run_lazy/{wrong_string.hvm => wrong_string.bend} (100%)
 rename tests/golden_tests/scott_triggers_unused/{test.hvm => test.bend} (100%)
 rename tests/golden_tests/simplify_matches/{adt_tup_era.hvm => adt_tup_era.bend} (100%)
 rename tests/golden_tests/simplify_matches/{already_flat.hvm => already_flat.bend} (100%)
 rename tests/golden_tests/simplify_matches/{bits_dec.hvm => bits_dec.bend} (100%)
 rename tests/golden_tests/simplify_matches/{complex_with_case.hvm => complex_with_case.bend} (100%)
 rename tests/golden_tests/simplify_matches/{double_unwrap_box.hvm => double_unwrap_box.bend} (100%)
 rename tests/golden_tests/simplify_matches/{double_unwrap_maybe.hvm => double_unwrap_maybe.bend} (100%)
 rename tests/golden_tests/simplify_matches/{flatten_with_terminal.hvm => flatten_with_terminal.bend} (100%)
 rename tests/golden_tests/simplify_matches/{linearize_match_all.hvm => linearize_match_all.bend} (100%)
 rename tests/golden_tests/simplify_matches/{match_str.hvm => match_str.bend} (100%)
 rename tests/golden_tests/simplify_matches/{nested.hvm => nested.bend} (100%)
 rename tests/golden_tests/simplify_matches/{nested2.hvm => nested2.bend} (100%)
 rename tests/golden_tests/simplify_matches/{nested_0ary.hvm => nested_0ary.bend} (100%)
 rename tests/golden_tests/simplify_matches/{redundant_with_era.hvm => redundant_with_era.bend} (100%)
 rename tests/golden_tests/simplify_matches/{wrong_fn_arity.hvm => wrong_fn_arity.bend} (100%)
 rename tests/snapshots/{cli__compile_all.hvm.snap => cli__compile_all.bend.snap} (83%)
 rename tests/snapshots/{cli__compile_inline.hvm.snap => cli__compile_inline.bend.snap} (65%)
 create mode 100644 tests/snapshots/cli__compile_no_opts.bend.snap
 delete mode 100644 tests/snapshots/cli__compile_no_opts.hvm.snap
 rename tests/snapshots/{cli__compile_pre_reduce.hvm.snap => cli__compile_pre_reduce.bend.snap} (84%)
 rename tests/snapshots/{cli__compile_strict_loop.hvm.snap => cli__compile_strict_loop.bend.snap} (79%)
 rename tests/snapshots/{cli__compile_wrong_opt.hvm.snap => cli__compile_wrong_opt.bend.snap} (86%)
 rename tests/snapshots/{cli__debug_list_map.hvm.snap => cli__debug_list_map.bend.snap} (79%)
 rename tests/snapshots/{cli__debug_u60_to_nat.hvm.snap => cli__debug_u60_to_nat.bend.snap} (78%)
 rename tests/snapshots/{cli__desugar_bool_scott.hvm.snap => cli__desugar_bool_scott.bend.snap} (84%)
 delete mode 100644 tests/snapshots/cli__desugar_bool_tagged.hvm.snap
 rename tests/snapshots/{cli__desugar_float_combinators.hvm.snap => cli__desugar_float_combinators.bend.snap} (77%)
 rename tests/snapshots/{cli__desugar_linearize_matches.hvm.snap => cli__desugar_linearize_matches.bend.snap} (62%)
 rename tests/snapshots/{cli__desugar_linearize_matches_alt.hvm.snap => cli__desugar_linearize_matches_alt.bend.snap} (96%)
 delete mode 100644 tests/snapshots/cli__desugar_linearize_matches_extra.hvm.snap
 rename tests/snapshots/{cli__desugar_merge.hvm.snap => cli__desugar_merge.bend.snap} (75%)
 create mode 100644 tests/snapshots/cli__desugar_prune.bend.snap
 delete mode 100644 tests/snapshots/cli__desugar_prune.hvm.snap
 rename tests/snapshots/{cli__run_add.hvm.snap => cli__run_add.bend.snap} (50%)
 rename tests/snapshots/{cli__run_pretty.hvm.snap => cli__run_pretty.bend.snap} (84%)
 rename tests/snapshots/{cli__warn_and_err.hvm.snap => cli__warn_and_err.bend.snap} (82%)
 rename tests/snapshots/{compile_entrypoint__foo.hvm.snap => compile_entrypoint__foo.bend.snap} (56%)
 rename tests/snapshots/{compile_file__360_no_scope.hvm.snap => compile_file__360_no_scope.bend.snap} (61%)
 rename tests/snapshots/{compile_file__add_args.hvm.snap => compile_file__add_args.bend.snap} (61%)
 rename tests/snapshots/{compile_file__addition.hvm.snap => compile_file__addition.bend.snap} (67%)
 rename tests/snapshots/{compile_file__addition_const.hvm.snap => compile_file__addition_const.bend.snap} (50%)
 rename tests/snapshots/{compile_file__ask_outside_do.hvm.snap => compile_file__ask_outside_do.bend.snap} (72%)
 rename tests/snapshots/{compile_file__church_one.hvm.snap => compile_file__church_one.bend.snap} (66%)
 create mode 100644 tests/snapshots/compile_file__church_zero.bend.snap
 delete mode 100644 tests/snapshots/compile_file__church_zero.hvm.snap
 rename tests/snapshots/{compile_file__complicated_dup.hvm.snap => compile_file__complicated_dup.bend.snap} (59%)
 rename tests/snapshots/{compile_file__crlf.hvm.snap => compile_file__crlf.bend.snap} (50%)
 rename tests/snapshots/{compile_file__cyclic_global_lam.hvm.snap => compile_file__cyclic_global_lam.bend.snap} (71%)
 rename tests/snapshots/{compile_file__dup_apply.hvm.snap => compile_file__dup_apply.bend.snap} (50%)
 rename tests/snapshots/{compile_file__dup_global_lam.hvm.snap => compile_file__dup_global_lam.bend.snap} (54%)
 create mode 100644 tests/snapshots/compile_file__erased_dup.bend.snap
 delete mode 100644 tests/snapshots/compile_file__erased_dup.hvm.snap
 rename tests/snapshots/{compile_file__error_data_def_name.hvm.snap => compile_file__error_data_def_name.bend.snap} (97%)
 rename tests/snapshots/{compile_file__error_messages.hvm.snap => compile_file__error_messages.bend.snap} (82%)
 rename tests/snapshots/{compile_file__f24_oper.hvm.snap => compile_file__f24_oper.bend.snap} (66%)
 rename tests/snapshots/{compile_file__fst_snd.hvm.snap => compile_file__fst_snd.bend.snap} (74%)
 rename tests/snapshots/{compile_file__global_lam.hvm.snap => compile_file__global_lam.bend.snap} (53%)
 rename tests/snapshots/{compile_file__huge_tree.hvm.snap => compile_file__huge_tree.bend.snap} (99%)
 rename tests/snapshots/{compile_file__i24_oper.hvm.snap => compile_file__i24_oper.bend.snap} (64%)
 rename tests/snapshots/{compile_file__id.hvm.snap => compile_file__id.bend.snap} (50%)
 rename tests/snapshots/{compile_file__infer_dup.hvm.snap => compile_file__infer_dup.bend.snap} (50%)
 rename tests/snapshots/{compile_file__inlining.hvm.snap => compile_file__inlining.bend.snap} (67%)
 rename tests/snapshots/{compile_file__just_a_name.hvm.snap => compile_file__just_a_name.bend.snap} (59%)
 rename tests/snapshots/{compile_file__just_data.hvm.snap => compile_file__just_data.bend.snap} (58%)
 rename tests/snapshots/{compile_file__just_paren.hvm.snap => compile_file__just_paren.bend.snap} (57%)
 rename tests/snapshots/{compile_file__just_rule_paren.hvm.snap => compile_file__just_rule_paren.bend.snap} (54%)
 create mode 100644 tests/snapshots/compile_file__let_substitution.bend.snap
 delete mode 100644 tests/snapshots/compile_file__let_substitution.hvm.snap
 rename tests/snapshots/{compile_file__let_tup.hvm.snap => compile_file__let_tup.bend.snap} (54%)
 rename tests/snapshots/{compile_file__lets.hvm.snap => compile_file__lets.bend.snap} (78%)
 rename tests/snapshots/{compile_file__long_name.hvm.snap => compile_file__long_name.bend.snap} (72%)
 rename tests/snapshots/{compile_file__match.hvm.snap => compile_file__match.bend.snap} (63%)
 rename tests/snapshots/{compile_file__missing_adt_eq.hvm.snap => compile_file__missing_adt_eq.bend.snap} (55%)
 rename tests/snapshots/{compile_file__missing_ctrs.hvm.snap => compile_file__missing_ctrs.bend.snap} (60%)
 rename tests/snapshots/{compile_file__missing_pat.hvm.snap => compile_file__missing_pat.bend.snap} (56%)
 rename tests/snapshots/{compile_file__names_starting_with_keywords.hvm.snap => compile_file__names_starting_with_keywords.bend.snap} (92%)
 rename tests/snapshots/{compile_file__nested_ctr_wrong_arity.hvm.snap => compile_file__nested_ctr_wrong_arity.bend.snap} (97%)
 rename tests/snapshots/{compile_file__nested_let.hvm.snap => compile_file__nested_let.bend.snap} (56%)
 rename tests/snapshots/{compile_file__number_too_large.hvm.snap => compile_file__number_too_large.bend.snap} (55%)
 rename tests/snapshots/{compile_file__nums.hvm.snap => compile_file__nums.bend.snap} (63%)
 rename tests/snapshots/{compile_file__op2.hvm.snap => compile_file__op2.bend.snap} (73%)
 rename tests/snapshots/{compile_file__redex_order.hvm.snap => compile_file__redex_order.bend.snap} (78%)
 rename tests/snapshots/{compile_file__redex_order_recursive.hvm.snap => compile_file__redex_order_recursive.bend.snap} (99%)
 rename tests/snapshots/{compile_file__ref_to_main.hvm.snap => compile_file__ref_to_main.bend.snap} (72%)
 rename tests/snapshots/{compile_file__ref_to_ref.hvm.snap => compile_file__ref_to_ref.bend.snap} (70%)
 rename tests/snapshots/{compile_file__repeated_bind_rule.hvm.snap => compile_file__repeated_bind_rule.bend.snap} (74%)
 create mode 100644 tests/snapshots/compile_file__simple_tup.bend.snap
 delete mode 100644 tests/snapshots/compile_file__simple_tup.hvm.snap
 rename tests/snapshots/{compile_file__switch_all_patterns.hvm.snap => compile_file__switch_all_patterns.bend.snap} (75%)
 rename tests/snapshots/{compile_file__switch_in_switch_arg.hvm.snap => compile_file__switch_in_switch_arg.bend.snap} (96%)
 rename tests/snapshots/{compile_file__switch_unscoped_lambda.hvm.snap => compile_file__switch_unscoped_lambda.bend.snap} (96%)
 rename tests/snapshots/{compile_file__tup.hvm.snap => compile_file__tup.bend.snap} (53%)
 rename tests/snapshots/{compile_file__tup_add.hvm.snap => compile_file__tup_add.bend.snap} (58%)
 rename tests/snapshots/{compile_file__unbound_unscoped_var.hvm.snap => compile_file__unbound_unscoped_var.bend.snap} (97%)
 rename tests/snapshots/{compile_file__unbound_var.hvm.snap => compile_file__unbound_var.bend.snap} (67%)
 rename tests/snapshots/{compile_file__unbound_var_scope.hvm.snap => compile_file__unbound_var_scope.bend.snap} (65%)
 rename tests/snapshots/{compile_file__unbound_with_tup_pattern.hvm.snap => compile_file__unbound_with_tup_pattern.bend.snap} (95%)
 rename tests/snapshots/{compile_file__underscore.hvm.snap => compile_file__underscore.bend.snap} (58%)
 rename tests/snapshots/{compile_file__unexpected_top_char.hvm.snap => compile_file__unexpected_top_char.bend.snap} (75%)
 rename tests/snapshots/{compile_file__unscoped_dup_use.hvm.snap => compile_file__unscoped_dup_use.bend.snap} (69%)
 rename tests/snapshots/{compile_file__unscoped_supercombinator.hvm.snap => compile_file__unscoped_supercombinator.bend.snap} (95%)
 rename tests/snapshots/{compile_file__unused_let.hvm.snap => compile_file__unused_let.bend.snap} (54%)
 rename tests/snapshots/{compile_file__unused_unscoped_bind.hvm.snap => compile_file__unused_unscoped_bind.bend.snap} (97%)
 rename tests/snapshots/{compile_file__vicious_circles.hvm.snap => compile_file__vicious_circles.bend.snap} (81%)
 rename tests/snapshots/{compile_file__warn_and_err.hvm.snap => compile_file__warn_and_err.bend.snap} (79%)
 rename tests/snapshots/{compile_file__with_clause_parse_err.hvm.snap => compile_file__with_clause_parse_err.bend.snap} (76%)
 rename tests/snapshots/{compile_file__wrong_ctr_arity.hvm.snap => compile_file__wrong_ctr_arity.bend.snap} (77%)
 rename tests/snapshots/{compile_file__wrong_ctr_var_arity.hvm.snap => compile_file__wrong_ctr_var_arity.bend.snap} (98%)
 rename tests/snapshots/{compile_file__wrong_nums.hvm.snap => compile_file__wrong_nums.bend.snap} (58%)
 rename tests/snapshots/{compile_file__wrong_unicode_escape.hvm.snap => compile_file__wrong_unicode_escape.bend.snap} (77%)
 rename tests/snapshots/{compile_file_o_all__addition.hvm.snap => compile_file_o_all__addition.bend.snap} (65%)
 rename tests/snapshots/{compile_file_o_all__addition_var_fst.hvm.snap => compile_file_o_all__addition_var_fst.bend.snap} (93%)
 rename tests/snapshots/{compile_file_o_all__adt_option_and.hvm.snap => compile_file_o_all__adt_option_and.bend.snap} (98%)
 rename tests/snapshots/{compile_file_o_all__adt_string.hvm.snap => compile_file_o_all__adt_string.bend.snap} (63%)
 rename tests/snapshots/{compile_file_o_all__and.hvm.snap => compile_file_o_all__and.bend.snap} (75%)
 rename tests/snapshots/{compile_file_o_all__bad_parens_making_erased_let.hvm.snap => compile_file_o_all__bad_parens_making_erased_let.bend.snap} (91%)
 rename tests/snapshots/{compile_file_o_all__bool.hvm.snap => compile_file_o_all__bool.bend.snap} (69%)
 rename tests/snapshots/{compile_file_o_all__cyclic_dup.hvm.snap => compile_file_o_all__cyclic_dup.bend.snap} (66%)
 rename tests/snapshots/{compile_file_o_all__double_main.hvm.snap => compile_file_o_all__double_main.bend.snap} (61%)
 rename tests/snapshots/{compile_file_o_all__eta_chain.hvm.snap => compile_file_o_all__eta_chain.bend.snap} (70%)
 rename tests/snapshots/{compile_file_o_all__ex0.hvm.snap => compile_file_o_all__ex0.bend.snap} (70%)
 rename tests/snapshots/{compile_file_o_all__ex2.hvm.snap => compile_file_o_all__ex2.bend.snap} (91%)
 rename tests/snapshots/{compile_file_o_all__example.hvm.snap => compile_file_o_all__example.bend.snap} (67%)
 rename tests/snapshots/{compile_file_o_all__exp.hvm.snap => compile_file_o_all__exp.bend.snap} (71%)
 rename tests/snapshots/{compile_file_o_all__expr.hvm.snap => compile_file_o_all__expr.bend.snap} (93%)
 rename tests/snapshots/{compile_file_o_all__extracted_match_pred.hvm.snap => compile_file_o_all__extracted_match_pred.bend.snap} (94%)
 rename tests/snapshots/{compile_file_o_all__fst.hvm.snap => compile_file_o_all__fst.bend.snap} (59%)
 rename tests/snapshots/{compile_file_o_all__fst_fst.hvm.snap => compile_file_o_all__fst_fst.bend.snap} (64%)
 create mode 100644 tests/snapshots/compile_file_o_all__hvm1_main.bend.snap
 delete mode 100644 tests/snapshots/compile_file_o_all__hvm1_main.hvm.snap
 rename tests/snapshots/{compile_file_o_all__inline_app.hvm.snap => compile_file_o_all__inline_app.bend.snap} (68%)
 rename tests/snapshots/{compile_file_o_all__inlining.hvm.snap => compile_file_o_all__inlining.bend.snap} (51%)
 rename tests/snapshots/{compile_file_o_all__linearize_match.hvm.snap => compile_file_o_all__linearize_match.bend.snap} (96%)
 rename tests/snapshots/{compile_file_o_all__list_merge_sort.hvm.snap => compile_file_o_all__list_merge_sort.bend.snap} (99%)
 rename tests/snapshots/{compile_file_o_all__list_reverse.hvm.snap => compile_file_o_all__list_reverse.bend.snap} (87%)
 rename tests/snapshots/{compile_file_o_all__long_str_file.hvm.snap => compile_file_o_all__long_str_file.bend.snap} (99%)
 rename tests/snapshots/{compile_file_o_all__match_adt_non_exhaustive.hvm.snap => compile_file_o_all__match_adt_non_exhaustive.bend.snap} (94%)
 rename tests/snapshots/{compile_file_o_all__match_dup_and_reconstruction.hvm.snap => compile_file_o_all__match_dup_and_reconstruction.bend.snap} (92%)
 rename tests/snapshots/{compile_file_o_all__match_mult_linearization.hvm.snap => compile_file_o_all__match_mult_linearization.bend.snap} (94%)
 rename tests/snapshots/{compile_file_o_all__match_num_explicit_bind.hvm.snap => compile_file_o_all__match_num_explicit_bind.bend.snap} (91%)
 rename tests/snapshots/{compile_file_o_all__match_tup.hvm.snap => compile_file_o_all__match_tup.bend.snap} (60%)
 rename tests/snapshots/{compile_file_o_all__merge_definitions.hvm.snap => compile_file_o_all__merge_definitions.bend.snap} (96%)
 rename tests/snapshots/{compile_file_o_all__non_exhaustive_and.hvm.snap => compile_file_o_all__non_exhaustive_and.bend.snap} (96%)
 rename tests/snapshots/{compile_file_o_all__non_exhaustive_different_types.hvm.snap => compile_file_o_all__non_exhaustive_different_types.bend.snap} (92%)
 rename tests/snapshots/{compile_file_o_all__non_exhaustive_pattern.hvm.snap => compile_file_o_all__non_exhaustive_pattern.bend.snap} (94%)
 rename tests/snapshots/{compile_file_o_all__non_exhaustive_tree.hvm.snap => compile_file_o_all__non_exhaustive_tree.bend.snap} (95%)
 rename tests/snapshots/{compile_file_o_all__num_pattern_with_var.hvm.snap => compile_file_o_all__num_pattern_with_var.bend.snap} (95%)
 rename tests/snapshots/{compile_file_o_all__recursive_combinator_inactive.hvm.snap => compile_file_o_all__recursive_combinator_inactive.bend.snap} (90%)
 rename tests/snapshots/{compile_file_o_all__repeated_name_trucation.hvm.snap => compile_file_o_all__repeated_name_trucation.bend.snap} (99%)
 rename tests/snapshots/{compile_file_o_all__scrutinee_reconstruction.hvm.snap => compile_file_o_all__scrutinee_reconstruction.bend.snap} (95%)
 rename tests/snapshots/{compile_file_o_all__self_ref.hvm.snap => compile_file_o_all__self_ref.bend.snap} (95%)
 rename tests/snapshots/{compile_file_o_all__snd.hvm.snap => compile_file_o_all__snd.bend.snap} (59%)
 rename tests/snapshots/{compile_file_o_all__spacing.hvm.snap => compile_file_o_all__spacing.bend.snap} (55%)
 rename tests/snapshots/{compile_file_o_all__spacing2.hvm.snap => compile_file_o_all__spacing2.bend.snap} (52%)
 rename tests/snapshots/{compile_file_o_all__str.hvm.snap => compile_file_o_all__str.bend.snap} (83%)
 rename tests/snapshots/{compile_file_o_all__sum_predicates.hvm.snap => compile_file_o_all__sum_predicates.bend.snap} (98%)
 rename tests/snapshots/{compile_file_o_all__tagged_dup.hvm.snap => compile_file_o_all__tagged_dup.bend.snap} (54%)
 rename tests/snapshots/{compile_file_o_all__tagged_lam.hvm.snap => compile_file_o_all__tagged_lam.bend.snap} (58%)
 rename tests/snapshots/{compile_file_o_all__tagged_sup.hvm.snap => compile_file_o_all__tagged_sup.bend.snap} (54%)
 rename tests/snapshots/{compile_file_o_all__unapplied_eta.hvm.snap => compile_file_o_all__unapplied_eta.bend.snap} (96%)
 create mode 100644 tests/snapshots/compile_file_o_all__unscoped_eta.bend.snap
 delete mode 100644 tests/snapshots/compile_file_o_all__unscoped_eta.hvm.snap
 rename tests/snapshots/{compile_file_o_all__var_shadows_ref.hvm.snap => compile_file_o_all__var_shadows_ref.bend.snap} (95%)
 rename tests/snapshots/{compile_file_o_all__weekday.hvm.snap => compile_file_o_all__weekday.bend.snap} (67%)
 rename tests/snapshots/{compile_file_o_no_all__bitonic_sort.hvm.snap => compile_file_o_no_all__bitonic_sort.bend.snap} (99%)
 rename tests/snapshots/{compile_file_o_no_all__list_reverse.hvm.snap => compile_file_o_no_all__list_reverse.bend.snap} (99%)
 rename tests/snapshots/{compile_file_o_no_all__redex_order.hvm.snap => compile_file_o_no_all__redex_order.bend.snap} (98%)
 rename tests/snapshots/{compile_file_o_no_all__sum_tree.hvm.snap => compile_file_o_no_all__sum_tree.bend.snap} (95%)
 rename tests/snapshots/{desugar_file__bind_syntax.hvm.snap => desugar_file__bind_syntax.bend.snap} (94%)
 rename tests/snapshots/{desugar_file__combinators.hvm.snap => desugar_file__combinators.bend.snap} (90%)
 rename tests/snapshots/{desugar_file__deref_loop.hvm.snap => desugar_file__deref_loop.bend.snap} (75%)
 rename tests/snapshots/{desugar_file__dup_linearization.hvm.snap => desugar_file__dup_linearization.bend.snap} (55%)
 rename tests/snapshots/{desugar_file__non_exaustive_limit.hvm.snap => desugar_file__non_exaustive_limit.bend.snap} (98%)
 rename tests/snapshots/{desugar_file__switch_with_use.hvm.snap => desugar_file__switch_with_use.bend.snap} (68%)
 rename tests/snapshots/{desugar_file__use_id.hvm.snap => desugar_file__use_id.bend.snap} (62%)
 rename tests/snapshots/{desugar_file__use_shadow.hvm.snap => desugar_file__use_shadow.bend.snap} (56%)
 rename tests/snapshots/{desugar_file__used_once_names.hvm.snap => desugar_file__used_once_names.bend.snap} (63%)
 rename tests/snapshots/{encode_pattern_match__adt_tup_era.hvm.snap => encode_pattern_match__adt_tup_era.bend.snap} (97%)
 rename tests/snapshots/{encode_pattern_match__and3.hvm.snap => encode_pattern_match__and3.bend.snap} (78%)
 rename tests/snapshots/{encode_pattern_match__bool.hvm.snap => encode_pattern_match__bool.bend.snap} (85%)
 rename tests/snapshots/{encode_pattern_match__bool_tup.hvm.snap => encode_pattern_match__bool_tup.bend.snap} (71%)
 rename tests/snapshots/{encode_pattern_match__box.hvm.snap => encode_pattern_match__box.bend.snap} (59%)
 rename tests/snapshots/{encode_pattern_match__common.hvm.snap => encode_pattern_match__common.bend.snap} (90%)
 rename tests/snapshots/{encode_pattern_match__concat.hvm.snap => encode_pattern_match__concat.bend.snap} (82%)
 rename tests/snapshots/{encode_pattern_match__concat_def.hvm.snap => encode_pattern_match__concat_def.bend.snap} (80%)
 rename tests/snapshots/{encode_pattern_match__def_tups.hvm.snap => encode_pattern_match__def_tups.bend.snap} (72%)
 rename tests/snapshots/{encode_pattern_match__definition_merge.hvm.snap => encode_pattern_match__definition_merge.bend.snap} (96%)
 rename tests/snapshots/{encode_pattern_match__expr.hvm.snap => encode_pattern_match__expr.bend.snap} (92%)
 rename tests/snapshots/{encode_pattern_match__flatten_era_pat.hvm.snap => encode_pattern_match__flatten_era_pat.bend.snap} (97%)
 rename tests/snapshots/{encode_pattern_match__is_some_some.hvm.snap => encode_pattern_match__is_some_some.bend.snap} (97%)
 rename tests/snapshots/{encode_pattern_match__list_merge_sort.hvm.snap => encode_pattern_match__list_merge_sort.bend.snap} (99%)
 rename tests/snapshots/{encode_pattern_match__list_str_encoding_undeclared_fn.hvm.snap => encode_pattern_match__list_str_encoding_undeclared_fn.bend.snap} (87%)
 rename tests/snapshots/{encode_pattern_match__list_str_encoding_undeclared_map.hvm.snap => encode_pattern_match__list_str_encoding_undeclared_map.bend.snap} (85%)
 rename tests/snapshots/{encode_pattern_match__match_adt_unscoped_in_arm.hvm.snap => encode_pattern_match__match_adt_unscoped_in_arm.bend.snap} (89%)
 rename tests/snapshots/{encode_pattern_match__match_adt_unscoped_lambda.hvm.snap => encode_pattern_match__match_adt_unscoped_lambda.bend.snap} (91%)
 rename tests/snapshots/{encode_pattern_match__match_adt_unscoped_var.hvm.snap => encode_pattern_match__match_adt_unscoped_var.bend.snap} (94%)
 rename tests/snapshots/{encode_pattern_match__match_auto_linearization.hvm.snap => encode_pattern_match__match_auto_linearization.bend.snap} (98%)
 rename tests/snapshots/{encode_pattern_match__match_bind.hvm.snap => encode_pattern_match__match_bind.bend.snap} (66%)
 rename tests/snapshots/{encode_pattern_match__match_num_adt_tup_parser.hvm.snap => encode_pattern_match__match_num_adt_tup_parser.bend.snap} (97%)
 rename tests/snapshots/{encode_pattern_match__match_num_pred.hvm.snap => encode_pattern_match__match_num_pred.bend.snap} (98%)
 rename tests/snapshots/{encode_pattern_match__match_syntax.hvm.snap => encode_pattern_match__match_syntax.bend.snap} (97%)
 rename tests/snapshots/{encode_pattern_match__merge_recursive.hvm.snap => encode_pattern_match__merge_recursive.bend.snap} (95%)
 rename tests/snapshots/{encode_pattern_match__no_patterns.hvm.snap => encode_pattern_match__no_patterns.bend.snap} (96%)
 rename tests/snapshots/{encode_pattern_match__non_matching_fst_arg.hvm.snap => encode_pattern_match__non_matching_fst_arg.bend.snap} (93%)
 rename tests/snapshots/{encode_pattern_match__ntup_sum.hvm.snap => encode_pattern_match__ntup_sum.bend.snap} (68%)
 rename tests/snapshots/{encode_pattern_match__pattern_match_encoding.hvm.snap => encode_pattern_match__pattern_match_encoding.bend.snap} (96%)
 rename tests/snapshots/{encode_pattern_match__switch_in_switch_arg.hvm.snap => encode_pattern_match__switch_in_switch_arg.bend.snap} (92%)
 rename tests/snapshots/{encode_pattern_match__var_only.hvm.snap => encode_pattern_match__var_only.bend.snap} (66%)
 rename tests/snapshots/{encode_pattern_match__weekday.hvm.snap => encode_pattern_match__weekday.bend.snap} (86%)
 rename tests/snapshots/{examples__all_tree.hvm.snap => examples__all_tree.bend.snap} (57%)
 create mode 100644 tests/snapshots/examples__alloc_small_tree.bend.snap
 delete mode 100644 tests/snapshots/examples__alloc_small_tree.hvm.snap
 rename tests/snapshots/{examples__bitonic_sort.hvm.snap => examples__bitonic_sort.bend.snap} (53%)
 rename tests/snapshots/{examples__bubble_sort.hvm.snap => examples__bubble_sort.bend.snap} (54%)
 rename tests/snapshots/{examples__callcc.hvm.snap => examples__callcc.bend.snap} (55%)
 rename tests/snapshots/{examples__example.hvm.snap => examples__example.bend.snap} (54%)
 rename tests/snapshots/{examples__fib.hvm.snap => examples__fib.bend.snap} (60%)
 rename tests/snapshots/{examples__fusing_add.hvm.snap => examples__fusing_add.bend.snap} (64%)
 rename tests/snapshots/{examples__fusing_not.hvm.snap => examples__fusing_not.bend.snap} (61%)
 rename tests/snapshots/{examples__gen_tree.hvm.snap => examples__gen_tree.bend.snap} (99%)
 delete mode 100644 tests/snapshots/examples__hello_world.hvm.snap
 rename tests/snapshots/{examples__neg_fusion.hvm.snap => examples__neg_fusion.bend.snap} (56%)
 create mode 100644 tests/snapshots/examples__queue.bend.snap
 delete mode 100644 tests/snapshots/examples__queue.hvm.snap
 rename tests/snapshots/{examples__quick_sort.hvm.snap => examples__quick_sort.bend.snap} (55%)
 rename tests/snapshots/{examples__radix_sort.hvm.snap => examples__radix_sort.bend.snap} (53%)
 delete mode 100644 tests/snapshots/examples__sat_solver.hvm.snap
 delete mode 100644 tests/snapshots/hangs__recursive_with_unscoped.hvm.snap
 delete mode 100644 tests/snapshots/io__load.hvm.snap
 delete mode 100644 tests/snapshots/io__load_fail.hvm.snap
 delete mode 100644 tests/snapshots/io__store.hvm.snap
 delete mode 100644 tests/snapshots/io__store_fail.hvm.snap
 rename tests/snapshots/{linear_readback__church_mul.hvm.snap => linear_readback__church_mul.bend.snap} (64%)
 rename tests/snapshots/{mutual_recursion__a_b_c.hvm.snap => mutual_recursion__a_b_c.bend.snap} (95%)
 rename tests/snapshots/{mutual_recursion__len.hvm.snap => mutual_recursion__len.bend.snap} (87%)
 rename tests/snapshots/{mutual_recursion__merged.hvm.snap => mutual_recursion__merged.bend.snap} (96%)
 rename tests/snapshots/{mutual_recursion__multiple.hvm.snap => mutual_recursion__multiple.bend.snap} (95%)
 rename tests/snapshots/{mutual_recursion__odd_even.hvm.snap => mutual_recursion__odd_even.bend.snap} (95%)
 rename tests/snapshots/{parse_file__imp_map.hvm.snap => parse_file__imp_map.bend.snap} (95%)
 rename tests/snapshots/{parse_file__imp_program.hvm.snap => parse_file__imp_program.bend.snap} (94%)
 rename tests/snapshots/{parse_file__repeated_adt_name.hvm.snap => parse_file__repeated_adt_name.bend.snap} (58%)
 rename tests/snapshots/{parse_file__scape_chars.hvm.snap => parse_file__scape_chars.bend.snap} (84%)
 create mode 100644 tests/snapshots/readback_lnet__addition.bend.snap
 delete mode 100644 tests/snapshots/readback_lnet__addition.hvm.snap
 rename tests/snapshots/{readback_lnet__bad_net.hvm.snap => readback_lnet__bad_net.bend.snap} (66%)
 create mode 100644 tests/snapshots/readback_lnet__bad_net1.bend.snap
 delete mode 100644 tests/snapshots/readback_lnet__bad_net1.hvm.snap
 create mode 100644 tests/snapshots/readback_lnet__bad_net3.bend.snap
 delete mode 100644 tests/snapshots/readback_lnet__bad_net3.hvm.snap
 rename tests/snapshots/{readback_lnet__complicated_dup.hvm.snap => readback_lnet__complicated_dup.bend.snap} (54%)
 rename tests/snapshots/{readback_lnet__fst_snd.hvm.snap => readback_lnet__fst_snd.bend.snap} (52%)
 create mode 100644 tests/snapshots/readback_lnet__id.bend.snap
 delete mode 100644 tests/snapshots/readback_lnet__id.hvm.snap
 rename tests/snapshots/{readback_lnet__invalid_op2_op2.hvm.snap => readback_lnet__invalid_op2_op2.bend.snap} (69%)
 rename tests/snapshots/{readback_lnet__match.hvm.snap => readback_lnet__match.bend.snap} (56%)
 create mode 100644 tests/snapshots/readback_lnet__nested_let.bend.snap
 delete mode 100644 tests/snapshots/readback_lnet__nested_let.hvm.snap
 create mode 100644 tests/snapshots/readback_lnet__nested_tup.bend.snap
 delete mode 100644 tests/snapshots/readback_lnet__nested_tup.hvm.snap
 create mode 100644 tests/snapshots/readback_lnet__number.bend.snap
 delete mode 100644 tests/snapshots/readback_lnet__number.hvm.snap
 create mode 100644 tests/snapshots/readback_lnet__simple_tup.bend.snap
 delete mode 100644 tests/snapshots/readback_lnet__simple_tup.hvm.snap
 create mode 100644 tests/snapshots/readback_lnet__tup_add.bend.snap
 delete mode 100644 tests/snapshots/readback_lnet__tup_add.hvm.snap
 delete mode 100644 tests/snapshots/run_entrypoint__foo.hvm.snap
 rename tests/snapshots/{run_file__360_no_scope.hvm.snap => run_file__360_no_scope.bend.snap} (63%)
 create mode 100644 tests/snapshots/run_file__addition.bend.snap
 delete mode 100644 tests/snapshots/run_file__addition.hvm.snap
 create mode 100644 tests/snapshots/run_file__adt_match.bend.snap
 delete mode 100644 tests/snapshots/run_file__adt_match.hvm.snap
 rename tests/snapshots/{run_file__adt_match_wrong_tag.hvm.snap => run_file__adt_match_wrong_tag.bend.snap} (58%)
 rename tests/snapshots/{run_file__adt_option_and.hvm.snap => run_file__adt_option_and.bend.snap} (66%)
 rename tests/snapshots/{run_file__adt_wrong_tag.hvm.snap => run_file__adt_wrong_tag.bend.snap} (60%)
 rename tests/snapshots/{run_file__and.hvm.snap => run_file__and.bend.snap} (50%)
 delete mode 100644 tests/snapshots/run_file__bend_fold.hvm.snap
 create mode 100644 tests/snapshots/run_file__bitonic_sort.bend.snap
 delete mode 100644 tests/snapshots/run_file__bitonic_sort.hvm.snap
 create mode 100644 tests/snapshots/run_file__bitonic_sort_lam.bend.snap
 delete mode 100644 tests/snapshots/run_file__bitonic_sort_lam.hvm.snap
 rename tests/snapshots/{run_file__box.hvm.snap => run_file__box.bend.snap} (53%)
 rename tests/snapshots/{run_file__branch_statements_assignment.hvm.snap => run_file__branch_statements_assignment.bend.snap} (91%)
 create mode 100644 tests/snapshots/run_file__callcc.bend.snap
 delete mode 100644 tests/snapshots/run_file__callcc.hvm.snap
 rename tests/snapshots/{run_file__chars.hvm.snap => run_file__chars.bend.snap} (65%)
 create mode 100644 tests/snapshots/run_file__chars_forall.bend.snap
 delete mode 100644 tests/snapshots/run_file__chars_forall.hvm.snap
 create mode 100644 tests/snapshots/run_file__chars_lambda.bend.snap
 delete mode 100644 tests/snapshots/run_file__chars_lambda.hvm.snap
 rename tests/snapshots/{run_file__def_bool_num.hvm.snap => run_file__def_bool_num.bend.snap} (76%)
 rename tests/snapshots/{run_file__def_num_bool.hvm.snap => run_file__def_num_bool.bend.snap} (76%)
 create mode 100644 tests/snapshots/run_file__def_tups.bend.snap
 delete mode 100644 tests/snapshots/run_file__def_tups.hvm.snap
 create mode 100644 tests/snapshots/run_file__do_block_mixed.bend.snap
 delete mode 100644 tests/snapshots/run_file__do_block_mixed.hvm.snap
 create mode 100644 tests/snapshots/run_file__dup_global_lam.bend.snap
 delete mode 100644 tests/snapshots/run_file__dup_global_lam.hvm.snap
 rename tests/snapshots/{run_file__empty.hvm.snap => run_file__empty.bend.snap} (64%)
 create mode 100644 tests/snapshots/run_file__erased_side_effect.bend.snap
 delete mode 100644 tests/snapshots/run_file__erased_side_effect.hvm.snap
 rename tests/snapshots/{run_file__escape_sequences.hvm.snap => run_file__escape_sequences.bend.snap} (85%)
 create mode 100644 tests/snapshots/run_file__eta.bend.snap
 delete mode 100644 tests/snapshots/run_file__eta.hvm.snap
 create mode 100644 tests/snapshots/run_file__example.bend.snap
 delete mode 100644 tests/snapshots/run_file__example.hvm.snap
 rename tests/snapshots/{run_file__exp.hvm.snap => run_file__exp.bend.snap} (73%)
 create mode 100644 tests/snapshots/run_file__extracted_match_pred.bend.snap
 delete mode 100644 tests/snapshots/run_file__extracted_match_pred.hvm.snap
 create mode 100644 tests/snapshots/run_file__field_vectorization.bend.snap
 delete mode 100644 tests/snapshots/run_file__field_vectorization.hvm.snap
 create mode 100644 tests/snapshots/run_file__id_underscore.bend.snap
 delete mode 100644 tests/snapshots/run_file__id_underscore.hvm.snap
 create mode 100644 tests/snapshots/run_file__kind_compiled_tree_sum.bend.snap
 delete mode 100644 tests/snapshots/run_file__kind_compiled_tree_sum.hvm.snap
 create mode 100644 tests/snapshots/run_file__lam_op2.bend.snap
 delete mode 100644 tests/snapshots/run_file__lam_op2.hvm.snap
 rename tests/snapshots/{run_file__lam_op2_nested.hvm.snap => run_file__lam_op2_nested.bend.snap} (72%)
 rename tests/snapshots/{run_file__let_tup_readback.hvm.snap => run_file__let_tup_readback.bend.snap} (69%)
 rename tests/snapshots/{run_file__linearize_match.hvm.snap => run_file__linearize_match.bend.snap} (73%)
 rename tests/snapshots/{run_file__list_resugar.hvm.snap => run_file__list_resugar.bend.snap} (63%)
 rename tests/snapshots/{run_file__list_reverse.hvm.snap => run_file__list_reverse.bend.snap} (60%)
 rename tests/snapshots/{run_file__list_take.hvm.snap => run_file__list_take.bend.snap} (57%)
 create mode 100644 tests/snapshots/run_file__list_to_tree.bend.snap
 delete mode 100644 tests/snapshots/run_file__list_to_tree.hvm.snap
 delete mode 100644 tests/snapshots/run_file__log.hvm.snap
 create mode 100644 tests/snapshots/run_file__match.bend.snap
 delete mode 100644 tests/snapshots/run_file__match.hvm.snap
 rename tests/snapshots/{run_file__match_builtins.hvm.snap => run_file__match_builtins.bend.snap} (77%)
 rename tests/snapshots/{run_file__match_mult_linearization.hvm.snap => run_file__match_mult_linearization.bend.snap} (97%)
 rename tests/snapshots/{run_file__match_num_adt_tup_parser.hvm.snap => run_file__match_num_adt_tup_parser.bend.snap} (96%)
 rename tests/snapshots/{run_file__match_num_explicit_bind.hvm.snap => run_file__match_num_explicit_bind.bend.snap} (95%)
 rename tests/snapshots/{run_file__match_num_num_to_char.hvm.snap => run_file__match_num_num_to_char.bend.snap} (89%)
 rename tests/snapshots/{run_file__match_num_succ_complex.hvm.snap => run_file__match_num_succ_complex.bend.snap} (79%)
 rename tests/snapshots/{run_file__match_str.hvm.snap => run_file__match_str.bend.snap} (70%)
 rename tests/snapshots/{run_file__match_sup.hvm.snap => run_file__match_sup.bend.snap} (58%)
 rename tests/snapshots/{run_file__match_vars.hvm.snap => run_file__match_vars.bend.snap} (87%)
 create mode 100644 tests/snapshots/run_file__merge_sort.bend.snap
 delete mode 100644 tests/snapshots/run_file__merge_sort.hvm.snap
 create mode 100644 tests/snapshots/run_file__mixed_syntax.bend.snap
 delete mode 100644 tests/snapshots/run_file__mixed_syntax.hvm.snap
 create mode 100644 tests/snapshots/run_file__names_hyphen.bend.snap
 delete mode 100644 tests/snapshots/run_file__names_hyphen.hvm.snap
 create mode 100644 tests/snapshots/run_file__names_hyphen_toplevel.bend.snap
 delete mode 100644 tests/snapshots/run_file__names_hyphen_toplevel.hvm.snap
 rename tests/snapshots/{run_file__nat_add.hvm.snap => run_file__nat_add.bend.snap} (89%)
 rename tests/snapshots/{run_file__nat_add_num.hvm.snap => run_file__nat_add_num.bend.snap} (60%)
 rename tests/snapshots/{run_file__nested_list_and_string.hvm.snap => run_file__nested_list_and_string.bend.snap} (81%)
 rename tests/snapshots/{run_file__nested_str.hvm.snap => run_file__nested_str.bend.snap} (75%)
 rename tests/snapshots/{run_file__num_match_missing_var.hvm.snap => run_file__num_match_missing_var.bend.snap} (52%)
 create mode 100644 tests/snapshots/run_file__num_pred.bend.snap
 delete mode 100644 tests/snapshots/run_file__num_pred.hvm.snap
 rename tests/snapshots/{run_file__override_list_ctr.hvm.snap => run_file__override_list_ctr.bend.snap} (68%)
 rename tests/snapshots/{run_file__override_str_ctr.hvm.snap => run_file__override_str_ctr.bend.snap} (69%)
 create mode 100644 tests/snapshots/run_file__pred.bend.snap
 delete mode 100644 tests/snapshots/run_file__pred.hvm.snap
 delete mode 100644 tests/snapshots/run_file__print.hvm.snap
 rename tests/snapshots/{run_file__queue.hvm.snap => run_file__queue.bend.snap} (59%)
 create mode 100644 tests/snapshots/run_file__radix_sort_ctr.bend.snap
 delete mode 100644 tests/snapshots/run_file__radix_sort_ctr.hvm.snap
 rename tests/snapshots/{run_file__readback_hvm1_main.hvm.snap => run_file__readback_hvm1_main.bend.snap} (71%)
 rename tests/snapshots/{run_file__readback_list_other_ctr.hvm.snap => run_file__readback_list_other_ctr.bend.snap} (97%)
 create mode 100644 tests/snapshots/run_file__recursive_bind.bend.snap
 delete mode 100644 tests/snapshots/run_file__recursive_bind.hvm.snap
 create mode 100644 tests/snapshots/run_file__recursive_combinator.bend.snap
 delete mode 100644 tests/snapshots/run_file__recursive_combinator.hvm.snap
 rename tests/snapshots/{run_file__recursive_combinator_nested.hvm.snap => run_file__recursive_combinator_nested.bend.snap} (74%)
 create mode 100644 tests/snapshots/run_file__recursive_match_native.bend.snap
 delete mode 100644 tests/snapshots/run_file__recursive_match_native.hvm.snap
 create mode 100644 tests/snapshots/run_file__ref_resolution.bend.snap
 delete mode 100644 tests/snapshots/run_file__ref_resolution.hvm.snap
 rename tests/snapshots/{run_file__repeated_name_truncation.hvm.snap => run_file__repeated_name_truncation.bend.snap} (95%)
 create mode 100644 tests/snapshots/run_file__scopeless_discard.bend.snap
 delete mode 100644 tests/snapshots/run_file__scopeless_discard.hvm.snap
 rename tests/snapshots/{run_file__str_concat.hvm.snap => run_file__str_concat.bend.snap} (80%)
 rename tests/snapshots/{run_file__str_inc.hvm.snap => run_file__str_inc.bend.snap} (65%)
 rename tests/snapshots/{run_file__str_inc_eta.hvm.snap => run_file__str_inc_eta.bend.snap} (64%)
 create mode 100644 tests/snapshots/run_file__str_len.bend.snap
 delete mode 100644 tests/snapshots/run_file__str_len.hvm.snap
 create mode 100644 tests/snapshots/run_file__sum_tree.bend.snap
 delete mode 100644 tests/snapshots/run_file__sum_tree.hvm.snap
 create mode 100644 tests/snapshots/run_file__sup_app.bend.snap
 delete mode 100644 tests/snapshots/run_file__sup_app.hvm.snap
 create mode 100644 tests/snapshots/run_file__sup_reconstruction.bend.snap
 delete mode 100644 tests/snapshots/run_file__sup_reconstruction.hvm.snap
 create mode 100644 tests/snapshots/run_file__superposed_is_even.bend.snap
 delete mode 100644 tests/snapshots/run_file__superposed_is_even.hvm.snap
 rename tests/snapshots/{run_file__tagged_lam.hvm.snap => run_file__tagged_lam.bend.snap} (63%)
 rename tests/snapshots/{run_file__tup_list_strings.hvm.snap => run_file__tup_list_strings.bend.snap} (81%)
 create mode 100644 tests/snapshots/run_file__tup_reconstruction.bend.snap
 delete mode 100644 tests/snapshots/run_file__tup_reconstruction.hvm.snap
 rename tests/snapshots/{run_file__tuple_rots.hvm.snap => run_file__tuple_rots.bend.snap} (52%)
 rename tests/snapshots/{run_file__unaplied_str.hvm.snap => run_file__unaplied_str.bend.snap} (66%)
 rename tests/snapshots/{run_file__unscoped_never_used.hvm.snap => run_file__unscoped_never_used.bend.snap} (70%)
 create mode 100644 tests/snapshots/run_file__unused_dup_var.bend.snap
 delete mode 100644 tests/snapshots/run_file__unused_dup_var.hvm.snap
 rename tests/snapshots/{run_file__world.hvm.snap => run_file__world.bend.snap} (57%)
 rename tests/snapshots/{run_file__wrong_string.hvm.snap => run_file__wrong_string.bend.snap} (58%)
 delete mode 100644 tests/snapshots/run_lazy__addition.hvm.snap
 delete mode 100644 tests/snapshots/run_lazy__adt_match.hvm.snap
 delete mode 100644 tests/snapshots/run_lazy__adt_match_wrong_tag.hvm.snap
 delete mode 100644 tests/snapshots/run_lazy__adt_option_and.hvm.snap
 delete mode 100644 tests/snapshots/run_lazy__adt_wrong_tag.hvm.snap
 delete mode 100644 tests/snapshots/run_lazy__and.hvm.snap
 delete mode 100644 tests/snapshots/run_lazy__bitonic_sort.hvm.snap
 delete mode 100644 tests/snapshots/run_lazy__bitonic_sort_lam.hvm.snap
 delete mode 100644 tests/snapshots/run_lazy__box.hvm.snap
 delete mode 100644 tests/snapshots/run_lazy__box2.hvm.snap
 delete mode 100644 tests/snapshots/run_lazy__callcc.hvm.snap
 delete mode 100644 tests/snapshots/run_lazy__chars.hvm.snap
 delete mode 100644 tests/snapshots/run_lazy__def_tups.hvm.snap
 delete mode 100644 tests/snapshots/run_lazy__dup_global_lam.hvm.snap
 delete mode 100644 tests/snapshots/run_lazy__eta.hvm.snap
 delete mode 100644 tests/snapshots/run_lazy__example.hvm.snap
 delete mode 100644 tests/snapshots/run_lazy__exp.hvm.snap
 delete mode 100644 tests/snapshots/run_lazy__extracted_match_pred.hvm.snap
 delete mode 100644 tests/snapshots/run_lazy__field_vectorization.hvm.snap
 delete mode 100644 tests/snapshots/run_lazy__lam_op2.hvm.snap
 delete mode 100644 tests/snapshots/run_lazy__lam_op2_nested.hvm.snap
 delete mode 100644 tests/snapshots/run_lazy__let_tup_readback.hvm.snap
 delete mode 100644 tests/snapshots/run_lazy__linearize_match.hvm.snap
 delete mode 100644 tests/snapshots/run_lazy__list_resugar.hvm.snap
 delete mode 100644 tests/snapshots/run_lazy__list_reverse.hvm.snap
 delete mode 100644 tests/snapshots/run_lazy__list_take.hvm.snap
 delete mode 100644 tests/snapshots/run_lazy__list_to_tree.hvm.snap
 delete mode 100644 tests/snapshots/run_lazy__match.hvm.snap
 delete mode 100644 tests/snapshots/run_lazy__match_builtins.hvm.snap
 delete mode 100644 tests/snapshots/run_lazy__match_mult_linearization.hvm.snap
 delete mode 100644 tests/snapshots/run_lazy__match_num_explicit_bind.hvm.snap
 delete mode 100644 tests/snapshots/run_lazy__merge_sort.hvm.snap
 delete mode 100644 tests/snapshots/run_lazy__nested_list_and_string.hvm.snap
 delete mode 100644 tests/snapshots/run_lazy__nested_str.hvm.snap
 delete mode 100644 tests/snapshots/run_lazy__num_pred.hvm.snap
 delete mode 100644 tests/snapshots/run_lazy__queue.hvm.snap
 delete mode 100644 tests/snapshots/run_lazy__radix_sort_ctr.hvm.snap
 delete mode 100644 tests/snapshots/run_lazy__recursive_match_native.hvm.snap
 delete mode 100644 tests/snapshots/run_lazy__scopeless_discard.hvm.snap
 delete mode 100644 tests/snapshots/run_lazy__str_concat.hvm.snap
 delete mode 100644 tests/snapshots/run_lazy__str_inc.hvm.snap
 delete mode 100644 tests/snapshots/run_lazy__str_inc_eta.hvm.snap
 delete mode 100644 tests/snapshots/run_lazy__str_len.hvm.snap
 delete mode 100644 tests/snapshots/run_lazy__sum_tree.hvm.snap
 delete mode 100644 tests/snapshots/run_lazy__sup_app.hvm.snap
 delete mode 100644 tests/snapshots/run_lazy__sup_reconstruction.hvm.snap
 delete mode 100644 tests/snapshots/run_lazy__superposed_is_even.hvm.snap
 delete mode 100644 tests/snapshots/run_lazy__tagged_lam.hvm.snap
 delete mode 100644 tests/snapshots/run_lazy__tup_reconstruction.hvm.snap
 delete mode 100644 tests/snapshots/run_lazy__tuple_rots.hvm.snap
 delete mode 100644 tests/snapshots/run_lazy__unaplied_str.hvm.snap
 delete mode 100644 tests/snapshots/run_lazy__unused_dup_var.hvm.snap
 delete mode 100644 tests/snapshots/run_lazy__world.hvm.snap
 delete mode 100644 tests/snapshots/run_lazy__wrong_string.hvm.snap
 rename tests/snapshots/{scott_triggers_unused__test.hvm.snap => scott_triggers_unused__test.bend.snap} (61%)
 rename tests/snapshots/{simplify_matches__adt_tup_era.hvm.snap => simplify_matches__adt_tup_era.bend.snap} (74%)
 rename tests/snapshots/{simplify_matches__already_flat.hvm.snap => simplify_matches__already_flat.bend.snap} (92%)
 rename tests/snapshots/{simplify_matches__bits_dec.hvm.snap => simplify_matches__bits_dec.bend.snap} (88%)
 rename tests/snapshots/{simplify_matches__complex_with_case.hvm.snap => simplify_matches__complex_with_case.bend.snap} (98%)
 rename tests/snapshots/{simplify_matches__double_unwrap_box.hvm.snap => simplify_matches__double_unwrap_box.bend.snap} (97%)
 rename tests/snapshots/{simplify_matches__double_unwrap_maybe.hvm.snap => simplify_matches__double_unwrap_maybe.bend.snap} (97%)
 rename tests/snapshots/{simplify_matches__flatten_with_terminal.hvm.snap => simplify_matches__flatten_with_terminal.bend.snap} (96%)
 rename tests/snapshots/{simplify_matches__linearize_match_all.hvm.snap => simplify_matches__linearize_match_all.bend.snap} (99%)
 rename tests/snapshots/{simplify_matches__match_str.hvm.snap => simplify_matches__match_str.bend.snap} (88%)
 rename tests/snapshots/{simplify_matches__nested.hvm.snap => simplify_matches__nested.bend.snap} (85%)
 rename tests/snapshots/{simplify_matches__nested2.hvm.snap => simplify_matches__nested2.bend.snap} (82%)
 rename tests/snapshots/{simplify_matches__nested_0ary.hvm.snap => simplify_matches__nested_0ary.bend.snap} (80%)
 rename tests/snapshots/{simplify_matches__redundant_with_era.hvm.snap => simplify_matches__redundant_with_era.bend.snap} (96%)
 rename tests/snapshots/{simplify_matches__wrong_fn_arity.hvm.snap => simplify_matches__wrong_fn_arity.bend.snap} (74%)

diff --git a/.gitignore b/.gitignore
index 811e6f6e..022fb433 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /target
 *.snap.new
+.out.hvm
\ No newline at end of file
diff --git a/README.md b/README.md
index 45e2f430..d6c831f5 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,5 @@
 # Bend
 
-_Note: The latest version of Bend targets an unreleased version of HVM. If you want to use Bend right now, use branch [hvm-core](https://github.com/HigherOrderCO/bend/tree/hvm-core)_.
-
 Bend is a programming language that can run massively parallel programs on the GPU or the CPU using the power of interaction nets and the [HVM](https://github.com/HigherOrderCO/hvm).
 With Bend, you can write programs for the GPU as easily as you'd write a normal program in your favorite language.
 
diff --git a/examples/merge_sort.bend b/examples/merge_sort.bend
deleted file mode 100644
index 6b05409a..00000000
--- a/examples/merge_sort.bend
+++ /dev/null
@@ -1,15 +0,0 @@
-data Tree = (node ~lft ~rgt) | (leaf val)
-
-(MergeSort tree) = fold tree {
-  Tree/node: (merge tree.lft tree.rgt)
-  Tree/leaf: tree
-}
-
-(Merge (Tree/leaf a) (Tree/leaf b)) =
-  let (a, b) = if (<= a b) { (a, b) } else { (b, a) }
-  (Tree/node (Tree/leaf a) (Tree/leaf b))
-
-
-(concat a b) = match a {
-  List/cons: 
-}
\ No newline at end of file
diff --git a/tests/golden_tests.rs b/tests/golden_tests.rs
index 74af7b95..2d6c95cb 100644
--- a/tests/golden_tests.rs
+++ b/tests/golden_tests.rs
@@ -69,7 +69,7 @@ fn run_golden_test_dir_multiple(test_name: &str, run: &[&RunFn]) {
 
   let walker = WalkDir::new(&root).sort_by_file_name().max_depth(2).into_iter().filter_entry(|e| {
     let path = e.path();
-    path == root || path.is_dir() || (path.is_file() && path.extension().is_some_and(|x| x == "hvm"))
+    path == root || path.is_dir() || (path.is_file() && path.extension().is_some_and(|x| x == "bend"))
   });
 
   for entry in walker {
@@ -407,7 +407,7 @@ fn examples() -> Result<(), Diagnostics> {
     .min_depth(1)
     .into_iter()
     .filter_map(|e| e.ok())
-    .filter(|e| e.path().extension().map_or(false, |ext| ext == "hvm"))
+    .filter(|e| e.path().extension().map_or(false, |ext| ext == "bend"))
   {
     let _guard = RUN_MUTEX.lock().unwrap();
     let path = entry.path();
diff --git a/tests/golden_tests/cli/compile_all.args b/tests/golden_tests/cli/compile_all.args
index a5e9dfc4..792521e5 100644
--- a/tests/golden_tests/cli/compile_all.args
+++ b/tests/golden_tests/cli/compile_all.args
@@ -1,3 +1,3 @@
 gen-hvm
-tests/golden_tests/cli/compile_all.hvm
+tests/golden_tests/cli/compile_all.bend
 -Oall
diff --git a/tests/golden_tests/cli/compile_all.hvm b/tests/golden_tests/cli/compile_all.bend
similarity index 100%
rename from tests/golden_tests/cli/compile_all.hvm
rename to tests/golden_tests/cli/compile_all.bend
diff --git a/tests/golden_tests/cli/compile_inline.args b/tests/golden_tests/cli/compile_inline.args
index 808af8db..85309a20 100644
--- a/tests/golden_tests/cli/compile_inline.args
+++ b/tests/golden_tests/cli/compile_inline.args
@@ -1,3 +1,3 @@
 gen-hvm
-tests/golden_tests/cli/compile_inline.hvm
+tests/golden_tests/cli/compile_inline.bend
 -Oinline
diff --git a/tests/golden_tests/cli/compile_inline.hvm b/tests/golden_tests/cli/compile_inline.bend
similarity index 100%
rename from tests/golden_tests/cli/compile_inline.hvm
rename to tests/golden_tests/cli/compile_inline.bend
diff --git a/tests/golden_tests/cli/compile_no_opts.args b/tests/golden_tests/cli/compile_no_opts.args
index db634417..3c005902 100644
--- a/tests/golden_tests/cli/compile_no_opts.args
+++ b/tests/golden_tests/cli/compile_no_opts.args
@@ -1,9 +1,8 @@
 gen-hvm
-tests/golden_tests/cli/compile_no_opts.hvm
+tests/golden_tests/cli/compile_no_opts.bend
 -Ono-all
 -Ono-eta
 -Ono-prune
--Ono-pre-reduce
 -Ono-float-combinators
 -Ono-merge
 -Ono-inline
diff --git a/tests/golden_tests/cli/compile_no_opts.hvm b/tests/golden_tests/cli/compile_no_opts.bend
similarity index 100%
rename from tests/golden_tests/cli/compile_no_opts.hvm
rename to tests/golden_tests/cli/compile_no_opts.bend
diff --git a/tests/golden_tests/cli/compile_pre_reduce.args b/tests/golden_tests/cli/compile_pre_reduce.args
index d4c2716c..510420de 100644
--- a/tests/golden_tests/cli/compile_pre_reduce.args
+++ b/tests/golden_tests/cli/compile_pre_reduce.args
@@ -1,3 +1,3 @@
 gen-hvm
-tests/golden_tests/cli/compile_pre_reduce.hvm
+tests/golden_tests/cli/compile_pre_reduce.bend
 -Opre-reduce
diff --git a/tests/golden_tests/cli/compile_pre_reduce.hvm b/tests/golden_tests/cli/compile_pre_reduce.bend
similarity index 100%
rename from tests/golden_tests/cli/compile_pre_reduce.hvm
rename to tests/golden_tests/cli/compile_pre_reduce.bend
diff --git a/tests/golden_tests/cli/compile_strict_loop.args b/tests/golden_tests/cli/compile_strict_loop.args
index 5bc0f2e0..a8570e35 100644
--- a/tests/golden_tests/cli/compile_strict_loop.args
+++ b/tests/golden_tests/cli/compile_strict_loop.args
@@ -1,4 +1,4 @@
 gen-hvm
-tests/golden_tests/cli/compile_strict_loop.hvm
+tests/golden_tests/cli/compile_strict_loop.bend
 -Ono-all
 -Arecursion-cycle
diff --git a/tests/golden_tests/cli/compile_strict_loop.hvm b/tests/golden_tests/cli/compile_strict_loop.bend
similarity index 100%
rename from tests/golden_tests/cli/compile_strict_loop.hvm
rename to tests/golden_tests/cli/compile_strict_loop.bend
diff --git a/tests/golden_tests/cli/compile_wrong_opt.args b/tests/golden_tests/cli/compile_wrong_opt.args
index a550e42d..97015d78 100644
--- a/tests/golden_tests/cli/compile_wrong_opt.args
+++ b/tests/golden_tests/cli/compile_wrong_opt.args
@@ -1,3 +1,3 @@
 gen-hvm
-tests/golden_tests/cli/compile_wrong_opt.hvm
+tests/golden_tests/cli/compile_wrong_opt.bend
 -Ofoo
diff --git a/tests/golden_tests/cli/compile_wrong_opt.hvm b/tests/golden_tests/cli/compile_wrong_opt.bend
similarity index 100%
rename from tests/golden_tests/cli/compile_wrong_opt.hvm
rename to tests/golden_tests/cli/compile_wrong_opt.bend
diff --git a/tests/golden_tests/cli/debug_list_map.args b/tests/golden_tests/cli/debug_list_map.args
index 158ade67..aa553d31 100644
--- a/tests/golden_tests/cli/debug_list_map.args
+++ b/tests/golden_tests/cli/debug_list_map.args
@@ -1,5 +1,5 @@
 run
-tests/golden_tests/cli/debug_list_map.hvm
+tests/golden_tests/cli/debug_list_map.bend
 -d
 -L
 -1
diff --git a/tests/golden_tests/cli/debug_list_map.hvm b/tests/golden_tests/cli/debug_list_map.bend
similarity index 100%
rename from tests/golden_tests/cli/debug_list_map.hvm
rename to tests/golden_tests/cli/debug_list_map.bend
diff --git a/tests/golden_tests/cli/debug_u60_to_nat.args b/tests/golden_tests/cli/debug_u60_to_nat.args
index 0dc92ddd..26b98087 100644
--- a/tests/golden_tests/cli/debug_u60_to_nat.args
+++ b/tests/golden_tests/cli/debug_u60_to_nat.args
@@ -1,4 +1,4 @@
 run
-tests/golden_tests/cli/debug_u60_to_nat.hvm
+tests/golden_tests/cli/debug_u60_to_nat.bend
 -d
 4
diff --git a/tests/golden_tests/cli/debug_u60_to_nat.hvm b/tests/golden_tests/cli/debug_u60_to_nat.bend
similarity index 100%
rename from tests/golden_tests/cli/debug_u60_to_nat.hvm
rename to tests/golden_tests/cli/debug_u60_to_nat.bend
diff --git a/tests/golden_tests/cli/desugar_bool_scott.args b/tests/golden_tests/cli/desugar_bool_scott.args
index feba903b..4766b0c3 100644
--- a/tests/golden_tests/cli/desugar_bool_scott.args
+++ b/tests/golden_tests/cli/desugar_bool_scott.args
@@ -1,3 +1,3 @@
 desugar
-tests/golden_tests/cli/desugar_bool_scott.hvm
+tests/golden_tests/cli/desugar_bool_scott.bend
 -Oadt-scott
diff --git a/tests/golden_tests/cli/desugar_bool_scott.hvm b/tests/golden_tests/cli/desugar_bool_scott.bend
similarity index 100%
rename from tests/golden_tests/cli/desugar_bool_scott.hvm
rename to tests/golden_tests/cli/desugar_bool_scott.bend
diff --git a/tests/golden_tests/cli/desugar_bool_tagged.args b/tests/golden_tests/cli/desugar_bool_tagged.args
deleted file mode 100644
index a4d9ed07..00000000
--- a/tests/golden_tests/cli/desugar_bool_tagged.args
+++ /dev/null
@@ -1,3 +0,0 @@
-desugar
-tests/golden_tests/cli/desugar_bool_tagged.hvm
--Oadt-tagged-scott
diff --git a/tests/golden_tests/cli/desugar_bool_tagged.hvm b/tests/golden_tests/cli/desugar_bool_tagged.hvm
deleted file mode 100644
index 6fdff649..00000000
--- a/tests/golden_tests/cli/desugar_bool_tagged.hvm
+++ /dev/null
@@ -1,3 +0,0 @@
-data Boolean = True | False
-
-main = Boolean/True
diff --git a/tests/golden_tests/cli/desugar_float_combinators.args b/tests/golden_tests/cli/desugar_float_combinators.args
index b432da5a..229d938a 100644
--- a/tests/golden_tests/cli/desugar_float_combinators.args
+++ b/tests/golden_tests/cli/desugar_float_combinators.args
@@ -1,3 +1,3 @@
 desugar
-tests/golden_tests/cli/desugar_float_combinators.hvm
+tests/golden_tests/cli/desugar_float_combinators.bend
 -Ofloat-combinators
diff --git a/tests/golden_tests/cli/desugar_float_combinators.hvm b/tests/golden_tests/cli/desugar_float_combinators.bend
similarity index 100%
rename from tests/golden_tests/cli/desugar_float_combinators.hvm
rename to tests/golden_tests/cli/desugar_float_combinators.bend
diff --git a/tests/golden_tests/cli/desugar_linearize_matches.args b/tests/golden_tests/cli/desugar_linearize_matches.args
index 144ea324..0badd589 100644
--- a/tests/golden_tests/cli/desugar_linearize_matches.args
+++ b/tests/golden_tests/cli/desugar_linearize_matches.args
@@ -1,3 +1,3 @@
 desugar
-tests/golden_tests/cli/desugar_linearize_matches.hvm
+tests/golden_tests/cli/desugar_linearize_matches.bend
 -Olinearize-matches
diff --git a/tests/golden_tests/cli/desugar_linearize_matches.hvm b/tests/golden_tests/cli/desugar_linearize_matches.bend
similarity index 100%
rename from tests/golden_tests/cli/desugar_linearize_matches.hvm
rename to tests/golden_tests/cli/desugar_linearize_matches.bend
diff --git a/tests/golden_tests/cli/desugar_linearize_matches_alt.args b/tests/golden_tests/cli/desugar_linearize_matches_alt.args
index 5771f741..72db5cdc 100644
--- a/tests/golden_tests/cli/desugar_linearize_matches_alt.args
+++ b/tests/golden_tests/cli/desugar_linearize_matches_alt.args
@@ -1,3 +1,3 @@
 desugar
-tests/golden_tests/cli/desugar_linearize_matches_alt.hvm
+tests/golden_tests/cli/desugar_linearize_matches_alt.bend
 -Olinearize-matches-alt
diff --git a/tests/golden_tests/cli/desugar_linearize_matches_alt.hvm b/tests/golden_tests/cli/desugar_linearize_matches_alt.bend
similarity index 100%
rename from tests/golden_tests/cli/desugar_linearize_matches_alt.hvm
rename to tests/golden_tests/cli/desugar_linearize_matches_alt.bend
diff --git a/tests/golden_tests/cli/desugar_merge.args b/tests/golden_tests/cli/desugar_merge.args
index 698a9b36..d2c403b6 100644
--- a/tests/golden_tests/cli/desugar_merge.args
+++ b/tests/golden_tests/cli/desugar_merge.args
@@ -1,3 +1,3 @@
 desugar
-tests/golden_tests/cli/desugar_merge.hvm
+tests/golden_tests/cli/desugar_merge.bend
 -Omerge
diff --git a/tests/golden_tests/cli/desugar_merge.hvm b/tests/golden_tests/cli/desugar_merge.bend
similarity index 100%
rename from tests/golden_tests/cli/desugar_merge.hvm
rename to tests/golden_tests/cli/desugar_merge.bend
diff --git a/tests/golden_tests/cli/desugar_prune.args b/tests/golden_tests/cli/desugar_prune.args
index 4b1dc1b4..5245a9e0 100644
--- a/tests/golden_tests/cli/desugar_prune.args
+++ b/tests/golden_tests/cli/desugar_prune.args
@@ -1,3 +1,3 @@
 desugar
-tests/golden_tests/cli/desugar_prune.hvm
+tests/golden_tests/cli/desugar_prune.bend
 -Oprune
diff --git a/tests/golden_tests/cli/desugar_prune.hvm b/tests/golden_tests/cli/desugar_prune.bend
similarity index 100%
rename from tests/golden_tests/cli/desugar_prune.hvm
rename to tests/golden_tests/cli/desugar_prune.bend
diff --git a/tests/golden_tests/cli/run_add.args b/tests/golden_tests/cli/run_add.args
index 7dcce0dd..b4b9e138 100644
--- a/tests/golden_tests/cli/run_add.args
+++ b/tests/golden_tests/cli/run_add.args
@@ -1,4 +1,4 @@
 run
-tests/golden_tests/cli/run_add.hvm
+tests/golden_tests/cli/run_add.bend
 3
 6
diff --git a/tests/golden_tests/cli/run_add.hvm b/tests/golden_tests/cli/run_add.bend
similarity index 100%
rename from tests/golden_tests/cli/run_add.hvm
rename to tests/golden_tests/cli/run_add.bend
diff --git a/tests/golden_tests/cli/run_pretty.args b/tests/golden_tests/cli/run_pretty.args
index f11049a8..e7ba7cdc 100644
--- a/tests/golden_tests/cli/run_pretty.args
+++ b/tests/golden_tests/cli/run_pretty.args
@@ -1,3 +1,3 @@
 run
-tests/golden_tests/cli/run_pretty.hvm
+tests/golden_tests/cli/run_pretty.bend
 -p
diff --git a/tests/golden_tests/cli/run_pretty.hvm b/tests/golden_tests/cli/run_pretty.bend
similarity index 100%
rename from tests/golden_tests/cli/run_pretty.hvm
rename to tests/golden_tests/cli/run_pretty.bend
diff --git a/tests/golden_tests/cli/warn_and_err.args b/tests/golden_tests/cli/warn_and_err.args
index 688ccac8..14676432 100644
--- a/tests/golden_tests/cli/warn_and_err.args
+++ b/tests/golden_tests/cli/warn_and_err.args
@@ -1,2 +1,2 @@
 gen-hvm
-tests/golden_tests/cli/warn_and_err.hvm
+tests/golden_tests/cli/warn_and_err.bend
diff --git a/tests/golden_tests/cli/warn_and_err.hvm b/tests/golden_tests/cli/warn_and_err.bend
similarity index 100%
rename from tests/golden_tests/cli/warn_and_err.hvm
rename to tests/golden_tests/cli/warn_and_err.bend
diff --git a/tests/golden_tests/compile_entrypoint/foo.hvm b/tests/golden_tests/compile_entrypoint/foo.bend
similarity index 100%
rename from tests/golden_tests/compile_entrypoint/foo.hvm
rename to tests/golden_tests/compile_entrypoint/foo.bend
diff --git a/tests/golden_tests/compile_file/360_no_scope.hvm b/tests/golden_tests/compile_file/360_no_scope.bend
similarity index 100%
rename from tests/golden_tests/compile_file/360_no_scope.hvm
rename to tests/golden_tests/compile_file/360_no_scope.bend
diff --git a/tests/golden_tests/compile_file/add_args.hvm b/tests/golden_tests/compile_file/add_args.bend
similarity index 100%
rename from tests/golden_tests/compile_file/add_args.hvm
rename to tests/golden_tests/compile_file/add_args.bend
diff --git a/tests/golden_tests/compile_file/addition.hvm b/tests/golden_tests/compile_file/addition.bend
similarity index 100%
rename from tests/golden_tests/compile_file/addition.hvm
rename to tests/golden_tests/compile_file/addition.bend
diff --git a/tests/golden_tests/compile_file/addition_const.hvm b/tests/golden_tests/compile_file/addition_const.bend
similarity index 100%
rename from tests/golden_tests/compile_file/addition_const.hvm
rename to tests/golden_tests/compile_file/addition_const.bend
diff --git a/tests/golden_tests/compile_file/ask_outside_do.hvm b/tests/golden_tests/compile_file/ask_outside_do.bend
similarity index 100%
rename from tests/golden_tests/compile_file/ask_outside_do.hvm
rename to tests/golden_tests/compile_file/ask_outside_do.bend
diff --git a/tests/golden_tests/compile_file/church_one.hvm b/tests/golden_tests/compile_file/church_one.bend
similarity index 100%
rename from tests/golden_tests/compile_file/church_one.hvm
rename to tests/golden_tests/compile_file/church_one.bend
diff --git a/tests/golden_tests/compile_file/church_zero.hvm b/tests/golden_tests/compile_file/church_zero.bend
similarity index 100%
rename from tests/golden_tests/compile_file/church_zero.hvm
rename to tests/golden_tests/compile_file/church_zero.bend
diff --git a/tests/golden_tests/compile_file/complicated_dup.hvm b/tests/golden_tests/compile_file/complicated_dup.bend
similarity index 100%
rename from tests/golden_tests/compile_file/complicated_dup.hvm
rename to tests/golden_tests/compile_file/complicated_dup.bend
diff --git a/tests/golden_tests/compile_file/crlf.hvm b/tests/golden_tests/compile_file/crlf.bend
similarity index 100%
rename from tests/golden_tests/compile_file/crlf.hvm
rename to tests/golden_tests/compile_file/crlf.bend
diff --git a/tests/golden_tests/compile_file/cyclic_global_lam.hvm b/tests/golden_tests/compile_file/cyclic_global_lam.bend
similarity index 100%
rename from tests/golden_tests/compile_file/cyclic_global_lam.hvm
rename to tests/golden_tests/compile_file/cyclic_global_lam.bend
diff --git a/tests/golden_tests/compile_file/dup_apply.hvm b/tests/golden_tests/compile_file/dup_apply.bend
similarity index 100%
rename from tests/golden_tests/compile_file/dup_apply.hvm
rename to tests/golden_tests/compile_file/dup_apply.bend
diff --git a/tests/golden_tests/compile_file/dup_global_lam.hvm b/tests/golden_tests/compile_file/dup_global_lam.bend
similarity index 100%
rename from tests/golden_tests/compile_file/dup_global_lam.hvm
rename to tests/golden_tests/compile_file/dup_global_lam.bend
diff --git a/tests/golden_tests/compile_file/erased_dup.hvm b/tests/golden_tests/compile_file/erased_dup.bend
similarity index 100%
rename from tests/golden_tests/compile_file/erased_dup.hvm
rename to tests/golden_tests/compile_file/erased_dup.bend
diff --git a/tests/golden_tests/compile_file/error_data_def_name.hvm b/tests/golden_tests/compile_file/error_data_def_name.bend
similarity index 100%
rename from tests/golden_tests/compile_file/error_data_def_name.hvm
rename to tests/golden_tests/compile_file/error_data_def_name.bend
diff --git a/tests/golden_tests/compile_file/error_messages.hvm b/tests/golden_tests/compile_file/error_messages.bend
similarity index 100%
rename from tests/golden_tests/compile_file/error_messages.hvm
rename to tests/golden_tests/compile_file/error_messages.bend
diff --git a/tests/golden_tests/compile_file/f24_oper.hvm b/tests/golden_tests/compile_file/f24_oper.bend
similarity index 100%
rename from tests/golden_tests/compile_file/f24_oper.hvm
rename to tests/golden_tests/compile_file/f24_oper.bend
diff --git a/tests/golden_tests/compile_file/fst_snd.hvm b/tests/golden_tests/compile_file/fst_snd.bend
similarity index 100%
rename from tests/golden_tests/compile_file/fst_snd.hvm
rename to tests/golden_tests/compile_file/fst_snd.bend
diff --git a/tests/golden_tests/compile_file/global_lam.hvm b/tests/golden_tests/compile_file/global_lam.bend
similarity index 100%
rename from tests/golden_tests/compile_file/global_lam.hvm
rename to tests/golden_tests/compile_file/global_lam.bend
diff --git a/tests/golden_tests/compile_file/huge_tree.hvm b/tests/golden_tests/compile_file/huge_tree.bend
similarity index 100%
rename from tests/golden_tests/compile_file/huge_tree.hvm
rename to tests/golden_tests/compile_file/huge_tree.bend
diff --git a/tests/golden_tests/compile_file/i24_oper.hvm b/tests/golden_tests/compile_file/i24_oper.bend
similarity index 100%
rename from tests/golden_tests/compile_file/i24_oper.hvm
rename to tests/golden_tests/compile_file/i24_oper.bend
diff --git a/tests/golden_tests/compile_file/id.hvm b/tests/golden_tests/compile_file/id.bend
similarity index 100%
rename from tests/golden_tests/compile_file/id.hvm
rename to tests/golden_tests/compile_file/id.bend
diff --git a/tests/golden_tests/compile_file/infer_dup.hvm b/tests/golden_tests/compile_file/infer_dup.bend
similarity index 100%
rename from tests/golden_tests/compile_file/infer_dup.hvm
rename to tests/golden_tests/compile_file/infer_dup.bend
diff --git a/tests/golden_tests/compile_file/inlining.hvm b/tests/golden_tests/compile_file/inlining.bend
similarity index 100%
rename from tests/golden_tests/compile_file/inlining.hvm
rename to tests/golden_tests/compile_file/inlining.bend
diff --git a/tests/golden_tests/compile_file/just_a_name.hvm b/tests/golden_tests/compile_file/just_a_name.bend
similarity index 100%
rename from tests/golden_tests/compile_file/just_a_name.hvm
rename to tests/golden_tests/compile_file/just_a_name.bend
diff --git a/tests/golden_tests/compile_file/just_data.hvm b/tests/golden_tests/compile_file/just_data.bend
similarity index 100%
rename from tests/golden_tests/compile_file/just_data.hvm
rename to tests/golden_tests/compile_file/just_data.bend
diff --git a/tests/golden_tests/compile_file/just_paren.hvm b/tests/golden_tests/compile_file/just_paren.bend
similarity index 100%
rename from tests/golden_tests/compile_file/just_paren.hvm
rename to tests/golden_tests/compile_file/just_paren.bend
diff --git a/tests/golden_tests/compile_file/just_rule_paren.hvm b/tests/golden_tests/compile_file/just_rule_paren.bend
similarity index 100%
rename from tests/golden_tests/compile_file/just_rule_paren.hvm
rename to tests/golden_tests/compile_file/just_rule_paren.bend
diff --git a/tests/golden_tests/compile_file/let_substitution.hvm b/tests/golden_tests/compile_file/let_substitution.bend
similarity index 100%
rename from tests/golden_tests/compile_file/let_substitution.hvm
rename to tests/golden_tests/compile_file/let_substitution.bend
diff --git a/tests/golden_tests/compile_file/let_tup.hvm b/tests/golden_tests/compile_file/let_tup.bend
similarity index 100%
rename from tests/golden_tests/compile_file/let_tup.hvm
rename to tests/golden_tests/compile_file/let_tup.bend
diff --git a/tests/golden_tests/compile_file/lets.hvm b/tests/golden_tests/compile_file/lets.bend
similarity index 100%
rename from tests/golden_tests/compile_file/lets.hvm
rename to tests/golden_tests/compile_file/lets.bend
diff --git a/tests/golden_tests/compile_file/long_name.hvm b/tests/golden_tests/compile_file/long_name.bend
similarity index 100%
rename from tests/golden_tests/compile_file/long_name.hvm
rename to tests/golden_tests/compile_file/long_name.bend
diff --git a/tests/golden_tests/compile_file/match.hvm b/tests/golden_tests/compile_file/match.bend
similarity index 100%
rename from tests/golden_tests/compile_file/match.hvm
rename to tests/golden_tests/compile_file/match.bend
diff --git a/tests/golden_tests/compile_file/missing_adt_eq.hvm b/tests/golden_tests/compile_file/missing_adt_eq.bend
similarity index 100%
rename from tests/golden_tests/compile_file/missing_adt_eq.hvm
rename to tests/golden_tests/compile_file/missing_adt_eq.bend
diff --git a/tests/golden_tests/compile_file/missing_ctrs.hvm b/tests/golden_tests/compile_file/missing_ctrs.bend
similarity index 100%
rename from tests/golden_tests/compile_file/missing_ctrs.hvm
rename to tests/golden_tests/compile_file/missing_ctrs.bend
diff --git a/tests/golden_tests/compile_file/missing_pat.hvm b/tests/golden_tests/compile_file/missing_pat.bend
similarity index 100%
rename from tests/golden_tests/compile_file/missing_pat.hvm
rename to tests/golden_tests/compile_file/missing_pat.bend
diff --git a/tests/golden_tests/compile_file/names_starting_with_keywords.hvm b/tests/golden_tests/compile_file/names_starting_with_keywords.bend
similarity index 100%
rename from tests/golden_tests/compile_file/names_starting_with_keywords.hvm
rename to tests/golden_tests/compile_file/names_starting_with_keywords.bend
diff --git a/tests/golden_tests/compile_file/nested_ctr_wrong_arity.hvm b/tests/golden_tests/compile_file/nested_ctr_wrong_arity.bend
similarity index 100%
rename from tests/golden_tests/compile_file/nested_ctr_wrong_arity.hvm
rename to tests/golden_tests/compile_file/nested_ctr_wrong_arity.bend
diff --git a/tests/golden_tests/compile_file/nested_let.hvm b/tests/golden_tests/compile_file/nested_let.bend
similarity index 100%
rename from tests/golden_tests/compile_file/nested_let.hvm
rename to tests/golden_tests/compile_file/nested_let.bend
diff --git a/tests/golden_tests/compile_file/number_too_large.hvm b/tests/golden_tests/compile_file/number_too_large.bend
similarity index 100%
rename from tests/golden_tests/compile_file/number_too_large.hvm
rename to tests/golden_tests/compile_file/number_too_large.bend
diff --git a/tests/golden_tests/compile_file/nums.hvm b/tests/golden_tests/compile_file/nums.bend
similarity index 100%
rename from tests/golden_tests/compile_file/nums.hvm
rename to tests/golden_tests/compile_file/nums.bend
diff --git a/tests/golden_tests/compile_file/op2.hvm b/tests/golden_tests/compile_file/op2.bend
similarity index 100%
rename from tests/golden_tests/compile_file/op2.hvm
rename to tests/golden_tests/compile_file/op2.bend
diff --git a/tests/golden_tests/compile_file/redex_order.hvm b/tests/golden_tests/compile_file/redex_order.bend
similarity index 100%
rename from tests/golden_tests/compile_file/redex_order.hvm
rename to tests/golden_tests/compile_file/redex_order.bend
diff --git a/tests/golden_tests/compile_file/redex_order_recursive.hvm b/tests/golden_tests/compile_file/redex_order_recursive.bend
similarity index 100%
rename from tests/golden_tests/compile_file/redex_order_recursive.hvm
rename to tests/golden_tests/compile_file/redex_order_recursive.bend
diff --git a/tests/golden_tests/compile_file/ref_to_main.hvm b/tests/golden_tests/compile_file/ref_to_main.bend
similarity index 100%
rename from tests/golden_tests/compile_file/ref_to_main.hvm
rename to tests/golden_tests/compile_file/ref_to_main.bend
diff --git a/tests/golden_tests/compile_file/ref_to_ref.hvm b/tests/golden_tests/compile_file/ref_to_ref.bend
similarity index 100%
rename from tests/golden_tests/compile_file/ref_to_ref.hvm
rename to tests/golden_tests/compile_file/ref_to_ref.bend
diff --git a/tests/golden_tests/compile_file/repeated_bind_rule.hvm b/tests/golden_tests/compile_file/repeated_bind_rule.bend
similarity index 100%
rename from tests/golden_tests/compile_file/repeated_bind_rule.hvm
rename to tests/golden_tests/compile_file/repeated_bind_rule.bend
diff --git a/tests/golden_tests/compile_file/simple_tup.hvm b/tests/golden_tests/compile_file/simple_tup.bend
similarity index 100%
rename from tests/golden_tests/compile_file/simple_tup.hvm
rename to tests/golden_tests/compile_file/simple_tup.bend
diff --git a/tests/golden_tests/compile_file/switch_all_patterns.hvm b/tests/golden_tests/compile_file/switch_all_patterns.bend
similarity index 100%
rename from tests/golden_tests/compile_file/switch_all_patterns.hvm
rename to tests/golden_tests/compile_file/switch_all_patterns.bend
diff --git a/tests/golden_tests/compile_file/switch_in_switch_arg.hvm b/tests/golden_tests/compile_file/switch_in_switch_arg.bend
similarity index 100%
rename from tests/golden_tests/compile_file/switch_in_switch_arg.hvm
rename to tests/golden_tests/compile_file/switch_in_switch_arg.bend
diff --git a/tests/golden_tests/compile_file/switch_unscoped_lambda.hvm b/tests/golden_tests/compile_file/switch_unscoped_lambda.bend
similarity index 100%
rename from tests/golden_tests/compile_file/switch_unscoped_lambda.hvm
rename to tests/golden_tests/compile_file/switch_unscoped_lambda.bend
diff --git a/tests/golden_tests/compile_file/tup.hvm b/tests/golden_tests/compile_file/tup.bend
similarity index 100%
rename from tests/golden_tests/compile_file/tup.hvm
rename to tests/golden_tests/compile_file/tup.bend
diff --git a/tests/golden_tests/compile_file/tup_add.hvm b/tests/golden_tests/compile_file/tup_add.bend
similarity index 100%
rename from tests/golden_tests/compile_file/tup_add.hvm
rename to tests/golden_tests/compile_file/tup_add.bend
diff --git a/tests/golden_tests/compile_file/unbound_unscoped_var.hvm b/tests/golden_tests/compile_file/unbound_unscoped_var.bend
similarity index 100%
rename from tests/golden_tests/compile_file/unbound_unscoped_var.hvm
rename to tests/golden_tests/compile_file/unbound_unscoped_var.bend
diff --git a/tests/golden_tests/compile_file/unbound_var.hvm b/tests/golden_tests/compile_file/unbound_var.bend
similarity index 100%
rename from tests/golden_tests/compile_file/unbound_var.hvm
rename to tests/golden_tests/compile_file/unbound_var.bend
diff --git a/tests/golden_tests/compile_file/unbound_var_scope.hvm b/tests/golden_tests/compile_file/unbound_var_scope.bend
similarity index 100%
rename from tests/golden_tests/compile_file/unbound_var_scope.hvm
rename to tests/golden_tests/compile_file/unbound_var_scope.bend
diff --git a/tests/golden_tests/compile_file/unbound_with_tup_pattern.hvm b/tests/golden_tests/compile_file/unbound_with_tup_pattern.bend
similarity index 100%
rename from tests/golden_tests/compile_file/unbound_with_tup_pattern.hvm
rename to tests/golden_tests/compile_file/unbound_with_tup_pattern.bend
diff --git a/tests/golden_tests/compile_file/underscore.hvm b/tests/golden_tests/compile_file/underscore.bend
similarity index 100%
rename from tests/golden_tests/compile_file/underscore.hvm
rename to tests/golden_tests/compile_file/underscore.bend
diff --git a/tests/golden_tests/compile_file/unexpected_top_char.hvm b/tests/golden_tests/compile_file/unexpected_top_char.bend
similarity index 100%
rename from tests/golden_tests/compile_file/unexpected_top_char.hvm
rename to tests/golden_tests/compile_file/unexpected_top_char.bend
diff --git a/tests/golden_tests/compile_file/unscoped_dup_use.hvm b/tests/golden_tests/compile_file/unscoped_dup_use.bend
similarity index 100%
rename from tests/golden_tests/compile_file/unscoped_dup_use.hvm
rename to tests/golden_tests/compile_file/unscoped_dup_use.bend
diff --git a/tests/golden_tests/compile_file/unscoped_supercombinator.hvm b/tests/golden_tests/compile_file/unscoped_supercombinator.bend
similarity index 100%
rename from tests/golden_tests/compile_file/unscoped_supercombinator.hvm
rename to tests/golden_tests/compile_file/unscoped_supercombinator.bend
diff --git a/tests/golden_tests/compile_file/unused_let.hvm b/tests/golden_tests/compile_file/unused_let.bend
similarity index 100%
rename from tests/golden_tests/compile_file/unused_let.hvm
rename to tests/golden_tests/compile_file/unused_let.bend
diff --git a/tests/golden_tests/compile_file/unused_unscoped_bind.hvm b/tests/golden_tests/compile_file/unused_unscoped_bind.bend
similarity index 100%
rename from tests/golden_tests/compile_file/unused_unscoped_bind.hvm
rename to tests/golden_tests/compile_file/unused_unscoped_bind.bend
diff --git a/tests/golden_tests/compile_file/vicious_circles.hvm b/tests/golden_tests/compile_file/vicious_circles.bend
similarity index 100%
rename from tests/golden_tests/compile_file/vicious_circles.hvm
rename to tests/golden_tests/compile_file/vicious_circles.bend
diff --git a/tests/golden_tests/compile_file/warn_and_err.hvm b/tests/golden_tests/compile_file/warn_and_err.bend
similarity index 100%
rename from tests/golden_tests/compile_file/warn_and_err.hvm
rename to tests/golden_tests/compile_file/warn_and_err.bend
diff --git a/tests/golden_tests/compile_file/with_clause_parse_err.hvm b/tests/golden_tests/compile_file/with_clause_parse_err.bend
similarity index 100%
rename from tests/golden_tests/compile_file/with_clause_parse_err.hvm
rename to tests/golden_tests/compile_file/with_clause_parse_err.bend
diff --git a/tests/golden_tests/compile_file/wrong_ctr_arity.hvm b/tests/golden_tests/compile_file/wrong_ctr_arity.bend
similarity index 100%
rename from tests/golden_tests/compile_file/wrong_ctr_arity.hvm
rename to tests/golden_tests/compile_file/wrong_ctr_arity.bend
diff --git a/tests/golden_tests/compile_file/wrong_ctr_var_arity.hvm b/tests/golden_tests/compile_file/wrong_ctr_var_arity.bend
similarity index 100%
rename from tests/golden_tests/compile_file/wrong_ctr_var_arity.hvm
rename to tests/golden_tests/compile_file/wrong_ctr_var_arity.bend
diff --git a/tests/golden_tests/compile_file/wrong_nums.hvm b/tests/golden_tests/compile_file/wrong_nums.bend
similarity index 100%
rename from tests/golden_tests/compile_file/wrong_nums.hvm
rename to tests/golden_tests/compile_file/wrong_nums.bend
diff --git a/tests/golden_tests/compile_file/wrong_unicode_escape.hvm b/tests/golden_tests/compile_file/wrong_unicode_escape.bend
similarity index 100%
rename from tests/golden_tests/compile_file/wrong_unicode_escape.hvm
rename to tests/golden_tests/compile_file/wrong_unicode_escape.bend
diff --git a/tests/golden_tests/compile_file_o_all/addition.hvm b/tests/golden_tests/compile_file_o_all/addition.bend
similarity index 100%
rename from tests/golden_tests/compile_file_o_all/addition.hvm
rename to tests/golden_tests/compile_file_o_all/addition.bend
diff --git a/tests/golden_tests/compile_file_o_all/addition_var_fst.hvm b/tests/golden_tests/compile_file_o_all/addition_var_fst.bend
similarity index 100%
rename from tests/golden_tests/compile_file_o_all/addition_var_fst.hvm
rename to tests/golden_tests/compile_file_o_all/addition_var_fst.bend
diff --git a/tests/golden_tests/compile_file_o_all/adt_option_and.hvm b/tests/golden_tests/compile_file_o_all/adt_option_and.bend
similarity index 100%
rename from tests/golden_tests/compile_file_o_all/adt_option_and.hvm
rename to tests/golden_tests/compile_file_o_all/adt_option_and.bend
diff --git a/tests/golden_tests/compile_file_o_all/adt_string.hvm b/tests/golden_tests/compile_file_o_all/adt_string.bend
similarity index 100%
rename from tests/golden_tests/compile_file_o_all/adt_string.hvm
rename to tests/golden_tests/compile_file_o_all/adt_string.bend
diff --git a/tests/golden_tests/compile_file_o_all/and.hvm b/tests/golden_tests/compile_file_o_all/and.bend
similarity index 100%
rename from tests/golden_tests/compile_file_o_all/and.hvm
rename to tests/golden_tests/compile_file_o_all/and.bend
diff --git a/tests/golden_tests/compile_file_o_all/bad_parens_making_erased_let.hvm b/tests/golden_tests/compile_file_o_all/bad_parens_making_erased_let.bend
similarity index 100%
rename from tests/golden_tests/compile_file_o_all/bad_parens_making_erased_let.hvm
rename to tests/golden_tests/compile_file_o_all/bad_parens_making_erased_let.bend
diff --git a/tests/golden_tests/compile_file_o_all/bool.hvm b/tests/golden_tests/compile_file_o_all/bool.bend
similarity index 100%
rename from tests/golden_tests/compile_file_o_all/bool.hvm
rename to tests/golden_tests/compile_file_o_all/bool.bend
diff --git a/tests/golden_tests/compile_file_o_all/cyclic_dup.hvm b/tests/golden_tests/compile_file_o_all/cyclic_dup.bend
similarity index 100%
rename from tests/golden_tests/compile_file_o_all/cyclic_dup.hvm
rename to tests/golden_tests/compile_file_o_all/cyclic_dup.bend
diff --git a/tests/golden_tests/compile_file_o_all/double_main.hvm b/tests/golden_tests/compile_file_o_all/double_main.bend
similarity index 100%
rename from tests/golden_tests/compile_file_o_all/double_main.hvm
rename to tests/golden_tests/compile_file_o_all/double_main.bend
diff --git a/tests/golden_tests/compile_file_o_all/eta_chain.hvm b/tests/golden_tests/compile_file_o_all/eta_chain.bend
similarity index 100%
rename from tests/golden_tests/compile_file_o_all/eta_chain.hvm
rename to tests/golden_tests/compile_file_o_all/eta_chain.bend
diff --git a/tests/golden_tests/compile_file_o_all/ex0.hvm b/tests/golden_tests/compile_file_o_all/ex0.bend
similarity index 100%
rename from tests/golden_tests/compile_file_o_all/ex0.hvm
rename to tests/golden_tests/compile_file_o_all/ex0.bend
diff --git a/tests/golden_tests/compile_file_o_all/ex2.hvm b/tests/golden_tests/compile_file_o_all/ex2.bend
similarity index 100%
rename from tests/golden_tests/compile_file_o_all/ex2.hvm
rename to tests/golden_tests/compile_file_o_all/ex2.bend
diff --git a/tests/golden_tests/compile_file_o_all/example.hvm b/tests/golden_tests/compile_file_o_all/example.bend
similarity index 100%
rename from tests/golden_tests/compile_file_o_all/example.hvm
rename to tests/golden_tests/compile_file_o_all/example.bend
diff --git a/tests/golden_tests/compile_file_o_all/exp.hvm b/tests/golden_tests/compile_file_o_all/exp.bend
similarity index 100%
rename from tests/golden_tests/compile_file_o_all/exp.hvm
rename to tests/golden_tests/compile_file_o_all/exp.bend
diff --git a/tests/golden_tests/compile_file_o_all/expr.hvm b/tests/golden_tests/compile_file_o_all/expr.bend
similarity index 100%
rename from tests/golden_tests/compile_file_o_all/expr.hvm
rename to tests/golden_tests/compile_file_o_all/expr.bend
diff --git a/tests/golden_tests/compile_file_o_all/extracted_match_pred.hvm b/tests/golden_tests/compile_file_o_all/extracted_match_pred.bend
similarity index 100%
rename from tests/golden_tests/compile_file_o_all/extracted_match_pred.hvm
rename to tests/golden_tests/compile_file_o_all/extracted_match_pred.bend
diff --git a/tests/golden_tests/compile_file_o_all/fst.hvm b/tests/golden_tests/compile_file_o_all/fst.bend
similarity index 100%
rename from tests/golden_tests/compile_file_o_all/fst.hvm
rename to tests/golden_tests/compile_file_o_all/fst.bend
diff --git a/tests/golden_tests/compile_file_o_all/fst_fst.hvm b/tests/golden_tests/compile_file_o_all/fst_fst.bend
similarity index 100%
rename from tests/golden_tests/compile_file_o_all/fst_fst.hvm
rename to tests/golden_tests/compile_file_o_all/fst_fst.bend
diff --git a/tests/golden_tests/compile_file_o_all/hvm1_main.hvm b/tests/golden_tests/compile_file_o_all/hvm1_main.bend
similarity index 100%
rename from tests/golden_tests/compile_file_o_all/hvm1_main.hvm
rename to tests/golden_tests/compile_file_o_all/hvm1_main.bend
diff --git a/tests/golden_tests/compile_file_o_all/inline_app.hvm b/tests/golden_tests/compile_file_o_all/inline_app.bend
similarity index 100%
rename from tests/golden_tests/compile_file_o_all/inline_app.hvm
rename to tests/golden_tests/compile_file_o_all/inline_app.bend
diff --git a/tests/golden_tests/compile_file_o_all/inlining.hvm b/tests/golden_tests/compile_file_o_all/inlining.bend
similarity index 100%
rename from tests/golden_tests/compile_file_o_all/inlining.hvm
rename to tests/golden_tests/compile_file_o_all/inlining.bend
diff --git a/tests/golden_tests/compile_file_o_all/linearize_match.hvm b/tests/golden_tests/compile_file_o_all/linearize_match.bend
similarity index 100%
rename from tests/golden_tests/compile_file_o_all/linearize_match.hvm
rename to tests/golden_tests/compile_file_o_all/linearize_match.bend
diff --git a/tests/golden_tests/compile_file_o_all/list_merge_sort.hvm b/tests/golden_tests/compile_file_o_all/list_merge_sort.bend
similarity index 100%
rename from tests/golden_tests/compile_file_o_all/list_merge_sort.hvm
rename to tests/golden_tests/compile_file_o_all/list_merge_sort.bend
diff --git a/tests/golden_tests/compile_file_o_all/list_reverse.hvm b/tests/golden_tests/compile_file_o_all/list_reverse.bend
similarity index 100%
rename from tests/golden_tests/compile_file_o_all/list_reverse.hvm
rename to tests/golden_tests/compile_file_o_all/list_reverse.bend
diff --git a/tests/golden_tests/compile_file_o_all/long_str_file.hvm b/tests/golden_tests/compile_file_o_all/long_str_file.bend
similarity index 100%
rename from tests/golden_tests/compile_file_o_all/long_str_file.hvm
rename to tests/golden_tests/compile_file_o_all/long_str_file.bend
diff --git a/tests/golden_tests/compile_file_o_all/match_adt_non_exhaustive.hvm b/tests/golden_tests/compile_file_o_all/match_adt_non_exhaustive.bend
similarity index 100%
rename from tests/golden_tests/compile_file_o_all/match_adt_non_exhaustive.hvm
rename to tests/golden_tests/compile_file_o_all/match_adt_non_exhaustive.bend
diff --git a/tests/golden_tests/compile_file_o_all/match_dup_and_reconstruction.hvm b/tests/golden_tests/compile_file_o_all/match_dup_and_reconstruction.bend
similarity index 100%
rename from tests/golden_tests/compile_file_o_all/match_dup_and_reconstruction.hvm
rename to tests/golden_tests/compile_file_o_all/match_dup_and_reconstruction.bend
diff --git a/tests/golden_tests/compile_file_o_all/match_mult_linearization.hvm b/tests/golden_tests/compile_file_o_all/match_mult_linearization.bend
similarity index 100%
rename from tests/golden_tests/compile_file_o_all/match_mult_linearization.hvm
rename to tests/golden_tests/compile_file_o_all/match_mult_linearization.bend
diff --git a/tests/golden_tests/compile_file_o_all/match_num_explicit_bind.hvm b/tests/golden_tests/compile_file_o_all/match_num_explicit_bind.bend
similarity index 100%
rename from tests/golden_tests/compile_file_o_all/match_num_explicit_bind.hvm
rename to tests/golden_tests/compile_file_o_all/match_num_explicit_bind.bend
diff --git a/tests/golden_tests/compile_file_o_all/match_tup.hvm b/tests/golden_tests/compile_file_o_all/match_tup.bend
similarity index 100%
rename from tests/golden_tests/compile_file_o_all/match_tup.hvm
rename to tests/golden_tests/compile_file_o_all/match_tup.bend
diff --git a/tests/golden_tests/compile_file_o_all/merge_definitions.hvm b/tests/golden_tests/compile_file_o_all/merge_definitions.bend
similarity index 100%
rename from tests/golden_tests/compile_file_o_all/merge_definitions.hvm
rename to tests/golden_tests/compile_file_o_all/merge_definitions.bend
diff --git a/tests/golden_tests/compile_file_o_all/non_exhaustive_and.hvm b/tests/golden_tests/compile_file_o_all/non_exhaustive_and.bend
similarity index 100%
rename from tests/golden_tests/compile_file_o_all/non_exhaustive_and.hvm
rename to tests/golden_tests/compile_file_o_all/non_exhaustive_and.bend
diff --git a/tests/golden_tests/compile_file_o_all/non_exhaustive_different_types.hvm b/tests/golden_tests/compile_file_o_all/non_exhaustive_different_types.bend
similarity index 100%
rename from tests/golden_tests/compile_file_o_all/non_exhaustive_different_types.hvm
rename to tests/golden_tests/compile_file_o_all/non_exhaustive_different_types.bend
diff --git a/tests/golden_tests/compile_file_o_all/non_exhaustive_pattern.hvm b/tests/golden_tests/compile_file_o_all/non_exhaustive_pattern.bend
similarity index 100%
rename from tests/golden_tests/compile_file_o_all/non_exhaustive_pattern.hvm
rename to tests/golden_tests/compile_file_o_all/non_exhaustive_pattern.bend
diff --git a/tests/golden_tests/compile_file_o_all/non_exhaustive_tree.hvm b/tests/golden_tests/compile_file_o_all/non_exhaustive_tree.bend
similarity index 100%
rename from tests/golden_tests/compile_file_o_all/non_exhaustive_tree.hvm
rename to tests/golden_tests/compile_file_o_all/non_exhaustive_tree.bend
diff --git a/tests/golden_tests/compile_file_o_all/num_pattern_with_var.hvm b/tests/golden_tests/compile_file_o_all/num_pattern_with_var.bend
similarity index 100%
rename from tests/golden_tests/compile_file_o_all/num_pattern_with_var.hvm
rename to tests/golden_tests/compile_file_o_all/num_pattern_with_var.bend
diff --git a/tests/golden_tests/compile_file_o_all/recursive_combinator_inactive.hvm b/tests/golden_tests/compile_file_o_all/recursive_combinator_inactive.bend
similarity index 100%
rename from tests/golden_tests/compile_file_o_all/recursive_combinator_inactive.hvm
rename to tests/golden_tests/compile_file_o_all/recursive_combinator_inactive.bend
diff --git a/tests/golden_tests/compile_file_o_all/repeated_name_trucation.hvm b/tests/golden_tests/compile_file_o_all/repeated_name_trucation.bend
similarity index 100%
rename from tests/golden_tests/compile_file_o_all/repeated_name_trucation.hvm
rename to tests/golden_tests/compile_file_o_all/repeated_name_trucation.bend
diff --git a/tests/golden_tests/compile_file_o_all/scrutinee_reconstruction.hvm b/tests/golden_tests/compile_file_o_all/scrutinee_reconstruction.bend
similarity index 100%
rename from tests/golden_tests/compile_file_o_all/scrutinee_reconstruction.hvm
rename to tests/golden_tests/compile_file_o_all/scrutinee_reconstruction.bend
diff --git a/tests/golden_tests/compile_file_o_all/self_ref.hvm b/tests/golden_tests/compile_file_o_all/self_ref.bend
similarity index 100%
rename from tests/golden_tests/compile_file_o_all/self_ref.hvm
rename to tests/golden_tests/compile_file_o_all/self_ref.bend
diff --git a/tests/golden_tests/compile_file_o_all/snd.hvm b/tests/golden_tests/compile_file_o_all/snd.bend
similarity index 100%
rename from tests/golden_tests/compile_file_o_all/snd.hvm
rename to tests/golden_tests/compile_file_o_all/snd.bend
diff --git a/tests/golden_tests/compile_file_o_all/spacing.hvm b/tests/golden_tests/compile_file_o_all/spacing.bend
similarity index 100%
rename from tests/golden_tests/compile_file_o_all/spacing.hvm
rename to tests/golden_tests/compile_file_o_all/spacing.bend
diff --git a/tests/golden_tests/compile_file_o_all/spacing2.hvm b/tests/golden_tests/compile_file_o_all/spacing2.bend
similarity index 100%
rename from tests/golden_tests/compile_file_o_all/spacing2.hvm
rename to tests/golden_tests/compile_file_o_all/spacing2.bend
diff --git a/tests/golden_tests/compile_file_o_all/str.hvm b/tests/golden_tests/compile_file_o_all/str.bend
similarity index 100%
rename from tests/golden_tests/compile_file_o_all/str.hvm
rename to tests/golden_tests/compile_file_o_all/str.bend
diff --git a/tests/golden_tests/compile_file_o_all/sum_predicates.hvm b/tests/golden_tests/compile_file_o_all/sum_predicates.bend
similarity index 100%
rename from tests/golden_tests/compile_file_o_all/sum_predicates.hvm
rename to tests/golden_tests/compile_file_o_all/sum_predicates.bend
diff --git a/tests/golden_tests/compile_file_o_all/tagged_dup.hvm b/tests/golden_tests/compile_file_o_all/tagged_dup.bend
similarity index 100%
rename from tests/golden_tests/compile_file_o_all/tagged_dup.hvm
rename to tests/golden_tests/compile_file_o_all/tagged_dup.bend
diff --git a/tests/golden_tests/compile_file_o_all/tagged_lam.hvm b/tests/golden_tests/compile_file_o_all/tagged_lam.bend
similarity index 100%
rename from tests/golden_tests/compile_file_o_all/tagged_lam.hvm
rename to tests/golden_tests/compile_file_o_all/tagged_lam.bend
diff --git a/tests/golden_tests/compile_file_o_all/tagged_sup.hvm b/tests/golden_tests/compile_file_o_all/tagged_sup.bend
similarity index 100%
rename from tests/golden_tests/compile_file_o_all/tagged_sup.hvm
rename to tests/golden_tests/compile_file_o_all/tagged_sup.bend
diff --git a/tests/golden_tests/compile_file_o_all/unapplied_eta.hvm b/tests/golden_tests/compile_file_o_all/unapplied_eta.bend
similarity index 100%
rename from tests/golden_tests/compile_file_o_all/unapplied_eta.hvm
rename to tests/golden_tests/compile_file_o_all/unapplied_eta.bend
diff --git a/tests/golden_tests/compile_file_o_all/unscoped_eta.hvm b/tests/golden_tests/compile_file_o_all/unscoped_eta.bend
similarity index 100%
rename from tests/golden_tests/compile_file_o_all/unscoped_eta.hvm
rename to tests/golden_tests/compile_file_o_all/unscoped_eta.bend
diff --git a/tests/golden_tests/compile_file_o_all/var_shadows_ref.hvm b/tests/golden_tests/compile_file_o_all/var_shadows_ref.bend
similarity index 100%
rename from tests/golden_tests/compile_file_o_all/var_shadows_ref.hvm
rename to tests/golden_tests/compile_file_o_all/var_shadows_ref.bend
diff --git a/tests/golden_tests/compile_file_o_all/weekday.hvm b/tests/golden_tests/compile_file_o_all/weekday.bend
similarity index 100%
rename from tests/golden_tests/compile_file_o_all/weekday.hvm
rename to tests/golden_tests/compile_file_o_all/weekday.bend
diff --git a/tests/golden_tests/compile_file_o_no_all/bitonic_sort.hvm b/tests/golden_tests/compile_file_o_no_all/bitonic_sort.bend
similarity index 100%
rename from tests/golden_tests/compile_file_o_no_all/bitonic_sort.hvm
rename to tests/golden_tests/compile_file_o_no_all/bitonic_sort.bend
diff --git a/tests/golden_tests/compile_file_o_no_all/list_reverse.hvm b/tests/golden_tests/compile_file_o_no_all/list_reverse.bend
similarity index 100%
rename from tests/golden_tests/compile_file_o_no_all/list_reverse.hvm
rename to tests/golden_tests/compile_file_o_no_all/list_reverse.bend
diff --git a/tests/golden_tests/compile_file_o_no_all/redex_order.hvm b/tests/golden_tests/compile_file_o_no_all/redex_order.bend
similarity index 100%
rename from tests/golden_tests/compile_file_o_no_all/redex_order.hvm
rename to tests/golden_tests/compile_file_o_no_all/redex_order.bend
diff --git a/tests/golden_tests/compile_file_o_no_all/sum_tree.hvm b/tests/golden_tests/compile_file_o_no_all/sum_tree.bend
similarity index 100%
rename from tests/golden_tests/compile_file_o_no_all/sum_tree.hvm
rename to tests/golden_tests/compile_file_o_no_all/sum_tree.bend
diff --git a/tests/golden_tests/desugar_file/bind_syntax.hvm b/tests/golden_tests/desugar_file/bind_syntax.bend
similarity index 100%
rename from tests/golden_tests/desugar_file/bind_syntax.hvm
rename to tests/golden_tests/desugar_file/bind_syntax.bend
diff --git a/tests/golden_tests/desugar_file/combinators.hvm b/tests/golden_tests/desugar_file/combinators.bend
similarity index 100%
rename from tests/golden_tests/desugar_file/combinators.hvm
rename to tests/golden_tests/desugar_file/combinators.bend
diff --git a/tests/golden_tests/desugar_file/deref_loop.hvm b/tests/golden_tests/desugar_file/deref_loop.bend
similarity index 100%
rename from tests/golden_tests/desugar_file/deref_loop.hvm
rename to tests/golden_tests/desugar_file/deref_loop.bend
diff --git a/tests/golden_tests/desugar_file/dup_linearization.hvm b/tests/golden_tests/desugar_file/dup_linearization.bend
similarity index 100%
rename from tests/golden_tests/desugar_file/dup_linearization.hvm
rename to tests/golden_tests/desugar_file/dup_linearization.bend
diff --git a/tests/golden_tests/desugar_file/non_exaustive_limit.hvm b/tests/golden_tests/desugar_file/non_exaustive_limit.bend
similarity index 100%
rename from tests/golden_tests/desugar_file/non_exaustive_limit.hvm
rename to tests/golden_tests/desugar_file/non_exaustive_limit.bend
diff --git a/tests/golden_tests/desugar_file/switch_with_use.hvm b/tests/golden_tests/desugar_file/switch_with_use.bend
similarity index 100%
rename from tests/golden_tests/desugar_file/switch_with_use.hvm
rename to tests/golden_tests/desugar_file/switch_with_use.bend
diff --git a/tests/golden_tests/desugar_file/use_id.hvm b/tests/golden_tests/desugar_file/use_id.bend
similarity index 100%
rename from tests/golden_tests/desugar_file/use_id.hvm
rename to tests/golden_tests/desugar_file/use_id.bend
diff --git a/tests/golden_tests/desugar_file/use_shadow.hvm b/tests/golden_tests/desugar_file/use_shadow.bend
similarity index 100%
rename from tests/golden_tests/desugar_file/use_shadow.hvm
rename to tests/golden_tests/desugar_file/use_shadow.bend
diff --git a/tests/golden_tests/desugar_file/used_once_names.hvm b/tests/golden_tests/desugar_file/used_once_names.bend
similarity index 100%
rename from tests/golden_tests/desugar_file/used_once_names.hvm
rename to tests/golden_tests/desugar_file/used_once_names.bend
diff --git a/tests/golden_tests/encode_pattern_match/adt_tup_era.hvm b/tests/golden_tests/encode_pattern_match/adt_tup_era.bend
similarity index 100%
rename from tests/golden_tests/encode_pattern_match/adt_tup_era.hvm
rename to tests/golden_tests/encode_pattern_match/adt_tup_era.bend
diff --git a/tests/golden_tests/encode_pattern_match/and3.hvm b/tests/golden_tests/encode_pattern_match/and3.bend
similarity index 100%
rename from tests/golden_tests/encode_pattern_match/and3.hvm
rename to tests/golden_tests/encode_pattern_match/and3.bend
diff --git a/tests/golden_tests/encode_pattern_match/bool.hvm b/tests/golden_tests/encode_pattern_match/bool.bend
similarity index 100%
rename from tests/golden_tests/encode_pattern_match/bool.hvm
rename to tests/golden_tests/encode_pattern_match/bool.bend
diff --git a/tests/golden_tests/encode_pattern_match/bool_tup.hvm b/tests/golden_tests/encode_pattern_match/bool_tup.bend
similarity index 100%
rename from tests/golden_tests/encode_pattern_match/bool_tup.hvm
rename to tests/golden_tests/encode_pattern_match/bool_tup.bend
diff --git a/tests/golden_tests/encode_pattern_match/box.hvm b/tests/golden_tests/encode_pattern_match/box.bend
similarity index 100%
rename from tests/golden_tests/encode_pattern_match/box.hvm
rename to tests/golden_tests/encode_pattern_match/box.bend
diff --git a/tests/golden_tests/encode_pattern_match/common.hvm b/tests/golden_tests/encode_pattern_match/common.bend
similarity index 100%
rename from tests/golden_tests/encode_pattern_match/common.hvm
rename to tests/golden_tests/encode_pattern_match/common.bend
diff --git a/tests/golden_tests/encode_pattern_match/concat.hvm b/tests/golden_tests/encode_pattern_match/concat.bend
similarity index 100%
rename from tests/golden_tests/encode_pattern_match/concat.hvm
rename to tests/golden_tests/encode_pattern_match/concat.bend
diff --git a/tests/golden_tests/encode_pattern_match/concat_def.hvm b/tests/golden_tests/encode_pattern_match/concat_def.bend
similarity index 100%
rename from tests/golden_tests/encode_pattern_match/concat_def.hvm
rename to tests/golden_tests/encode_pattern_match/concat_def.bend
diff --git a/tests/golden_tests/encode_pattern_match/def_tups.hvm b/tests/golden_tests/encode_pattern_match/def_tups.bend
similarity index 100%
rename from tests/golden_tests/encode_pattern_match/def_tups.hvm
rename to tests/golden_tests/encode_pattern_match/def_tups.bend
diff --git a/tests/golden_tests/encode_pattern_match/definition_merge.hvm b/tests/golden_tests/encode_pattern_match/definition_merge.bend
similarity index 100%
rename from tests/golden_tests/encode_pattern_match/definition_merge.hvm
rename to tests/golden_tests/encode_pattern_match/definition_merge.bend
diff --git a/tests/golden_tests/encode_pattern_match/expr.hvm b/tests/golden_tests/encode_pattern_match/expr.bend
similarity index 100%
rename from tests/golden_tests/encode_pattern_match/expr.hvm
rename to tests/golden_tests/encode_pattern_match/expr.bend
diff --git a/tests/golden_tests/encode_pattern_match/flatten_era_pat.hvm b/tests/golden_tests/encode_pattern_match/flatten_era_pat.bend
similarity index 100%
rename from tests/golden_tests/encode_pattern_match/flatten_era_pat.hvm
rename to tests/golden_tests/encode_pattern_match/flatten_era_pat.bend
diff --git a/tests/golden_tests/encode_pattern_match/is_some_some.hvm b/tests/golden_tests/encode_pattern_match/is_some_some.bend
similarity index 100%
rename from tests/golden_tests/encode_pattern_match/is_some_some.hvm
rename to tests/golden_tests/encode_pattern_match/is_some_some.bend
diff --git a/tests/golden_tests/encode_pattern_match/list_merge_sort.hvm b/tests/golden_tests/encode_pattern_match/list_merge_sort.bend
similarity index 100%
rename from tests/golden_tests/encode_pattern_match/list_merge_sort.hvm
rename to tests/golden_tests/encode_pattern_match/list_merge_sort.bend
diff --git a/tests/golden_tests/encode_pattern_match/list_str_encoding_undeclared_fn.hvm b/tests/golden_tests/encode_pattern_match/list_str_encoding_undeclared_fn.bend
similarity index 100%
rename from tests/golden_tests/encode_pattern_match/list_str_encoding_undeclared_fn.hvm
rename to tests/golden_tests/encode_pattern_match/list_str_encoding_undeclared_fn.bend
diff --git a/tests/golden_tests/encode_pattern_match/list_str_encoding_undeclared_map.hvm b/tests/golden_tests/encode_pattern_match/list_str_encoding_undeclared_map.bend
similarity index 100%
rename from tests/golden_tests/encode_pattern_match/list_str_encoding_undeclared_map.hvm
rename to tests/golden_tests/encode_pattern_match/list_str_encoding_undeclared_map.bend
diff --git a/tests/golden_tests/encode_pattern_match/match_adt_unscoped_in_arm.hvm b/tests/golden_tests/encode_pattern_match/match_adt_unscoped_in_arm.bend
similarity index 100%
rename from tests/golden_tests/encode_pattern_match/match_adt_unscoped_in_arm.hvm
rename to tests/golden_tests/encode_pattern_match/match_adt_unscoped_in_arm.bend
diff --git a/tests/golden_tests/encode_pattern_match/match_adt_unscoped_lambda.hvm b/tests/golden_tests/encode_pattern_match/match_adt_unscoped_lambda.bend
similarity index 100%
rename from tests/golden_tests/encode_pattern_match/match_adt_unscoped_lambda.hvm
rename to tests/golden_tests/encode_pattern_match/match_adt_unscoped_lambda.bend
diff --git a/tests/golden_tests/encode_pattern_match/match_adt_unscoped_var.hvm b/tests/golden_tests/encode_pattern_match/match_adt_unscoped_var.bend
similarity index 100%
rename from tests/golden_tests/encode_pattern_match/match_adt_unscoped_var.hvm
rename to tests/golden_tests/encode_pattern_match/match_adt_unscoped_var.bend
diff --git a/tests/golden_tests/encode_pattern_match/match_auto_linearization.hvm b/tests/golden_tests/encode_pattern_match/match_auto_linearization.bend
similarity index 100%
rename from tests/golden_tests/encode_pattern_match/match_auto_linearization.hvm
rename to tests/golden_tests/encode_pattern_match/match_auto_linearization.bend
diff --git a/tests/golden_tests/encode_pattern_match/match_bind.hvm b/tests/golden_tests/encode_pattern_match/match_bind.bend
similarity index 100%
rename from tests/golden_tests/encode_pattern_match/match_bind.hvm
rename to tests/golden_tests/encode_pattern_match/match_bind.bend
diff --git a/tests/golden_tests/encode_pattern_match/match_num_adt_tup_parser.hvm b/tests/golden_tests/encode_pattern_match/match_num_adt_tup_parser.bend
similarity index 100%
rename from tests/golden_tests/encode_pattern_match/match_num_adt_tup_parser.hvm
rename to tests/golden_tests/encode_pattern_match/match_num_adt_tup_parser.bend
diff --git a/tests/golden_tests/encode_pattern_match/match_num_pred.hvm b/tests/golden_tests/encode_pattern_match/match_num_pred.bend
similarity index 100%
rename from tests/golden_tests/encode_pattern_match/match_num_pred.hvm
rename to tests/golden_tests/encode_pattern_match/match_num_pred.bend
diff --git a/tests/golden_tests/encode_pattern_match/match_syntax.hvm b/tests/golden_tests/encode_pattern_match/match_syntax.bend
similarity index 100%
rename from tests/golden_tests/encode_pattern_match/match_syntax.hvm
rename to tests/golden_tests/encode_pattern_match/match_syntax.bend
diff --git a/tests/golden_tests/encode_pattern_match/merge_recursive.hvm b/tests/golden_tests/encode_pattern_match/merge_recursive.bend
similarity index 100%
rename from tests/golden_tests/encode_pattern_match/merge_recursive.hvm
rename to tests/golden_tests/encode_pattern_match/merge_recursive.bend
diff --git a/tests/golden_tests/encode_pattern_match/no_patterns.hvm b/tests/golden_tests/encode_pattern_match/no_patterns.bend
similarity index 100%
rename from tests/golden_tests/encode_pattern_match/no_patterns.hvm
rename to tests/golden_tests/encode_pattern_match/no_patterns.bend
diff --git a/tests/golden_tests/encode_pattern_match/non_matching_fst_arg.hvm b/tests/golden_tests/encode_pattern_match/non_matching_fst_arg.bend
similarity index 100%
rename from tests/golden_tests/encode_pattern_match/non_matching_fst_arg.hvm
rename to tests/golden_tests/encode_pattern_match/non_matching_fst_arg.bend
diff --git a/tests/golden_tests/encode_pattern_match/ntup_sum.hvm b/tests/golden_tests/encode_pattern_match/ntup_sum.bend
similarity index 100%
rename from tests/golden_tests/encode_pattern_match/ntup_sum.hvm
rename to tests/golden_tests/encode_pattern_match/ntup_sum.bend
diff --git a/tests/golden_tests/encode_pattern_match/pattern_match_encoding.hvm b/tests/golden_tests/encode_pattern_match/pattern_match_encoding.bend
similarity index 100%
rename from tests/golden_tests/encode_pattern_match/pattern_match_encoding.hvm
rename to tests/golden_tests/encode_pattern_match/pattern_match_encoding.bend
diff --git a/tests/golden_tests/encode_pattern_match/switch_in_switch_arg.hvm b/tests/golden_tests/encode_pattern_match/switch_in_switch_arg.bend
similarity index 100%
rename from tests/golden_tests/encode_pattern_match/switch_in_switch_arg.hvm
rename to tests/golden_tests/encode_pattern_match/switch_in_switch_arg.bend
diff --git a/tests/golden_tests/encode_pattern_match/var_only.hvm b/tests/golden_tests/encode_pattern_match/var_only.bend
similarity index 100%
rename from tests/golden_tests/encode_pattern_match/var_only.hvm
rename to tests/golden_tests/encode_pattern_match/var_only.bend
diff --git a/tests/golden_tests/encode_pattern_match/weekday.hvm b/tests/golden_tests/encode_pattern_match/weekday.bend
similarity index 100%
rename from tests/golden_tests/encode_pattern_match/weekday.hvm
rename to tests/golden_tests/encode_pattern_match/weekday.bend
diff --git a/tests/golden_tests/hangs/recursive_with_unscoped.hvm b/tests/golden_tests/hangs/recursive_with_unscoped.bend
similarity index 100%
rename from tests/golden_tests/hangs/recursive_with_unscoped.hvm
rename to tests/golden_tests/hangs/recursive_with_unscoped.bend
diff --git a/tests/golden_tests/io/load.hvm b/tests/golden_tests/io/load.bend
similarity index 100%
rename from tests/golden_tests/io/load.hvm
rename to tests/golden_tests/io/load.bend
diff --git a/tests/golden_tests/io/load_fail.hvm b/tests/golden_tests/io/load_fail.bend
similarity index 100%
rename from tests/golden_tests/io/load_fail.hvm
rename to tests/golden_tests/io/load_fail.bend
diff --git a/tests/golden_tests/io/store.hvm b/tests/golden_tests/io/store.bend
similarity index 100%
rename from tests/golden_tests/io/store.hvm
rename to tests/golden_tests/io/store.bend
diff --git a/tests/golden_tests/io/store_fail.hvm b/tests/golden_tests/io/store_fail.bend
similarity index 100%
rename from tests/golden_tests/io/store_fail.hvm
rename to tests/golden_tests/io/store_fail.bend
diff --git a/tests/golden_tests/linear_readback/church_mul.hvm b/tests/golden_tests/linear_readback/church_mul.bend
similarity index 100%
rename from tests/golden_tests/linear_readback/church_mul.hvm
rename to tests/golden_tests/linear_readback/church_mul.bend
diff --git a/tests/golden_tests/mutual_recursion/a_b_c.hvm b/tests/golden_tests/mutual_recursion/a_b_c.bend
similarity index 100%
rename from tests/golden_tests/mutual_recursion/a_b_c.hvm
rename to tests/golden_tests/mutual_recursion/a_b_c.bend
diff --git a/tests/golden_tests/mutual_recursion/len.hvm b/tests/golden_tests/mutual_recursion/len.bend
similarity index 100%
rename from tests/golden_tests/mutual_recursion/len.hvm
rename to tests/golden_tests/mutual_recursion/len.bend
diff --git a/tests/golden_tests/mutual_recursion/merged.hvm b/tests/golden_tests/mutual_recursion/merged.bend
similarity index 100%
rename from tests/golden_tests/mutual_recursion/merged.hvm
rename to tests/golden_tests/mutual_recursion/merged.bend
diff --git a/tests/golden_tests/mutual_recursion/multiple.hvm b/tests/golden_tests/mutual_recursion/multiple.bend
similarity index 100%
rename from tests/golden_tests/mutual_recursion/multiple.hvm
rename to tests/golden_tests/mutual_recursion/multiple.bend
diff --git a/tests/golden_tests/mutual_recursion/odd_even.hvm b/tests/golden_tests/mutual_recursion/odd_even.bend
similarity index 100%
rename from tests/golden_tests/mutual_recursion/odd_even.hvm
rename to tests/golden_tests/mutual_recursion/odd_even.bend
diff --git a/tests/golden_tests/parse_file/imp_map.hvm b/tests/golden_tests/parse_file/imp_map.bend
similarity index 100%
rename from tests/golden_tests/parse_file/imp_map.hvm
rename to tests/golden_tests/parse_file/imp_map.bend
diff --git a/tests/golden_tests/parse_file/imp_program.hvm b/tests/golden_tests/parse_file/imp_program.bend
similarity index 100%
rename from tests/golden_tests/parse_file/imp_program.hvm
rename to tests/golden_tests/parse_file/imp_program.bend
diff --git a/tests/golden_tests/parse_file/repeated_adt_name.hvm b/tests/golden_tests/parse_file/repeated_adt_name.bend
similarity index 100%
rename from tests/golden_tests/parse_file/repeated_adt_name.hvm
rename to tests/golden_tests/parse_file/repeated_adt_name.bend
diff --git a/tests/golden_tests/parse_file/scape_chars.hvm b/tests/golden_tests/parse_file/scape_chars.bend
similarity index 100%
rename from tests/golden_tests/parse_file/scape_chars.hvm
rename to tests/golden_tests/parse_file/scape_chars.bend
diff --git a/tests/golden_tests/readback_lnet/addition.hvm b/tests/golden_tests/readback_lnet/addition.bend
similarity index 100%
rename from tests/golden_tests/readback_lnet/addition.hvm
rename to tests/golden_tests/readback_lnet/addition.bend
diff --git a/tests/golden_tests/readback_lnet/bad_net.hvm b/tests/golden_tests/readback_lnet/bad_net.bend
similarity index 100%
rename from tests/golden_tests/readback_lnet/bad_net.hvm
rename to tests/golden_tests/readback_lnet/bad_net.bend
diff --git a/tests/golden_tests/readback_lnet/bad_net1.hvm b/tests/golden_tests/readback_lnet/bad_net1.bend
similarity index 100%
rename from tests/golden_tests/readback_lnet/bad_net1.hvm
rename to tests/golden_tests/readback_lnet/bad_net1.bend
diff --git a/tests/golden_tests/readback_lnet/bad_net3.hvm b/tests/golden_tests/readback_lnet/bad_net3.bend
similarity index 100%
rename from tests/golden_tests/readback_lnet/bad_net3.hvm
rename to tests/golden_tests/readback_lnet/bad_net3.bend
diff --git a/tests/golden_tests/readback_lnet/complicated_dup.hvm b/tests/golden_tests/readback_lnet/complicated_dup.bend
similarity index 100%
rename from tests/golden_tests/readback_lnet/complicated_dup.hvm
rename to tests/golden_tests/readback_lnet/complicated_dup.bend
diff --git a/tests/golden_tests/readback_lnet/fst_snd.hvm b/tests/golden_tests/readback_lnet/fst_snd.bend
similarity index 100%
rename from tests/golden_tests/readback_lnet/fst_snd.hvm
rename to tests/golden_tests/readback_lnet/fst_snd.bend
diff --git a/tests/golden_tests/readback_lnet/id.hvm b/tests/golden_tests/readback_lnet/id.bend
similarity index 100%
rename from tests/golden_tests/readback_lnet/id.hvm
rename to tests/golden_tests/readback_lnet/id.bend
diff --git a/tests/golden_tests/readback_lnet/invalid_op2_op2.hvm b/tests/golden_tests/readback_lnet/invalid_op2_op2.bend
similarity index 100%
rename from tests/golden_tests/readback_lnet/invalid_op2_op2.hvm
rename to tests/golden_tests/readback_lnet/invalid_op2_op2.bend
diff --git a/tests/golden_tests/readback_lnet/match.hvm b/tests/golden_tests/readback_lnet/match.bend
similarity index 100%
rename from tests/golden_tests/readback_lnet/match.hvm
rename to tests/golden_tests/readback_lnet/match.bend
diff --git a/tests/golden_tests/readback_lnet/nested_let.hvm b/tests/golden_tests/readback_lnet/nested_let.bend
similarity index 100%
rename from tests/golden_tests/readback_lnet/nested_let.hvm
rename to tests/golden_tests/readback_lnet/nested_let.bend
diff --git a/tests/golden_tests/readback_lnet/nested_tup.hvm b/tests/golden_tests/readback_lnet/nested_tup.bend
similarity index 100%
rename from tests/golden_tests/readback_lnet/nested_tup.hvm
rename to tests/golden_tests/readback_lnet/nested_tup.bend
diff --git a/tests/golden_tests/readback_lnet/number.hvm b/tests/golden_tests/readback_lnet/number.bend
similarity index 100%
rename from tests/golden_tests/readback_lnet/number.hvm
rename to tests/golden_tests/readback_lnet/number.bend
diff --git a/tests/golden_tests/readback_lnet/simple_tup.hvm b/tests/golden_tests/readback_lnet/simple_tup.bend
similarity index 100%
rename from tests/golden_tests/readback_lnet/simple_tup.hvm
rename to tests/golden_tests/readback_lnet/simple_tup.bend
diff --git a/tests/golden_tests/readback_lnet/tup_add.hvm b/tests/golden_tests/readback_lnet/tup_add.bend
similarity index 100%
rename from tests/golden_tests/readback_lnet/tup_add.hvm
rename to tests/golden_tests/readback_lnet/tup_add.bend
diff --git a/tests/golden_tests/run_entrypoint/foo.hvm b/tests/golden_tests/run_entrypoint/foo.bend
similarity index 100%
rename from tests/golden_tests/run_entrypoint/foo.hvm
rename to tests/golden_tests/run_entrypoint/foo.bend
diff --git a/tests/golden_tests/run_file/360_no_scope.hvm b/tests/golden_tests/run_file/360_no_scope.bend
similarity index 100%
rename from tests/golden_tests/run_file/360_no_scope.hvm
rename to tests/golden_tests/run_file/360_no_scope.bend
diff --git a/tests/golden_tests/run_file/addition.hvm b/tests/golden_tests/run_file/addition.bend
similarity index 100%
rename from tests/golden_tests/run_file/addition.hvm
rename to tests/golden_tests/run_file/addition.bend
diff --git a/tests/golden_tests/run_file/adt_match.hvm b/tests/golden_tests/run_file/adt_match.bend
similarity index 100%
rename from tests/golden_tests/run_file/adt_match.hvm
rename to tests/golden_tests/run_file/adt_match.bend
diff --git a/tests/golden_tests/run_file/adt_match_wrong_tag.hvm b/tests/golden_tests/run_file/adt_match_wrong_tag.bend
similarity index 100%
rename from tests/golden_tests/run_file/adt_match_wrong_tag.hvm
rename to tests/golden_tests/run_file/adt_match_wrong_tag.bend
diff --git a/tests/golden_tests/run_file/adt_option_and.hvm b/tests/golden_tests/run_file/adt_option_and.bend
similarity index 100%
rename from tests/golden_tests/run_file/adt_option_and.hvm
rename to tests/golden_tests/run_file/adt_option_and.bend
diff --git a/tests/golden_tests/run_file/adt_wrong_tag.hvm b/tests/golden_tests/run_file/adt_wrong_tag.bend
similarity index 100%
rename from tests/golden_tests/run_file/adt_wrong_tag.hvm
rename to tests/golden_tests/run_file/adt_wrong_tag.bend
diff --git a/tests/golden_tests/run_file/and.hvm b/tests/golden_tests/run_file/and.bend
similarity index 100%
rename from tests/golden_tests/run_file/and.hvm
rename to tests/golden_tests/run_file/and.bend
diff --git a/tests/golden_tests/run_file/bend_fold.hvm b/tests/golden_tests/run_file/bend_fold.bend
similarity index 100%
rename from tests/golden_tests/run_file/bend_fold.hvm
rename to tests/golden_tests/run_file/bend_fold.bend
diff --git a/tests/golden_tests/run_file/bitonic_sort.hvm b/tests/golden_tests/run_file/bitonic_sort.bend
similarity index 100%
rename from tests/golden_tests/run_file/bitonic_sort.hvm
rename to tests/golden_tests/run_file/bitonic_sort.bend
diff --git a/tests/golden_tests/run_file/bitonic_sort_lam.hvm b/tests/golden_tests/run_file/bitonic_sort_lam.bend
similarity index 100%
rename from tests/golden_tests/run_file/bitonic_sort_lam.hvm
rename to tests/golden_tests/run_file/bitonic_sort_lam.bend
diff --git a/tests/golden_tests/run_file/box.hvm b/tests/golden_tests/run_file/box.bend
similarity index 100%
rename from tests/golden_tests/run_file/box.hvm
rename to tests/golden_tests/run_file/box.bend
diff --git a/tests/golden_tests/run_file/branch_statements_assignment.hvm b/tests/golden_tests/run_file/branch_statements_assignment.bend
similarity index 100%
rename from tests/golden_tests/run_file/branch_statements_assignment.hvm
rename to tests/golden_tests/run_file/branch_statements_assignment.bend
diff --git a/tests/golden_tests/run_file/callcc.hvm b/tests/golden_tests/run_file/callcc.bend
similarity index 100%
rename from tests/golden_tests/run_file/callcc.hvm
rename to tests/golden_tests/run_file/callcc.bend
diff --git a/tests/golden_tests/run_file/chars.hvm b/tests/golden_tests/run_file/chars.bend
similarity index 100%
rename from tests/golden_tests/run_file/chars.hvm
rename to tests/golden_tests/run_file/chars.bend
diff --git a/tests/golden_tests/run_file/chars_forall.hvm b/tests/golden_tests/run_file/chars_forall.bend
similarity index 100%
rename from tests/golden_tests/run_file/chars_forall.hvm
rename to tests/golden_tests/run_file/chars_forall.bend
diff --git a/tests/golden_tests/run_file/chars_lambda.hvm b/tests/golden_tests/run_file/chars_lambda.bend
similarity index 100%
rename from tests/golden_tests/run_file/chars_lambda.hvm
rename to tests/golden_tests/run_file/chars_lambda.bend
diff --git a/tests/golden_tests/run_file/def_bool_num.hvm b/tests/golden_tests/run_file/def_bool_num.bend
similarity index 100%
rename from tests/golden_tests/run_file/def_bool_num.hvm
rename to tests/golden_tests/run_file/def_bool_num.bend
diff --git a/tests/golden_tests/run_file/def_num_bool.hvm b/tests/golden_tests/run_file/def_num_bool.bend
similarity index 100%
rename from tests/golden_tests/run_file/def_num_bool.hvm
rename to tests/golden_tests/run_file/def_num_bool.bend
diff --git a/tests/golden_tests/run_file/def_tups.hvm b/tests/golden_tests/run_file/def_tups.bend
similarity index 100%
rename from tests/golden_tests/run_file/def_tups.hvm
rename to tests/golden_tests/run_file/def_tups.bend
diff --git a/tests/golden_tests/run_file/do_block_mixed.hvm b/tests/golden_tests/run_file/do_block_mixed.bend
similarity index 100%
rename from tests/golden_tests/run_file/do_block_mixed.hvm
rename to tests/golden_tests/run_file/do_block_mixed.bend
diff --git a/tests/golden_tests/run_file/dup_global_lam.hvm b/tests/golden_tests/run_file/dup_global_lam.bend
similarity index 100%
rename from tests/golden_tests/run_file/dup_global_lam.hvm
rename to tests/golden_tests/run_file/dup_global_lam.bend
diff --git a/tests/golden_tests/run_file/empty.hvm b/tests/golden_tests/run_file/empty.bend
similarity index 100%
rename from tests/golden_tests/run_file/empty.hvm
rename to tests/golden_tests/run_file/empty.bend
diff --git a/tests/golden_tests/run_file/erased_side_effect.hvm b/tests/golden_tests/run_file/erased_side_effect.bend
similarity index 100%
rename from tests/golden_tests/run_file/erased_side_effect.hvm
rename to tests/golden_tests/run_file/erased_side_effect.bend
diff --git a/tests/golden_tests/run_file/escape_sequences.hvm b/tests/golden_tests/run_file/escape_sequences.bend
similarity index 100%
rename from tests/golden_tests/run_file/escape_sequences.hvm
rename to tests/golden_tests/run_file/escape_sequences.bend
diff --git a/tests/golden_tests/run_file/eta.hvm b/tests/golden_tests/run_file/eta.bend
similarity index 100%
rename from tests/golden_tests/run_file/eta.hvm
rename to tests/golden_tests/run_file/eta.bend
diff --git a/tests/golden_tests/run_file/example.hvm b/tests/golden_tests/run_file/example.bend
similarity index 100%
rename from tests/golden_tests/run_file/example.hvm
rename to tests/golden_tests/run_file/example.bend
diff --git a/tests/golden_tests/run_file/exp.hvm b/tests/golden_tests/run_file/exp.bend
similarity index 100%
rename from tests/golden_tests/run_file/exp.hvm
rename to tests/golden_tests/run_file/exp.bend
diff --git a/tests/golden_tests/run_file/extracted_match_pred.hvm b/tests/golden_tests/run_file/extracted_match_pred.bend
similarity index 100%
rename from tests/golden_tests/run_file/extracted_match_pred.hvm
rename to tests/golden_tests/run_file/extracted_match_pred.bend
diff --git a/tests/golden_tests/run_file/field_vectorization.hvm b/tests/golden_tests/run_file/field_vectorization.bend
similarity index 100%
rename from tests/golden_tests/run_file/field_vectorization.hvm
rename to tests/golden_tests/run_file/field_vectorization.bend
diff --git a/tests/golden_tests/run_file/id_underscore.hvm b/tests/golden_tests/run_file/id_underscore.bend
similarity index 100%
rename from tests/golden_tests/run_file/id_underscore.hvm
rename to tests/golden_tests/run_file/id_underscore.bend
diff --git a/tests/golden_tests/run_file/kind_compiled_tree_sum.hvm b/tests/golden_tests/run_file/kind_compiled_tree_sum.bend
similarity index 100%
rename from tests/golden_tests/run_file/kind_compiled_tree_sum.hvm
rename to tests/golden_tests/run_file/kind_compiled_tree_sum.bend
diff --git a/tests/golden_tests/run_file/lam_op2.hvm b/tests/golden_tests/run_file/lam_op2.bend
similarity index 100%
rename from tests/golden_tests/run_file/lam_op2.hvm
rename to tests/golden_tests/run_file/lam_op2.bend
diff --git a/tests/golden_tests/run_file/lam_op2_nested.hvm b/tests/golden_tests/run_file/lam_op2_nested.bend
similarity index 100%
rename from tests/golden_tests/run_file/lam_op2_nested.hvm
rename to tests/golden_tests/run_file/lam_op2_nested.bend
diff --git a/tests/golden_tests/run_file/let_tup_readback.hvm b/tests/golden_tests/run_file/let_tup_readback.bend
similarity index 100%
rename from tests/golden_tests/run_file/let_tup_readback.hvm
rename to tests/golden_tests/run_file/let_tup_readback.bend
diff --git a/tests/golden_tests/run_file/linearize_match.hvm b/tests/golden_tests/run_file/linearize_match.bend
similarity index 100%
rename from tests/golden_tests/run_file/linearize_match.hvm
rename to tests/golden_tests/run_file/linearize_match.bend
diff --git a/tests/golden_tests/run_file/list_resugar.hvm b/tests/golden_tests/run_file/list_resugar.bend
similarity index 100%
rename from tests/golden_tests/run_file/list_resugar.hvm
rename to tests/golden_tests/run_file/list_resugar.bend
diff --git a/tests/golden_tests/run_file/list_reverse.hvm b/tests/golden_tests/run_file/list_reverse.bend
similarity index 100%
rename from tests/golden_tests/run_file/list_reverse.hvm
rename to tests/golden_tests/run_file/list_reverse.bend
diff --git a/tests/golden_tests/run_file/list_take.hvm b/tests/golden_tests/run_file/list_take.bend
similarity index 100%
rename from tests/golden_tests/run_file/list_take.hvm
rename to tests/golden_tests/run_file/list_take.bend
diff --git a/tests/golden_tests/run_file/list_to_tree.hvm b/tests/golden_tests/run_file/list_to_tree.bend
similarity index 100%
rename from tests/golden_tests/run_file/list_to_tree.hvm
rename to tests/golden_tests/run_file/list_to_tree.bend
diff --git a/tests/golden_tests/run_file/match.hvm b/tests/golden_tests/run_file/match.bend
similarity index 100%
rename from tests/golden_tests/run_file/match.hvm
rename to tests/golden_tests/run_file/match.bend
diff --git a/tests/golden_tests/run_file/match_builtins.hvm b/tests/golden_tests/run_file/match_builtins.bend
similarity index 100%
rename from tests/golden_tests/run_file/match_builtins.hvm
rename to tests/golden_tests/run_file/match_builtins.bend
diff --git a/tests/golden_tests/run_file/match_mult_linearization.hvm b/tests/golden_tests/run_file/match_mult_linearization.bend
similarity index 100%
rename from tests/golden_tests/run_file/match_mult_linearization.hvm
rename to tests/golden_tests/run_file/match_mult_linearization.bend
diff --git a/tests/golden_tests/run_file/match_num_adt_tup_parser.hvm b/tests/golden_tests/run_file/match_num_adt_tup_parser.bend
similarity index 100%
rename from tests/golden_tests/run_file/match_num_adt_tup_parser.hvm
rename to tests/golden_tests/run_file/match_num_adt_tup_parser.bend
diff --git a/tests/golden_tests/run_file/match_num_explicit_bind.hvm b/tests/golden_tests/run_file/match_num_explicit_bind.bend
similarity index 100%
rename from tests/golden_tests/run_file/match_num_explicit_bind.hvm
rename to tests/golden_tests/run_file/match_num_explicit_bind.bend
diff --git a/tests/golden_tests/run_file/match_num_num_to_char.hvm b/tests/golden_tests/run_file/match_num_num_to_char.bend
similarity index 100%
rename from tests/golden_tests/run_file/match_num_num_to_char.hvm
rename to tests/golden_tests/run_file/match_num_num_to_char.bend
diff --git a/tests/golden_tests/run_file/match_num_succ_complex.hvm b/tests/golden_tests/run_file/match_num_succ_complex.bend
similarity index 100%
rename from tests/golden_tests/run_file/match_num_succ_complex.hvm
rename to tests/golden_tests/run_file/match_num_succ_complex.bend
diff --git a/tests/golden_tests/run_file/match_str.hvm b/tests/golden_tests/run_file/match_str.bend
similarity index 100%
rename from tests/golden_tests/run_file/match_str.hvm
rename to tests/golden_tests/run_file/match_str.bend
diff --git a/tests/golden_tests/run_file/match_sup.hvm b/tests/golden_tests/run_file/match_sup.bend
similarity index 100%
rename from tests/golden_tests/run_file/match_sup.hvm
rename to tests/golden_tests/run_file/match_sup.bend
diff --git a/tests/golden_tests/run_file/match_vars.hvm b/tests/golden_tests/run_file/match_vars.bend
similarity index 100%
rename from tests/golden_tests/run_file/match_vars.hvm
rename to tests/golden_tests/run_file/match_vars.bend
diff --git a/tests/golden_tests/run_file/merge_sort.hvm b/tests/golden_tests/run_file/merge_sort.bend
similarity index 100%
rename from tests/golden_tests/run_file/merge_sort.hvm
rename to tests/golden_tests/run_file/merge_sort.bend
diff --git a/tests/golden_tests/run_file/mixed_syntax.hvm b/tests/golden_tests/run_file/mixed_syntax.bend
similarity index 100%
rename from tests/golden_tests/run_file/mixed_syntax.hvm
rename to tests/golden_tests/run_file/mixed_syntax.bend
diff --git a/tests/golden_tests/run_file/names_hyphen.hvm b/tests/golden_tests/run_file/names_hyphen.bend
similarity index 100%
rename from tests/golden_tests/run_file/names_hyphen.hvm
rename to tests/golden_tests/run_file/names_hyphen.bend
diff --git a/tests/golden_tests/run_file/names_hyphen_toplevel.hvm b/tests/golden_tests/run_file/names_hyphen_toplevel.bend
similarity index 100%
rename from tests/golden_tests/run_file/names_hyphen_toplevel.hvm
rename to tests/golden_tests/run_file/names_hyphen_toplevel.bend
diff --git a/tests/golden_tests/run_file/nat_add.hvm b/tests/golden_tests/run_file/nat_add.bend
similarity index 100%
rename from tests/golden_tests/run_file/nat_add.hvm
rename to tests/golden_tests/run_file/nat_add.bend
diff --git a/tests/golden_tests/run_file/nat_add_num.hvm b/tests/golden_tests/run_file/nat_add_num.bend
similarity index 100%
rename from tests/golden_tests/run_file/nat_add_num.hvm
rename to tests/golden_tests/run_file/nat_add_num.bend
diff --git a/tests/golden_tests/run_file/nested_list_and_string.hvm b/tests/golden_tests/run_file/nested_list_and_string.bend
similarity index 100%
rename from tests/golden_tests/run_file/nested_list_and_string.hvm
rename to tests/golden_tests/run_file/nested_list_and_string.bend
diff --git a/tests/golden_tests/run_file/nested_str.hvm b/tests/golden_tests/run_file/nested_str.bend
similarity index 100%
rename from tests/golden_tests/run_file/nested_str.hvm
rename to tests/golden_tests/run_file/nested_str.bend
diff --git a/tests/golden_tests/run_file/num_match_missing_var.hvm b/tests/golden_tests/run_file/num_match_missing_var.bend
similarity index 100%
rename from tests/golden_tests/run_file/num_match_missing_var.hvm
rename to tests/golden_tests/run_file/num_match_missing_var.bend
diff --git a/tests/golden_tests/run_file/num_pred.hvm b/tests/golden_tests/run_file/num_pred.bend
similarity index 100%
rename from tests/golden_tests/run_file/num_pred.hvm
rename to tests/golden_tests/run_file/num_pred.bend
diff --git a/tests/golden_tests/run_file/override_list_ctr.hvm b/tests/golden_tests/run_file/override_list_ctr.bend
similarity index 100%
rename from tests/golden_tests/run_file/override_list_ctr.hvm
rename to tests/golden_tests/run_file/override_list_ctr.bend
diff --git a/tests/golden_tests/run_file/override_str_ctr.hvm b/tests/golden_tests/run_file/override_str_ctr.bend
similarity index 100%
rename from tests/golden_tests/run_file/override_str_ctr.hvm
rename to tests/golden_tests/run_file/override_str_ctr.bend
diff --git a/tests/golden_tests/run_file/pred.hvm b/tests/golden_tests/run_file/pred.bend
similarity index 100%
rename from tests/golden_tests/run_file/pred.hvm
rename to tests/golden_tests/run_file/pred.bend
diff --git a/tests/golden_tests/run_file/queue.hvm b/tests/golden_tests/run_file/queue.bend
similarity index 100%
rename from tests/golden_tests/run_file/queue.hvm
rename to tests/golden_tests/run_file/queue.bend
diff --git a/tests/golden_tests/run_file/radix_sort_ctr.hvm b/tests/golden_tests/run_file/radix_sort_ctr.bend
similarity index 100%
rename from tests/golden_tests/run_file/radix_sort_ctr.hvm
rename to tests/golden_tests/run_file/radix_sort_ctr.bend
diff --git a/tests/golden_tests/run_file/readback_hvm1_main.hvm b/tests/golden_tests/run_file/readback_hvm1_main.bend
similarity index 100%
rename from tests/golden_tests/run_file/readback_hvm1_main.hvm
rename to tests/golden_tests/run_file/readback_hvm1_main.bend
diff --git a/tests/golden_tests/run_file/readback_list_other_ctr.hvm b/tests/golden_tests/run_file/readback_list_other_ctr.bend
similarity index 100%
rename from tests/golden_tests/run_file/readback_list_other_ctr.hvm
rename to tests/golden_tests/run_file/readback_list_other_ctr.bend
diff --git a/tests/golden_tests/run_file/recursive_bind.hvm b/tests/golden_tests/run_file/recursive_bind.bend
similarity index 100%
rename from tests/golden_tests/run_file/recursive_bind.hvm
rename to tests/golden_tests/run_file/recursive_bind.bend
diff --git a/tests/golden_tests/run_file/recursive_combinator.hvm b/tests/golden_tests/run_file/recursive_combinator.bend
similarity index 100%
rename from tests/golden_tests/run_file/recursive_combinator.hvm
rename to tests/golden_tests/run_file/recursive_combinator.bend
diff --git a/tests/golden_tests/run_file/recursive_combinator_nested.hvm b/tests/golden_tests/run_file/recursive_combinator_nested.bend
similarity index 100%
rename from tests/golden_tests/run_file/recursive_combinator_nested.hvm
rename to tests/golden_tests/run_file/recursive_combinator_nested.bend
diff --git a/tests/golden_tests/run_file/recursive_match_native.hvm b/tests/golden_tests/run_file/recursive_match_native.bend
similarity index 100%
rename from tests/golden_tests/run_file/recursive_match_native.hvm
rename to tests/golden_tests/run_file/recursive_match_native.bend
diff --git a/tests/golden_tests/run_file/ref_resolution.hvm b/tests/golden_tests/run_file/ref_resolution.bend
similarity index 100%
rename from tests/golden_tests/run_file/ref_resolution.hvm
rename to tests/golden_tests/run_file/ref_resolution.bend
diff --git a/tests/golden_tests/run_file/repeated_name_truncation.hvm b/tests/golden_tests/run_file/repeated_name_truncation.bend
similarity index 100%
rename from tests/golden_tests/run_file/repeated_name_truncation.hvm
rename to tests/golden_tests/run_file/repeated_name_truncation.bend
diff --git a/tests/golden_tests/run_file/scopeless_discard.hvm b/tests/golden_tests/run_file/scopeless_discard.bend
similarity index 100%
rename from tests/golden_tests/run_file/scopeless_discard.hvm
rename to tests/golden_tests/run_file/scopeless_discard.bend
diff --git a/tests/golden_tests/run_file/str_concat.hvm b/tests/golden_tests/run_file/str_concat.bend
similarity index 100%
rename from tests/golden_tests/run_file/str_concat.hvm
rename to tests/golden_tests/run_file/str_concat.bend
diff --git a/tests/golden_tests/run_file/str_inc.hvm b/tests/golden_tests/run_file/str_inc.bend
similarity index 100%
rename from tests/golden_tests/run_file/str_inc.hvm
rename to tests/golden_tests/run_file/str_inc.bend
diff --git a/tests/golden_tests/run_file/str_inc_eta.hvm b/tests/golden_tests/run_file/str_inc_eta.bend
similarity index 100%
rename from tests/golden_tests/run_file/str_inc_eta.hvm
rename to tests/golden_tests/run_file/str_inc_eta.bend
diff --git a/tests/golden_tests/run_file/str_len.hvm b/tests/golden_tests/run_file/str_len.bend
similarity index 100%
rename from tests/golden_tests/run_file/str_len.hvm
rename to tests/golden_tests/run_file/str_len.bend
diff --git a/tests/golden_tests/run_file/sum_tree.hvm b/tests/golden_tests/run_file/sum_tree.bend
similarity index 100%
rename from tests/golden_tests/run_file/sum_tree.hvm
rename to tests/golden_tests/run_file/sum_tree.bend
diff --git a/tests/golden_tests/run_file/sup_app.hvm b/tests/golden_tests/run_file/sup_app.bend
similarity index 100%
rename from tests/golden_tests/run_file/sup_app.hvm
rename to tests/golden_tests/run_file/sup_app.bend
diff --git a/tests/golden_tests/run_file/sup_reconstruction.bend b/tests/golden_tests/run_file/sup_reconstruction.bend
new file mode 100644
index 00000000..e81d7f10
--- /dev/null
+++ b/tests/golden_tests/run_file/sup_reconstruction.bend
@@ -0,0 +1 @@
+main = λa let {b c} = a; {b c}
diff --git a/tests/golden_tests/run_file/superposed_is_even.hvm b/tests/golden_tests/run_file/superposed_is_even.bend
similarity index 100%
rename from tests/golden_tests/run_file/superposed_is_even.hvm
rename to tests/golden_tests/run_file/superposed_is_even.bend
diff --git a/tests/golden_tests/run_file/tagged_lam.hvm b/tests/golden_tests/run_file/tagged_lam.bend
similarity index 100%
rename from tests/golden_tests/run_file/tagged_lam.hvm
rename to tests/golden_tests/run_file/tagged_lam.bend
diff --git a/tests/golden_tests/run_file/tup_list_strings.hvm b/tests/golden_tests/run_file/tup_list_strings.bend
similarity index 100%
rename from tests/golden_tests/run_file/tup_list_strings.hvm
rename to tests/golden_tests/run_file/tup_list_strings.bend
diff --git a/tests/golden_tests/run_file/tup_reconstruction.hvm b/tests/golden_tests/run_file/tup_reconstruction.bend
similarity index 100%
rename from tests/golden_tests/run_file/tup_reconstruction.hvm
rename to tests/golden_tests/run_file/tup_reconstruction.bend
diff --git a/tests/golden_tests/run_file/tuple_rots.hvm b/tests/golden_tests/run_file/tuple_rots.bend
similarity index 100%
rename from tests/golden_tests/run_file/tuple_rots.hvm
rename to tests/golden_tests/run_file/tuple_rots.bend
diff --git a/tests/golden_tests/run_file/unaplied_str.hvm b/tests/golden_tests/run_file/unaplied_str.bend
similarity index 100%
rename from tests/golden_tests/run_file/unaplied_str.hvm
rename to tests/golden_tests/run_file/unaplied_str.bend
diff --git a/tests/golden_tests/run_file/unscoped_never_used.hvm b/tests/golden_tests/run_file/unscoped_never_used.bend
similarity index 100%
rename from tests/golden_tests/run_file/unscoped_never_used.hvm
rename to tests/golden_tests/run_file/unscoped_never_used.bend
diff --git a/tests/golden_tests/run_file/unused_dup_var.hvm b/tests/golden_tests/run_file/unused_dup_var.bend
similarity index 100%
rename from tests/golden_tests/run_file/unused_dup_var.hvm
rename to tests/golden_tests/run_file/unused_dup_var.bend
diff --git a/tests/golden_tests/run_file/world.hvm b/tests/golden_tests/run_file/world.bend
similarity index 100%
rename from tests/golden_tests/run_file/world.hvm
rename to tests/golden_tests/run_file/world.bend
diff --git a/tests/golden_tests/run_file/wrong_string.hvm b/tests/golden_tests/run_file/wrong_string.bend
similarity index 100%
rename from tests/golden_tests/run_file/wrong_string.hvm
rename to tests/golden_tests/run_file/wrong_string.bend
diff --git a/tests/golden_tests/run_lazy/addition.hvm b/tests/golden_tests/run_lazy/addition.bend
similarity index 100%
rename from tests/golden_tests/run_lazy/addition.hvm
rename to tests/golden_tests/run_lazy/addition.bend
diff --git a/tests/golden_tests/run_lazy/adt_match.hvm b/tests/golden_tests/run_lazy/adt_match.bend
similarity index 100%
rename from tests/golden_tests/run_lazy/adt_match.hvm
rename to tests/golden_tests/run_lazy/adt_match.bend
diff --git a/tests/golden_tests/run_lazy/adt_match_wrong_tag.hvm b/tests/golden_tests/run_lazy/adt_match_wrong_tag.bend
similarity index 100%
rename from tests/golden_tests/run_lazy/adt_match_wrong_tag.hvm
rename to tests/golden_tests/run_lazy/adt_match_wrong_tag.bend
diff --git a/tests/golden_tests/run_lazy/adt_option_and.hvm b/tests/golden_tests/run_lazy/adt_option_and.bend
similarity index 100%
rename from tests/golden_tests/run_lazy/adt_option_and.hvm
rename to tests/golden_tests/run_lazy/adt_option_and.bend
diff --git a/tests/golden_tests/run_lazy/adt_wrong_tag.hvm b/tests/golden_tests/run_lazy/adt_wrong_tag.bend
similarity index 100%
rename from tests/golden_tests/run_lazy/adt_wrong_tag.hvm
rename to tests/golden_tests/run_lazy/adt_wrong_tag.bend
diff --git a/tests/golden_tests/run_lazy/and.hvm b/tests/golden_tests/run_lazy/and.bend
similarity index 100%
rename from tests/golden_tests/run_lazy/and.hvm
rename to tests/golden_tests/run_lazy/and.bend
diff --git a/tests/golden_tests/run_lazy/bitonic_sort.hvm b/tests/golden_tests/run_lazy/bitonic_sort.bend
similarity index 100%
rename from tests/golden_tests/run_lazy/bitonic_sort.hvm
rename to tests/golden_tests/run_lazy/bitonic_sort.bend
diff --git a/tests/golden_tests/run_lazy/bitonic_sort_lam.hvm b/tests/golden_tests/run_lazy/bitonic_sort_lam.bend
similarity index 100%
rename from tests/golden_tests/run_lazy/bitonic_sort_lam.hvm
rename to tests/golden_tests/run_lazy/bitonic_sort_lam.bend
diff --git a/tests/golden_tests/run_lazy/box.hvm b/tests/golden_tests/run_lazy/box.bend
similarity index 100%
rename from tests/golden_tests/run_lazy/box.hvm
rename to tests/golden_tests/run_lazy/box.bend
diff --git a/tests/golden_tests/run_lazy/box2.hvm b/tests/golden_tests/run_lazy/box2.bend
similarity index 100%
rename from tests/golden_tests/run_lazy/box2.hvm
rename to tests/golden_tests/run_lazy/box2.bend
diff --git a/tests/golden_tests/run_lazy/callcc.hvm b/tests/golden_tests/run_lazy/callcc.bend
similarity index 100%
rename from tests/golden_tests/run_lazy/callcc.hvm
rename to tests/golden_tests/run_lazy/callcc.bend
diff --git a/tests/golden_tests/run_lazy/chars.hvm b/tests/golden_tests/run_lazy/chars.bend
similarity index 100%
rename from tests/golden_tests/run_lazy/chars.hvm
rename to tests/golden_tests/run_lazy/chars.bend
diff --git a/tests/golden_tests/run_lazy/def_tups.hvm b/tests/golden_tests/run_lazy/def_tups.bend
similarity index 100%
rename from tests/golden_tests/run_lazy/def_tups.hvm
rename to tests/golden_tests/run_lazy/def_tups.bend
diff --git a/tests/golden_tests/run_lazy/dup_global_lam.hvm b/tests/golden_tests/run_lazy/dup_global_lam.bend
similarity index 100%
rename from tests/golden_tests/run_lazy/dup_global_lam.hvm
rename to tests/golden_tests/run_lazy/dup_global_lam.bend
diff --git a/tests/golden_tests/run_lazy/eta.hvm b/tests/golden_tests/run_lazy/eta.bend
similarity index 100%
rename from tests/golden_tests/run_lazy/eta.hvm
rename to tests/golden_tests/run_lazy/eta.bend
diff --git a/tests/golden_tests/run_lazy/example.hvm b/tests/golden_tests/run_lazy/example.bend
similarity index 100%
rename from tests/golden_tests/run_lazy/example.hvm
rename to tests/golden_tests/run_lazy/example.bend
diff --git a/tests/golden_tests/run_lazy/exp.hvm b/tests/golden_tests/run_lazy/exp.bend
similarity index 100%
rename from tests/golden_tests/run_lazy/exp.hvm
rename to tests/golden_tests/run_lazy/exp.bend
diff --git a/tests/golden_tests/run_lazy/extracted_match_pred.hvm b/tests/golden_tests/run_lazy/extracted_match_pred.bend
similarity index 100%
rename from tests/golden_tests/run_lazy/extracted_match_pred.hvm
rename to tests/golden_tests/run_lazy/extracted_match_pred.bend
diff --git a/tests/golden_tests/run_lazy/field_vectorization.hvm b/tests/golden_tests/run_lazy/field_vectorization.bend
similarity index 100%
rename from tests/golden_tests/run_lazy/field_vectorization.hvm
rename to tests/golden_tests/run_lazy/field_vectorization.bend
diff --git a/tests/golden_tests/run_lazy/lam_op2.hvm b/tests/golden_tests/run_lazy/lam_op2.bend
similarity index 100%
rename from tests/golden_tests/run_lazy/lam_op2.hvm
rename to tests/golden_tests/run_lazy/lam_op2.bend
diff --git a/tests/golden_tests/run_lazy/lam_op2_nested.hvm b/tests/golden_tests/run_lazy/lam_op2_nested.bend
similarity index 100%
rename from tests/golden_tests/run_lazy/lam_op2_nested.hvm
rename to tests/golden_tests/run_lazy/lam_op2_nested.bend
diff --git a/tests/golden_tests/run_lazy/let_tup_readback.hvm b/tests/golden_tests/run_lazy/let_tup_readback.bend
similarity index 100%
rename from tests/golden_tests/run_lazy/let_tup_readback.hvm
rename to tests/golden_tests/run_lazy/let_tup_readback.bend
diff --git a/tests/golden_tests/run_lazy/linearize_match.hvm b/tests/golden_tests/run_lazy/linearize_match.bend
similarity index 100%
rename from tests/golden_tests/run_lazy/linearize_match.hvm
rename to tests/golden_tests/run_lazy/linearize_match.bend
diff --git a/tests/golden_tests/run_lazy/list_resugar.hvm b/tests/golden_tests/run_lazy/list_resugar.bend
similarity index 100%
rename from tests/golden_tests/run_lazy/list_resugar.hvm
rename to tests/golden_tests/run_lazy/list_resugar.bend
diff --git a/tests/golden_tests/run_lazy/list_reverse.hvm b/tests/golden_tests/run_lazy/list_reverse.bend
similarity index 100%
rename from tests/golden_tests/run_lazy/list_reverse.hvm
rename to tests/golden_tests/run_lazy/list_reverse.bend
diff --git a/tests/golden_tests/run_lazy/list_take.hvm b/tests/golden_tests/run_lazy/list_take.bend
similarity index 100%
rename from tests/golden_tests/run_lazy/list_take.hvm
rename to tests/golden_tests/run_lazy/list_take.bend
diff --git a/tests/golden_tests/run_lazy/list_to_tree.hvm b/tests/golden_tests/run_lazy/list_to_tree.bend
similarity index 100%
rename from tests/golden_tests/run_lazy/list_to_tree.hvm
rename to tests/golden_tests/run_lazy/list_to_tree.bend
diff --git a/tests/golden_tests/run_lazy/match.hvm b/tests/golden_tests/run_lazy/match.bend
similarity index 100%
rename from tests/golden_tests/run_lazy/match.hvm
rename to tests/golden_tests/run_lazy/match.bend
diff --git a/tests/golden_tests/run_lazy/match_builtins.hvm b/tests/golden_tests/run_lazy/match_builtins.bend
similarity index 100%
rename from tests/golden_tests/run_lazy/match_builtins.hvm
rename to tests/golden_tests/run_lazy/match_builtins.bend
diff --git a/tests/golden_tests/run_lazy/match_mult_linearization.hvm b/tests/golden_tests/run_lazy/match_mult_linearization.bend
similarity index 100%
rename from tests/golden_tests/run_lazy/match_mult_linearization.hvm
rename to tests/golden_tests/run_lazy/match_mult_linearization.bend
diff --git a/tests/golden_tests/run_lazy/match_num_explicit_bind.hvm b/tests/golden_tests/run_lazy/match_num_explicit_bind.bend
similarity index 100%
rename from tests/golden_tests/run_lazy/match_num_explicit_bind.hvm
rename to tests/golden_tests/run_lazy/match_num_explicit_bind.bend
diff --git a/tests/golden_tests/run_lazy/merge_sort.hvm b/tests/golden_tests/run_lazy/merge_sort.bend
similarity index 100%
rename from tests/golden_tests/run_lazy/merge_sort.hvm
rename to tests/golden_tests/run_lazy/merge_sort.bend
diff --git a/tests/golden_tests/run_lazy/nested_list_and_string.hvm b/tests/golden_tests/run_lazy/nested_list_and_string.bend
similarity index 100%
rename from tests/golden_tests/run_lazy/nested_list_and_string.hvm
rename to tests/golden_tests/run_lazy/nested_list_and_string.bend
diff --git a/tests/golden_tests/run_lazy/nested_str.hvm b/tests/golden_tests/run_lazy/nested_str.bend
similarity index 100%
rename from tests/golden_tests/run_lazy/nested_str.hvm
rename to tests/golden_tests/run_lazy/nested_str.bend
diff --git a/tests/golden_tests/run_lazy/num_pred.hvm b/tests/golden_tests/run_lazy/num_pred.bend
similarity index 100%
rename from tests/golden_tests/run_lazy/num_pred.hvm
rename to tests/golden_tests/run_lazy/num_pred.bend
diff --git a/tests/golden_tests/run_lazy/queue.hvm b/tests/golden_tests/run_lazy/queue.bend
similarity index 100%
rename from tests/golden_tests/run_lazy/queue.hvm
rename to tests/golden_tests/run_lazy/queue.bend
diff --git a/tests/golden_tests/run_lazy/radix_sort_ctr.hvm b/tests/golden_tests/run_lazy/radix_sort_ctr.bend
similarity index 100%
rename from tests/golden_tests/run_lazy/radix_sort_ctr.hvm
rename to tests/golden_tests/run_lazy/radix_sort_ctr.bend
diff --git a/tests/golden_tests/run_lazy/recursive_match_native.hvm b/tests/golden_tests/run_lazy/recursive_match_native.bend
similarity index 100%
rename from tests/golden_tests/run_lazy/recursive_match_native.hvm
rename to tests/golden_tests/run_lazy/recursive_match_native.bend
diff --git a/tests/golden_tests/run_lazy/scopeless_discard.hvm b/tests/golden_tests/run_lazy/scopeless_discard.bend
similarity index 100%
rename from tests/golden_tests/run_lazy/scopeless_discard.hvm
rename to tests/golden_tests/run_lazy/scopeless_discard.bend
diff --git a/tests/golden_tests/run_lazy/str_concat.hvm b/tests/golden_tests/run_lazy/str_concat.bend
similarity index 100%
rename from tests/golden_tests/run_lazy/str_concat.hvm
rename to tests/golden_tests/run_lazy/str_concat.bend
diff --git a/tests/golden_tests/run_lazy/str_inc.hvm b/tests/golden_tests/run_lazy/str_inc.bend
similarity index 100%
rename from tests/golden_tests/run_lazy/str_inc.hvm
rename to tests/golden_tests/run_lazy/str_inc.bend
diff --git a/tests/golden_tests/run_lazy/str_inc_eta.hvm b/tests/golden_tests/run_lazy/str_inc_eta.bend
similarity index 100%
rename from tests/golden_tests/run_lazy/str_inc_eta.hvm
rename to tests/golden_tests/run_lazy/str_inc_eta.bend
diff --git a/tests/golden_tests/run_lazy/str_len.hvm b/tests/golden_tests/run_lazy/str_len.bend
similarity index 100%
rename from tests/golden_tests/run_lazy/str_len.hvm
rename to tests/golden_tests/run_lazy/str_len.bend
diff --git a/tests/golden_tests/run_lazy/sum_tree.hvm b/tests/golden_tests/run_lazy/sum_tree.bend
similarity index 100%
rename from tests/golden_tests/run_lazy/sum_tree.hvm
rename to tests/golden_tests/run_lazy/sum_tree.bend
diff --git a/tests/golden_tests/run_lazy/sup_app.hvm b/tests/golden_tests/run_lazy/sup_app.bend
similarity index 100%
rename from tests/golden_tests/run_lazy/sup_app.hvm
rename to tests/golden_tests/run_lazy/sup_app.bend
diff --git a/tests/golden_tests/run_file/sup_reconstruction.hvm b/tests/golden_tests/run_lazy/sup_reconstruction.bend
similarity index 100%
rename from tests/golden_tests/run_file/sup_reconstruction.hvm
rename to tests/golden_tests/run_lazy/sup_reconstruction.bend
diff --git a/tests/golden_tests/run_lazy/sup_reconstruction.hvm b/tests/golden_tests/run_lazy/sup_reconstruction.hvm
deleted file mode 100644
index 04cbb58f..00000000
--- a/tests/golden_tests/run_lazy/sup_reconstruction.hvm
+++ /dev/null
@@ -1 +0,0 @@
-main = λa let #s {b c} = a; #s {b c}
diff --git a/tests/golden_tests/run_lazy/superposed_is_even.hvm b/tests/golden_tests/run_lazy/superposed_is_even.bend
similarity index 100%
rename from tests/golden_tests/run_lazy/superposed_is_even.hvm
rename to tests/golden_tests/run_lazy/superposed_is_even.bend
diff --git a/tests/golden_tests/run_lazy/tagged_lam.hvm b/tests/golden_tests/run_lazy/tagged_lam.bend
similarity index 100%
rename from tests/golden_tests/run_lazy/tagged_lam.hvm
rename to tests/golden_tests/run_lazy/tagged_lam.bend
diff --git a/tests/golden_tests/run_lazy/tup_reconstruction.hvm b/tests/golden_tests/run_lazy/tup_reconstruction.bend
similarity index 100%
rename from tests/golden_tests/run_lazy/tup_reconstruction.hvm
rename to tests/golden_tests/run_lazy/tup_reconstruction.bend
diff --git a/tests/golden_tests/run_lazy/tuple_rots.hvm b/tests/golden_tests/run_lazy/tuple_rots.bend
similarity index 100%
rename from tests/golden_tests/run_lazy/tuple_rots.hvm
rename to tests/golden_tests/run_lazy/tuple_rots.bend
diff --git a/tests/golden_tests/run_lazy/unaplied_str.hvm b/tests/golden_tests/run_lazy/unaplied_str.bend
similarity index 100%
rename from tests/golden_tests/run_lazy/unaplied_str.hvm
rename to tests/golden_tests/run_lazy/unaplied_str.bend
diff --git a/tests/golden_tests/run_lazy/unused_dup_var.hvm b/tests/golden_tests/run_lazy/unused_dup_var.bend
similarity index 100%
rename from tests/golden_tests/run_lazy/unused_dup_var.hvm
rename to tests/golden_tests/run_lazy/unused_dup_var.bend
diff --git a/tests/golden_tests/run_lazy/world.hvm b/tests/golden_tests/run_lazy/world.bend
similarity index 100%
rename from tests/golden_tests/run_lazy/world.hvm
rename to tests/golden_tests/run_lazy/world.bend
diff --git a/tests/golden_tests/run_lazy/wrong_string.hvm b/tests/golden_tests/run_lazy/wrong_string.bend
similarity index 100%
rename from tests/golden_tests/run_lazy/wrong_string.hvm
rename to tests/golden_tests/run_lazy/wrong_string.bend
diff --git a/tests/golden_tests/scott_triggers_unused/test.hvm b/tests/golden_tests/scott_triggers_unused/test.bend
similarity index 100%
rename from tests/golden_tests/scott_triggers_unused/test.hvm
rename to tests/golden_tests/scott_triggers_unused/test.bend
diff --git a/tests/golden_tests/simplify_matches/adt_tup_era.hvm b/tests/golden_tests/simplify_matches/adt_tup_era.bend
similarity index 100%
rename from tests/golden_tests/simplify_matches/adt_tup_era.hvm
rename to tests/golden_tests/simplify_matches/adt_tup_era.bend
diff --git a/tests/golden_tests/simplify_matches/already_flat.hvm b/tests/golden_tests/simplify_matches/already_flat.bend
similarity index 100%
rename from tests/golden_tests/simplify_matches/already_flat.hvm
rename to tests/golden_tests/simplify_matches/already_flat.bend
diff --git a/tests/golden_tests/simplify_matches/bits_dec.hvm b/tests/golden_tests/simplify_matches/bits_dec.bend
similarity index 100%
rename from tests/golden_tests/simplify_matches/bits_dec.hvm
rename to tests/golden_tests/simplify_matches/bits_dec.bend
diff --git a/tests/golden_tests/simplify_matches/complex_with_case.hvm b/tests/golden_tests/simplify_matches/complex_with_case.bend
similarity index 100%
rename from tests/golden_tests/simplify_matches/complex_with_case.hvm
rename to tests/golden_tests/simplify_matches/complex_with_case.bend
diff --git a/tests/golden_tests/simplify_matches/double_unwrap_box.hvm b/tests/golden_tests/simplify_matches/double_unwrap_box.bend
similarity index 100%
rename from tests/golden_tests/simplify_matches/double_unwrap_box.hvm
rename to tests/golden_tests/simplify_matches/double_unwrap_box.bend
diff --git a/tests/golden_tests/simplify_matches/double_unwrap_maybe.hvm b/tests/golden_tests/simplify_matches/double_unwrap_maybe.bend
similarity index 100%
rename from tests/golden_tests/simplify_matches/double_unwrap_maybe.hvm
rename to tests/golden_tests/simplify_matches/double_unwrap_maybe.bend
diff --git a/tests/golden_tests/simplify_matches/flatten_with_terminal.hvm b/tests/golden_tests/simplify_matches/flatten_with_terminal.bend
similarity index 100%
rename from tests/golden_tests/simplify_matches/flatten_with_terminal.hvm
rename to tests/golden_tests/simplify_matches/flatten_with_terminal.bend
diff --git a/tests/golden_tests/simplify_matches/linearize_match_all.hvm b/tests/golden_tests/simplify_matches/linearize_match_all.bend
similarity index 100%
rename from tests/golden_tests/simplify_matches/linearize_match_all.hvm
rename to tests/golden_tests/simplify_matches/linearize_match_all.bend
diff --git a/tests/golden_tests/simplify_matches/match_str.hvm b/tests/golden_tests/simplify_matches/match_str.bend
similarity index 100%
rename from tests/golden_tests/simplify_matches/match_str.hvm
rename to tests/golden_tests/simplify_matches/match_str.bend
diff --git a/tests/golden_tests/simplify_matches/nested.hvm b/tests/golden_tests/simplify_matches/nested.bend
similarity index 100%
rename from tests/golden_tests/simplify_matches/nested.hvm
rename to tests/golden_tests/simplify_matches/nested.bend
diff --git a/tests/golden_tests/simplify_matches/nested2.hvm b/tests/golden_tests/simplify_matches/nested2.bend
similarity index 100%
rename from tests/golden_tests/simplify_matches/nested2.hvm
rename to tests/golden_tests/simplify_matches/nested2.bend
diff --git a/tests/golden_tests/simplify_matches/nested_0ary.hvm b/tests/golden_tests/simplify_matches/nested_0ary.bend
similarity index 100%
rename from tests/golden_tests/simplify_matches/nested_0ary.hvm
rename to tests/golden_tests/simplify_matches/nested_0ary.bend
diff --git a/tests/golden_tests/simplify_matches/redundant_with_era.hvm b/tests/golden_tests/simplify_matches/redundant_with_era.bend
similarity index 100%
rename from tests/golden_tests/simplify_matches/redundant_with_era.hvm
rename to tests/golden_tests/simplify_matches/redundant_with_era.bend
diff --git a/tests/golden_tests/simplify_matches/wrong_fn_arity.hvm b/tests/golden_tests/simplify_matches/wrong_fn_arity.bend
similarity index 100%
rename from tests/golden_tests/simplify_matches/wrong_fn_arity.hvm
rename to tests/golden_tests/simplify_matches/wrong_fn_arity.bend
diff --git a/tests/snapshots/cli__compile_all.hvm.snap b/tests/snapshots/cli__compile_all.bend.snap
similarity index 83%
rename from tests/snapshots/cli__compile_all.hvm.snap
rename to tests/snapshots/cli__compile_all.bend.snap
index 1d60de0f..22a1d4c8 100644
--- a/tests/snapshots/cli__compile_all.hvm.snap
+++ b/tests/snapshots/cli__compile_all.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/cli/compile_all.hvm
+input_file: tests/golden_tests/cli/compile_all.bend
 ---
 @Pair.get = (a ((@Pair.get__C0 (a b)) b))
 
diff --git a/tests/snapshots/cli__compile_inline.hvm.snap b/tests/snapshots/cli__compile_inline.bend.snap
similarity index 65%
rename from tests/snapshots/cli__compile_inline.hvm.snap
rename to tests/snapshots/cli__compile_inline.bend.snap
index 874c0a19..debbc55e 100644
--- a/tests/snapshots/cli__compile_inline.hvm.snap
+++ b/tests/snapshots/cli__compile_inline.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/cli/compile_inline.hvm
+input_file: tests/golden_tests/cli/compile_inline.bend
 ---
 @Era = *
 
diff --git a/tests/snapshots/cli__compile_no_opts.bend.snap b/tests/snapshots/cli__compile_no_opts.bend.snap
new file mode 100644
index 00000000..4741e980
--- /dev/null
+++ b/tests/snapshots/cli__compile_no_opts.bend.snap
@@ -0,0 +1,5 @@
+---
+source: tests/golden_tests.rs
+input_file: tests/golden_tests/cli/compile_no_opts.bend
+---
+@main = *
diff --git a/tests/snapshots/cli__compile_no_opts.hvm.snap b/tests/snapshots/cli__compile_no_opts.hvm.snap
deleted file mode 100644
index 0103d21f..00000000
--- a/tests/snapshots/cli__compile_no_opts.hvm.snap
+++ /dev/null
@@ -1,10 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/cli/compile_no_opts.hvm
----
-error: invalid value 'no-pre-reduce' for '-O <COMP_OPTS>'
-  [possible values: all, no-all, eta, no-eta, prune, no-prune, linearize-matches, linearize-matches-alt, no-linearize-matches, float-combinators, no-float-combinators, merge, no-merge, inline, no-inline]
-
-  tip: a similar value exists: 'no-prune'
-
-For more information, try '--help'.
diff --git a/tests/snapshots/cli__compile_pre_reduce.hvm.snap b/tests/snapshots/cli__compile_pre_reduce.bend.snap
similarity index 84%
rename from tests/snapshots/cli__compile_pre_reduce.hvm.snap
rename to tests/snapshots/cli__compile_pre_reduce.bend.snap
index ec31f9bc..018dd5c2 100644
--- a/tests/snapshots/cli__compile_pre_reduce.hvm.snap
+++ b/tests/snapshots/cli__compile_pre_reduce.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/cli/compile_pre_reduce.hvm
+input_file: tests/golden_tests/cli/compile_pre_reduce.bend
 ---
 error: invalid value 'pre-reduce' for '-O <COMP_OPTS>'
   [possible values: all, no-all, eta, no-eta, prune, no-prune, linearize-matches, linearize-matches-alt, no-linearize-matches, float-combinators, no-float-combinators, merge, no-merge, inline, no-inline]
diff --git a/tests/snapshots/cli__compile_strict_loop.hvm.snap b/tests/snapshots/cli__compile_strict_loop.bend.snap
similarity index 79%
rename from tests/snapshots/cli__compile_strict_loop.hvm.snap
rename to tests/snapshots/cli__compile_strict_loop.bend.snap
index d714fd39..d29274f9 100644
--- a/tests/snapshots/cli__compile_strict_loop.hvm.snap
+++ b/tests/snapshots/cli__compile_strict_loop.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/cli/compile_strict_loop.hvm
+input_file: tests/golden_tests/cli/compile_strict_loop.bend
 ---
 @A = (((* (a b)) (0 c)) c)
   & @A ~ (a b)
diff --git a/tests/snapshots/cli__compile_wrong_opt.hvm.snap b/tests/snapshots/cli__compile_wrong_opt.bend.snap
similarity index 86%
rename from tests/snapshots/cli__compile_wrong_opt.hvm.snap
rename to tests/snapshots/cli__compile_wrong_opt.bend.snap
index a23a82f4..f43422c2 100644
--- a/tests/snapshots/cli__compile_wrong_opt.hvm.snap
+++ b/tests/snapshots/cli__compile_wrong_opt.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/cli/compile_wrong_opt.hvm
+input_file: tests/golden_tests/cli/compile_wrong_opt.bend
 ---
 error: invalid value 'foo' for '-O <COMP_OPTS>'
   [possible values: all, no-all, eta, no-eta, prune, no-prune, linearize-matches, linearize-matches-alt, no-linearize-matches, float-combinators, no-float-combinators, merge, no-merge, inline, no-inline]
diff --git a/tests/snapshots/cli__debug_list_map.hvm.snap b/tests/snapshots/cli__debug_list_map.bend.snap
similarity index 79%
rename from tests/snapshots/cli__debug_list_map.hvm.snap
rename to tests/snapshots/cli__debug_list_map.bend.snap
index 97d76427..de105f53 100644
--- a/tests/snapshots/cli__debug_list_map.hvm.snap
+++ b/tests/snapshots/cli__debug_list_map.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/cli/debug_list_map.hvm
+input_file: tests/golden_tests/cli/debug_list_map.bend
 ---
 error: unexpected argument '-d' found
 
diff --git a/tests/snapshots/cli__debug_u60_to_nat.hvm.snap b/tests/snapshots/cli__debug_u60_to_nat.bend.snap
similarity index 78%
rename from tests/snapshots/cli__debug_u60_to_nat.hvm.snap
rename to tests/snapshots/cli__debug_u60_to_nat.bend.snap
index 3004a76c..6d607824 100644
--- a/tests/snapshots/cli__debug_u60_to_nat.hvm.snap
+++ b/tests/snapshots/cli__debug_u60_to_nat.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/cli/debug_u60_to_nat.hvm
+input_file: tests/golden_tests/cli/debug_u60_to_nat.bend
 ---
 error: unexpected argument '-d' found
 
diff --git a/tests/snapshots/cli__desugar_bool_scott.hvm.snap b/tests/snapshots/cli__desugar_bool_scott.bend.snap
similarity index 84%
rename from tests/snapshots/cli__desugar_bool_scott.hvm.snap
rename to tests/snapshots/cli__desugar_bool_scott.bend.snap
index 9193eff0..8036afb3 100644
--- a/tests/snapshots/cli__desugar_bool_scott.hvm.snap
+++ b/tests/snapshots/cli__desugar_bool_scott.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/cli/desugar_bool_scott.hvm
+input_file: tests/golden_tests/cli/desugar_bool_scott.bend
 ---
 error: invalid value 'adt-scott' for '-O <COMP_OPTS>'
   [possible values: all, no-all, eta, no-eta, prune, no-prune, linearize-matches, linearize-matches-alt, no-linearize-matches, float-combinators, no-float-combinators, merge, no-merge, inline, no-inline]
diff --git a/tests/snapshots/cli__desugar_bool_tagged.hvm.snap b/tests/snapshots/cli__desugar_bool_tagged.hvm.snap
deleted file mode 100644
index 0f02dd42..00000000
--- a/tests/snapshots/cli__desugar_bool_tagged.hvm.snap
+++ /dev/null
@@ -1,8 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/cli/desugar_bool_tagged.hvm
----
-error: invalid value 'adt-tagged-scott' for '-O <COMP_OPTS>'
-  [possible values: all, no-all, eta, no-eta, prune, no-prune, linearize-matches, linearize-matches-alt, no-linearize-matches, float-combinators, no-float-combinators, merge, no-merge, inline, no-inline]
-
-For more information, try '--help'.
diff --git a/tests/snapshots/cli__desugar_float_combinators.hvm.snap b/tests/snapshots/cli__desugar_float_combinators.bend.snap
similarity index 77%
rename from tests/snapshots/cli__desugar_float_combinators.hvm.snap
rename to tests/snapshots/cli__desugar_float_combinators.bend.snap
index 99521aa6..f7a24a7e 100644
--- a/tests/snapshots/cli__desugar_float_combinators.hvm.snap
+++ b/tests/snapshots/cli__desugar_float_combinators.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/cli/desugar_float_combinators.hvm
+input_file: tests/golden_tests/cli/desugar_float_combinators.bend
 ---
 (Z) = λ* λa a
 
diff --git a/tests/snapshots/cli__desugar_linearize_matches.hvm.snap b/tests/snapshots/cli__desugar_linearize_matches.bend.snap
similarity index 62%
rename from tests/snapshots/cli__desugar_linearize_matches.hvm.snap
rename to tests/snapshots/cli__desugar_linearize_matches.bend.snap
index 126163f8..b55ac394 100644
--- a/tests/snapshots/cli__desugar_linearize_matches.hvm.snap
+++ b/tests/snapshots/cli__desugar_linearize_matches.bend.snap
@@ -1,5 +1,5 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/cli/desugar_linearize_matches.hvm
+input_file: tests/golden_tests/cli/desugar_linearize_matches.bend
 ---
 (main) = λa λb λc (switch a { 0: λd λ* d; _: λ* λ* λe e; } b c)
diff --git a/tests/snapshots/cli__desugar_linearize_matches_alt.hvm.snap b/tests/snapshots/cli__desugar_linearize_matches_alt.bend.snap
similarity index 96%
rename from tests/snapshots/cli__desugar_linearize_matches_alt.hvm.snap
rename to tests/snapshots/cli__desugar_linearize_matches_alt.bend.snap
index a59eee11..c84d4753 100644
--- a/tests/snapshots/cli__desugar_linearize_matches_alt.hvm.snap
+++ b/tests/snapshots/cli__desugar_linearize_matches_alt.bend.snap
@@ -1,5 +1,5 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/cli/desugar_linearize_matches_alt.hvm
+input_file: tests/golden_tests/cli/desugar_linearize_matches_alt.bend
 ---
 (main) = λa switch a { 0: λb b; _: λ* λc c; }
diff --git a/tests/snapshots/cli__desugar_linearize_matches_extra.hvm.snap b/tests/snapshots/cli__desugar_linearize_matches_extra.hvm.snap
deleted file mode 100644
index 10a81274..00000000
--- a/tests/snapshots/cli__desugar_linearize_matches_extra.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/cli/desugar_linearize_matches_extra.hvm
----
-(main) = λa λb λc (switch a { 0: λd λ* d; _: λ* λ* λe e; } b c)
diff --git a/tests/snapshots/cli__desugar_merge.hvm.snap b/tests/snapshots/cli__desugar_merge.bend.snap
similarity index 75%
rename from tests/snapshots/cli__desugar_merge.hvm.snap
rename to tests/snapshots/cli__desugar_merge.bend.snap
index a86fb7ce..b440b766 100644
--- a/tests/snapshots/cli__desugar_merge.hvm.snap
+++ b/tests/snapshots/cli__desugar_merge.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/cli/desugar_merge.hvm
+input_file: tests/golden_tests/cli/desugar_merge.bend
 ---
 Warnings:
 In definition 'Z':
diff --git a/tests/snapshots/cli__desugar_prune.bend.snap b/tests/snapshots/cli__desugar_prune.bend.snap
new file mode 100644
index 00000000..c136f21b
--- /dev/null
+++ b/tests/snapshots/cli__desugar_prune.bend.snap
@@ -0,0 +1,5 @@
+---
+source: tests/golden_tests.rs
+input_file: tests/golden_tests/cli/desugar_prune.bend
+---
+(main) = *
diff --git a/tests/snapshots/cli__desugar_prune.hvm.snap b/tests/snapshots/cli__desugar_prune.hvm.snap
deleted file mode 100644
index bc2572e6..00000000
--- a/tests/snapshots/cli__desugar_prune.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/cli/desugar_prune.hvm
----
-(main) = *
diff --git a/tests/snapshots/cli__run_add.hvm.snap b/tests/snapshots/cli__run_add.bend.snap
similarity index 50%
rename from tests/snapshots/cli__run_add.hvm.snap
rename to tests/snapshots/cli__run_add.bend.snap
index ea9ef972..bf4624cc 100644
--- a/tests/snapshots/cli__run_add.hvm.snap
+++ b/tests/snapshots/cli__run_add.bend.snap
@@ -1,5 +1,5 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/cli/run_add.hvm
+input_file: tests/golden_tests/cli/run_add.bend
 ---
 Result: 9
diff --git a/tests/snapshots/cli__run_pretty.hvm.snap b/tests/snapshots/cli__run_pretty.bend.snap
similarity index 84%
rename from tests/snapshots/cli__run_pretty.hvm.snap
rename to tests/snapshots/cli__run_pretty.bend.snap
index 4a36adf9..e0c942df 100644
--- a/tests/snapshots/cli__run_pretty.hvm.snap
+++ b/tests/snapshots/cli__run_pretty.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/cli/run_pretty.hvm
+input_file: tests/golden_tests/cli/run_pretty.bend
 ---
 Result:
 λa switch a = a {
diff --git a/tests/snapshots/cli__warn_and_err.hvm.snap b/tests/snapshots/cli__warn_and_err.bend.snap
similarity index 82%
rename from tests/snapshots/cli__warn_and_err.hvm.snap
rename to tests/snapshots/cli__warn_and_err.bend.snap
index 8af86add..e972dc58 100644
--- a/tests/snapshots/cli__warn_and_err.hvm.snap
+++ b/tests/snapshots/cli__warn_and_err.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/cli/warn_and_err.hvm
+input_file: tests/golden_tests/cli/warn_and_err.bend
 ---
 Warnings:
 In definition 'Foo':
diff --git a/tests/snapshots/compile_entrypoint__foo.hvm.snap b/tests/snapshots/compile_entrypoint__foo.bend.snap
similarity index 56%
rename from tests/snapshots/compile_entrypoint__foo.hvm.snap
rename to tests/snapshots/compile_entrypoint__foo.bend.snap
index 4f3a9137..4dc66edc 100644
--- a/tests/snapshots/compile_entrypoint__foo.hvm.snap
+++ b/tests/snapshots/compile_entrypoint__foo.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_entrypoint/foo.hvm
+input_file: tests/golden_tests/compile_entrypoint/foo.bend
 ---
 @bar = (a a)
 
diff --git a/tests/snapshots/compile_file__360_no_scope.hvm.snap b/tests/snapshots/compile_file__360_no_scope.bend.snap
similarity index 61%
rename from tests/snapshots/compile_file__360_no_scope.hvm.snap
rename to tests/snapshots/compile_file__360_no_scope.bend.snap
index afbf1ea6..6c79cadf 100644
--- a/tests/snapshots/compile_file__360_no_scope.hvm.snap
+++ b/tests/snapshots/compile_file__360_no_scope.bend.snap
@@ -1,8 +1,8 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file/360_no_scope.hvm
+input_file: tests/golden_tests/compile_file/360_no_scope.bend
 ---
 Errors:
-In tests/golden_tests/compile_file/360_no_scope.hvm :
+In tests/golden_tests/compile_file/360_no_scope.bend :
 Tagged terms not supported for hvm32.
    4 |   let #x{#y($e, $f) #y($g, $h)} = #y(#x{$d $f}, #x{$e, $g})
diff --git a/tests/snapshots/compile_file__add_args.hvm.snap b/tests/snapshots/compile_file__add_args.bend.snap
similarity index 61%
rename from tests/snapshots/compile_file__add_args.hvm.snap
rename to tests/snapshots/compile_file__add_args.bend.snap
index 259f4f25..9627da92 100644
--- a/tests/snapshots/compile_file__add_args.hvm.snap
+++ b/tests/snapshots/compile_file__add_args.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file/add_args.hvm
+input_file: tests/golden_tests/compile_file/add_args.bend
 ---
 @add = ($(:[+] $(a b)) (a b))
 
diff --git a/tests/snapshots/compile_file__addition.hvm.snap b/tests/snapshots/compile_file__addition.bend.snap
similarity index 67%
rename from tests/snapshots/compile_file__addition.hvm.snap
rename to tests/snapshots/compile_file__addition.bend.snap
index e8361673..758802af 100644
--- a/tests/snapshots/compile_file__addition.hvm.snap
+++ b/tests/snapshots/compile_file__addition.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file/addition.hvm
+input_file: tests/golden_tests/compile_file/addition.bend
 ---
 @main = a
   & @main__C0 ~ (8 a)
diff --git a/tests/snapshots/compile_file__addition_const.hvm.snap b/tests/snapshots/compile_file__addition_const.bend.snap
similarity index 50%
rename from tests/snapshots/compile_file__addition_const.hvm.snap
rename to tests/snapshots/compile_file__addition_const.bend.snap
index dd4796e4..3869551f 100644
--- a/tests/snapshots/compile_file__addition_const.hvm.snap
+++ b/tests/snapshots/compile_file__addition_const.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file/addition_const.hvm
+input_file: tests/golden_tests/compile_file/addition_const.bend
 ---
 @main = a
   & $(2 a) ~ [+1]
diff --git a/tests/snapshots/compile_file__ask_outside_do.hvm.snap b/tests/snapshots/compile_file__ask_outside_do.bend.snap
similarity index 72%
rename from tests/snapshots/compile_file__ask_outside_do.hvm.snap
rename to tests/snapshots/compile_file__ask_outside_do.bend.snap
index 533f30cb..d8c0ab4b 100644
--- a/tests/snapshots/compile_file__ask_outside_do.hvm.snap
+++ b/tests/snapshots/compile_file__ask_outside_do.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file/ask_outside_do.hvm
+input_file: tests/golden_tests/compile_file/ask_outside_do.bend
 ---
 Errors:
 In definition 'main':
diff --git a/tests/snapshots/compile_file__church_one.hvm.snap b/tests/snapshots/compile_file__church_one.bend.snap
similarity index 66%
rename from tests/snapshots/compile_file__church_one.hvm.snap
rename to tests/snapshots/compile_file__church_one.bend.snap
index 79836dee..063566ad 100644
--- a/tests/snapshots/compile_file__church_one.hvm.snap
+++ b/tests/snapshots/compile_file__church_one.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file/church_one.hvm
+input_file: tests/golden_tests/compile_file/church_one.bend
 ---
 @main = b
   & @main__C0 ~ ((* (a a)) b)
diff --git a/tests/snapshots/compile_file__church_zero.bend.snap b/tests/snapshots/compile_file__church_zero.bend.snap
new file mode 100644
index 00000000..d25c1eba
--- /dev/null
+++ b/tests/snapshots/compile_file__church_zero.bend.snap
@@ -0,0 +1,5 @@
+---
+source: tests/golden_tests.rs
+input_file: tests/golden_tests/compile_file/church_zero.bend
+---
+@main = (* (a a))
diff --git a/tests/snapshots/compile_file__church_zero.hvm.snap b/tests/snapshots/compile_file__church_zero.hvm.snap
deleted file mode 100644
index 40f3a2ca..00000000
--- a/tests/snapshots/compile_file__church_zero.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file/church_zero.hvm
----
-@main = (* (a a))
diff --git a/tests/snapshots/compile_file__complicated_dup.hvm.snap b/tests/snapshots/compile_file__complicated_dup.bend.snap
similarity index 59%
rename from tests/snapshots/compile_file__complicated_dup.hvm.snap
rename to tests/snapshots/compile_file__complicated_dup.bend.snap
index a5afcb60..8c63e38d 100644
--- a/tests/snapshots/compile_file__complicated_dup.hvm.snap
+++ b/tests/snapshots/compile_file__complicated_dup.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file/complicated_dup.hvm
+input_file: tests/golden_tests/compile_file/complicated_dup.bend
 ---
 @main = ({(a b) (d e)} f)
   & ((c {a d}) b) ~ ((c e) f)
diff --git a/tests/snapshots/compile_file__crlf.hvm.snap b/tests/snapshots/compile_file__crlf.bend.snap
similarity index 50%
rename from tests/snapshots/compile_file__crlf.hvm.snap
rename to tests/snapshots/compile_file__crlf.bend.snap
index 92f7a024..129018d5 100644
--- a/tests/snapshots/compile_file__crlf.hvm.snap
+++ b/tests/snapshots/compile_file__crlf.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file/crlf.hvm
+input_file: tests/golden_tests/compile_file/crlf.bend
 ---
 @a = 1
 
diff --git a/tests/snapshots/compile_file__cyclic_global_lam.hvm.snap b/tests/snapshots/compile_file__cyclic_global_lam.bend.snap
similarity index 71%
rename from tests/snapshots/compile_file__cyclic_global_lam.hvm.snap
rename to tests/snapshots/compile_file__cyclic_global_lam.bend.snap
index 89e44ad3..7514d226 100644
--- a/tests/snapshots/compile_file__cyclic_global_lam.hvm.snap
+++ b/tests/snapshots/compile_file__cyclic_global_lam.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file/cyclic_global_lam.hvm
+input_file: tests/golden_tests/compile_file/cyclic_global_lam.bend
 ---
 Errors:
 In compiled inet 'main':
diff --git a/tests/snapshots/compile_file__dup_apply.hvm.snap b/tests/snapshots/compile_file__dup_apply.bend.snap
similarity index 50%
rename from tests/snapshots/compile_file__dup_apply.hvm.snap
rename to tests/snapshots/compile_file__dup_apply.bend.snap
index 0cd142e0..19ba6e60 100644
--- a/tests/snapshots/compile_file__dup_apply.hvm.snap
+++ b/tests/snapshots/compile_file__dup_apply.bend.snap
@@ -1,5 +1,5 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file/dup_apply.hvm
+input_file: tests/golden_tests/compile_file/dup_apply.bend
 ---
 @main = ({(a b) a} b)
diff --git a/tests/snapshots/compile_file__dup_global_lam.hvm.snap b/tests/snapshots/compile_file__dup_global_lam.bend.snap
similarity index 54%
rename from tests/snapshots/compile_file__dup_global_lam.hvm.snap
rename to tests/snapshots/compile_file__dup_global_lam.bend.snap
index bc3e75ea..1e487127 100644
--- a/tests/snapshots/compile_file__dup_global_lam.hvm.snap
+++ b/tests/snapshots/compile_file__dup_global_lam.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file/dup_global_lam.hvm
+input_file: tests/golden_tests/compile_file/dup_global_lam.bend
 ---
 @main = d
   & ({(b c) b} (a a)) ~ (c d)
diff --git a/tests/snapshots/compile_file__erased_dup.bend.snap b/tests/snapshots/compile_file__erased_dup.bend.snap
new file mode 100644
index 00000000..b6b73f47
--- /dev/null
+++ b/tests/snapshots/compile_file__erased_dup.bend.snap
@@ -0,0 +1,5 @@
+---
+source: tests/golden_tests.rs
+input_file: tests/golden_tests/compile_file/erased_dup.bend
+---
+@main = ({* a} a)
diff --git a/tests/snapshots/compile_file__erased_dup.hvm.snap b/tests/snapshots/compile_file__erased_dup.hvm.snap
deleted file mode 100644
index d6c68984..00000000
--- a/tests/snapshots/compile_file__erased_dup.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file/erased_dup.hvm
----
-@main = ({* a} a)
diff --git a/tests/snapshots/compile_file__error_data_def_name.hvm.snap b/tests/snapshots/compile_file__error_data_def_name.bend.snap
similarity index 97%
rename from tests/snapshots/compile_file__error_data_def_name.hvm.snap
rename to tests/snapshots/compile_file__error_data_def_name.bend.snap
index 8949457e..dcc275ec 100644
--- a/tests/snapshots/compile_file__error_data_def_name.hvm.snap
+++ b/tests/snapshots/compile_file__error_data_def_name.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file/error_data_def_name.hvm
+input_file: tests/golden_tests/compile_file/error_data_def_name.bend
 ---
 Errors:
 Function 'A/A' has the same name as a previously defined constructor
diff --git a/tests/snapshots/compile_file__error_messages.hvm.snap b/tests/snapshots/compile_file__error_messages.bend.snap
similarity index 82%
rename from tests/snapshots/compile_file__error_messages.hvm.snap
rename to tests/snapshots/compile_file__error_messages.bend.snap
index ba09237f..272abe75 100644
--- a/tests/snapshots/compile_file__error_messages.hvm.snap
+++ b/tests/snapshots/compile_file__error_messages.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file/error_messages.hvm
+input_file: tests/golden_tests/compile_file/error_messages.bend
 ---
 Errors:
 In definition 'Foo':
diff --git a/tests/snapshots/compile_file__f24_oper.hvm.snap b/tests/snapshots/compile_file__f24_oper.bend.snap
similarity index 66%
rename from tests/snapshots/compile_file__f24_oper.hvm.snap
rename to tests/snapshots/compile_file__f24_oper.bend.snap
index 016e3cf9..dce3a5c7 100644
--- a/tests/snapshots/compile_file__f24_oper.hvm.snap
+++ b/tests/snapshots/compile_file__f24_oper.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file/f24_oper.hvm
+input_file: tests/golden_tests/compile_file/f24_oper.bend
 ---
 @main = b
   & $(1.240 $(:[/] $(a b))) ~ [*4583519]
diff --git a/tests/snapshots/compile_file__fst_snd.hvm.snap b/tests/snapshots/compile_file__fst_snd.bend.snap
similarity index 74%
rename from tests/snapshots/compile_file__fst_snd.hvm.snap
rename to tests/snapshots/compile_file__fst_snd.bend.snap
index bdda05e6..a409b577 100644
--- a/tests/snapshots/compile_file__fst_snd.hvm.snap
+++ b/tests/snapshots/compile_file__fst_snd.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file/fst_snd.hvm
+input_file: tests/golden_tests/compile_file/fst_snd.bend
 ---
 @main = a
   & @main__C2 ~ (@main__C1 a)
diff --git a/tests/snapshots/compile_file__global_lam.hvm.snap b/tests/snapshots/compile_file__global_lam.bend.snap
similarity index 53%
rename from tests/snapshots/compile_file__global_lam.hvm.snap
rename to tests/snapshots/compile_file__global_lam.bend.snap
index 19d27360..80b0ffdb 100644
--- a/tests/snapshots/compile_file__global_lam.hvm.snap
+++ b/tests/snapshots/compile_file__global_lam.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file/global_lam.hvm
+input_file: tests/golden_tests/compile_file/global_lam.bend
 ---
 @main = c
   & (b (a a)) ~ (b c)
diff --git a/tests/snapshots/compile_file__huge_tree.hvm.snap b/tests/snapshots/compile_file__huge_tree.bend.snap
similarity index 99%
rename from tests/snapshots/compile_file__huge_tree.hvm.snap
rename to tests/snapshots/compile_file__huge_tree.bend.snap
index 5a7200b5..ce8fd5ca 100644
--- a/tests/snapshots/compile_file__huge_tree.hvm.snap
+++ b/tests/snapshots/compile_file__huge_tree.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file/huge_tree.hvm
+input_file: tests/golden_tests/compile_file/huge_tree.bend
 ---
 @Tree/Leaf = (a (* ((a b) b)))
 
diff --git a/tests/snapshots/compile_file__i24_oper.hvm.snap b/tests/snapshots/compile_file__i24_oper.bend.snap
similarity index 64%
rename from tests/snapshots/compile_file__i24_oper.hvm.snap
rename to tests/snapshots/compile_file__i24_oper.bend.snap
index e7497255..083ba1c4 100644
--- a/tests/snapshots/compile_file__i24_oper.hvm.snap
+++ b/tests/snapshots/compile_file__i24_oper.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file/i24_oper.hvm
+input_file: tests/golden_tests/compile_file/i24_oper.bend
 ---
 @main = b
   & $(-1 $(:[*] $(a b))) ~ [+1]
diff --git a/tests/snapshots/compile_file__id.hvm.snap b/tests/snapshots/compile_file__id.bend.snap
similarity index 50%
rename from tests/snapshots/compile_file__id.hvm.snap
rename to tests/snapshots/compile_file__id.bend.snap
index f048e8cb..ee72ceb8 100644
--- a/tests/snapshots/compile_file__id.hvm.snap
+++ b/tests/snapshots/compile_file__id.bend.snap
@@ -1,5 +1,5 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file/id.hvm
+input_file: tests/golden_tests/compile_file/id.bend
 ---
 @main = (a a)
diff --git a/tests/snapshots/compile_file__infer_dup.hvm.snap b/tests/snapshots/compile_file__infer_dup.bend.snap
similarity index 50%
rename from tests/snapshots/compile_file__infer_dup.hvm.snap
rename to tests/snapshots/compile_file__infer_dup.bend.snap
index 6f535966..160164d4 100644
--- a/tests/snapshots/compile_file__infer_dup.hvm.snap
+++ b/tests/snapshots/compile_file__infer_dup.bend.snap
@@ -1,5 +1,5 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file/infer_dup.hvm
+input_file: tests/golden_tests/compile_file/infer_dup.bend
 ---
 @main = ({(a b) a} b)
diff --git a/tests/snapshots/compile_file__inlining.hvm.snap b/tests/snapshots/compile_file__inlining.bend.snap
similarity index 67%
rename from tests/snapshots/compile_file__inlining.hvm.snap
rename to tests/snapshots/compile_file__inlining.bend.snap
index 828db793..ff13d32c 100644
--- a/tests/snapshots/compile_file__inlining.hvm.snap
+++ b/tests/snapshots/compile_file__inlining.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file/inlining.hvm
+input_file: tests/golden_tests/compile_file/inlining.bend
 ---
 @Era = *
 
diff --git a/tests/snapshots/compile_file__just_a_name.hvm.snap b/tests/snapshots/compile_file__just_a_name.bend.snap
similarity index 59%
rename from tests/snapshots/compile_file__just_a_name.hvm.snap
rename to tests/snapshots/compile_file__just_a_name.bend.snap
index b1e5eb97..2aae92ca 100644
--- a/tests/snapshots/compile_file__just_a_name.hvm.snap
+++ b/tests/snapshots/compile_file__just_a_name.bend.snap
@@ -1,9 +1,9 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file/just_a_name.hvm
+input_file: tests/golden_tests/compile_file/just_a_name.bend
 ---
 Errors:
-In tests/golden_tests/compile_file/just_a_name.hvm :
+In tests/golden_tests/compile_file/just_a_name.bend :
 - expected: pattern-matching pattern
 - detected: end of input
  1 | asdf 
diff --git a/tests/snapshots/compile_file__just_data.hvm.snap b/tests/snapshots/compile_file__just_data.bend.snap
similarity index 58%
rename from tests/snapshots/compile_file__just_data.hvm.snap
rename to tests/snapshots/compile_file__just_data.bend.snap
index c0df4659..baad9ba8 100644
--- a/tests/snapshots/compile_file__just_data.hvm.snap
+++ b/tests/snapshots/compile_file__just_data.bend.snap
@@ -1,9 +1,9 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file/just_data.hvm
+input_file: tests/golden_tests/compile_file/just_data.bend
 ---
 Errors:
-In tests/golden_tests/compile_file/just_data.hvm :
+In tests/golden_tests/compile_file/just_data.bend :
 - expected: datatype name
 - detected: end of input
  1 | data 
diff --git a/tests/snapshots/compile_file__just_paren.hvm.snap b/tests/snapshots/compile_file__just_paren.bend.snap
similarity index 57%
rename from tests/snapshots/compile_file__just_paren.hvm.snap
rename to tests/snapshots/compile_file__just_paren.bend.snap
index 07a260f7..ed73d4b5 100644
--- a/tests/snapshots/compile_file__just_paren.hvm.snap
+++ b/tests/snapshots/compile_file__just_paren.bend.snap
@@ -1,9 +1,9 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file/just_paren.hvm
+input_file: tests/golden_tests/compile_file/just_paren.bend
 ---
 Errors:
-In tests/golden_tests/compile_file/just_paren.hvm :
+In tests/golden_tests/compile_file/just_paren.bend :
 - expected: function name
 - detected: end of input
   2 | ( 
diff --git a/tests/snapshots/compile_file__just_rule_paren.hvm.snap b/tests/snapshots/compile_file__just_rule_paren.bend.snap
similarity index 54%
rename from tests/snapshots/compile_file__just_rule_paren.hvm.snap
rename to tests/snapshots/compile_file__just_rule_paren.bend.snap
index f891758c..9a98bcb3 100644
--- a/tests/snapshots/compile_file__just_rule_paren.hvm.snap
+++ b/tests/snapshots/compile_file__just_rule_paren.bend.snap
@@ -1,9 +1,9 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file/just_rule_paren.hvm
+input_file: tests/golden_tests/compile_file/just_rule_paren.bend
 ---
 Errors:
-In tests/golden_tests/compile_file/just_rule_paren.hvm :
+In tests/golden_tests/compile_file/just_rule_paren.bend :
 - expected: '='
 - detected: end of input
  1 | (rule) 
diff --git a/tests/snapshots/compile_file__let_substitution.bend.snap b/tests/snapshots/compile_file__let_substitution.bend.snap
new file mode 100644
index 00000000..f4a9f07d
--- /dev/null
+++ b/tests/snapshots/compile_file__let_substitution.bend.snap
@@ -0,0 +1,5 @@
+---
+source: tests/golden_tests.rs
+input_file: tests/golden_tests/compile_file/let_substitution.bend
+---
+@main = ({(a b) a} b)
diff --git a/tests/snapshots/compile_file__let_substitution.hvm.snap b/tests/snapshots/compile_file__let_substitution.hvm.snap
deleted file mode 100644
index 301326fa..00000000
--- a/tests/snapshots/compile_file__let_substitution.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file/let_substitution.hvm
----
-@main = ({(a b) a} b)
diff --git a/tests/snapshots/compile_file__let_tup.hvm.snap b/tests/snapshots/compile_file__let_tup.bend.snap
similarity index 54%
rename from tests/snapshots/compile_file__let_tup.hvm.snap
rename to tests/snapshots/compile_file__let_tup.bend.snap
index 11e5a9c6..e21b8634 100644
--- a/tests/snapshots/compile_file__let_tup.hvm.snap
+++ b/tests/snapshots/compile_file__let_tup.bend.snap
@@ -1,5 +1,5 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file/let_tup.hvm
+input_file: tests/golden_tests/compile_file/let_tup.bend
 ---
 @main = ((a (* a)) (* (b b)))
diff --git a/tests/snapshots/compile_file__lets.hvm.snap b/tests/snapshots/compile_file__lets.bend.snap
similarity index 78%
rename from tests/snapshots/compile_file__lets.hvm.snap
rename to tests/snapshots/compile_file__lets.bend.snap
index 69c95e54..2f68d329 100644
--- a/tests/snapshots/compile_file__lets.hvm.snap
+++ b/tests/snapshots/compile_file__lets.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file/lets.hvm
+input_file: tests/golden_tests/compile_file/lets.bend
 ---
 @main = @main__C0
   & (a a) ~ *
diff --git a/tests/snapshots/compile_file__long_name.hvm.snap b/tests/snapshots/compile_file__long_name.bend.snap
similarity index 72%
rename from tests/snapshots/compile_file__long_name.hvm.snap
rename to tests/snapshots/compile_file__long_name.bend.snap
index 815af66a..ed902335 100644
--- a/tests/snapshots/compile_file__long_name.hvm.snap
+++ b/tests/snapshots/compile_file__long_name.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file/long_name.hvm
+input_file: tests/golden_tests/compile_file/long_name.bend
 ---
 @WowThis_is_a_very_long_name_no_way_ItFits = (a a)
 
diff --git a/tests/snapshots/compile_file__match.hvm.snap b/tests/snapshots/compile_file__match.bend.snap
similarity index 63%
rename from tests/snapshots/compile_file__match.hvm.snap
rename to tests/snapshots/compile_file__match.bend.snap
index 14eb6e46..62a75b0b 100644
--- a/tests/snapshots/compile_file__match.hvm.snap
+++ b/tests/snapshots/compile_file__match.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file/match.hvm
+input_file: tests/golden_tests/compile_file/match.bend
 ---
 @main = c
   & $(1 ?(((a (* a)) (* (* (b b)))) c)) ~ [+0]
diff --git a/tests/snapshots/compile_file__missing_adt_eq.hvm.snap b/tests/snapshots/compile_file__missing_adt_eq.bend.snap
similarity index 55%
rename from tests/snapshots/compile_file__missing_adt_eq.hvm.snap
rename to tests/snapshots/compile_file__missing_adt_eq.bend.snap
index 180b3851..bfe6d0e6 100644
--- a/tests/snapshots/compile_file__missing_adt_eq.hvm.snap
+++ b/tests/snapshots/compile_file__missing_adt_eq.bend.snap
@@ -1,9 +1,9 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file/missing_adt_eq.hvm
+input_file: tests/golden_tests/compile_file/missing_adt_eq.bend
 ---
 Errors:
-In tests/golden_tests/compile_file/missing_adt_eq.hvm :
+In tests/golden_tests/compile_file/missing_adt_eq.bend :
 - expected: '='
 - detected: end of input
   1 | data Adt 
diff --git a/tests/snapshots/compile_file__missing_ctrs.hvm.snap b/tests/snapshots/compile_file__missing_ctrs.bend.snap
similarity index 60%
rename from tests/snapshots/compile_file__missing_ctrs.hvm.snap
rename to tests/snapshots/compile_file__missing_ctrs.bend.snap
index 688ec033..1d07965f 100644
--- a/tests/snapshots/compile_file__missing_ctrs.hvm.snap
+++ b/tests/snapshots/compile_file__missing_ctrs.bend.snap
@@ -1,9 +1,9 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file/missing_ctrs.hvm
+input_file: tests/golden_tests/compile_file/missing_ctrs.bend
 ---
 Errors:
-In tests/golden_tests/compile_file/missing_ctrs.hvm :
+In tests/golden_tests/compile_file/missing_ctrs.bend :
 - expected: datatype constructor name
 - detected: end of input
   1 | data Adt =  
diff --git a/tests/snapshots/compile_file__missing_pat.hvm.snap b/tests/snapshots/compile_file__missing_pat.bend.snap
similarity index 56%
rename from tests/snapshots/compile_file__missing_pat.hvm.snap
rename to tests/snapshots/compile_file__missing_pat.bend.snap
index dd166ee3..b5ab00d9 100644
--- a/tests/snapshots/compile_file__missing_pat.hvm.snap
+++ b/tests/snapshots/compile_file__missing_pat.bend.snap
@@ -1,9 +1,9 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file/missing_pat.hvm
+input_file: tests/golden_tests/compile_file/missing_pat.bend
 ---
 Errors:
-In tests/golden_tests/compile_file/missing_pat.hvm :
+In tests/golden_tests/compile_file/missing_pat.bend :
 - expected: name or '*'
 - detected:
   2 |   : *
diff --git a/tests/snapshots/compile_file__names_starting_with_keywords.hvm.snap b/tests/snapshots/compile_file__names_starting_with_keywords.bend.snap
similarity index 92%
rename from tests/snapshots/compile_file__names_starting_with_keywords.hvm.snap
rename to tests/snapshots/compile_file__names_starting_with_keywords.bend.snap
index 1101a982..c0eb2aff 100644
--- a/tests/snapshots/compile_file__names_starting_with_keywords.hvm.snap
+++ b/tests/snapshots/compile_file__names_starting_with_keywords.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file/names_starting_with_keywords.hvm
+input_file: tests/golden_tests/compile_file/names_starting_with_keywords.bend
 ---
 @A = (a a)
 
diff --git a/tests/snapshots/compile_file__nested_ctr_wrong_arity.hvm.snap b/tests/snapshots/compile_file__nested_ctr_wrong_arity.bend.snap
similarity index 97%
rename from tests/snapshots/compile_file__nested_ctr_wrong_arity.hvm.snap
rename to tests/snapshots/compile_file__nested_ctr_wrong_arity.bend.snap
index 28fc30fb..3a150fb5 100644
--- a/tests/snapshots/compile_file__nested_ctr_wrong_arity.hvm.snap
+++ b/tests/snapshots/compile_file__nested_ctr_wrong_arity.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file/nested_ctr_wrong_arity.hvm
+input_file: tests/golden_tests/compile_file/nested_ctr_wrong_arity.bend
 ---
 Errors:
 In definition 'fst_fst':
diff --git a/tests/snapshots/compile_file__nested_let.hvm.snap b/tests/snapshots/compile_file__nested_let.bend.snap
similarity index 56%
rename from tests/snapshots/compile_file__nested_let.hvm.snap
rename to tests/snapshots/compile_file__nested_let.bend.snap
index ae9790bd..e1406986 100644
--- a/tests/snapshots/compile_file__nested_let.hvm.snap
+++ b/tests/snapshots/compile_file__nested_let.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file/nested_let.hvm
+input_file: tests/golden_tests/compile_file/nested_let.bend
 ---
 @main = a
   & ((2 4) (3 6)) ~ (* (a *))
diff --git a/tests/snapshots/compile_file__number_too_large.hvm.snap b/tests/snapshots/compile_file__number_too_large.bend.snap
similarity index 55%
rename from tests/snapshots/compile_file__number_too_large.hvm.snap
rename to tests/snapshots/compile_file__number_too_large.bend.snap
index b55b9d39..9f7ea27e 100644
--- a/tests/snapshots/compile_file__number_too_large.hvm.snap
+++ b/tests/snapshots/compile_file__number_too_large.bend.snap
@@ -1,8 +1,8 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file/number_too_large.hvm
+input_file: tests/golden_tests/compile_file/number_too_large.bend
 ---
 Errors:
-In tests/golden_tests/compile_file/number_too_large.hvm :
+In tests/golden_tests/compile_file/number_too_large.bend :
 Number literal outside of range for U24.
   1 | main = 0x10000000
diff --git a/tests/snapshots/compile_file__nums.hvm.snap b/tests/snapshots/compile_file__nums.bend.snap
similarity index 63%
rename from tests/snapshots/compile_file__nums.hvm.snap
rename to tests/snapshots/compile_file__nums.bend.snap
index 2cf93616..2ced2822 100644
--- a/tests/snapshots/compile_file__nums.hvm.snap
+++ b/tests/snapshots/compile_file__nums.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file/nums.hvm
+input_file: tests/golden_tests/compile_file/nums.bend
 ---
 @main = b
   & $(a b) ~ [+16777215]
diff --git a/tests/snapshots/compile_file__op2.hvm.snap b/tests/snapshots/compile_file__op2.bend.snap
similarity index 73%
rename from tests/snapshots/compile_file__op2.hvm.snap
rename to tests/snapshots/compile_file__op2.bend.snap
index fd1af49a..b6acb150 100644
--- a/tests/snapshots/compile_file__op2.hvm.snap
+++ b/tests/snapshots/compile_file__op2.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file/op2.hvm
+input_file: tests/golden_tests/compile_file/op2.bend
 ---
 @main = a
   & $(1 $([=2] $([&3] $([|4] $([>5] $([<6] $([/7] $([*8] $([-9] $([+10] $([%11] a))))))))))) ~ [!0]
diff --git a/tests/snapshots/compile_file__redex_order.hvm.snap b/tests/snapshots/compile_file__redex_order.bend.snap
similarity index 78%
rename from tests/snapshots/compile_file__redex_order.hvm.snap
rename to tests/snapshots/compile_file__redex_order.bend.snap
index c1ce3db4..9624c3e8 100644
--- a/tests/snapshots/compile_file__redex_order.hvm.snap
+++ b/tests/snapshots/compile_file__redex_order.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file/redex_order.hvm
+input_file: tests/golden_tests/compile_file/redex_order.bend
 ---
 @a = (a a)
 
diff --git a/tests/snapshots/compile_file__redex_order_recursive.hvm.snap b/tests/snapshots/compile_file__redex_order_recursive.bend.snap
similarity index 99%
rename from tests/snapshots/compile_file__redex_order_recursive.hvm.snap
rename to tests/snapshots/compile_file__redex_order_recursive.bend.snap
index 0879d476..25aface2 100644
--- a/tests/snapshots/compile_file__redex_order_recursive.hvm.snap
+++ b/tests/snapshots/compile_file__redex_order_recursive.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file/redex_order_recursive.hvm
+input_file: tests/golden_tests/compile_file/redex_order_recursive.bend
 ---
 @Foo = (a (b (c ((a (b (c d))) d))))
 
diff --git a/tests/snapshots/compile_file__ref_to_main.hvm.snap b/tests/snapshots/compile_file__ref_to_main.bend.snap
similarity index 72%
rename from tests/snapshots/compile_file__ref_to_main.hvm.snap
rename to tests/snapshots/compile_file__ref_to_main.bend.snap
index dca58089..d0d1bfb6 100644
--- a/tests/snapshots/compile_file__ref_to_main.hvm.snap
+++ b/tests/snapshots/compile_file__ref_to_main.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file/ref_to_main.hvm
+input_file: tests/golden_tests/compile_file/ref_to_main.bend
 ---
 Errors:
 In definition 'Foo':
diff --git a/tests/snapshots/compile_file__ref_to_ref.hvm.snap b/tests/snapshots/compile_file__ref_to_ref.bend.snap
similarity index 70%
rename from tests/snapshots/compile_file__ref_to_ref.hvm.snap
rename to tests/snapshots/compile_file__ref_to_ref.bend.snap
index 975cdf49..a9b2566e 100644
--- a/tests/snapshots/compile_file__ref_to_ref.hvm.snap
+++ b/tests/snapshots/compile_file__ref_to_ref.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file/ref_to_ref.hvm
+input_file: tests/golden_tests/compile_file/ref_to_ref.bend
 ---
 @A1 = @A2
 
diff --git a/tests/snapshots/compile_file__repeated_bind_rule.hvm.snap b/tests/snapshots/compile_file__repeated_bind_rule.bend.snap
similarity index 74%
rename from tests/snapshots/compile_file__repeated_bind_rule.hvm.snap
rename to tests/snapshots/compile_file__repeated_bind_rule.bend.snap
index d2a75a56..d6fa3989 100644
--- a/tests/snapshots/compile_file__repeated_bind_rule.hvm.snap
+++ b/tests/snapshots/compile_file__repeated_bind_rule.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file/repeated_bind_rule.hvm
+input_file: tests/golden_tests/compile_file/repeated_bind_rule.bend
 ---
 Warnings:
 In definition 'Foo':
diff --git a/tests/snapshots/compile_file__simple_tup.bend.snap b/tests/snapshots/compile_file__simple_tup.bend.snap
new file mode 100644
index 00000000..9ce7dfe0
--- /dev/null
+++ b/tests/snapshots/compile_file__simple_tup.bend.snap
@@ -0,0 +1,5 @@
+---
+source: tests/golden_tests.rs
+input_file: tests/golden_tests/compile_file/simple_tup.bend
+---
+@main = (0 42)
diff --git a/tests/snapshots/compile_file__simple_tup.hvm.snap b/tests/snapshots/compile_file__simple_tup.hvm.snap
deleted file mode 100644
index 556f5f31..00000000
--- a/tests/snapshots/compile_file__simple_tup.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file/simple_tup.hvm
----
-@main = (0 42)
diff --git a/tests/snapshots/compile_file__switch_all_patterns.hvm.snap b/tests/snapshots/compile_file__switch_all_patterns.bend.snap
similarity index 75%
rename from tests/snapshots/compile_file__switch_all_patterns.hvm.snap
rename to tests/snapshots/compile_file__switch_all_patterns.bend.snap
index 04cf0769..af5971be 100644
--- a/tests/snapshots/compile_file__switch_all_patterns.hvm.snap
+++ b/tests/snapshots/compile_file__switch_all_patterns.bend.snap
@@ -1,9 +1,9 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file/switch_all_patterns.hvm
+input_file: tests/golden_tests/compile_file/switch_all_patterns.bend
 ---
 Errors:
-In tests/golden_tests/compile_file/switch_all_patterns.hvm :
+In tests/golden_tests/compile_file/switch_all_patterns.bend :
 - expected: 0
 - detected:
   7 |   _: x-1
diff --git a/tests/snapshots/compile_file__switch_in_switch_arg.hvm.snap b/tests/snapshots/compile_file__switch_in_switch_arg.bend.snap
similarity index 96%
rename from tests/snapshots/compile_file__switch_in_switch_arg.hvm.snap
rename to tests/snapshots/compile_file__switch_in_switch_arg.bend.snap
index 18706031..c2e8a7af 100644
--- a/tests/snapshots/compile_file__switch_in_switch_arg.hvm.snap
+++ b/tests/snapshots/compile_file__switch_in_switch_arg.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file/switch_in_switch_arg.hvm
+input_file: tests/golden_tests/compile_file/switch_in_switch_arg.bend
 ---
 @main = (?((0 (a a)) ?((0 @main__C0) b)) b)
 
diff --git a/tests/snapshots/compile_file__switch_unscoped_lambda.hvm.snap b/tests/snapshots/compile_file__switch_unscoped_lambda.bend.snap
similarity index 96%
rename from tests/snapshots/compile_file__switch_unscoped_lambda.hvm.snap
rename to tests/snapshots/compile_file__switch_unscoped_lambda.bend.snap
index 8f1b3c76..71aee146 100644
--- a/tests/snapshots/compile_file__switch_unscoped_lambda.hvm.snap
+++ b/tests/snapshots/compile_file__switch_unscoped_lambda.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file/switch_unscoped_lambda.hvm
+input_file: tests/golden_tests/compile_file/switch_unscoped_lambda.bend
 ---
 @lambda_in = (?(((a a) (b (c b))) (c d)) d)
 
diff --git a/tests/snapshots/compile_file__tup.hvm.snap b/tests/snapshots/compile_file__tup.bend.snap
similarity index 53%
rename from tests/snapshots/compile_file__tup.hvm.snap
rename to tests/snapshots/compile_file__tup.bend.snap
index 5cfa0cbb..866c2438 100644
--- a/tests/snapshots/compile_file__tup.hvm.snap
+++ b/tests/snapshots/compile_file__tup.bend.snap
@@ -1,5 +1,5 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file/tup.hvm
+input_file: tests/golden_tests/compile_file/tup.bend
 ---
 @main = ((1 4) (2 3))
diff --git a/tests/snapshots/compile_file__tup_add.hvm.snap b/tests/snapshots/compile_file__tup_add.bend.snap
similarity index 58%
rename from tests/snapshots/compile_file__tup_add.hvm.snap
rename to tests/snapshots/compile_file__tup_add.bend.snap
index bf9592f3..06c667e2 100644
--- a/tests/snapshots/compile_file__tup_add.hvm.snap
+++ b/tests/snapshots/compile_file__tup_add.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file/tup_add.hvm
+input_file: tests/golden_tests/compile_file/tup_add.bend
 ---
 @main = b
   & (1 2) ~ ($(:[+] $(a b)) a)
diff --git a/tests/snapshots/compile_file__unbound_unscoped_var.hvm.snap b/tests/snapshots/compile_file__unbound_unscoped_var.bend.snap
similarity index 97%
rename from tests/snapshots/compile_file__unbound_unscoped_var.hvm.snap
rename to tests/snapshots/compile_file__unbound_unscoped_var.bend.snap
index b6ca4043..50012beb 100644
--- a/tests/snapshots/compile_file__unbound_unscoped_var.hvm.snap
+++ b/tests/snapshots/compile_file__unbound_unscoped_var.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file/unbound_unscoped_var.hvm
+input_file: tests/golden_tests/compile_file/unbound_unscoped_var.bend
 ---
 Errors:
 In definition 'main':
diff --git a/tests/snapshots/compile_file__unbound_var.hvm.snap b/tests/snapshots/compile_file__unbound_var.bend.snap
similarity index 67%
rename from tests/snapshots/compile_file__unbound_var.hvm.snap
rename to tests/snapshots/compile_file__unbound_var.bend.snap
index 3a694c18..a53e420c 100644
--- a/tests/snapshots/compile_file__unbound_var.hvm.snap
+++ b/tests/snapshots/compile_file__unbound_var.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file/unbound_var.hvm
+input_file: tests/golden_tests/compile_file/unbound_var.bend
 ---
 Errors:
 In definition 'main':
diff --git a/tests/snapshots/compile_file__unbound_var_scope.hvm.snap b/tests/snapshots/compile_file__unbound_var_scope.bend.snap
similarity index 65%
rename from tests/snapshots/compile_file__unbound_var_scope.hvm.snap
rename to tests/snapshots/compile_file__unbound_var_scope.bend.snap
index cd532d74..2976e074 100644
--- a/tests/snapshots/compile_file__unbound_var_scope.hvm.snap
+++ b/tests/snapshots/compile_file__unbound_var_scope.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file/unbound_var_scope.hvm
+input_file: tests/golden_tests/compile_file/unbound_var_scope.bend
 ---
 Errors:
 In definition 'main':
diff --git a/tests/snapshots/compile_file__unbound_with_tup_pattern.hvm.snap b/tests/snapshots/compile_file__unbound_with_tup_pattern.bend.snap
similarity index 95%
rename from tests/snapshots/compile_file__unbound_with_tup_pattern.hvm.snap
rename to tests/snapshots/compile_file__unbound_with_tup_pattern.bend.snap
index dcc02cbd..549c276d 100644
--- a/tests/snapshots/compile_file__unbound_with_tup_pattern.hvm.snap
+++ b/tests/snapshots/compile_file__unbound_with_tup_pattern.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file/unbound_with_tup_pattern.hvm
+input_file: tests/golden_tests/compile_file/unbound_with_tup_pattern.bend
 ---
 Errors:
 In definition 'Foo':
diff --git a/tests/snapshots/compile_file__underscore.hvm.snap b/tests/snapshots/compile_file__underscore.bend.snap
similarity index 58%
rename from tests/snapshots/compile_file__underscore.hvm.snap
rename to tests/snapshots/compile_file__underscore.bend.snap
index 0252a390..55d91c5f 100644
--- a/tests/snapshots/compile_file__underscore.hvm.snap
+++ b/tests/snapshots/compile_file__underscore.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file/underscore.hvm
+input_file: tests/golden_tests/compile_file/underscore.bend
 ---
 @const = (* 2)
 
diff --git a/tests/snapshots/compile_file__unexpected_top_char.hvm.snap b/tests/snapshots/compile_file__unexpected_top_char.bend.snap
similarity index 75%
rename from tests/snapshots/compile_file__unexpected_top_char.hvm.snap
rename to tests/snapshots/compile_file__unexpected_top_char.bend.snap
index e5ef70eb..a847ea43 100644
--- a/tests/snapshots/compile_file__unexpected_top_char.hvm.snap
+++ b/tests/snapshots/compile_file__unexpected_top_char.bend.snap
@@ -1,9 +1,9 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file/unexpected_top_char.hvm
+input_file: tests/golden_tests/compile_file/unexpected_top_char.bend
 ---
 Errors:
-In tests/golden_tests/compile_file/unexpected_top_char.hvm :
+In tests/golden_tests/compile_file/unexpected_top_char.bend :
 - expected: top-level definition
 - detected:
  1 | *
diff --git a/tests/snapshots/compile_file__unscoped_dup_use.hvm.snap b/tests/snapshots/compile_file__unscoped_dup_use.bend.snap
similarity index 69%
rename from tests/snapshots/compile_file__unscoped_dup_use.hvm.snap
rename to tests/snapshots/compile_file__unscoped_dup_use.bend.snap
index a018d1d3..1c4ed17c 100644
--- a/tests/snapshots/compile_file__unscoped_dup_use.hvm.snap
+++ b/tests/snapshots/compile_file__unscoped_dup_use.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file/unscoped_dup_use.hvm
+input_file: tests/golden_tests/compile_file/unscoped_dup_use.bend
 ---
 Errors:
 In definition 'main':
diff --git a/tests/snapshots/compile_file__unscoped_supercombinator.hvm.snap b/tests/snapshots/compile_file__unscoped_supercombinator.bend.snap
similarity index 95%
rename from tests/snapshots/compile_file__unscoped_supercombinator.hvm.snap
rename to tests/snapshots/compile_file__unscoped_supercombinator.bend.snap
index 468b3c1f..75f39138 100644
--- a/tests/snapshots/compile_file__unscoped_supercombinator.hvm.snap
+++ b/tests/snapshots/compile_file__unscoped_supercombinator.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file/unscoped_supercombinator.hvm
+input_file: tests/golden_tests/compile_file/unscoped_supercombinator.bend
 ---
 @Foo = ((@Foo__C1 (@Foo__C0 a)) a)
 
diff --git a/tests/snapshots/compile_file__unused_let.hvm.snap b/tests/snapshots/compile_file__unused_let.bend.snap
similarity index 54%
rename from tests/snapshots/compile_file__unused_let.hvm.snap
rename to tests/snapshots/compile_file__unused_let.bend.snap
index 61194672..d1c499f8 100644
--- a/tests/snapshots/compile_file__unused_let.hvm.snap
+++ b/tests/snapshots/compile_file__unused_let.bend.snap
@@ -1,5 +1,5 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file/unused_let.hvm
+input_file: tests/golden_tests/compile_file/unused_let.bend
 ---
 @main = ({$(:[+] $(b *)) {b a}} a)
diff --git a/tests/snapshots/compile_file__unused_unscoped_bind.hvm.snap b/tests/snapshots/compile_file__unused_unscoped_bind.bend.snap
similarity index 97%
rename from tests/snapshots/compile_file__unused_unscoped_bind.hvm.snap
rename to tests/snapshots/compile_file__unused_unscoped_bind.bend.snap
index 4cbfd167..b2b5f265 100644
--- a/tests/snapshots/compile_file__unused_unscoped_bind.hvm.snap
+++ b/tests/snapshots/compile_file__unused_unscoped_bind.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file/unused_unscoped_bind.hvm
+input_file: tests/golden_tests/compile_file/unused_unscoped_bind.bend
 ---
 Errors:
 In definition 'main':
diff --git a/tests/snapshots/compile_file__vicious_circles.hvm.snap b/tests/snapshots/compile_file__vicious_circles.bend.snap
similarity index 81%
rename from tests/snapshots/compile_file__vicious_circles.hvm.snap
rename to tests/snapshots/compile_file__vicious_circles.bend.snap
index ab90eb3d..33580e7b 100644
--- a/tests/snapshots/compile_file__vicious_circles.hvm.snap
+++ b/tests/snapshots/compile_file__vicious_circles.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file/vicious_circles.hvm
+input_file: tests/golden_tests/compile_file/vicious_circles.bend
 ---
 Errors:
 In compiled inet 'disconnected_self_lam':
diff --git a/tests/snapshots/compile_file__warn_and_err.hvm.snap b/tests/snapshots/compile_file__warn_and_err.bend.snap
similarity index 79%
rename from tests/snapshots/compile_file__warn_and_err.hvm.snap
rename to tests/snapshots/compile_file__warn_and_err.bend.snap
index 7a680525..3e331175 100644
--- a/tests/snapshots/compile_file__warn_and_err.hvm.snap
+++ b/tests/snapshots/compile_file__warn_and_err.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file/warn_and_err.hvm
+input_file: tests/golden_tests/compile_file/warn_and_err.bend
 ---
 Warnings:
 In definition 'Foo':
diff --git a/tests/snapshots/compile_file__with_clause_parse_err.hvm.snap b/tests/snapshots/compile_file__with_clause_parse_err.bend.snap
similarity index 76%
rename from tests/snapshots/compile_file__with_clause_parse_err.hvm.snap
rename to tests/snapshots/compile_file__with_clause_parse_err.bend.snap
index 16a3d632..94e4475f 100644
--- a/tests/snapshots/compile_file__with_clause_parse_err.hvm.snap
+++ b/tests/snapshots/compile_file__with_clause_parse_err.bend.snap
@@ -1,9 +1,9 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file/with_clause_parse_err.hvm
+input_file: tests/golden_tests/compile_file/with_clause_parse_err.bend
 ---
 Errors:
-In tests/golden_tests/compile_file/with_clause_parse_err.hvm :
+In tests/golden_tests/compile_file/with_clause_parse_err.bend :
 - expected: '{'
 - detected:
   1 | main = @a @b switch b witha{
diff --git a/tests/snapshots/compile_file__wrong_ctr_arity.hvm.snap b/tests/snapshots/compile_file__wrong_ctr_arity.bend.snap
similarity index 77%
rename from tests/snapshots/compile_file__wrong_ctr_arity.hvm.snap
rename to tests/snapshots/compile_file__wrong_ctr_arity.bend.snap
index 338ce640..1f47876c 100644
--- a/tests/snapshots/compile_file__wrong_ctr_arity.hvm.snap
+++ b/tests/snapshots/compile_file__wrong_ctr_arity.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file/wrong_ctr_arity.hvm
+input_file: tests/golden_tests/compile_file/wrong_ctr_arity.bend
 ---
 Errors:
 In definition 'Bar':
diff --git a/tests/snapshots/compile_file__wrong_ctr_var_arity.hvm.snap b/tests/snapshots/compile_file__wrong_ctr_var_arity.bend.snap
similarity index 98%
rename from tests/snapshots/compile_file__wrong_ctr_var_arity.hvm.snap
rename to tests/snapshots/compile_file__wrong_ctr_var_arity.bend.snap
index 8d1b1340..60591d40 100644
--- a/tests/snapshots/compile_file__wrong_ctr_var_arity.hvm.snap
+++ b/tests/snapshots/compile_file__wrong_ctr_var_arity.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file/wrong_ctr_var_arity.hvm
+input_file: tests/golden_tests/compile_file/wrong_ctr_var_arity.bend
 ---
 Errors:
 In definition 'foo':
diff --git a/tests/snapshots/compile_file__wrong_nums.hvm.snap b/tests/snapshots/compile_file__wrong_nums.bend.snap
similarity index 58%
rename from tests/snapshots/compile_file__wrong_nums.hvm.snap
rename to tests/snapshots/compile_file__wrong_nums.bend.snap
index 7d578da5..7ce6aa53 100644
--- a/tests/snapshots/compile_file__wrong_nums.hvm.snap
+++ b/tests/snapshots/compile_file__wrong_nums.bend.snap
@@ -1,9 +1,9 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file/wrong_nums.hvm
+input_file: tests/golden_tests/compile_file/wrong_nums.bend
 ---
 Errors:
-In tests/golden_tests/compile_file/wrong_nums.hvm :
+In tests/golden_tests/compile_file/wrong_nums.bend :
 - expected: ')'
 - detected:
   1 | main = (+ 0b012345 0FA)
diff --git a/tests/snapshots/compile_file__wrong_unicode_escape.hvm.snap b/tests/snapshots/compile_file__wrong_unicode_escape.bend.snap
similarity index 77%
rename from tests/snapshots/compile_file__wrong_unicode_escape.hvm.snap
rename to tests/snapshots/compile_file__wrong_unicode_escape.bend.snap
index a5808596..682d7420 100644
--- a/tests/snapshots/compile_file__wrong_unicode_escape.hvm.snap
+++ b/tests/snapshots/compile_file__wrong_unicode_escape.bend.snap
@@ -1,9 +1,9 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file/wrong_unicode_escape.hvm
+input_file: tests/golden_tests/compile_file/wrong_unicode_escape.bend
 ---
 Errors:
-In tests/golden_tests/compile_file/wrong_unicode_escape.hvm :
+In tests/golden_tests/compile_file/wrong_unicode_escape.bend :
 - expected: '}'
 - detected:
   1 | main = (String.cons '\u{1' "\u2}\u{zxcx}")
diff --git a/tests/snapshots/compile_file_o_all__addition.hvm.snap b/tests/snapshots/compile_file_o_all__addition.bend.snap
similarity index 65%
rename from tests/snapshots/compile_file_o_all__addition.hvm.snap
rename to tests/snapshots/compile_file_o_all__addition.bend.snap
index e5f8b679..2e46b859 100644
--- a/tests/snapshots/compile_file_o_all__addition.hvm.snap
+++ b/tests/snapshots/compile_file_o_all__addition.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file_o_all/addition.hvm
+input_file: tests/golden_tests/compile_file_o_all/addition.bend
 ---
 @main = a
   & @main__C0 ~ (8 a)
diff --git a/tests/snapshots/compile_file_o_all__addition_var_fst.hvm.snap b/tests/snapshots/compile_file_o_all__addition_var_fst.bend.snap
similarity index 93%
rename from tests/snapshots/compile_file_o_all__addition_var_fst.hvm.snap
rename to tests/snapshots/compile_file_o_all__addition_var_fst.bend.snap
index 4913edfd..a0b68605 100644
--- a/tests/snapshots/compile_file_o_all__addition_var_fst.hvm.snap
+++ b/tests/snapshots/compile_file_o_all__addition_var_fst.bend.snap
@@ -1,5 +1,5 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file_o_all/addition_var_fst.hvm
+input_file: tests/golden_tests/compile_file_o_all/addition_var_fst.bend
 ---
 @main = ($([+1] a) a)
diff --git a/tests/snapshots/compile_file_o_all__adt_option_and.hvm.snap b/tests/snapshots/compile_file_o_all__adt_option_and.bend.snap
similarity index 98%
rename from tests/snapshots/compile_file_o_all__adt_option_and.hvm.snap
rename to tests/snapshots/compile_file_o_all__adt_option_and.bend.snap
index f3176bf5..739c90a1 100644
--- a/tests/snapshots/compile_file_o_all__adt_option_and.hvm.snap
+++ b/tests/snapshots/compile_file_o_all__adt_option_and.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file_o_all/adt_option_and.hvm
+input_file: tests/golden_tests/compile_file_o_all/adt_option_and.bend
 ---
 @Option/None = (* (a a))
 
diff --git a/tests/snapshots/compile_file_o_all__adt_string.hvm.snap b/tests/snapshots/compile_file_o_all__adt_string.bend.snap
similarity index 63%
rename from tests/snapshots/compile_file_o_all__adt_string.hvm.snap
rename to tests/snapshots/compile_file_o_all__adt_string.bend.snap
index d8069834..523aa7ee 100644
--- a/tests/snapshots/compile_file_o_all__adt_string.hvm.snap
+++ b/tests/snapshots/compile_file_o_all__adt_string.bend.snap
@@ -1,9 +1,9 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file_o_all/adt_string.hvm
+input_file: tests/golden_tests/compile_file_o_all/adt_string.bend
 ---
 Errors:
-In tests/golden_tests/compile_file_o_all/adt_string.hvm :
+In tests/golden_tests/compile_file_o_all/adt_string.bend :
 String is a built-in datatype and should not be overridden.
   1 | data String = S
   2 | 
diff --git a/tests/snapshots/compile_file_o_all__and.hvm.snap b/tests/snapshots/compile_file_o_all__and.bend.snap
similarity index 75%
rename from tests/snapshots/compile_file_o_all__and.hvm.snap
rename to tests/snapshots/compile_file_o_all__and.bend.snap
index 3b019a54..fe0e211f 100644
--- a/tests/snapshots/compile_file_o_all__and.hvm.snap
+++ b/tests/snapshots/compile_file_o_all__and.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file_o_all/and.hvm
+input_file: tests/golden_tests/compile_file_o_all/and.bend
 ---
 @and = (b (((a a) ((* @bool/false) (b c))) c))
 
diff --git a/tests/snapshots/compile_file_o_all__bad_parens_making_erased_let.hvm.snap b/tests/snapshots/compile_file_o_all__bad_parens_making_erased_let.bend.snap
similarity index 91%
rename from tests/snapshots/compile_file_o_all__bad_parens_making_erased_let.hvm.snap
rename to tests/snapshots/compile_file_o_all__bad_parens_making_erased_let.bend.snap
index 234ac01b..726c4d9a 100644
--- a/tests/snapshots/compile_file_o_all__bad_parens_making_erased_let.hvm.snap
+++ b/tests/snapshots/compile_file_o_all__bad_parens_making_erased_let.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file_o_all/bad_parens_making_erased_let.hvm
+input_file: tests/golden_tests/compile_file_o_all/bad_parens_making_erased_let.bend
 ---
 Errors:
 In definition 'main':
diff --git a/tests/snapshots/compile_file_o_all__bool.hvm.snap b/tests/snapshots/compile_file_o_all__bool.bend.snap
similarity index 69%
rename from tests/snapshots/compile_file_o_all__bool.hvm.snap
rename to tests/snapshots/compile_file_o_all__bool.bend.snap
index ec817b3e..81dbbc35 100644
--- a/tests/snapshots/compile_file_o_all__bool.hvm.snap
+++ b/tests/snapshots/compile_file_o_all__bool.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file_o_all/bool.hvm
+input_file: tests/golden_tests/compile_file_o_all/bool.bend
 ---
 @Not = ((@fals (@true a)) a)
 
diff --git a/tests/snapshots/compile_file_o_all__cyclic_dup.hvm.snap b/tests/snapshots/compile_file_o_all__cyclic_dup.bend.snap
similarity index 66%
rename from tests/snapshots/compile_file_o_all__cyclic_dup.hvm.snap
rename to tests/snapshots/compile_file_o_all__cyclic_dup.bend.snap
index 441b3efa..6114b7b4 100644
--- a/tests/snapshots/compile_file_o_all__cyclic_dup.hvm.snap
+++ b/tests/snapshots/compile_file_o_all__cyclic_dup.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file_o_all/cyclic_dup.hvm
+input_file: tests/golden_tests/compile_file_o_all/cyclic_dup.bend
 ---
 Errors:
 In definition 'main':
diff --git a/tests/snapshots/compile_file_o_all__double_main.hvm.snap b/tests/snapshots/compile_file_o_all__double_main.bend.snap
similarity index 61%
rename from tests/snapshots/compile_file_o_all__double_main.hvm.snap
rename to tests/snapshots/compile_file_o_all__double_main.bend.snap
index f35f4ad6..8d14ad81 100644
--- a/tests/snapshots/compile_file_o_all__double_main.hvm.snap
+++ b/tests/snapshots/compile_file_o_all__double_main.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file_o_all/double_main.hvm
+input_file: tests/golden_tests/compile_file_o_all/double_main.bend
 ---
 Errors:
 File has both 'main' and 'Main' definitions.
diff --git a/tests/snapshots/compile_file_o_all__eta_chain.hvm.snap b/tests/snapshots/compile_file_o_all__eta_chain.bend.snap
similarity index 70%
rename from tests/snapshots/compile_file_o_all__eta_chain.hvm.snap
rename to tests/snapshots/compile_file_o_all__eta_chain.bend.snap
index ab30f904..a4d15578 100644
--- a/tests/snapshots/compile_file_o_all__eta_chain.hvm.snap
+++ b/tests/snapshots/compile_file_o_all__eta_chain.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file_o_all/eta_chain.hvm
+input_file: tests/golden_tests/compile_file_o_all/eta_chain.bend
 ---
 @Bar = a
   & @Baz ~ a
diff --git a/tests/snapshots/compile_file_o_all__ex0.hvm.snap b/tests/snapshots/compile_file_o_all__ex0.bend.snap
similarity index 70%
rename from tests/snapshots/compile_file_o_all__ex0.hvm.snap
rename to tests/snapshots/compile_file_o_all__ex0.bend.snap
index b0ae460f..2c8e8035 100644
--- a/tests/snapshots/compile_file_o_all__ex0.hvm.snap
+++ b/tests/snapshots/compile_file_o_all__ex0.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file_o_all/ex0.hvm
+input_file: tests/golden_tests/compile_file_o_all/ex0.bend
 ---
 @C_2 = ({(b c) (a b)} (a c))
 
diff --git a/tests/snapshots/compile_file_o_all__ex2.hvm.snap b/tests/snapshots/compile_file_o_all__ex2.bend.snap
similarity index 91%
rename from tests/snapshots/compile_file_o_all__ex2.hvm.snap
rename to tests/snapshots/compile_file_o_all__ex2.bend.snap
index df3b1944..d98385eb 100644
--- a/tests/snapshots/compile_file_o_all__ex2.hvm.snap
+++ b/tests/snapshots/compile_file_o_all__ex2.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file_o_all/ex2.hvm
+input_file: tests/golden_tests/compile_file_o_all/ex2.bend
 ---
 @E = (* (* (a a)))
 
diff --git a/tests/snapshots/compile_file_o_all__example.hvm.snap b/tests/snapshots/compile_file_o_all__example.bend.snap
similarity index 67%
rename from tests/snapshots/compile_file_o_all__example.hvm.snap
rename to tests/snapshots/compile_file_o_all__example.bend.snap
index 1dbd64c9..32366df6 100644
--- a/tests/snapshots/compile_file_o_all__example.hvm.snap
+++ b/tests/snapshots/compile_file_o_all__example.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file_o_all/example.hvm
+input_file: tests/golden_tests/compile_file_o_all/example.bend
 ---
 @Def1 = c
   & (a a) ~ ((b b) c)
diff --git a/tests/snapshots/compile_file_o_all__exp.hvm.snap b/tests/snapshots/compile_file_o_all__exp.bend.snap
similarity index 71%
rename from tests/snapshots/compile_file_o_all__exp.hvm.snap
rename to tests/snapshots/compile_file_o_all__exp.bend.snap
index 2ded231e..f2b2bafa 100644
--- a/tests/snapshots/compile_file_o_all__exp.hvm.snap
+++ b/tests/snapshots/compile_file_o_all__exp.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file_o_all/exp.hvm
+input_file: tests/golden_tests/compile_file_o_all/exp.bend
 ---
 @main = a
   & @main__C1 ~ (@main__C0 a)
diff --git a/tests/snapshots/compile_file_o_all__expr.hvm.snap b/tests/snapshots/compile_file_o_all__expr.bend.snap
similarity index 93%
rename from tests/snapshots/compile_file_o_all__expr.hvm.snap
rename to tests/snapshots/compile_file_o_all__expr.bend.snap
index cef2a3a7..7b104f27 100644
--- a/tests/snapshots/compile_file_o_all__expr.hvm.snap
+++ b/tests/snapshots/compile_file_o_all__expr.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file_o_all/expr.hvm
+input_file: tests/golden_tests/compile_file_o_all/expr.bend
 ---
 @Expr/App = (a (b (* (* ((a (b c)) (* (* (* (* (* (* c)))))))))))
 
diff --git a/tests/snapshots/compile_file_o_all__extracted_match_pred.hvm.snap b/tests/snapshots/compile_file_o_all__extracted_match_pred.bend.snap
similarity index 94%
rename from tests/snapshots/compile_file_o_all__extracted_match_pred.hvm.snap
rename to tests/snapshots/compile_file_o_all__extracted_match_pred.bend.snap
index 4060b257..a48737fe 100644
--- a/tests/snapshots/compile_file_o_all__extracted_match_pred.hvm.snap
+++ b/tests/snapshots/compile_file_o_all__extracted_match_pred.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file_o_all/extracted_match_pred.hvm
+input_file: tests/golden_tests/compile_file_o_all/extracted_match_pred.bend
 ---
 @main = a
   & @val ~ (1 a)
diff --git a/tests/snapshots/compile_file_o_all__fst.hvm.snap b/tests/snapshots/compile_file_o_all__fst.bend.snap
similarity index 59%
rename from tests/snapshots/compile_file_o_all__fst.hvm.snap
rename to tests/snapshots/compile_file_o_all__fst.bend.snap
index 909ab596..adb96878 100644
--- a/tests/snapshots/compile_file_o_all__fst.hvm.snap
+++ b/tests/snapshots/compile_file_o_all__fst.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file_o_all/fst.hvm
+input_file: tests/golden_tests/compile_file_o_all/fst.bend
 ---
 @Fst = ((a *) a)
 
diff --git a/tests/snapshots/compile_file_o_all__fst_fst.hvm.snap b/tests/snapshots/compile_file_o_all__fst_fst.bend.snap
similarity index 64%
rename from tests/snapshots/compile_file_o_all__fst_fst.hvm.snap
rename to tests/snapshots/compile_file_o_all__fst_fst.bend.snap
index 392bba40..bd2b1e59 100644
--- a/tests/snapshots/compile_file_o_all__fst_fst.hvm.snap
+++ b/tests/snapshots/compile_file_o_all__fst_fst.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file_o_all/fst_fst.hvm
+input_file: tests/golden_tests/compile_file_o_all/fst_fst.bend
 ---
 @FstFst = ((a *) ((b *) (a b)))
 
diff --git a/tests/snapshots/compile_file_o_all__hvm1_main.bend.snap b/tests/snapshots/compile_file_o_all__hvm1_main.bend.snap
new file mode 100644
index 00000000..baad2b3a
--- /dev/null
+++ b/tests/snapshots/compile_file_o_all__hvm1_main.bend.snap
@@ -0,0 +1,5 @@
+---
+source: tests/golden_tests.rs
+input_file: tests/golden_tests/compile_file_o_all/hvm1_main.bend
+---
+@main = (a a)
diff --git a/tests/snapshots/compile_file_o_all__hvm1_main.hvm.snap b/tests/snapshots/compile_file_o_all__hvm1_main.hvm.snap
deleted file mode 100644
index 64246944..00000000
--- a/tests/snapshots/compile_file_o_all__hvm1_main.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file_o_all/hvm1_main.hvm
----
-@main = (a a)
diff --git a/tests/snapshots/compile_file_o_all__inline_app.hvm.snap b/tests/snapshots/compile_file_o_all__inline_app.bend.snap
similarity index 68%
rename from tests/snapshots/compile_file_o_all__inline_app.hvm.snap
rename to tests/snapshots/compile_file_o_all__inline_app.bend.snap
index 31c2066d..ac7b62ab 100644
--- a/tests/snapshots/compile_file_o_all__inline_app.hvm.snap
+++ b/tests/snapshots/compile_file_o_all__inline_app.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file_o_all/inline_app.hvm
+input_file: tests/golden_tests/compile_file_o_all/inline_app.bend
 ---
 @Rul1__M_Rul2 = (a a)
 
diff --git a/tests/snapshots/compile_file_o_all__inlining.hvm.snap b/tests/snapshots/compile_file_o_all__inlining.bend.snap
similarity index 51%
rename from tests/snapshots/compile_file_o_all__inlining.hvm.snap
rename to tests/snapshots/compile_file_o_all__inlining.bend.snap
index 6d00452f..0496aa38 100644
--- a/tests/snapshots/compile_file_o_all__inlining.hvm.snap
+++ b/tests/snapshots/compile_file_o_all__inlining.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file_o_all/inlining.hvm
+input_file: tests/golden_tests/compile_file_o_all/inlining.bend
 ---
 @main = a
   & * ~ (42 (* a))
diff --git a/tests/snapshots/compile_file_o_all__linearize_match.hvm.snap b/tests/snapshots/compile_file_o_all__linearize_match.bend.snap
similarity index 96%
rename from tests/snapshots/compile_file_o_all__linearize_match.hvm.snap
rename to tests/snapshots/compile_file_o_all__linearize_match.bend.snap
index 76b313ab..4e8b58b8 100644
--- a/tests/snapshots/compile_file_o_all__linearize_match.hvm.snap
+++ b/tests/snapshots/compile_file_o_all__linearize_match.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file_o_all/linearize_match.hvm
+input_file: tests/golden_tests/compile_file_o_all/linearize_match.bend
 ---
 @main = (?(((a a) @main__C0) b) b)
 
diff --git a/tests/snapshots/compile_file_o_all__list_merge_sort.hvm.snap b/tests/snapshots/compile_file_o_all__list_merge_sort.bend.snap
similarity index 99%
rename from tests/snapshots/compile_file_o_all__list_merge_sort.hvm.snap
rename to tests/snapshots/compile_file_o_all__list_merge_sort.bend.snap
index 92e55395..24af07ec 100644
--- a/tests/snapshots/compile_file_o_all__list_merge_sort.hvm.snap
+++ b/tests/snapshots/compile_file_o_all__list_merge_sort.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file_o_all/list_merge_sort.hvm
+input_file: tests/golden_tests/compile_file_o_all/list_merge_sort.bend
 ---
 @Bool/False__M_List_/Nil = (* (a a))
 
diff --git a/tests/snapshots/compile_file_o_all__list_reverse.hvm.snap b/tests/snapshots/compile_file_o_all__list_reverse.bend.snap
similarity index 87%
rename from tests/snapshots/compile_file_o_all__list_reverse.hvm.snap
rename to tests/snapshots/compile_file_o_all__list_reverse.bend.snap
index 7609d51d..1e24cb8b 100644
--- a/tests/snapshots/compile_file_o_all__list_reverse.hvm.snap
+++ b/tests/snapshots/compile_file_o_all__list_reverse.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file_o_all/list_reverse.hvm
+input_file: tests/golden_tests/compile_file_o_all/list_reverse.bend
 ---
 @concat = ((@concat__C0 ((a a) b)) b)
 
diff --git a/tests/snapshots/compile_file_o_all__long_str_file.hvm.snap b/tests/snapshots/compile_file_o_all__long_str_file.bend.snap
similarity index 99%
rename from tests/snapshots/compile_file_o_all__long_str_file.hvm.snap
rename to tests/snapshots/compile_file_o_all__long_str_file.bend.snap
index 79fb6f2b..04527d5f 100644
--- a/tests/snapshots/compile_file_o_all__long_str_file.hvm.snap
+++ b/tests/snapshots/compile_file_o_all__long_str_file.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file_o_all/long_str_file.hvm
+input_file: tests/golden_tests/compile_file_o_all/long_str_file.bend
 ---
 @String/cons = (a (b ((a (b c)) (* c))))
 
diff --git a/tests/snapshots/compile_file_o_all__match_adt_non_exhaustive.hvm.snap b/tests/snapshots/compile_file_o_all__match_adt_non_exhaustive.bend.snap
similarity index 94%
rename from tests/snapshots/compile_file_o_all__match_adt_non_exhaustive.hvm.snap
rename to tests/snapshots/compile_file_o_all__match_adt_non_exhaustive.bend.snap
index c1114061..b3463d45 100644
--- a/tests/snapshots/compile_file_o_all__match_adt_non_exhaustive.hvm.snap
+++ b/tests/snapshots/compile_file_o_all__match_adt_non_exhaustive.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file_o_all/match_adt_non_exhaustive.hvm
+input_file: tests/golden_tests/compile_file_o_all/match_adt_non_exhaustive.bend
 ---
 Errors:
 In definition 'main':
diff --git a/tests/snapshots/compile_file_o_all__match_dup_and_reconstruction.hvm.snap b/tests/snapshots/compile_file_o_all__match_dup_and_reconstruction.bend.snap
similarity index 92%
rename from tests/snapshots/compile_file_o_all__match_dup_and_reconstruction.hvm.snap
rename to tests/snapshots/compile_file_o_all__match_dup_and_reconstruction.bend.snap
index 15ba234b..389f4e6f 100644
--- a/tests/snapshots/compile_file_o_all__match_dup_and_reconstruction.hvm.snap
+++ b/tests/snapshots/compile_file_o_all__match_dup_and_reconstruction.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file_o_all/match_dup_and_reconstruction.hvm
+input_file: tests/golden_tests/compile_file_o_all/match_dup_and_reconstruction.bend
 ---
 @Box/Boxed = (a ((a b) b))
 
diff --git a/tests/snapshots/compile_file_o_all__match_mult_linearization.hvm.snap b/tests/snapshots/compile_file_o_all__match_mult_linearization.bend.snap
similarity index 94%
rename from tests/snapshots/compile_file_o_all__match_mult_linearization.hvm.snap
rename to tests/snapshots/compile_file_o_all__match_mult_linearization.bend.snap
index 7eecfd37..3b63bd74 100644
--- a/tests/snapshots/compile_file_o_all__match_mult_linearization.hvm.snap
+++ b/tests/snapshots/compile_file_o_all__match_mult_linearization.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file_o_all/match_mult_linearization.hvm
+input_file: tests/golden_tests/compile_file_o_all/match_mult_linearization.bend
 ---
 @main = (?((@main__C0 @main__C1) a) a)
 
diff --git a/tests/snapshots/compile_file_o_all__match_num_explicit_bind.hvm.snap b/tests/snapshots/compile_file_o_all__match_num_explicit_bind.bend.snap
similarity index 91%
rename from tests/snapshots/compile_file_o_all__match_num_explicit_bind.hvm.snap
rename to tests/snapshots/compile_file_o_all__match_num_explicit_bind.bend.snap
index 3edb0104..6e03d4b4 100644
--- a/tests/snapshots/compile_file_o_all__match_num_explicit_bind.hvm.snap
+++ b/tests/snapshots/compile_file_o_all__match_num_explicit_bind.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file_o_all/match_num_explicit_bind.hvm
+input_file: tests/golden_tests/compile_file_o_all/match_num_explicit_bind.bend
 ---
 @main = a
   & @pred ~ (4 a)
diff --git a/tests/snapshots/compile_file_o_all__match_tup.hvm.snap b/tests/snapshots/compile_file_o_all__match_tup.bend.snap
similarity index 60%
rename from tests/snapshots/compile_file_o_all__match_tup.hvm.snap
rename to tests/snapshots/compile_file_o_all__match_tup.bend.snap
index 24f8f755..eab21075 100644
--- a/tests/snapshots/compile_file_o_all__match_tup.hvm.snap
+++ b/tests/snapshots/compile_file_o_all__match_tup.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file_o_all/match_tup.hvm
+input_file: tests/golden_tests/compile_file_o_all/match_tup.bend
 ---
 @Sum = (($(:[+] $(a b)) a) b)
 
diff --git a/tests/snapshots/compile_file_o_all__merge_definitions.hvm.snap b/tests/snapshots/compile_file_o_all__merge_definitions.bend.snap
similarity index 96%
rename from tests/snapshots/compile_file_o_all__merge_definitions.hvm.snap
rename to tests/snapshots/compile_file_o_all__merge_definitions.bend.snap
index 206ecae6..2fbdd8b8 100644
--- a/tests/snapshots/compile_file_o_all__merge_definitions.hvm.snap
+++ b/tests/snapshots/compile_file_o_all__merge_definitions.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file_o_all/merge_definitions.hvm
+input_file: tests/golden_tests/compile_file_o_all/merge_definitions.bend
 ---
 @false__M_snd = (* (a a))
 
diff --git a/tests/snapshots/compile_file_o_all__non_exhaustive_and.hvm.snap b/tests/snapshots/compile_file_o_all__non_exhaustive_and.bend.snap
similarity index 96%
rename from tests/snapshots/compile_file_o_all__non_exhaustive_and.hvm.snap
rename to tests/snapshots/compile_file_o_all__non_exhaustive_and.bend.snap
index f1a3f06b..84cd4c29 100644
--- a/tests/snapshots/compile_file_o_all__non_exhaustive_and.hvm.snap
+++ b/tests/snapshots/compile_file_o_all__non_exhaustive_and.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file_o_all/non_exhaustive_and.hvm
+input_file: tests/golden_tests/compile_file_o_all/non_exhaustive_and.bend
 ---
 Errors:
 In definition 'Bool.and':
diff --git a/tests/snapshots/compile_file_o_all__non_exhaustive_different_types.hvm.snap b/tests/snapshots/compile_file_o_all__non_exhaustive_different_types.bend.snap
similarity index 92%
rename from tests/snapshots/compile_file_o_all__non_exhaustive_different_types.hvm.snap
rename to tests/snapshots/compile_file_o_all__non_exhaustive_different_types.bend.snap
index 99b16a61..2ced975f 100644
--- a/tests/snapshots/compile_file_o_all__non_exhaustive_different_types.hvm.snap
+++ b/tests/snapshots/compile_file_o_all__non_exhaustive_different_types.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file_o_all/non_exhaustive_different_types.hvm
+input_file: tests/golden_tests/compile_file_o_all/non_exhaustive_different_types.bend
 ---
 Errors:
 In definition 'foo':
diff --git a/tests/snapshots/compile_file_o_all__non_exhaustive_pattern.hvm.snap b/tests/snapshots/compile_file_o_all__non_exhaustive_pattern.bend.snap
similarity index 94%
rename from tests/snapshots/compile_file_o_all__non_exhaustive_pattern.hvm.snap
rename to tests/snapshots/compile_file_o_all__non_exhaustive_pattern.bend.snap
index 3c2f481d..0e73f2e0 100644
--- a/tests/snapshots/compile_file_o_all__non_exhaustive_pattern.hvm.snap
+++ b/tests/snapshots/compile_file_o_all__non_exhaustive_pattern.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file_o_all/non_exhaustive_pattern.hvm
+input_file: tests/golden_tests/compile_file_o_all/non_exhaustive_pattern.bend
 ---
 Errors:
 In definition 'Foo':
diff --git a/tests/snapshots/compile_file_o_all__non_exhaustive_tree.hvm.snap b/tests/snapshots/compile_file_o_all__non_exhaustive_tree.bend.snap
similarity index 95%
rename from tests/snapshots/compile_file_o_all__non_exhaustive_tree.hvm.snap
rename to tests/snapshots/compile_file_o_all__non_exhaustive_tree.bend.snap
index cd1563e1..aec70622 100644
--- a/tests/snapshots/compile_file_o_all__non_exhaustive_tree.hvm.snap
+++ b/tests/snapshots/compile_file_o_all__non_exhaustive_tree.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file_o_all/non_exhaustive_tree.hvm
+input_file: tests/golden_tests/compile_file_o_all/non_exhaustive_tree.bend
 ---
 Errors:
 In definition 'Warp':
diff --git a/tests/snapshots/compile_file_o_all__num_pattern_with_var.hvm.snap b/tests/snapshots/compile_file_o_all__num_pattern_with_var.bend.snap
similarity index 95%
rename from tests/snapshots/compile_file_o_all__num_pattern_with_var.hvm.snap
rename to tests/snapshots/compile_file_o_all__num_pattern_with_var.bend.snap
index d5ca1726..51e1a0bf 100644
--- a/tests/snapshots/compile_file_o_all__num_pattern_with_var.hvm.snap
+++ b/tests/snapshots/compile_file_o_all__num_pattern_with_var.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file_o_all/num_pattern_with_var.hvm
+input_file: tests/golden_tests/compile_file_o_all/num_pattern_with_var.bend
 ---
 @Foo = (((* 0) (@Foo__C1 a)) a)
 
diff --git a/tests/snapshots/compile_file_o_all__recursive_combinator_inactive.hvm.snap b/tests/snapshots/compile_file_o_all__recursive_combinator_inactive.bend.snap
similarity index 90%
rename from tests/snapshots/compile_file_o_all__recursive_combinator_inactive.hvm.snap
rename to tests/snapshots/compile_file_o_all__recursive_combinator_inactive.bend.snap
index 4553c9f7..9104ad6a 100644
--- a/tests/snapshots/compile_file_o_all__recursive_combinator_inactive.hvm.snap
+++ b/tests/snapshots/compile_file_o_all__recursive_combinator_inactive.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file_o_all/recursive_combinator_inactive.hvm
+input_file: tests/golden_tests/compile_file_o_all/recursive_combinator_inactive.bend
 ---
 @Foo = (?((@Foo__C0 (a (* a))) b) b)
 
diff --git a/tests/snapshots/compile_file_o_all__repeated_name_trucation.hvm.snap b/tests/snapshots/compile_file_o_all__repeated_name_trucation.bend.snap
similarity index 99%
rename from tests/snapshots/compile_file_o_all__repeated_name_trucation.hvm.snap
rename to tests/snapshots/compile_file_o_all__repeated_name_trucation.bend.snap
index f4012b9c..6e224c71 100644
--- a/tests/snapshots/compile_file_o_all__repeated_name_trucation.hvm.snap
+++ b/tests/snapshots/compile_file_o_all__repeated_name_trucation.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file_o_all/repeated_name_trucation.hvm
+input_file: tests/golden_tests/compile_file_o_all/repeated_name_trucation.bend
 ---
 Warnings:
 The following functions contain recursive cycles incompatible with HVM's strict evaluation:
diff --git a/tests/snapshots/compile_file_o_all__scrutinee_reconstruction.hvm.snap b/tests/snapshots/compile_file_o_all__scrutinee_reconstruction.bend.snap
similarity index 95%
rename from tests/snapshots/compile_file_o_all__scrutinee_reconstruction.hvm.snap
rename to tests/snapshots/compile_file_o_all__scrutinee_reconstruction.bend.snap
index e4b067d5..270f7481 100644
--- a/tests/snapshots/compile_file_o_all__scrutinee_reconstruction.hvm.snap
+++ b/tests/snapshots/compile_file_o_all__scrutinee_reconstruction.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file_o_all/scrutinee_reconstruction.hvm
+input_file: tests/golden_tests/compile_file_o_all/scrutinee_reconstruction.bend
 ---
 @Option/None = (* (a a))
 
diff --git a/tests/snapshots/compile_file_o_all__self_ref.hvm.snap b/tests/snapshots/compile_file_o_all__self_ref.bend.snap
similarity index 95%
rename from tests/snapshots/compile_file_o_all__self_ref.hvm.snap
rename to tests/snapshots/compile_file_o_all__self_ref.bend.snap
index c92d8426..d6681794 100644
--- a/tests/snapshots/compile_file_o_all__self_ref.hvm.snap
+++ b/tests/snapshots/compile_file_o_all__self_ref.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file_o_all/self_ref.hvm
+input_file: tests/golden_tests/compile_file_o_all/self_ref.bend
 ---
 Warnings:
 The following functions contain recursive cycles incompatible with HVM's strict evaluation:
diff --git a/tests/snapshots/compile_file_o_all__snd.hvm.snap b/tests/snapshots/compile_file_o_all__snd.bend.snap
similarity index 59%
rename from tests/snapshots/compile_file_o_all__snd.hvm.snap
rename to tests/snapshots/compile_file_o_all__snd.bend.snap
index 4b110c53..db3eea7a 100644
--- a/tests/snapshots/compile_file_o_all__snd.hvm.snap
+++ b/tests/snapshots/compile_file_o_all__snd.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file_o_all/snd.hvm
+input_file: tests/golden_tests/compile_file_o_all/snd.bend
 ---
 @main = a
   & @snd ~ ((0 42) a)
diff --git a/tests/snapshots/compile_file_o_all__spacing.hvm.snap b/tests/snapshots/compile_file_o_all__spacing.bend.snap
similarity index 55%
rename from tests/snapshots/compile_file_o_all__spacing.hvm.snap
rename to tests/snapshots/compile_file_o_all__spacing.bend.snap
index d67230f5..4c8230e6 100644
--- a/tests/snapshots/compile_file_o_all__spacing.hvm.snap
+++ b/tests/snapshots/compile_file_o_all__spacing.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file_o_all/spacing.hvm
+input_file: tests/golden_tests/compile_file_o_all/spacing.bend
 ---
 @main = ({b c} d)
   & (a a) ~ (b (c d))
diff --git a/tests/snapshots/compile_file_o_all__spacing2.hvm.snap b/tests/snapshots/compile_file_o_all__spacing2.bend.snap
similarity index 52%
rename from tests/snapshots/compile_file_o_all__spacing2.hvm.snap
rename to tests/snapshots/compile_file_o_all__spacing2.bend.snap
index df2698cd..6f5255dc 100644
--- a/tests/snapshots/compile_file_o_all__spacing2.hvm.snap
+++ b/tests/snapshots/compile_file_o_all__spacing2.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file_o_all/spacing2.hvm
+input_file: tests/golden_tests/compile_file_o_all/spacing2.bend
 ---
 @main = c
   & (a a) ~ ((b b) c)
diff --git a/tests/snapshots/compile_file_o_all__str.hvm.snap b/tests/snapshots/compile_file_o_all__str.bend.snap
similarity index 83%
rename from tests/snapshots/compile_file_o_all__str.hvm.snap
rename to tests/snapshots/compile_file_o_all__str.bend.snap
index 6a08c5ef..b59d4bed 100644
--- a/tests/snapshots/compile_file_o_all__str.hvm.snap
+++ b/tests/snapshots/compile_file_o_all__str.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file_o_all/str.hvm
+input_file: tests/golden_tests/compile_file_o_all/str.bend
 ---
 @String/cons = (a (b ((a (b c)) (* c))))
 
diff --git a/tests/snapshots/compile_file_o_all__sum_predicates.hvm.snap b/tests/snapshots/compile_file_o_all__sum_predicates.bend.snap
similarity index 98%
rename from tests/snapshots/compile_file_o_all__sum_predicates.hvm.snap
rename to tests/snapshots/compile_file_o_all__sum_predicates.bend.snap
index 9257885e..1781cfc0 100644
--- a/tests/snapshots/compile_file_o_all__sum_predicates.hvm.snap
+++ b/tests/snapshots/compile_file_o_all__sum_predicates.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file_o_all/sum_predicates.hvm
+input_file: tests/golden_tests/compile_file_o_all/sum_predicates.bend
 ---
 @main = a
   & @sum_pred ~ (8 (5 a))
diff --git a/tests/snapshots/compile_file_o_all__tagged_dup.hvm.snap b/tests/snapshots/compile_file_o_all__tagged_dup.bend.snap
similarity index 54%
rename from tests/snapshots/compile_file_o_all__tagged_dup.hvm.snap
rename to tests/snapshots/compile_file_o_all__tagged_dup.bend.snap
index f38798e1..6423b4d1 100644
--- a/tests/snapshots/compile_file_o_all__tagged_dup.hvm.snap
+++ b/tests/snapshots/compile_file_o_all__tagged_dup.bend.snap
@@ -1,8 +1,8 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file_o_all/tagged_dup.hvm
+input_file: tests/golden_tests/compile_file_o_all/tagged_dup.bend
 ---
 Errors:
-In tests/golden_tests/compile_file_o_all/tagged_dup.hvm :
+In tests/golden_tests/compile_file_o_all/tagged_dup.bend :
 Tagged terms not supported for hvm32.
   2 |   let #i {a b} = @x x;
diff --git a/tests/snapshots/compile_file_o_all__tagged_lam.hvm.snap b/tests/snapshots/compile_file_o_all__tagged_lam.bend.snap
similarity index 58%
rename from tests/snapshots/compile_file_o_all__tagged_lam.hvm.snap
rename to tests/snapshots/compile_file_o_all__tagged_lam.bend.snap
index 85b682a3..95bb52c0 100644
--- a/tests/snapshots/compile_file_o_all__tagged_lam.hvm.snap
+++ b/tests/snapshots/compile_file_o_all__tagged_lam.bend.snap
@@ -1,8 +1,8 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file_o_all/tagged_lam.hvm
+input_file: tests/golden_tests/compile_file_o_all/tagged_lam.bend
 ---
 Errors:
-In tests/golden_tests/compile_file_o_all/tagged_lam.hvm :
+In tests/golden_tests/compile_file_o_all/tagged_lam.bend :
 Tagged terms not supported for hvm32.
   1 | main = #foo ((#foo @x (+ x 1), #foo @x (* x x)) 2)
diff --git a/tests/snapshots/compile_file_o_all__tagged_sup.hvm.snap b/tests/snapshots/compile_file_o_all__tagged_sup.bend.snap
similarity index 54%
rename from tests/snapshots/compile_file_o_all__tagged_sup.hvm.snap
rename to tests/snapshots/compile_file_o_all__tagged_sup.bend.snap
index dcd32282..f9f9db45 100644
--- a/tests/snapshots/compile_file_o_all__tagged_sup.hvm.snap
+++ b/tests/snapshots/compile_file_o_all__tagged_sup.bend.snap
@@ -1,8 +1,8 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file_o_all/tagged_sup.hvm
+input_file: tests/golden_tests/compile_file_o_all/tagged_sup.bend
 ---
 Errors:
-In tests/golden_tests/compile_file_o_all/tagged_sup.hvm :
+In tests/golden_tests/compile_file_o_all/tagged_sup.bend :
 Tagged terms not supported for hvm32.
   1 | a = #i {λx x λx x}
diff --git a/tests/snapshots/compile_file_o_all__unapplied_eta.hvm.snap b/tests/snapshots/compile_file_o_all__unapplied_eta.bend.snap
similarity index 96%
rename from tests/snapshots/compile_file_o_all__unapplied_eta.hvm.snap
rename to tests/snapshots/compile_file_o_all__unapplied_eta.bend.snap
index 71ac2f5b..6aba900d 100644
--- a/tests/snapshots/compile_file_o_all__unapplied_eta.hvm.snap
+++ b/tests/snapshots/compile_file_o_all__unapplied_eta.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file_o_all/unapplied_eta.hvm
+input_file: tests/golden_tests/compile_file_o_all/unapplied_eta.bend
 ---
 @Id = (a a)
 
diff --git a/tests/snapshots/compile_file_o_all__unscoped_eta.bend.snap b/tests/snapshots/compile_file_o_all__unscoped_eta.bend.snap
new file mode 100644
index 00000000..8e09bfbf
--- /dev/null
+++ b/tests/snapshots/compile_file_o_all__unscoped_eta.bend.snap
@@ -0,0 +1,5 @@
+---
+source: tests/golden_tests.rs
+input_file: tests/golden_tests/compile_file_o_all/unscoped_eta.bend
+---
+@main = (a a)
diff --git a/tests/snapshots/compile_file_o_all__unscoped_eta.hvm.snap b/tests/snapshots/compile_file_o_all__unscoped_eta.hvm.snap
deleted file mode 100644
index 8423ad88..00000000
--- a/tests/snapshots/compile_file_o_all__unscoped_eta.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file_o_all/unscoped_eta.hvm
----
-@main = (a a)
diff --git a/tests/snapshots/compile_file_o_all__var_shadows_ref.hvm.snap b/tests/snapshots/compile_file_o_all__var_shadows_ref.bend.snap
similarity index 95%
rename from tests/snapshots/compile_file_o_all__var_shadows_ref.hvm.snap
rename to tests/snapshots/compile_file_o_all__var_shadows_ref.bend.snap
index 900c0426..40f4ed11 100644
--- a/tests/snapshots/compile_file_o_all__var_shadows_ref.hvm.snap
+++ b/tests/snapshots/compile_file_o_all__var_shadows_ref.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file_o_all/var_shadows_ref.hvm
+input_file: tests/golden_tests/compile_file_o_all/var_shadows_ref.bend
 ---
 @a = (a a)
 
diff --git a/tests/snapshots/compile_file_o_all__weekday.hvm.snap b/tests/snapshots/compile_file_o_all__weekday.bend.snap
similarity index 67%
rename from tests/snapshots/compile_file_o_all__weekday.hvm.snap
rename to tests/snapshots/compile_file_o_all__weekday.bend.snap
index 29062cdb..b5d7d6de 100644
--- a/tests/snapshots/compile_file_o_all__weekday.hvm.snap
+++ b/tests/snapshots/compile_file_o_all__weekday.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file_o_all/weekday.hvm
+input_file: tests/golden_tests/compile_file_o_all/weekday.bend
 ---
 @Weekday/Saturday = (* (* (* (* (* (a (* a)))))))
 
diff --git a/tests/snapshots/compile_file_o_no_all__bitonic_sort.hvm.snap b/tests/snapshots/compile_file_o_no_all__bitonic_sort.bend.snap
similarity index 99%
rename from tests/snapshots/compile_file_o_no_all__bitonic_sort.hvm.snap
rename to tests/snapshots/compile_file_o_no_all__bitonic_sort.bend.snap
index 8efc341d..4d79ca46 100644
--- a/tests/snapshots/compile_file_o_no_all__bitonic_sort.hvm.snap
+++ b/tests/snapshots/compile_file_o_no_all__bitonic_sort.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file_o_no_all/bitonic_sort.hvm
+input_file: tests/golden_tests/compile_file_o_no_all/bitonic_sort.bend
 ---
 Errors:
 The following functions contain recursive cycles incompatible with HVM's strict evaluation:
diff --git a/tests/snapshots/compile_file_o_no_all__list_reverse.hvm.snap b/tests/snapshots/compile_file_o_no_all__list_reverse.bend.snap
similarity index 99%
rename from tests/snapshots/compile_file_o_no_all__list_reverse.hvm.snap
rename to tests/snapshots/compile_file_o_no_all__list_reverse.bend.snap
index 7a357d9c..b0b60155 100644
--- a/tests/snapshots/compile_file_o_no_all__list_reverse.hvm.snap
+++ b/tests/snapshots/compile_file_o_no_all__list_reverse.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file_o_no_all/list_reverse.hvm
+input_file: tests/golden_tests/compile_file_o_no_all/list_reverse.bend
 ---
 Errors:
 The following functions contain recursive cycles incompatible with HVM's strict evaluation:
diff --git a/tests/snapshots/compile_file_o_no_all__redex_order.hvm.snap b/tests/snapshots/compile_file_o_no_all__redex_order.bend.snap
similarity index 98%
rename from tests/snapshots/compile_file_o_no_all__redex_order.hvm.snap
rename to tests/snapshots/compile_file_o_no_all__redex_order.bend.snap
index 383c9e3f..9757cd9d 100644
--- a/tests/snapshots/compile_file_o_no_all__redex_order.hvm.snap
+++ b/tests/snapshots/compile_file_o_no_all__redex_order.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file_o_no_all/redex_order.hvm
+input_file: tests/golden_tests/compile_file_o_no_all/redex_order.bend
 ---
 @a = (a a)
 
diff --git a/tests/snapshots/compile_file_o_no_all__sum_tree.hvm.snap b/tests/snapshots/compile_file_o_no_all__sum_tree.bend.snap
similarity index 95%
rename from tests/snapshots/compile_file_o_no_all__sum_tree.hvm.snap
rename to tests/snapshots/compile_file_o_no_all__sum_tree.bend.snap
index 6052c4ba..1dbb667a 100644
--- a/tests/snapshots/compile_file_o_no_all__sum_tree.hvm.snap
+++ b/tests/snapshots/compile_file_o_no_all__sum_tree.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/compile_file_o_no_all/sum_tree.hvm
+input_file: tests/golden_tests/compile_file_o_no_all/sum_tree.bend
 ---
 Errors:
 The following functions contain recursive cycles incompatible with HVM's strict evaluation:
diff --git a/tests/snapshots/desugar_file__bind_syntax.hvm.snap b/tests/snapshots/desugar_file__bind_syntax.bend.snap
similarity index 94%
rename from tests/snapshots/desugar_file__bind_syntax.hvm.snap
rename to tests/snapshots/desugar_file__bind_syntax.bend.snap
index dd8f7f72..26782b93 100644
--- a/tests/snapshots/desugar_file__bind_syntax.hvm.snap
+++ b/tests/snapshots/desugar_file__bind_syntax.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/desugar_file/bind_syntax.hvm
+input_file: tests/golden_tests/desugar_file/bind_syntax.bend
 ---
 (Result/bind) = λa λb (a Result/bind__C1 Result/bind__C0 b)
 
diff --git a/tests/snapshots/desugar_file__combinators.hvm.snap b/tests/snapshots/desugar_file__combinators.bend.snap
similarity index 90%
rename from tests/snapshots/desugar_file__combinators.hvm.snap
rename to tests/snapshots/desugar_file__combinators.bend.snap
index c04d7601..027271e3 100644
--- a/tests/snapshots/desugar_file__combinators.hvm.snap
+++ b/tests/snapshots/desugar_file__combinators.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/desugar_file/combinators.hvm
+input_file: tests/golden_tests/desugar_file/combinators.bend
 ---
 (foo) = λa λ* λ* (foo a)
 
diff --git a/tests/snapshots/desugar_file__deref_loop.hvm.snap b/tests/snapshots/desugar_file__deref_loop.bend.snap
similarity index 75%
rename from tests/snapshots/desugar_file__deref_loop.hvm.snap
rename to tests/snapshots/desugar_file__deref_loop.bend.snap
index 9dec4767..61838c19 100644
--- a/tests/snapshots/desugar_file__deref_loop.hvm.snap
+++ b/tests/snapshots/desugar_file__deref_loop.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/desugar_file/deref_loop.hvm
+input_file: tests/golden_tests/desugar_file/deref_loop.bend
 ---
 (foo) = λa (a λb b foo__C0)
 
diff --git a/tests/snapshots/desugar_file__dup_linearization.hvm.snap b/tests/snapshots/desugar_file__dup_linearization.bend.snap
similarity index 55%
rename from tests/snapshots/desugar_file__dup_linearization.hvm.snap
rename to tests/snapshots/desugar_file__dup_linearization.bend.snap
index 425dbc32..7aaacbb2 100644
--- a/tests/snapshots/desugar_file__dup_linearization.hvm.snap
+++ b/tests/snapshots/desugar_file__dup_linearization.bend.snap
@@ -1,5 +1,5 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/desugar_file/dup_linearization.hvm
+input_file: tests/golden_tests/desugar_file/dup_linearization.bend
 ---
 (main) = let {a b c d e} = *; (a, e, d, c, b)
diff --git a/tests/snapshots/desugar_file__non_exaustive_limit.hvm.snap b/tests/snapshots/desugar_file__non_exaustive_limit.bend.snap
similarity index 98%
rename from tests/snapshots/desugar_file__non_exaustive_limit.hvm.snap
rename to tests/snapshots/desugar_file__non_exaustive_limit.bend.snap
index 593f422d..f19cb796 100644
--- a/tests/snapshots/desugar_file__non_exaustive_limit.hvm.snap
+++ b/tests/snapshots/desugar_file__non_exaustive_limit.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/desugar_file/non_exaustive_limit.hvm
+input_file: tests/golden_tests/desugar_file/non_exaustive_limit.bend
 ---
 Errors:
 In definition 'Bar':
diff --git a/tests/snapshots/desugar_file__switch_with_use.hvm.snap b/tests/snapshots/desugar_file__switch_with_use.bend.snap
similarity index 68%
rename from tests/snapshots/desugar_file__switch_with_use.hvm.snap
rename to tests/snapshots/desugar_file__switch_with_use.bend.snap
index e41afffe..dd87e36d 100644
--- a/tests/snapshots/desugar_file__switch_with_use.hvm.snap
+++ b/tests/snapshots/desugar_file__switch_with_use.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/desugar_file/switch_with_use.hvm
+input_file: tests/golden_tests/desugar_file/switch_with_use.bend
 ---
 (main) = λa λb λc λ* λ* (switch c { 0: λd d; _: main__C0; } (a b))
 
diff --git a/tests/snapshots/desugar_file__use_id.hvm.snap b/tests/snapshots/desugar_file__use_id.bend.snap
similarity index 62%
rename from tests/snapshots/desugar_file__use_id.hvm.snap
rename to tests/snapshots/desugar_file__use_id.bend.snap
index 1e69edf7..903fd397 100644
--- a/tests/snapshots/desugar_file__use_id.hvm.snap
+++ b/tests/snapshots/desugar_file__use_id.bend.snap
@@ -1,5 +1,5 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/desugar_file/use_id.hvm
+input_file: tests/golden_tests/desugar_file/use_id.bend
 ---
 (Main) = (λa a 2 3 (λb b 2 3) (λc c 2 3 (λd d 2 3)))
diff --git a/tests/snapshots/desugar_file__use_shadow.hvm.snap b/tests/snapshots/desugar_file__use_shadow.bend.snap
similarity index 56%
rename from tests/snapshots/desugar_file__use_shadow.hvm.snap
rename to tests/snapshots/desugar_file__use_shadow.bend.snap
index b41d5a14..c69f8530 100644
--- a/tests/snapshots/desugar_file__use_shadow.hvm.snap
+++ b/tests/snapshots/desugar_file__use_shadow.bend.snap
@@ -1,5 +1,5 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/desugar_file/use_shadow.hvm
+input_file: tests/golden_tests/desugar_file/use_shadow.bend
 ---
 (main) = λa let {b c} = a; λd (b c d)
diff --git a/tests/snapshots/desugar_file__used_once_names.hvm.snap b/tests/snapshots/desugar_file__used_once_names.bend.snap
similarity index 63%
rename from tests/snapshots/desugar_file__used_once_names.hvm.snap
rename to tests/snapshots/desugar_file__used_once_names.bend.snap
index 4d37b8f4..813ec54a 100644
--- a/tests/snapshots/desugar_file__used_once_names.hvm.snap
+++ b/tests/snapshots/desugar_file__used_once_names.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/desugar_file/used_once_names.hvm
+input_file: tests/golden_tests/desugar_file/used_once_names.bend
 ---
 (foo) = λa λb λc let {d e} = c; (a b (d e))
 
diff --git a/tests/snapshots/encode_pattern_match__adt_tup_era.hvm.snap b/tests/snapshots/encode_pattern_match__adt_tup_era.bend.snap
similarity index 97%
rename from tests/snapshots/encode_pattern_match__adt_tup_era.hvm.snap
rename to tests/snapshots/encode_pattern_match__adt_tup_era.bend.snap
index b3fa9b70..bd885c59 100644
--- a/tests/snapshots/encode_pattern_match__adt_tup_era.hvm.snap
+++ b/tests/snapshots/encode_pattern_match__adt_tup_era.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/encode_pattern_match/adt_tup_era.hvm
+input_file: tests/golden_tests/encode_pattern_match/adt_tup_era.bend
 ---
 (Foo) = λa (a λb λc (b λd λ* λ* d c))
 
diff --git a/tests/snapshots/encode_pattern_match__and3.hvm.snap b/tests/snapshots/encode_pattern_match__and3.bend.snap
similarity index 78%
rename from tests/snapshots/encode_pattern_match__and3.hvm.snap
rename to tests/snapshots/encode_pattern_match__and3.bend.snap
index 693db172..dd423385 100644
--- a/tests/snapshots/encode_pattern_match__and3.hvm.snap
+++ b/tests/snapshots/encode_pattern_match__and3.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/encode_pattern_match/and3.hvm
+input_file: tests/golden_tests/encode_pattern_match/and3.bend
 ---
 (And) = λa let (b, c, d) = a; (b λe λf (e λg (g Bool/T Bool/F) λ* Bool/F f) λ* λ* Bool/F c d)
 
diff --git a/tests/snapshots/encode_pattern_match__bool.hvm.snap b/tests/snapshots/encode_pattern_match__bool.bend.snap
similarity index 85%
rename from tests/snapshots/encode_pattern_match__bool.hvm.snap
rename to tests/snapshots/encode_pattern_match__bool.bend.snap
index 80049ac2..a55287bc 100644
--- a/tests/snapshots/encode_pattern_match__bool.hvm.snap
+++ b/tests/snapshots/encode_pattern_match__bool.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/encode_pattern_match/bool.hvm
+input_file: tests/golden_tests/encode_pattern_match/bool.bend
 ---
 (not) = λa (a bool/false bool/true)
 
diff --git a/tests/snapshots/encode_pattern_match__bool_tup.hvm.snap b/tests/snapshots/encode_pattern_match__bool_tup.bend.snap
similarity index 71%
rename from tests/snapshots/encode_pattern_match__bool_tup.hvm.snap
rename to tests/snapshots/encode_pattern_match__bool_tup.bend.snap
index 0baf21e2..37f790a5 100644
--- a/tests/snapshots/encode_pattern_match__bool_tup.hvm.snap
+++ b/tests/snapshots/encode_pattern_match__bool_tup.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/encode_pattern_match/bool_tup.hvm
+input_file: tests/golden_tests/encode_pattern_match/bool_tup.bend
 ---
 (foo) = λa let (b, c) = a; (b λd d λ* Bool/F c)
 
diff --git a/tests/snapshots/encode_pattern_match__box.hvm.snap b/tests/snapshots/encode_pattern_match__box.bend.snap
similarity index 59%
rename from tests/snapshots/encode_pattern_match__box.hvm.snap
rename to tests/snapshots/encode_pattern_match__box.bend.snap
index af80b060..565b9d88 100644
--- a/tests/snapshots/encode_pattern_match__box.hvm.snap
+++ b/tests/snapshots/encode_pattern_match__box.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/encode_pattern_match/box.hvm
+input_file: tests/golden_tests/encode_pattern_match/box.bend
 ---
 (unbox) = λa (a λb b)
 
diff --git a/tests/snapshots/encode_pattern_match__common.hvm.snap b/tests/snapshots/encode_pattern_match__common.bend.snap
similarity index 90%
rename from tests/snapshots/encode_pattern_match__common.hvm.snap
rename to tests/snapshots/encode_pattern_match__common.bend.snap
index 88ac84fc..7b7fee15 100644
--- a/tests/snapshots/encode_pattern_match__common.hvm.snap
+++ b/tests/snapshots/encode_pattern_match__common.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/encode_pattern_match/common.hvm
+input_file: tests/golden_tests/encode_pattern_match/common.bend
 ---
 (Box/Filled) = λa λb λ* (b a)
 
diff --git a/tests/snapshots/encode_pattern_match__concat.hvm.snap b/tests/snapshots/encode_pattern_match__concat.bend.snap
similarity index 82%
rename from tests/snapshots/encode_pattern_match__concat.hvm.snap
rename to tests/snapshots/encode_pattern_match__concat.bend.snap
index 24ed7cdd..01c4b2cf 100644
--- a/tests/snapshots/encode_pattern_match__concat.hvm.snap
+++ b/tests/snapshots/encode_pattern_match__concat.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/encode_pattern_match/concat.hvm
+input_file: tests/golden_tests/encode_pattern_match/concat.bend
 ---
 (String/concat) = λa (a λb λc λd (String/cons b (String/concat c d)) λe e)
 
diff --git a/tests/snapshots/encode_pattern_match__concat_def.hvm.snap b/tests/snapshots/encode_pattern_match__concat_def.bend.snap
similarity index 80%
rename from tests/snapshots/encode_pattern_match__concat_def.hvm.snap
rename to tests/snapshots/encode_pattern_match__concat_def.bend.snap
index 9fc16452..a30415e6 100644
--- a/tests/snapshots/encode_pattern_match__concat_def.hvm.snap
+++ b/tests/snapshots/encode_pattern_match__concat_def.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/encode_pattern_match/concat_def.hvm
+input_file: tests/golden_tests/encode_pattern_match/concat_def.bend
 ---
 (concat) = λa (a λb λc λd (String/cons b (concat c d)) λe e)
 
diff --git a/tests/snapshots/encode_pattern_match__def_tups.hvm.snap b/tests/snapshots/encode_pattern_match__def_tups.bend.snap
similarity index 72%
rename from tests/snapshots/encode_pattern_match__def_tups.hvm.snap
rename to tests/snapshots/encode_pattern_match__def_tups.bend.snap
index 748f3cb2..57d3a575 100644
--- a/tests/snapshots/encode_pattern_match__def_tups.hvm.snap
+++ b/tests/snapshots/encode_pattern_match__def_tups.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/encode_pattern_match/def_tups.hvm
+input_file: tests/golden_tests/encode_pattern_match/def_tups.bend
 ---
 (go) = λa let (b, c) = a; let (d, e) = c; let (f, g) = e; let (h, i) = g; (+ (+ (+ (+ i h) f) d) b)
 
diff --git a/tests/snapshots/encode_pattern_match__definition_merge.hvm.snap b/tests/snapshots/encode_pattern_match__definition_merge.bend.snap
similarity index 96%
rename from tests/snapshots/encode_pattern_match__definition_merge.hvm.snap
rename to tests/snapshots/encode_pattern_match__definition_merge.bend.snap
index 56247f86..a4f3b3ea 100644
--- a/tests/snapshots/encode_pattern_match__definition_merge.hvm.snap
+++ b/tests/snapshots/encode_pattern_match__definition_merge.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/encode_pattern_match/definition_merge.hvm
+input_file: tests/golden_tests/encode_pattern_match/definition_merge.bend
 ---
 (Foo) = λa (a λ* λc (c λ* 1 λ* 2) λ* λg (g λ* 3 λ* 3))
 
diff --git a/tests/snapshots/encode_pattern_match__expr.hvm.snap b/tests/snapshots/encode_pattern_match__expr.bend.snap
similarity index 92%
rename from tests/snapshots/encode_pattern_match__expr.hvm.snap
rename to tests/snapshots/encode_pattern_match__expr.bend.snap
index 3475f072..2273178a 100644
--- a/tests/snapshots/encode_pattern_match__expr.hvm.snap
+++ b/tests/snapshots/encode_pattern_match__expr.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/encode_pattern_match/expr.hvm
+input_file: tests/golden_tests/encode_pattern_match/expr.bend
 ---
 (Expr/Var) = λa λb λ* λ* λ* λ* λ* λ* λ* λ* (b a)
 
diff --git a/tests/snapshots/encode_pattern_match__flatten_era_pat.hvm.snap b/tests/snapshots/encode_pattern_match__flatten_era_pat.bend.snap
similarity index 97%
rename from tests/snapshots/encode_pattern_match__flatten_era_pat.hvm.snap
rename to tests/snapshots/encode_pattern_match__flatten_era_pat.bend.snap
index 10c319ed..538b7e6c 100644
--- a/tests/snapshots/encode_pattern_match__flatten_era_pat.hvm.snap
+++ b/tests/snapshots/encode_pattern_match__flatten_era_pat.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/encode_pattern_match/flatten_era_pat.hvm
+input_file: tests/golden_tests/encode_pattern_match/flatten_era_pat.bend
 ---
 (Fn1) = λa λ* let (*, d) = a; let (e, *) = d; e
 
diff --git a/tests/snapshots/encode_pattern_match__is_some_some.hvm.snap b/tests/snapshots/encode_pattern_match__is_some_some.bend.snap
similarity index 97%
rename from tests/snapshots/encode_pattern_match__is_some_some.hvm.snap
rename to tests/snapshots/encode_pattern_match__is_some_some.bend.snap
index 845ba6c7..9a5e492f 100644
--- a/tests/snapshots/encode_pattern_match__is_some_some.hvm.snap
+++ b/tests/snapshots/encode_pattern_match__is_some_some.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/encode_pattern_match/is_some_some.hvm
+input_file: tests/golden_tests/encode_pattern_match/is_some_some.bend
 ---
 (some_some) = λa (a λb (b λ* 1 0) 0)
 
diff --git a/tests/snapshots/encode_pattern_match__list_merge_sort.hvm.snap b/tests/snapshots/encode_pattern_match__list_merge_sort.bend.snap
similarity index 99%
rename from tests/snapshots/encode_pattern_match__list_merge_sort.hvm.snap
rename to tests/snapshots/encode_pattern_match__list_merge_sort.bend.snap
index 5b88cebb..86802526 100644
--- a/tests/snapshots/encode_pattern_match__list_merge_sort.hvm.snap
+++ b/tests/snapshots/encode_pattern_match__list_merge_sort.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/encode_pattern_match/list_merge_sort.hvm
+input_file: tests/golden_tests/encode_pattern_match/list_merge_sort.bend
 ---
 (If) = λa (a λb λ* b λ* λe e)
 
diff --git a/tests/snapshots/encode_pattern_match__list_str_encoding_undeclared_fn.hvm.snap b/tests/snapshots/encode_pattern_match__list_str_encoding_undeclared_fn.bend.snap
similarity index 87%
rename from tests/snapshots/encode_pattern_match__list_str_encoding_undeclared_fn.hvm.snap
rename to tests/snapshots/encode_pattern_match__list_str_encoding_undeclared_fn.bend.snap
index 7ae3488d..def1030a 100644
--- a/tests/snapshots/encode_pattern_match__list_str_encoding_undeclared_fn.hvm.snap
+++ b/tests/snapshots/encode_pattern_match__list_str_encoding_undeclared_fn.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/encode_pattern_match/list_str_encoding_undeclared_fn.hvm
+input_file: tests/golden_tests/encode_pattern_match/list_str_encoding_undeclared_fn.bend
 ---
 (main) = *
 
diff --git a/tests/snapshots/encode_pattern_match__list_str_encoding_undeclared_map.hvm.snap b/tests/snapshots/encode_pattern_match__list_str_encoding_undeclared_map.bend.snap
similarity index 85%
rename from tests/snapshots/encode_pattern_match__list_str_encoding_undeclared_map.hvm.snap
rename to tests/snapshots/encode_pattern_match__list_str_encoding_undeclared_map.bend.snap
index 91b7e310..fc923222 100644
--- a/tests/snapshots/encode_pattern_match__list_str_encoding_undeclared_map.hvm.snap
+++ b/tests/snapshots/encode_pattern_match__list_str_encoding_undeclared_map.bend.snap
@@ -1,5 +1,5 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/encode_pattern_match/list_str_encoding_undeclared_map.hvm
+input_file: tests/golden_tests/encode_pattern_match/list_str_encoding_undeclared_map.bend
 ---
 (main) = λa λb ((a λ* λ* 1 2), (b λ* λ* 1 2))
diff --git a/tests/snapshots/encode_pattern_match__match_adt_unscoped_in_arm.hvm.snap b/tests/snapshots/encode_pattern_match__match_adt_unscoped_in_arm.bend.snap
similarity index 89%
rename from tests/snapshots/encode_pattern_match__match_adt_unscoped_in_arm.hvm.snap
rename to tests/snapshots/encode_pattern_match__match_adt_unscoped_in_arm.bend.snap
index 324a84bd..6709c1e7 100644
--- a/tests/snapshots/encode_pattern_match__match_adt_unscoped_in_arm.hvm.snap
+++ b/tests/snapshots/encode_pattern_match__match_adt_unscoped_in_arm.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/encode_pattern_match/match_adt_unscoped_in_arm.hvm
+input_file: tests/golden_tests/encode_pattern_match/match_adt_unscoped_in_arm.bend
 ---
 (main) = λ* λ$x $x
 
diff --git a/tests/snapshots/encode_pattern_match__match_adt_unscoped_lambda.hvm.snap b/tests/snapshots/encode_pattern_match__match_adt_unscoped_lambda.bend.snap
similarity index 91%
rename from tests/snapshots/encode_pattern_match__match_adt_unscoped_lambda.hvm.snap
rename to tests/snapshots/encode_pattern_match__match_adt_unscoped_lambda.bend.snap
index 5c6fa4f0..644378f1 100644
--- a/tests/snapshots/encode_pattern_match__match_adt_unscoped_lambda.hvm.snap
+++ b/tests/snapshots/encode_pattern_match__match_adt_unscoped_lambda.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/encode_pattern_match/match_adt_unscoped_lambda.hvm
+input_file: tests/golden_tests/encode_pattern_match/match_adt_unscoped_lambda.bend
 ---
 (main) = (Maybe/Some 1 λ$x * λa a $x)
 
diff --git a/tests/snapshots/encode_pattern_match__match_adt_unscoped_var.hvm.snap b/tests/snapshots/encode_pattern_match__match_adt_unscoped_var.bend.snap
similarity index 94%
rename from tests/snapshots/encode_pattern_match__match_adt_unscoped_var.hvm.snap
rename to tests/snapshots/encode_pattern_match__match_adt_unscoped_var.bend.snap
index c3596587..7cc7cead 100644
--- a/tests/snapshots/encode_pattern_match__match_adt_unscoped_var.hvm.snap
+++ b/tests/snapshots/encode_pattern_match__match_adt_unscoped_var.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/encode_pattern_match/match_adt_unscoped_var.hvm
+input_file: tests/golden_tests/encode_pattern_match/match_adt_unscoped_var.bend
 ---
 (Foo) = λ$x (Maybe/Some 1 $x λa a)
 
diff --git a/tests/snapshots/encode_pattern_match__match_auto_linearization.hvm.snap b/tests/snapshots/encode_pattern_match__match_auto_linearization.bend.snap
similarity index 98%
rename from tests/snapshots/encode_pattern_match__match_auto_linearization.hvm.snap
rename to tests/snapshots/encode_pattern_match__match_auto_linearization.bend.snap
index 649cc38b..b8874836 100644
--- a/tests/snapshots/encode_pattern_match__match_auto_linearization.hvm.snap
+++ b/tests/snapshots/encode_pattern_match__match_auto_linearization.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/encode_pattern_match/match_auto_linearization.hvm
+input_file: tests/golden_tests/encode_pattern_match/match_auto_linearization.bend
 ---
 (switch_linearization) = λa let {a a_2 a_3 a_4} = a; λb let {b b_2 b_3 b_4 b_5} = b; let (c, d) = (a, b); let {d d_2} = d; let {c c_2} = c; switch a_2 { 0: let {e e_2} = 2; let {f g} = e; (b_2 e_2 f g (a_3, b_3) c d); _: λh let {i i_2} = 2; let {j k} = i; (h b_4 i_2 j k (a_4, b_5) c_2 d_2); }
 
diff --git a/tests/snapshots/encode_pattern_match__match_bind.hvm.snap b/tests/snapshots/encode_pattern_match__match_bind.bend.snap
similarity index 66%
rename from tests/snapshots/encode_pattern_match__match_bind.hvm.snap
rename to tests/snapshots/encode_pattern_match__match_bind.bend.snap
index bc3483f6..0d1271c2 100644
--- a/tests/snapshots/encode_pattern_match__match_bind.hvm.snap
+++ b/tests/snapshots/encode_pattern_match__match_bind.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/encode_pattern_match/match_bind.hvm
+input_file: tests/golden_tests/encode_pattern_match/match_bind.bend
 ---
 (cheese) = switch (+ 2 3) { 0: 653323; _: λa let {a a_2} = a; (+ (+ a 1) a_2); }
 
diff --git a/tests/snapshots/encode_pattern_match__match_num_adt_tup_parser.hvm.snap b/tests/snapshots/encode_pattern_match__match_num_adt_tup_parser.bend.snap
similarity index 97%
rename from tests/snapshots/encode_pattern_match__match_num_adt_tup_parser.hvm.snap
rename to tests/snapshots/encode_pattern_match__match_num_adt_tup_parser.bend.snap
index 7be1d20a..1816bcc8 100644
--- a/tests/snapshots/encode_pattern_match__match_num_adt_tup_parser.hvm.snap
+++ b/tests/snapshots/encode_pattern_match__match_num_adt_tup_parser.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/encode_pattern_match/match_num_adt_tup_parser.hvm
+input_file: tests/golden_tests/encode_pattern_match/match_num_adt_tup_parser.bend
 ---
 (Parse) = λa λb (b λc λd λe (switch (- c 10) { 0: λf λg (Result_/Ok (0, g, f)); _: λh λi λj (switch (- h 29) { 0: λk λl (Result_/Ok (40, l, k)); _: λm λn λo (switch m { 0: λp λq (Result_/Ok (41, q, p)); _: λr λs λt (Result_/Err ((String/cons (+ r 42) t), s)); } n o); } i j); } e d) λu (Result_/Err (String/nil, u)) a)
 
diff --git a/tests/snapshots/encode_pattern_match__match_num_pred.hvm.snap b/tests/snapshots/encode_pattern_match__match_num_pred.bend.snap
similarity index 98%
rename from tests/snapshots/encode_pattern_match__match_num_pred.hvm.snap
rename to tests/snapshots/encode_pattern_match__match_num_pred.bend.snap
index 29f532c2..3b77b0f9 100644
--- a/tests/snapshots/encode_pattern_match__match_num_pred.hvm.snap
+++ b/tests/snapshots/encode_pattern_match__match_num_pred.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/encode_pattern_match/match_num_pred.hvm
+input_file: tests/golden_tests/encode_pattern_match/match_num_pred.bend
 ---
 (pred) = λa switch a { 0: 0; _: λb b; }
 
diff --git a/tests/snapshots/encode_pattern_match__match_syntax.hvm.snap b/tests/snapshots/encode_pattern_match__match_syntax.bend.snap
similarity index 97%
rename from tests/snapshots/encode_pattern_match__match_syntax.hvm.snap
rename to tests/snapshots/encode_pattern_match__match_syntax.bend.snap
index 9284e165..ad34828e 100644
--- a/tests/snapshots/encode_pattern_match__match_syntax.hvm.snap
+++ b/tests/snapshots/encode_pattern_match__match_syntax.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/encode_pattern_match/match_syntax.hvm
+input_file: tests/golden_tests/encode_pattern_match/match_syntax.bend
 ---
 (head) = λa (a λb λ* b List_/Nil)
 
diff --git a/tests/snapshots/encode_pattern_match__merge_recursive.hvm.snap b/tests/snapshots/encode_pattern_match__merge_recursive.bend.snap
similarity index 95%
rename from tests/snapshots/encode_pattern_match__merge_recursive.hvm.snap
rename to tests/snapshots/encode_pattern_match__merge_recursive.bend.snap
index 02b03a7d..69499fad 100644
--- a/tests/snapshots/encode_pattern_match__merge_recursive.hvm.snap
+++ b/tests/snapshots/encode_pattern_match__merge_recursive.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/encode_pattern_match/merge_recursive.hvm
+input_file: tests/golden_tests/encode_pattern_match/merge_recursive.bend
 ---
 (foo_1) = λa (a foo_2)
 
diff --git a/tests/snapshots/encode_pattern_match__no_patterns.hvm.snap b/tests/snapshots/encode_pattern_match__no_patterns.bend.snap
similarity index 96%
rename from tests/snapshots/encode_pattern_match__no_patterns.hvm.snap
rename to tests/snapshots/encode_pattern_match__no_patterns.bend.snap
index 40d18cdb..9afcaa8e 100644
--- a/tests/snapshots/encode_pattern_match__no_patterns.hvm.snap
+++ b/tests/snapshots/encode_pattern_match__no_patterns.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/encode_pattern_match/no_patterns.hvm
+input_file: tests/golden_tests/encode_pattern_match/no_patterns.bend
 ---
 (Id) = λa a
 
diff --git a/tests/snapshots/encode_pattern_match__non_matching_fst_arg.hvm.snap b/tests/snapshots/encode_pattern_match__non_matching_fst_arg.bend.snap
similarity index 93%
rename from tests/snapshots/encode_pattern_match__non_matching_fst_arg.hvm.snap
rename to tests/snapshots/encode_pattern_match__non_matching_fst_arg.bend.snap
index c55300a6..f5447971 100644
--- a/tests/snapshots/encode_pattern_match__non_matching_fst_arg.hvm.snap
+++ b/tests/snapshots/encode_pattern_match__non_matching_fst_arg.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/encode_pattern_match/non_matching_fst_arg.hvm
+input_file: tests/golden_tests/encode_pattern_match/non_matching_fst_arg.bend
 ---
 (Foo) = λa λb (b λc let {c c_2} = c; (Foo c c_2) λd d a)
 
diff --git a/tests/snapshots/encode_pattern_match__ntup_sum.hvm.snap b/tests/snapshots/encode_pattern_match__ntup_sum.bend.snap
similarity index 68%
rename from tests/snapshots/encode_pattern_match__ntup_sum.hvm.snap
rename to tests/snapshots/encode_pattern_match__ntup_sum.bend.snap
index 039d352c..674ae09c 100644
--- a/tests/snapshots/encode_pattern_match__ntup_sum.hvm.snap
+++ b/tests/snapshots/encode_pattern_match__ntup_sum.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/encode_pattern_match/ntup_sum.hvm
+input_file: tests/golden_tests/encode_pattern_match/ntup_sum.bend
 ---
 (ntupSum) = λa let (b, c, d, e, f) = a; (+ b (+ c (+ d (+ e f))))
 
diff --git a/tests/snapshots/encode_pattern_match__pattern_match_encoding.hvm.snap b/tests/snapshots/encode_pattern_match__pattern_match_encoding.bend.snap
similarity index 96%
rename from tests/snapshots/encode_pattern_match__pattern_match_encoding.hvm.snap
rename to tests/snapshots/encode_pattern_match__pattern_match_encoding.bend.snap
index b2b3544c..6bdc04b9 100644
--- a/tests/snapshots/encode_pattern_match__pattern_match_encoding.hvm.snap
+++ b/tests/snapshots/encode_pattern_match__pattern_match_encoding.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/encode_pattern_match/pattern_match_encoding.hvm
+input_file: tests/golden_tests/encode_pattern_match/pattern_match_encoding.bend
 ---
 (Foo) = λa (a λ* 100 λ* 200 λ* 200 λ* λ* 200 λ* λ* 200)
 
diff --git a/tests/snapshots/encode_pattern_match__switch_in_switch_arg.hvm.snap b/tests/snapshots/encode_pattern_match__switch_in_switch_arg.bend.snap
similarity index 92%
rename from tests/snapshots/encode_pattern_match__switch_in_switch_arg.hvm.snap
rename to tests/snapshots/encode_pattern_match__switch_in_switch_arg.bend.snap
index 675e74a0..4f7d41c1 100644
--- a/tests/snapshots/encode_pattern_match__switch_in_switch_arg.hvm.snap
+++ b/tests/snapshots/encode_pattern_match__switch_in_switch_arg.bend.snap
@@ -1,5 +1,5 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/encode_pattern_match/switch_in_switch_arg.hvm
+input_file: tests/golden_tests/encode_pattern_match/switch_in_switch_arg.bend
 ---
 (main) = λa switch switch a { 0: 0; _: λb b; } { 0: 0; _: λc (+ c 1); }
diff --git a/tests/snapshots/encode_pattern_match__var_only.hvm.snap b/tests/snapshots/encode_pattern_match__var_only.bend.snap
similarity index 66%
rename from tests/snapshots/encode_pattern_match__var_only.hvm.snap
rename to tests/snapshots/encode_pattern_match__var_only.bend.snap
index d3904d32..a539bc73 100644
--- a/tests/snapshots/encode_pattern_match__var_only.hvm.snap
+++ b/tests/snapshots/encode_pattern_match__var_only.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/encode_pattern_match/var_only.hvm
+input_file: tests/golden_tests/encode_pattern_match/var_only.bend
 ---
 (Foo) = λa λ* λc (c a)
 
diff --git a/tests/snapshots/encode_pattern_match__weekday.hvm.snap b/tests/snapshots/encode_pattern_match__weekday.bend.snap
similarity index 86%
rename from tests/snapshots/encode_pattern_match__weekday.hvm.snap
rename to tests/snapshots/encode_pattern_match__weekday.bend.snap
index 8fdc4972..0e4680a6 100644
--- a/tests/snapshots/encode_pattern_match__weekday.hvm.snap
+++ b/tests/snapshots/encode_pattern_match__weekday.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/encode_pattern_match/weekday.hvm
+input_file: tests/golden_tests/encode_pattern_match/weekday.bend
 ---
 (main) = (λa a Weekday/Saturday)
 
diff --git a/tests/snapshots/examples__all_tree.hvm.snap b/tests/snapshots/examples__all_tree.bend.snap
similarity index 57%
rename from tests/snapshots/examples__all_tree.hvm.snap
rename to tests/snapshots/examples__all_tree.bend.snap
index 62cdb602..d9e08de9 100644
--- a/tests/snapshots/examples__all_tree.hvm.snap
+++ b/tests/snapshots/examples__all_tree.bend.snap
@@ -1,5 +1,5 @@
 ---
 source: tests/golden_tests.rs
-input_file: examples/all_tree.hvm
+input_file: examples/all_tree.bend
 ---
 Bool/true
diff --git a/tests/snapshots/examples__alloc_small_tree.bend.snap b/tests/snapshots/examples__alloc_small_tree.bend.snap
new file mode 100644
index 00000000..7312015a
--- /dev/null
+++ b/tests/snapshots/examples__alloc_small_tree.bend.snap
@@ -0,0 +1,5 @@
+---
+source: tests/golden_tests.rs
+input_file: examples/alloc_small_tree.bend
+---
+T
diff --git a/tests/snapshots/examples__alloc_small_tree.hvm.snap b/tests/snapshots/examples__alloc_small_tree.hvm.snap
deleted file mode 100644
index 95f5d4d9..00000000
--- a/tests/snapshots/examples__alloc_small_tree.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: examples/alloc_small_tree.hvm
----
-T
diff --git a/tests/snapshots/examples__bitonic_sort.hvm.snap b/tests/snapshots/examples__bitonic_sort.bend.snap
similarity index 53%
rename from tests/snapshots/examples__bitonic_sort.hvm.snap
rename to tests/snapshots/examples__bitonic_sort.bend.snap
index c2ba4148..95766bcb 100644
--- a/tests/snapshots/examples__bitonic_sort.hvm.snap
+++ b/tests/snapshots/examples__bitonic_sort.bend.snap
@@ -1,5 +1,5 @@
 ---
 source: tests/golden_tests.rs
-input_file: examples/bitonic_sort.hvm
+input_file: examples/bitonic_sort.bend
 ---
 523776
diff --git a/tests/snapshots/examples__bubble_sort.hvm.snap b/tests/snapshots/examples__bubble_sort.bend.snap
similarity index 54%
rename from tests/snapshots/examples__bubble_sort.hvm.snap
rename to tests/snapshots/examples__bubble_sort.bend.snap
index 25addb44..9053509b 100644
--- a/tests/snapshots/examples__bubble_sort.hvm.snap
+++ b/tests/snapshots/examples__bubble_sort.bend.snap
@@ -1,5 +1,5 @@
 ---
 source: tests/golden_tests.rs
-input_file: examples/bubble_sort.hvm
+input_file: examples/bubble_sort.bend
 ---
 5525035
diff --git a/tests/snapshots/examples__callcc.hvm.snap b/tests/snapshots/examples__callcc.bend.snap
similarity index 55%
rename from tests/snapshots/examples__callcc.hvm.snap
rename to tests/snapshots/examples__callcc.bend.snap
index ddccfe65..2f867626 100644
--- a/tests/snapshots/examples__callcc.hvm.snap
+++ b/tests/snapshots/examples__callcc.bend.snap
@@ -1,5 +1,5 @@
 ---
 source: tests/golden_tests.rs
-input_file: examples/callcc.hvm
+input_file: examples/callcc.bend
 ---
 52
diff --git a/tests/snapshots/examples__example.hvm.snap b/tests/snapshots/examples__example.bend.snap
similarity index 54%
rename from tests/snapshots/examples__example.hvm.snap
rename to tests/snapshots/examples__example.bend.snap
index de75fbc5..d83093f0 100644
--- a/tests/snapshots/examples__example.hvm.snap
+++ b/tests/snapshots/examples__example.bend.snap
@@ -1,5 +1,5 @@
 ---
 source: tests/golden_tests.rs
-input_file: examples/example.hvm
+input_file: examples/example.bend
 ---
 8
diff --git a/tests/snapshots/examples__fib.hvm.snap b/tests/snapshots/examples__fib.bend.snap
similarity index 60%
rename from tests/snapshots/examples__fib.hvm.snap
rename to tests/snapshots/examples__fib.bend.snap
index f22eb999..80a63fec 100644
--- a/tests/snapshots/examples__fib.hvm.snap
+++ b/tests/snapshots/examples__fib.bend.snap
@@ -1,5 +1,5 @@
 ---
 source: tests/golden_tests.rs
-input_file: examples/fib.hvm
+input_file: examples/fib.bend
 ---
 1346269
diff --git a/tests/snapshots/examples__fusing_add.hvm.snap b/tests/snapshots/examples__fusing_add.bend.snap
similarity index 64%
rename from tests/snapshots/examples__fusing_add.hvm.snap
rename to tests/snapshots/examples__fusing_add.bend.snap
index 10ce2e14..2df67c8b 100644
--- a/tests/snapshots/examples__fusing_add.hvm.snap
+++ b/tests/snapshots/examples__fusing_add.bend.snap
@@ -1,5 +1,5 @@
 ---
 source: tests/golden_tests.rs
-input_file: examples/fusing_add.hvm
+input_file: examples/fusing_add.bend
 ---
 λa λb λ* (b λc λ* (c a))
diff --git a/tests/snapshots/examples__fusing_not.hvm.snap b/tests/snapshots/examples__fusing_not.bend.snap
similarity index 61%
rename from tests/snapshots/examples__fusing_not.hvm.snap
rename to tests/snapshots/examples__fusing_not.bend.snap
index 1f0bcdcf..4a6af525 100644
--- a/tests/snapshots/examples__fusing_not.hvm.snap
+++ b/tests/snapshots/examples__fusing_not.bend.snap
@@ -1,5 +1,5 @@
 ---
 source: tests/golden_tests.rs
-input_file: examples/fusing_not.hvm
+input_file: examples/fusing_not.bend
 ---
 λa λb λc (a c b)
diff --git a/tests/snapshots/examples__gen_tree.hvm.snap b/tests/snapshots/examples__gen_tree.bend.snap
similarity index 99%
rename from tests/snapshots/examples__gen_tree.hvm.snap
rename to tests/snapshots/examples__gen_tree.bend.snap
index a5a5cac8..a6f75f03 100644
--- a/tests/snapshots/examples__gen_tree.hvm.snap
+++ b/tests/snapshots/examples__gen_tree.bend.snap
@@ -1,5 +1,5 @@
 ---
 source: tests/golden_tests.rs
-input_file: examples/gen_tree.hvm
+input_file: examples/gen_tree.bend
 ---
 λa λ* (a 2 λb λ* (b 5 λc λ* (c 11 λd λ* (d 23 λe λ* (e 47 λf λ* (f 95 λg λ* (g 191 λh λ* (h 383 Tree.leaf Tree.leaf) λi λ* (i 384 Tree.leaf Tree.leaf)) λj λ* (j 192 λk λ* (k 385 Tree.leaf Tree.leaf) λl λ* (l 386 Tree.leaf Tree.leaf))) λm λ* (m 96 λn λ* (n 193 λo λ* (o 387 Tree.leaf Tree.leaf) λp λ* (p 388 Tree.leaf Tree.leaf)) λq λ* (q 194 λr λ* (r 389 Tree.leaf Tree.leaf) λs λ* (s 390 Tree.leaf Tree.leaf)))) λt λ* (t 48 λu λ* (u 97 λv λ* (v 195 λw λ* (w 391 Tree.leaf Tree.leaf) λx λ* (x 392 Tree.leaf Tree.leaf)) λy λ* (y 196 λz λ* (z 393 Tree.leaf Tree.leaf) λab λ* (ab 394 Tree.leaf Tree.leaf))) λbb λ* (bb 98 λcb λ* (cb 197 λdb λ* (db 395 Tree.leaf Tree.leaf) λeb λ* (eb 396 Tree.leaf Tree.leaf)) λfb λ* (fb 198 λgb λ* (gb 397 Tree.leaf Tree.leaf) λhb λ* (hb 398 Tree.leaf Tree.leaf))))) λib λ* (ib 24 λjb λ* (jb 49 λkb λ* (kb 99 λlb λ* (lb 199 λmb λ* (mb 399 Tree.leaf Tree.leaf) λnb λ* (nb 400 Tree.leaf Tree.leaf)) λob λ* (ob 200 λpb λ* (pb 401 Tree.leaf Tree.leaf) λqb λ* (qb 402 Tree.leaf Tree.leaf))) λrb λ* (rb 100 λsb λ* (sb 201 λtb λ* (tb 403 Tree.leaf Tree.leaf) λub λ* (ub 404 Tree.leaf Tree.leaf)) λvb λ* (vb 202 λwb λ* (wb 405 Tree.leaf Tree.leaf) λxb λ* (xb 406 Tree.leaf Tree.leaf)))) λyb λ* (yb 50 λzb λ* (zb 101 λac λ* (ac 203 λbc λ* (bc 407 Tree.leaf Tree.leaf) λcc λ* (cc 408 Tree.leaf Tree.leaf)) λdc λ* (dc 204 λec λ* (ec 409 Tree.leaf Tree.leaf) λfc λ* (fc 410 Tree.leaf Tree.leaf))) λgc λ* (gc 102 λhc λ* (hc 205 λic λ* (ic 411 Tree.leaf Tree.leaf) λjc λ* (jc 412 Tree.leaf Tree.leaf)) λkc λ* (kc 206 λlc λ* (lc 413 Tree.leaf Tree.leaf) λmc λ* (mc 414 Tree.leaf Tree.leaf)))))) λnc λ* (nc 12 λoc λ* (oc 25 λpc λ* (pc 51 λqc λ* (qc 103 λrc λ* (rc 207 λsc λ* (sc 415 Tree.leaf Tree.leaf) λtc λ* (tc 416 Tree.leaf Tree.leaf)) λuc λ* (uc 208 λvc λ* (vc 417 Tree.leaf Tree.leaf) λwc λ* (wc 418 Tree.leaf Tree.leaf))) λxc λ* (xc 104 λyc λ* (yc 209 λzc λ* (zc 419 Tree.leaf Tree.leaf) λad λ* (ad 420 Tree.leaf Tree.leaf)) λbd λ* (bd 210 λcd λ* (cd 421 Tree.leaf Tree.leaf) λdd λ* (dd 422 Tree.leaf Tree.leaf)))) λed λ* (ed 52 λfd λ* (fd 105 λgd λ* (gd 211 λhd λ* (hd 423 Tree.leaf Tree.leaf) λid λ* (id 424 Tree.leaf Tree.leaf)) λjd λ* (jd 212 λkd λ* (kd 425 Tree.leaf Tree.leaf) λld λ* (ld 426 Tree.leaf Tree.leaf))) λmd λ* (md 106 λnd λ* (nd 213 λod λ* (od 427 Tree.leaf Tree.leaf) λpd λ* (pd 428 Tree.leaf Tree.leaf)) λqd λ* (qd 214 λrd λ* (rd 429 Tree.leaf Tree.leaf) λsd λ* (sd 430 Tree.leaf Tree.leaf))))) λtd λ* (td 26 λud λ* (ud 53 λvd λ* (vd 107 λwd λ* (wd 215 λxd λ* (xd 431 Tree.leaf Tree.leaf) λyd λ* (yd 432 Tree.leaf Tree.leaf)) λzd λ* (zd 216 λae λ* (ae 433 Tree.leaf Tree.leaf) λbe λ* (be 434 Tree.leaf Tree.leaf))) λce λ* (ce 108 λde λ* (de 217 λee λ* (ee 435 Tree.leaf Tree.leaf) λfe λ* (fe 436 Tree.leaf Tree.leaf)) λge λ* (ge 218 λhe λ* (he 437 Tree.leaf Tree.leaf) λie λ* (ie 438 Tree.leaf Tree.leaf)))) λje λ* (je 54 λke λ* (ke 109 λle λ* (le 219 λme λ* (me 439 Tree.leaf Tree.leaf) λne λ* (ne 440 Tree.leaf Tree.leaf)) λoe λ* (oe 220 λpe λ* (pe 441 Tree.leaf Tree.leaf) λqe λ* (qe 442 Tree.leaf Tree.leaf))) λre λ* (re 110 λse λ* (se 221 λte λ* (te 443 Tree.leaf Tree.leaf) λue λ* (ue 444 Tree.leaf Tree.leaf)) λve λ* (ve 222 λwe λ* (we 445 Tree.leaf Tree.leaf) λxe λ* (xe 446 Tree.leaf Tree.leaf))))))) λye λ* (ye 6 λze λ* (ze 13 λaf λ* (af 27 λbf λ* (bf 55 λcf λ* (cf 111 λdf λ* (df 223 λef λ* (ef 447 Tree.leaf Tree.leaf) λff λ* (ff 448 Tree.leaf Tree.leaf)) λgf λ* (gf 224 λhf λ* (hf 449 Tree.leaf Tree.leaf) λif λ* (if 450 Tree.leaf Tree.leaf))) λjf λ* (jf 112 λkf λ* (kf 225 λlf λ* (lf 451 Tree.leaf Tree.leaf) λmf λ* (mf 452 Tree.leaf Tree.leaf)) λnf λ* (nf 226 λof λ* (of 453 Tree.leaf Tree.leaf) λpf λ* (pf 454 Tree.leaf Tree.leaf)))) λqf λ* (qf 56 λrf λ* (rf 113 λsf λ* (sf 227 λtf λ* (tf 455 Tree.leaf Tree.leaf) λuf λ* (uf 456 Tree.leaf Tree.leaf)) λvf λ* (vf 228 λwf λ* (wf 457 Tree.leaf Tree.leaf) λxf λ* (xf 458 Tree.leaf Tree.leaf))) λyf λ* (yf 114 λzf λ* (zf 229 λag λ* (ag 459 Tree.leaf Tree.leaf) λbg λ* (bg 460 Tree.leaf Tree.leaf)) λcg λ* (cg 230 λdg λ* (dg 461 Tree.leaf Tree.leaf) λeg λ* (eg 462 Tree.leaf Tree.leaf))))) λfg λ* (fg 28 λgg λ* (gg 57 λhg λ* (hg 115 λig λ* (ig 231 λjg λ* (jg 463 Tree.leaf Tree.leaf) λkg λ* (kg 464 Tree.leaf Tree.leaf)) λlg λ* (lg 232 λmg λ* (mg 465 Tree.leaf Tree.leaf) λng λ* (ng 466 Tree.leaf Tree.leaf))) λog λ* (og 116 λpg λ* (pg 233 λqg λ* (qg 467 Tree.leaf Tree.leaf) λrg λ* (rg 468 Tree.leaf Tree.leaf)) λsg λ* (sg 234 λtg λ* (tg 469 Tree.leaf Tree.leaf) λug λ* (ug 470 Tree.leaf Tree.leaf)))) λvg λ* (vg 58 λwg λ* (wg 117 λxg λ* (xg 235 λyg λ* (yg 471 Tree.leaf Tree.leaf) λzg λ* (zg 472 Tree.leaf Tree.leaf)) λah λ* (ah 236 λbh λ* (bh 473 Tree.leaf Tree.leaf) λch λ* (ch 474 Tree.leaf Tree.leaf))) λdh λ* (dh 118 λeh λ* (eh 237 λfh λ* (fh 475 Tree.leaf Tree.leaf) λgh λ* (gh 476 Tree.leaf Tree.leaf)) λhh λ* (hh 238 λih λ* (ih 477 Tree.leaf Tree.leaf) λjh λ* (jh 478 Tree.leaf Tree.leaf)))))) λkh λ* (kh 14 λlh λ* (lh 29 λmh λ* (mh 59 λnh λ* (nh 119 λoh λ* (oh 239 λph λ* (ph 479 Tree.leaf Tree.leaf) λqh λ* (qh 480 Tree.leaf Tree.leaf)) λrh λ* (rh 240 λsh λ* (sh 481 Tree.leaf Tree.leaf) λth λ* (th 482 Tree.leaf Tree.leaf))) λuh λ* (uh 120 λvh λ* (vh 241 λwh λ* (wh 483 Tree.leaf Tree.leaf) λxh λ* (xh 484 Tree.leaf Tree.leaf)) λyh λ* (yh 242 λzh λ* (zh 485 Tree.leaf Tree.leaf) λai λ* (ai 486 Tree.leaf Tree.leaf)))) λbi λ* (bi 60 λci λ* (ci 121 λdi λ* (di 243 λei λ* (ei 487 Tree.leaf Tree.leaf) λfi λ* (fi 488 Tree.leaf Tree.leaf)) λgi λ* (gi 244 λhi λ* (hi 489 Tree.leaf Tree.leaf) λii λ* (ii 490 Tree.leaf Tree.leaf))) λji λ* (ji 122 λki λ* (ki 245 λli λ* (li 491 Tree.leaf Tree.leaf) λmi λ* (mi 492 Tree.leaf Tree.leaf)) λni λ* (ni 246 λoi λ* (oi 493 Tree.leaf Tree.leaf) λpi λ* (pi 494 Tree.leaf Tree.leaf))))) λqi λ* (qi 30 λri λ* (ri 61 λsi λ* (si 123 λti λ* (ti 247 λui λ* (ui 495 Tree.leaf Tree.leaf) λvi λ* (vi 496 Tree.leaf Tree.leaf)) λwi λ* (wi 248 λxi λ* (xi 497 Tree.leaf Tree.leaf) λyi λ* (yi 498 Tree.leaf Tree.leaf))) λzi λ* (zi 124 λaj λ* (aj 249 λbj λ* (bj 499 Tree.leaf Tree.leaf) λcj λ* (cj 500 Tree.leaf Tree.leaf)) λdj λ* (dj 250 λej λ* (ej 501 Tree.leaf Tree.leaf) λfj λ* (fj 502 Tree.leaf Tree.leaf)))) λgj λ* (gj 62 λhj λ* (hj 125 λij λ* (ij 251 λjj λ* (jj 503 Tree.leaf Tree.leaf) λkj λ* (kj 504 Tree.leaf Tree.leaf)) λlj λ* (lj 252 λmj λ* (mj 505 Tree.leaf Tree.leaf) λnj λ* (nj 506 Tree.leaf Tree.leaf))) λoj λ* (oj 126 λpj λ* (pj 253 λqj λ* (qj 507 Tree.leaf Tree.leaf) λrj λ* (rj 508 Tree.leaf Tree.leaf)) λsj λ* (sj 254 λtj λ* (tj 509 Tree.leaf Tree.leaf) λuj λ* (uj 510 Tree.leaf Tree.leaf))))))))
diff --git a/tests/snapshots/examples__hello_world.hvm.snap b/tests/snapshots/examples__hello_world.hvm.snap
deleted file mode 100644
index 0c9ca9b3..00000000
--- a/tests/snapshots/examples__hello_world.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: examples/hello_world.hvm
----
-*
diff --git a/tests/snapshots/examples__neg_fusion.hvm.snap b/tests/snapshots/examples__neg_fusion.bend.snap
similarity index 56%
rename from tests/snapshots/examples__neg_fusion.hvm.snap
rename to tests/snapshots/examples__neg_fusion.bend.snap
index 8d8c3d27..8e8a0f10 100644
--- a/tests/snapshots/examples__neg_fusion.hvm.snap
+++ b/tests/snapshots/examples__neg_fusion.bend.snap
@@ -1,5 +1,5 @@
 ---
 source: tests/golden_tests.rs
-input_file: examples/neg_fusion.hvm
+input_file: examples/neg_fusion.bend
 ---
 λa λ* a
diff --git a/tests/snapshots/examples__queue.bend.snap b/tests/snapshots/examples__queue.bend.snap
new file mode 100644
index 00000000..d1748956
--- /dev/null
+++ b/tests/snapshots/examples__queue.bend.snap
@@ -0,0 +1,5 @@
+---
+source: tests/golden_tests.rs
+input_file: examples/queue.bend
+---
+λa λ* (a 1 λb λ* (b 2 λc λ* (c 3 List/nil)))
diff --git a/tests/snapshots/examples__queue.hvm.snap b/tests/snapshots/examples__queue.hvm.snap
deleted file mode 100644
index 6f0c0537..00000000
--- a/tests/snapshots/examples__queue.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: examples/queue.hvm
----
-λa λ* (a 1 λb λ* (b 2 λc λ* (c 3 List.nil)))
diff --git a/tests/snapshots/examples__quick_sort.hvm.snap b/tests/snapshots/examples__quick_sort.bend.snap
similarity index 55%
rename from tests/snapshots/examples__quick_sort.hvm.snap
rename to tests/snapshots/examples__quick_sort.bend.snap
index bf79282a..987ae70c 100644
--- a/tests/snapshots/examples__quick_sort.hvm.snap
+++ b/tests/snapshots/examples__quick_sort.bend.snap
@@ -1,5 +1,5 @@
 ---
 source: tests/golden_tests.rs
-input_file: examples/quick_sort.hvm
+input_file: examples/quick_sort.bend
 ---
 12741879
diff --git a/tests/snapshots/examples__radix_sort.hvm.snap b/tests/snapshots/examples__radix_sort.bend.snap
similarity index 53%
rename from tests/snapshots/examples__radix_sort.hvm.snap
rename to tests/snapshots/examples__radix_sort.bend.snap
index a4915939..a6e7ba07 100644
--- a/tests/snapshots/examples__radix_sort.hvm.snap
+++ b/tests/snapshots/examples__radix_sort.bend.snap
@@ -1,5 +1,5 @@
 ---
 source: tests/golden_tests.rs
-input_file: examples/radix_sort.hvm
+input_file: examples/radix_sort.bend
 ---
 120
diff --git a/tests/snapshots/examples__sat_solver.hvm.snap b/tests/snapshots/examples__sat_solver.hvm.snap
deleted file mode 100644
index 0e2cdbd2..00000000
--- a/tests/snapshots/examples__sat_solver.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: examples/sat_solver.hvm
----
-λa λb (a λc (c 1 0 0 1 1 1 1 0 0 1 0 0 1 1 0 1) (a λd (d 1 0 0 1 1 1 1 0 0 0 0 0 1 1 0 1) (a λe (e 1 0 0 1 1 1 1 0 0 0 0 0 0 1 0 1) (a λf (f 1 0 0 1 1 0 1 0 0 1 0 0 1 1 0 1) (a λg (g 1 0 0 1 1 0 1 0 0 0 0 0 1 1 0 1) (a λh (h 1 0 0 1 0 0 1 0 0 0 0 0 1 1 0 1) (a λi (i 1 0 0 1 0 0 1 0 0 0 0 0 1 0 0 1) (a λj (j 0 1 0 1 0 0 1 1 1 0 1 0 1 1 0 1) (a λk (k 0 0 0 0 1 1 1 0 1 1 1 1 1 1 1 0) b)))))))))
diff --git a/tests/snapshots/hangs__recursive_with_unscoped.hvm.snap b/tests/snapshots/hangs__recursive_with_unscoped.hvm.snap
deleted file mode 100644
index f246ca6e..00000000
--- a/tests/snapshots/hangs__recursive_with_unscoped.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/hangs/recursive_with_unscoped.hvm
----
-Hangs
diff --git a/tests/snapshots/io__load.hvm.snap b/tests/snapshots/io__load.hvm.snap
deleted file mode 100644
index 5db3c9ff..00000000
--- a/tests/snapshots/io__load.hvm.snap
+++ /dev/null
@@ -1,8 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/io/load.hvm
----
-Lazy mode:
-"Contents\n"
-Strict mode:
-"Contents\n"
diff --git a/tests/snapshots/io__load_fail.hvm.snap b/tests/snapshots/io__load_fail.hvm.snap
deleted file mode 100644
index f8bedf75..00000000
--- a/tests/snapshots/io__load_fail.hvm.snap
+++ /dev/null
@@ -1,8 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/io/load_fail.hvm
----
-Lazy mode:
-"Filesystem error: No such file or directory (os error 2)"
-Strict mode:
-"Filesystem error: No such file or directory (os error 2)"
diff --git a/tests/snapshots/io__store.hvm.snap b/tests/snapshots/io__store.hvm.snap
deleted file mode 100644
index 69efd240..00000000
--- a/tests/snapshots/io__store.hvm.snap
+++ /dev/null
@@ -1,8 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/io/store.hvm
----
-Lazy mode:
-*
-Strict mode:
-*
diff --git a/tests/snapshots/io__store_fail.hvm.snap b/tests/snapshots/io__store_fail.hvm.snap
deleted file mode 100644
index 5d228899..00000000
--- a/tests/snapshots/io__store_fail.hvm.snap
+++ /dev/null
@@ -1,8 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/io/store_fail.hvm
----
-Lazy mode:
-"Filesystem error: No such file or directory (os error 2)"
-Strict mode:
-"Filesystem error: No such file or directory (os error 2)"
diff --git a/tests/snapshots/linear_readback__church_mul.hvm.snap b/tests/snapshots/linear_readback__church_mul.bend.snap
similarity index 64%
rename from tests/snapshots/linear_readback__church_mul.hvm.snap
rename to tests/snapshots/linear_readback__church_mul.bend.snap
index d5872226..78554598 100644
--- a/tests/snapshots/linear_readback__church_mul.hvm.snap
+++ b/tests/snapshots/linear_readback__church_mul.bend.snap
@@ -1,5 +1,5 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/linear_readback/church_mul.hvm
+input_file: tests/golden_tests/linear_readback/church_mul.bend
 ---
 λa λb let {c $g} = (let {d $h} = a; d let {e f} = $h; (e (f {$g b}))); c
diff --git a/tests/snapshots/mutual_recursion__a_b_c.hvm.snap b/tests/snapshots/mutual_recursion__a_b_c.bend.snap
similarity index 95%
rename from tests/snapshots/mutual_recursion__a_b_c.hvm.snap
rename to tests/snapshots/mutual_recursion__a_b_c.bend.snap
index 1ebcfe98..5f746552 100644
--- a/tests/snapshots/mutual_recursion__a_b_c.hvm.snap
+++ b/tests/snapshots/mutual_recursion__a_b_c.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/mutual_recursion/a_b_c.hvm
+input_file: tests/golden_tests/mutual_recursion/a_b_c.bend
 ---
 Errors:
 The following functions contain recursive cycles incompatible with HVM's strict evaluation:
diff --git a/tests/snapshots/mutual_recursion__len.hvm.snap b/tests/snapshots/mutual_recursion__len.bend.snap
similarity index 87%
rename from tests/snapshots/mutual_recursion__len.hvm.snap
rename to tests/snapshots/mutual_recursion__len.bend.snap
index 15c1bd4b..55b209de 100644
--- a/tests/snapshots/mutual_recursion__len.hvm.snap
+++ b/tests/snapshots/mutual_recursion__len.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/mutual_recursion/len.hvm
+input_file: tests/golden_tests/mutual_recursion/len.bend
 ---
 @Len = ((@Len__C0 (0 a)) a)
 
diff --git a/tests/snapshots/mutual_recursion__merged.hvm.snap b/tests/snapshots/mutual_recursion__merged.bend.snap
similarity index 96%
rename from tests/snapshots/mutual_recursion__merged.hvm.snap
rename to tests/snapshots/mutual_recursion__merged.bend.snap
index 76f3657e..ffc6f8f9 100644
--- a/tests/snapshots/mutual_recursion__merged.hvm.snap
+++ b/tests/snapshots/mutual_recursion__merged.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/mutual_recursion/merged.hvm
+input_file: tests/golden_tests/mutual_recursion/merged.bend
 ---
 Errors:
 The following functions contain recursive cycles incompatible with HVM's strict evaluation:
diff --git a/tests/snapshots/mutual_recursion__multiple.hvm.snap b/tests/snapshots/mutual_recursion__multiple.bend.snap
similarity index 95%
rename from tests/snapshots/mutual_recursion__multiple.hvm.snap
rename to tests/snapshots/mutual_recursion__multiple.bend.snap
index 7cfc551f..e75d4c2a 100644
--- a/tests/snapshots/mutual_recursion__multiple.hvm.snap
+++ b/tests/snapshots/mutual_recursion__multiple.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/mutual_recursion/multiple.hvm
+input_file: tests/golden_tests/mutual_recursion/multiple.bend
 ---
 Errors:
 The following functions contain recursive cycles incompatible with HVM's strict evaluation:
diff --git a/tests/snapshots/mutual_recursion__odd_even.hvm.snap b/tests/snapshots/mutual_recursion__odd_even.bend.snap
similarity index 95%
rename from tests/snapshots/mutual_recursion__odd_even.hvm.snap
rename to tests/snapshots/mutual_recursion__odd_even.bend.snap
index bede559a..a11f4447 100644
--- a/tests/snapshots/mutual_recursion__odd_even.hvm.snap
+++ b/tests/snapshots/mutual_recursion__odd_even.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/mutual_recursion/odd_even.hvm
+input_file: tests/golden_tests/mutual_recursion/odd_even.bend
 ---
 Errors:
 The following functions contain recursive cycles incompatible with HVM's strict evaluation:
diff --git a/tests/snapshots/parse_file__imp_map.hvm.snap b/tests/snapshots/parse_file__imp_map.bend.snap
similarity index 95%
rename from tests/snapshots/parse_file__imp_map.hvm.snap
rename to tests/snapshots/parse_file__imp_map.bend.snap
index 8d114d6a..16895385 100644
--- a/tests/snapshots/parse_file__imp_map.hvm.snap
+++ b/tests/snapshots/parse_file__imp_map.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/parse_file/imp_map.hvm
+input_file: tests/golden_tests/parse_file/imp_map.bend
 ---
 (Map/empty) = Map/leaf
 
diff --git a/tests/snapshots/parse_file__imp_program.hvm.snap b/tests/snapshots/parse_file__imp_program.bend.snap
similarity index 94%
rename from tests/snapshots/parse_file__imp_program.hvm.snap
rename to tests/snapshots/parse_file__imp_program.bend.snap
index e1bcef27..786bdd12 100644
--- a/tests/snapshots/parse_file__imp_program.hvm.snap
+++ b/tests/snapshots/parse_file__imp_program.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/parse_file/imp_program.hvm
+input_file: tests/golden_tests/parse_file/imp_program.bend
 ---
 (symbols) = let x = (Map/set (Map/set Map/empty 49 5) 2 3); let x = (Map/set x 49 2); let x = (Map/set x 2 3); let (map/get%0, x) = (Map/get x 49); (+ map/get%0 8293490)
 
diff --git a/tests/snapshots/parse_file__repeated_adt_name.hvm.snap b/tests/snapshots/parse_file__repeated_adt_name.bend.snap
similarity index 58%
rename from tests/snapshots/parse_file__repeated_adt_name.hvm.snap
rename to tests/snapshots/parse_file__repeated_adt_name.bend.snap
index b6df245b..c879f3c8 100644
--- a/tests/snapshots/parse_file__repeated_adt_name.hvm.snap
+++ b/tests/snapshots/parse_file__repeated_adt_name.bend.snap
@@ -1,9 +1,9 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/parse_file/repeated_adt_name.hvm
+input_file: tests/golden_tests/parse_file/repeated_adt_name.bend
 ---
 Errors:
-In tests/golden_tests/parse_file/repeated_adt_name.hvm :
+In tests/golden_tests/parse_file/repeated_adt_name.bend :
 Repeated datatype 'Foo'
   2 | data Foo = B
   3 | 
diff --git a/tests/snapshots/parse_file__scape_chars.hvm.snap b/tests/snapshots/parse_file__scape_chars.bend.snap
similarity index 84%
rename from tests/snapshots/parse_file__scape_chars.hvm.snap
rename to tests/snapshots/parse_file__scape_chars.bend.snap
index aeab9b1b..af1ea45a 100644
--- a/tests/snapshots/parse_file__scape_chars.hvm.snap
+++ b/tests/snapshots/parse_file__scape_chars.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/parse_file/scape_chars.hvm
+input_file: tests/golden_tests/parse_file/scape_chars.bend
 ---
 (main) = (String/cons 92 (String/cons 32 (String/cons 10 (String/cons 32 (String/cons 9 (String/cons 32 (String/cons 34 String/nil)))))))
 
diff --git a/tests/snapshots/readback_lnet__addition.bend.snap b/tests/snapshots/readback_lnet__addition.bend.snap
new file mode 100644
index 00000000..5dbc0dfe
--- /dev/null
+++ b/tests/snapshots/readback_lnet__addition.bend.snap
@@ -0,0 +1,5 @@
+---
+source: tests/golden_tests.rs
+input_file: tests/golden_tests/readback_lnet/addition.bend
+---
+(+ 2 1)
diff --git a/tests/snapshots/readback_lnet__addition.hvm.snap b/tests/snapshots/readback_lnet__addition.hvm.snap
deleted file mode 100644
index d2f6c689..00000000
--- a/tests/snapshots/readback_lnet__addition.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/readback_lnet/addition.hvm
----
-(+ 2 1)
diff --git a/tests/snapshots/readback_lnet__bad_net.hvm.snap b/tests/snapshots/readback_lnet__bad_net.bend.snap
similarity index 66%
rename from tests/snapshots/readback_lnet__bad_net.hvm.snap
rename to tests/snapshots/readback_lnet__bad_net.bend.snap
index ee94ba14..5522f953 100644
--- a/tests/snapshots/readback_lnet__bad_net.hvm.snap
+++ b/tests/snapshots/readback_lnet__bad_net.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/readback_lnet/bad_net.hvm
+input_file: tests/golden_tests/readback_lnet/bad_net.bend
 ---
 Warnings:
 During readback:
diff --git a/tests/snapshots/readback_lnet__bad_net1.bend.snap b/tests/snapshots/readback_lnet__bad_net1.bend.snap
new file mode 100644
index 00000000..fc6c5014
--- /dev/null
+++ b/tests/snapshots/readback_lnet__bad_net1.bend.snap
@@ -0,0 +1,5 @@
+---
+source: tests/golden_tests.rs
+input_file: tests/golden_tests/readback_lnet/bad_net1.bend
+---
+λa λb a
diff --git a/tests/snapshots/readback_lnet__bad_net1.hvm.snap b/tests/snapshots/readback_lnet__bad_net1.hvm.snap
deleted file mode 100644
index 1ffd47f4..00000000
--- a/tests/snapshots/readback_lnet__bad_net1.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/readback_lnet/bad_net1.hvm
----
-λa λb a
diff --git a/tests/snapshots/readback_lnet__bad_net3.bend.snap b/tests/snapshots/readback_lnet__bad_net3.bend.snap
new file mode 100644
index 00000000..ddf1b851
--- /dev/null
+++ b/tests/snapshots/readback_lnet__bad_net3.bend.snap
@@ -0,0 +1,5 @@
+---
+source: tests/golden_tests.rs
+input_file: tests/golden_tests/readback_lnet/bad_net3.bend
+---
+λa λb a
diff --git a/tests/snapshots/readback_lnet__bad_net3.hvm.snap b/tests/snapshots/readback_lnet__bad_net3.hvm.snap
deleted file mode 100644
index 849401fd..00000000
--- a/tests/snapshots/readback_lnet__bad_net3.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/readback_lnet/bad_net3.hvm
----
-λa λb a
diff --git a/tests/snapshots/readback_lnet__complicated_dup.hvm.snap b/tests/snapshots/readback_lnet__complicated_dup.bend.snap
similarity index 54%
rename from tests/snapshots/readback_lnet__complicated_dup.hvm.snap
rename to tests/snapshots/readback_lnet__complicated_dup.bend.snap
index d878e9c7..43255495 100644
--- a/tests/snapshots/readback_lnet__complicated_dup.hvm.snap
+++ b/tests/snapshots/readback_lnet__complicated_dup.bend.snap
@@ -1,5 +1,5 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/readback_lnet/complicated_dup.hvm
+input_file: tests/golden_tests/readback_lnet/complicated_dup.bend
 ---
 λa (λ$b (a ($b $c)) λ$c (a ($b $c)))
diff --git a/tests/snapshots/readback_lnet__fst_snd.hvm.snap b/tests/snapshots/readback_lnet__fst_snd.bend.snap
similarity index 52%
rename from tests/snapshots/readback_lnet__fst_snd.hvm.snap
rename to tests/snapshots/readback_lnet__fst_snd.bend.snap
index b00fc6b3..46803960 100644
--- a/tests/snapshots/readback_lnet__fst_snd.hvm.snap
+++ b/tests/snapshots/readback_lnet__fst_snd.bend.snap
@@ -1,5 +1,5 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/readback_lnet/fst_snd.hvm
+input_file: tests/golden_tests/readback_lnet/fst_snd.bend
 ---
 (λa a (λb b {{1 3} 2}))
diff --git a/tests/snapshots/readback_lnet__id.bend.snap b/tests/snapshots/readback_lnet__id.bend.snap
new file mode 100644
index 00000000..dcc76dd2
--- /dev/null
+++ b/tests/snapshots/readback_lnet__id.bend.snap
@@ -0,0 +1,5 @@
+---
+source: tests/golden_tests.rs
+input_file: tests/golden_tests/readback_lnet/id.bend
+---
+λa a
diff --git a/tests/snapshots/readback_lnet__id.hvm.snap b/tests/snapshots/readback_lnet__id.hvm.snap
deleted file mode 100644
index 5366ef3f..00000000
--- a/tests/snapshots/readback_lnet__id.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/readback_lnet/id.hvm
----
-λa a
diff --git a/tests/snapshots/readback_lnet__invalid_op2_op2.hvm.snap b/tests/snapshots/readback_lnet__invalid_op2_op2.bend.snap
similarity index 69%
rename from tests/snapshots/readback_lnet__invalid_op2_op2.hvm.snap
rename to tests/snapshots/readback_lnet__invalid_op2_op2.bend.snap
index 5eb6f253..1d457d78 100644
--- a/tests/snapshots/readback_lnet__invalid_op2_op2.hvm.snap
+++ b/tests/snapshots/readback_lnet__invalid_op2_op2.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/readback_lnet/invalid_op2_op2.hvm
+input_file: tests/golden_tests/readback_lnet/invalid_op2_op2.bend
 ---
 Warnings:
 During readback:
diff --git a/tests/snapshots/readback_lnet__match.hvm.snap b/tests/snapshots/readback_lnet__match.bend.snap
similarity index 56%
rename from tests/snapshots/readback_lnet__match.hvm.snap
rename to tests/snapshots/readback_lnet__match.bend.snap
index ca5a1bc3..d2d868b0 100644
--- a/tests/snapshots/readback_lnet__match.hvm.snap
+++ b/tests/snapshots/readback_lnet__match.bend.snap
@@ -1,5 +1,5 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/readback_lnet/match.hvm
+input_file: tests/golden_tests/readback_lnet/match.bend
 ---
 switch a = 1 { 0: λb b; _: a-1; }
diff --git a/tests/snapshots/readback_lnet__nested_let.bend.snap b/tests/snapshots/readback_lnet__nested_let.bend.snap
new file mode 100644
index 00000000..f57dca0c
--- /dev/null
+++ b/tests/snapshots/readback_lnet__nested_let.bend.snap
@@ -0,0 +1,5 @@
+---
+source: tests/golden_tests.rs
+input_file: tests/golden_tests/readback_lnet/nested_let.bend
+---
+3
diff --git a/tests/snapshots/readback_lnet__nested_let.hvm.snap b/tests/snapshots/readback_lnet__nested_let.hvm.snap
deleted file mode 100644
index 05cc53d0..00000000
--- a/tests/snapshots/readback_lnet__nested_let.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/readback_lnet/nested_let.hvm
----
-3
diff --git a/tests/snapshots/readback_lnet__nested_tup.bend.snap b/tests/snapshots/readback_lnet__nested_tup.bend.snap
new file mode 100644
index 00000000..c70300a8
--- /dev/null
+++ b/tests/snapshots/readback_lnet__nested_tup.bend.snap
@@ -0,0 +1,5 @@
+---
+source: tests/golden_tests.rs
+input_file: tests/golden_tests/readback_lnet/nested_tup.bend
+---
+{{1 2} {4 {3 5}}}
diff --git a/tests/snapshots/readback_lnet__nested_tup.hvm.snap b/tests/snapshots/readback_lnet__nested_tup.hvm.snap
deleted file mode 100644
index b765cf7f..00000000
--- a/tests/snapshots/readback_lnet__nested_tup.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/readback_lnet/nested_tup.hvm
----
-{{1 2} {4 {3 5}}}
diff --git a/tests/snapshots/readback_lnet__number.bend.snap b/tests/snapshots/readback_lnet__number.bend.snap
new file mode 100644
index 00000000..77f1ab9b
--- /dev/null
+++ b/tests/snapshots/readback_lnet__number.bend.snap
@@ -0,0 +1,5 @@
+---
+source: tests/golden_tests.rs
+input_file: tests/golden_tests/readback_lnet/number.bend
+---
+10
diff --git a/tests/snapshots/readback_lnet__number.hvm.snap b/tests/snapshots/readback_lnet__number.hvm.snap
deleted file mode 100644
index ed03c2dd..00000000
--- a/tests/snapshots/readback_lnet__number.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/readback_lnet/number.hvm
----
-10
diff --git a/tests/snapshots/readback_lnet__simple_tup.bend.snap b/tests/snapshots/readback_lnet__simple_tup.bend.snap
new file mode 100644
index 00000000..b123d69b
--- /dev/null
+++ b/tests/snapshots/readback_lnet__simple_tup.bend.snap
@@ -0,0 +1,5 @@
+---
+source: tests/golden_tests.rs
+input_file: tests/golden_tests/readback_lnet/simple_tup.bend
+---
+{0 42}
diff --git a/tests/snapshots/readback_lnet__simple_tup.hvm.snap b/tests/snapshots/readback_lnet__simple_tup.hvm.snap
deleted file mode 100644
index 889b8860..00000000
--- a/tests/snapshots/readback_lnet__simple_tup.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/readback_lnet/simple_tup.hvm
----
-{0 42}
diff --git a/tests/snapshots/readback_lnet__tup_add.bend.snap b/tests/snapshots/readback_lnet__tup_add.bend.snap
new file mode 100644
index 00000000..a5721be6
--- /dev/null
+++ b/tests/snapshots/readback_lnet__tup_add.bend.snap
@@ -0,0 +1,5 @@
+---
+source: tests/golden_tests.rs
+input_file: tests/golden_tests/readback_lnet/tup_add.bend
+---
+(+ 1 2)
diff --git a/tests/snapshots/readback_lnet__tup_add.hvm.snap b/tests/snapshots/readback_lnet__tup_add.hvm.snap
deleted file mode 100644
index 9182e6e2..00000000
--- a/tests/snapshots/readback_lnet__tup_add.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/readback_lnet/tup_add.hvm
----
-(+ 1 2)
diff --git a/tests/snapshots/run_entrypoint__foo.hvm.snap b/tests/snapshots/run_entrypoint__foo.hvm.snap
deleted file mode 100644
index 16f21b83..00000000
--- a/tests/snapshots/run_entrypoint__foo.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_entrypoint/foo.hvm
----
-2
diff --git a/tests/snapshots/run_file__360_no_scope.hvm.snap b/tests/snapshots/run_file__360_no_scope.bend.snap
similarity index 63%
rename from tests/snapshots/run_file__360_no_scope.hvm.snap
rename to tests/snapshots/run_file__360_no_scope.bend.snap
index 5d8a7637..88bdf320 100644
--- a/tests/snapshots/run_file__360_no_scope.hvm.snap
+++ b/tests/snapshots/run_file__360_no_scope.bend.snap
@@ -1,8 +1,8 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/360_no_scope.hvm
+input_file: tests/golden_tests/run_file/360_no_scope.bend
 ---
 Errors:
-In tests/golden_tests/run_file/360_no_scope.hvm :
+In tests/golden_tests/run_file/360_no_scope.bend :
 Tagged terms not supported for hvm32.
    4 |   let #x{#y($e, $f) #y($g, $h)} = #y(#x{$d $f}, #x{$e, $g})
diff --git a/tests/snapshots/run_file__addition.bend.snap b/tests/snapshots/run_file__addition.bend.snap
new file mode 100644
index 00000000..6f03b623
--- /dev/null
+++ b/tests/snapshots/run_file__addition.bend.snap
@@ -0,0 +1,5 @@
+---
+source: tests/golden_tests.rs
+input_file: tests/golden_tests/run_file/addition.bend
+---
+10
diff --git a/tests/snapshots/run_file__addition.hvm.snap b/tests/snapshots/run_file__addition.hvm.snap
deleted file mode 100644
index a28545db..00000000
--- a/tests/snapshots/run_file__addition.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/addition.hvm
----
-10
diff --git a/tests/snapshots/run_file__adt_match.bend.snap b/tests/snapshots/run_file__adt_match.bend.snap
new file mode 100644
index 00000000..fb54abbb
--- /dev/null
+++ b/tests/snapshots/run_file__adt_match.bend.snap
@@ -0,0 +1,5 @@
+---
+source: tests/golden_tests.rs
+input_file: tests/golden_tests/run_file/adt_match.bend
+---
+λa λ* (a 2)
diff --git a/tests/snapshots/run_file__adt_match.hvm.snap b/tests/snapshots/run_file__adt_match.hvm.snap
deleted file mode 100644
index 47677b65..00000000
--- a/tests/snapshots/run_file__adt_match.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/adt_match.hvm
----
-λa λ* (a 2)
diff --git a/tests/snapshots/run_file__adt_match_wrong_tag.hvm.snap b/tests/snapshots/run_file__adt_match_wrong_tag.bend.snap
similarity index 58%
rename from tests/snapshots/run_file__adt_match_wrong_tag.hvm.snap
rename to tests/snapshots/run_file__adt_match_wrong_tag.bend.snap
index 92522a21..b4a01ef9 100644
--- a/tests/snapshots/run_file__adt_match_wrong_tag.hvm.snap
+++ b/tests/snapshots/run_file__adt_match_wrong_tag.bend.snap
@@ -1,8 +1,8 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/adt_match_wrong_tag.hvm
+input_file: tests/golden_tests/run_file/adt_match_wrong_tag.bend
 ---
 Errors:
-In tests/golden_tests/run_file/adt_match_wrong_tag.hvm :
+In tests/golden_tests/run_file/adt_match_wrong_tag.bend :
 Tagged terms not supported for hvm32.
   3 | main = λa #Option (a #wrong_tag λb b *)
diff --git a/tests/snapshots/run_file__adt_option_and.hvm.snap b/tests/snapshots/run_file__adt_option_and.bend.snap
similarity index 66%
rename from tests/snapshots/run_file__adt_option_and.hvm.snap
rename to tests/snapshots/run_file__adt_option_and.bend.snap
index 70e2f5f0..a244ac43 100644
--- a/tests/snapshots/run_file__adt_option_and.hvm.snap
+++ b/tests/snapshots/run_file__adt_option_and.bend.snap
@@ -1,5 +1,5 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/adt_option_and.hvm
+input_file: tests/golden_tests/run_file/adt_option_and.bend
 ---
 λa (a λa λb (b λa λb (Option/Some (b, a)) λ* Option/None a) λ* Option/None)
diff --git a/tests/snapshots/run_file__adt_wrong_tag.hvm.snap b/tests/snapshots/run_file__adt_wrong_tag.bend.snap
similarity index 60%
rename from tests/snapshots/run_file__adt_wrong_tag.hvm.snap
rename to tests/snapshots/run_file__adt_wrong_tag.bend.snap
index f8de5605..a7374208 100644
--- a/tests/snapshots/run_file__adt_wrong_tag.hvm.snap
+++ b/tests/snapshots/run_file__adt_wrong_tag.bend.snap
@@ -1,8 +1,8 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/adt_wrong_tag.hvm
+input_file: tests/golden_tests/run_file/adt_wrong_tag.bend
 ---
 Errors:
-In tests/golden_tests/run_file/adt_wrong_tag.hvm :
+In tests/golden_tests/run_file/adt_wrong_tag.bend :
 Tagged terms not supported for hvm32.
   3 | main = (@a #Option (a #wrong_tag @x x *)) 
diff --git a/tests/snapshots/run_file__and.hvm.snap b/tests/snapshots/run_file__and.bend.snap
similarity index 50%
rename from tests/snapshots/run_file__and.hvm.snap
rename to tests/snapshots/run_file__and.bend.snap
index 73debe21..195d46ed 100644
--- a/tests/snapshots/run_file__and.hvm.snap
+++ b/tests/snapshots/run_file__and.bend.snap
@@ -1,5 +1,5 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/and.hvm
+input_file: tests/golden_tests/run_file/and.bend
 ---
 bool/false
diff --git a/tests/snapshots/run_file__bend_fold.hvm.snap b/tests/snapshots/run_file__bend_fold.hvm.snap
deleted file mode 100644
index 8b431225..00000000
--- a/tests/snapshots/run_file__bend_fold.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/bend_fold.hvm
----
-24
diff --git a/tests/snapshots/run_file__bitonic_sort.bend.snap b/tests/snapshots/run_file__bitonic_sort.bend.snap
new file mode 100644
index 00000000..68c8a824
--- /dev/null
+++ b/tests/snapshots/run_file__bitonic_sort.bend.snap
@@ -0,0 +1,5 @@
+---
+source: tests/golden_tests.rs
+input_file: tests/golden_tests/run_file/bitonic_sort.bend
+---
+120
diff --git a/tests/snapshots/run_file__bitonic_sort.hvm.snap b/tests/snapshots/run_file__bitonic_sort.hvm.snap
deleted file mode 100644
index bff521ce..00000000
--- a/tests/snapshots/run_file__bitonic_sort.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/bitonic_sort.hvm
----
-120
diff --git a/tests/snapshots/run_file__bitonic_sort_lam.bend.snap b/tests/snapshots/run_file__bitonic_sort_lam.bend.snap
new file mode 100644
index 00000000..72cd5838
--- /dev/null
+++ b/tests/snapshots/run_file__bitonic_sort_lam.bend.snap
@@ -0,0 +1,5 @@
+---
+source: tests/golden_tests.rs
+input_file: tests/golden_tests/run_file/bitonic_sort_lam.bend
+---
+32640
diff --git a/tests/snapshots/run_file__bitonic_sort_lam.hvm.snap b/tests/snapshots/run_file__bitonic_sort_lam.hvm.snap
deleted file mode 100644
index 31e3915a..00000000
--- a/tests/snapshots/run_file__bitonic_sort_lam.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/bitonic_sort_lam.hvm
----
-32640
diff --git a/tests/snapshots/run_file__box.hvm.snap b/tests/snapshots/run_file__box.bend.snap
similarity index 53%
rename from tests/snapshots/run_file__box.hvm.snap
rename to tests/snapshots/run_file__box.bend.snap
index 8b1d6a14..932b1607 100644
--- a/tests/snapshots/run_file__box.hvm.snap
+++ b/tests/snapshots/run_file__box.bend.snap
@@ -1,5 +1,5 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/box.hvm
+input_file: tests/golden_tests/run_file/box.bend
 ---
 λa (a λb (b 10))
diff --git a/tests/snapshots/run_file__branch_statements_assignment.hvm.snap b/tests/snapshots/run_file__branch_statements_assignment.bend.snap
similarity index 91%
rename from tests/snapshots/run_file__branch_statements_assignment.hvm.snap
rename to tests/snapshots/run_file__branch_statements_assignment.bend.snap
index fb786aeb..5462ba37 100644
--- a/tests/snapshots/run_file__branch_statements_assignment.hvm.snap
+++ b/tests/snapshots/run_file__branch_statements_assignment.bend.snap
@@ -1,5 +1,5 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/branch_statements_assignment.hvm
+input_file: tests/golden_tests/run_file/branch_statements_assignment.bend
 ---
 6
diff --git a/tests/snapshots/run_file__callcc.bend.snap b/tests/snapshots/run_file__callcc.bend.snap
new file mode 100644
index 00000000..1a59b689
--- /dev/null
+++ b/tests/snapshots/run_file__callcc.bend.snap
@@ -0,0 +1,5 @@
+---
+source: tests/golden_tests.rs
+input_file: tests/golden_tests/run_file/callcc.bend
+---
+52
diff --git a/tests/snapshots/run_file__callcc.hvm.snap b/tests/snapshots/run_file__callcc.hvm.snap
deleted file mode 100644
index 9ffd5d9a..00000000
--- a/tests/snapshots/run_file__callcc.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/callcc.hvm
----
-52
diff --git a/tests/snapshots/run_file__chars.hvm.snap b/tests/snapshots/run_file__chars.bend.snap
similarity index 65%
rename from tests/snapshots/run_file__chars.hvm.snap
rename to tests/snapshots/run_file__chars.bend.snap
index 741e0d4b..0f0fa8dc 100644
--- a/tests/snapshots/run_file__chars.hvm.snap
+++ b/tests/snapshots/run_file__chars.bend.snap
@@ -1,5 +1,5 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/chars.hvm
+input_file: tests/golden_tests/run_file/chars.bend
 ---
 λa λ* (a 4660 λb λ* (b 33 λc λ* (c 55 String/nil)))
diff --git a/tests/snapshots/run_file__chars_forall.bend.snap b/tests/snapshots/run_file__chars_forall.bend.snap
new file mode 100644
index 00000000..e291ceab
--- /dev/null
+++ b/tests/snapshots/run_file__chars_forall.bend.snap
@@ -0,0 +1,5 @@
+---
+source: tests/golden_tests.rs
+input_file: tests/golden_tests/run_file/chars_forall.bend
+---
+8704
diff --git a/tests/snapshots/run_file__chars_forall.hvm.snap b/tests/snapshots/run_file__chars_forall.hvm.snap
deleted file mode 100644
index 4b1a0b8d..00000000
--- a/tests/snapshots/run_file__chars_forall.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/chars_forall.hvm
----
-8704
diff --git a/tests/snapshots/run_file__chars_lambda.bend.snap b/tests/snapshots/run_file__chars_lambda.bend.snap
new file mode 100644
index 00000000..68955e21
--- /dev/null
+++ b/tests/snapshots/run_file__chars_lambda.bend.snap
@@ -0,0 +1,5 @@
+---
+source: tests/golden_tests.rs
+input_file: tests/golden_tests/run_file/chars_lambda.bend
+---
+955
diff --git a/tests/snapshots/run_file__chars_lambda.hvm.snap b/tests/snapshots/run_file__chars_lambda.hvm.snap
deleted file mode 100644
index 0a8d6b3a..00000000
--- a/tests/snapshots/run_file__chars_lambda.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/chars_lambda.hvm
----
-955
diff --git a/tests/snapshots/run_file__def_bool_num.hvm.snap b/tests/snapshots/run_file__def_bool_num.bend.snap
similarity index 76%
rename from tests/snapshots/run_file__def_bool_num.hvm.snap
rename to tests/snapshots/run_file__def_bool_num.bend.snap
index 5774c6a8..27dbe0f0 100644
--- a/tests/snapshots/run_file__def_bool_num.hvm.snap
+++ b/tests/snapshots/run_file__def_bool_num.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/def_bool_num.hvm
+input_file: tests/golden_tests/run_file/def_bool_num.bend
 ---
 Errors:
 In definition 'go':
diff --git a/tests/snapshots/run_file__def_num_bool.hvm.snap b/tests/snapshots/run_file__def_num_bool.bend.snap
similarity index 76%
rename from tests/snapshots/run_file__def_num_bool.hvm.snap
rename to tests/snapshots/run_file__def_num_bool.bend.snap
index 6f385a22..420ccdb9 100644
--- a/tests/snapshots/run_file__def_num_bool.hvm.snap
+++ b/tests/snapshots/run_file__def_num_bool.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/def_num_bool.hvm
+input_file: tests/golden_tests/run_file/def_num_bool.bend
 ---
 Errors:
 In definition 'go':
diff --git a/tests/snapshots/run_file__def_tups.bend.snap b/tests/snapshots/run_file__def_tups.bend.snap
new file mode 100644
index 00000000..7ded0c61
--- /dev/null
+++ b/tests/snapshots/run_file__def_tups.bend.snap
@@ -0,0 +1,5 @@
+---
+source: tests/golden_tests.rs
+input_file: tests/golden_tests/run_file/def_tups.bend
+---
+15
diff --git a/tests/snapshots/run_file__def_tups.hvm.snap b/tests/snapshots/run_file__def_tups.hvm.snap
deleted file mode 100644
index befee56f..00000000
--- a/tests/snapshots/run_file__def_tups.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/def_tups.hvm
----
-15
diff --git a/tests/snapshots/run_file__do_block_mixed.bend.snap b/tests/snapshots/run_file__do_block_mixed.bend.snap
new file mode 100644
index 00000000..2903234d
--- /dev/null
+++ b/tests/snapshots/run_file__do_block_mixed.bend.snap
@@ -0,0 +1,5 @@
+---
+source: tests/golden_tests.rs
+input_file: tests/golden_tests/run_file/do_block_mixed.bend
+---
+λa λ* (a 1)
diff --git a/tests/snapshots/run_file__do_block_mixed.hvm.snap b/tests/snapshots/run_file__do_block_mixed.hvm.snap
deleted file mode 100644
index a12d9c57..00000000
--- a/tests/snapshots/run_file__do_block_mixed.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/do_block_mixed.hvm
----
-λa λ* (a 1)
diff --git a/tests/snapshots/run_file__dup_global_lam.bend.snap b/tests/snapshots/run_file__dup_global_lam.bend.snap
new file mode 100644
index 00000000..18da6371
--- /dev/null
+++ b/tests/snapshots/run_file__dup_global_lam.bend.snap
@@ -0,0 +1,5 @@
+---
+source: tests/golden_tests.rs
+input_file: tests/golden_tests/run_file/dup_global_lam.bend
+---
+λa a
diff --git a/tests/snapshots/run_file__dup_global_lam.hvm.snap b/tests/snapshots/run_file__dup_global_lam.hvm.snap
deleted file mode 100644
index 072ad48b..00000000
--- a/tests/snapshots/run_file__dup_global_lam.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/dup_global_lam.hvm
----
-λa a
diff --git a/tests/snapshots/run_file__empty.hvm.snap b/tests/snapshots/run_file__empty.bend.snap
similarity index 64%
rename from tests/snapshots/run_file__empty.hvm.snap
rename to tests/snapshots/run_file__empty.bend.snap
index 44cdb803..ae032209 100644
--- a/tests/snapshots/run_file__empty.hvm.snap
+++ b/tests/snapshots/run_file__empty.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/empty.hvm
+input_file: tests/golden_tests/run_file/empty.bend
 ---
 Errors:
 File has no 'main' definition.
diff --git a/tests/snapshots/run_file__erased_side_effect.bend.snap b/tests/snapshots/run_file__erased_side_effect.bend.snap
new file mode 100644
index 00000000..afd59bc7
--- /dev/null
+++ b/tests/snapshots/run_file__erased_side_effect.bend.snap
@@ -0,0 +1,5 @@
+---
+source: tests/golden_tests.rs
+input_file: tests/golden_tests/run_file/erased_side_effect.bend
+---
+123
diff --git a/tests/snapshots/run_file__erased_side_effect.hvm.snap b/tests/snapshots/run_file__erased_side_effect.hvm.snap
deleted file mode 100644
index cf62d031..00000000
--- a/tests/snapshots/run_file__erased_side_effect.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/erased_side_effect.hvm
----
-123
diff --git a/tests/snapshots/run_file__escape_sequences.hvm.snap b/tests/snapshots/run_file__escape_sequences.bend.snap
similarity index 85%
rename from tests/snapshots/run_file__escape_sequences.hvm.snap
rename to tests/snapshots/run_file__escape_sequences.bend.snap
index 049fe2f0..28e49d87 100644
--- a/tests/snapshots/run_file__escape_sequences.hvm.snap
+++ b/tests/snapshots/run_file__escape_sequences.bend.snap
@@ -1,5 +1,5 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/escape_sequences.hvm
+input_file: tests/golden_tests/run_file/escape_sequences.bend
 ---
 λa (Join (List/cons (String/cons 10 String/nil) (List/cons (String/cons 13 String/nil) (List/cons (String/cons 9 String/nil) (List/cons (String/cons 0 String/nil) (List/cons (String/cons 34 String/nil) (List/cons (String/cons 39 String/nil) (List/cons (String/cons 2814 String/nil) (List/cons (String/cons 92 String/nil) List/nil)))))))))
diff --git a/tests/snapshots/run_file__eta.bend.snap b/tests/snapshots/run_file__eta.bend.snap
new file mode 100644
index 00000000..7e13990a
--- /dev/null
+++ b/tests/snapshots/run_file__eta.bend.snap
@@ -0,0 +1,5 @@
+---
+source: tests/golden_tests.rs
+input_file: tests/golden_tests/run_file/eta.bend
+---
+Id
diff --git a/tests/snapshots/run_file__eta.hvm.snap b/tests/snapshots/run_file__eta.hvm.snap
deleted file mode 100644
index 525f2d45..00000000
--- a/tests/snapshots/run_file__eta.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/eta.hvm
----
-Id
diff --git a/tests/snapshots/run_file__example.bend.snap b/tests/snapshots/run_file__example.bend.snap
new file mode 100644
index 00000000..9bdacec9
--- /dev/null
+++ b/tests/snapshots/run_file__example.bend.snap
@@ -0,0 +1,5 @@
+---
+source: tests/golden_tests.rs
+input_file: tests/golden_tests/run_file/example.bend
+---
+8
diff --git a/tests/snapshots/run_file__example.hvm.snap b/tests/snapshots/run_file__example.hvm.snap
deleted file mode 100644
index 6ffc0b95..00000000
--- a/tests/snapshots/run_file__example.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/example.hvm
----
-8
diff --git a/tests/snapshots/run_file__exp.hvm.snap b/tests/snapshots/run_file__exp.bend.snap
similarity index 73%
rename from tests/snapshots/run_file__exp.hvm.snap
rename to tests/snapshots/run_file__exp.bend.snap
index 6c080102..5fac9529 100644
--- a/tests/snapshots/run_file__exp.hvm.snap
+++ b/tests/snapshots/run_file__exp.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/exp.hvm
+input_file: tests/golden_tests/run_file/exp.bend
 ---
 Warnings:
 During readback:
diff --git a/tests/snapshots/run_file__extracted_match_pred.bend.snap b/tests/snapshots/run_file__extracted_match_pred.bend.snap
new file mode 100644
index 00000000..7ed3c379
--- /dev/null
+++ b/tests/snapshots/run_file__extracted_match_pred.bend.snap
@@ -0,0 +1,5 @@
+---
+source: tests/golden_tests.rs
+input_file: tests/golden_tests/run_file/extracted_match_pred.bend
+---
+valZ
diff --git a/tests/snapshots/run_file__extracted_match_pred.hvm.snap b/tests/snapshots/run_file__extracted_match_pred.hvm.snap
deleted file mode 100644
index 3311968d..00000000
--- a/tests/snapshots/run_file__extracted_match_pred.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/extracted_match_pred.hvm
----
-valZ
diff --git a/tests/snapshots/run_file__field_vectorization.bend.snap b/tests/snapshots/run_file__field_vectorization.bend.snap
new file mode 100644
index 00000000..d5220495
--- /dev/null
+++ b/tests/snapshots/run_file__field_vectorization.bend.snap
@@ -0,0 +1,5 @@
+---
+source: tests/golden_tests.rs
+input_file: tests/golden_tests/run_file/field_vectorization.bend
+---
+Bool/T
diff --git a/tests/snapshots/run_file__field_vectorization.hvm.snap b/tests/snapshots/run_file__field_vectorization.hvm.snap
deleted file mode 100644
index de0a3e6a..00000000
--- a/tests/snapshots/run_file__field_vectorization.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/field_vectorization.hvm
----
-Bool/T
diff --git a/tests/snapshots/run_file__id_underscore.bend.snap b/tests/snapshots/run_file__id_underscore.bend.snap
new file mode 100644
index 00000000..4e2dd296
--- /dev/null
+++ b/tests/snapshots/run_file__id_underscore.bend.snap
@@ -0,0 +1,5 @@
+---
+source: tests/golden_tests.rs
+input_file: tests/golden_tests/run_file/id_underscore.bend
+---
+{2 3}
diff --git a/tests/snapshots/run_file__id_underscore.hvm.snap b/tests/snapshots/run_file__id_underscore.hvm.snap
deleted file mode 100644
index a7bb3fc8..00000000
--- a/tests/snapshots/run_file__id_underscore.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/id_underscore.hvm
----
-{2 3}
diff --git a/tests/snapshots/run_file__kind_compiled_tree_sum.bend.snap b/tests/snapshots/run_file__kind_compiled_tree_sum.bend.snap
new file mode 100644
index 00000000..d14ede23
--- /dev/null
+++ b/tests/snapshots/run_file__kind_compiled_tree_sum.bend.snap
@@ -0,0 +1,5 @@
+---
+source: tests/golden_tests.rs
+input_file: tests/golden_tests/run_file/kind_compiled_tree_sum.bend
+---
+16678913
diff --git a/tests/snapshots/run_file__kind_compiled_tree_sum.hvm.snap b/tests/snapshots/run_file__kind_compiled_tree_sum.hvm.snap
deleted file mode 100644
index 5c6a6d3d..00000000
--- a/tests/snapshots/run_file__kind_compiled_tree_sum.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/kind_compiled_tree_sum.hvm
----
-16678913
diff --git a/tests/snapshots/run_file__lam_op2.bend.snap b/tests/snapshots/run_file__lam_op2.bend.snap
new file mode 100644
index 00000000..76cc626b
--- /dev/null
+++ b/tests/snapshots/run_file__lam_op2.bend.snap
@@ -0,0 +1,5 @@
+---
+source: tests/golden_tests.rs
+input_file: tests/golden_tests/run_file/lam_op2.bend
+---
+λa (+ a 2)
diff --git a/tests/snapshots/run_file__lam_op2.hvm.snap b/tests/snapshots/run_file__lam_op2.hvm.snap
deleted file mode 100644
index 014db88c..00000000
--- a/tests/snapshots/run_file__lam_op2.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/lam_op2.hvm
----
-λa (+ a 2)
diff --git a/tests/snapshots/run_file__lam_op2_nested.hvm.snap b/tests/snapshots/run_file__lam_op2_nested.bend.snap
similarity index 72%
rename from tests/snapshots/run_file__lam_op2_nested.hvm.snap
rename to tests/snapshots/run_file__lam_op2_nested.bend.snap
index 5b4fc1b5..87490173 100644
--- a/tests/snapshots/run_file__lam_op2_nested.hvm.snap
+++ b/tests/snapshots/run_file__lam_op2_nested.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/lam_op2_nested.hvm
+input_file: tests/golden_tests/run_file/lam_op2_nested.bend
 ---
 Warnings:
 During readback:
diff --git a/tests/snapshots/run_file__let_tup_readback.hvm.snap b/tests/snapshots/run_file__let_tup_readback.bend.snap
similarity index 69%
rename from tests/snapshots/run_file__let_tup_readback.hvm.snap
rename to tests/snapshots/run_file__let_tup_readback.bend.snap
index b8128f31..73c8e796 100644
--- a/tests/snapshots/run_file__let_tup_readback.hvm.snap
+++ b/tests/snapshots/run_file__let_tup_readback.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/let_tup_readback.hvm
+input_file: tests/golden_tests/run_file/let_tup_readback.bend
 ---
 Warnings:
 During readback:
diff --git a/tests/snapshots/run_file__linearize_match.hvm.snap b/tests/snapshots/run_file__linearize_match.bend.snap
similarity index 73%
rename from tests/snapshots/run_file__linearize_match.hvm.snap
rename to tests/snapshots/run_file__linearize_match.bend.snap
index 8dcb60eb..0a9bd406 100644
--- a/tests/snapshots/run_file__linearize_match.hvm.snap
+++ b/tests/snapshots/run_file__linearize_match.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/linearize_match.hvm
+input_file: tests/golden_tests/run_file/linearize_match.bend
 ---
 Warnings:
 During readback:
diff --git a/tests/snapshots/run_file__list_resugar.hvm.snap b/tests/snapshots/run_file__list_resugar.bend.snap
similarity index 63%
rename from tests/snapshots/run_file__list_resugar.hvm.snap
rename to tests/snapshots/run_file__list_resugar.bend.snap
index 4cdc3b05..39c332cf 100644
--- a/tests/snapshots/run_file__list_resugar.hvm.snap
+++ b/tests/snapshots/run_file__list_resugar.bend.snap
@@ -1,5 +1,5 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/list_resugar.hvm
+input_file: tests/golden_tests/run_file/list_resugar.bend
 ---
 λa λ* (a 42 λb λ* (b λc λ* (c λd d List/nil) List/nil))
diff --git a/tests/snapshots/run_file__list_reverse.hvm.snap b/tests/snapshots/run_file__list_reverse.bend.snap
similarity index 60%
rename from tests/snapshots/run_file__list_reverse.hvm.snap
rename to tests/snapshots/run_file__list_reverse.bend.snap
index b2f18893..2b95c7fc 100644
--- a/tests/snapshots/run_file__list_reverse.hvm.snap
+++ b/tests/snapshots/run_file__list_reverse.bend.snap
@@ -1,5 +1,5 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/list_reverse.hvm
+input_file: tests/golden_tests/run_file/list_reverse.bend
 ---
 λa λ* (a 1 λb λ* (b 2 λc λ* (c 3 list/nil)))
diff --git a/tests/snapshots/run_file__list_take.hvm.snap b/tests/snapshots/run_file__list_take.bend.snap
similarity index 57%
rename from tests/snapshots/run_file__list_take.hvm.snap
rename to tests/snapshots/run_file__list_take.bend.snap
index e714dc37..487a97e1 100644
--- a/tests/snapshots/run_file__list_take.hvm.snap
+++ b/tests/snapshots/run_file__list_take.bend.snap
@@ -1,5 +1,5 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/list_take.hvm
+input_file: tests/golden_tests/run_file/list_take.bend
 ---
 λa λ* (a 3 λb λ* (b 2 List/nil))
diff --git a/tests/snapshots/run_file__list_to_tree.bend.snap b/tests/snapshots/run_file__list_to_tree.bend.snap
new file mode 100644
index 00000000..162be837
--- /dev/null
+++ b/tests/snapshots/run_file__list_to_tree.bend.snap
@@ -0,0 +1,5 @@
+---
+source: tests/golden_tests.rs
+input_file: tests/golden_tests/run_file/list_to_tree.bend
+---
+{{1 2} {3 {4 5}}}
diff --git a/tests/snapshots/run_file__list_to_tree.hvm.snap b/tests/snapshots/run_file__list_to_tree.hvm.snap
deleted file mode 100644
index 85731a18..00000000
--- a/tests/snapshots/run_file__list_to_tree.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/list_to_tree.hvm
----
-{{1 2} {3 {4 5}}}
diff --git a/tests/snapshots/run_file__log.hvm.snap b/tests/snapshots/run_file__log.hvm.snap
deleted file mode 100644
index 74910894..00000000
--- a/tests/snapshots/run_file__log.hvm.snap
+++ /dev/null
@@ -1,13 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/log.hvm
----
-Lazy mode:
-59
-(Some "Hello world")
-"Hi"
-
-Strict mode:
-59
-(Some "Hello world")
-"Hi"
diff --git a/tests/snapshots/run_file__match.bend.snap b/tests/snapshots/run_file__match.bend.snap
new file mode 100644
index 00000000..15df3e58
--- /dev/null
+++ b/tests/snapshots/run_file__match.bend.snap
@@ -0,0 +1,5 @@
+---
+source: tests/golden_tests.rs
+input_file: tests/golden_tests/run_file/match.bend
+---
+λ* λa a
diff --git a/tests/snapshots/run_file__match.hvm.snap b/tests/snapshots/run_file__match.hvm.snap
deleted file mode 100644
index dbc27512..00000000
--- a/tests/snapshots/run_file__match.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/match.hvm
----
-λ* λa a
diff --git a/tests/snapshots/run_file__match_builtins.hvm.snap b/tests/snapshots/run_file__match_builtins.bend.snap
similarity index 77%
rename from tests/snapshots/run_file__match_builtins.hvm.snap
rename to tests/snapshots/run_file__match_builtins.bend.snap
index d773b3a2..279d5c09 100644
--- a/tests/snapshots/run_file__match_builtins.hvm.snap
+++ b/tests/snapshots/run_file__match_builtins.bend.snap
@@ -1,5 +1,5 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/match_builtins.hvm
+input_file: tests/golden_tests/run_file/match_builtins.bend
 ---
 {λa λ* (a 101 λb λ* (b 108 λc λ* (c 108 λd λ* (d 111 String/nil)))) λe λ* (e 119 λf λ* (f 111 λg λ* (g 114 λh λ* (h 108 λi λ* (i 100 String/nil)))))}
diff --git a/tests/snapshots/run_file__match_mult_linearization.hvm.snap b/tests/snapshots/run_file__match_mult_linearization.bend.snap
similarity index 97%
rename from tests/snapshots/run_file__match_mult_linearization.hvm.snap
rename to tests/snapshots/run_file__match_mult_linearization.bend.snap
index 9c8f0619..df5532fb 100644
--- a/tests/snapshots/run_file__match_mult_linearization.hvm.snap
+++ b/tests/snapshots/run_file__match_mult_linearization.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/match_mult_linearization.hvm
+input_file: tests/golden_tests/run_file/match_mult_linearization.bend
 ---
 Warnings:
 During readback:
diff --git a/tests/snapshots/run_file__match_num_adt_tup_parser.hvm.snap b/tests/snapshots/run_file__match_num_adt_tup_parser.bend.snap
similarity index 96%
rename from tests/snapshots/run_file__match_num_adt_tup_parser.hvm.snap
rename to tests/snapshots/run_file__match_num_adt_tup_parser.bend.snap
index 47df1d08..9a9fcdc8 100644
--- a/tests/snapshots/run_file__match_num_adt_tup_parser.hvm.snap
+++ b/tests/snapshots/run_file__match_num_adt_tup_parser.bend.snap
@@ -1,5 +1,5 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/match_num_adt_tup_parser.hvm
+input_file: tests/golden_tests/run_file/match_num_adt_tup_parser.bend
 ---
 λ* λa (a {λb λ* (b 40 λc λ* (c 43 String/nil)) *})
diff --git a/tests/snapshots/run_file__match_num_explicit_bind.hvm.snap b/tests/snapshots/run_file__match_num_explicit_bind.bend.snap
similarity index 95%
rename from tests/snapshots/run_file__match_num_explicit_bind.hvm.snap
rename to tests/snapshots/run_file__match_num_explicit_bind.bend.snap
index 8156afe4..c264f4fc 100644
--- a/tests/snapshots/run_file__match_num_explicit_bind.hvm.snap
+++ b/tests/snapshots/run_file__match_num_explicit_bind.bend.snap
@@ -1,5 +1,5 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/match_num_explicit_bind.hvm
+input_file: tests/golden_tests/run_file/match_num_explicit_bind.bend
 ---
 3
diff --git a/tests/snapshots/run_file__match_num_num_to_char.hvm.snap b/tests/snapshots/run_file__match_num_num_to_char.bend.snap
similarity index 89%
rename from tests/snapshots/run_file__match_num_num_to_char.hvm.snap
rename to tests/snapshots/run_file__match_num_num_to_char.bend.snap
index d02cefd6..28226730 100644
--- a/tests/snapshots/run_file__match_num_num_to_char.hvm.snap
+++ b/tests/snapshots/run_file__match_num_num_to_char.bend.snap
@@ -1,5 +1,5 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/match_num_num_to_char.hvm
+input_file: tests/golden_tests/run_file/match_num_num_to_char.bend
 ---
 {{λa λ* (a 0 λb λ* (b 1 λc λ* (c 2 λd λ* (d 3 λe λ* (e 4 λf λ* (f 5 λg λ* (g 6 λh λ* (h 7 λi λ* (i 8 λj λ* (j 9 λk λ* (k 10 List/nil))))))))))) λl λ* (l 0 λm λ* (m 1 λn λ* (n 2 λo λ* (o 3 λp λ* (p 4 λq λ* (q 5 λr λ* (r 6 λs λ* (s 7 λt λ* (t 8 λu λ* (u 9 λv λ* (v 16777215 List/nil)))))))))))} λw λ* (w 48 λx λ* (x 49 λy λ* (y 50 λz λ* (z 51 λab λ* (ab 52 λbb λ* (bb 53 λcb λ* (cb 54 λdb λ* (db 55 λeb λ* (eb 56 λfb λ* (fb 57 λgb λ* (gb 0 List/nil)))))))))))}
diff --git a/tests/snapshots/run_file__match_num_succ_complex.hvm.snap b/tests/snapshots/run_file__match_num_succ_complex.bend.snap
similarity index 79%
rename from tests/snapshots/run_file__match_num_succ_complex.hvm.snap
rename to tests/snapshots/run_file__match_num_succ_complex.bend.snap
index a725368f..754b1c4a 100644
--- a/tests/snapshots/run_file__match_num_succ_complex.hvm.snap
+++ b/tests/snapshots/run_file__match_num_succ_complex.bend.snap
@@ -1,5 +1,5 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/match_num_succ_complex.hvm
+input_file: tests/golden_tests/run_file/match_num_succ_complex.bend
 ---
 λa λ* (a λb λ* (b 5 λc λ* (c 5 λd λ* (d 0 λe λ* (e 12 λf λ* (f 0 λg λ* (g 6 List/nil)))))) λh λ* (h λi λ* (i 5 λj λ* (j 5 λk λ* (k 0 λl λ* (l 12 λm λ* (m 0 λn λ* (n 6 List/nil)))))) List/nil))
diff --git a/tests/snapshots/run_file__match_str.hvm.snap b/tests/snapshots/run_file__match_str.bend.snap
similarity index 70%
rename from tests/snapshots/run_file__match_str.hvm.snap
rename to tests/snapshots/run_file__match_str.bend.snap
index bc3132f9..ab478015 100644
--- a/tests/snapshots/run_file__match_str.hvm.snap
+++ b/tests/snapshots/run_file__match_str.bend.snap
@@ -1,5 +1,5 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/match_str.hvm
+input_file: tests/golden_tests/run_file/match_str.bend
 ---
 λa λ* (a 2 λb λ* (b 2 λc λ* (c 1 λd λ* (d 0 λe λ* (e 0 λf λ* (f 0 List/nil))))))
diff --git a/tests/snapshots/run_file__match_sup.hvm.snap b/tests/snapshots/run_file__match_sup.bend.snap
similarity index 58%
rename from tests/snapshots/run_file__match_sup.hvm.snap
rename to tests/snapshots/run_file__match_sup.bend.snap
index 7f2f3b00..0ffa334a 100644
--- a/tests/snapshots/run_file__match_sup.hvm.snap
+++ b/tests/snapshots/run_file__match_sup.bend.snap
@@ -1,8 +1,8 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/match_sup.hvm
+input_file: tests/golden_tests/run_file/match_sup.bend
 ---
 Errors:
-In tests/golden_tests/run_file/match_sup.hvm :
+In tests/golden_tests/run_file/match_sup.bend :
 Tagged terms not supported for hvm32.
   2 |   let k = #a{0 1};
diff --git a/tests/snapshots/run_file__match_vars.hvm.snap b/tests/snapshots/run_file__match_vars.bend.snap
similarity index 87%
rename from tests/snapshots/run_file__match_vars.hvm.snap
rename to tests/snapshots/run_file__match_vars.bend.snap
index 4cb547e8..866c9aef 100644
--- a/tests/snapshots/run_file__match_vars.hvm.snap
+++ b/tests/snapshots/run_file__match_vars.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/match_vars.hvm
+input_file: tests/golden_tests/run_file/match_vars.bend
 ---
 Errors:
 In definition 'main':
diff --git a/tests/snapshots/run_file__merge_sort.bend.snap b/tests/snapshots/run_file__merge_sort.bend.snap
new file mode 100644
index 00000000..5d7febbf
--- /dev/null
+++ b/tests/snapshots/run_file__merge_sort.bend.snap
@@ -0,0 +1,5 @@
+---
+source: tests/golden_tests.rs
+input_file: tests/golden_tests/run_file/merge_sort.bend
+---
+120
diff --git a/tests/snapshots/run_file__merge_sort.hvm.snap b/tests/snapshots/run_file__merge_sort.hvm.snap
deleted file mode 100644
index c9ac1883..00000000
--- a/tests/snapshots/run_file__merge_sort.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/merge_sort.hvm
----
-120
diff --git a/tests/snapshots/run_file__mixed_syntax.bend.snap b/tests/snapshots/run_file__mixed_syntax.bend.snap
new file mode 100644
index 00000000..5180bafb
--- /dev/null
+++ b/tests/snapshots/run_file__mixed_syntax.bend.snap
@@ -0,0 +1,5 @@
+---
+source: tests/golden_tests.rs
+input_file: tests/golden_tests/run_file/mixed_syntax.bend
+---
+Bool/False
diff --git a/tests/snapshots/run_file__mixed_syntax.hvm.snap b/tests/snapshots/run_file__mixed_syntax.hvm.snap
deleted file mode 100644
index a85e9fa2..00000000
--- a/tests/snapshots/run_file__mixed_syntax.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/mixed_syntax.hvm
----
-Bool/False
diff --git a/tests/snapshots/run_file__names_hyphen.bend.snap b/tests/snapshots/run_file__names_hyphen.bend.snap
new file mode 100644
index 00000000..fa3855c1
--- /dev/null
+++ b/tests/snapshots/run_file__names_hyphen.bend.snap
@@ -0,0 +1,5 @@
+---
+source: tests/golden_tests.rs
+input_file: tests/golden_tests/run_file/names_hyphen.bend
+---
+1
diff --git a/tests/snapshots/run_file__names_hyphen.hvm.snap b/tests/snapshots/run_file__names_hyphen.hvm.snap
deleted file mode 100644
index c1c16fee..00000000
--- a/tests/snapshots/run_file__names_hyphen.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/names_hyphen.hvm
----
-1
diff --git a/tests/snapshots/run_file__names_hyphen_toplevel.bend.snap b/tests/snapshots/run_file__names_hyphen_toplevel.bend.snap
new file mode 100644
index 00000000..9cc7730e
--- /dev/null
+++ b/tests/snapshots/run_file__names_hyphen_toplevel.bend.snap
@@ -0,0 +1,5 @@
+---
+source: tests/golden_tests.rs
+input_file: tests/golden_tests/run_file/names_hyphen_toplevel.bend
+---
+λa (a fun-with-hyphen)
diff --git a/tests/snapshots/run_file__names_hyphen_toplevel.hvm.snap b/tests/snapshots/run_file__names_hyphen_toplevel.hvm.snap
deleted file mode 100644
index a0ce9927..00000000
--- a/tests/snapshots/run_file__names_hyphen_toplevel.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/names_hyphen_toplevel.hvm
----
-λa (a fun-with-hyphen)
diff --git a/tests/snapshots/run_file__nat_add.hvm.snap b/tests/snapshots/run_file__nat_add.bend.snap
similarity index 89%
rename from tests/snapshots/run_file__nat_add.hvm.snap
rename to tests/snapshots/run_file__nat_add.bend.snap
index 49ae811d..24dee5f0 100644
--- a/tests/snapshots/run_file__nat_add.hvm.snap
+++ b/tests/snapshots/run_file__nat_add.bend.snap
@@ -1,5 +1,5 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/nat_add.hvm
+input_file: tests/golden_tests/run_file/nat_add.bend
 ---
 λa λ* (a λb λ* (b λc λ* (c λd λ* (d λe λ* (e λf λ* (f λg λ* (g λh λ* (h λi λ* (i λj λ* (j λk λ* (k λl λ* (l λm λ* (m λn λ* (n λo λ* (o λp λ* (p λq λ* (q λr λ* (r λs λ* (s λt λ* (t λu λ* (u λv λ* (v λw λ* (w λx λ* (x λy λ* (y (Nat/succ (Nat/succ (Nat/succ (Nat/succ (Nat/succ (Nat/succ (Nat/succ (Nat/succ (Nat/succ Nat/zero))))))))))))))))))))))))))))))))))
diff --git a/tests/snapshots/run_file__nat_add_num.hvm.snap b/tests/snapshots/run_file__nat_add_num.bend.snap
similarity index 60%
rename from tests/snapshots/run_file__nat_add_num.hvm.snap
rename to tests/snapshots/run_file__nat_add_num.bend.snap
index e7b34b43..a71df1ad 100644
--- a/tests/snapshots/run_file__nat_add_num.hvm.snap
+++ b/tests/snapshots/run_file__nat_add_num.bend.snap
@@ -1,5 +1,5 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/nat_add_num.hvm
+input_file: tests/golden_tests/run_file/nat_add_num.bend
 ---
 λa λ* (a λb λ* (b λc λ* (c λd λ* (d 0))))
diff --git a/tests/snapshots/run_file__nested_list_and_string.hvm.snap b/tests/snapshots/run_file__nested_list_and_string.bend.snap
similarity index 81%
rename from tests/snapshots/run_file__nested_list_and_string.hvm.snap
rename to tests/snapshots/run_file__nested_list_and_string.bend.snap
index c91e368d..5b280e8e 100644
--- a/tests/snapshots/run_file__nested_list_and_string.hvm.snap
+++ b/tests/snapshots/run_file__nested_list_and_string.bend.snap
@@ -1,5 +1,5 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/nested_list_and_string.hvm
+input_file: tests/golden_tests/run_file/nested_list_and_string.bend
 ---
 λa λb λ* (b a λc λ* (c λ* 2 λd λ* (d λe λ* (e λf λ* (f 7 λg λ* (g λh λ* (h 49 λi λ* (i 50 λj λ* (j 51 λk λ* (k 52 String/nil)))) λl λ* (l 9 List/nil))) λm λ* (m a (String/cons * (String/cons 52 (String/cons 50 String/nil))))) List/nil)))
diff --git a/tests/snapshots/run_file__nested_str.hvm.snap b/tests/snapshots/run_file__nested_str.bend.snap
similarity index 75%
rename from tests/snapshots/run_file__nested_str.hvm.snap
rename to tests/snapshots/run_file__nested_str.bend.snap
index e812d126..473dfc03 100644
--- a/tests/snapshots/run_file__nested_str.hvm.snap
+++ b/tests/snapshots/run_file__nested_str.bend.snap
@@ -1,5 +1,5 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/nested_str.hvm
+input_file: tests/golden_tests/run_file/nested_str.bend
 ---
 λa λb λc λd λ* (d λe λ* (e 97 λf λ* (f 98 String/nil)) λg λ* (g λh λ* (h 99 λi λ* (i 100 String/nil)) String/nil))
diff --git a/tests/snapshots/run_file__num_match_missing_var.hvm.snap b/tests/snapshots/run_file__num_match_missing_var.bend.snap
similarity index 52%
rename from tests/snapshots/run_file__num_match_missing_var.hvm.snap
rename to tests/snapshots/run_file__num_match_missing_var.bend.snap
index fad1136a..1fb2700c 100644
--- a/tests/snapshots/run_file__num_match_missing_var.hvm.snap
+++ b/tests/snapshots/run_file__num_match_missing_var.bend.snap
@@ -1,9 +1,9 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/num_match_missing_var.hvm
+input_file: tests/golden_tests/run_file/num_match_missing_var.bend
 ---
 Errors:
-In tests/golden_tests/run_file/num_match_missing_var.hvm :
+In tests/golden_tests/run_file/num_match_missing_var.bend :
 - expected: '}'
 - detected:
   7 |   _: f
diff --git a/tests/snapshots/run_file__num_pred.bend.snap b/tests/snapshots/run_file__num_pred.bend.snap
new file mode 100644
index 00000000..589cf45a
--- /dev/null
+++ b/tests/snapshots/run_file__num_pred.bend.snap
@@ -0,0 +1,5 @@
+---
+source: tests/golden_tests.rs
+input_file: tests/golden_tests/run_file/num_pred.bend
+---
+42
diff --git a/tests/snapshots/run_file__num_pred.hvm.snap b/tests/snapshots/run_file__num_pred.hvm.snap
deleted file mode 100644
index 6a6c6936..00000000
--- a/tests/snapshots/run_file__num_pred.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/num_pred.hvm
----
-42
diff --git a/tests/snapshots/run_file__override_list_ctr.hvm.snap b/tests/snapshots/run_file__override_list_ctr.bend.snap
similarity index 68%
rename from tests/snapshots/run_file__override_list_ctr.hvm.snap
rename to tests/snapshots/run_file__override_list_ctr.bend.snap
index 3e3ed2c5..2bd79aec 100644
--- a/tests/snapshots/run_file__override_list_ctr.hvm.snap
+++ b/tests/snapshots/run_file__override_list_ctr.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/override_list_ctr.hvm
+input_file: tests/golden_tests/run_file/override_list_ctr.bend
 ---
 Errors:
 Function 'List/nil' has the same name as a previously defined constructor
diff --git a/tests/snapshots/run_file__override_str_ctr.hvm.snap b/tests/snapshots/run_file__override_str_ctr.bend.snap
similarity index 69%
rename from tests/snapshots/run_file__override_str_ctr.hvm.snap
rename to tests/snapshots/run_file__override_str_ctr.bend.snap
index 0afe7b65..06002466 100644
--- a/tests/snapshots/run_file__override_str_ctr.hvm.snap
+++ b/tests/snapshots/run_file__override_str_ctr.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/override_str_ctr.hvm
+input_file: tests/golden_tests/run_file/override_str_ctr.bend
 ---
 Errors:
 Function 'String/cons' has the same name as a previously defined constructor
diff --git a/tests/snapshots/run_file__pred.bend.snap b/tests/snapshots/run_file__pred.bend.snap
new file mode 100644
index 00000000..ed2230ef
--- /dev/null
+++ b/tests/snapshots/run_file__pred.bend.snap
@@ -0,0 +1,5 @@
+---
+source: tests/golden_tests.rs
+input_file: tests/golden_tests/run_file/pred.bend
+---
+2
diff --git a/tests/snapshots/run_file__pred.hvm.snap b/tests/snapshots/run_file__pred.hvm.snap
deleted file mode 100644
index 0fe4e970..00000000
--- a/tests/snapshots/run_file__pred.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/pred.hvm
----
-2
diff --git a/tests/snapshots/run_file__print.hvm.snap b/tests/snapshots/run_file__print.hvm.snap
deleted file mode 100644
index 6acfc3d2..00000000
--- a/tests/snapshots/run_file__print.hvm.snap
+++ /dev/null
@@ -1,11 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/print.hvm
----
-Lazy mode:
-hello world
-"goodbye world"
-
-Strict mode:
-hello world
-"goodbye world"
diff --git a/tests/snapshots/run_file__queue.hvm.snap b/tests/snapshots/run_file__queue.bend.snap
similarity index 59%
rename from tests/snapshots/run_file__queue.hvm.snap
rename to tests/snapshots/run_file__queue.bend.snap
index 7d058660..bb3813aa 100644
--- a/tests/snapshots/run_file__queue.hvm.snap
+++ b/tests/snapshots/run_file__queue.bend.snap
@@ -1,5 +1,5 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/queue.hvm
+input_file: tests/golden_tests/run_file/queue.bend
 ---
 λa λ* (a 1 (Cons 2 (Cons 3 Nil)))
diff --git a/tests/snapshots/run_file__radix_sort_ctr.bend.snap b/tests/snapshots/run_file__radix_sort_ctr.bend.snap
new file mode 100644
index 00000000..cc840383
--- /dev/null
+++ b/tests/snapshots/run_file__radix_sort_ctr.bend.snap
@@ -0,0 +1,5 @@
+---
+source: tests/golden_tests.rs
+input_file: tests/golden_tests/run_file/radix_sort_ctr.bend
+---
+120
diff --git a/tests/snapshots/run_file__radix_sort_ctr.hvm.snap b/tests/snapshots/run_file__radix_sort_ctr.hvm.snap
deleted file mode 100644
index 151b7569..00000000
--- a/tests/snapshots/run_file__radix_sort_ctr.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/radix_sort_ctr.hvm
----
-120
diff --git a/tests/snapshots/run_file__readback_hvm1_main.hvm.snap b/tests/snapshots/run_file__readback_hvm1_main.bend.snap
similarity index 71%
rename from tests/snapshots/run_file__readback_hvm1_main.hvm.snap
rename to tests/snapshots/run_file__readback_hvm1_main.bend.snap
index de3d3c52..25bda2fc 100644
--- a/tests/snapshots/run_file__readback_hvm1_main.hvm.snap
+++ b/tests/snapshots/run_file__readback_hvm1_main.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/readback_hvm1_main.hvm
+input_file: tests/golden_tests/run_file/readback_hvm1_main.bend
 ---
 Errors:
 In definition 'Main':
diff --git a/tests/snapshots/run_file__readback_list_other_ctr.hvm.snap b/tests/snapshots/run_file__readback_list_other_ctr.bend.snap
similarity index 97%
rename from tests/snapshots/run_file__readback_list_other_ctr.hvm.snap
rename to tests/snapshots/run_file__readback_list_other_ctr.bend.snap
index 9d1f5d87..447dea5d 100644
--- a/tests/snapshots/run_file__readback_list_other_ctr.hvm.snap
+++ b/tests/snapshots/run_file__readback_list_other_ctr.bend.snap
@@ -1,5 +1,5 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/readback_list_other_ctr.hvm
+input_file: tests/golden_tests/run_file/readback_list_other_ctr.bend
 ---
 λa λ* (a λb λ* (b 97 λc (c 98 λd λ* (d 99 String/nil))) λe λ* (e 1 λf (f 2 λg λ* (g 3 λh λ* (h 4 List/nil)))))
diff --git a/tests/snapshots/run_file__recursive_bind.bend.snap b/tests/snapshots/run_file__recursive_bind.bend.snap
new file mode 100644
index 00000000..bcfeb884
--- /dev/null
+++ b/tests/snapshots/run_file__recursive_bind.bend.snap
@@ -0,0 +1,5 @@
+---
+source: tests/golden_tests.rs
+input_file: tests/golden_tests/run_file/recursive_bind.bend
+---
+λa (a 0)
diff --git a/tests/snapshots/run_file__recursive_bind.hvm.snap b/tests/snapshots/run_file__recursive_bind.hvm.snap
deleted file mode 100644
index baae4108..00000000
--- a/tests/snapshots/run_file__recursive_bind.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/recursive_bind.hvm
----
-λa (a 0)
diff --git a/tests/snapshots/run_file__recursive_combinator.bend.snap b/tests/snapshots/run_file__recursive_combinator.bend.snap
new file mode 100644
index 00000000..9f5b7e99
--- /dev/null
+++ b/tests/snapshots/run_file__recursive_combinator.bend.snap
@@ -0,0 +1,5 @@
+---
+source: tests/golden_tests.rs
+input_file: tests/golden_tests/run_file/recursive_combinator.bend
+---
+0
diff --git a/tests/snapshots/run_file__recursive_combinator.hvm.snap b/tests/snapshots/run_file__recursive_combinator.hvm.snap
deleted file mode 100644
index fde141c8..00000000
--- a/tests/snapshots/run_file__recursive_combinator.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/recursive_combinator.hvm
----
-0
diff --git a/tests/snapshots/run_file__recursive_combinator_nested.hvm.snap b/tests/snapshots/run_file__recursive_combinator_nested.bend.snap
similarity index 74%
rename from tests/snapshots/run_file__recursive_combinator_nested.hvm.snap
rename to tests/snapshots/run_file__recursive_combinator_nested.bend.snap
index a1bbd747..4253c6e0 100644
--- a/tests/snapshots/run_file__recursive_combinator_nested.hvm.snap
+++ b/tests/snapshots/run_file__recursive_combinator_nested.bend.snap
@@ -1,8 +1,8 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/recursive_combinator_nested.hvm
+input_file: tests/golden_tests/run_file/recursive_combinator_nested.bend
 ---
 Errors:
-In tests/golden_tests/run_file/recursive_combinator_nested.hvm :
+In tests/golden_tests/run_file/recursive_combinator_nested.bend :
 Tagged terms not supported for hvm32.
    3 |   0: (#a {Foo @* a} 9);
diff --git a/tests/snapshots/run_file__recursive_match_native.bend.snap b/tests/snapshots/run_file__recursive_match_native.bend.snap
new file mode 100644
index 00000000..3a5a49b8
--- /dev/null
+++ b/tests/snapshots/run_file__recursive_match_native.bend.snap
@@ -0,0 +1,5 @@
+---
+source: tests/golden_tests.rs
+input_file: tests/golden_tests/run_file/recursive_match_native.bend
+---
+512
diff --git a/tests/snapshots/run_file__recursive_match_native.hvm.snap b/tests/snapshots/run_file__recursive_match_native.hvm.snap
deleted file mode 100644
index 0fbf46b6..00000000
--- a/tests/snapshots/run_file__recursive_match_native.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/recursive_match_native.hvm
----
-512
diff --git a/tests/snapshots/run_file__ref_resolution.bend.snap b/tests/snapshots/run_file__ref_resolution.bend.snap
new file mode 100644
index 00000000..87275a2f
--- /dev/null
+++ b/tests/snapshots/run_file__ref_resolution.bend.snap
@@ -0,0 +1,5 @@
+---
+source: tests/golden_tests.rs
+input_file: tests/golden_tests/run_file/ref_resolution.bend
+---
+42
diff --git a/tests/snapshots/run_file__ref_resolution.hvm.snap b/tests/snapshots/run_file__ref_resolution.hvm.snap
deleted file mode 100644
index a176729c..00000000
--- a/tests/snapshots/run_file__ref_resolution.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/ref_resolution.hvm
----
-42
diff --git a/tests/snapshots/run_file__repeated_name_truncation.hvm.snap b/tests/snapshots/run_file__repeated_name_truncation.bend.snap
similarity index 95%
rename from tests/snapshots/run_file__repeated_name_truncation.hvm.snap
rename to tests/snapshots/run_file__repeated_name_truncation.bend.snap
index 76af717a..30e0c984 100644
--- a/tests/snapshots/run_file__repeated_name_truncation.hvm.snap
+++ b/tests/snapshots/run_file__repeated_name_truncation.bend.snap
@@ -1,5 +1,5 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/repeated_name_truncation.hvm
+input_file: tests/golden_tests/run_file/repeated_name_truncation.bend
 ---
 λ* long_name_that_truncates2
diff --git a/tests/snapshots/run_file__scopeless_discard.bend.snap b/tests/snapshots/run_file__scopeless_discard.bend.snap
new file mode 100644
index 00000000..a3bb43c4
--- /dev/null
+++ b/tests/snapshots/run_file__scopeless_discard.bend.snap
@@ -0,0 +1,5 @@
+---
+source: tests/golden_tests.rs
+input_file: tests/golden_tests/run_file/scopeless_discard.bend
+---
+{2 *}
diff --git a/tests/snapshots/run_file__scopeless_discard.hvm.snap b/tests/snapshots/run_file__scopeless_discard.hvm.snap
deleted file mode 100644
index c83a057e..00000000
--- a/tests/snapshots/run_file__scopeless_discard.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/scopeless_discard.hvm
----
-{2 *}
diff --git a/tests/snapshots/run_file__str_concat.hvm.snap b/tests/snapshots/run_file__str_concat.bend.snap
similarity index 80%
rename from tests/snapshots/run_file__str_concat.hvm.snap
rename to tests/snapshots/run_file__str_concat.bend.snap
index faf87635..02648b2c 100644
--- a/tests/snapshots/run_file__str_concat.hvm.snap
+++ b/tests/snapshots/run_file__str_concat.bend.snap
@@ -1,5 +1,5 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/str_concat.hvm
+input_file: tests/golden_tests/run_file/str_concat.bend
 ---
 λa λ* (a 104 λb λ* (b 101 λc λ* (c 108 λd λ* (d 108 λe λ* (e 111 λf λ* (f 32 λg λ* (g 119 λh λ* (h 111 λi λ* (i 114 λj λ* (j 108 λk λ* (k 100 String/nil)))))))))))
diff --git a/tests/snapshots/run_file__str_inc.hvm.snap b/tests/snapshots/run_file__str_inc.bend.snap
similarity index 65%
rename from tests/snapshots/run_file__str_inc.hvm.snap
rename to tests/snapshots/run_file__str_inc.bend.snap
index ec359540..2387bd7d 100644
--- a/tests/snapshots/run_file__str_inc.hvm.snap
+++ b/tests/snapshots/run_file__str_inc.bend.snap
@@ -1,8 +1,8 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/str_inc.hvm
+input_file: tests/golden_tests/run_file/str_inc.bend
 ---
 Errors:
-In tests/golden_tests/run_file/str_inc.hvm :
+In tests/golden_tests/run_file/str_inc.bend :
 Tagged terms not supported for hvm32.
   1 | (StrInc (len, buf)) = (len, #str λx (StrGo len #str (buf x)))
diff --git a/tests/snapshots/run_file__str_inc_eta.hvm.snap b/tests/snapshots/run_file__str_inc_eta.bend.snap
similarity index 64%
rename from tests/snapshots/run_file__str_inc_eta.hvm.snap
rename to tests/snapshots/run_file__str_inc_eta.bend.snap
index e0875dd2..49948fd2 100644
--- a/tests/snapshots/run_file__str_inc_eta.hvm.snap
+++ b/tests/snapshots/run_file__str_inc_eta.bend.snap
@@ -1,8 +1,8 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/str_inc_eta.hvm
+input_file: tests/golden_tests/run_file/str_inc_eta.bend
 ---
 Errors:
-In tests/golden_tests/run_file/str_inc_eta.hvm :
+In tests/golden_tests/run_file/str_inc_eta.bend :
 Tagged terms not supported for hvm32.
   1 | (StrInc (len, buf)) = (len, #str λx (StrGo len #str (buf x)))
diff --git a/tests/snapshots/run_file__str_len.bend.snap b/tests/snapshots/run_file__str_len.bend.snap
new file mode 100644
index 00000000..068dbca5
--- /dev/null
+++ b/tests/snapshots/run_file__str_len.bend.snap
@@ -0,0 +1,5 @@
+---
+source: tests/golden_tests.rs
+input_file: tests/golden_tests/run_file/str_len.bend
+---
+4
diff --git a/tests/snapshots/run_file__str_len.hvm.snap b/tests/snapshots/run_file__str_len.hvm.snap
deleted file mode 100644
index b1db32ec..00000000
--- a/tests/snapshots/run_file__str_len.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/str_len.hvm
----
-4
diff --git a/tests/snapshots/run_file__sum_tree.bend.snap b/tests/snapshots/run_file__sum_tree.bend.snap
new file mode 100644
index 00000000..f9aead7b
--- /dev/null
+++ b/tests/snapshots/run_file__sum_tree.bend.snap
@@ -0,0 +1,5 @@
+---
+source: tests/golden_tests.rs
+input_file: tests/golden_tests/run_file/sum_tree.bend
+---
+256
diff --git a/tests/snapshots/run_file__sum_tree.hvm.snap b/tests/snapshots/run_file__sum_tree.hvm.snap
deleted file mode 100644
index eada5679..00000000
--- a/tests/snapshots/run_file__sum_tree.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/sum_tree.hvm
----
-256
diff --git a/tests/snapshots/run_file__sup_app.bend.snap b/tests/snapshots/run_file__sup_app.bend.snap
new file mode 100644
index 00000000..fb150bd2
--- /dev/null
+++ b/tests/snapshots/run_file__sup_app.bend.snap
@@ -0,0 +1,5 @@
+---
+source: tests/golden_tests.rs
+input_file: tests/golden_tests/run_file/sup_app.bend
+---
+{3 3}
diff --git a/tests/snapshots/run_file__sup_app.hvm.snap b/tests/snapshots/run_file__sup_app.hvm.snap
deleted file mode 100644
index 30584a1a..00000000
--- a/tests/snapshots/run_file__sup_app.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/sup_app.hvm
----
-{3 3}
diff --git a/tests/snapshots/run_file__sup_reconstruction.bend.snap b/tests/snapshots/run_file__sup_reconstruction.bend.snap
new file mode 100644
index 00000000..2a8ec285
--- /dev/null
+++ b/tests/snapshots/run_file__sup_reconstruction.bend.snap
@@ -0,0 +1,5 @@
+---
+source: tests/golden_tests.rs
+input_file: tests/golden_tests/run_file/sup_reconstruction.bend
+---
+λa a
diff --git a/tests/snapshots/run_file__sup_reconstruction.hvm.snap b/tests/snapshots/run_file__sup_reconstruction.hvm.snap
deleted file mode 100644
index 204cd3ed..00000000
--- a/tests/snapshots/run_file__sup_reconstruction.hvm.snap
+++ /dev/null
@@ -1,8 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/sup_reconstruction.hvm
----
-Errors:
-In tests/golden_tests/run_file/sup_reconstruction.hvm :
-Tagged terms not supported for hvm32.
-  1 | main = λa let #s {b c} = a; #s {b c}
diff --git a/tests/snapshots/run_file__superposed_is_even.bend.snap b/tests/snapshots/run_file__superposed_is_even.bend.snap
new file mode 100644
index 00000000..53831b9b
--- /dev/null
+++ b/tests/snapshots/run_file__superposed_is_even.bend.snap
@@ -0,0 +1,5 @@
+---
+source: tests/golden_tests.rs
+input_file: tests/golden_tests/run_file/superposed_is_even.bend
+---
+{{B/T B/F} {B/T B/F}}
diff --git a/tests/snapshots/run_file__superposed_is_even.hvm.snap b/tests/snapshots/run_file__superposed_is_even.hvm.snap
deleted file mode 100644
index 4ea73281..00000000
--- a/tests/snapshots/run_file__superposed_is_even.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/superposed_is_even.hvm
----
-{{B/T B/F} {B/T B/F}}
diff --git a/tests/snapshots/run_file__tagged_lam.hvm.snap b/tests/snapshots/run_file__tagged_lam.bend.snap
similarity index 63%
rename from tests/snapshots/run_file__tagged_lam.hvm.snap
rename to tests/snapshots/run_file__tagged_lam.bend.snap
index ea0777c9..bff14191 100644
--- a/tests/snapshots/run_file__tagged_lam.hvm.snap
+++ b/tests/snapshots/run_file__tagged_lam.bend.snap
@@ -1,8 +1,8 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/tagged_lam.hvm
+input_file: tests/golden_tests/run_file/tagged_lam.bend
 ---
 Errors:
-In tests/golden_tests/run_file/tagged_lam.hvm :
+In tests/golden_tests/run_file/tagged_lam.bend :
 Tagged terms not supported for hvm32.
   1 | main = #foo ((#foo @x (+ x 1), #foo @x (* x x)) 2)
diff --git a/tests/snapshots/run_file__tup_list_strings.hvm.snap b/tests/snapshots/run_file__tup_list_strings.bend.snap
similarity index 81%
rename from tests/snapshots/run_file__tup_list_strings.hvm.snap
rename to tests/snapshots/run_file__tup_list_strings.bend.snap
index 13ac04f2..3b66517c 100644
--- a/tests/snapshots/run_file__tup_list_strings.hvm.snap
+++ b/tests/snapshots/run_file__tup_list_strings.bend.snap
@@ -1,5 +1,5 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/tup_list_strings.hvm
+input_file: tests/golden_tests/run_file/tup_list_strings.bend
 ---
 {λa λ* (a {λb λ* (b 102 λc λ* (c 111 λd λ* (d 111 String/nil))) 0} λe λ* (e {λf λ* (f 102 λg λ* (g 111 λh λ* (h 111 String/nil))) 0} λi λ* (i {λj λ* (j 102 λk λ* (k 111 λl λ* (l 111 String/nil))) 1} List/nil))) 4}
diff --git a/tests/snapshots/run_file__tup_reconstruction.bend.snap b/tests/snapshots/run_file__tup_reconstruction.bend.snap
new file mode 100644
index 00000000..690524e3
--- /dev/null
+++ b/tests/snapshots/run_file__tup_reconstruction.bend.snap
@@ -0,0 +1,5 @@
+---
+source: tests/golden_tests.rs
+input_file: tests/golden_tests/run_file/tup_reconstruction.bend
+---
+λa a
diff --git a/tests/snapshots/run_file__tup_reconstruction.hvm.snap b/tests/snapshots/run_file__tup_reconstruction.hvm.snap
deleted file mode 100644
index 8e8d5cd1..00000000
--- a/tests/snapshots/run_file__tup_reconstruction.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/tup_reconstruction.hvm
----
-λa a
diff --git a/tests/snapshots/run_file__tuple_rots.hvm.snap b/tests/snapshots/run_file__tuple_rots.bend.snap
similarity index 52%
rename from tests/snapshots/run_file__tuple_rots.hvm.snap
rename to tests/snapshots/run_file__tuple_rots.bend.snap
index 39d020d6..3a0272ae 100644
--- a/tests/snapshots/run_file__tuple_rots.hvm.snap
+++ b/tests/snapshots/run_file__tuple_rots.bend.snap
@@ -1,5 +1,5 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/tuple_rots.hvm
+input_file: tests/golden_tests/run_file/tuple_rots.bend
 ---
 λa (a 5 6 7 8 1 2 3 4)
diff --git a/tests/snapshots/run_file__unaplied_str.hvm.snap b/tests/snapshots/run_file__unaplied_str.bend.snap
similarity index 66%
rename from tests/snapshots/run_file__unaplied_str.hvm.snap
rename to tests/snapshots/run_file__unaplied_str.bend.snap
index d85b78a2..dbeba4c9 100644
--- a/tests/snapshots/run_file__unaplied_str.hvm.snap
+++ b/tests/snapshots/run_file__unaplied_str.bend.snap
@@ -1,5 +1,5 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/unaplied_str.hvm
+input_file: tests/golden_tests/run_file/unaplied_str.bend
 ---
 λa λb λc λ* (c a λd λ* (d 98 λe λ* (e 99 λf λ* (f b String/nil))))
diff --git a/tests/snapshots/run_file__unscoped_never_used.hvm.snap b/tests/snapshots/run_file__unscoped_never_used.bend.snap
similarity index 70%
rename from tests/snapshots/run_file__unscoped_never_used.hvm.snap
rename to tests/snapshots/run_file__unscoped_never_used.bend.snap
index 5dee7b07..aeb93b14 100644
--- a/tests/snapshots/run_file__unscoped_never_used.hvm.snap
+++ b/tests/snapshots/run_file__unscoped_never_used.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/unscoped_never_used.hvm
+input_file: tests/golden_tests/run_file/unscoped_never_used.bend
 ---
 Errors:
 In definition 'main':
diff --git a/tests/snapshots/run_file__unused_dup_var.bend.snap b/tests/snapshots/run_file__unused_dup_var.bend.snap
new file mode 100644
index 00000000..32ad1997
--- /dev/null
+++ b/tests/snapshots/run_file__unused_dup_var.bend.snap
@@ -0,0 +1,5 @@
+---
+source: tests/golden_tests.rs
+input_file: tests/golden_tests/run_file/unused_dup_var.bend
+---
+λa (a X)
diff --git a/tests/snapshots/run_file__unused_dup_var.hvm.snap b/tests/snapshots/run_file__unused_dup_var.hvm.snap
deleted file mode 100644
index 8641efeb..00000000
--- a/tests/snapshots/run_file__unused_dup_var.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/unused_dup_var.hvm
----
-λa (a X)
diff --git a/tests/snapshots/run_file__world.hvm.snap b/tests/snapshots/run_file__world.bend.snap
similarity index 57%
rename from tests/snapshots/run_file__world.hvm.snap
rename to tests/snapshots/run_file__world.bend.snap
index 6a3bc45c..1fd873de 100644
--- a/tests/snapshots/run_file__world.hvm.snap
+++ b/tests/snapshots/run_file__world.bend.snap
@@ -1,5 +1,5 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/world.hvm
+input_file: tests/golden_tests/run_file/world.bend
 ---
 λa λ* (a 127758 String/nil)
diff --git a/tests/snapshots/run_file__wrong_string.hvm.snap b/tests/snapshots/run_file__wrong_string.bend.snap
similarity index 58%
rename from tests/snapshots/run_file__wrong_string.hvm.snap
rename to tests/snapshots/run_file__wrong_string.bend.snap
index b5e75de6..77eea802 100644
--- a/tests/snapshots/run_file__wrong_string.hvm.snap
+++ b/tests/snapshots/run_file__wrong_string.bend.snap
@@ -1,5 +1,5 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_file/wrong_string.hvm
+input_file: tests/golden_tests/run_file/wrong_string.bend
 ---
 λa λ* (a λ* 4 λb λ* (b * String/nil))
diff --git a/tests/snapshots/run_lazy__addition.hvm.snap b/tests/snapshots/run_lazy__addition.hvm.snap
deleted file mode 100644
index 0596cc44..00000000
--- a/tests/snapshots/run_lazy__addition.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_lazy/addition.hvm
----
-10
diff --git a/tests/snapshots/run_lazy__adt_match.hvm.snap b/tests/snapshots/run_lazy__adt_match.hvm.snap
deleted file mode 100644
index 3e016ca8..00000000
--- a/tests/snapshots/run_lazy__adt_match.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_lazy/adt_match.hvm
----
-(Some 2)
diff --git a/tests/snapshots/run_lazy__adt_match_wrong_tag.hvm.snap b/tests/snapshots/run_lazy__adt_match_wrong_tag.hvm.snap
deleted file mode 100644
index 3ec1cbd3..00000000
--- a/tests/snapshots/run_lazy__adt_match_wrong_tag.hvm.snap
+++ /dev/null
@@ -1,9 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_lazy/adt_match_wrong_tag.hvm
----
-Warnings:
-During readback:
-  Unexpected tag found during Adt readback, expected '#Option', but found '#wrong_tag'.
-
-λa match a = a { Some: #Option (#wrong_tag λb b a.val); None: *; }
diff --git a/tests/snapshots/run_lazy__adt_option_and.hvm.snap b/tests/snapshots/run_lazy__adt_option_and.hvm.snap
deleted file mode 100644
index a21ec0bb..00000000
--- a/tests/snapshots/run_lazy__adt_option_and.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_lazy/adt_option_and.hvm
----
-λa match a = a { Some: λc match c = c { Some: (Some (a.val, c.val)); None: None; }; None: λ* None; }
diff --git a/tests/snapshots/run_lazy__adt_wrong_tag.hvm.snap b/tests/snapshots/run_lazy__adt_wrong_tag.hvm.snap
deleted file mode 100644
index ce25079d..00000000
--- a/tests/snapshots/run_lazy__adt_wrong_tag.hvm.snap
+++ /dev/null
@@ -1,9 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_lazy/adt_wrong_tag.hvm
----
-Warnings:
-During readback:
-  Unexpected tag found during Adt readback, expected '#Option', but found '#wrong_tag'.
-
-λa match a = a { Some: #Option (#wrong_tag λb b a.val); None: *; }
diff --git a/tests/snapshots/run_lazy__and.hvm.snap b/tests/snapshots/run_lazy__and.hvm.snap
deleted file mode 100644
index 6d2f169f..00000000
--- a/tests/snapshots/run_lazy__and.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_lazy/and.hvm
----
-false
diff --git a/tests/snapshots/run_lazy__bitonic_sort.hvm.snap b/tests/snapshots/run_lazy__bitonic_sort.hvm.snap
deleted file mode 100644
index 826de195..00000000
--- a/tests/snapshots/run_lazy__bitonic_sort.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_lazy/bitonic_sort.hvm
----
-120
diff --git a/tests/snapshots/run_lazy__bitonic_sort_lam.hvm.snap b/tests/snapshots/run_lazy__bitonic_sort_lam.hvm.snap
deleted file mode 100644
index 6c0ac307..00000000
--- a/tests/snapshots/run_lazy__bitonic_sort_lam.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_lazy/bitonic_sort_lam.hvm
----
-32640
diff --git a/tests/snapshots/run_lazy__box.hvm.snap b/tests/snapshots/run_lazy__box.hvm.snap
deleted file mode 100644
index 3308808d..00000000
--- a/tests/snapshots/run_lazy__box.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_lazy/box.hvm
----
-(Box 10)
diff --git a/tests/snapshots/run_lazy__box2.hvm.snap b/tests/snapshots/run_lazy__box2.hvm.snap
deleted file mode 100644
index 17fca4c6..00000000
--- a/tests/snapshots/run_lazy__box2.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_lazy/box2.hvm
----
-(Box 4)
diff --git a/tests/snapshots/run_lazy__callcc.hvm.snap b/tests/snapshots/run_lazy__callcc.hvm.snap
deleted file mode 100644
index 6587d902..00000000
--- a/tests/snapshots/run_lazy__callcc.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_lazy/callcc.hvm
----
-52
diff --git a/tests/snapshots/run_lazy__chars.hvm.snap b/tests/snapshots/run_lazy__chars.hvm.snap
deleted file mode 100644
index 0d0369ae..00000000
--- a/tests/snapshots/run_lazy__chars.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_lazy/chars.hvm
----
-"ሴ!7"
diff --git a/tests/snapshots/run_lazy__def_tups.hvm.snap b/tests/snapshots/run_lazy__def_tups.hvm.snap
deleted file mode 100644
index a1d03a1d..00000000
--- a/tests/snapshots/run_lazy__def_tups.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_lazy/def_tups.hvm
----
-(15, 15)
diff --git a/tests/snapshots/run_lazy__dup_global_lam.hvm.snap b/tests/snapshots/run_lazy__dup_global_lam.hvm.snap
deleted file mode 100644
index 12a559de..00000000
--- a/tests/snapshots/run_lazy__dup_global_lam.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_lazy/dup_global_lam.hvm
----
-λa a
diff --git a/tests/snapshots/run_lazy__eta.hvm.snap b/tests/snapshots/run_lazy__eta.hvm.snap
deleted file mode 100644
index 3607f532..00000000
--- a/tests/snapshots/run_lazy__eta.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_lazy/eta.hvm
----
-λa a
diff --git a/tests/snapshots/run_lazy__example.hvm.snap b/tests/snapshots/run_lazy__example.hvm.snap
deleted file mode 100644
index bf469706..00000000
--- a/tests/snapshots/run_lazy__example.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_lazy/example.hvm
----
-8
diff --git a/tests/snapshots/run_lazy__exp.hvm.snap b/tests/snapshots/run_lazy__exp.hvm.snap
deleted file mode 100644
index 9db9cd7f..00000000
--- a/tests/snapshots/run_lazy__exp.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_lazy/exp.hvm
----
-λa λb (a (a (a (a b))))
diff --git a/tests/snapshots/run_lazy__extracted_match_pred.hvm.snap b/tests/snapshots/run_lazy__extracted_match_pred.hvm.snap
deleted file mode 100644
index 08c794f9..00000000
--- a/tests/snapshots/run_lazy__extracted_match_pred.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_lazy/extracted_match_pred.hvm
----
-0
diff --git a/tests/snapshots/run_lazy__field_vectorization.hvm.snap b/tests/snapshots/run_lazy__field_vectorization.hvm.snap
deleted file mode 100644
index 392ccf56..00000000
--- a/tests/snapshots/run_lazy__field_vectorization.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_lazy/field_vectorization.hvm
----
-(Cons T (Cons T (Cons F (Cons T Nil))))
diff --git a/tests/snapshots/run_lazy__lam_op2.hvm.snap b/tests/snapshots/run_lazy__lam_op2.hvm.snap
deleted file mode 100644
index 44883ae5..00000000
--- a/tests/snapshots/run_lazy__lam_op2.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_lazy/lam_op2.hvm
----
-λa (+ a 2)
diff --git a/tests/snapshots/run_lazy__lam_op2_nested.hvm.snap b/tests/snapshots/run_lazy__lam_op2_nested.hvm.snap
deleted file mode 100644
index 5c822cd9..00000000
--- a/tests/snapshots/run_lazy__lam_op2_nested.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_lazy/lam_op2_nested.hvm
----
-λa (+ (* a a) (+ (+ a 2) 3))
diff --git a/tests/snapshots/run_lazy__let_tup_readback.hvm.snap b/tests/snapshots/run_lazy__let_tup_readback.hvm.snap
deleted file mode 100644
index cd8f8907..00000000
--- a/tests/snapshots/run_lazy__let_tup_readback.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_lazy/let_tup_readback.hvm
----
-λa let (b, c) = a; (b c)
diff --git a/tests/snapshots/run_lazy__linearize_match.hvm.snap b/tests/snapshots/run_lazy__linearize_match.hvm.snap
deleted file mode 100644
index a0668b3e..00000000
--- a/tests/snapshots/run_lazy__linearize_match.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_lazy/linearize_match.hvm
----
-λa switch a = a { 0: λb b; _: λd (+ a-1 d); }
diff --git a/tests/snapshots/run_lazy__list_resugar.hvm.snap b/tests/snapshots/run_lazy__list_resugar.hvm.snap
deleted file mode 100644
index 1de57da1..00000000
--- a/tests/snapshots/run_lazy__list_resugar.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_lazy/list_resugar.hvm
----
-[42, [λd d]]
diff --git a/tests/snapshots/run_lazy__list_reverse.hvm.snap b/tests/snapshots/run_lazy__list_reverse.hvm.snap
deleted file mode 100644
index 09dfa614..00000000
--- a/tests/snapshots/run_lazy__list_reverse.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_lazy/list_reverse.hvm
----
-(cons 1 (cons 2 (cons 3 nil)))
diff --git a/tests/snapshots/run_lazy__list_take.hvm.snap b/tests/snapshots/run_lazy__list_take.hvm.snap
deleted file mode 100644
index 04fcd766..00000000
--- a/tests/snapshots/run_lazy__list_take.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_lazy/list_take.hvm
----
-[3, 2]
diff --git a/tests/snapshots/run_lazy__list_to_tree.hvm.snap b/tests/snapshots/run_lazy__list_to_tree.hvm.snap
deleted file mode 100644
index 74714f52..00000000
--- a/tests/snapshots/run_lazy__list_to_tree.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_lazy/list_to_tree.hvm
----
-((1, 2), (3, (4, 5)))
diff --git a/tests/snapshots/run_lazy__match.hvm.snap b/tests/snapshots/run_lazy__match.hvm.snap
deleted file mode 100644
index 787605df..00000000
--- a/tests/snapshots/run_lazy__match.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_lazy/match.hvm
----
-λ* λa a
diff --git a/tests/snapshots/run_lazy__match_builtins.hvm.snap b/tests/snapshots/run_lazy__match_builtins.hvm.snap
deleted file mode 100644
index 933620b1..00000000
--- a/tests/snapshots/run_lazy__match_builtins.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_lazy/match_builtins.hvm
----
-("ello", "world")
diff --git a/tests/snapshots/run_lazy__match_mult_linearization.hvm.snap b/tests/snapshots/run_lazy__match_mult_linearization.hvm.snap
deleted file mode 100644
index 209082a2..00000000
--- a/tests/snapshots/run_lazy__match_mult_linearization.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_lazy/match_mult_linearization.hvm
----
-λa switch a = a { 0: λb λc λd (+ (+ b c) d); _: λf λg λh (+ (+ (+ a-1 f) g) h); }
diff --git a/tests/snapshots/run_lazy__match_num_explicit_bind.hvm.snap b/tests/snapshots/run_lazy__match_num_explicit_bind.hvm.snap
deleted file mode 100644
index 5ba134df..00000000
--- a/tests/snapshots/run_lazy__match_num_explicit_bind.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_lazy/match_num_explicit_bind.hvm
----
-3
diff --git a/tests/snapshots/run_lazy__merge_sort.hvm.snap b/tests/snapshots/run_lazy__merge_sort.hvm.snap
deleted file mode 100644
index ff0c8006..00000000
--- a/tests/snapshots/run_lazy__merge_sort.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_lazy/merge_sort.hvm
----
-120
diff --git a/tests/snapshots/run_lazy__nested_list_and_string.hvm.snap b/tests/snapshots/run_lazy__nested_list_and_string.hvm.snap
deleted file mode 100644
index 3f33bcb8..00000000
--- a/tests/snapshots/run_lazy__nested_list_and_string.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_lazy/nested_list_and_string.hvm
----
-λa [a, (*, 2), (String.cons [7, "1234", 9] (String.cons a (String.cons * "42")))]
diff --git a/tests/snapshots/run_lazy__nested_str.hvm.snap b/tests/snapshots/run_lazy__nested_str.hvm.snap
deleted file mode 100644
index 0f0e9550..00000000
--- a/tests/snapshots/run_lazy__nested_str.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_lazy/nested_str.hvm
----
-((String.cons "a" String.nil), ((String.cons 97 (String.cons "bc" String.nil)), ((String.cons "ab" "c"), (String.cons "ab" (String.cons "cd" String.nil)))))
diff --git a/tests/snapshots/run_lazy__num_pred.hvm.snap b/tests/snapshots/run_lazy__num_pred.hvm.snap
deleted file mode 100644
index 8c285013..00000000
--- a/tests/snapshots/run_lazy__num_pred.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_lazy/num_pred.hvm
----
-42
diff --git a/tests/snapshots/run_lazy__queue.hvm.snap b/tests/snapshots/run_lazy__queue.hvm.snap
deleted file mode 100644
index aff79d71..00000000
--- a/tests/snapshots/run_lazy__queue.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_lazy/queue.hvm
----
-λa λ* (a 1 λb λ* (b 2 λc λ* (c 3 λ* λd d)))
diff --git a/tests/snapshots/run_lazy__radix_sort_ctr.hvm.snap b/tests/snapshots/run_lazy__radix_sort_ctr.hvm.snap
deleted file mode 100644
index 8de2c819..00000000
--- a/tests/snapshots/run_lazy__radix_sort_ctr.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_lazy/radix_sort_ctr.hvm
----
-120
diff --git a/tests/snapshots/run_lazy__recursive_match_native.hvm.snap b/tests/snapshots/run_lazy__recursive_match_native.hvm.snap
deleted file mode 100644
index 3b298953..00000000
--- a/tests/snapshots/run_lazy__recursive_match_native.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_lazy/recursive_match_native.hvm
----
-512
diff --git a/tests/snapshots/run_lazy__scopeless_discard.hvm.snap b/tests/snapshots/run_lazy__scopeless_discard.hvm.snap
deleted file mode 100644
index af509984..00000000
--- a/tests/snapshots/run_lazy__scopeless_discard.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_lazy/scopeless_discard.hvm
----
-(2, *)
diff --git a/tests/snapshots/run_lazy__str_concat.hvm.snap b/tests/snapshots/run_lazy__str_concat.hvm.snap
deleted file mode 100644
index 89f1c95b..00000000
--- a/tests/snapshots/run_lazy__str_concat.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_lazy/str_concat.hvm
----
-"hello world"
diff --git a/tests/snapshots/run_lazy__str_inc.hvm.snap b/tests/snapshots/run_lazy__str_inc.hvm.snap
deleted file mode 100644
index 8aa6d173..00000000
--- a/tests/snapshots/run_lazy__str_inc.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_lazy/str_inc.hvm
----
-(11, #str λa (105, (102, (109, (109, (112, (33, (120, (112, (115, (109, (101, a))))))))))))
diff --git a/tests/snapshots/run_lazy__str_inc_eta.hvm.snap b/tests/snapshots/run_lazy__str_inc_eta.hvm.snap
deleted file mode 100644
index e9b83b5f..00000000
--- a/tests/snapshots/run_lazy__str_inc_eta.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_lazy/str_inc_eta.hvm
----
-(11, #str λa (105, (102, (109, (109, (112, (33, (120, (112, (115, (109, (101, a))))))))))))
diff --git a/tests/snapshots/run_lazy__str_len.hvm.snap b/tests/snapshots/run_lazy__str_len.hvm.snap
deleted file mode 100644
index 3d58f5fb..00000000
--- a/tests/snapshots/run_lazy__str_len.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_lazy/str_len.hvm
----
-4
diff --git a/tests/snapshots/run_lazy__sum_tree.hvm.snap b/tests/snapshots/run_lazy__sum_tree.hvm.snap
deleted file mode 100644
index 5d3fa19b..00000000
--- a/tests/snapshots/run_lazy__sum_tree.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_lazy/sum_tree.hvm
----
-256
diff --git a/tests/snapshots/run_lazy__sup_app.hvm.snap b/tests/snapshots/run_lazy__sup_app.hvm.snap
deleted file mode 100644
index 9ad845c7..00000000
--- a/tests/snapshots/run_lazy__sup_app.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_lazy/sup_app.hvm
----
-#id{3 3}
diff --git a/tests/snapshots/run_lazy__sup_reconstruction.hvm.snap b/tests/snapshots/run_lazy__sup_reconstruction.hvm.snap
deleted file mode 100644
index 6a9adc64..00000000
--- a/tests/snapshots/run_lazy__sup_reconstruction.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_lazy/sup_reconstruction.hvm
----
-λa a
diff --git a/tests/snapshots/run_lazy__superposed_is_even.hvm.snap b/tests/snapshots/run_lazy__superposed_is_even.hvm.snap
deleted file mode 100644
index 33834727..00000000
--- a/tests/snapshots/run_lazy__superposed_is_even.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_lazy/superposed_is_even.hvm
----
-#0{#1{T F} #2{T F}}
diff --git a/tests/snapshots/run_lazy__tagged_lam.hvm.snap b/tests/snapshots/run_lazy__tagged_lam.hvm.snap
deleted file mode 100644
index 51283648..00000000
--- a/tests/snapshots/run_lazy__tagged_lam.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_lazy/tagged_lam.hvm
----
-(3, 4)
diff --git a/tests/snapshots/run_lazy__tup_reconstruction.hvm.snap b/tests/snapshots/run_lazy__tup_reconstruction.hvm.snap
deleted file mode 100644
index 68c73f4a..00000000
--- a/tests/snapshots/run_lazy__tup_reconstruction.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_lazy/tup_reconstruction.hvm
----
-λa a
diff --git a/tests/snapshots/run_lazy__tuple_rots.hvm.snap b/tests/snapshots/run_lazy__tuple_rots.hvm.snap
deleted file mode 100644
index 3f18b1eb..00000000
--- a/tests/snapshots/run_lazy__tuple_rots.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_lazy/tuple_rots.hvm
----
-λa (a 5 6 7 8 1 2 3 4)
diff --git a/tests/snapshots/run_lazy__unaplied_str.hvm.snap b/tests/snapshots/run_lazy__unaplied_str.hvm.snap
deleted file mode 100644
index 13dbaad7..00000000
--- a/tests/snapshots/run_lazy__unaplied_str.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_lazy/unaplied_str.hvm
----
-λa λb (String.cons a (String.cons 98 (String.cons 99 (String.cons b String.nil))))
diff --git a/tests/snapshots/run_lazy__unused_dup_var.hvm.snap b/tests/snapshots/run_lazy__unused_dup_var.hvm.snap
deleted file mode 100644
index 38584ea5..00000000
--- a/tests/snapshots/run_lazy__unused_dup_var.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_lazy/unused_dup_var.hvm
----
-λa (a λb b)
diff --git a/tests/snapshots/run_lazy__world.hvm.snap b/tests/snapshots/run_lazy__world.hvm.snap
deleted file mode 100644
index 54e87a8d..00000000
--- a/tests/snapshots/run_lazy__world.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_lazy/world.hvm
----
-"🌎"
diff --git a/tests/snapshots/run_lazy__wrong_string.hvm.snap b/tests/snapshots/run_lazy__wrong_string.hvm.snap
deleted file mode 100644
index 8b3bc7ee..00000000
--- a/tests/snapshots/run_lazy__wrong_string.hvm.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tests/golden_tests.rs
-input_file: tests/golden_tests/run_lazy/wrong_string.hvm
----
-(String.cons (*, 4) (String.cons * String.nil))
diff --git a/tests/snapshots/scott_triggers_unused__test.hvm.snap b/tests/snapshots/scott_triggers_unused__test.bend.snap
similarity index 61%
rename from tests/snapshots/scott_triggers_unused__test.hvm.snap
rename to tests/snapshots/scott_triggers_unused__test.bend.snap
index 40035444..2fe5312a 100644
--- a/tests/snapshots/scott_triggers_unused__test.hvm.snap
+++ b/tests/snapshots/scott_triggers_unused__test.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/scott_triggers_unused/test.hvm
+input_file: tests/golden_tests/scott_triggers_unused/test.bend
 ---
 @bool/f = (* (a a))
 
diff --git a/tests/snapshots/simplify_matches__adt_tup_era.hvm.snap b/tests/snapshots/simplify_matches__adt_tup_era.bend.snap
similarity index 74%
rename from tests/snapshots/simplify_matches__adt_tup_era.hvm.snap
rename to tests/snapshots/simplify_matches__adt_tup_era.bend.snap
index af081853..c4ab658a 100644
--- a/tests/snapshots/simplify_matches__adt_tup_era.hvm.snap
+++ b/tests/snapshots/simplify_matches__adt_tup_era.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/simplify_matches/adt_tup_era.hvm
+input_file: tests/golden_tests/simplify_matches/adt_tup_era.bend
 ---
 (Foo) = λa match a { Tuple/Pair b c: (match b { Tuple/Pair d e: λf d; } c); }
 
diff --git a/tests/snapshots/simplify_matches__already_flat.hvm.snap b/tests/snapshots/simplify_matches__already_flat.bend.snap
similarity index 92%
rename from tests/snapshots/simplify_matches__already_flat.hvm.snap
rename to tests/snapshots/simplify_matches__already_flat.bend.snap
index 26cec411..c1b01713 100644
--- a/tests/snapshots/simplify_matches__already_flat.hvm.snap
+++ b/tests/snapshots/simplify_matches__already_flat.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/simplify_matches/already_flat.hvm
+input_file: tests/golden_tests/simplify_matches/already_flat.bend
 ---
 (Rule1) = λa a
 
diff --git a/tests/snapshots/simplify_matches__bits_dec.hvm.snap b/tests/snapshots/simplify_matches__bits_dec.bend.snap
similarity index 88%
rename from tests/snapshots/simplify_matches__bits_dec.hvm.snap
rename to tests/snapshots/simplify_matches__bits_dec.bend.snap
index ebbc3cef..81b56ade 100644
--- a/tests/snapshots/simplify_matches__bits_dec.hvm.snap
+++ b/tests/snapshots/simplify_matches__bits_dec.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/simplify_matches/bits_dec.hvm
+input_file: tests/golden_tests/simplify_matches/bits_dec.bend
 ---
 (Data.Bits.dec) = λa match a { Data/Bits/e: Data/Bits/e; Data/Bits/o b: match b { Data/Bits/e: Data/Bits/e; Data/Bits/o c: (Data/Bits/i (Data.Bits.dec c)); Data/Bits/i d: (Data/Bits/i (Data.Bits.dec d)); }; Data/Bits/i e: match e { Data/Bits/e: (Data/Bits/o Data/Bits/e); Data/Bits/o f: (Data/Bits/o f); Data/Bits/i g: (Data/Bits/o g); }; }
 
diff --git a/tests/snapshots/simplify_matches__complex_with_case.hvm.snap b/tests/snapshots/simplify_matches__complex_with_case.bend.snap
similarity index 98%
rename from tests/snapshots/simplify_matches__complex_with_case.hvm.snap
rename to tests/snapshots/simplify_matches__complex_with_case.bend.snap
index ee477ab9..ea026550 100644
--- a/tests/snapshots/simplify_matches__complex_with_case.hvm.snap
+++ b/tests/snapshots/simplify_matches__complex_with_case.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/simplify_matches/complex_with_case.hvm
+input_file: tests/golden_tests/simplify_matches/complex_with_case.bend
 ---
 (map) = λa λb (match b { Tree/Node c d e f: λg (Tree/Node (map g c) (map g d) (map g e) (map g f)); Tree/Leaf h: λi (Tree/Leaf (i h)); } a)
 
diff --git a/tests/snapshots/simplify_matches__double_unwrap_box.hvm.snap b/tests/snapshots/simplify_matches__double_unwrap_box.bend.snap
similarity index 97%
rename from tests/snapshots/simplify_matches__double_unwrap_box.hvm.snap
rename to tests/snapshots/simplify_matches__double_unwrap_box.bend.snap
index ff19aa0d..ed8c78ec 100644
--- a/tests/snapshots/simplify_matches__double_unwrap_box.hvm.snap
+++ b/tests/snapshots/simplify_matches__double_unwrap_box.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/simplify_matches/double_unwrap_box.hvm
+input_file: tests/golden_tests/simplify_matches/double_unwrap_box.bend
 ---
 (DoubleUnbox) = λa match a { Boxed/Box b: match b { Boxed/Box c: λd c; }; }
 
diff --git a/tests/snapshots/simplify_matches__double_unwrap_maybe.hvm.snap b/tests/snapshots/simplify_matches__double_unwrap_maybe.bend.snap
similarity index 97%
rename from tests/snapshots/simplify_matches__double_unwrap_maybe.hvm.snap
rename to tests/snapshots/simplify_matches__double_unwrap_maybe.bend.snap
index 99a40799..6e5798f5 100644
--- a/tests/snapshots/simplify_matches__double_unwrap_maybe.hvm.snap
+++ b/tests/snapshots/simplify_matches__double_unwrap_maybe.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/simplify_matches/double_unwrap_maybe.hvm
+input_file: tests/golden_tests/simplify_matches/double_unwrap_maybe.bend
 ---
 (DoubleUnwrap) = λa match a { Maybe/Some b: match b { Maybe/Some c: λd c; Maybe/None: λe e; }; Maybe/None: λf f; }
 
diff --git a/tests/snapshots/simplify_matches__flatten_with_terminal.hvm.snap b/tests/snapshots/simplify_matches__flatten_with_terminal.bend.snap
similarity index 96%
rename from tests/snapshots/simplify_matches__flatten_with_terminal.hvm.snap
rename to tests/snapshots/simplify_matches__flatten_with_terminal.bend.snap
index cd705ad8..1be1fbfe 100644
--- a/tests/snapshots/simplify_matches__flatten_with_terminal.hvm.snap
+++ b/tests/snapshots/simplify_matches__flatten_with_terminal.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/simplify_matches/flatten_with_terminal.hvm
+input_file: tests/golden_tests/simplify_matches/flatten_with_terminal.bend
 ---
 (Foo) = λa switch a { 0: λb match b { A_t/A c: match c { B_t/B: B_t/B; }; }; _ d: λe *; }
 
diff --git a/tests/snapshots/simplify_matches__linearize_match_all.hvm.snap b/tests/snapshots/simplify_matches__linearize_match_all.bend.snap
similarity index 99%
rename from tests/snapshots/simplify_matches__linearize_match_all.hvm.snap
rename to tests/snapshots/simplify_matches__linearize_match_all.bend.snap
index 1bb01802..c095caad 100644
--- a/tests/snapshots/simplify_matches__linearize_match_all.hvm.snap
+++ b/tests/snapshots/simplify_matches__linearize_match_all.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/simplify_matches/linearize_match_all.hvm
+input_file: tests/golden_tests/simplify_matches/linearize_match_all.bend
 ---
 (A) = λa switch a { 0: λb λc (b c); _ d: λe λf (d e f); }
 
diff --git a/tests/snapshots/simplify_matches__match_str.hvm.snap b/tests/snapshots/simplify_matches__match_str.bend.snap
similarity index 88%
rename from tests/snapshots/simplify_matches__match_str.hvm.snap
rename to tests/snapshots/simplify_matches__match_str.bend.snap
index 2a6b2458..d886d7e4 100644
--- a/tests/snapshots/simplify_matches__match_str.hvm.snap
+++ b/tests/snapshots/simplify_matches__match_str.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/simplify_matches/match_str.hvm
+input_file: tests/golden_tests/simplify_matches/match_str.bend
 ---
 (is_as) = λa match a { String/cons b c: (switch (- b 65) { 0: λd match d { String/cons e f: (switch (- e 115) { 0: λg match g { String/cons h i: 0; String/nil: 2; }; _ j: λk 0; } f); String/nil: 0; }; _ l: λm (switch (- l 31) { 0: λn match n { String/cons o p: (switch (- o 115) { 0: λq match q { String/cons r s: 0; String/nil: 2; }; _ t: λu 0; } p); String/nil: 0; }; _ v: λw 0; } m); } c); String/nil: 1; }
 
diff --git a/tests/snapshots/simplify_matches__nested.hvm.snap b/tests/snapshots/simplify_matches__nested.bend.snap
similarity index 85%
rename from tests/snapshots/simplify_matches__nested.hvm.snap
rename to tests/snapshots/simplify_matches__nested.bend.snap
index 35a1deb6..d01265ac 100644
--- a/tests/snapshots/simplify_matches__nested.hvm.snap
+++ b/tests/snapshots/simplify_matches__nested.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/simplify_matches/nested.hvm
+input_file: tests/golden_tests/simplify_matches/nested.bend
 ---
 (Rule) = λa match a { Foo/CtrA b c: (match c { Bar/CtrB1 d: λe (e d); Bar/CtrB2 f g: λh (match f { Baz/CtrC: λi λj (i j); } h g); } b); Foo/CtrB k: k; }
 
diff --git a/tests/snapshots/simplify_matches__nested2.hvm.snap b/tests/snapshots/simplify_matches__nested2.bend.snap
similarity index 82%
rename from tests/snapshots/simplify_matches__nested2.hvm.snap
rename to tests/snapshots/simplify_matches__nested2.bend.snap
index 6264039e..13028450 100644
--- a/tests/snapshots/simplify_matches__nested2.hvm.snap
+++ b/tests/snapshots/simplify_matches__nested2.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/simplify_matches/nested2.hvm
+input_file: tests/golden_tests/simplify_matches/nested2.bend
 ---
 (Foo) = λa λb (match b { List/cons c d: λe (match d { List/cons f g: λh λi (h i f g); List/nil: λj λk (j (List/cons k List/nil)); } e c); List/nil: λl (l List/nil); } a)
 
diff --git a/tests/snapshots/simplify_matches__nested_0ary.hvm.snap b/tests/snapshots/simplify_matches__nested_0ary.bend.snap
similarity index 80%
rename from tests/snapshots/simplify_matches__nested_0ary.hvm.snap
rename to tests/snapshots/simplify_matches__nested_0ary.bend.snap
index 91b59fce..1f03ca1d 100644
--- a/tests/snapshots/simplify_matches__nested_0ary.hvm.snap
+++ b/tests/snapshots/simplify_matches__nested_0ary.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/simplify_matches/nested_0ary.hvm
+input_file: tests/golden_tests/simplify_matches/nested_0ary.bend
 ---
 (Unpack) = λa λb (match b { list/Cons c d: λe (match d { list/Cons f g: λh λi (h (list/Cons i (list/Cons f g))); list/Nil: λj λk k; } e c); list/Nil: λl list/Nil; } a)
 
diff --git a/tests/snapshots/simplify_matches__redundant_with_era.hvm.snap b/tests/snapshots/simplify_matches__redundant_with_era.bend.snap
similarity index 96%
rename from tests/snapshots/simplify_matches__redundant_with_era.hvm.snap
rename to tests/snapshots/simplify_matches__redundant_with_era.bend.snap
index 388b99f2..78a48999 100644
--- a/tests/snapshots/simplify_matches__redundant_with_era.hvm.snap
+++ b/tests/snapshots/simplify_matches__redundant_with_era.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/simplify_matches/redundant_with_era.hvm
+input_file: tests/golden_tests/simplify_matches/redundant_with_era.bend
 ---
 (Fn2) = λa switch a { 0: λb let (c, d) = b; let (e, f) = d; f; _ g: λh let (i, j) = h; let (k, l) = j; l; }
 
diff --git a/tests/snapshots/simplify_matches__wrong_fn_arity.hvm.snap b/tests/snapshots/simplify_matches__wrong_fn_arity.bend.snap
similarity index 74%
rename from tests/snapshots/simplify_matches__wrong_fn_arity.hvm.snap
rename to tests/snapshots/simplify_matches__wrong_fn_arity.bend.snap
index 6304e4f2..0420c05e 100644
--- a/tests/snapshots/simplify_matches__wrong_fn_arity.hvm.snap
+++ b/tests/snapshots/simplify_matches__wrong_fn_arity.bend.snap
@@ -1,6 +1,6 @@
 ---
 source: tests/golden_tests.rs
-input_file: tests/golden_tests/simplify_matches/wrong_fn_arity.hvm
+input_file: tests/golden_tests/simplify_matches/wrong_fn_arity.bend
 ---
 Errors:
 File has no 'main' definition.