From f0c7314e176759c37d9876b1831cf6d416db8105 Mon Sep 17 00:00:00 2001
From: d0cd <pranavsaig@gmail.com>
Date: Sat, 4 Feb 2023 22:01:23 -0800
Subject: [PATCH] Regen expectations

---
 compiler/compiler/tests/compile.rs            |   4 +-
 .../expectations/compiler/address/binary.out  |   1 +
 .../expectations/compiler/address/branch.out  |   1 +
 tests/expectations/compiler/address/equal.out |   1 +
 .../expectations/compiler/address/ternary.out |   1 +
 tests/expectations/compiler/boolean/and.out   |   1 +
 .../compiler/boolean/conditional.out          |   1 +
 tests/expectations/compiler/boolean/equal.out |   1 +
 .../compiler/boolean/not_equal.out            |   1 +
 .../compiler/boolean/operator_methods.out     |   1 +
 tests/expectations/compiler/boolean/or.out    |   1 +
 .../expectations/compiler/console/assert.out  |   1 +
 .../compiler/console/conditional_assert.out   |   1 +
 .../core/algorithms/bhp1024_commit.out        |   1 +
 .../compiler/core/algorithms/bhp1024_hash.out |   1 +
 .../core/algorithms/bhp256_commit.out         |   1 +
 .../compiler/core/algorithms/bhp256_hash.out  |   1 +
 .../core/algorithms/bhp512_commit.out         |   1 +
 .../compiler/core/algorithms/bhp512_hash.out  |   1 +
 .../core/algorithms/bhp768_commit.out         |   1 +
 .../compiler/core/algorithms/bhp768_hash.out  |   1 +
 .../core/algorithms/pedersen128_commit.out    |   1 +
 .../core/algorithms/pedersen128_hash.out      |   1 +
 .../core/algorithms/pedersen64_commit.out     |   1 +
 .../core/algorithms/pedersen64_hash.out       |   1 +
 .../core/algorithms/poseidon2_hash.out        |   1 +
 .../core/algorithms/poseidon4_hash.out        |   1 +
 .../core/algorithms/poseidon8_hash.out        |   1 +
 .../compiler/definition/out_of_order.out      |   1 +
 tests/expectations/compiler/field/add.out     |   1 +
 tests/expectations/compiler/field/div.out     |   1 +
 tests/expectations/compiler/field/eq.out      |   1 +
 tests/expectations/compiler/field/field.out   |   1 +
 tests/expectations/compiler/field/mul.out     |   1 +
 tests/expectations/compiler/field/negate.out  |   1 +
 .../compiler/field/operator_methods.out       |   1 +
 tests/expectations/compiler/field/pow.out     |   1 +
 tests/expectations/compiler/field/sub.out     |   1 +
 tests/expectations/compiler/field/ternary.out |   1 +
 .../compiler/finalize/decrement.out           |   1 +
 .../compiler/finalize/finalize.out            |   1 +
 .../finalize/finalize_with_return.out         |   1 +
 .../compiler/finalize/increment.out           |   1 +
 .../compiler/finalize/mapping.out             |   1 +
 .../compiler/function/conditional_return.out  |   1 +
 .../compiler/function/flatten_test.out        |   1 +
 .../function/flatten_tuples_of_structs.out    |   1 +
 .../compiler/function/function_call.out       |   1 +
 .../function/function_call_out_of_order.out   |   1 +
 .../helper_function_with_interface.out        |   1 +
 .../function/private_input_output.out         |   1 +
 ...ction_any_number_of_inputs_and_outputs.out |   1 +
 .../function/program_function_empty_body.out  |   1 +
 .../function/program_function_unit_type.out   |   1 +
 .../function/program_function_with_mode.out   |   1 +
 .../function/record_in_conditional_return.out |   1 +
 tests/expectations/compiler/function/self.out |   1 +
 tests/expectations/compiler/group/add.out     |   1 +
 .../expectations/compiler/group/assert_eq.out |   1 +
 tests/expectations/compiler/group/eq.out      |   1 +
 .../expectations/compiler/group/group_mul.out |   1 +
 tests/expectations/compiler/group/input.out   |   1 +
 tests/expectations/compiler/group/mul.out     |   1 +
 .../compiler/group/mult_by_scalar.out         |   1 +
 tests/expectations/compiler/group/negate.out  |   1 +
 .../compiler/group/operator_methods.out       |   1 +
 .../compiler/group/point_input.out            |   1 +
 tests/expectations/compiler/group/sub.out     |   1 +
 tests/expectations/compiler/group/ternary.out |   1 +
 tests/expectations/compiler/group/x_and_y.out |   1 +
 .../compiler/group/x_sign_high.out            |   1 +
 .../compiler/group/x_sign_inferred.out        |   1 +
 .../compiler/group/x_sign_low.out             |   1 +
 tests/expectations/compiler/group/zero.out    |   1 +
 tests/expectations/compiler/input/main.out    |   1 +
 .../compiler/input/main_field.out             |   1 +
 .../compiler/integers/i128/add.out            |   1 +
 .../compiler/integers/i128/and.out            |   1 +
 .../compiler/integers/i128/console_assert.out |   1 +
 .../compiler/integers/i128/div.out            |   1 +
 .../compiler/integers/i128/eq.out             |   1 +
 .../compiler/integers/i128/ge.out             |   1 +
 .../compiler/integers/i128/gt.out             |   1 +
 .../compiler/integers/i128/le.out             |   1 +
 .../compiler/integers/i128/lt.out             |   1 +
 .../compiler/integers/i128/max.out            |   1 +
 .../compiler/integers/i128/min.out            |   1 +
 .../compiler/integers/i128/min_fail.out       |   1 +
 .../compiler/integers/i128/mul.out            |   1 +
 .../compiler/integers/i128/ne.out             |   1 +
 .../compiler/integers/i128/negate.out         |   1 +
 .../integers/i128/negate_min_fail.out         |   1 +
 .../compiler/integers/i128/negate_zero.out    |   1 +
 .../integers/i128/operator_methods.out        |   1 +
 .../compiler/integers/i128/or.out             |   1 +
 .../compiler/integers/i128/pow.out            |   1 +
 .../compiler/integers/i128/rem.out            |   1 +
 .../compiler/integers/i128/shl.out            |   1 +
 .../compiler/integers/i128/shr.out            |   1 +
 .../compiler/integers/i128/sub.out            |   1 +
 .../compiler/integers/i128/ternary.out        |   1 +
 .../compiler/integers/i128/xor.out            |   1 +
 .../compiler/integers/i16/add.out             |   1 +
 .../compiler/integers/i16/and.out             |   1 +
 .../compiler/integers/i16/console_assert.out  |   1 +
 .../compiler/integers/i16/div.out             |   1 +
 .../expectations/compiler/integers/i16/eq.out |   1 +
 .../expectations/compiler/integers/i16/ge.out |   1 +
 .../expectations/compiler/integers/i16/gt.out |   1 +
 .../expectations/compiler/integers/i16/le.out |   1 +
 .../expectations/compiler/integers/i16/lt.out |   1 +
 .../compiler/integers/i16/max.out             |   1 +
 .../compiler/integers/i16/min.out             |   1 +
 .../compiler/integers/i16/min_fail.out        |   1 +
 .../compiler/integers/i16/mul.out             |   1 +
 .../expectations/compiler/integers/i16/ne.out |   1 +
 .../compiler/integers/i16/negate.out          |   1 +
 .../compiler/integers/i16/negate_min_fail.out |   1 +
 .../compiler/integers/i16/negate_zero.out     |   1 +
 .../integers/i16/operator_methods.out         |   1 +
 .../expectations/compiler/integers/i16/or.out |   1 +
 .../compiler/integers/i16/pow.out             |   1 +
 .../compiler/integers/i16/rem.out             |   1 +
 .../compiler/integers/i16/shl.out             |   1 +
 .../compiler/integers/i16/shr.out             |   1 +
 .../compiler/integers/i16/sub.out             |   1 +
 .../compiler/integers/i16/ternary.out         |   1 +
 .../compiler/integers/i16/xor.out             |   1 +
 .../compiler/integers/i32/add.out             |   1 +
 .../compiler/integers/i32/and.out             |   1 +
 .../compiler/integers/i32/console_assert.out  |   1 +
 .../compiler/integers/i32/div.out             |   1 +
 .../expectations/compiler/integers/i32/eq.out |   1 +
 .../expectations/compiler/integers/i32/ge.out |   1 +
 .../expectations/compiler/integers/i32/gt.out |   1 +
 .../expectations/compiler/integers/i32/le.out |   1 +
 .../expectations/compiler/integers/i32/lt.out |   1 +
 .../compiler/integers/i32/max.out             |   1 +
 .../compiler/integers/i32/min.out             |   1 +
 .../compiler/integers/i32/min_fail.out        |   1 +
 .../compiler/integers/i32/mul.out             |   1 +
 .../expectations/compiler/integers/i32/ne.out |   1 +
 .../compiler/integers/i32/negate.out          |   1 +
 .../compiler/integers/i32/negate_min_fail.out |   1 +
 .../compiler/integers/i32/negate_zero.out     |   1 +
 .../integers/i32/operator_methods.out         |   1 +
 .../expectations/compiler/integers/i32/or.out |   1 +
 .../compiler/integers/i32/pow.out             |   1 +
 .../compiler/integers/i32/rem.out             |   1 +
 .../compiler/integers/i32/shl.out             |   1 +
 .../compiler/integers/i32/shr.out             |   1 +
 .../compiler/integers/i32/sub.out             |   1 +
 .../compiler/integers/i32/ternary.out         |   1 +
 .../compiler/integers/i32/xor.out             |   1 +
 .../compiler/integers/i64/add.out             |   1 +
 .../compiler/integers/i64/and.out             |   1 +
 .../compiler/integers/i64/console_assert.out  |   1 +
 .../compiler/integers/i64/div.out             |   1 +
 .../expectations/compiler/integers/i64/eq.out |   1 +
 .../expectations/compiler/integers/i64/ge.out |   1 +
 .../expectations/compiler/integers/i64/gt.out |   1 +
 .../expectations/compiler/integers/i64/le.out |   1 +
 .../expectations/compiler/integers/i64/lt.out |   1 +
 .../compiler/integers/i64/max.out             |   1 +
 .../compiler/integers/i64/min.out             |   1 +
 .../compiler/integers/i64/min_fail.out        |   1 +
 .../compiler/integers/i64/mul.out             |   1 +
 .../expectations/compiler/integers/i64/ne.out |   1 +
 .../compiler/integers/i64/negate.out          |   1 +
 .../compiler/integers/i64/negate_min_fail.out |   1 +
 .../compiler/integers/i64/negate_zero.out     |   1 +
 .../integers/i64/operator_methods.out         |   1 +
 .../expectations/compiler/integers/i64/or.out |   1 +
 .../compiler/integers/i64/pow.out             |   1 +
 .../compiler/integers/i64/rem.out             |   1 +
 .../compiler/integers/i64/shl.out             |   1 +
 .../compiler/integers/i64/shr.out             |   1 +
 .../compiler/integers/i64/sub.out             |   1 +
 .../compiler/integers/i64/ternary.out         |   1 +
 .../compiler/integers/i64/xor.out             |   1 +
 .../expectations/compiler/integers/i8/add.out |   1 +
 .../expectations/compiler/integers/i8/and.out |   1 +
 .../compiler/integers/i8/console_assert.out   |   1 +
 .../expectations/compiler/integers/i8/div.out |   1 +
 .../expectations/compiler/integers/i8/eq.out  |   1 +
 .../expectations/compiler/integers/i8/ge.out  |   1 +
 .../expectations/compiler/integers/i8/gt.out  |   1 +
 .../expectations/compiler/integers/i8/le.out  |   1 +
 .../expectations/compiler/integers/i8/lt.out  |   1 +
 .../expectations/compiler/integers/i8/max.out |   1 +
 .../expectations/compiler/integers/i8/min.out |   1 +
 .../compiler/integers/i8/min_fail.out         |   1 +
 .../expectations/compiler/integers/i8/mul.out |   1 +
 .../expectations/compiler/integers/i8/ne.out  |   1 +
 .../compiler/integers/i8/negate.out           |   1 +
 .../compiler/integers/i8/negate_min_fail.out  |   1 +
 .../compiler/integers/i8/negate_zero.out      |   1 +
 .../compiler/integers/i8/operator_methods.out |   1 +
 .../expectations/compiler/integers/i8/or.out  |   1 +
 .../expectations/compiler/integers/i8/pow.out |   1 +
 .../expectations/compiler/integers/i8/rem.out |   1 +
 .../expectations/compiler/integers/i8/shl.out |   1 +
 .../expectations/compiler/integers/i8/shr.out |   1 +
 .../expectations/compiler/integers/i8/sub.out |   1 +
 .../compiler/integers/i8/ternary.out          |   1 +
 .../expectations/compiler/integers/i8/xor.out |   1 +
 .../compiler/integers/u128/add.out            |   1 +
 .../compiler/integers/u128/and.out            |   1 +
 .../compiler/integers/u128/console_assert.out |   1 +
 .../compiler/integers/u128/div.out            |   1 +
 .../compiler/integers/u128/eq.out             |   1 +
 .../compiler/integers/u128/ge.out             |   1 +
 .../compiler/integers/u128/gt.out             |   1 +
 .../compiler/integers/u128/le.out             |   1 +
 .../compiler/integers/u128/lt.out             |   1 +
 .../compiler/integers/u128/max.out            |   1 +
 .../compiler/integers/u128/min.out            |   1 +
 .../compiler/integers/u128/mul.out            |   1 +
 .../compiler/integers/u128/ne.out             |   1 +
 .../integers/u128/operator_methods.out        |   1 +
 .../compiler/integers/u128/or.out             |   1 +
 .../compiler/integers/u128/pow.out            |   1 +
 .../compiler/integers/u128/rem.out            |   1 +
 .../compiler/integers/u128/shl.out            |   1 +
 .../compiler/integers/u128/shr.out            |   1 +
 .../compiler/integers/u128/sub.out            |   1 +
 .../compiler/integers/u128/ternary.out        |   1 +
 .../compiler/integers/u128/xor.out            |   1 +
 .../compiler/integers/u16/add.out             |   1 +
 .../compiler/integers/u16/and.out             |   1 +
 .../compiler/integers/u16/console_assert.out  |   1 +
 .../compiler/integers/u16/div.out             |   1 +
 .../expectations/compiler/integers/u16/eq.out |   1 +
 .../expectations/compiler/integers/u16/ge.out |   1 +
 .../expectations/compiler/integers/u16/gt.out |   1 +
 .../expectations/compiler/integers/u16/le.out |   1 +
 .../expectations/compiler/integers/u16/lt.out |   1 +
 .../compiler/integers/u16/max.out             |   1 +
 .../compiler/integers/u16/min.out             |   1 +
 .../compiler/integers/u16/mul.out             |   1 +
 .../expectations/compiler/integers/u16/ne.out |   1 +
 .../integers/u16/operator_methods.out         |   1 +
 .../expectations/compiler/integers/u16/or.out |   1 +
 .../compiler/integers/u16/pow.out             |   1 +
 .../compiler/integers/u16/rem.out             |   1 +
 .../compiler/integers/u16/shl.out             |   1 +
 .../compiler/integers/u16/shr.out             |   1 +
 .../compiler/integers/u16/sub.out             |   1 +
 .../compiler/integers/u16/ternary.out         |   1 +
 .../compiler/integers/u16/xor.out             |   1 +
 .../compiler/integers/u32/add.out             |   1 +
 .../compiler/integers/u32/and.out             |   1 +
 .../compiler/integers/u32/console_assert.out  |   1 +
 .../compiler/integers/u32/div.out             |   1 +
 .../expectations/compiler/integers/u32/eq.out |   1 +
 .../expectations/compiler/integers/u32/ge.out |   1 +
 .../expectations/compiler/integers/u32/gt.out |   1 +
 .../expectations/compiler/integers/u32/le.out |   1 +
 .../expectations/compiler/integers/u32/lt.out |   1 +
 .../compiler/integers/u32/max.out             |   1 +
 .../compiler/integers/u32/min.out             |   1 +
 .../compiler/integers/u32/mul.out             |   1 +
 .../expectations/compiler/integers/u32/ne.out |   1 +
 .../integers/u32/operator_methods.out         |   1 +
 .../expectations/compiler/integers/u32/or.out |   1 +
 .../compiler/integers/u32/pow.out             |   1 +
 .../compiler/integers/u32/rem.out             |   1 +
 .../compiler/integers/u32/shl.out             |   1 +
 .../compiler/integers/u32/shr.out             |   1 +
 .../compiler/integers/u32/sub.out             |   1 +
 .../compiler/integers/u32/ternary.out         |   1 +
 .../compiler/integers/u32/xor.out             |   1 +
 .../compiler/integers/u64/add.out             |   1 +
 .../compiler/integers/u64/and.out             |   1 +
 .../compiler/integers/u64/console_assert.out  |   1 +
 .../compiler/integers/u64/div.out             |   1 +
 .../expectations/compiler/integers/u64/eq.out |   1 +
 .../expectations/compiler/integers/u64/ge.out |   1 +
 .../expectations/compiler/integers/u64/gt.out |   1 +
 .../expectations/compiler/integers/u64/le.out |   1 +
 .../expectations/compiler/integers/u64/lt.out |   1 +
 .../compiler/integers/u64/max.out             |   1 +
 .../compiler/integers/u64/min.out             |   1 +
 .../compiler/integers/u64/mul.out             |   1 +
 .../expectations/compiler/integers/u64/ne.out |   1 +
 .../integers/u64/operator_methods.out         |   1 +
 .../expectations/compiler/integers/u64/or.out |   1 +
 .../compiler/integers/u64/pow.out             |   1 +
 .../compiler/integers/u64/rem.out             |   1 +
 .../compiler/integers/u64/shl.out             |   1 +
 .../compiler/integers/u64/shr.out             |   1 +
 .../compiler/integers/u64/sub.out             |   1 +
 .../compiler/integers/u64/ternary.out         |   1 +
 .../compiler/integers/u64/xor.out             |   1 +
 .../expectations/compiler/integers/u8/add.out |   1 +
 .../expectations/compiler/integers/u8/and.out |   1 +
 .../compiler/integers/u8/console_assert.out   |   1 +
 .../expectations/compiler/integers/u8/div.out |   1 +
 .../expectations/compiler/integers/u8/eq.out  |   1 +
 .../expectations/compiler/integers/u8/ge.out  |   1 +
 .../expectations/compiler/integers/u8/gt.out  |   1 +
 .../expectations/compiler/integers/u8/le.out  |   1 +
 .../expectations/compiler/integers/u8/lt.out  |   1 +
 .../expectations/compiler/integers/u8/max.out |   1 +
 .../expectations/compiler/integers/u8/min.out |   1 +
 .../expectations/compiler/integers/u8/mul.out |   1 +
 .../expectations/compiler/integers/u8/ne.out  |   1 +
 .../compiler/integers/u8/operator_methods.out |   1 +
 .../expectations/compiler/integers/u8/or.out  |   1 +
 .../expectations/compiler/integers/u8/pow.out |   1 +
 .../expectations/compiler/integers/u8/rem.out |   1 +
 .../expectations/compiler/integers/u8/shl.out |   1 +
 .../expectations/compiler/integers/u8/shr.out |   1 +
 .../expectations/compiler/integers/u8/sub.out |   1 +
 .../compiler/integers/u8/ternary.out          |   1 +
 .../expectations/compiler/integers/u8/xor.out |   1 +
 .../compiler/records/declaration.out          |   1 +
 .../compiler/records/init_expression.out      |   1 +
 .../records/init_expression_shorthand.out     |   1 +
 .../compiler/records/nested_record.out        |   1 +
 .../record_declaration_out_of_order.out       |   1 +
 .../records/record_init_out_of_order.out      |   1 +
 tests/expectations/compiler/scalar/add.out    |   1 +
 tests/expectations/compiler/scalar/cmp.out    |   1 +
 tests/expectations/compiler/scalar/eq.out     |   1 +
 .../compiler/scalar/operator_methods.out      |   1 +
 tests/expectations/compiler/scalar/scalar.out |   1 +
 .../expectations/compiler/scalar/ternary.out  |   1 +
 .../compiler/statements/assign.out            |   1 +
 .../compiler/statements/block.out             |   1 +
 .../compiler/statements/chain.out             |   1 +
 .../compiler/statements/expr_statement.out    |   1 +
 .../compiler/statements/iteration_basic.out   |   1 +
 .../compiler/statements/iteration_nested.out  |   1 +
 .../compiler/statements/multiple_returns.out  |   1 +
 .../compiler/statements/mutate.out            |   1 +
 .../statements/operations/add_assign.out      |   1 +
 .../statements/operations/and_assign.out      |   1 +
 .../statements/operations/bitand_assign.out   |   1 +
 .../statements/operations/bitor_assign.out    |   1 +
 .../statements/operations/bitxor_assign.out   |   1 +
 .../statements/operations/div_assign.out      |   1 +
 .../statements/operations/mul_assign.out      |   1 +
 .../statements/operations/or_assign.out       |   1 +
 .../statements/operations/pow_assign.out      |   1 +
 .../statements/operations/rem_assign.out      |   1 +
 .../statements/operations/shl_assign.out      |   1 +
 .../statements/operations/shr_assign.out      |   1 +
 .../statements/operations/sub_assign.out      |   1 +
 .../ternary_explicit_and_implicit.out         |   1 +
 .../expectations/compiler/structs/inline.out  |   1 +
 .../compiler/structs/member_variable.out      |   1 +
 .../struct_declaration_out_of_order.out       |   1 +
 .../structs/struct_init_out_of_order.out      |   1 +
 .../tuple/function_call_returns_tuple.out     |   1 +
 .../compiler/tuple/function_early_return.out  |   1 +
 .../compiler/tuple/function_return.out        |   1 +
 .../tuple/function_return_nothing.out         |   1 +
 .../compiler/tuple/function_return_unit.out   |   1 +
 .../tuple/function_return_varying_modes.out   |   1 +
 .../tuple/return_with_different_modes.out     |   1 +
 .../compiler/tuple/tuple_access.out           |   1 +
 .../compiler/tuple/tuple_destructure.out      |   1 +
 .../compiler/tuple/tuple_in_assignment.out    |   1 +
 .../compiler/tuple/tuple_in_definition.out    |   1 +
 .../compiler/tuple/tuple_in_loop.out          |   1 +
 tests/expectations/compiler/tuple/unit.out    |   1 +
 tests/expectations/execution/chain.out        |   9 +-
 tests/expectations/tests/execution/chain.out  |  19 -
 .../tests/parser/expression/access/call.out   |  50 --
 .../parser/expression/array_init_fail.out     |   8 -
 .../parser/expression/array_inline_fail.out   |   9 -
 .../tests/parser/expression/binary/add.out    | 481 ------------
 .../parser/expression/binary/add_wrapped.out  | 243 ------
 .../tests/parser/expression/binary/and.out    | 313 --------
 .../parser/expression/binary/bit_and.out      | 481 ------------
 .../tests/parser/expression/binary/bit_or.out | 481 ------------
 .../parser/expression/binary/bit_xor.out      | 481 ------------
 .../tests/parser/expression/binary/div.out    | 369 ---------
 .../parser/expression/binary/div_wrapped.out  | 243 ------
 .../tests/parser/expression/binary/eq.out     | 439 -----------
 .../parser/expression/binary/eq_fail.out      |   5 -
 .../tests/parser/expression/binary/ge.out     | 334 --------
 .../parser/expression/binary/ge_fail.out      |   7 -
 .../tests/parser/expression/binary/gt.out     | 334 --------
 .../parser/expression/binary/gt_fail.out      |   7 -
 .../tests/parser/expression/binary/le.out     | 334 --------
 .../parser/expression/binary/le_fail.out      |   7 -
 .../tests/parser/expression/binary/lt.out     | 334 --------
 .../parser/expression/binary/lt_fail.out      |   7 -
 .../tests/parser/expression/binary/modulo.out | 243 ------
 .../tests/parser/expression/binary/mul.out    | 446 -----------
 .../parser/expression/binary/mul_wrapped.out  | 243 ------
 .../tests/parser/expression/binary/nand.out   | 243 ------
 .../tests/parser/expression/binary/neq.out    | 439 -----------
 .../parser/expression/binary/neq_fail.out     |   5 -
 .../tests/parser/expression/binary/nor.out    | 243 ------
 .../tests/parser/expression/binary/or.out     | 164 ----
 .../tests/parser/expression/binary/pow.out    | 320 --------
 .../parser/expression/binary/pow_wrapped.out  | 243 ------
 .../tests/parser/expression/binary/rem.out    | 369 ---------
 .../parser/expression/binary/rem_wrapped.out  | 243 ------
 .../tests/parser/expression/binary/shl.out    | 481 ------------
 .../parser/expression/binary/shl_wrapped.out  | 243 ------
 .../tests/parser/expression/binary/shr.out    | 481 ------------
 .../parser/expression/binary/shr_wrapped.out  | 243 ------
 .../tests/parser/expression/binary/sub.out    | 369 ---------
 .../parser/expression/binary/sub_wrapped.out  | 243 ------
 .../parser/expression/circuit_init_fail.out   |  16 -
 .../tests/parser/expression/ident.out         |  23 -
 .../parser/expression/literal/address.out     |  10 -
 .../expression/literal/address_fail.out       |  14 -
 .../expression/literal/address_parse.out      |  10 -
 .../tests/parser/expression/literal/bool.out  |  12 -
 .../parser/expression/literal/bool_parse.out  |  16 -
 .../tests/parser/expression/literal/char.out  |  57 --
 .../parser/expression/literal/char_fail.out   |  51 --
 .../parser/expression/literal/char_parse.out  |  55 --
 .../parser/expression/literal/comment.out     |  14 -
 .../expression/literal/comment_fail.out       |  15 -
 .../expression/literal/formatted_string.out   |  24 -
 .../tests/parser/expression/literal/group.out | 442 -----------
 .../parser/expression/literal/group_fail.out  |  16 -
 .../tests/parser/expression/literal/int.out   | 111 ---
 .../parser/expression/literal/int_fail.out    |   7 -
 .../expression/literal/int_parse/field.out    | 634 ---------------
 .../literal/int_parse/field_fail.out          |   5 -
 .../expression/literal/int_parse/i128.out     | 739 ------------------
 .../expression/literal/int_parse/i16.out      | 739 ------------------
 .../expression/literal/int_parse/i32.out      | 739 ------------------
 .../expression/literal/int_parse/i64.out      | 739 ------------------
 .../expression/literal/int_parse/i8.out       | 739 ------------------
 .../expression/literal/int_parse/implicit.out | 109 ---
 .../literal/int_parse/mono_group.out          | 739 ------------------
 .../expression/literal/int_parse/scalar.out   | 634 ---------------
 .../expression/literal/int_parse/u128.out     | 739 ------------------
 .../expression/literal/int_parse/u16.out      | 739 ------------------
 .../expression/literal/int_parse/u32.out      | 739 ------------------
 .../expression/literal/int_parse/u64.out      | 739 ------------------
 .../expression/literal/int_parse/u8.out       | 739 ------------------
 .../expression/literal/postfix_types.out      |  62 --
 .../parser/expression/literal/string.out      |  25 -
 .../parser/expression/literal/string_fail.out |   8 -
 .../tests/parser/expression/ternary.out       |  52 --
 .../tests/parser/expression/token_format.out  |  74 --
 .../tests/parser/expression/unary/abs.out     | 146 ----
 .../parser/expression/unary/abs_wrapped.out   | 146 ----
 .../tests/parser/expression/unary/double.out  | 146 ----
 .../tests/parser/expression/unary/inv.out     | 146 ----
 .../tests/parser/expression/unary/neg.out     | 220 ------
 .../tests/parser/expression/unary/not.out     | 192 -----
 .../tests/parser/expression/unary/sqrt.out    | 158 ----
 .../tests/parser/expression/unary/square.out  | 158 ----
 .../tests/parser/finalize/decrement.out       |  34 -
 .../tests/parser/finalize/decrement_fail.out  |   9 -
 .../tests/parser/finalize/finalize.out        | 106 ---
 .../tests/parser/finalize/finalize_fail.out   |   5 -
 .../parser/finalize/finalize_statement.out    |  47 --
 .../finalize/finalize_statement_fail.out      |  11 -
 .../tests/parser/finalize/increment.out       |  34 -
 .../tests/parser/finalize/increment_fail.out  |   9 -
 .../tests/parser/finalize/mapping.out         |  32 -
 .../tests/parser/finalize/mapping_fail.out    |   5 -
 .../annotated_arg_not_ident_fail.out          |   5 -
 .../parser/functions/annotated_context.out    |  96 ---
 .../parser/functions/annotated_functions.out  | 130 ---
 .../parser/functions/bounded_recursion.out    | 156 ----
 .../tests/parser/functions/const_input.out    |  78 --
 .../tests/parser/functions/const_param.out    | 120 ---
 .../functions/const_public_param_fail.out     |   5 -
 .../functions/danling_annotations_fail.out    |  42 -
 .../tests/parser/functions/empty2.out         |  38 -
 .../tests/parser/functions/escape_fail.out    |   5 -
 .../parser/functions/ident_token_fail.out     |   5 -
 .../parser/functions/infinite_recursion.out   | 100 ---
 .../parser/functions/mode_outside_tuple.out   |   5 -
 .../tests/parser/functions/mut_input_fail.out |   5 -
 .../tests/parser/functions/params.out         |  67 --
 .../tests/parser/functions/params_return.out  |  67 --
 .../functions/public_const_param_fail.out     |   5 -
 .../tests/parser/functions/public_param.out   | 120 ---
 .../tests/parser/functions/return.out         |  51 --
 .../functions/spaced_annotation_fail.out      |   5 -
 .../parser/functions/test_keyword_fail.out    |   5 -
 .../tests/parser/inputs/input_const.out       | 203 -----
 .../tests/parser/inputs/input_constant.out    | 203 -----
 .../inputs/input_constant_public_fail.out     |   5 -
 .../tests/parser/inputs/input_fail.out        |   5 -
 .../tests/parser/inputs/input_public.out      | 203 -----
 .../inputs/input_public_constant_fail.out     |   5 -
 .../tests/parser/program/backslash_eof.out    |   5 -
 .../parser/program/bidi_comment_2_fail.out    |   5 -
 .../parser/program/bidi_comment_fail.out      |   5 -
 .../program/circuit_deprecated_fail.out       |   5 -
 .../tests/parser/program/dollar_eof.out       |   5 -
 .../tests/parser/program/escape_u8_eof.out    |   5 -
 .../tests/parser/program/hex_eof.out          |   5 -
 .../tests/parser/program/mapping.out          |  31 -
 .../tests/parser/program/mapping_fail.out     |   5 -
 .../tests/parser/program/pipe_eof.out         |   5 -
 .../tests/parser/program/q_eof.out            |   5 -
 .../tests/parser/program/sq_eof.out           |   5 -
 .../tests/parser/program/tilde_eof.out        |   5 -
 .../program/unclosed_unicode_eof_fail.out     |   5 -
 .../tests/parser/serialize/one_plus_one.out   |  41 -
 .../tests/parser/serialize/parser_error.out   |   5 -
 .../tests/parser/statement/assert.out         |  56 --
 .../tests/parser/statement/assign.out         |  43 -
 .../tests/parser/statement/async_fail.out     |   5 -
 .../tests/parser/statement/block.out          |  90 ---
 .../tests/parser/statement/conditional.out    | 149 ----
 .../parser/statement/conditional_fail.out     |   5 -
 .../tests/parser/statement/console_fail.out   |  16 -
 .../tests/parser/statement/definition.out     | 231 ------
 .../parser/statement/definition_fail.out      |  47 --
 .../tests/parser/statement/expression.out     |  37 -
 .../parser/statement/expression_fail.out      |  10 -
 .../tests/parser/statement/finalize_fail.out  |   5 -
 .../tests/parser/statement/hex_int_fail.out   |   7 -
 .../tests/parser/statement/iteration.out      | 150 ----
 .../parser/statement/let_mut_recover.out      |   5 -
 .../tests/parser/statement/return.out         |  24 -
 .../tests/parser/statement/return_fail.out    |   7 -
 .../tests/parser/unreachable/define.out       |  49 --
 .../tests/parser/unreachable/eat_ident.out    |   5 -
 .../tests/parser/unreachable/eat_int.out      |  56 --
 .../equality_and_order_expression.out         |  56 --
 .../tests/parser/unreachable/expect_ident.out |  56 --
 .../tests/parser/unreachable/math_op_fail.out |  58 --
 .../tests/parser/unreachable/math_op_pass.out | 305 --------
 .../tests/parser/unreachable/postfix_fail.out |  24 -
 .../tests/parser/unreachable/postfix_pass.out | 279 -------
 tests/test-framework/src/runner.rs            |  30 +-
 533 files changed, 394 insertions(+), 26142 deletions(-)
 delete mode 100644 tests/expectations/tests/execution/chain.out
 delete mode 100644 tests/expectations/tests/parser/expression/access/call.out
 delete mode 100644 tests/expectations/tests/parser/expression/array_init_fail.out
 delete mode 100644 tests/expectations/tests/parser/expression/array_inline_fail.out
 delete mode 100644 tests/expectations/tests/parser/expression/binary/add.out
 delete mode 100644 tests/expectations/tests/parser/expression/binary/add_wrapped.out
 delete mode 100644 tests/expectations/tests/parser/expression/binary/and.out
 delete mode 100644 tests/expectations/tests/parser/expression/binary/bit_and.out
 delete mode 100644 tests/expectations/tests/parser/expression/binary/bit_or.out
 delete mode 100644 tests/expectations/tests/parser/expression/binary/bit_xor.out
 delete mode 100644 tests/expectations/tests/parser/expression/binary/div.out
 delete mode 100644 tests/expectations/tests/parser/expression/binary/div_wrapped.out
 delete mode 100644 tests/expectations/tests/parser/expression/binary/eq.out
 delete mode 100644 tests/expectations/tests/parser/expression/binary/eq_fail.out
 delete mode 100644 tests/expectations/tests/parser/expression/binary/ge.out
 delete mode 100644 tests/expectations/tests/parser/expression/binary/ge_fail.out
 delete mode 100644 tests/expectations/tests/parser/expression/binary/gt.out
 delete mode 100644 tests/expectations/tests/parser/expression/binary/gt_fail.out
 delete mode 100644 tests/expectations/tests/parser/expression/binary/le.out
 delete mode 100644 tests/expectations/tests/parser/expression/binary/le_fail.out
 delete mode 100644 tests/expectations/tests/parser/expression/binary/lt.out
 delete mode 100644 tests/expectations/tests/parser/expression/binary/lt_fail.out
 delete mode 100644 tests/expectations/tests/parser/expression/binary/modulo.out
 delete mode 100644 tests/expectations/tests/parser/expression/binary/mul.out
 delete mode 100644 tests/expectations/tests/parser/expression/binary/mul_wrapped.out
 delete mode 100644 tests/expectations/tests/parser/expression/binary/nand.out
 delete mode 100644 tests/expectations/tests/parser/expression/binary/neq.out
 delete mode 100644 tests/expectations/tests/parser/expression/binary/neq_fail.out
 delete mode 100644 tests/expectations/tests/parser/expression/binary/nor.out
 delete mode 100644 tests/expectations/tests/parser/expression/binary/or.out
 delete mode 100644 tests/expectations/tests/parser/expression/binary/pow.out
 delete mode 100644 tests/expectations/tests/parser/expression/binary/pow_wrapped.out
 delete mode 100644 tests/expectations/tests/parser/expression/binary/rem.out
 delete mode 100644 tests/expectations/tests/parser/expression/binary/rem_wrapped.out
 delete mode 100644 tests/expectations/tests/parser/expression/binary/shl.out
 delete mode 100644 tests/expectations/tests/parser/expression/binary/shl_wrapped.out
 delete mode 100644 tests/expectations/tests/parser/expression/binary/shr.out
 delete mode 100644 tests/expectations/tests/parser/expression/binary/shr_wrapped.out
 delete mode 100644 tests/expectations/tests/parser/expression/binary/sub.out
 delete mode 100644 tests/expectations/tests/parser/expression/binary/sub_wrapped.out
 delete mode 100644 tests/expectations/tests/parser/expression/circuit_init_fail.out
 delete mode 100644 tests/expectations/tests/parser/expression/ident.out
 delete mode 100644 tests/expectations/tests/parser/expression/literal/address.out
 delete mode 100644 tests/expectations/tests/parser/expression/literal/address_fail.out
 delete mode 100644 tests/expectations/tests/parser/expression/literal/address_parse.out
 delete mode 100644 tests/expectations/tests/parser/expression/literal/bool.out
 delete mode 100644 tests/expectations/tests/parser/expression/literal/bool_parse.out
 delete mode 100644 tests/expectations/tests/parser/expression/literal/char.out
 delete mode 100644 tests/expectations/tests/parser/expression/literal/char_fail.out
 delete mode 100644 tests/expectations/tests/parser/expression/literal/char_parse.out
 delete mode 100644 tests/expectations/tests/parser/expression/literal/comment.out
 delete mode 100644 tests/expectations/tests/parser/expression/literal/comment_fail.out
 delete mode 100644 tests/expectations/tests/parser/expression/literal/formatted_string.out
 delete mode 100644 tests/expectations/tests/parser/expression/literal/group.out
 delete mode 100644 tests/expectations/tests/parser/expression/literal/group_fail.out
 delete mode 100644 tests/expectations/tests/parser/expression/literal/int.out
 delete mode 100644 tests/expectations/tests/parser/expression/literal/int_fail.out
 delete mode 100644 tests/expectations/tests/parser/expression/literal/int_parse/field.out
 delete mode 100644 tests/expectations/tests/parser/expression/literal/int_parse/field_fail.out
 delete mode 100644 tests/expectations/tests/parser/expression/literal/int_parse/i128.out
 delete mode 100644 tests/expectations/tests/parser/expression/literal/int_parse/i16.out
 delete mode 100644 tests/expectations/tests/parser/expression/literal/int_parse/i32.out
 delete mode 100644 tests/expectations/tests/parser/expression/literal/int_parse/i64.out
 delete mode 100644 tests/expectations/tests/parser/expression/literal/int_parse/i8.out
 delete mode 100644 tests/expectations/tests/parser/expression/literal/int_parse/implicit.out
 delete mode 100644 tests/expectations/tests/parser/expression/literal/int_parse/mono_group.out
 delete mode 100644 tests/expectations/tests/parser/expression/literal/int_parse/scalar.out
 delete mode 100644 tests/expectations/tests/parser/expression/literal/int_parse/u128.out
 delete mode 100644 tests/expectations/tests/parser/expression/literal/int_parse/u16.out
 delete mode 100644 tests/expectations/tests/parser/expression/literal/int_parse/u32.out
 delete mode 100644 tests/expectations/tests/parser/expression/literal/int_parse/u64.out
 delete mode 100644 tests/expectations/tests/parser/expression/literal/int_parse/u8.out
 delete mode 100644 tests/expectations/tests/parser/expression/literal/postfix_types.out
 delete mode 100644 tests/expectations/tests/parser/expression/literal/string.out
 delete mode 100644 tests/expectations/tests/parser/expression/literal/string_fail.out
 delete mode 100644 tests/expectations/tests/parser/expression/ternary.out
 delete mode 100644 tests/expectations/tests/parser/expression/token_format.out
 delete mode 100644 tests/expectations/tests/parser/expression/unary/abs.out
 delete mode 100644 tests/expectations/tests/parser/expression/unary/abs_wrapped.out
 delete mode 100644 tests/expectations/tests/parser/expression/unary/double.out
 delete mode 100644 tests/expectations/tests/parser/expression/unary/inv.out
 delete mode 100644 tests/expectations/tests/parser/expression/unary/neg.out
 delete mode 100644 tests/expectations/tests/parser/expression/unary/not.out
 delete mode 100644 tests/expectations/tests/parser/expression/unary/sqrt.out
 delete mode 100644 tests/expectations/tests/parser/expression/unary/square.out
 delete mode 100644 tests/expectations/tests/parser/finalize/decrement.out
 delete mode 100644 tests/expectations/tests/parser/finalize/decrement_fail.out
 delete mode 100644 tests/expectations/tests/parser/finalize/finalize.out
 delete mode 100644 tests/expectations/tests/parser/finalize/finalize_fail.out
 delete mode 100644 tests/expectations/tests/parser/finalize/finalize_statement.out
 delete mode 100644 tests/expectations/tests/parser/finalize/finalize_statement_fail.out
 delete mode 100644 tests/expectations/tests/parser/finalize/increment.out
 delete mode 100644 tests/expectations/tests/parser/finalize/increment_fail.out
 delete mode 100644 tests/expectations/tests/parser/finalize/mapping.out
 delete mode 100644 tests/expectations/tests/parser/finalize/mapping_fail.out
 delete mode 100644 tests/expectations/tests/parser/functions/annotated_arg_not_ident_fail.out
 delete mode 100644 tests/expectations/tests/parser/functions/annotated_context.out
 delete mode 100644 tests/expectations/tests/parser/functions/annotated_functions.out
 delete mode 100644 tests/expectations/tests/parser/functions/bounded_recursion.out
 delete mode 100644 tests/expectations/tests/parser/functions/const_input.out
 delete mode 100644 tests/expectations/tests/parser/functions/const_param.out
 delete mode 100644 tests/expectations/tests/parser/functions/const_public_param_fail.out
 delete mode 100644 tests/expectations/tests/parser/functions/danling_annotations_fail.out
 delete mode 100644 tests/expectations/tests/parser/functions/empty2.out
 delete mode 100644 tests/expectations/tests/parser/functions/escape_fail.out
 delete mode 100644 tests/expectations/tests/parser/functions/ident_token_fail.out
 delete mode 100644 tests/expectations/tests/parser/functions/infinite_recursion.out
 delete mode 100644 tests/expectations/tests/parser/functions/mode_outside_tuple.out
 delete mode 100644 tests/expectations/tests/parser/functions/mut_input_fail.out
 delete mode 100644 tests/expectations/tests/parser/functions/params.out
 delete mode 100644 tests/expectations/tests/parser/functions/params_return.out
 delete mode 100644 tests/expectations/tests/parser/functions/public_const_param_fail.out
 delete mode 100644 tests/expectations/tests/parser/functions/public_param.out
 delete mode 100644 tests/expectations/tests/parser/functions/return.out
 delete mode 100644 tests/expectations/tests/parser/functions/spaced_annotation_fail.out
 delete mode 100644 tests/expectations/tests/parser/functions/test_keyword_fail.out
 delete mode 100644 tests/expectations/tests/parser/inputs/input_const.out
 delete mode 100644 tests/expectations/tests/parser/inputs/input_constant.out
 delete mode 100644 tests/expectations/tests/parser/inputs/input_constant_public_fail.out
 delete mode 100644 tests/expectations/tests/parser/inputs/input_fail.out
 delete mode 100644 tests/expectations/tests/parser/inputs/input_public.out
 delete mode 100644 tests/expectations/tests/parser/inputs/input_public_constant_fail.out
 delete mode 100644 tests/expectations/tests/parser/program/backslash_eof.out
 delete mode 100644 tests/expectations/tests/parser/program/bidi_comment_2_fail.out
 delete mode 100644 tests/expectations/tests/parser/program/bidi_comment_fail.out
 delete mode 100644 tests/expectations/tests/parser/program/circuit_deprecated_fail.out
 delete mode 100644 tests/expectations/tests/parser/program/dollar_eof.out
 delete mode 100644 tests/expectations/tests/parser/program/escape_u8_eof.out
 delete mode 100644 tests/expectations/tests/parser/program/hex_eof.out
 delete mode 100644 tests/expectations/tests/parser/program/mapping.out
 delete mode 100644 tests/expectations/tests/parser/program/mapping_fail.out
 delete mode 100644 tests/expectations/tests/parser/program/pipe_eof.out
 delete mode 100644 tests/expectations/tests/parser/program/q_eof.out
 delete mode 100644 tests/expectations/tests/parser/program/sq_eof.out
 delete mode 100644 tests/expectations/tests/parser/program/tilde_eof.out
 delete mode 100644 tests/expectations/tests/parser/program/unclosed_unicode_eof_fail.out
 delete mode 100644 tests/expectations/tests/parser/serialize/one_plus_one.out
 delete mode 100644 tests/expectations/tests/parser/serialize/parser_error.out
 delete mode 100644 tests/expectations/tests/parser/statement/assert.out
 delete mode 100644 tests/expectations/tests/parser/statement/assign.out
 delete mode 100644 tests/expectations/tests/parser/statement/async_fail.out
 delete mode 100644 tests/expectations/tests/parser/statement/block.out
 delete mode 100644 tests/expectations/tests/parser/statement/conditional.out
 delete mode 100644 tests/expectations/tests/parser/statement/conditional_fail.out
 delete mode 100644 tests/expectations/tests/parser/statement/console_fail.out
 delete mode 100644 tests/expectations/tests/parser/statement/definition.out
 delete mode 100644 tests/expectations/tests/parser/statement/definition_fail.out
 delete mode 100644 tests/expectations/tests/parser/statement/expression.out
 delete mode 100644 tests/expectations/tests/parser/statement/expression_fail.out
 delete mode 100644 tests/expectations/tests/parser/statement/finalize_fail.out
 delete mode 100644 tests/expectations/tests/parser/statement/hex_int_fail.out
 delete mode 100644 tests/expectations/tests/parser/statement/iteration.out
 delete mode 100644 tests/expectations/tests/parser/statement/let_mut_recover.out
 delete mode 100644 tests/expectations/tests/parser/statement/return.out
 delete mode 100644 tests/expectations/tests/parser/statement/return_fail.out
 delete mode 100644 tests/expectations/tests/parser/unreachable/define.out
 delete mode 100644 tests/expectations/tests/parser/unreachable/eat_ident.out
 delete mode 100644 tests/expectations/tests/parser/unreachable/eat_int.out
 delete mode 100644 tests/expectations/tests/parser/unreachable/equality_and_order_expression.out
 delete mode 100644 tests/expectations/tests/parser/unreachable/expect_ident.out
 delete mode 100644 tests/expectations/tests/parser/unreachable/math_op_fail.out
 delete mode 100644 tests/expectations/tests/parser/unreachable/math_op_pass.out
 delete mode 100644 tests/expectations/tests/parser/unreachable/postfix_fail.out
 delete mode 100644 tests/expectations/tests/parser/unreachable/postfix_pass.out

diff --git a/compiler/compiler/tests/compile.rs b/compiler/compiler/tests/compile.rs
index 01d9c1817c..0b1382f961 100644
--- a/compiler/compiler/tests/compile.rs
+++ b/compiler/compiler/tests/compile.rs
@@ -53,7 +53,7 @@ struct CompileOutput {
     pub unrolled_ast: String,
     pub ssa_ast: String,
     pub flattened_ast: String,
-    pub bytecode: String
+    pub bytecode: String,
 }
 
 fn run_test(test: Test, handler: &Handler) -> Result<Value, ()> {
@@ -86,7 +86,7 @@ fn run_test(test: Test, handler: &Handler) -> Result<Value, ()> {
         unrolled_ast,
         ssa_ast,
         flattened_ast,
-        bytecode: hash_content(&bytecode)
+        bytecode: hash_content(&bytecode),
     };
     Ok(serde_yaml::to_value(final_output).expect("serialization failed"))
 }
diff --git a/tests/expectations/compiler/address/binary.out b/tests/expectations/compiler/address/binary.out
index ee53b1aa1d..4990411148 100644
--- a/tests/expectations/compiler/address/binary.out
+++ b/tests/expectations/compiler/address/binary.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: da35eac4b0b82c923dc6075007bb615896efc249afffc57a197b129256f967e8
     ssa_ast: b257a4b1cf0e2aaa47df31a4845b9bb7d8293579c4b1ec4fd0f516d25c924dfa
     flattened_ast: 1e009489c50036acad0df55be7cf779ec95bba86dcd40f3d08ff955a26424005
+    bytecode: eada90968195512a17847ed966d0bef43b7011c18ceee417a3cdb02a1190ca52
diff --git a/tests/expectations/compiler/address/branch.out b/tests/expectations/compiler/address/branch.out
index cb9a19f760..13e377d7b6 100644
--- a/tests/expectations/compiler/address/branch.out
+++ b/tests/expectations/compiler/address/branch.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: ab702ef192a0fcfae6024bd86f419dc6413e2655d593a66abf2abe58c169e4cd
     ssa_ast: 2a47e9b9cc25ee909648953549f2cfc1cc575b1787a88af5c77bc3ab487ea6ce
     flattened_ast: d4c71cde2c8e2b908ca3f868b33eb2486424ddfc7aa000d177a27c7fe768841a
+    bytecode: b192f4b7f52da46a22cec3aec7e8c14b6e3fad7c40b9d0c0990255902fb596ef
diff --git a/tests/expectations/compiler/address/equal.out b/tests/expectations/compiler/address/equal.out
index 442cb9a836..b20ecfa359 100644
--- a/tests/expectations/compiler/address/equal.out
+++ b/tests/expectations/compiler/address/equal.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 2c04fdc69608512ca566b0eccf8d5e9fdd741b391a7937da4431293cfc3a046e
     ssa_ast: 894efdfdb630a92cfa8a0a5101b681e15995e993b8c87d75dd738c8d7ce80d0c
     flattened_ast: 139b39ec11943d222a18eaa61e504bc4aa46e7accc63c68755fafe861668f245
+    bytecode: 4903abf35d22e4264aae4bf26b908108d11d981d069c247793cea817dd8851a7
diff --git a/tests/expectations/compiler/address/ternary.out b/tests/expectations/compiler/address/ternary.out
index ab03028e73..7dae0c443b 100644
--- a/tests/expectations/compiler/address/ternary.out
+++ b/tests/expectations/compiler/address/ternary.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 035627cd394d2b54892daeb2a84e3eff5ce02f06f96c688356a7e66585aa61ec
     ssa_ast: ca06bce101b6ec51b72c064357bafb094b7f4aafeec89e07e7ff58694eb032c8
     flattened_ast: 9cf2f3f0e5391494304cedaf34d1bced7cc1f43599ee341d389fab7e050b574f
+    bytecode: 5cbdf4a6a290f80540d2653153c57495eaf45432bc7ce44d52af2b5d0594951c
diff --git a/tests/expectations/compiler/boolean/and.out b/tests/expectations/compiler/boolean/and.out
index 16b885e8a5..659493642e 100644
--- a/tests/expectations/compiler/boolean/and.out
+++ b/tests/expectations/compiler/boolean/and.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 10f6791409c21336d6b777f66a6266b9b69fe761701a8a3c4a61ab59ef158db9
     ssa_ast: 1fa53964ef7d5eb8e8e7cd5af01a73fab123e423cb0b49e88d1c6de6ebf227d1
     flattened_ast: 17e88106f92c0c25e20740e89304527e3044b636ebf31fdf0e34dacd86a0322a
+    bytecode: e3deaf24a91bcb77628f7af29d4ad6d0ba67215617d6cfe753168543123ce7d2
diff --git a/tests/expectations/compiler/boolean/conditional.out b/tests/expectations/compiler/boolean/conditional.out
index 20191ae98e..6e872dc285 100644
--- a/tests/expectations/compiler/boolean/conditional.out
+++ b/tests/expectations/compiler/boolean/conditional.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: f5fd959d856025c2866f27b37e3711a49509b9a385a78d9186b1ea077ef5146d
     ssa_ast: a119ee86727dd82a8a82aaf459b14e13bc2fdc5177efdbced71bc0d5c3566f44
     flattened_ast: 67e55340f8f5e864f376d989201bf85de15783ff43c438039bf4b5790e5b3081
+    bytecode: d0d3f79c32e6cb17c98afa2f1d4861d0f71d7f805a87712b3491ef0a9e1b4892
diff --git a/tests/expectations/compiler/boolean/equal.out b/tests/expectations/compiler/boolean/equal.out
index 20926d2bc4..e7e1d68a28 100644
--- a/tests/expectations/compiler/boolean/equal.out
+++ b/tests/expectations/compiler/boolean/equal.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 01d0412fda7ce54eec5f6ca193e4444ec47d2aa22a1425df65c6a2038a991fbb
     ssa_ast: 5c2e90a07d8231a03f335bf762f5f660d3197f23b8f59b34d4b5319f9dd2cecb
     flattened_ast: e68c35439afdde8d5587f8ae5289a422871b6942f3aba8b633f0549a2ca93b3a
+    bytecode: e742ac3b95a8971f2018963aba6d915ea53205c21443d0b11ad52a42ad443b97
diff --git a/tests/expectations/compiler/boolean/not_equal.out b/tests/expectations/compiler/boolean/not_equal.out
index 77d1701efa..017b207d77 100644
--- a/tests/expectations/compiler/boolean/not_equal.out
+++ b/tests/expectations/compiler/boolean/not_equal.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: bbfd6e25c73c1abe14cdd1dee14000551c1b4bdc5dc3e36c06870b7ac39ddc67
     ssa_ast: e3cf6c2a4fd04746714c7328cb24fa58ef15fb4e44c2be1c87e4116c62169ffa
     flattened_ast: 633da269b8763b2eff9e443744d07cea72e592159171f02125bd6fbb504cdb71
+    bytecode: 1db874ad15d9bb70df7372ed3250cc6d0f65992e17788cd90c656ef1e1ceb63e
diff --git a/tests/expectations/compiler/boolean/operator_methods.out b/tests/expectations/compiler/boolean/operator_methods.out
index 77902cc902..3f358eab96 100644
--- a/tests/expectations/compiler/boolean/operator_methods.out
+++ b/tests/expectations/compiler/boolean/operator_methods.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 9a25a8b1eee1fb699e503df05bb0f46ed2ca10c9bc7fafbb7c14a75674b09811
     ssa_ast: 0fc0e6501d2a700776813dcc44051d19c7b7453cb326d3531c172384f016db56
     flattened_ast: a59c0aacc4aff5883c09976c56621841297b435e693d4f217ef97a85c19e73c7
+    bytecode: 1a2170c46bb214eb8bedf2e98b58393ec0fa09051aeb52c3f59734a8da6ca5dc
diff --git a/tests/expectations/compiler/boolean/or.out b/tests/expectations/compiler/boolean/or.out
index 7d5f3226c6..04f7c67477 100644
--- a/tests/expectations/compiler/boolean/or.out
+++ b/tests/expectations/compiler/boolean/or.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: d7b1adf3c0e7c05e1a58a2c76d2c0c675be0e04408adf3d30e7eab17cbc356bf
     ssa_ast: ecc229eb0204777ed540e09bc44119a400526ff9ca6ca8081fc5e2c511deda25
     flattened_ast: 0d3dae7d567bcf36fd442b6658b9b217907935fc91c93a8b10bfe14225f57b71
+    bytecode: e859520fd52dbdf69b14a3c3d9bad64bf6165084fb949912224eda3ccab9b638
diff --git a/tests/expectations/compiler/console/assert.out b/tests/expectations/compiler/console/assert.out
index 688175d1cd..c914acc478 100644
--- a/tests/expectations/compiler/console/assert.out
+++ b/tests/expectations/compiler/console/assert.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: b901b1b3790e751b788bc5ea0b8e006d3387dfa1924c85d32d4869b82e50ccde
     ssa_ast: 496f4c109108408884fbe6b95c7f0a959fa636acae72e8ad8c792e4ec45892ed
     flattened_ast: b5235d5705cd37b10f879e16db77cbc46b2b74f91285cef4a5611d4d02798c5d
+    bytecode: fdc5659b97d4dbfea710ca848dcffa29bcd4da3a7a54739fb916e5292284a1a4
diff --git a/tests/expectations/compiler/console/conditional_assert.out b/tests/expectations/compiler/console/conditional_assert.out
index 419dfaf42f..c662f8b3ec 100644
--- a/tests/expectations/compiler/console/conditional_assert.out
+++ b/tests/expectations/compiler/console/conditional_assert.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: bcd5d9f7ba1b3d81d16310653b8531e39eeb6f6d35367dda89a77819f421d950
     ssa_ast: d9f534bddd58e3fff333eadef39784a9c0f67f0b4a65fe7f7f4ae0fa4e808488
     flattened_ast: f6e67ced6f8462f2cd655fa9b6a64a767ee22b7e123cb00d364ba0c7fea73e92
+    bytecode: 9006475518263541b3a855db6907377b638ef28f2a44caf4e26db7991c3b58ef
diff --git a/tests/expectations/compiler/core/algorithms/bhp1024_commit.out b/tests/expectations/compiler/core/algorithms/bhp1024_commit.out
index 29f3262145..4c9fc36384 100644
--- a/tests/expectations/compiler/core/algorithms/bhp1024_commit.out
+++ b/tests/expectations/compiler/core/algorithms/bhp1024_commit.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 88ea51c2bf3abfa3c8810b8208c6e8428217a02543c584f890df6c1321ae2ec8
     ssa_ast: a4cd65095b0188f08dca7a5bee3c77cea0c038009e52bddac6a634641c447d54
     flattened_ast: 50f2528808517ccb6f238e23c83f75666c391958386a86daac4929b5b1155602
+    bytecode: 65dcc91a4e07d98f73a0eb5b43d945f85859694417bd643b3ebba0d40494d001
diff --git a/tests/expectations/compiler/core/algorithms/bhp1024_hash.out b/tests/expectations/compiler/core/algorithms/bhp1024_hash.out
index 534a9f5afb..05b2278cac 100644
--- a/tests/expectations/compiler/core/algorithms/bhp1024_hash.out
+++ b/tests/expectations/compiler/core/algorithms/bhp1024_hash.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 1970d7b7a42e3b910ab4d910d41eb3f5ae96d509099ff0983d66dbeb1b7a8e54
     ssa_ast: 260c86f7c85b3cbddd66756cab69d3890b86951411472470f68f3ab9dd937a49
     flattened_ast: ed477843f037999f6d1dae0c16ac75fb0c8e525ab44dee32e41fb4c1332d3b67
+    bytecode: 629677c0e48a743b2fc341de20c6b14ccc59d74c6ae08c317bdf597e0cc2f749
diff --git a/tests/expectations/compiler/core/algorithms/bhp256_commit.out b/tests/expectations/compiler/core/algorithms/bhp256_commit.out
index 14d0129df7..474c2731b5 100644
--- a/tests/expectations/compiler/core/algorithms/bhp256_commit.out
+++ b/tests/expectations/compiler/core/algorithms/bhp256_commit.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 8916dd47b049835d250b12ccdcb00ab91fe7c0272671098871b5e8c926f93312
     ssa_ast: 0b7a62110d7d274f974a91b61c592f89edec6831b743008dfd038c464f4ec6d1
     flattened_ast: 7b1400a9873fab71406b4330e864bcd8aecaa70eee0e4d96601ae0baad00f8a9
+    bytecode: a120b1e1d98948faf72473e55ec5ee1ea7ead4b7b5e4e79560053918dc1ff81b
diff --git a/tests/expectations/compiler/core/algorithms/bhp256_hash.out b/tests/expectations/compiler/core/algorithms/bhp256_hash.out
index b2f303bfea..c7e0a46088 100644
--- a/tests/expectations/compiler/core/algorithms/bhp256_hash.out
+++ b/tests/expectations/compiler/core/algorithms/bhp256_hash.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 5fe729d3d383d535452bd280076f64905a8f508849c19cf72ea538e93d8c25bf
     ssa_ast: 99239a050244e0741313b53301d7581117b126dca571361c568209e00db550b1
     flattened_ast: 9fca40489b79b32cc320285c96c47f45fdbd14de1194aa7ff824508fb6e2b252
+    bytecode: 0098070069139200be104771fcb1807e52b331b50bab0dc82d3a16d451e4db97
diff --git a/tests/expectations/compiler/core/algorithms/bhp512_commit.out b/tests/expectations/compiler/core/algorithms/bhp512_commit.out
index 76a780b618..44392c3c3d 100644
--- a/tests/expectations/compiler/core/algorithms/bhp512_commit.out
+++ b/tests/expectations/compiler/core/algorithms/bhp512_commit.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 22635a9f3ee2333185a07a9a3fb2a2f8c428cef4d00bd2072db527c49a665b0a
     ssa_ast: d1b72ed1203491549451aade31456e4926166c6448cc2805e55fbf706594e7c3
     flattened_ast: cc9c1479272915baf29b1de71b54341d06ff588a2a0816f310dbfeec10e96309
+    bytecode: b9875b017a81226905d6fec1324bf41bc859bb4fca832de6b5309224ca343511
diff --git a/tests/expectations/compiler/core/algorithms/bhp512_hash.out b/tests/expectations/compiler/core/algorithms/bhp512_hash.out
index a7c71c5d70..be90c128ca 100644
--- a/tests/expectations/compiler/core/algorithms/bhp512_hash.out
+++ b/tests/expectations/compiler/core/algorithms/bhp512_hash.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 65a69d890ef0691d1cfb7396f45a8a8c8181fc3b958a537f8b0559512a91e00f
     ssa_ast: 2810947b50fb6df3b805a5a20b61ddb5812be742bdaf8775e4d73030f4745f44
     flattened_ast: 53818a9ccc8a985d7990ad921ebfae74b68aed98cf016a37f01b9bd8127a186a
+    bytecode: 976c0daf1133bb687c763b552cf546d3c02ad6f2ba23def2a1aec0e56e5aff64
diff --git a/tests/expectations/compiler/core/algorithms/bhp768_commit.out b/tests/expectations/compiler/core/algorithms/bhp768_commit.out
index ff4209f55d..4d2d46b112 100644
--- a/tests/expectations/compiler/core/algorithms/bhp768_commit.out
+++ b/tests/expectations/compiler/core/algorithms/bhp768_commit.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 4a1e5c2818e99b3779669345fec31621c54768b926a6e246ba5edeb1eb123f21
     ssa_ast: 2c0de477e742beb8a851d2e26b18f9342b94ae65893bb55518a689b31b038572
     flattened_ast: 894437e501f829491e9e22617052c169541174a854aa2afedd5d3c912b71400d
+    bytecode: d8c824aec550f73676651160b81bf3e546b5958ec8520629f779b9156b033032
diff --git a/tests/expectations/compiler/core/algorithms/bhp768_hash.out b/tests/expectations/compiler/core/algorithms/bhp768_hash.out
index 4c1b1b193c..31e795ea24 100644
--- a/tests/expectations/compiler/core/algorithms/bhp768_hash.out
+++ b/tests/expectations/compiler/core/algorithms/bhp768_hash.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: fd09783877c99da74d6ba033e99e7bda8e82433c307d93e9c0a4e3914d6a109a
     ssa_ast: 74e79d5cbd5e7b80826ff017294a6542b55cfe9e0734e82c8d0b47c257d1f0a3
     flattened_ast: b5d3d72262fec88ea316abd2f6dfaf90e199aceb959b7eda6eaeddcc419233b2
+    bytecode: 45f6f395a7abca14ca5a1e3d5dc3fb2ac5ea3946740553ca5aee7a5822a235ec
diff --git a/tests/expectations/compiler/core/algorithms/pedersen128_commit.out b/tests/expectations/compiler/core/algorithms/pedersen128_commit.out
index 5b4d420f8a..4d9bb4f47e 100644
--- a/tests/expectations/compiler/core/algorithms/pedersen128_commit.out
+++ b/tests/expectations/compiler/core/algorithms/pedersen128_commit.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 557130262ded1b479b139b15c095260d83a1c3bdd038d7cb61e6ad852f760fe5
     ssa_ast: f9a7a186621cb450664b053f18293aeec444b650403adc294cf1572958b6033d
     flattened_ast: 44461faaa8269377891df43705df40021a18e0cdf75e5daebca3503005a71ab4
+    bytecode: e5e0c25f5c089802ae51be9f719ccd87b53adf4676bc463ddf6e6f63d6e1f977
diff --git a/tests/expectations/compiler/core/algorithms/pedersen128_hash.out b/tests/expectations/compiler/core/algorithms/pedersen128_hash.out
index c24b3de033..4bbd2470ea 100644
--- a/tests/expectations/compiler/core/algorithms/pedersen128_hash.out
+++ b/tests/expectations/compiler/core/algorithms/pedersen128_hash.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: bb21bfd7f94edff0912f41c0c530966e1ffe6d117ed3143e2ec005af8a2f4ab0
     ssa_ast: 4a5fbd468288f7c57f21d71246fe1aece51945b617ec91d217e734faa88b7571
     flattened_ast: fa3e33dae39e487a23accfa895fafbe1d9fa2e909d17b74d71135f5f3ab26340
+    bytecode: 9217044f6eb12f18c1298c2ce3217533eb27618e7c8c5ead76848d21935783d4
diff --git a/tests/expectations/compiler/core/algorithms/pedersen64_commit.out b/tests/expectations/compiler/core/algorithms/pedersen64_commit.out
index 00ed327702..d1a5ffc29a 100644
--- a/tests/expectations/compiler/core/algorithms/pedersen64_commit.out
+++ b/tests/expectations/compiler/core/algorithms/pedersen64_commit.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 7add075b516b60285bc9d29c17f5139f685fd899d332a401a4204d6067327419
     ssa_ast: 42f2f811d77249415e50dbaf99585f8617f8d14f934b5043798ab0c5c8f67ec8
     flattened_ast: 734d6c9e1008eab4451158ad667a9d8e34e2af6e960548d501057fa2558299bc
+    bytecode: 6a07bdcfa9cc3f72be7acb20de65bed8983094471083dee01fc5a46d923e7506
diff --git a/tests/expectations/compiler/core/algorithms/pedersen64_hash.out b/tests/expectations/compiler/core/algorithms/pedersen64_hash.out
index ae829cda81..a735381718 100644
--- a/tests/expectations/compiler/core/algorithms/pedersen64_hash.out
+++ b/tests/expectations/compiler/core/algorithms/pedersen64_hash.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 4205da189bdc3b248ed6fb048073e333135e4f7a8af2700adcb5c65554063794
     ssa_ast: 1af2511db5bcf2cf74638c72d6981ae8e16005436e8c3ebd216bc4788a48b6d1
     flattened_ast: 538f7c5c282048564690bb02ea04066e4e1e6a67f2b7550e87bf7cb53c4aab0c
+    bytecode: e893a23da89b538d6d95e87e9a97340f63c798fda07cf50166d09e8c4e07932b
diff --git a/tests/expectations/compiler/core/algorithms/poseidon2_hash.out b/tests/expectations/compiler/core/algorithms/poseidon2_hash.out
index 7720b562d7..9ce616f58c 100644
--- a/tests/expectations/compiler/core/algorithms/poseidon2_hash.out
+++ b/tests/expectations/compiler/core/algorithms/poseidon2_hash.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: b944463bfcb82f802952036416b0e8908866974395da5e0a0c26afc1b0f19b5f
     ssa_ast: e426c41fd8d87d5990e6bbb8dd934be2baa95d665850ecdaf5e3109a3675b541
     flattened_ast: 6947188abbeb502e1a4c8be8568df35f2d4739e1d7c15213757c7ef4e37205f9
+    bytecode: b82322298b5a498c7a2a308c597a5e5d546becd9ff6d05d0c571247e09f1cb7d
diff --git a/tests/expectations/compiler/core/algorithms/poseidon4_hash.out b/tests/expectations/compiler/core/algorithms/poseidon4_hash.out
index 8606acaa8c..105fb2ab72 100644
--- a/tests/expectations/compiler/core/algorithms/poseidon4_hash.out
+++ b/tests/expectations/compiler/core/algorithms/poseidon4_hash.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 9308c9c592608dcd11960a906c0753504372209da9f7b7669ac3f9adda28a592
     ssa_ast: c1f73a8466d54233516776dc587ff566345e879c0e358776a2774d32d0d154da
     flattened_ast: 0b6a282a12ba27a9968282a45dccbc2b69754c56c6f719b30895de9d7ef1bec2
+    bytecode: 849a917a861f86e0a277f0a92a018a81f6f6d69762816e29e585452dd805a1c1
diff --git a/tests/expectations/compiler/core/algorithms/poseidon8_hash.out b/tests/expectations/compiler/core/algorithms/poseidon8_hash.out
index 7fe5874a12..f61a1c4577 100644
--- a/tests/expectations/compiler/core/algorithms/poseidon8_hash.out
+++ b/tests/expectations/compiler/core/algorithms/poseidon8_hash.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 095d15c58d65096d77a62ff54af5ab129002522930e0a8ca83dd0c6de4467bec
     ssa_ast: 368a16973432fa980ce1b15d598fe6c27287055c3aefc05cf6b575cc2f4e7447
     flattened_ast: 0ffd6d24cffb39df46258a3a2a11c297fdf1ac650ba368378aa1906ededc7d8b
+    bytecode: 8d921ede85807f033431e06b604875bb1f6712fb96957faa5a805fe02fe24245
diff --git a/tests/expectations/compiler/definition/out_of_order.out b/tests/expectations/compiler/definition/out_of_order.out
index b482feec5e..d3981e60c9 100644
--- a/tests/expectations/compiler/definition/out_of_order.out
+++ b/tests/expectations/compiler/definition/out_of_order.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 7a5cb78dd349a26c2962daece4fc6a3eaa4f03fb67f31ace4a9d84a5ce658e34
     ssa_ast: a087b2cd64869c8d52a49d39d50aaccc710ec9153fe8f96be820de8d3dc02854
     flattened_ast: 41087f4e5ebf8e00900384acacecb9d2bc66774d31c63fef66ab5c4b5f44024e
+    bytecode: 9a1e5bb7b8d932d4afd347a856bfb38db144771f49a0d9589ef14236338e3dcf
diff --git a/tests/expectations/compiler/field/add.out b/tests/expectations/compiler/field/add.out
index f14c917907..d095ae9c94 100644
--- a/tests/expectations/compiler/field/add.out
+++ b/tests/expectations/compiler/field/add.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 0ae25e3f48a005325105c1ae4859df780f56dceaa7ece1c9f7036f804709d30f
     ssa_ast: 843981d448200fe4b207a10fea71a9afe5d3f8f255122efb3108644122cd85a4
     flattened_ast: df1e8e6fc3eb3558b3069137816491d8e6ccdeabf1e9934b70e18dfb3c1c6ebb
+    bytecode: 230d4f2bda3933eb4fafc4dda4ce0087e74e4cbd9c65349746da561cbb3f99da
diff --git a/tests/expectations/compiler/field/div.out b/tests/expectations/compiler/field/div.out
index 396b682e79..b01eec468c 100644
--- a/tests/expectations/compiler/field/div.out
+++ b/tests/expectations/compiler/field/div.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: c4bf7caa38d22e8398b21a08af4bb1c675160e8d03d4b96b392d6f0c595918c2
     ssa_ast: cf4f7d1a7e63e3979a8aca25d94719410856bbc8e022df52ef4811d83fec9ea6
     flattened_ast: 892e661b9c5a87b5598ae3f9c405a5d8d04a82dd70cc06980fb05b5e661b8820
+    bytecode: fa960590c979aea4bdfe07b7d37060bb593f73f745974241e2db578bd7ba2ced
diff --git a/tests/expectations/compiler/field/eq.out b/tests/expectations/compiler/field/eq.out
index 7a98a69f1a..20247e9b76 100644
--- a/tests/expectations/compiler/field/eq.out
+++ b/tests/expectations/compiler/field/eq.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 0a2a053e5bf78c3cc425dbb1600479aef43f652c58b34b8749aa36765720889e
     ssa_ast: a51dea4bd834bde7d545b7226c1d94beb2aa67de016288c4a33d7bf6a11e5084
     flattened_ast: bf525b12a2743590934d071970c062b6383680a16de9f12e3f0a62422b4e6e61
+    bytecode: e8cc0536d26ff27b9fe9ff3ad45b575185b9f60c9d3910481ab66843af0f2171
diff --git a/tests/expectations/compiler/field/field.out b/tests/expectations/compiler/field/field.out
index 1c54184b2e..3c45fae265 100644
--- a/tests/expectations/compiler/field/field.out
+++ b/tests/expectations/compiler/field/field.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 39a8a1edc287de186596bad9afa19c71d2bdf424eb5a666075d262edadb582ab
     ssa_ast: 2d88cadc3172088d6282e7ee6353af69ba372f592038028ce52cf4db1abdf8d5
     flattened_ast: 021d9f732dac254daf87cc96a1378bca92202b0ddeedb2ae9057638caadda0b1
+    bytecode: eeb44a4faf22686de577f93db551bd83246583158dcecb35d2dc454e0693e419
diff --git a/tests/expectations/compiler/field/mul.out b/tests/expectations/compiler/field/mul.out
index 0cce1c6196..3977353eba 100644
--- a/tests/expectations/compiler/field/mul.out
+++ b/tests/expectations/compiler/field/mul.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 7fbe1dee1da36bbf500eac5fdb3c85096b160e10da9dc765e072bb3a3e6f8725
     ssa_ast: 14a61902cd2de8c44d6ad562a382c42bc63764b975f9c668f90eb2c9297258f7
     flattened_ast: f8cb858f6f41179bed737e5b47b138291dde83ec0a5d30787c7e1cd6d750e7c1
+    bytecode: 90662aea378f911f2798c1ece956f7a2566fd99d99a87d8285f1476edf468e43
diff --git a/tests/expectations/compiler/field/negate.out b/tests/expectations/compiler/field/negate.out
index fdd83c2218..2e26f8800f 100644
--- a/tests/expectations/compiler/field/negate.out
+++ b/tests/expectations/compiler/field/negate.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 66d929a26a59181cacf5631183d943ad5d90de0c011f00b5e7fd0a86fbca6aea
     ssa_ast: 1e0bc0c103cf34a316892d929e5018d04157bd2b8fccf21a39d3ba34dffb3bb8
     flattened_ast: 07518cb75989513b755211d766ac61f7263d96203dcdd48af48b0fb8af64e6d4
+    bytecode: 57bdcce5ea2ea7890a6a4786e4795f5c458da4b6b29f6295f86e15f11479f3e6
diff --git a/tests/expectations/compiler/field/operator_methods.out b/tests/expectations/compiler/field/operator_methods.out
index 2dae872dfb..ad1c609dcb 100644
--- a/tests/expectations/compiler/field/operator_methods.out
+++ b/tests/expectations/compiler/field/operator_methods.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 730c7aae808fdd0cf9b2e008612191ad36d29f7f4fe7770c9b72371a1146b65f
     ssa_ast: 6b20fc19648d776c5321df0b9b3b403456cae4ed0aa815366373a64f7810e0cf
     flattened_ast: b4ce53a9ebedbfe05b96f67e0894f31a70d0948d371574772e76dc3adbeb19b0
+    bytecode: 1bfceea51d0a0df233268cc281d300a3c15c291de63528a723a763eba97e9b93
diff --git a/tests/expectations/compiler/field/pow.out b/tests/expectations/compiler/field/pow.out
index 65dba57ef6..60c4c49ec3 100644
--- a/tests/expectations/compiler/field/pow.out
+++ b/tests/expectations/compiler/field/pow.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: ab79658672090ee72bf8485cdc370f980531343942292b54ff3f1b3ab9fce67d
     ssa_ast: e2c1c59b1bb7a799df57044ab663d0c4b93f8c5e96c1927639abd8c0a9dc8488
     flattened_ast: f75ea6e363e36e8123507e5a285072730e03621238ade5f5c96e53314ba2b1fe
+    bytecode: 7540a269502febfe91bebfc15030891bde7667f921d5d8d9d22efbcf16410543
diff --git a/tests/expectations/compiler/field/sub.out b/tests/expectations/compiler/field/sub.out
index ddcde5df29..6a456d9478 100644
--- a/tests/expectations/compiler/field/sub.out
+++ b/tests/expectations/compiler/field/sub.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: dc0f03e353714f93a4bdc39a64369a4bf6af4725dea2342523c0447e5666b63f
     ssa_ast: ceb2eeb666f437f0adeb57cb689e501a3a0981ba14663b9e4f85bcf795aa5ecb
     flattened_ast: dd5f38e0fa2531c81ad10c5aa2143388c47caca081cf7fc56a2e39cb0d07d98b
+    bytecode: ef0f05392652587de58875f041bb805a5a1172a153d96973638342d143798863
diff --git a/tests/expectations/compiler/field/ternary.out b/tests/expectations/compiler/field/ternary.out
index 12ac551dfc..132beb0933 100644
--- a/tests/expectations/compiler/field/ternary.out
+++ b/tests/expectations/compiler/field/ternary.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: ce068059ab68c906175c70d259fc716165e8749596c80ec6e2be52c88d076335
     ssa_ast: 48b84a8784368f924f6b15526204f34921eee3224112cc0555a223c169047809
     flattened_ast: be6f3fd5174704ed384b73de24f569b4ca3744480bd454b7501a52a4dddb98f6
+    bytecode: b65dba415908458745a14bfc52abda70a0899732f807ba22f56776ab3fcbf589
diff --git a/tests/expectations/compiler/finalize/decrement.out b/tests/expectations/compiler/finalize/decrement.out
index 3d415e6177..ae92908c48 100644
--- a/tests/expectations/compiler/finalize/decrement.out
+++ b/tests/expectations/compiler/finalize/decrement.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 56080d8ee17c7eedbe41d281e986a8b09fa1d0e33bb1c7876fc93599c194f0fa
     ssa_ast: 56080d8ee17c7eedbe41d281e986a8b09fa1d0e33bb1c7876fc93599c194f0fa
     flattened_ast: c49b193e77aad777550c12ac43fdb3fed1d33ef1a841af37294c43902fef9ee8
+    bytecode: 39aa8516297ece27331b633a72466d2ff0122d36beca663a48bc07589e2d3e15
diff --git a/tests/expectations/compiler/finalize/finalize.out b/tests/expectations/compiler/finalize/finalize.out
index ee280db751..f117c96fdf 100644
--- a/tests/expectations/compiler/finalize/finalize.out
+++ b/tests/expectations/compiler/finalize/finalize.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: ab5dac20c924339789f9c0ac6fcd035b58ea7b9d3b2084a5151cba3c14f7939b
     ssa_ast: 83186e2623d9152de399d213137d7813c027e1e76e607295b66b8c03dbe32a4d
     flattened_ast: 26b244650007d2841b4dec172241e8eae1091483054e8c82ac61df52fd63f91f
+    bytecode: 6db857dc2b80ea257d141b3980404e050024771f95c5f9b74f899145b2001432
diff --git a/tests/expectations/compiler/finalize/finalize_with_return.out b/tests/expectations/compiler/finalize/finalize_with_return.out
index 94d8c95fdd..e50cd15e3d 100644
--- a/tests/expectations/compiler/finalize/finalize_with_return.out
+++ b/tests/expectations/compiler/finalize/finalize_with_return.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 521891369f880815ee6ac54d87588c147feff8ec4cb62128c44afdf792e30e76
     ssa_ast: fe601539c9d1cc61da7a956647e4712edacc7928d3cce050ade833e2fb9da0d8
     flattened_ast: 5c1a7f7f8356f0de01c7cd183adb76570fa9f9e80f3f5853c761293cb6ca355f
+    bytecode: 9f1144202f6b114409c379f7ecc4b480dd81daaf0f6f8b244efd20c520f7b76c
diff --git a/tests/expectations/compiler/finalize/increment.out b/tests/expectations/compiler/finalize/increment.out
index a00927028c..0d25176f26 100644
--- a/tests/expectations/compiler/finalize/increment.out
+++ b/tests/expectations/compiler/finalize/increment.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 1fc29cb05bcd2261b761b2342516525cf7cf27f897cce03d13ea456362411b9d
     ssa_ast: 1fc29cb05bcd2261b761b2342516525cf7cf27f897cce03d13ea456362411b9d
     flattened_ast: ad48f1a8f2207a90e1707665b0a1047b313647d83a38a413f7fb5bc1751f22ef
+    bytecode: 49afa4d378578bc680308083733b31b8272f9c952fe8dbc133398676e3f0d2ba
diff --git a/tests/expectations/compiler/finalize/mapping.out b/tests/expectations/compiler/finalize/mapping.out
index 42913b503c..aeebaaee84 100644
--- a/tests/expectations/compiler/finalize/mapping.out
+++ b/tests/expectations/compiler/finalize/mapping.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: fcd02f88db2176cd7e0befcda00311776bff3f8518b272c256c0e19de8eb7dd9
     ssa_ast: ba628027acf56c96c1047a38f2adb820e4dd16e7e82a77e210f60cbee2265f13
     flattened_ast: 6d53ef7e6768f1eb0b230e73c743a0d07ef5eca2e962ae8666c3a88677a33b03
+    bytecode: 1da5a78fcb6f77bd197de7dce1e7e94e7a9d30a6ec26703a645b25ab7c65cc08
diff --git a/tests/expectations/compiler/function/conditional_return.out b/tests/expectations/compiler/function/conditional_return.out
index 13aca8c233..c81eecfa71 100644
--- a/tests/expectations/compiler/function/conditional_return.out
+++ b/tests/expectations/compiler/function/conditional_return.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: f54d04dcf65f240192da3a67407a1ab8c97942603bb031269a3b6e20e450c364
     ssa_ast: f7a38580c6da1a0cb128799ff979843f913b87af368920ed5dbbd72b64a8f67e
     flattened_ast: b31dbb46a29aec9009f7aff2a8f6f206cfed5fd837174aa66d450b38adc4df21
+    bytecode: 434d585ff5cbe799cf645514abda7bc7ad069563501ded68fc716e583390fefa
diff --git a/tests/expectations/compiler/function/flatten_test.out b/tests/expectations/compiler/function/flatten_test.out
index 3c571a495c..585dda8b37 100644
--- a/tests/expectations/compiler/function/flatten_test.out
+++ b/tests/expectations/compiler/function/flatten_test.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: f2670ba11429088c8d6ca1498d168df09a9706ac2d20d71cd29af5dd867d35e7
     ssa_ast: 16b1a88055e17a218086950e9ff90c81c167872faf26d901814952f3a3c57091
     flattened_ast: 814492938dd116ec6cd0db1f084a22379a12127f123b7630efecd668452a33d9
+    bytecode: 2a939858f2f71f1bbe25bd039899cdb71254e56acc203eb6d60dbb5c191a4224
diff --git a/tests/expectations/compiler/function/flatten_tuples_of_structs.out b/tests/expectations/compiler/function/flatten_tuples_of_structs.out
index 31095d0e5d..6bfcd64153 100644
--- a/tests/expectations/compiler/function/flatten_tuples_of_structs.out
+++ b/tests/expectations/compiler/function/flatten_tuples_of_structs.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: a21e39f581430c0a9a90d57dc00d6ba3baa09ec5a210d9c5021cd1b11072e91f
     ssa_ast: 7b49247c500c5c179b892dd9fd7eff60104a1e04ffd00b9b53b5fbbc493b92af
     flattened_ast: 99341a91c75455d056b346f1a35ecb55af04b18ddaecbbe4ec154d4d3512b0f0
+    bytecode: 27556a268723e0d8ffc4210290babab1ad098d9c8a77ad2dc84195d98059deac
diff --git a/tests/expectations/compiler/function/function_call.out b/tests/expectations/compiler/function/function_call.out
index cb18322a78..64b3ae1172 100644
--- a/tests/expectations/compiler/function/function_call.out
+++ b/tests/expectations/compiler/function/function_call.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 5db5302effae454776641d39a58e71fb54e7a0dd8f9abb33aad033eae6bfd2dc
     ssa_ast: 380883028c4da15e42781a4488f67821bc0a24da459de5a96fe424ed0296b09b
     flattened_ast: 0689f093ce2cc6ca0be1ea491a268329d67ecc1251025a5d398ab174288e2c9c
+    bytecode: 713ce56eafa3f358be317894fd3ddf287a03422f855a304ee64becfcbd1f8590
diff --git a/tests/expectations/compiler/function/function_call_out_of_order.out b/tests/expectations/compiler/function/function_call_out_of_order.out
index 457c59825f..1ef1db5839 100644
--- a/tests/expectations/compiler/function/function_call_out_of_order.out
+++ b/tests/expectations/compiler/function/function_call_out_of_order.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 4d3f6c6d7473e2d981f1b66cdc0aa6c8c838b0cd5119749f88dd78173d948429
     ssa_ast: fa0c588d9ee1505dd06a0b90526b09e62f4336d4ce9f2e7be420235cd93bc9ab
     flattened_ast: de929e7ddaf5ac129f46d064d2581b79cad2a4ff2d91243af77c07dd1d2d9146
+    bytecode: a190851c7a73c1068c1c5819c3e064535d56273dffbc007874376c094399cd9e
diff --git a/tests/expectations/compiler/function/helper_function_with_interface.out b/tests/expectations/compiler/function/helper_function_with_interface.out
index a690edab67..6687da2321 100644
--- a/tests/expectations/compiler/function/helper_function_with_interface.out
+++ b/tests/expectations/compiler/function/helper_function_with_interface.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: ea45c4127e9cb23abb3761d287db4841f7d4bcde901104d33447cf5f8a40a964
     ssa_ast: 3c660861f07ab818e4fc7ac137e9fcc2d8b39d5174a2fd307b0a478869bf8a83
     flattened_ast: 5d5bc19468ea4393bb7a5f3737724c999030eb04c71d25e8d53e995706e2b762
+    bytecode: 56875e297f05e4c60762445a3ac97b57e4a0f12d69180bb7207ef62f950b0b25
diff --git a/tests/expectations/compiler/function/private_input_output.out b/tests/expectations/compiler/function/private_input_output.out
index 32650ceabd..f540fe49a6 100644
--- a/tests/expectations/compiler/function/private_input_output.out
+++ b/tests/expectations/compiler/function/private_input_output.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 3d476147549e1c400f8d99b7868d4bb55873f63a8935b64335cdb8ebb2836121
     ssa_ast: f36b1fa15ab9001afe65592d2c3f5a790301ff47c68fb3ef3766c75251cdbe75
     flattened_ast: 161c5aa7b09fc1d3fba97998c52055855426cbe34ca5c05739f7831e8dcf30a5
+    bytecode: 6d5fea51d9eec1cf3a5037b123147f9d532855197e3891ff870fbe700dd08d3f
diff --git a/tests/expectations/compiler/function/program_function_any_number_of_inputs_and_outputs.out b/tests/expectations/compiler/function/program_function_any_number_of_inputs_and_outputs.out
index 655bfedb4a..3db65150ca 100644
--- a/tests/expectations/compiler/function/program_function_any_number_of_inputs_and_outputs.out
+++ b/tests/expectations/compiler/function/program_function_any_number_of_inputs_and_outputs.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 6d33052975f037a698138d1e3d7bb06ac22669c9f92997b1ececac62a8361fe4
     ssa_ast: e0f62e9ed02da031b11dbffb2e0e928ea2fbda7c2f0eb28013068abdaab521dc
     flattened_ast: bf48feece0821904ba575f8a4de972d1f72631e102f2e6968c69a364fd70ea1d
+    bytecode: 76a90286cb4903577bb9b0d219abe140fd8e2ef8a74df48a82d986e8efc4235d
diff --git a/tests/expectations/compiler/function/program_function_empty_body.out b/tests/expectations/compiler/function/program_function_empty_body.out
index 26edb45028..88c477daaf 100644
--- a/tests/expectations/compiler/function/program_function_empty_body.out
+++ b/tests/expectations/compiler/function/program_function_empty_body.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: df120b5592ffccee9259d4dd27c40c0d1b960abc37c342057aeb73e0c01ca8bf
     ssa_ast: df120b5592ffccee9259d4dd27c40c0d1b960abc37c342057aeb73e0c01ca8bf
     flattened_ast: df120b5592ffccee9259d4dd27c40c0d1b960abc37c342057aeb73e0c01ca8bf
+    bytecode: a26eca302425b77f7d017763631062a040d57f8557dd53a31bfe4d17584ab0e2
diff --git a/tests/expectations/compiler/function/program_function_unit_type.out b/tests/expectations/compiler/function/program_function_unit_type.out
index 64d26fe524..edb728f989 100644
--- a/tests/expectations/compiler/function/program_function_unit_type.out
+++ b/tests/expectations/compiler/function/program_function_unit_type.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: b7ac599b0560dd5b3282817ed32b8b22d0999026b0dfa78a8cd2b90691fad917
     ssa_ast: b7ac599b0560dd5b3282817ed32b8b22d0999026b0dfa78a8cd2b90691fad917
     flattened_ast: b7ac599b0560dd5b3282817ed32b8b22d0999026b0dfa78a8cd2b90691fad917
+    bytecode: 8f6238b1942bb3cf2eb7d0eed9745dffaf088c884c423992f0d23b989f3954ff
diff --git a/tests/expectations/compiler/function/program_function_with_mode.out b/tests/expectations/compiler/function/program_function_with_mode.out
index 02b15e1fda..ab41fa1d05 100644
--- a/tests/expectations/compiler/function/program_function_with_mode.out
+++ b/tests/expectations/compiler/function/program_function_with_mode.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: c4ce51e4c750829268e97fe1c5333b1cbb354bcb91a85bc6404f031a1ff2e291
     ssa_ast: 58066c4b25ab20dd7df4125558d9ed640860aa8a07fba43edf93e45a43966eb4
     flattened_ast: 76d51105eed165130131944cb57697e1f6328eabfc0356f780ce10af062e0d84
+    bytecode: 70d3806e31f660faa4eff783ad05a73cf249a0a1ac7c29046fd8f1b2cec656b1
diff --git a/tests/expectations/compiler/function/record_in_conditional_return.out b/tests/expectations/compiler/function/record_in_conditional_return.out
index 4ac542999b..aa4b85cbb0 100644
--- a/tests/expectations/compiler/function/record_in_conditional_return.out
+++ b/tests/expectations/compiler/function/record_in_conditional_return.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 73d07c274e50c7ea55284ad7d934eac48d7157d3019d9b3097ef57c641427de6
     ssa_ast: d045710e1117eacb8be6d8e6c20c0b0a5782ce56f309b3f8302395f09789378f
     flattened_ast: c036ab67e797fda07180962b44adbb43e16cebc88b86f9beec77c874688e6482
+    bytecode: f5572172f6812e0eb6e906c230138c76d1344fd15522b8b2ee98156d6c92ca0a
diff --git a/tests/expectations/compiler/function/self.out b/tests/expectations/compiler/function/self.out
index 1b0d89c57e..e8e5071329 100644
--- a/tests/expectations/compiler/function/self.out
+++ b/tests/expectations/compiler/function/self.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 0579db12bce5b6f72c0f548276347f1dbb15a3fbee9096566dac494f0d2f429c
     ssa_ast: b52f3c0f0b541815aa8c44a975458e05c9a29a58e882c89b95423060b67be520
     flattened_ast: 35afdc86059af5851243dcb987b586241484e1fa649cd3ba062921e1860e48eb
+    bytecode: e62ba6ed16c820d4f4a8c2569bf96add46e3b8ce999e5fc77fa99c1769ca2dbd
diff --git a/tests/expectations/compiler/group/add.out b/tests/expectations/compiler/group/add.out
index 4ebda1803f..ffa05eafdd 100644
--- a/tests/expectations/compiler/group/add.out
+++ b/tests/expectations/compiler/group/add.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 195a02f5609697e7ba75c2057d0793b4be01e032ffdf4f86ab3cd139bd8ccb45
     ssa_ast: 99d29759cb73fadd73e12d0d9cc61bb3d76de5f9a8a029327fcca11740c81911
     flattened_ast: de07b90b2461632b0ab11ca4e4a89261f3b19bf28dd1d12c4146c2308aab7d0a
+    bytecode: 12e9627877abc9f4f519aeb445a200162f2c962b8ec7ecf49564c35abf14caa4
diff --git a/tests/expectations/compiler/group/assert_eq.out b/tests/expectations/compiler/group/assert_eq.out
index d3664bf051..059f60b399 100644
--- a/tests/expectations/compiler/group/assert_eq.out
+++ b/tests/expectations/compiler/group/assert_eq.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 98faf200b99d4d413f3cda0b984c27b4898258040bbc8255c736d75887cbb845
     ssa_ast: f672d9bfcaa92675a142fe1e6bd33b1d46cdf455340a7157fc5e38799ee61cf8
     flattened_ast: 5ecef425c9fa0b75f72ea912cd30700cab07c62a4b19402de638c2a50501c394
+    bytecode: ec93d62ff5b281dc94a2adea7451851a6101494b2539a653869f8cf5dc8d64b7
diff --git a/tests/expectations/compiler/group/eq.out b/tests/expectations/compiler/group/eq.out
index d3664bf051..059f60b399 100644
--- a/tests/expectations/compiler/group/eq.out
+++ b/tests/expectations/compiler/group/eq.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 98faf200b99d4d413f3cda0b984c27b4898258040bbc8255c736d75887cbb845
     ssa_ast: f672d9bfcaa92675a142fe1e6bd33b1d46cdf455340a7157fc5e38799ee61cf8
     flattened_ast: 5ecef425c9fa0b75f72ea912cd30700cab07c62a4b19402de638c2a50501c394
+    bytecode: ec93d62ff5b281dc94a2adea7451851a6101494b2539a653869f8cf5dc8d64b7
diff --git a/tests/expectations/compiler/group/group_mul.out b/tests/expectations/compiler/group/group_mul.out
index 6371e235bf..f6b4e0ad5d 100644
--- a/tests/expectations/compiler/group/group_mul.out
+++ b/tests/expectations/compiler/group/group_mul.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 1ef73786d0a40335e6d0edb2d560b20334113b48857030b87a638b6ff71a00da
     ssa_ast: abd17aba00c9af6437d78c5a05a999c14dbb19baf9a2617061d5df1092503845
     flattened_ast: d157785860e8aea337c5aeab93b9d23cf78c1fd91a958f138606e12d163176b4
+    bytecode: 734e21460ab7e6ae2f2f66f0dbb45e31b82e8e154807c69aa36a9332c31c9b6a
diff --git a/tests/expectations/compiler/group/input.out b/tests/expectations/compiler/group/input.out
index d3664bf051..059f60b399 100644
--- a/tests/expectations/compiler/group/input.out
+++ b/tests/expectations/compiler/group/input.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 98faf200b99d4d413f3cda0b984c27b4898258040bbc8255c736d75887cbb845
     ssa_ast: f672d9bfcaa92675a142fe1e6bd33b1d46cdf455340a7157fc5e38799ee61cf8
     flattened_ast: 5ecef425c9fa0b75f72ea912cd30700cab07c62a4b19402de638c2a50501c394
+    bytecode: ec93d62ff5b281dc94a2adea7451851a6101494b2539a653869f8cf5dc8d64b7
diff --git a/tests/expectations/compiler/group/mul.out b/tests/expectations/compiler/group/mul.out
index 569f16ee77..af0d14f457 100644
--- a/tests/expectations/compiler/group/mul.out
+++ b/tests/expectations/compiler/group/mul.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 9ba40b1ed2211831c2e70bbb47dcc6f9bdbed6f3a758f0d7f8fa0e854e12b68c
     ssa_ast: 6dcfde6afdaa4519781018b5f20141d1f4d4dc98fe2d6e4ab0a42bce86e414cc
     flattened_ast: e28793a0f344690ea2d325882fb8aff55066ab403cc6a52f1eb881e69fab3399
+    bytecode: 9dd44babd234f3b33af51d04ffd422308692b59caa5f1d6c3b765d0d8e795644
diff --git a/tests/expectations/compiler/group/mult_by_scalar.out b/tests/expectations/compiler/group/mult_by_scalar.out
index ef5a21e183..2ee378ab54 100644
--- a/tests/expectations/compiler/group/mult_by_scalar.out
+++ b/tests/expectations/compiler/group/mult_by_scalar.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 5dd447ad60022886199098602ccf066013f072ce9622dd400bd2ac57816b376d
     ssa_ast: c85b3e962cfee75d39b3c50bf61a1eb6d023fa28d1cea2c1fa3d037eec3d03a5
     flattened_ast: 212a97dc2ef10c35a3f70b9c490fe874bacb765d8ef0b1a5f6a1c3a7aad66392
+    bytecode: b3cef3c4dcd879fc92c9a2082e4820b102bf0ce47335b5e432b17a5c1b55da81
diff --git a/tests/expectations/compiler/group/negate.out b/tests/expectations/compiler/group/negate.out
index ced331dd34..77e5b9bd4a 100644
--- a/tests/expectations/compiler/group/negate.out
+++ b/tests/expectations/compiler/group/negate.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: bbd661aa4a9ada502cbdbb2665efe6013a863a2a793df248c6098e232a80bc5e
     ssa_ast: 0a0b98bae2ae082aeeff6e4ec78d8c1ee2b2a5627ac8a3000d4fb00466e0821e
     flattened_ast: 913ad9fa99a583ed51cfaaadb7cf990256c02d4361bcbb3b955e7458add13ca0
+    bytecode: 96c9838c6cd113e26c1cb3abcb9aebb52e622fec38cab2a13ebaad1683a1c15d
diff --git a/tests/expectations/compiler/group/operator_methods.out b/tests/expectations/compiler/group/operator_methods.out
index 93f7451d5e..4b7946e8c5 100644
--- a/tests/expectations/compiler/group/operator_methods.out
+++ b/tests/expectations/compiler/group/operator_methods.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: d2e4ad5bce1daeeebf758d000ac7751ba2ce982742338165fe5bb87d3ecd7960
     ssa_ast: 5f9670251173735ac6ea1aad7edbe922b940ef55ab909253a032e788d5b526ce
     flattened_ast: 5d6d814439ab855a5cfd7af55c47f8005dfc082bbfe3c5aef3fea8e90f208ee4
+    bytecode: 3e00010d213e17baaa50b9dd4f0a2b77264d697e851e4c64b6f33eaa15c16ed8
diff --git a/tests/expectations/compiler/group/point_input.out b/tests/expectations/compiler/group/point_input.out
index cbbe2f30f4..14ee1243e1 100644
--- a/tests/expectations/compiler/group/point_input.out
+++ b/tests/expectations/compiler/group/point_input.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 579ebc703c9567acb936536395be67bd0ceba6ee723875f7a13a087faf5e1228
     ssa_ast: a3a5204d56f2b6a7b5f7d2e7aa7beb9592831da092de01638e10a98c3e787272
     flattened_ast: 9365c2eb0ac1ef7dbd8a4124010230851dec684062fe4e3acbbb523e6df5ad2a
+    bytecode: ab93704b9e34e4588d4b5e1ae347f661a182ce16fac8a45c1d95232b38564d23
diff --git a/tests/expectations/compiler/group/sub.out b/tests/expectations/compiler/group/sub.out
index e126b599a2..fc2b6f3506 100644
--- a/tests/expectations/compiler/group/sub.out
+++ b/tests/expectations/compiler/group/sub.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 2c6d2c17a9aef05c817c6435e69a63c3bcfb15176464a5e632d0a3f263c4ea61
     ssa_ast: 4c6573fe76fa1a65a8d06f0e6a388ddb398c39c21eefad762f0fa16925aefb11
     flattened_ast: dc2cf7117e9a8c87aed98a23da5ba8c58f8ec01a10c56c49fe6041ec3f9e91d3
+    bytecode: 8389291206b5fde26edad53fd7cbfa30f4594fe5818a2cbb1a02b193a0382693
diff --git a/tests/expectations/compiler/group/ternary.out b/tests/expectations/compiler/group/ternary.out
index 7105287f75..2258e9e6b9 100644
--- a/tests/expectations/compiler/group/ternary.out
+++ b/tests/expectations/compiler/group/ternary.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 99ff057c8a5851601a3d60209dbeb87032128ca2a04a2daa54f3d6b484e7ddc3
     ssa_ast: 54d5c3881def5b8279e797176be1409c032ae1f9c429009f9a4a79f5400ceb04
     flattened_ast: 686318cd6349eedddcbec1954f5305f294dc6acab1c5129c4c902d24da82cfce
+    bytecode: cdbe7fcbbe006b5e22012279653209cfb5ba4db73631553c0eddd44a59e4a581
diff --git a/tests/expectations/compiler/group/x_and_y.out b/tests/expectations/compiler/group/x_and_y.out
index 44e584a9da..ff904dab7b 100644
--- a/tests/expectations/compiler/group/x_and_y.out
+++ b/tests/expectations/compiler/group/x_and_y.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: f9ed9bf2435a4565f8e03f5383219bb17fb0ec5f59e4b5dfec7d79563950bf8a
     ssa_ast: c67405bb4c2ef247dd665eff62d93351ad79d634cae7bcdb67db6aea61de4e02
     flattened_ast: 83659f1d7ff7ef190db88405e21fdfbf4ab997cf18e6f405c3371a4f87faeda0
+    bytecode: e96081d4904a9d73c7ce8bb9cd6357c90051b37b97961e254aff910cb2d73827
diff --git a/tests/expectations/compiler/group/x_sign_high.out b/tests/expectations/compiler/group/x_sign_high.out
index b48147eff3..8dab485856 100644
--- a/tests/expectations/compiler/group/x_sign_high.out
+++ b/tests/expectations/compiler/group/x_sign_high.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 4d301f9d6b17407c63148b4f8c041b8b909793ceb30eeeeb317e76dbcfcc99c9
     ssa_ast: 7202b4ad4215848a310b8225168a7c4f7603b878d74a669e096c8e8c31a89b34
     flattened_ast: aead5633b1b881f6f860a1fb3c03a8b2a8b4a297293533b005f38cde2514935c
+    bytecode: e96081d4904a9d73c7ce8bb9cd6357c90051b37b97961e254aff910cb2d73827
diff --git a/tests/expectations/compiler/group/x_sign_inferred.out b/tests/expectations/compiler/group/x_sign_inferred.out
index 50a115cf20..3f0d974950 100644
--- a/tests/expectations/compiler/group/x_sign_inferred.out
+++ b/tests/expectations/compiler/group/x_sign_inferred.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 604563d4a0d52722b6c15e370f927659a499e91ad5649d58967a8a245c8c476d
     ssa_ast: 7f811a402fc8219914ed3dd4b9654a81beba256f0211f987cf448de19c9bf5bb
     flattened_ast: e3abc3d29b6c9b690323c128a7da46de9fccf8d4123d24fe15df65f96d169b4f
+    bytecode: e96081d4904a9d73c7ce8bb9cd6357c90051b37b97961e254aff910cb2d73827
diff --git a/tests/expectations/compiler/group/x_sign_low.out b/tests/expectations/compiler/group/x_sign_low.out
index b2df4d3cb2..e8bad2c891 100644
--- a/tests/expectations/compiler/group/x_sign_low.out
+++ b/tests/expectations/compiler/group/x_sign_low.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 3e35b37fd750edd97e1a3662c4bce21b6f5fc1c88774c386ca0096e437972599
     ssa_ast: 3fdd109073c0e7110dd3379e077c05b6352ba06e8188dad3c069f2d081d919eb
     flattened_ast: 5704d3db9b7f86cc5723e69f66f605ef7132e30204de430527521e55f0d33ce4
+    bytecode: e96081d4904a9d73c7ce8bb9cd6357c90051b37b97961e254aff910cb2d73827
diff --git a/tests/expectations/compiler/group/zero.out b/tests/expectations/compiler/group/zero.out
index 3f55dcefe7..35a007a833 100644
--- a/tests/expectations/compiler/group/zero.out
+++ b/tests/expectations/compiler/group/zero.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 82fb5f408fbf7647e4084c267bddad855272b2f75438247aa6338945ce62db5c
     ssa_ast: 37e4ce8ac228a2c2bf01fb72739fc819889d609b1ece3edc7d66db4adccd7128
     flattened_ast: cb9291cc666173917ecdda359e79083fac86addd5d5694dca5d077cfff866368
+    bytecode: a94d1d8f79e69b746fcaf829916aae3f08c540aff13fd5d5a828addaded23621
diff --git a/tests/expectations/compiler/input/main.out b/tests/expectations/compiler/input/main.out
index f8e296be96..43d710c4f8 100644
--- a/tests/expectations/compiler/input/main.out
+++ b/tests/expectations/compiler/input/main.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 19d110903b06eb82c5c4874563eb500c0dd36c4919408daad9f77a327b3b1aa7
     ssa_ast: 1b9b290637908e25c9c0433fa968a0f5d69945f44a8fd7a4c85bb118edf739b8
     flattened_ast: 6d6965a5201fc59e8903d51599813a97ef1f40dac787d94aa27fefc39d0765de
+    bytecode: 9a1e5bb7b8d932d4afd347a856bfb38db144771f49a0d9589ef14236338e3dcf
diff --git a/tests/expectations/compiler/input/main_field.out b/tests/expectations/compiler/input/main_field.out
index 35b190c91c..eaf2873e12 100644
--- a/tests/expectations/compiler/input/main_field.out
+++ b/tests/expectations/compiler/input/main_field.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: e6bc55f56476fbc040c72a5ecdf5bb22d8c2312d1d2b1ddd337a126dbc2b761d
     ssa_ast: 26075e53cb215ce7f8be51dcc0ca710932d41ced058030984ea03185bf7e0e37
     flattened_ast: b137a195e489a4099fae89406755bad365c094a0982da96660d7b2b7e08746aa
+    bytecode: 33b0428205d23a2e03c265edac88f7b98fcfb7769b86ee0508128e68069b5b46
diff --git a/tests/expectations/compiler/integers/i128/add.out b/tests/expectations/compiler/integers/i128/add.out
index c43bed0619..93ae3c778a 100644
--- a/tests/expectations/compiler/integers/i128/add.out
+++ b/tests/expectations/compiler/integers/i128/add.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: d189fe8b28b7c36c871e03c2a86c8942aa2fea5e4b1c059bff5396293fd16944
     ssa_ast: 4eb45856236a2aec21eee3587586bca6f012ef68e4885328f0ec0799988bd944
     flattened_ast: 11b3cffdbd8f6bbabc8f619e77c80e56dfd9afff9eff861f7190d9575329caaa
+    bytecode: 6f3edf18242106629627faa1e59807276fabe9703a44c467ab0869035a916e59
diff --git a/tests/expectations/compiler/integers/i128/and.out b/tests/expectations/compiler/integers/i128/and.out
index a585e825e1..fe358cd0d0 100644
--- a/tests/expectations/compiler/integers/i128/and.out
+++ b/tests/expectations/compiler/integers/i128/and.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: e0cb5b24cd7e6dbda157f7aa0295bde5b3859367ef497673aa50fe0990f1d50e
     ssa_ast: 4432815bfb84d4bc36106dd593c1b0779bf0d4874687b7838f45a091accf8213
     flattened_ast: ee02b0137f2b5e86e7ab98d27d1a4ab3136cb1a106eabb7e7bc49c033fe40283
+    bytecode: d3d6361fcc04fcc6102c91ec93ca087f2248b8868883a216282223937942b9ff
diff --git a/tests/expectations/compiler/integers/i128/console_assert.out b/tests/expectations/compiler/integers/i128/console_assert.out
index f0ba7682ef..17c8430a4d 100644
--- a/tests/expectations/compiler/integers/i128/console_assert.out
+++ b/tests/expectations/compiler/integers/i128/console_assert.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 430e69cefed74391fe5a5de982090eee7ef96575bfd3fc04ff3d1a3623be65b0
     ssa_ast: a912f5c92b89cf2a00e8a66b3e8f46569d11f97f765f9d5833a587e1d23845bc
     flattened_ast: 46ec14d163ad58816884cf8aa5461f2726df0deb258d737bccae8a577b4b9c3a
+    bytecode: d865e47d55dd534c79a7f0abc2a97c569a9195a3579412a415379b6131003628
diff --git a/tests/expectations/compiler/integers/i128/div.out b/tests/expectations/compiler/integers/i128/div.out
index 19343b011e..874ec4b14d 100644
--- a/tests/expectations/compiler/integers/i128/div.out
+++ b/tests/expectations/compiler/integers/i128/div.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: a855bb1bed2d8bf27d37ea893758dddf23a1d1f3ab7e53bf7045627769654f00
     ssa_ast: b2f4a4cc16abdcb6a4da0d448860e132a019d2c35aa433e21288fee5ab1dbe60
     flattened_ast: 91cf630edd9ec636fdae558e655aff2523e0fa4990adeabbf5d24026313a4ec5
+    bytecode: 6a831f79614e36f29287d0c38c39352d1563a85cfd3d1ffcda037ce3dd6f32bd
diff --git a/tests/expectations/compiler/integers/i128/eq.out b/tests/expectations/compiler/integers/i128/eq.out
index 44bbd45306..3bdc5874b3 100644
--- a/tests/expectations/compiler/integers/i128/eq.out
+++ b/tests/expectations/compiler/integers/i128/eq.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 314179c813e78e89afacf2698d5f3a9509df02c9c05102404cc3ccb9838d919a
     ssa_ast: 99d92ee25742219c66ad49cf9e23d26e1d25ee1e8b6ef9c57518ecdb1aeda6cf
     flattened_ast: 2c98a4d126ef3c0180aac7c29ca22d3e6f82022f52a45eded7a51d68e63e078c
+    bytecode: 0497ce2fbdcd7212261295b10194407589572843d8ab24596f194c486ca2ea8a
diff --git a/tests/expectations/compiler/integers/i128/ge.out b/tests/expectations/compiler/integers/i128/ge.out
index 913434708b..016ddffb22 100644
--- a/tests/expectations/compiler/integers/i128/ge.out
+++ b/tests/expectations/compiler/integers/i128/ge.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: e124b477251252c4e52d4cc96cea5704ace30e2cc6f84103a528c002d109da19
     ssa_ast: 094aa869fbaae46eb578015aaf9a4501039c64672987aaa6e96e76dff9f67c84
     flattened_ast: ed17ac922a947b4ea6696d2eacef910bb0921e67fe53aa00c9670b0c1a69eea2
+    bytecode: 305c7f46ca9ad5640019699025196349bbc986ebc1532a17600e41d048df3d97
diff --git a/tests/expectations/compiler/integers/i128/gt.out b/tests/expectations/compiler/integers/i128/gt.out
index 2e32471751..f25a1e2b3e 100644
--- a/tests/expectations/compiler/integers/i128/gt.out
+++ b/tests/expectations/compiler/integers/i128/gt.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: afc0761d407235f3f42ebd1a8bd96e6b1a6c6b551b8bbbfbb52e3c83a6786932
     ssa_ast: 22709e954c12c74215000b8b621d171608165c43e5938bb1efdc2f47ba8a8ec3
     flattened_ast: 9b7dd9ac8d93a9bc0347bcc0d9a5719f0bd9bf935ecc46f6c1506bf4231e5b6d
+    bytecode: 9abaadb0253d49dfeee51800854119b7464f14158804826e78f6ab145ffe63e9
diff --git a/tests/expectations/compiler/integers/i128/le.out b/tests/expectations/compiler/integers/i128/le.out
index 36a63f471d..75bb2589ec 100644
--- a/tests/expectations/compiler/integers/i128/le.out
+++ b/tests/expectations/compiler/integers/i128/le.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: f46e78aaae54009bac9a12e37ae17f9a6580d733ff8b5ed21cf487f291675220
     ssa_ast: 860df825dfc234d8409d436d10a90a35101326c7a32a83dca5c2873a2911e341
     flattened_ast: 7e2e910843110f19826ba2fbb5397050ba029e0038b9e5aec533122aa546c8aa
+    bytecode: 8f31c696966ee1357b25d09dbad473b72482970eafed6a581aa90d13134dfb09
diff --git a/tests/expectations/compiler/integers/i128/lt.out b/tests/expectations/compiler/integers/i128/lt.out
index bf29e0793a..6c41e0590a 100644
--- a/tests/expectations/compiler/integers/i128/lt.out
+++ b/tests/expectations/compiler/integers/i128/lt.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: f6309e8478b5a8e2c8c5f455a5b0335de448029eeda9023fba17f9d12109bfe8
     ssa_ast: 0b898c35a71a64e1347e1c3a34e4db9b72b8fa46dfe7a363ee0a027ac8c56d42
     flattened_ast: 74f35d0a8b11e1b1e501f1c8c872b27e526b94b76ad01b0bdcc2f0f516812bb3
+    bytecode: 3b4376c236be3332bde01a7d6beabda973f64e777ee81bc17c2b082c8fb34d80
diff --git a/tests/expectations/compiler/integers/i128/max.out b/tests/expectations/compiler/integers/i128/max.out
index e4be262600..064fbc4b96 100644
--- a/tests/expectations/compiler/integers/i128/max.out
+++ b/tests/expectations/compiler/integers/i128/max.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 67950aac7e791df4b5547ad01ce7322f22ba9c650ecc92012a54b6c5d2256d04
     ssa_ast: f9046d8edf4629c2f371bd0e6dc917165f3987de68bddf0ba1a974eac6249284
     flattened_ast: f7cfdcde1a8e19702ab37edeab8b3077e4935fdf481c8dd030ff1ff64413aec3
+    bytecode: 4a17c14a9beba81a7b8177ff19eb147431b1d5769cca507dfe8cbce02a29ae1d
diff --git a/tests/expectations/compiler/integers/i128/min.out b/tests/expectations/compiler/integers/i128/min.out
index a782d5c1a4..1ff4f5ea3b 100644
--- a/tests/expectations/compiler/integers/i128/min.out
+++ b/tests/expectations/compiler/integers/i128/min.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 655033e68000f0abae9dfde77abbbd9484ff0c95bc6c8230c8a8d335e8a6882c
     ssa_ast: 8fdbe08df76b8185f6defa52503668a41409cd6636b63029880c1bfd3dd94586
     flattened_ast: c06ea99c57dbe8e033e06582c7d64ce254bb0f79ac954fbc3684a6ee5a958cee
+    bytecode: 5dd12bea92c7275bd2ef924ed8006f84593cd73bd7a517088f3350735d320ed6
diff --git a/tests/expectations/compiler/integers/i128/min_fail.out b/tests/expectations/compiler/integers/i128/min_fail.out
index d91bd75788..003e9c9c20 100644
--- a/tests/expectations/compiler/integers/i128/min_fail.out
+++ b/tests/expectations/compiler/integers/i128/min_fail.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 711bcf0e920537e99779ae3725c86b9f2758e0df6129a92641c2041b0242946b
     ssa_ast: 8f2d46e2c444560a5a3cfaf1bcb8fc7480b9f5881708fe5e43c49cb112319137
     flattened_ast: b6428fe05f919c3584f24eda3779191dd33f6b5a44b5835b8d58258510139d03
+    bytecode: 8514f62e239ece8b0cd2f7bc3c6b259ceeca8b9d921b0a3a167875814febe9d2
diff --git a/tests/expectations/compiler/integers/i128/mul.out b/tests/expectations/compiler/integers/i128/mul.out
index 4d6cf935b0..e7acc8e41b 100644
--- a/tests/expectations/compiler/integers/i128/mul.out
+++ b/tests/expectations/compiler/integers/i128/mul.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: b4fb5f080e02c918f3ec0079da577b7d10da85b7a27c297d9bdd76c8ac4896a4
     ssa_ast: 4b148681615e0cb140b614139a7b22ee5838b9dfa059fd87dfd70368df012c6b
     flattened_ast: 8d18710dbe4975b06e19edfcb58754fa477b1d7781b3b31d674ee2cd0195e3f2
+    bytecode: cf239c5d4821dc939540cb2317a2713906d1f552cf8f31e1ba4e0f37a92b8a35
diff --git a/tests/expectations/compiler/integers/i128/ne.out b/tests/expectations/compiler/integers/i128/ne.out
index 32b1c471ff..b7c812f18e 100644
--- a/tests/expectations/compiler/integers/i128/ne.out
+++ b/tests/expectations/compiler/integers/i128/ne.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 6705c4af4cab75cf1df851fca1a43d4dfa154705c5f2bc2791ea2aa2a580b490
     ssa_ast: e1f4434d0bb9736387f28f2212a3c7dd22dc27221ab51bd33fc6786532961b86
     flattened_ast: 6414384571c5a21f543ac4fee184d0e68f1e58b0075689674cdb02e076b7f790
+    bytecode: 1fdfc70503d61138eccaa03367363c5e3b5c46f439fa5e9666f34f1b795e4998
diff --git a/tests/expectations/compiler/integers/i128/negate.out b/tests/expectations/compiler/integers/i128/negate.out
index 23aa9441b7..b919b6066f 100644
--- a/tests/expectations/compiler/integers/i128/negate.out
+++ b/tests/expectations/compiler/integers/i128/negate.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: a133d7aed17a86ee23adba1d649d0aa0b2208e139eca8b2bb68c048c62b4a22d
     ssa_ast: 8c466028bd0eac80b4fb2d51175d98f91b9b7cc1b9805be0bd717742cd4dc107
     flattened_ast: 558c98ce88c995c445dd253118e17fc17dd53f1d980f4f11b492e86cd9f30f49
+    bytecode: 7cd3cce37a87bb48f44b2f44e37be5e1821abfc3d73d7ab6a5e7e96c72f8f091
diff --git a/tests/expectations/compiler/integers/i128/negate_min_fail.out b/tests/expectations/compiler/integers/i128/negate_min_fail.out
index 57694c1767..91c6ee9ba1 100644
--- a/tests/expectations/compiler/integers/i128/negate_min_fail.out
+++ b/tests/expectations/compiler/integers/i128/negate_min_fail.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 5ded4174b536a02944bc27a36fc9c6f2a4a51558da05eb6574efcb5da88ef6c7
     ssa_ast: 5e6aa992e4bc756d9651507f9a1ee732cc824c2c7013708a10c284f38e26654d
     flattened_ast: 0495861b8de56ee0e490bafacac0ceff52c442bdbc0821b824a775df0efff141
+    bytecode: 494ae1254dbca57e7dedbc2d9e21e837803b3124a21a87bdba507780a7e14fd7
diff --git a/tests/expectations/compiler/integers/i128/negate_zero.out b/tests/expectations/compiler/integers/i128/negate_zero.out
index bd26616302..f2414e13a8 100644
--- a/tests/expectations/compiler/integers/i128/negate_zero.out
+++ b/tests/expectations/compiler/integers/i128/negate_zero.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 0a0034b90fb853ef8a3fe279a2aef9c782decf3d6d8089fd15d17c57a4175e4b
     ssa_ast: 1115ec764603c47cbad7ffe307b6505df3c7ab67ba7d7d26c9ec714b9c694dd2
     flattened_ast: a96b8fd2115e4390c9d2366f850c3f320c6d8cc54f9f4e5bb059832ddb8765bb
+    bytecode: e6204df8c165d3c5fc23fa09299a67fc651c5ab297ce3d7ddab7766d7b360857
diff --git a/tests/expectations/compiler/integers/i128/operator_methods.out b/tests/expectations/compiler/integers/i128/operator_methods.out
index 5aca92b0a2..38ef3f1211 100644
--- a/tests/expectations/compiler/integers/i128/operator_methods.out
+++ b/tests/expectations/compiler/integers/i128/operator_methods.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: cf3f5321a65b327de126fef12fee797f58b8f1e67a0ff99b1caa26c71b8e3ef1
     ssa_ast: dbcc3625b2bf2ca1e1186e454c2ffa74c99f7e766cdc39fa18768cf0871ea9e4
     flattened_ast: 0563d02599f8b2247d164d7bbf088fa57b32956da7dd209ad4e760828349c461
+    bytecode: 379a43829001f6d142c2f738b3849505a90c255244d02c8581ab405cc8bd8afa
diff --git a/tests/expectations/compiler/integers/i128/or.out b/tests/expectations/compiler/integers/i128/or.out
index 2e58387049..f9e045398a 100644
--- a/tests/expectations/compiler/integers/i128/or.out
+++ b/tests/expectations/compiler/integers/i128/or.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 0d2139956268ba3da2b68064907148961cdf24ab0d9787be3503cbe648b965ce
     ssa_ast: 570e75c1074001f1f7472499b2ec0436acf2bf2e84eb7ffbab8b05c76b17cb9d
     flattened_ast: 9ce4368b29320061431c5a443be2b5d33457b3d021c02a1b50638dfbeb394a6f
+    bytecode: d262f60575627f8c4757304c45cd849e4b92b9ea44f0b342b12fa14c49d717ab
diff --git a/tests/expectations/compiler/integers/i128/pow.out b/tests/expectations/compiler/integers/i128/pow.out
index 20c2940f6c..43572ac9a1 100644
--- a/tests/expectations/compiler/integers/i128/pow.out
+++ b/tests/expectations/compiler/integers/i128/pow.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: dce7e36daed4b4f7bc9fec2930808cf5e6e09dcfc7e5efa19485cb679b2ebf55
     ssa_ast: b0c280050c730d4dc74745727882eb0f7b1b0f70cfd0895b553d003bc5906eca
     flattened_ast: c7aa06a57eaa5be0424c58d7dc1da3bc28a302ca9f568a93355b2b7cd90258cd
+    bytecode: dfd9659f15094e672f456a9603906d5babfca253c2b3098bc07e49aac07ca022
diff --git a/tests/expectations/compiler/integers/i128/rem.out b/tests/expectations/compiler/integers/i128/rem.out
index 4e499cef2b..2928155439 100644
--- a/tests/expectations/compiler/integers/i128/rem.out
+++ b/tests/expectations/compiler/integers/i128/rem.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 31eea787b1cdc1b5954efa413e56865f7bbb2c24de1c6fcf6b95e5d58e59e5a2
     ssa_ast: bf2ba7abf710e8fe2cc789cea659ba32b515f268540d583e40f0d8f3dde77d28
     flattened_ast: 9f166726d1ee8e57a56dbca1ff0b8e9140c710eacb93ec8bebd964ab6d04e40f
+    bytecode: 632f8400deb0e0e0aebadd45f557698474142e78ea2628de28c2cd4f6617d413
diff --git a/tests/expectations/compiler/integers/i128/shl.out b/tests/expectations/compiler/integers/i128/shl.out
index 7599f62c74..4c4d9309eb 100644
--- a/tests/expectations/compiler/integers/i128/shl.out
+++ b/tests/expectations/compiler/integers/i128/shl.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 5ed13cf5124fcc5700f3e93b9e1d5027c60c9d0b7ffe4579509c54386e0adcfe
     ssa_ast: 0622ae8caec4b070d8c04fe1c63068a2ebf69d55896832cb717da8257fbfcec5
     flattened_ast: 34b68f21728ed90574b51e8729a349aa2bf6b2c0fb7a56fa553b17708af97211
+    bytecode: f29d4cc186e6bc24ca0b6e70e5845295b29a2c1f1e9f46f635c90e66ef0e588d
diff --git a/tests/expectations/compiler/integers/i128/shr.out b/tests/expectations/compiler/integers/i128/shr.out
index 2b6569328e..7d82bf9dd4 100644
--- a/tests/expectations/compiler/integers/i128/shr.out
+++ b/tests/expectations/compiler/integers/i128/shr.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 0dd8a1bac58e34fe63a33e3fb1cd1a7b4f9543b6fe02ba6ba77744102ae3db2b
     ssa_ast: 6748714f0a04106cba5c9c4e4d188ab8001e7491818c5f35e7f02bcfddcbe59b
     flattened_ast: 1dfc8f3c24f2497c06c701435d1671c74497a48ffb34957a464022bc5bc0705f
+    bytecode: 6a4fa49e165ac0c731dd78a8c05ced2418d69ced736d07ddbb3a07c50bcf6b37
diff --git a/tests/expectations/compiler/integers/i128/sub.out b/tests/expectations/compiler/integers/i128/sub.out
index dff9741dcf..003633aeea 100644
--- a/tests/expectations/compiler/integers/i128/sub.out
+++ b/tests/expectations/compiler/integers/i128/sub.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 48f37ac6323b6f12a7ae0f7c0da535ba85fa97c7fb7f99991778b10b02dfa2f2
     ssa_ast: aa6f0565527199c7c74bd4b8eb1d0f126a2c30cc42227eb8ef528e8101be65e0
     flattened_ast: 86185db302ca96d3ce37c4d5a85a3258c796b4b16f9b51a41867d27b52f0aa40
+    bytecode: 07685949b1e45db55522bf01298e4cd0ba6b2818a8212365c12f468ed061a731
diff --git a/tests/expectations/compiler/integers/i128/ternary.out b/tests/expectations/compiler/integers/i128/ternary.out
index 469a206e53..86a087ec60 100644
--- a/tests/expectations/compiler/integers/i128/ternary.out
+++ b/tests/expectations/compiler/integers/i128/ternary.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 1c5f83296430b3bc6b756bc623e55be9757e1df35a47cd86aff0fee695b4f92a
     ssa_ast: bf698ce134161c1c136e8102d697cd7b7f7451b9a83cf15a6e1b343e18a4fdde
     flattened_ast: 156f2ebaddfc81fd9d54891855ccfda54db34c5a78c137c75da5e2a3c76cca9a
+    bytecode: 1b5ee12236a81275c1c8597e6956c715050077486831d3900e20d9053433ac2d
diff --git a/tests/expectations/compiler/integers/i128/xor.out b/tests/expectations/compiler/integers/i128/xor.out
index 41e3d17e11..581df05e0b 100644
--- a/tests/expectations/compiler/integers/i128/xor.out
+++ b/tests/expectations/compiler/integers/i128/xor.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 5d84eb96a2712f0442bc1ced7f737531bcfeb50669309ee0646bfdfd9c5d5247
     ssa_ast: d548fc3fd808fedcc3444a25cbdeb1a5a20c15a69ce4733b222efd880bb795d7
     flattened_ast: a2a81aad78f99ca60e0768e3b02a8d6b53509e2d3716b9768e556b5e00933e6c
+    bytecode: 6431d8554d06ea3522030d1a433ef1f39fe17ac974b4ac60f8d18afc2a5e1f71
diff --git a/tests/expectations/compiler/integers/i16/add.out b/tests/expectations/compiler/integers/i16/add.out
index fd05576549..cadcab1a51 100644
--- a/tests/expectations/compiler/integers/i16/add.out
+++ b/tests/expectations/compiler/integers/i16/add.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: d06de10cebc94c12fb985c144934967c3cbe72b7dfdb3d1021f46674a8b10862
     ssa_ast: cce4f1ee853faee4d002764c56fbc7ca239be0254d2a66020639595c73c66417
     flattened_ast: 4c839986bb12f66adfaa45d2c1e706c589ce0896afa8d4c9219221f2165da662
+    bytecode: a61fbd6923f8bf087a21d6e2779b62e264d63a92071f34a762adc7eaf9cbbe28
diff --git a/tests/expectations/compiler/integers/i16/and.out b/tests/expectations/compiler/integers/i16/and.out
index d08456ed06..4d29f6792f 100644
--- a/tests/expectations/compiler/integers/i16/and.out
+++ b/tests/expectations/compiler/integers/i16/and.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 11e2d2f6a5b4ef35cbcec8d94e1a9a140a9084f9c3b0da2f613d9f0f872f0aae
     ssa_ast: f91a94924bbdde0d640419533736039a10d2bf48a535a699b7468d7eaf34cc16
     flattened_ast: 04c80e3a04ad7b65f43eea77e19764149947e8c9f0928341331f5fa0c7744fdf
+    bytecode: 5dad432ec3e9573b92eac45865218e8dc3c93ef477d7293d2a6867528faf0826
diff --git a/tests/expectations/compiler/integers/i16/console_assert.out b/tests/expectations/compiler/integers/i16/console_assert.out
index 52170a99e4..3d3f80cedb 100644
--- a/tests/expectations/compiler/integers/i16/console_assert.out
+++ b/tests/expectations/compiler/integers/i16/console_assert.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 6b37ab5b4f6aaa4064b6569803fbf42a93f235ade304d706dfe2e6db678e369a
     ssa_ast: 05733ff9d1d2ded2523838c0aa637b369cc83ce5b4c1aaf077a875221ef5191a
     flattened_ast: 55fdd7f4accdd13918a184ccaad51988ed62528cdd97efd4e69f24405e0a4aff
+    bytecode: 9d7d64b8d70d040e6e587e10d48e14c46ff63bffe4379f954f7749deffdf593b
diff --git a/tests/expectations/compiler/integers/i16/div.out b/tests/expectations/compiler/integers/i16/div.out
index c52b04ac34..c772fd1e39 100644
--- a/tests/expectations/compiler/integers/i16/div.out
+++ b/tests/expectations/compiler/integers/i16/div.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 4c899a62daf8b1efc45511d24210c3862e7b786c74ee575edeb9a64671ed50ba
     ssa_ast: 1a7fa9bba580ce79730123b095f2c2b29f873145d00dcb3f40ac18481e248593
     flattened_ast: c64d3b34a55cf2a1fb5037ef0f9ba483af518a3cd04eba0d9983d6c79c5af90f
+    bytecode: 2e49ec96b230329d29aafbfb7dd025dfc1d94a410f17972055b103e5a1629646
diff --git a/tests/expectations/compiler/integers/i16/eq.out b/tests/expectations/compiler/integers/i16/eq.out
index 46d9cf7b36..5fb3644fd4 100644
--- a/tests/expectations/compiler/integers/i16/eq.out
+++ b/tests/expectations/compiler/integers/i16/eq.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: d6294529a76aec3464ea95296d80f861c4b6f4c89a3723ba1b7174b4a465b920
     ssa_ast: 835a4f549fedcc9184166b90a7e60e63e53742b06ae18df370cca6a86f529b06
     flattened_ast: 2eabb640f035c7a44c304b0028d1f0f25919a4a4e96987f53f5a8cde71a643fc
+    bytecode: ae49e3dc309ac1fae7c4285e37e5a2dca653f25dfb4fbed5cab087d203c4c94f
diff --git a/tests/expectations/compiler/integers/i16/ge.out b/tests/expectations/compiler/integers/i16/ge.out
index 1610087496..4757892df7 100644
--- a/tests/expectations/compiler/integers/i16/ge.out
+++ b/tests/expectations/compiler/integers/i16/ge.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 95cb312ce7b435e9596c1b7909c42f6ef611e2879f06123402139b600411413f
     ssa_ast: 3821bbbb5435a49f1d550e7f86562bd04cb0d668d5343e459b13616dabe303c6
     flattened_ast: c5392e2fab688c58cd33204a140a24e164c6a9c6be3fde0712ffeb3b6751f4ef
+    bytecode: afd97c7c25711fe41717b8f2cc653082f5d81466b099a490dae43e058605e7e4
diff --git a/tests/expectations/compiler/integers/i16/gt.out b/tests/expectations/compiler/integers/i16/gt.out
index 77499e48b7..947ec68fe4 100644
--- a/tests/expectations/compiler/integers/i16/gt.out
+++ b/tests/expectations/compiler/integers/i16/gt.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 1ad895f524048c1450936e2c1697579519314006a7b7a62adeafa1079eb79b0e
     ssa_ast: dd4ce87aa8c9e202c91f80526a8a394e1a1dbf07258a75d7c1f7322379e6ae1b
     flattened_ast: a7c402da9412f2d74c5782812bdd709d0e193f4fd7ef181f1a874a3f6c288d2a
+    bytecode: f7802d16ffb5304531ce00063506d55ff82a24dd6aa659e96c46c37b597ec3e9
diff --git a/tests/expectations/compiler/integers/i16/le.out b/tests/expectations/compiler/integers/i16/le.out
index cec16accbb..296772aaa6 100644
--- a/tests/expectations/compiler/integers/i16/le.out
+++ b/tests/expectations/compiler/integers/i16/le.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 71904d7ae60a1275148b23f0bb8eaa8f153c285d474576dc805da1a5dd256eec
     ssa_ast: d0b82ba3081053e10dde3d3c89d881f47fba5f273457856e64955355eb52591a
     flattened_ast: e09f1ef0d423cf6495be8f8548305895b468d8f7842124f73d5974646fd771b2
+    bytecode: 4098055f0ddcaeedbeb57f3ba3914a9ef47ad8cd114258f04ff47dedff6d9a00
diff --git a/tests/expectations/compiler/integers/i16/lt.out b/tests/expectations/compiler/integers/i16/lt.out
index 570cca9224..67f93094ae 100644
--- a/tests/expectations/compiler/integers/i16/lt.out
+++ b/tests/expectations/compiler/integers/i16/lt.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: b74fb1122140742af0db7b3989de16241a447b1a71aa15470b8fafcd2c8dfd43
     ssa_ast: 0eb240c1f8de1c84e64e1d7cbdc396eefe703dccccfd7f7bfbca595a5850053d
     flattened_ast: 3cc5d031c3c38166c682ec3a1f22e86f74fe7c57a68c6c4a9af6df85bd633451
+    bytecode: 5246d0c0e3bcae2402ea4d869b25ea506f69b9f2b151c0a437a80c53f6b06820
diff --git a/tests/expectations/compiler/integers/i16/max.out b/tests/expectations/compiler/integers/i16/max.out
index e6b1bc62ec..264a69840c 100644
--- a/tests/expectations/compiler/integers/i16/max.out
+++ b/tests/expectations/compiler/integers/i16/max.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 0121c2f396502fc8652c947b96904acc0abae7453ffce676d1359e79a7e17e5b
     ssa_ast: efd9b5c7ef2f754c3a4fbae67dce7e2e4be2637315d0ad81a3a5e5785acc4cfb
     flattened_ast: ee1d76974e1e591a97bb208e0cd1d0cb13e5ea06ec6ac662bf4dc986b69d74bd
+    bytecode: 6958108d2957c63c3584130ff20bfffaac82cc978c77da23b73c4633a75f1b4f
diff --git a/tests/expectations/compiler/integers/i16/min.out b/tests/expectations/compiler/integers/i16/min.out
index 6b0aa0ab3f..d829accb8a 100644
--- a/tests/expectations/compiler/integers/i16/min.out
+++ b/tests/expectations/compiler/integers/i16/min.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: e00aff7ac821e33ff65913a75b520fccc909a22ca0f2b81bad8c0bbf73960de2
     ssa_ast: 02c93268d7c06492cbfe81f8660fa9d32e2b01ff049116a7cf9e8c6aad468c7b
     flattened_ast: 333922a3939dc0a0753e173708e65f1a64d39972bde737eae60a605b2a55047b
+    bytecode: f2fe31979d1155f5b72ae5746b03fd87c6f2f45da939acffade988230a8e2ad4
diff --git a/tests/expectations/compiler/integers/i16/min_fail.out b/tests/expectations/compiler/integers/i16/min_fail.out
index c136e62d89..a2844711bd 100644
--- a/tests/expectations/compiler/integers/i16/min_fail.out
+++ b/tests/expectations/compiler/integers/i16/min_fail.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 79d6eefe0bc22de1feeff36937009998b1d7b413fbd90e3fc68777d5ffc83ca2
     ssa_ast: 5661f3cf74d1c447498bea03ef64fe3183ed6195ef9f907f50912c2652994c8d
     flattened_ast: 5d0188426c39c2afc8e45e3432ca14dbffd43a454f5cfe6257cb271e7ed0d06d
+    bytecode: 610f6da5a1bfe09e95c9fcc99b8905d5889d879fa9e09167fc9dfbe512faab0d
diff --git a/tests/expectations/compiler/integers/i16/mul.out b/tests/expectations/compiler/integers/i16/mul.out
index 676b4a11b6..3f79d7d2f0 100644
--- a/tests/expectations/compiler/integers/i16/mul.out
+++ b/tests/expectations/compiler/integers/i16/mul.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: d1a832e392858c7bd15e5cf2ae40a32ec5c0368c0d6482cab1f77e042e35b0cf
     ssa_ast: 33101425a7c781f6429e3880f3e3fccb8b25b9d7c0e43c8143c67f4481013a56
     flattened_ast: ea89df496484708281bc2d67bcb2e93da033fc357dcb5b3fbe330baa5230d3f0
+    bytecode: d8edabcfee75bc808014904105c76f84c9acef35797c0e25bbf339e768d853b8
diff --git a/tests/expectations/compiler/integers/i16/ne.out b/tests/expectations/compiler/integers/i16/ne.out
index d96145b5e5..562ac87714 100644
--- a/tests/expectations/compiler/integers/i16/ne.out
+++ b/tests/expectations/compiler/integers/i16/ne.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 0d20212d390c4ef2632f93502c12a7214960dd1ea4f8fe038beaa7018f327e5e
     ssa_ast: 7472b7af2569c2d0367bae47c3205f1e22b0a930f2b4127768a11cc53b424d3f
     flattened_ast: 2357ff5c76e538212534d1a9dbea8f4b88f78d87c31dc95b2a8b13a0f3012500
+    bytecode: 7625de6e12d49943dc9afd004ecbced1ca28e58e37ee87bf8f7896de8230b61b
diff --git a/tests/expectations/compiler/integers/i16/negate.out b/tests/expectations/compiler/integers/i16/negate.out
index c13541102e..53c13b957d 100644
--- a/tests/expectations/compiler/integers/i16/negate.out
+++ b/tests/expectations/compiler/integers/i16/negate.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 85e44241879552cb0936124ffd6af4363c7eac0fd8d228bd32029931608726c4
     ssa_ast: cf1c308442f6cae61e12eb1201f76a78fec25c7c01af7952baef366659632ee0
     flattened_ast: 33ed8a5963450e08fc4f049f7da5a0592874ce8d2b84c2ab4b03c82af8d74d7b
+    bytecode: ff7764c9bd18a9bedde5cf440934d90d38f8e75b7a882e506899e54c81de578a
diff --git a/tests/expectations/compiler/integers/i16/negate_min_fail.out b/tests/expectations/compiler/integers/i16/negate_min_fail.out
index 3c09b24169..735a467989 100644
--- a/tests/expectations/compiler/integers/i16/negate_min_fail.out
+++ b/tests/expectations/compiler/integers/i16/negate_min_fail.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 5b904f28c79524c63414652a1af63b09990abc3fdcabe89cf2839b4e5ba4944d
     ssa_ast: 4c7c5d32385001660cc160a2006cf203c1b404ff577fa69cf4e169ee8d4845b5
     flattened_ast: 530a6692f51730f366463ab0259cf710a57cb6335311cc63ead6f101023d9a16
+    bytecode: bb7257ac8246f75ff2fa570e93351842aeac6b6b1711f233bc29427df8e5105a
diff --git a/tests/expectations/compiler/integers/i16/negate_zero.out b/tests/expectations/compiler/integers/i16/negate_zero.out
index 85c6deaae1..a0ff6ea2aa 100644
--- a/tests/expectations/compiler/integers/i16/negate_zero.out
+++ b/tests/expectations/compiler/integers/i16/negate_zero.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 5067eda944d304804107a56d720ee05e37e3f88591056353e60adcaf0e9acac0
     ssa_ast: 15518eff87e0600e14b5669fed404890778ec27930359f5ac99b6e2414f9fbf8
     flattened_ast: 121f14007adefc43108c1207422c08ccb34cf568be68b4b9bd5878c53128261f
+    bytecode: 82f078cb2577720b3ec0efb950478d85280f6d2cd4282c48f229ecd2286591f9
diff --git a/tests/expectations/compiler/integers/i16/operator_methods.out b/tests/expectations/compiler/integers/i16/operator_methods.out
index 90de460ac1..053bda5485 100644
--- a/tests/expectations/compiler/integers/i16/operator_methods.out
+++ b/tests/expectations/compiler/integers/i16/operator_methods.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: a77e4d9f2116fbc70fa97e34755401c4c22c49e890add1fa486ae3b35e69e1a3
     ssa_ast: a8c6a9814c128f348950bc9c92ab04dcd119a999dc1692a97baf0ad8c1c29eb0
     flattened_ast: 46a3eccef69cbe785576cc040f3f73450804c277472073dd19a24428898b9158
+    bytecode: ca26df3d981c76ea139e38698ccbb6ac2fe8c940f7dd424a6791d29d2d8a28f9
diff --git a/tests/expectations/compiler/integers/i16/or.out b/tests/expectations/compiler/integers/i16/or.out
index 41a325e888..0d656683f9 100644
--- a/tests/expectations/compiler/integers/i16/or.out
+++ b/tests/expectations/compiler/integers/i16/or.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: e240eae9985903b2ee4f5cef794fd7d1ea3b4d24598bbcb7c0bd6ed083c8a91a
     ssa_ast: 23d3141792239841af1abea74afe61b3e39543b2e4bf0176e8e81c8e9ee7cad3
     flattened_ast: be1cbfdc321f0c0eea4f831c6796df5e5db698908f61d9d42703f04eabcb7cbc
+    bytecode: 24dbe991a15924dab9a19dc86f6173f85a793bcf6d3b6d33c7fe2c29a9401cc1
diff --git a/tests/expectations/compiler/integers/i16/pow.out b/tests/expectations/compiler/integers/i16/pow.out
index 968e58fe2a..43dfe5067d 100644
--- a/tests/expectations/compiler/integers/i16/pow.out
+++ b/tests/expectations/compiler/integers/i16/pow.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 80d57d683008e67f7c5fc5b21bf94542b076e1f94e91540c4c524a0ac81d9a3e
     ssa_ast: eac9072a4760952f36e9bcb93672c0c6749df54ed7be860de8b2d60e9f9cb7f6
     flattened_ast: b0fc31b36074d4a36d0778ba1e28e5a72d7b2254ba149c197157088c00d6de3e
+    bytecode: 0a5d25027b5d2b5a4fce9b93c6ddd7e245ea50434fe7c19aae907fc1ddb0237d
diff --git a/tests/expectations/compiler/integers/i16/rem.out b/tests/expectations/compiler/integers/i16/rem.out
index 00b9a3d058..f6a210442a 100644
--- a/tests/expectations/compiler/integers/i16/rem.out
+++ b/tests/expectations/compiler/integers/i16/rem.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 02ba9e4bde00dc95ebbda7f802a7027c5d87fc7b2ce000aca350cdbde7d42ef7
     ssa_ast: 0715c027b8a20ad9a291688f8cae5e2a8339c683c3b84160569cca9a982a07e4
     flattened_ast: 3005391011ad2112e4f9d5ade752142c2d1489bd914c5fc8bcc350514549d09d
+    bytecode: 4bae84ce4d6380e7d41b5074b28652bcf2beae9c47004f480f45728d3fc076a8
diff --git a/tests/expectations/compiler/integers/i16/shl.out b/tests/expectations/compiler/integers/i16/shl.out
index 1ee2ef5743..288b9cf95d 100644
--- a/tests/expectations/compiler/integers/i16/shl.out
+++ b/tests/expectations/compiler/integers/i16/shl.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 5b86cd3a2f81aba3aaa0c464a1e992b6f50ca1060b2d022c68f9644d54b7a5f4
     ssa_ast: 9ae99a42943575dfb2dd954227256db3ca65d10256c6a04761598bfe373b7dd4
     flattened_ast: 3d1330e15d80f89164ba8e9bee0c2b2338cae6cd7fbe31122970749e59a05b61
+    bytecode: 51091a6c5b24e9575bad691bfd3e499a82465bebc851c624984a65d346a637a4
diff --git a/tests/expectations/compiler/integers/i16/shr.out b/tests/expectations/compiler/integers/i16/shr.out
index 99bee0b318..48f987ffd2 100644
--- a/tests/expectations/compiler/integers/i16/shr.out
+++ b/tests/expectations/compiler/integers/i16/shr.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 7eab30d55be96ac5aee02181d38a0ce4ada350ca9fc686c1c07697b6a1901a8b
     ssa_ast: 985d703376bbdecd07bad58ac7c17e5d2b5c2a9a43350ae51b0d82003d709f5b
     flattened_ast: 78e3d390090c13da1db7a73a9a4b5db2a638d3f4060c2b21fc09179dd202eeef
+    bytecode: 000f236df936960490eede733dc994070d896c73e4652e79ed6a078d2631d1af
diff --git a/tests/expectations/compiler/integers/i16/sub.out b/tests/expectations/compiler/integers/i16/sub.out
index f59923e67b..913758221b 100644
--- a/tests/expectations/compiler/integers/i16/sub.out
+++ b/tests/expectations/compiler/integers/i16/sub.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: efc127f14052fabab2ada5f1866ae54ec6e1085560aa0d2b89da309005b8b082
     ssa_ast: 40826cdaad6021b39986d5473c8d90a2290e671939ed6a4b317509b6ce77e0e1
     flattened_ast: 49ddf6b947d1e00c92a3d61ab4055426632a77bafd6731f3075ec89357ba0eca
+    bytecode: d1ad9d0c658a951a98f1bb225937352b40b5e2870fd131c6a68c0ee5e25e7b33
diff --git a/tests/expectations/compiler/integers/i16/ternary.out b/tests/expectations/compiler/integers/i16/ternary.out
index 0ef1ca85c0..b06796457d 100644
--- a/tests/expectations/compiler/integers/i16/ternary.out
+++ b/tests/expectations/compiler/integers/i16/ternary.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: c87e066b5c9fdaa5280fb48377d03732fcc911e75987f0edd7a75ccfda88e7a6
     ssa_ast: 8bdd5e909bc97970c78643f023a23fd2d065c7a86f09c54ed681cfdc0825a66d
     flattened_ast: 2d1f8cc9a013457902a89066191d8645a75f6cc6ee70f90d3a0f4be212443703
+    bytecode: 14e6a5f8a524c491e4fd3c49b81f89cf5ffaa68bea3b1ef60b9a86b65a77008f
diff --git a/tests/expectations/compiler/integers/i16/xor.out b/tests/expectations/compiler/integers/i16/xor.out
index 16010f8ef1..54914baaaa 100644
--- a/tests/expectations/compiler/integers/i16/xor.out
+++ b/tests/expectations/compiler/integers/i16/xor.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 8e73007dbc41aba54e759b318f3a7e7589d0a28eb71f9cf9cf9dde36a6da100d
     ssa_ast: 780c9c49b9a421d90d87365b69db2607e864aa2aee81f0129e6f34198611e70c
     flattened_ast: 1147730bef8102e74801540131d4124ba70c3dca431799cfd40ce6742485d075
+    bytecode: f35d4454526e753df023baf1761e228b4e7f75cc66b9268d8685cfd99f574004
diff --git a/tests/expectations/compiler/integers/i32/add.out b/tests/expectations/compiler/integers/i32/add.out
index e2e31209c3..d6798621ff 100644
--- a/tests/expectations/compiler/integers/i32/add.out
+++ b/tests/expectations/compiler/integers/i32/add.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 36f7bfd0e5026d2ae9ae5c1dce39d54e0d9a29f7193db79465a2542ca110073e
     ssa_ast: da4e236fe799d635e545ffa7e8992bc382ea6953ffb1c5cb06aca36697363145
     flattened_ast: ac5d76c55c0de24289dfe20efc696d385b6d695324a9c883475fc352b1479f31
+    bytecode: 4a98642513ca0ed6ae3eae0b4a7d4e25a43bf2537b52dca4385bf83626aa6348
diff --git a/tests/expectations/compiler/integers/i32/and.out b/tests/expectations/compiler/integers/i32/and.out
index 314d35cffa..bbcd70d01f 100644
--- a/tests/expectations/compiler/integers/i32/and.out
+++ b/tests/expectations/compiler/integers/i32/and.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: c7efc2ab5094addc6283d1ee756cbb97b7eb1e12278144172a7d5eb5126ddeb9
     ssa_ast: 027ce6a776920e91ec020b9359810eb30af7bf066d70864097087e02039bfc4c
     flattened_ast: 2d8c24706f795d5054efdd56987bdaaaa1fd921ab2d9c751c53682fee0646c46
+    bytecode: c83bc9d6ff309f026eaeb241d0fda881b4c06b706608171e54822ea576661785
diff --git a/tests/expectations/compiler/integers/i32/console_assert.out b/tests/expectations/compiler/integers/i32/console_assert.out
index 6b4c07d7c9..f97015aa2d 100644
--- a/tests/expectations/compiler/integers/i32/console_assert.out
+++ b/tests/expectations/compiler/integers/i32/console_assert.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: f6146b5efa826e72ac3fe51df8f9e6d3aeddf6c44fb4e7ca4979fd0c4c35b444
     ssa_ast: 631c3c1f8fc61b36e3f85e45559a30de0eaf72c678090f3a167929bafdfc05a7
     flattened_ast: c0bda22abed4d89793989f55415550c875f839a951ca28eb466a3c8d19753187
+    bytecode: e93a461327025eb76bd362a69b2768d3edcc1864570406e44734686eaec84237
diff --git a/tests/expectations/compiler/integers/i32/div.out b/tests/expectations/compiler/integers/i32/div.out
index be0c7393a9..4406c4e7cc 100644
--- a/tests/expectations/compiler/integers/i32/div.out
+++ b/tests/expectations/compiler/integers/i32/div.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 9d32b826fda0157d073120c5cfd982efabbc52adf03f06bd55086de008cf3545
     ssa_ast: 4d5a06be078a5ae49a19c5ff4ce67e9e195dcdeb13ec2f6d2309e711c2c69f75
     flattened_ast: 442fabdb641cb000d06829603dbebe861ed0c9d0bea19eefb3c4c6a43647eaf5
+    bytecode: 7513cf41cc383d2f32c59f1fc1f0c08d966470080cc680b4e067a299840d447e
diff --git a/tests/expectations/compiler/integers/i32/eq.out b/tests/expectations/compiler/integers/i32/eq.out
index 36f9863321..60896bef1b 100644
--- a/tests/expectations/compiler/integers/i32/eq.out
+++ b/tests/expectations/compiler/integers/i32/eq.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 186b78f8155be2d9737fc632e7cc16363c5cbc7f17b6ce2747930735b4478370
     ssa_ast: be8ce092223c9befde13ae9b6bf472194815bb8c161c4b440f7c17d3beb2c6c1
     flattened_ast: 5a8c6ed8d09758b00d462e3e6d6adbbbb6b1ca05899bc788b1e68c49fc47ac6e
+    bytecode: 0d9b72a5e1ee092b054a7f0884c63f028f5fca4db22b6d5c5046b9685481c56f
diff --git a/tests/expectations/compiler/integers/i32/ge.out b/tests/expectations/compiler/integers/i32/ge.out
index c3e210bc9f..42dda2602a 100644
--- a/tests/expectations/compiler/integers/i32/ge.out
+++ b/tests/expectations/compiler/integers/i32/ge.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 3991b5880e1d83378b5775ce756aa3a9aeed3e70b43e14f09f1fa99aa2424b5c
     ssa_ast: f4093eeae23fcfc818aa916ee0b3bc2b0dcc6bcb38845f4eea28424182de3183
     flattened_ast: 02afdce3bbef4126841d424e50ad52eceef3cc6bef96db01fd13e6d37e29e6e1
+    bytecode: e96d849b37da6f6ec972d154166606de44c27e8dffb03e0de68c0bd2193ce816
diff --git a/tests/expectations/compiler/integers/i32/gt.out b/tests/expectations/compiler/integers/i32/gt.out
index e60c4c456a..2b141bdf1f 100644
--- a/tests/expectations/compiler/integers/i32/gt.out
+++ b/tests/expectations/compiler/integers/i32/gt.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 3aa82813eb0359278627070e87f2a706828c0db80eb81293f1d6683030512824
     ssa_ast: 49ad41fdcd02107db65acecc3e766644ea2345aab3065e6e097fd54195c30d05
     flattened_ast: f70c8eb7b8f332028436615984fb86fed1d80684aedd4fd6344973d05c5f2a58
+    bytecode: 3397488866433f0960d9e392f25891d8b57a64a2395deb346b904d999546db9f
diff --git a/tests/expectations/compiler/integers/i32/le.out b/tests/expectations/compiler/integers/i32/le.out
index 8a23d6b72e..cbff8a4ec8 100644
--- a/tests/expectations/compiler/integers/i32/le.out
+++ b/tests/expectations/compiler/integers/i32/le.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: cee61245c62d46748be1fb566cd2e90295e67a770cfd039b3d014321b01666c5
     ssa_ast: ddbc0ed2ac561c8544fcc70c2f7c2777601ff9e912aaf882e559f50d51a455f9
     flattened_ast: 982e03cf3e15a62dddf1207c63ab206f5e9e271a8c21360187c65f5e0d96475b
+    bytecode: e2d82a67993557ac34d9e9945369fa907d4c6213c45feea19ad80bcb3cde4d68
diff --git a/tests/expectations/compiler/integers/i32/lt.out b/tests/expectations/compiler/integers/i32/lt.out
index df4db3fe13..06dfff153d 100644
--- a/tests/expectations/compiler/integers/i32/lt.out
+++ b/tests/expectations/compiler/integers/i32/lt.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 6ef01b6fc6417b5c4ed5f314752aeb531fb777ea019a218de7256fb5147110cc
     ssa_ast: c172608a8a533db0d76acd72b1b5f51772bb519748a5f1f0dec1614f6272f462
     flattened_ast: f50e41220c286cd471259b9b9441189ca80645041eea69449112bec1113c613f
+    bytecode: 9227aa899da4b7ff37558be85d668ca336252c64e0687ea5d62f018b72127a04
diff --git a/tests/expectations/compiler/integers/i32/max.out b/tests/expectations/compiler/integers/i32/max.out
index 1e85051023..0d9436218e 100644
--- a/tests/expectations/compiler/integers/i32/max.out
+++ b/tests/expectations/compiler/integers/i32/max.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 8a36a18077b598e420610d775f69cf6fca87b1ce9d7c71416f2f8aafc542f0e8
     ssa_ast: 69cea47efef9c1101a25da4a9ece27e438d3c748e197b1573e8df91c1ee64f26
     flattened_ast: 9b71044fb1bc3e3dc50d2cdddea24c1df6d61411371a09464982c337bd59499e
+    bytecode: 57be3af9aea4c0676f2aa231ab3f3ad37c1f7c3210ef1428cb0acd9edcd86fe2
diff --git a/tests/expectations/compiler/integers/i32/min.out b/tests/expectations/compiler/integers/i32/min.out
index 46e3cf4287..b2bd9855ff 100644
--- a/tests/expectations/compiler/integers/i32/min.out
+++ b/tests/expectations/compiler/integers/i32/min.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: ff6660d80f5e4df44fe438051b539eea1aee5cc53785a1c19b66c22e388771ac
     ssa_ast: 62a77ddf6f6d2e281e9a80fbb5e745d814d5a040eb3158c5136df389c1c5ff0c
     flattened_ast: ede707ce40b05e4146eb56b44e3b66dcf50ed24e0c1945aca388bb5491304468
+    bytecode: 14baafe414bb3db0919bce34efa2e0cb9be410e07822419abe1d221c68860ed3
diff --git a/tests/expectations/compiler/integers/i32/min_fail.out b/tests/expectations/compiler/integers/i32/min_fail.out
index 36e979e4dc..799f65488a 100644
--- a/tests/expectations/compiler/integers/i32/min_fail.out
+++ b/tests/expectations/compiler/integers/i32/min_fail.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: f7a3a170ba6d57bbe91cdf065ae3ee44f97fde92d2730deeffed645ffdfce5d4
     ssa_ast: 71229a7b35742121e14cf828f2ce645ad5ff638d34c8bb1f33df539c7b272dbe
     flattened_ast: 04d038e7b71b8253d39cee593501169d70e34a693459f6b35f2e03ff5298bf59
+    bytecode: b7db7415e9a7e2872bdc1b803f5427a6632cc201dd4a91e3f11a337c30c37cf5
diff --git a/tests/expectations/compiler/integers/i32/mul.out b/tests/expectations/compiler/integers/i32/mul.out
index 236475f86c..84ccc05198 100644
--- a/tests/expectations/compiler/integers/i32/mul.out
+++ b/tests/expectations/compiler/integers/i32/mul.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 9bc02f0bac5537597c9679a65610b2d4b4ca9af2ad7ecd485b12ba1b86b787a7
     ssa_ast: 062a77f76f33e255f2ec19206d30c1fee528597ffee62110943d969bfc014290
     flattened_ast: bc9d4e51523d0afff7e14399198e11249b70ed1cc438f710243cfb16a5ee66ff
+    bytecode: 0fae6466a2bf2de1231d59ee8579aaf8576385f781ec07b670799723b45090c1
diff --git a/tests/expectations/compiler/integers/i32/ne.out b/tests/expectations/compiler/integers/i32/ne.out
index 23ad28fac5..51cb065580 100644
--- a/tests/expectations/compiler/integers/i32/ne.out
+++ b/tests/expectations/compiler/integers/i32/ne.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: f28796eba1305513a97124712a252d3f38bbe4b2c12d3b973f1967fdb3f3720f
     ssa_ast: 034889d962de26f2b72b337c6d827d7703df200643fca30b9dda84f3b6176e20
     flattened_ast: 397ef80c6e7cb3e5511527fc430eea5d6b1ba811c89eba2fab713c460722d25f
+    bytecode: 8b1b03539a77776abeaef8d0d2b0955c2e1ee92abc4418cafd336e2fd7e07d8c
diff --git a/tests/expectations/compiler/integers/i32/negate.out b/tests/expectations/compiler/integers/i32/negate.out
index 2e251d86c7..e961d833b5 100644
--- a/tests/expectations/compiler/integers/i32/negate.out
+++ b/tests/expectations/compiler/integers/i32/negate.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 22b33fc825b0cd6aa0875dfe5b98ca74f850da8aa5820987964b19db40a9459a
     ssa_ast: 1aa82e537c3110c826af533d3db8fca889ae09b1da901d31ad2edc57cdb6293e
     flattened_ast: b64f8d965606883023d3481a415dafb45aa7c518d1bce40462725c623b17294e
+    bytecode: 0926e920330080c9eb6e3b07960f4ac16ba62c2e93e7d2deaf2be56f21f64457
diff --git a/tests/expectations/compiler/integers/i32/negate_min_fail.out b/tests/expectations/compiler/integers/i32/negate_min_fail.out
index aadb6fec1a..d9c4dd081b 100644
--- a/tests/expectations/compiler/integers/i32/negate_min_fail.out
+++ b/tests/expectations/compiler/integers/i32/negate_min_fail.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 9a8d6859a3d65bcc8f69a242e69baa4e17270d9052c0e8884e5f2bb1c83ff3e7
     ssa_ast: e674fc9166206b02451e9851f28dbebe45505e6ed1367082e3c8a83969f31453
     flattened_ast: 339886acbd03dcdfeab47e1f22f36bb6b9aadb53c4c5e54e2e6ca57afaa4668f
+    bytecode: 0df63ebe06d4d8d06c00c9b1d9591a683c5d13b9af12d4eb12c57a83ffbba471
diff --git a/tests/expectations/compiler/integers/i32/negate_zero.out b/tests/expectations/compiler/integers/i32/negate_zero.out
index ff42829aac..65abc3f45d 100644
--- a/tests/expectations/compiler/integers/i32/negate_zero.out
+++ b/tests/expectations/compiler/integers/i32/negate_zero.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 73406285ee1ba91663b29aa6c5d35228a9309cb15185000626a499b37f2934c3
     ssa_ast: 042f52bd3202567925354734ede0dd99598571ec079436e4dff7afc6539d6feb
     flattened_ast: ea9437fecb1eb7879b82ad7baf4e621408d19398e3f35e56c053d184e5e03e43
+    bytecode: b89559b0fd9e2790ecaef181d2af90bb7015a2c5894a07106eda104d8f572bed
diff --git a/tests/expectations/compiler/integers/i32/operator_methods.out b/tests/expectations/compiler/integers/i32/operator_methods.out
index 97a3aacdc6..9e50a9ff5a 100644
--- a/tests/expectations/compiler/integers/i32/operator_methods.out
+++ b/tests/expectations/compiler/integers/i32/operator_methods.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 3b74f77034a15dadb43593c9c13e1f246d015b8c8ade21c6009b8599a4c60ea4
     ssa_ast: 9b44a1f62001ea0a6ca5118db64fbfe610f99b6aee4e6e58764fb07198340863
     flattened_ast: 1e715e400f3e68d06500be21eb50e2d31dda565aca95063be350361c281eb1e1
+    bytecode: 990e5c5e9f9079479ff3efb9871f8987145c808d38818b83948b09060cefca91
diff --git a/tests/expectations/compiler/integers/i32/or.out b/tests/expectations/compiler/integers/i32/or.out
index 856f5cd2f5..e6d4e4841d 100644
--- a/tests/expectations/compiler/integers/i32/or.out
+++ b/tests/expectations/compiler/integers/i32/or.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 1410e7773fdb87aece7a0d922a0a4278692927f345234b70505177c52e7b5ab4
     ssa_ast: 2329fc40ceea4d6a2aebd34e87b28e734642c0d48e1c51d3869bdca676b28ea1
     flattened_ast: 1d96b46ddad6e40e8621be9eeb0f7bd55685a846ce1fb2b30c51c3b160adc9b9
+    bytecode: 41b5a13222dbf0dd53c84da7f751c736e7356ce05e37db45e764d52e4f04331e
diff --git a/tests/expectations/compiler/integers/i32/pow.out b/tests/expectations/compiler/integers/i32/pow.out
index 1fa17a29a2..09393f491e 100644
--- a/tests/expectations/compiler/integers/i32/pow.out
+++ b/tests/expectations/compiler/integers/i32/pow.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 069e5d7d92629f17d6e1e74959a8bc9cc28cfa34e837295b35294dbaad92c04a
     ssa_ast: 7eea2064a76cd33441c02d4d1677adeaed1d42377e5a60ebc3ceeae598920277
     flattened_ast: 678cb1d61870c5cbd7381249edf9e1dcc0c093886dda2b5dd083ef68b82d099c
+    bytecode: 8fde7f6968f5d5cc3ce9e9bbd5b9915995375f990bf41f7ac6e8f0a550b7c859
diff --git a/tests/expectations/compiler/integers/i32/rem.out b/tests/expectations/compiler/integers/i32/rem.out
index 1d131ecfa3..c9ab301611 100644
--- a/tests/expectations/compiler/integers/i32/rem.out
+++ b/tests/expectations/compiler/integers/i32/rem.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: dfa513d1e08071be875cf677fdf717f064110e619ff6c2fb6ddc2d6208bcf450
     ssa_ast: 9f134b8eabb87f50489ff18ff93029b4a3f592373537c5945a6cbc101a677d03
     flattened_ast: 9b0cc00c2631fd9cc80c451f8054b5af71149ca916463266cd8fa3df2dad68bd
+    bytecode: 5f3b856138f21abdccf6f7663995e7109d9a034bebc1c97573aabb9059a3a4ca
diff --git a/tests/expectations/compiler/integers/i32/shl.out b/tests/expectations/compiler/integers/i32/shl.out
index e59390b69c..3c5d739b1c 100644
--- a/tests/expectations/compiler/integers/i32/shl.out
+++ b/tests/expectations/compiler/integers/i32/shl.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 6f5cab1e1954664432e0c3fcdf88f9e5bdc37145b3c2d65206bf09f776ec8648
     ssa_ast: 88ec57f9420fc5af461c6acc9786e018713a222df65a01f2e0086d0813c08f6d
     flattened_ast: f25689cae33ea7b887f83c512d66f6f331a27f585e7f397077a34d34df66522b
+    bytecode: b069cb686a859904113693c69a78d951b07809cfec5a01f3178c7057287ba26f
diff --git a/tests/expectations/compiler/integers/i32/shr.out b/tests/expectations/compiler/integers/i32/shr.out
index 85ecd8e7f8..731a69aa31 100644
--- a/tests/expectations/compiler/integers/i32/shr.out
+++ b/tests/expectations/compiler/integers/i32/shr.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: ad824270f10a790c5293cc592764e9f787b7d7a23156bf4dd6ed0b1e6f7956f3
     ssa_ast: bd9160fc9dd62a0ba90c9b07187777c08571833095906bc2eed745ed7b170a5f
     flattened_ast: 67ebf918c0e0cdcf7f454d6a24f118831330bc70871e091aba67d84226bb2c08
+    bytecode: 699eda9f97d2b6c417a0fba495fdf3ff6f05965d5bc9dbd5f65ff738d5df5d4f
diff --git a/tests/expectations/compiler/integers/i32/sub.out b/tests/expectations/compiler/integers/i32/sub.out
index c687c762ad..e671fde315 100644
--- a/tests/expectations/compiler/integers/i32/sub.out
+++ b/tests/expectations/compiler/integers/i32/sub.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: b760112432da7d2f44caed56cbd1a9397b378aa3b9b8ae83520d89a1edbb2aac
     ssa_ast: bebf6d70eaf850004593662ca0c6da8f2cb6740ec63d967e50706795a7a34514
     flattened_ast: 768fc58caa320d23f072796c22ceae962d5ad0ed48f08a542f205cf63b6e3668
+    bytecode: 181e307cfa4facef9fd4cb209e120f102fbd934b6bdaf6208f8578360b8bb707
diff --git a/tests/expectations/compiler/integers/i32/ternary.out b/tests/expectations/compiler/integers/i32/ternary.out
index 88e45ebf66..145806c064 100644
--- a/tests/expectations/compiler/integers/i32/ternary.out
+++ b/tests/expectations/compiler/integers/i32/ternary.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: afb9f1fd4f1def77f05ccdfb456e9c07cfeb7e4ca7fc6baeb7f3a6fdabc62d22
     ssa_ast: 86788ca94205742aec0b732dbb2411430f46e4fa880fd4c0dce637ef43467653
     flattened_ast: 664a4fe4a4336c1fe32882d7b7a38ac84ed65f89eb9a89c4b4a567609aaa15f5
+    bytecode: 5e573c847fa4f1ac29236a5eb9a8a5601cdc8ab9fc41d1fe57225be41ca1f38e
diff --git a/tests/expectations/compiler/integers/i32/xor.out b/tests/expectations/compiler/integers/i32/xor.out
index d680aaf24b..4d2fe640a1 100644
--- a/tests/expectations/compiler/integers/i32/xor.out
+++ b/tests/expectations/compiler/integers/i32/xor.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: cb40f36627b10f1d5647e4a9e49ac766181c7ddfc0286bad3296d08ebf617fd9
     ssa_ast: d1ba917be39579d6fe1ec748d69656c38887c16fd3e4260579be9d9ef413f8cf
     flattened_ast: 99ea74485b07febed6387372ede17412db400f351c73c84fbc227d3be957b460
+    bytecode: e11c7631389943bb7588bb83da0b213b8c135def3ae965cb4898c010e4a61d60
diff --git a/tests/expectations/compiler/integers/i64/add.out b/tests/expectations/compiler/integers/i64/add.out
index c19a8c4831..fa89717ccc 100644
--- a/tests/expectations/compiler/integers/i64/add.out
+++ b/tests/expectations/compiler/integers/i64/add.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 0e9611c67f0fcb81500bf7dcf6030dd66609dd1636ed3d2232b5117b13bbc5e1
     ssa_ast: b772de5d785d694460c91c687d7c81bf025d843f7e615e22a10c0c791662ec30
     flattened_ast: 51dca2268aaac80efd0c28d76a6a4c257bcb868b6833d74b9555da9a31f69d13
+    bytecode: 17d483203a936ddc245bdc0796535ea82eb4e2299e9c0ed1cb64273c004dce73
diff --git a/tests/expectations/compiler/integers/i64/and.out b/tests/expectations/compiler/integers/i64/and.out
index 35be881198..566ef748f3 100644
--- a/tests/expectations/compiler/integers/i64/and.out
+++ b/tests/expectations/compiler/integers/i64/and.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: f3c48ebe21e26679d5a08ec3ba816d4fb2bd64e95b6c2401af3dd3b64be2fa5c
     ssa_ast: 3ed2f5d0b42eebf4c43970e223376091714c2f39b8d23dd516a94cd2e3dc076c
     flattened_ast: 79f19351f49eed2148851d7a727ef360c5b1285f53d454fc7f8ec7d8d8cd9bc7
+    bytecode: 1900494d905399f3c3cb4a321ccaceaf771e194ecffde3f9256f8a4236379d72
diff --git a/tests/expectations/compiler/integers/i64/console_assert.out b/tests/expectations/compiler/integers/i64/console_assert.out
index 217eefb2fa..4a19b6fd85 100644
--- a/tests/expectations/compiler/integers/i64/console_assert.out
+++ b/tests/expectations/compiler/integers/i64/console_assert.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 4c90f83c312c6e7fcc8ce83b14fb321b5020e3bd8baf40878d60d44e5afd4c37
     ssa_ast: 461e6d87ca947f6f837e063f2281976e0e0c3fbc601c19d3ece48c2b6aad7c69
     flattened_ast: e4228bf3d44761dbede153c1b6d471e7cb64e908add2ca148e288ab0bc3c7752
+    bytecode: a933fea3a225baaab4b8d1290eb57e8146b2c9d5b5f26d93c1d9e7b75f4ce004
diff --git a/tests/expectations/compiler/integers/i64/div.out b/tests/expectations/compiler/integers/i64/div.out
index c6cb2d4627..49f0d3fcde 100644
--- a/tests/expectations/compiler/integers/i64/div.out
+++ b/tests/expectations/compiler/integers/i64/div.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: ccaed7a5a093164baad702f4f6bd00e88d258501c758f88289439004c7297738
     ssa_ast: 6710b1f8786b15d9f53de6cff69b780e7e49c0ce77acafbcd65d7a142d94ce8e
     flattened_ast: 11a69da937647f7d3f9cd74be04ed41c8c30921d6d94e44128861ec1d786880b
+    bytecode: 4ff31765b1127b297af44c6e74441b7c065df074c73f29c50a4284a207c399ad
diff --git a/tests/expectations/compiler/integers/i64/eq.out b/tests/expectations/compiler/integers/i64/eq.out
index 00d2387243..964b693104 100644
--- a/tests/expectations/compiler/integers/i64/eq.out
+++ b/tests/expectations/compiler/integers/i64/eq.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: ba5d1d70ae955f5423e69727ff0d60d5e7fedbb82adfa104f3817e1ad35f50b2
     ssa_ast: 958b409efcf194c45b3ac7b2998f6f950b2c21a2907d15991bcd9d9bcd7b9fcf
     flattened_ast: 9204630c5a335b443cffd4c21099c8e47dc01e4b306f3a585151ca6208241ce3
+    bytecode: d9eaaabc3cd4c2a71842849ab67c1774ea5b405de5b9e19c2569f55ee2f5ff0d
diff --git a/tests/expectations/compiler/integers/i64/ge.out b/tests/expectations/compiler/integers/i64/ge.out
index 8fddca42c2..abbe818687 100644
--- a/tests/expectations/compiler/integers/i64/ge.out
+++ b/tests/expectations/compiler/integers/i64/ge.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 234da5527febcac53d22d8d53984f0941aadc9a724ec83d7f8371ee2ceda5855
     ssa_ast: 9b30e8d9e3a3af6ed8c72536282ea2d9e42af749b050a5122f515ebda9278a65
     flattened_ast: d518fca46d44edf6ff66a1840334788ba97b6eb3477698cd92c7bb538dee8745
+    bytecode: a4e24f8e568e5e919da45bb4f5af3c2e9cee35eefb118416bff06c89854386f3
diff --git a/tests/expectations/compiler/integers/i64/gt.out b/tests/expectations/compiler/integers/i64/gt.out
index 0df8a20dd2..de14085cff 100644
--- a/tests/expectations/compiler/integers/i64/gt.out
+++ b/tests/expectations/compiler/integers/i64/gt.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 7922ab3f9f42065f80e233a2ebd76cf58fe5525d17996ffde046cabb39edf194
     ssa_ast: ed0f1e051b65e7efea61cb9722a0e316ea773e42101802a3e1c62ad135327187
     flattened_ast: c042e954131dcbe8c82a628e3779f3c54a70ade997f569aa20759f45a28a0027
+    bytecode: d4c954232923c21fa21d3bda6a7dcc582ea6bb1b83600053839b5f3186c722cf
diff --git a/tests/expectations/compiler/integers/i64/le.out b/tests/expectations/compiler/integers/i64/le.out
index 90d65ee528..c5d60bea8b 100644
--- a/tests/expectations/compiler/integers/i64/le.out
+++ b/tests/expectations/compiler/integers/i64/le.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: e21f4de3d0fe67f5a7b534dcc941b0019c0ef847fc8429bf06f30a9b0517ca3d
     ssa_ast: 280c2a27be29f07499d996781f4a03cd0b1b1d1555bd110587945de3af2af1db
     flattened_ast: 22bd3a9c01e04f017bf6a2aa76a38d43327a495fb701500e6caf4de770d8bfc7
+    bytecode: 5e52e11a750dd49054fbc4df94cca7d6d8a6e3500688ab9dff28a2840f2debce
diff --git a/tests/expectations/compiler/integers/i64/lt.out b/tests/expectations/compiler/integers/i64/lt.out
index b18f6787f6..f534dab0b5 100644
--- a/tests/expectations/compiler/integers/i64/lt.out
+++ b/tests/expectations/compiler/integers/i64/lt.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 07f4526fb4a91c2d0bb58c3d72e9fe316663ad8502d9bc2df24c5a7cfbc4e696
     ssa_ast: 4941b98b931459e2dcd91d0caa8acb7755cbd061c452ce02c6908e65eca9baab
     flattened_ast: 086559ac95f73a366a44b1a91a23891a441f9a0c1ab4a75f015428b6f8e3b312
+    bytecode: 4343e01aa9b8faa22e183d62b592ac2fdeadeddce9c27d195579daf09195035d
diff --git a/tests/expectations/compiler/integers/i64/max.out b/tests/expectations/compiler/integers/i64/max.out
index 92010396f1..66d42f4261 100644
--- a/tests/expectations/compiler/integers/i64/max.out
+++ b/tests/expectations/compiler/integers/i64/max.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: fdad5019690949fac8c086a5255bee8b9973f115e2863a71c4be7ca90cf133a8
     ssa_ast: 6aeb1c07f6fc9f67b9c1ef31c51c52e4fae9ecb2ba81217aa9dba8e83a550873
     flattened_ast: 5bb31863685e087c58d0863e1d4adc2a856a98f5bcc6db68a283cf294f8531b1
+    bytecode: 929c4b937a8a738bf0965e24eeedbc03e55d101c8e36cfe1291733c1669280a5
diff --git a/tests/expectations/compiler/integers/i64/min.out b/tests/expectations/compiler/integers/i64/min.out
index 65da271fe9..fb4eb77708 100644
--- a/tests/expectations/compiler/integers/i64/min.out
+++ b/tests/expectations/compiler/integers/i64/min.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: daf0bb14f7f7342d21f57f90c946eaf457bd50a18c1777f39a299b43c156f99e
     ssa_ast: e434f625689cd3549cce3a50c3f35c4ec54f4339fd9c21f4ccc486005378dfdc
     flattened_ast: dfcb8d3c590bf10a19e03d36d30e5d11a1e71b7d5e5771abbabe0d5b6a23438a
+    bytecode: c70650dc5c5f4290173474dc878e9507448aed41f0f9f91348871c76e1a0d743
diff --git a/tests/expectations/compiler/integers/i64/min_fail.out b/tests/expectations/compiler/integers/i64/min_fail.out
index 8109066348..faf6c6d055 100644
--- a/tests/expectations/compiler/integers/i64/min_fail.out
+++ b/tests/expectations/compiler/integers/i64/min_fail.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 1e8cd063ff228b6ee31f308dac919870d835c5e55190d5247c8b9edbfc4f9179
     ssa_ast: 400b5d055969370c2a2cbda1a51bc680d5434076c4e6278483b73eba410eb339
     flattened_ast: 3e90c7fc84243febecf94b4a2b9b6100bf02823af57408cf61da674632f61512
+    bytecode: 974c9ba823baf31ab404b852fea45c594b862ef0cc1f75b0a8c929dcbaa9beda
diff --git a/tests/expectations/compiler/integers/i64/mul.out b/tests/expectations/compiler/integers/i64/mul.out
index d6fc37062d..4d39f930e9 100644
--- a/tests/expectations/compiler/integers/i64/mul.out
+++ b/tests/expectations/compiler/integers/i64/mul.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 303de02eb3b78cacb095d68aff65a920320a8dde82251a8bc14a35dde1040ef0
     ssa_ast: f343a8e41cd3010df7b412ca118f718badfbf99c5c04e746000c32a26f4ae75a
     flattened_ast: d0fc6c6015fa427f5f475e9b62e5157bc1cddf900b808064ceb0727c2db5bba7
+    bytecode: 99be027f5187d87654776502492f4f1978e42cc05f8f8f95182affbca89c3821
diff --git a/tests/expectations/compiler/integers/i64/ne.out b/tests/expectations/compiler/integers/i64/ne.out
index 46671c74a1..bb67f9c519 100644
--- a/tests/expectations/compiler/integers/i64/ne.out
+++ b/tests/expectations/compiler/integers/i64/ne.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 638850c9e28b8e6c2823ccbf2697dd7ebbe30ffa0461e5d0f43758964fb731fc
     ssa_ast: 2648210da18d7f2d9974b8b36b0bb4c5592fd1acf30b5fdbda030003032b62dd
     flattened_ast: df80dcbf1a7e682eb0ad8d45dfe0f33dd4e2faa603db4652004a23f695c5a8ad
+    bytecode: b10e55267602daa0dad06640cb8fd5284e816f1186333a8fc5fa9d35af8e18a1
diff --git a/tests/expectations/compiler/integers/i64/negate.out b/tests/expectations/compiler/integers/i64/negate.out
index c0dff62004..0e8687e95b 100644
--- a/tests/expectations/compiler/integers/i64/negate.out
+++ b/tests/expectations/compiler/integers/i64/negate.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 85e48f5a10d8c03e7365fb253e0b8d14de2550285d527c7881c99060cf9bc454
     ssa_ast: 3f6c42f8910dfd61b1bc05b938ae2410d516023145df19bc550a5bbfb1bb76d4
     flattened_ast: 94bc1604f933c0e12eb47f75aca56f47ecdc63168e1aac70dce95c1f89219aa7
+    bytecode: 1eb8ed3e4e4f46596178405f771a75b5eb12a6aa0f81de6ad95a5a0a1fa89923
diff --git a/tests/expectations/compiler/integers/i64/negate_min_fail.out b/tests/expectations/compiler/integers/i64/negate_min_fail.out
index 120f1669f2..2d98b071cc 100644
--- a/tests/expectations/compiler/integers/i64/negate_min_fail.out
+++ b/tests/expectations/compiler/integers/i64/negate_min_fail.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 9c7636d38015ea24685c1573d9a3ecb1a476bde7458f1847516280757df694c1
     ssa_ast: 5a3825576d4b8b1c5a5d79bfe76766e17685a134c73aa88fe58331fb010dd142
     flattened_ast: 66ba6984eab643ebe6ae07082ba1bc5002a4f9a9ff12a1ae9600733d46c5576b
+    bytecode: a1de0e06df0187d60cb76010969bb2ad1450e01f2b30f6de978c35898872e782
diff --git a/tests/expectations/compiler/integers/i64/negate_zero.out b/tests/expectations/compiler/integers/i64/negate_zero.out
index 64ab4a8ee2..d43cd75832 100644
--- a/tests/expectations/compiler/integers/i64/negate_zero.out
+++ b/tests/expectations/compiler/integers/i64/negate_zero.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 58ac08730469dbb8822b1f8ac36475bb98f5866d45339af1c4e98eb2c4362ff0
     ssa_ast: d7dd0a931558bd23fd4f28f17f31940a95132ca6c99f9dab2eff46ca2babbc13
     flattened_ast: 8487fc6edaa1b52a2e442a518996f9488a4fd852abc18cb0f3f02460536c63aa
+    bytecode: 0295112d7456742abc2395eeab5b9cb4ee8c80a439b0e861404330014260086e
diff --git a/tests/expectations/compiler/integers/i64/operator_methods.out b/tests/expectations/compiler/integers/i64/operator_methods.out
index daa4c2480b..07e7248600 100644
--- a/tests/expectations/compiler/integers/i64/operator_methods.out
+++ b/tests/expectations/compiler/integers/i64/operator_methods.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 9eb72528f32e178e1249fad730470d07b08e3afd8ad531fd7351b397e5e7a57e
     ssa_ast: 1fa123346e977d929643bff393e34784fc89f7f2e9a8323ea8c2b0187cf8ad41
     flattened_ast: 6c54de1868e89ed13f2abaa337ed384867a82b7bdbe3e8a1b367f0aeecc45310
+    bytecode: 45e1a7496d8146d68d8b9e79a05867ae62ee1ef6d06ff6cdd69932bdd88ee66e
diff --git a/tests/expectations/compiler/integers/i64/or.out b/tests/expectations/compiler/integers/i64/or.out
index a5f66c7e02..c57d717123 100644
--- a/tests/expectations/compiler/integers/i64/or.out
+++ b/tests/expectations/compiler/integers/i64/or.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 0707d0a64a329bfa0f954d7221586dba2dcf82c2bb4c47d7822a059479da3390
     ssa_ast: 6fb984032e6e7f2226a1dafb799276e576acd6c17c2fafccd409925cde1ffd70
     flattened_ast: d98045b42cb37a5b0dcfa9364982a3057ac75caa3c55567b7107d043869227c3
+    bytecode: 10d8b6e5560993921b85cea5a03c9e5af008271e9f540aa2a5e2232302ec215a
diff --git a/tests/expectations/compiler/integers/i64/pow.out b/tests/expectations/compiler/integers/i64/pow.out
index 00815d3368..d8ba843b78 100644
--- a/tests/expectations/compiler/integers/i64/pow.out
+++ b/tests/expectations/compiler/integers/i64/pow.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 5fcec92df3f257c1fe4701bf972073817692c12720a0e57f2e01b1ea91c62e0b
     ssa_ast: 965e4b2b272f610bd98ea3a753d70b63aa9bff9a6b86f69cb1b29057e80c31f6
     flattened_ast: f136b122a950d2b61bee034e605aeb78b5bbf643f1ef884039b96b25ab26fb3e
+    bytecode: ed321c5f4fbf49d901732c6bc9c133d64b569cefca9a04dcc1445d98beb4b2f7
diff --git a/tests/expectations/compiler/integers/i64/rem.out b/tests/expectations/compiler/integers/i64/rem.out
index 9cb3012911..43353a35df 100644
--- a/tests/expectations/compiler/integers/i64/rem.out
+++ b/tests/expectations/compiler/integers/i64/rem.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: b5be0067d7deb04ce490efa512c385fd74e713499edbce631aa1f609cdc07135
     ssa_ast: 6f96e181065ee5050caef99eeea08aecb03b4554b167b267fbd492b34ebaaab8
     flattened_ast: cfdbf3fff8678faa06d33a4be0c4574d2cd00fa584bb42e6ce49739f140074f3
+    bytecode: 554ac6af1c9ec6c453966a171f2b21b09c5c1f402d4fb316680b3bfde5842bac
diff --git a/tests/expectations/compiler/integers/i64/shl.out b/tests/expectations/compiler/integers/i64/shl.out
index 0a7efbe5a0..45bdbda05b 100644
--- a/tests/expectations/compiler/integers/i64/shl.out
+++ b/tests/expectations/compiler/integers/i64/shl.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 3b16a404be8487cb74f1f8b1ea4c9d9087982c8b5c9f0033bd379c9d4791dcc2
     ssa_ast: e74c7bec0cc85ec7c8bce03b1711fae9a2e8409e1a9d0d6cde8dea6dcd91a6cb
     flattened_ast: f1738411b324649c4271f973c27f890608b26d04d856db244ae0390e740c576e
+    bytecode: 98564fe7ce0c9a43bb88749f61cbbc6a62377e9df7a5711110138e10165d6dc3
diff --git a/tests/expectations/compiler/integers/i64/shr.out b/tests/expectations/compiler/integers/i64/shr.out
index e3fad47211..c5f5b04a5e 100644
--- a/tests/expectations/compiler/integers/i64/shr.out
+++ b/tests/expectations/compiler/integers/i64/shr.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: effbd5159ccc6d6dbc35c7de00473f1001a09913c15c648bf0931d05416c1150
     ssa_ast: 20f005a7c8991c63bb5a63c84a0365b20892a58a1b07e4d8accb5a5426808326
     flattened_ast: ea41b0ba9a32d731182e424d6878db22e41c638993403c92d836453cf15208cc
+    bytecode: 70b6844282763edb6d61664583d2c30b38259b3e2df0c8fc95d1d72ff0514aa7
diff --git a/tests/expectations/compiler/integers/i64/sub.out b/tests/expectations/compiler/integers/i64/sub.out
index 689631c37c..7c6da0b6bd 100644
--- a/tests/expectations/compiler/integers/i64/sub.out
+++ b/tests/expectations/compiler/integers/i64/sub.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: c87630d8931e2ba04c3a021fb2ede27459550300eaeec5b714c5153cd75f8272
     ssa_ast: 2e8da253798101d438326724bf76f56ae55030f666f82d327b68e3b04119b41e
     flattened_ast: 6a18a5a8f81546fc674b818f5381f97a9b695267ffb99dbd12403bdaee41145c
+    bytecode: 85db7ab7875d071536eaf1c6f9e37e5ca41ad4039a62e92fd34efc7ccc432ddb
diff --git a/tests/expectations/compiler/integers/i64/ternary.out b/tests/expectations/compiler/integers/i64/ternary.out
index 2c2f695200..cf4e8a2132 100644
--- a/tests/expectations/compiler/integers/i64/ternary.out
+++ b/tests/expectations/compiler/integers/i64/ternary.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 27210d6f7f5baec178ab877bddaa778e9d7cf5cc8420682619646d51e250ff6d
     ssa_ast: 7699affdbe67bf9d302e4ffb3e267f1d47d43dc31fcb9791fb5f8aa606dfd0b8
     flattened_ast: a4eca8a18cc6e02ff7656819dc74b929a7c1ee00714de4e2f2d81ae98b6072e0
+    bytecode: efc50d9c273e04e053737ce892bd545a43ffd8bf293e1a9b60ac1b39f215a653
diff --git a/tests/expectations/compiler/integers/i64/xor.out b/tests/expectations/compiler/integers/i64/xor.out
index 2e818f8191..5334fed08d 100644
--- a/tests/expectations/compiler/integers/i64/xor.out
+++ b/tests/expectations/compiler/integers/i64/xor.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 2ea5bd24852afeec9af7c16f6bc3c1f84ed9c897275cee982f48f3076742a911
     ssa_ast: 98559cb342075b568f321fcdda66d0506457437817abfa9f478011a40d6f9a04
     flattened_ast: 263db620bf682a6bbaadff1fec56160e6282fefa0a2b93af571c53738f289997
+    bytecode: 79ef5c83b542f0975485816623a41084fca121d7a9cbb2b8701d5f819be7f2cb
diff --git a/tests/expectations/compiler/integers/i8/add.out b/tests/expectations/compiler/integers/i8/add.out
index 17115aa426..201f80143d 100644
--- a/tests/expectations/compiler/integers/i8/add.out
+++ b/tests/expectations/compiler/integers/i8/add.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: bce3c06582375ee862faf2c71b79ddf148ee5e3573841d576c4bb1b0c6d3eae2
     ssa_ast: dac027cadca1d2064ea754c5987c71aa9f5ad24aa5ece9e70061be3f98b55ffe
     flattened_ast: deb554cc6a881c83133eb04f74a9ff803fb0ff6e6f47c71b6154cbac5a81608e
+    bytecode: 53f7284ec0cee9952b67d8f531abc9fd7efe250af6a77880444ae5a64bcf5282
diff --git a/tests/expectations/compiler/integers/i8/and.out b/tests/expectations/compiler/integers/i8/and.out
index 08f3ed940c..6c739a9548 100644
--- a/tests/expectations/compiler/integers/i8/and.out
+++ b/tests/expectations/compiler/integers/i8/and.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 4a1ae45c13daa0b5dc5162116becd947eed6d5def8f86be42a7817e40bf8bcc1
     ssa_ast: 86d1774624cc426c6325f15f8d2e3d3ba479aa3ed5ccb2768ec13c2048c25cc3
     flattened_ast: 85864bf4127ae898cfe60ea90e0251e64fdbc31834c3e9db3e088ff82a7aaa1e
+    bytecode: 6817590922be3c3e3daabc7006ee52ccbf790f4c133edfb2b20b6d93946f8534
diff --git a/tests/expectations/compiler/integers/i8/console_assert.out b/tests/expectations/compiler/integers/i8/console_assert.out
index 2d6469a449..256ae7babf 100644
--- a/tests/expectations/compiler/integers/i8/console_assert.out
+++ b/tests/expectations/compiler/integers/i8/console_assert.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 3512f169126d0aeafcf2abdaf8e8d8abc5549e86af2da76af18992a452b594ab
     ssa_ast: 8700257e598f8e34d033963b6b4ecfb67673529574c1f9ef9002c9efcf6b46ca
     flattened_ast: 02ef57252baddf6a703b05df0e87b9c7b9ab3082c1ab5498ea7b4433d4f61f8a
+    bytecode: 9ccdd321e147afa7ed76ec9b6660c2e195eba447dfc9fb3049e3473461610686
diff --git a/tests/expectations/compiler/integers/i8/div.out b/tests/expectations/compiler/integers/i8/div.out
index 0f15b5dbeb..6a00ee9586 100644
--- a/tests/expectations/compiler/integers/i8/div.out
+++ b/tests/expectations/compiler/integers/i8/div.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 012853a45a8c2bfbaec356eb27518ea3b52b0e9131eec8cdc8652e8a768c261c
     ssa_ast: ee8947bfb0cce8812a7cfe6ea3411f05dc1ba0857cdd77617e8eb329864b0287
     flattened_ast: 814f6bba240388a393f6ac241463b357bfb058caad27ab0a193f20e928817f0f
+    bytecode: 21c6bdc9bd2cdebb8b2b912e0385d324aac170014c87be6722f084ebbc5ed4db
diff --git a/tests/expectations/compiler/integers/i8/eq.out b/tests/expectations/compiler/integers/i8/eq.out
index 240dd7273c..bb0bd248d1 100644
--- a/tests/expectations/compiler/integers/i8/eq.out
+++ b/tests/expectations/compiler/integers/i8/eq.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 26f3d8bcd88a5cf7a551ab936afbb0c68e7eb4377d6e69e1c3c92e1745d14733
     ssa_ast: 2adebc919a80020ad060d979f27bea044d355ea35ba3ae64ea7ccc9e10b60d55
     flattened_ast: 8867feaf2c1710fa99432dd558b496cb8de3921aeef19554fb18a01c4f3d90a7
+    bytecode: 3553218fd9386759250fd70bcba85e542a360420e40e2e9552438de21101057f
diff --git a/tests/expectations/compiler/integers/i8/ge.out b/tests/expectations/compiler/integers/i8/ge.out
index 6fce4cd4f8..6fbea455f4 100644
--- a/tests/expectations/compiler/integers/i8/ge.out
+++ b/tests/expectations/compiler/integers/i8/ge.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: f376d864ffaec326cd662b1c847d0f1f187f0889da5ae6088b2e8eed48ad355e
     ssa_ast: 43002bc5548575cf233253e15723f2519dff11e4cba5f08235b8359c3cdfbeed
     flattened_ast: 5594fad51dbd05f1619b189cd9632bf97c8d4c1bdbd20f39f09974036ffe4072
+    bytecode: 9e7146c34af0d087b4b34caf78d2f65deb95229eb41978c01b9c9fea88766703
diff --git a/tests/expectations/compiler/integers/i8/gt.out b/tests/expectations/compiler/integers/i8/gt.out
index 2474b2310c..791e934038 100644
--- a/tests/expectations/compiler/integers/i8/gt.out
+++ b/tests/expectations/compiler/integers/i8/gt.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 7b4302dceca146a7d53b46a802bf1d3654f43122251e0ea4329e0341e5c27bad
     ssa_ast: 181d2cab369c86ebc223406faeaa1547bb93fe0ba9afb81d61517aeb6e616ac5
     flattened_ast: 612a4ebfdcca7ceb4117198d18370cf1b6add2aa71299172a280e7bebc0c1817
+    bytecode: 4b9c1679d96af528d4ed9b013682aefc9c492f96be84961ea92c1a6929168bb6
diff --git a/tests/expectations/compiler/integers/i8/le.out b/tests/expectations/compiler/integers/i8/le.out
index a229c65aff..d4012b293e 100644
--- a/tests/expectations/compiler/integers/i8/le.out
+++ b/tests/expectations/compiler/integers/i8/le.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 1f4a6177aa41f633c26fc2f52b23a9a87e9b026342e80c19f46c29ab8c67cdda
     ssa_ast: b78ffa61ee324ca2fe28fb98486424729c7647b53ca30d6442fa50be5367902b
     flattened_ast: 0b8d6aca04af2ff69f2dd26d82c801340b22f13dd7d194151ed29aade9f820ca
+    bytecode: 81333cc939429f1e8d89bb3f11ff35b75521e765dbc3ca0ee97540dc37952d9a
diff --git a/tests/expectations/compiler/integers/i8/lt.out b/tests/expectations/compiler/integers/i8/lt.out
index 30f13a6df7..f55b248f35 100644
--- a/tests/expectations/compiler/integers/i8/lt.out
+++ b/tests/expectations/compiler/integers/i8/lt.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 195c3c98dd7acb99a309b4675beadbf5498c0eb6c1a168a7a59a51810d68e05a
     ssa_ast: a8f7b1baee41c048f486bb06fac550ecdabc68ad6aa951851cbde579998c0840
     flattened_ast: 9ddef26d7a885c1f905d26df44d8f2cafdb365c293275773f4a39f51bd7c92c9
+    bytecode: f051e00dada12c993b7f40a69f919aea35c55ee397cde828a1bb7fabadb39f2f
diff --git a/tests/expectations/compiler/integers/i8/max.out b/tests/expectations/compiler/integers/i8/max.out
index b5ba2893f7..ec4e95a238 100644
--- a/tests/expectations/compiler/integers/i8/max.out
+++ b/tests/expectations/compiler/integers/i8/max.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: c7fa85afc0b0400bfc9b7c2cf46bab3847036c02640e69e0c8804202c59ff428
     ssa_ast: 82c837a2bb9b89241e2da4c12a8624ab6a0fb17c0e15ae94cc908969c8f61317
     flattened_ast: 85ee40df66f227256ca169b1e27bbe4dd7a23732a183644e99bf4f4ef2cf497e
+    bytecode: dc0e9e85c05c9e036b868585f9bbc765c2ec6a8b456401fa5c21c58b68082942
diff --git a/tests/expectations/compiler/integers/i8/min.out b/tests/expectations/compiler/integers/i8/min.out
index 9eaacbeab8..7d4774b5c7 100644
--- a/tests/expectations/compiler/integers/i8/min.out
+++ b/tests/expectations/compiler/integers/i8/min.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 6af858b11ac8b82a25070902372adc92d5b6f236202582da759b82fe2aa55853
     ssa_ast: 7c63d4c496752c498ab77e39baa6afe89ab453b35c1f4d6529cbf614bbecd7ba
     flattened_ast: b4c4c3e52b93254dcec40fccd17bf81841d703e5cd66a568119689d47f9e55c4
+    bytecode: 50d4e7ba4e53f4cbb291e2fb213c7d7d6e24261197c0a62dcaa6df341ada5804
diff --git a/tests/expectations/compiler/integers/i8/min_fail.out b/tests/expectations/compiler/integers/i8/min_fail.out
index d152d005b0..ccfcdc1dbf 100644
--- a/tests/expectations/compiler/integers/i8/min_fail.out
+++ b/tests/expectations/compiler/integers/i8/min_fail.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 5f9c1940e7dea44b100b284034fdebdf99bae1a905b1816fcfc9de094bffe7a4
     ssa_ast: a620aa3fe1742830d9cdc1baf534319edf443fa4b150b08572f1370b107e0e6f
     flattened_ast: a693b034aaa7f4ada656720633b2e1153b317a91df635ace42313b1294737405
+    bytecode: f2757e9d4dd2a331b078e23183869798b8ce892aa472bf12d26d1e2a970c57d6
diff --git a/tests/expectations/compiler/integers/i8/mul.out b/tests/expectations/compiler/integers/i8/mul.out
index 00daf81774..e438d4e83f 100644
--- a/tests/expectations/compiler/integers/i8/mul.out
+++ b/tests/expectations/compiler/integers/i8/mul.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 7ebe47098ea623facd0c8bec80142e6d3ee970122eb0b35db7b711cf8b8d82ae
     ssa_ast: 265e68e158d5b1919259789e9b21b5bacb222f89b88683a3a77d9a7c66e75796
     flattened_ast: d6e24261d106695ebf23768c40a33f4e895df3894f8b3f95c937c9f3f09672d9
+    bytecode: 6013dacf54aae0c3cdad036a45deb1e4594ab929d29b46420a53a46cfaab4e29
diff --git a/tests/expectations/compiler/integers/i8/ne.out b/tests/expectations/compiler/integers/i8/ne.out
index 614ab0df19..e49588be90 100644
--- a/tests/expectations/compiler/integers/i8/ne.out
+++ b/tests/expectations/compiler/integers/i8/ne.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 2bd7a1a7c95288e16332089fddfb3a50c5f110f30d28a0d9d550bcef6c7548d9
     ssa_ast: dc646aa6a2feca259c8fad4821e545327408cf9557c407b340de6f83a2aaf97d
     flattened_ast: 275060e44da6984f9f87c86feb5001682360e0e77e275db04a37e6da1eb88c0b
+    bytecode: 7a28f10ed9376765665eacbc7739f0e2241d640a6c4a82abf7036b8bafe73a0f
diff --git a/tests/expectations/compiler/integers/i8/negate.out b/tests/expectations/compiler/integers/i8/negate.out
index 622b5efcee..2be9bdede2 100644
--- a/tests/expectations/compiler/integers/i8/negate.out
+++ b/tests/expectations/compiler/integers/i8/negate.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: abc36127507653f7e21ebe388447df439ad18aeb7f2abc33f71ecc90f189d484
     ssa_ast: eb092a04f08d7c077955e6a70ced47e01ccd337fa92bbe22a6d01334e9d3b9ff
     flattened_ast: 94741b8bb48d4f636d209c9edf985a5b2279de0cac4c800a429d92bb6884efcc
+    bytecode: a721cf409ef6f324202d71cfa39ab808cf28bb7fb581e62b94b699e973dba18f
diff --git a/tests/expectations/compiler/integers/i8/negate_min_fail.out b/tests/expectations/compiler/integers/i8/negate_min_fail.out
index 84ccbfbc7f..c71fb9f652 100644
--- a/tests/expectations/compiler/integers/i8/negate_min_fail.out
+++ b/tests/expectations/compiler/integers/i8/negate_min_fail.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 8b4c807d2287ae08224c4ec4e705455f603b679074d489a35390526da60e5a61
     ssa_ast: c84a46f587a9fed57e2d044da1bfded8eb74caa33c10e37a90aba210217b1ddc
     flattened_ast: 247b513b1acb3513ac0422faf4c2359ac24000043f965410f940de0f59c5a010
+    bytecode: d141f4ef3f785d0a868f80fa465e961f271c66301506cc5269701f32f46e20d1
diff --git a/tests/expectations/compiler/integers/i8/negate_zero.out b/tests/expectations/compiler/integers/i8/negate_zero.out
index e2590e7973..e0b4913622 100644
--- a/tests/expectations/compiler/integers/i8/negate_zero.out
+++ b/tests/expectations/compiler/integers/i8/negate_zero.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 9bd339db51a52a88f3e959dc9c58ed41fbbbb5300173e95e425b545c3495b3a1
     ssa_ast: d854ae5cdf1fae47367573a32b1c1221f4ca6902078ff7ad2ce95ecf57136116
     flattened_ast: bccbdabc7bb2bbe0e36c572da468b0a461a013544b24aee08b18c481967be32f
+    bytecode: 03f172c9475df39921cf7bb70ce0544793ca7d90e3d57397cc5e425ef94c32b3
diff --git a/tests/expectations/compiler/integers/i8/operator_methods.out b/tests/expectations/compiler/integers/i8/operator_methods.out
index d689f98af3..8177133a89 100644
--- a/tests/expectations/compiler/integers/i8/operator_methods.out
+++ b/tests/expectations/compiler/integers/i8/operator_methods.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 5c0a0b4f3b43f7959fa10fe382bb59ca1a01da3c3f03af366612dbd166a70300
     ssa_ast: 6093a2c122527c6356b07861d6004abc2af91d9f5b37eb9f7a97149b0027d688
     flattened_ast: 9743c68919e03f336498eadc74d2e9dbe1d470939fba833b22cc5d106f858996
+    bytecode: 9432c4ee33e957559427d6e9c1d377fcb91a66f14d8f3c30622a60b920d627ac
diff --git a/tests/expectations/compiler/integers/i8/or.out b/tests/expectations/compiler/integers/i8/or.out
index 17bfe8d0ea..5492b358ef 100644
--- a/tests/expectations/compiler/integers/i8/or.out
+++ b/tests/expectations/compiler/integers/i8/or.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 222f81ea7738cd633c70526ecac4f8748e1c82dd774618ee1523b0df6d9275c7
     ssa_ast: c53182237b47fc21a56f522e9d4c654de833495f7c4555328d7119851832b10c
     flattened_ast: 31e193b2cdfa87f218e068f02d0d3373927260090a4cb51badf5f2b913aac2f9
+    bytecode: 2c82186f9411e3971fe3d8d2107a84618be275c026cfb3e68c9c2b536ee7e899
diff --git a/tests/expectations/compiler/integers/i8/pow.out b/tests/expectations/compiler/integers/i8/pow.out
index 05a8f1860f..c099000ac2 100644
--- a/tests/expectations/compiler/integers/i8/pow.out
+++ b/tests/expectations/compiler/integers/i8/pow.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 4fab65938924eca09bcf6dac20e0797e8c04e8acce8d8608fb2e043b957918c7
     ssa_ast: 9c7e6086b140a20ee54cb597b413bfdcb8c6ec48aecf54a26889f277a25c3ca0
     flattened_ast: e5ab1d01da873e9c1fdb3856f6a4b58f51a82cdc301567073224e16fd3b22503
+    bytecode: 31c2b5a31097f0c58d879ce7394e2e2f6fa929cfab0ee51d51f437fa2999badf
diff --git a/tests/expectations/compiler/integers/i8/rem.out b/tests/expectations/compiler/integers/i8/rem.out
index d7ca5f6bc7..7a410ec00f 100644
--- a/tests/expectations/compiler/integers/i8/rem.out
+++ b/tests/expectations/compiler/integers/i8/rem.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 19f667dd1a7c3d1b2e5cc702acfa733149d1d8e9c4cb7e4d45bf81e2e6e38be7
     ssa_ast: f92fbdf120ec31033942f039ad7f0cd22c8eb0519f4b09cbf718183b7209ea47
     flattened_ast: cd6c49c2ff7f22add35d15f11e5bdc20d66027db851930b69327f61f53e5fe1b
+    bytecode: cf10196216f488130740d21789f69b9b4d107803b54e8bec5fbad6a69375507c
diff --git a/tests/expectations/compiler/integers/i8/shl.out b/tests/expectations/compiler/integers/i8/shl.out
index 6f21d8a1aa..4fe7c152e6 100644
--- a/tests/expectations/compiler/integers/i8/shl.out
+++ b/tests/expectations/compiler/integers/i8/shl.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 71995a6a9805cf7ac286befdc7a6f2cbe295ac67b034b81130392c7cdf306706
     ssa_ast: e5b821f94537daf9630b73e8052e936e5c5cff04099afb44452df73c1f8eac36
     flattened_ast: 6ffff4f04b3d90d2c033ba8e3470223d3e3b76872705395d04445c080f5f6256
+    bytecode: 82393c15429b8c3bc3354f69a541a23f74533e0d2a2f4669ad2f167bd6539a4d
diff --git a/tests/expectations/compiler/integers/i8/shr.out b/tests/expectations/compiler/integers/i8/shr.out
index 7679b9c7e0..8a9fe658c0 100644
--- a/tests/expectations/compiler/integers/i8/shr.out
+++ b/tests/expectations/compiler/integers/i8/shr.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 8c1e8262e4053d4c1bda405e0f981929465747d425c6360628342b3ebba44884
     ssa_ast: 9c75b54991c05f7c1ae3e32d83730ef99e957eb069dd58f671a6d123812698d4
     flattened_ast: 63beff3bf3913b4c2b903377c8979b1e3fe772ad367400db085bd72de9e02b57
+    bytecode: 34d3c84f73921c5e8ea3c9b71af860c90983a11174010569f7986bc7b4690856
diff --git a/tests/expectations/compiler/integers/i8/sub.out b/tests/expectations/compiler/integers/i8/sub.out
index c787e0f0bf..69a5defce2 100644
--- a/tests/expectations/compiler/integers/i8/sub.out
+++ b/tests/expectations/compiler/integers/i8/sub.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: b535e57938d8f98c23b6ad5b009926dc4e86aba5bcce271a0eac4f04ff2a58ea
     ssa_ast: ee5d2842f56d4f14e22b79ce82639482988e705b7508236c0218ee1c2b997c9f
     flattened_ast: c218acef22e60a19351067d9eed75549772502264b0c6341cb7a10322d121a5a
+    bytecode: 240e913761c1b243df3d955ab56be82cf360f865a1458d1337c5bba09b1c9a0c
diff --git a/tests/expectations/compiler/integers/i8/ternary.out b/tests/expectations/compiler/integers/i8/ternary.out
index bc804c7cf0..e2c5d146b8 100644
--- a/tests/expectations/compiler/integers/i8/ternary.out
+++ b/tests/expectations/compiler/integers/i8/ternary.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 8d2b93f36ffca66f69356531af6af1c802080aa9aa7c42e159356182c806837b
     ssa_ast: 6fbb3759ba1fed28725614541fb163733c82459a546cacc0e913c19838b64a99
     flattened_ast: 260908b09fafe1438a79fc8f1720ae444fa1418cc793f1049ea57b1932a6648b
+    bytecode: 241a5a50c9244c5888a54aeb68d751fcf5f81cc3da3ab19cff1c2b258e03fc2c
diff --git a/tests/expectations/compiler/integers/i8/xor.out b/tests/expectations/compiler/integers/i8/xor.out
index 6a84dd225c..37b43671d0 100644
--- a/tests/expectations/compiler/integers/i8/xor.out
+++ b/tests/expectations/compiler/integers/i8/xor.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: fb6934ef8db7a8e078cef86d48f30e9aa9ebdd07f3dec7a8d0d3368399a0881c
     ssa_ast: fd2642bbbd1af991dc2443727c3b8dadc15782344c2bf52a847f5091917111b2
     flattened_ast: 39d3db72f05d2d55f0e807dead25e132382f8a2f9c2800d2663ae68fe33d83ab
+    bytecode: a44911d526a8e5d7da1619dce04ae1557a436208025369cff33931eb20ad3ab2
diff --git a/tests/expectations/compiler/integers/u128/add.out b/tests/expectations/compiler/integers/u128/add.out
index e6c0afff99..e0a994b597 100644
--- a/tests/expectations/compiler/integers/u128/add.out
+++ b/tests/expectations/compiler/integers/u128/add.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 1023797fa605e2973277aa1d7746b6bbd2720125821b61354c282952f6f06675
     ssa_ast: 5e891713fcab18704f9919f4f0c1ce0736fdcd07a122a58121b84962d3bf2201
     flattened_ast: 635511a119996f0172545a7ff31209d16ab5ffbbcec6b0c634cad6c37a225d1d
+    bytecode: 9ff614ee709abb66471b95ed2f6358108616c96a2530d7e4fe7d8df047c5f6e7
diff --git a/tests/expectations/compiler/integers/u128/and.out b/tests/expectations/compiler/integers/u128/and.out
index 750f5180ab..cf5d491199 100644
--- a/tests/expectations/compiler/integers/u128/and.out
+++ b/tests/expectations/compiler/integers/u128/and.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: fa46621c3a96b31893749ffd9e673152d447f29387834463e6101f45e54902a5
     ssa_ast: 9d18569cf8492aa51fb836c7ddbe30148832e02d690baef22c7467f402afa143
     flattened_ast: c6211e377a7d4b67f447435b5d81bd5d4c104af67cc4c136dbeecedcc5d5035b
+    bytecode: f86af89362dd5cc93bb266eac9d4f1c5413a5204f4390af61c3ece1f23f22d70
diff --git a/tests/expectations/compiler/integers/u128/console_assert.out b/tests/expectations/compiler/integers/u128/console_assert.out
index e20c8fcabd..18acca4a27 100644
--- a/tests/expectations/compiler/integers/u128/console_assert.out
+++ b/tests/expectations/compiler/integers/u128/console_assert.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: d24eda05a4e75d515d94d5b908de03a71d9522199f36893b5b372676282b59ea
     ssa_ast: fe02d50c6a2db1cac668e5dab3237e1a2ace0a98c2b5784be651866a8ceb9a4f
     flattened_ast: 0e556a6c58354320212702005400ca088d4590672ef1859b0632be29d0d9f71f
+    bytecode: d20b54c7ca0603e085ee81b6cbead9e5f0287ea391d80d47ed25df97a51daa78
diff --git a/tests/expectations/compiler/integers/u128/div.out b/tests/expectations/compiler/integers/u128/div.out
index 404572f542..b0b67fa0dd 100644
--- a/tests/expectations/compiler/integers/u128/div.out
+++ b/tests/expectations/compiler/integers/u128/div.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: bba8aca3e8bd4aea1b0f4f1308baef06d39bfe4028ba7441f13c05e84b9e8ac6
     ssa_ast: 46c02f30cb185a974b8eb7b96960a2ae9dcb8051daac3de8dca8fe84e93008cb
     flattened_ast: 57b2f702ccd7070175acec9a7bba672946889b4471ee8a28cb6ab2241f213484
+    bytecode: 7710b74d9f772c456d4a1e183756d567b3f7723306b1e6b5f4cc931f8494e357
diff --git a/tests/expectations/compiler/integers/u128/eq.out b/tests/expectations/compiler/integers/u128/eq.out
index 9418a2911c..70eebc568e 100644
--- a/tests/expectations/compiler/integers/u128/eq.out
+++ b/tests/expectations/compiler/integers/u128/eq.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 29662cd95c110aa32f0663ec5068df3c086400b3c1fdf92dda0f1d896ef19840
     ssa_ast: b6acf0e315e35aea463a753a95e946345cfbb4a53c150da94d64994704504438
     flattened_ast: cbc20b98cabc91a2d9e7739b28bde40000830910d2646b4f58099b2b9967318b
+    bytecode: 521ca5d8ee20c09793be83bbaa47205e8dc6839845b3e3e714b5bf5318ba1f7a
diff --git a/tests/expectations/compiler/integers/u128/ge.out b/tests/expectations/compiler/integers/u128/ge.out
index ecabc73553..2a0aa93a49 100644
--- a/tests/expectations/compiler/integers/u128/ge.out
+++ b/tests/expectations/compiler/integers/u128/ge.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 1089778715e56ae10d27f6052d2859f800b5322459d2aa7c52633df13d155ad0
     ssa_ast: 65a33071c858ae76a59723a213334c55a61adf8ce1e9760e26cd0d0b939a3a00
     flattened_ast: 50f3ce6d3534dfd734205fb56119e5240fa4eb8666213a3bdb04000efb83d3de
+    bytecode: e699a9c69f5724cb8dfec843b6b82e47837249aa7f5293ac3c5045ab1a1cc2ca
diff --git a/tests/expectations/compiler/integers/u128/gt.out b/tests/expectations/compiler/integers/u128/gt.out
index 52350c034f..6187efccb8 100644
--- a/tests/expectations/compiler/integers/u128/gt.out
+++ b/tests/expectations/compiler/integers/u128/gt.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 47e8473412a8ec8337d0f871f7fdf553e4c7d0e320250c568474e92fd9aef7cf
     ssa_ast: b7a105990a4a18046e0d38ffd2ce581f36827a3aa130ec0da321cf0e876a2187
     flattened_ast: 2c1b6dd37fb84ea0b7f685c2b0369a3f66b0ec7cba5395935936d32259903edd
+    bytecode: 817c700c1047a1eef944b8e6eb001bb5b301c98ff80872c134cb5d65e6e739ec
diff --git a/tests/expectations/compiler/integers/u128/le.out b/tests/expectations/compiler/integers/u128/le.out
index 79157c324f..bf701d3875 100644
--- a/tests/expectations/compiler/integers/u128/le.out
+++ b/tests/expectations/compiler/integers/u128/le.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 1d3103bd5c2158ccec714d4d04bfd8627be23694e09f02cffc5141b1a00cfd1a
     ssa_ast: 330e8e68e4b259e80da570e3cf4f9b6dc57df01e487147db15256048e28d3bee
     flattened_ast: c981c3c60e7f1d4a4bd25f1f3ae90387bb638b8dd3021791ba3e7bb50f3a6a57
+    bytecode: ea874d6bda8fcbe9a6c2f6ee73161ab55431bc3a3df4bbdb298f18bfa9535461
diff --git a/tests/expectations/compiler/integers/u128/lt.out b/tests/expectations/compiler/integers/u128/lt.out
index 4928e1e108..49c73370e7 100644
--- a/tests/expectations/compiler/integers/u128/lt.out
+++ b/tests/expectations/compiler/integers/u128/lt.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 633170c01b2b364d36b0a3920d756ca88b89947dab9e6e3629781bf9f8a37bce
     ssa_ast: 8cdd627667705aa750a92d68f02e2c47f216b8ffe25d7f5fe0a5ef7ed6057b8c
     flattened_ast: 84f6e86217b3de932a81c9c49360409ed76e19fb99078a93cc6085fca2824eea
+    bytecode: cc2553063e610afba4410eb902aee6984b0b58e341069d9ad7e452fd199f75c5
diff --git a/tests/expectations/compiler/integers/u128/max.out b/tests/expectations/compiler/integers/u128/max.out
index d209b8ed16..6b69e74232 100644
--- a/tests/expectations/compiler/integers/u128/max.out
+++ b/tests/expectations/compiler/integers/u128/max.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 31956b40077979b61ca6ac0cf8ca59006d58990ce6e753a8d20adf49f6a827c8
     ssa_ast: c19a694f2f4a3d427472c1b8564bfa70f66eb4e6138dd5dcbc1c77f3d57d5bf5
     flattened_ast: e970f4cb72d27953be3996faf89681e4ef44b7c9ce7ab72985cd6edde0fca1ba
+    bytecode: 9a1e5bb7b8d932d4afd347a856bfb38db144771f49a0d9589ef14236338e3dcf
diff --git a/tests/expectations/compiler/integers/u128/min.out b/tests/expectations/compiler/integers/u128/min.out
index a331f790e7..928594f66f 100644
--- a/tests/expectations/compiler/integers/u128/min.out
+++ b/tests/expectations/compiler/integers/u128/min.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 2214dc268e5799e0f26559d627b586cd4d904d3621bb305e0ec69823c3f510fb
     ssa_ast: 713f2ec28e92fcdf5fef5e746ff653f843552da9e6421e7719c2f988ef558fc0
     flattened_ast: 4751ad5ed526b687736cc56399641082b6e6a750296ca1e00c16a193ca79cf40
+    bytecode: 9a1e5bb7b8d932d4afd347a856bfb38db144771f49a0d9589ef14236338e3dcf
diff --git a/tests/expectations/compiler/integers/u128/mul.out b/tests/expectations/compiler/integers/u128/mul.out
index 9fc97f3a80..1178d0e568 100644
--- a/tests/expectations/compiler/integers/u128/mul.out
+++ b/tests/expectations/compiler/integers/u128/mul.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: b77fc1cfcd0158f1250da583449ae5a63b09d3f205adf9f973e5348a2aafbd2d
     ssa_ast: 71f9744854dcaf5ebae46ca4a7c9e7706031e475f911ac1d7abf25d05b0f890a
     flattened_ast: 4648ef890cb95c9c59757b54b1c578e82bf83aa7c85716dcc1be6001bd9e99b1
+    bytecode: b88aaf04313129225fa502629bc4997e455c06134fec78104d6b0227a2fc98ba
diff --git a/tests/expectations/compiler/integers/u128/ne.out b/tests/expectations/compiler/integers/u128/ne.out
index 073d96502f..6d29d2a937 100644
--- a/tests/expectations/compiler/integers/u128/ne.out
+++ b/tests/expectations/compiler/integers/u128/ne.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 2f9094552204a966531afe7acb8984ff8b9cb5a9a3ef253b4c7ac79ddaf9e8a2
     ssa_ast: 5e9fc70305ab740948db8a8a5611e51ea173585004c7171db60bea08f5ba06d1
     flattened_ast: 01262f2ef4399c706402d21aebc1d671cc10ff80b8e60994c65cd4cbce5b4424
+    bytecode: a8ebe7242de33b5e98e7b486f64b67aa14c0661fd8a3b0e850e57ea014f502a4
diff --git a/tests/expectations/compiler/integers/u128/operator_methods.out b/tests/expectations/compiler/integers/u128/operator_methods.out
index 7f3c6d6b7d..aa9f1c5c8f 100644
--- a/tests/expectations/compiler/integers/u128/operator_methods.out
+++ b/tests/expectations/compiler/integers/u128/operator_methods.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: b4746dfb4ff603bff9cb2cc8d8f7f75ece9b80a2017a5a560c48f2a9738143ff
     ssa_ast: 8da5982d4b022e77edf7fb18ad91fbe6febbd579ffa93e142853f0b76a4e977a
     flattened_ast: ebe70c5ee9f00a3451e29f52fa452601908f7f0eb65623ca4d65f0823cbf30d2
+    bytecode: 25a6afbece7c0aa0ca9620f50c35e9a3dd242270f5c68eed206a11e2574b8c09
diff --git a/tests/expectations/compiler/integers/u128/or.out b/tests/expectations/compiler/integers/u128/or.out
index 2e0d05b180..d3b133675c 100644
--- a/tests/expectations/compiler/integers/u128/or.out
+++ b/tests/expectations/compiler/integers/u128/or.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 5f9da03eda15b935c7469e2e85c6e21f64d26c3fb98826c41c530d0c53c5f086
     ssa_ast: ac469701183f7dc8a85554ea91e4357db19f60722e0027337032e46a4253fd13
     flattened_ast: 51e55854433b74b5eb2bd29a2e53af96c10ae00b281942d283769e362008ce6b
+    bytecode: 497d7538eec379ede5751c5787659362e7567f22f4d9c8f377a62f2ebf95fb83
diff --git a/tests/expectations/compiler/integers/u128/pow.out b/tests/expectations/compiler/integers/u128/pow.out
index 1f1bcb920f..31ecc64e02 100644
--- a/tests/expectations/compiler/integers/u128/pow.out
+++ b/tests/expectations/compiler/integers/u128/pow.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 1b41d6d2fb9b33c3bc4b4581787bbf37cf6384199dcc6f12f237e5b6b754a884
     ssa_ast: 5d6113e46827fae058c04550b916810c8f5bfd1964c042c915c04399741fab2d
     flattened_ast: 35d97bdab97d229a5d1df8253c094a3b4e9b12d1ea641ff6d14f1cfb2b620a2e
+    bytecode: b295d69a85960d23951d7906d80b47c30eaa713612ca063e6f70bed0e36fb779
diff --git a/tests/expectations/compiler/integers/u128/rem.out b/tests/expectations/compiler/integers/u128/rem.out
index b048be3fad..69e2ed079c 100644
--- a/tests/expectations/compiler/integers/u128/rem.out
+++ b/tests/expectations/compiler/integers/u128/rem.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: ec91c506729cf0da0be48f642def3e8b2f9e966e2a814ddb95953961eec6022a
     ssa_ast: b642a686204c379afb643295b8f3d330f00ee0699832fa5731648fd865d7d042
     flattened_ast: 70985b50a89ae6cc10c6aebfd5bd463360dc81c8c1dacd4fcc82345046bd0592
+    bytecode: cffeb79a503e9b27acabb15cfb42d54ea3f43fed9f9a5ded7374e4eb6961d1c8
diff --git a/tests/expectations/compiler/integers/u128/shl.out b/tests/expectations/compiler/integers/u128/shl.out
index 4a4bc69cbc..9879b91e4b 100644
--- a/tests/expectations/compiler/integers/u128/shl.out
+++ b/tests/expectations/compiler/integers/u128/shl.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 4b63b0047e0e2fd93f813a8bd766f051d0789d9fa08db64523dc2d950d8aab56
     ssa_ast: 408e2ddf5debcee451febc3b8ba054f529fa115427db82c4aee17ef3ada9b635
     flattened_ast: 1422edf4001afc1d41c3c4a151aef1a6a191f92e549db843b0b7180c4732cb7f
+    bytecode: 0042cfa5fe883c54d18c04df2847071d491cdf6f1833d0e9a2e169c96ecd2402
diff --git a/tests/expectations/compiler/integers/u128/shr.out b/tests/expectations/compiler/integers/u128/shr.out
index 1b3778a4ce..2e1a7fc2a0 100644
--- a/tests/expectations/compiler/integers/u128/shr.out
+++ b/tests/expectations/compiler/integers/u128/shr.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 3d78d602c90bc036f6cd2d455a31c95bb63bc787977bea3bb23864d156bf80d6
     ssa_ast: cece3aa100d730e50341e432023ac17251bb081d75f00f9bf856276111b8f422
     flattened_ast: d5237b3772a1fe9096507da4a9b4b99bb3c46a295c0bfcc7f6dae3ae0ef7c1fc
+    bytecode: dedaeab84a7c50d76bc53c8fb37937007409f5fcf347ba122e024119511c5529
diff --git a/tests/expectations/compiler/integers/u128/sub.out b/tests/expectations/compiler/integers/u128/sub.out
index 6a7eafd56b..4e77cf1197 100644
--- a/tests/expectations/compiler/integers/u128/sub.out
+++ b/tests/expectations/compiler/integers/u128/sub.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: eeb4f0eb50f1b7c0d4b510c153454e0eacd7ef79a36873e89107d2c83d7c27b2
     ssa_ast: 32eaa2b395479dfed3abda74b167855fa39c3e30ce1b73d25aa443f093dce825
     flattened_ast: ed4bdec4cb1dc2e782b11942856d4e99a357dcfd6c6262b9b52c9ddb680a1026
+    bytecode: 314254f7afdccd71d00e9823190312578171c602ebcef017e5aee843aa9636d7
diff --git a/tests/expectations/compiler/integers/u128/ternary.out b/tests/expectations/compiler/integers/u128/ternary.out
index 09f697ff4c..73960c172f 100644
--- a/tests/expectations/compiler/integers/u128/ternary.out
+++ b/tests/expectations/compiler/integers/u128/ternary.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 77ae56c3d97ab4d718e80a3759d3768645a252262ba3fa20a965698e758172b0
     ssa_ast: dadd945cd387719be9ec846a7a36d387fd1cc040b3b3f2fa64b6a9495c8005fa
     flattened_ast: 213de723e6fe7795df42b9157420175fdf2aab3f65650bcb9277818ecf71181d
+    bytecode: f18cc6c6b3c37ca606a0bc61608df529ddc102ca0844d944f906fec91c4f9b52
diff --git a/tests/expectations/compiler/integers/u128/xor.out b/tests/expectations/compiler/integers/u128/xor.out
index 7ccabd7973..d8d6c82f4e 100644
--- a/tests/expectations/compiler/integers/u128/xor.out
+++ b/tests/expectations/compiler/integers/u128/xor.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: ede6a5e8212d741ea498e34be46ad3321c117072cdce3be044b2ad854af044dd
     ssa_ast: e8e4e4f34371ccf4d48fa97c73fb64c2812b80255cd2cbca74a1217b7ec974c3
     flattened_ast: a47a8a1ff3c6bc853f4b3a8f213f46bf9d6fc9d5f1e49f9795a9dcb40a76de2c
+    bytecode: afd938366b81cd0861406fd62db4c863d1c8b505f04a4db8bacbb9c43f5b29a3
diff --git a/tests/expectations/compiler/integers/u16/add.out b/tests/expectations/compiler/integers/u16/add.out
index dcae203d88..1099bf8e32 100644
--- a/tests/expectations/compiler/integers/u16/add.out
+++ b/tests/expectations/compiler/integers/u16/add.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: c095ece86ff8f2933f22d44dd77600cc33ae9066d851479fcc16446f7916b430
     ssa_ast: c63b2bbd32719a6de1909f3d44e77db88b5be03ea50be25c8a2a4ae64a512c1d
     flattened_ast: eedfd4a2e0c932564be43fcee6175a3206b0330690be8a5fc858f7c66c8d44e9
+    bytecode: f547c15f7844d25b54b1ebd86cdd705e3fbdc09564a611fd3cd0f239eff93f53
diff --git a/tests/expectations/compiler/integers/u16/and.out b/tests/expectations/compiler/integers/u16/and.out
index 1e45f00e62..1909769a2a 100644
--- a/tests/expectations/compiler/integers/u16/and.out
+++ b/tests/expectations/compiler/integers/u16/and.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: ff1db2d7a6b2dc73c30da9becbde6b2b8fc8861ec3037e89b870f269bc9062d5
     ssa_ast: d84c509dfe19ae478900eb7038d7b62f28a5225080336dac26a01ea3491edef5
     flattened_ast: 8f5d6aaeac43b000125a0adb3ef2afd68b24186fbec9d4b996129e9260dcc842
+    bytecode: b92fd2503ffc225d448965784485e100166c08fe16458b2832978a7ccb123c89
diff --git a/tests/expectations/compiler/integers/u16/console_assert.out b/tests/expectations/compiler/integers/u16/console_assert.out
index b68cc5fdef..78018a23a1 100644
--- a/tests/expectations/compiler/integers/u16/console_assert.out
+++ b/tests/expectations/compiler/integers/u16/console_assert.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: a27dbd99f9d996f11be9db4dc1c305bfb22f7c9f5b10a8a6e51435056f883cfd
     ssa_ast: 0ef684de971b25a2f060f21ea8f2543a03f562c09b79a6033aedf68f7f521f7f
     flattened_ast: c77973144ea15b18446a9a80fa92bdb01e89096d090b49cd565c618498b3236b
+    bytecode: 5c2e38abbf8dbb49fc4211f11a583c8b75ff3355dc64b234008c6bb61f312fbc
diff --git a/tests/expectations/compiler/integers/u16/div.out b/tests/expectations/compiler/integers/u16/div.out
index 0b90166807..76919d0901 100644
--- a/tests/expectations/compiler/integers/u16/div.out
+++ b/tests/expectations/compiler/integers/u16/div.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 53b3ba8e7cc063721db15a3f63a54cb56610721b88b7ded5cea8632c34e62391
     ssa_ast: a40f6f3a8a299fe5b4c68dd79f5cd6cea4a1941a30d125facba0f3314eb210b7
     flattened_ast: 705669c1206fc10aa311a71370d8e6869829a65b4c6b12a0319c966615c9da23
+    bytecode: 87be9771a97c045c6ebd5640f02ca09f79ae9b424c41ac6955c23fd426ae9c23
diff --git a/tests/expectations/compiler/integers/u16/eq.out b/tests/expectations/compiler/integers/u16/eq.out
index d14c2d34fe..109bd109f0 100644
--- a/tests/expectations/compiler/integers/u16/eq.out
+++ b/tests/expectations/compiler/integers/u16/eq.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 834d90808c6fd007a16c7c3433ae1e3e6970c9136d7f5f22160cbe3f460b6255
     ssa_ast: c816336ec2f5429ffe6d2acb478113c8e8d8e029047a1736f22234d7d24cc962
     flattened_ast: a2a7006adac59667f4ee6fb47b8f86c570c276d1d41411a35fa25e72e29183aa
+    bytecode: 4087dea44779fb2c700e31777a0aa999053335f645cecece86bde0b509f3266d
diff --git a/tests/expectations/compiler/integers/u16/ge.out b/tests/expectations/compiler/integers/u16/ge.out
index 606143aa81..78435616c0 100644
--- a/tests/expectations/compiler/integers/u16/ge.out
+++ b/tests/expectations/compiler/integers/u16/ge.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: e2da920fa9530a9bf37055be743feed434e2df22b6e8e79ed2c893ac8b2f8e84
     ssa_ast: 01a4e856a6441c0f9619fb4465147e88e06042d637afaa8fc9e771f6522f1b64
     flattened_ast: f9af9dad2d8d70e3e08e63547f4a75f2a950254733389d8134319c321fb127f1
+    bytecode: 38b90d61922501f8a660d56599d9939e5b0238c3987c20a08abfbcc28b42a78b
diff --git a/tests/expectations/compiler/integers/u16/gt.out b/tests/expectations/compiler/integers/u16/gt.out
index 11a28f6dbc..f6b9ebc4fb 100644
--- a/tests/expectations/compiler/integers/u16/gt.out
+++ b/tests/expectations/compiler/integers/u16/gt.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 9b9ee7b04b5262206eb0cb5a080189ca8cb2a02c31a55f7c75555408ec331379
     ssa_ast: 9dc4e4cc64b2db8de9decd12ccd33c951e6521946308b363c89263b671c77acf
     flattened_ast: fa0d0ad16ada549eb17d461eed4c79994f68a2667f7353abc54116b2c5730880
+    bytecode: dcf677cdf5a9b3aa14bcc744cb4e7638f393334301ad27109301bd7eef063714
diff --git a/tests/expectations/compiler/integers/u16/le.out b/tests/expectations/compiler/integers/u16/le.out
index 4a05999490..fc62909ba3 100644
--- a/tests/expectations/compiler/integers/u16/le.out
+++ b/tests/expectations/compiler/integers/u16/le.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 012aadcf5b62631a31986e4112e647ac33a602de63f5fc2118e137170ff61e47
     ssa_ast: 05e03c984e68811ccd6af323621f671b2b0a7bff856cbcbc9a75af3978921429
     flattened_ast: 6c0004d8cf837a93b5bfffad60a6b386e30048766cbf845a41ab64651036f41e
+    bytecode: b42efbdfdc8e45e9ec1d3c09bd411d1a35618f03edb7d937d7634a4e763e75f9
diff --git a/tests/expectations/compiler/integers/u16/lt.out b/tests/expectations/compiler/integers/u16/lt.out
index 8542354fcc..1a0ca33ce9 100644
--- a/tests/expectations/compiler/integers/u16/lt.out
+++ b/tests/expectations/compiler/integers/u16/lt.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 7231a901544e7c57fd18ee78e7bd723c9dc427c0a10f3d1f001bb32d3983ddf9
     ssa_ast: 4945dd53d0be2ccbed193e4a0926a4a0d39027aec4fa5dc6c9c6dea6e25a6c27
     flattened_ast: cd98af542b67a630f6de120c9bc019ed2f957a7ab47adc2de2788ba322e16e36
+    bytecode: b10dd4efbabfac0d4db75433e8711f07213062647e3c9e319647a0889144452a
diff --git a/tests/expectations/compiler/integers/u16/max.out b/tests/expectations/compiler/integers/u16/max.out
index ebe23b9106..033dba7d6c 100644
--- a/tests/expectations/compiler/integers/u16/max.out
+++ b/tests/expectations/compiler/integers/u16/max.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 83947b82ce12be753df4c2966496de2d37323916b25ed3a7c567ad36b5482260
     ssa_ast: 09083edbb79bf099f3ee26da3fcf130d4cb528360a4a4097af86193f6c00a267
     flattened_ast: 5941d9035c061cc4b664b635b70b21957958d6529b999e12d0051091c19ce41c
+    bytecode: 9a1e5bb7b8d932d4afd347a856bfb38db144771f49a0d9589ef14236338e3dcf
diff --git a/tests/expectations/compiler/integers/u16/min.out b/tests/expectations/compiler/integers/u16/min.out
index 1ed8cdd525..223d1ca11e 100644
--- a/tests/expectations/compiler/integers/u16/min.out
+++ b/tests/expectations/compiler/integers/u16/min.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: c0ab98fe966dd058142cfd588b78a385cf18579c0b6e8189f82d1ab9953d09fa
     ssa_ast: 74e50b8560bc88a9d45722de4d3883ffdcfc67608b38e7620c19e8deb18e0c64
     flattened_ast: 547404583faa67e0d4b283a7064e7cfd56d54e695bac40a2b9215ef510b60a33
+    bytecode: 9a1e5bb7b8d932d4afd347a856bfb38db144771f49a0d9589ef14236338e3dcf
diff --git a/tests/expectations/compiler/integers/u16/mul.out b/tests/expectations/compiler/integers/u16/mul.out
index 9f89bdde3c..85b6446e7f 100644
--- a/tests/expectations/compiler/integers/u16/mul.out
+++ b/tests/expectations/compiler/integers/u16/mul.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: ebce8850a60cf1de55644cdbdc4c189cd612828a3552882cb89163f25ee51016
     ssa_ast: f1cb93682f7be8ecb351f52879e9ac67001635e0fb1f16c53e181c7d2a256112
     flattened_ast: 947134f1fb7294ad9c9985f7cbc263f8569143c554f6b879a4746ef691a40d3b
+    bytecode: 640898c0221b29b96bb54c04f62f0551ab5015287a2d0465afcd03eb0496922a
diff --git a/tests/expectations/compiler/integers/u16/ne.out b/tests/expectations/compiler/integers/u16/ne.out
index aee64b50c1..bb3e1b5214 100644
--- a/tests/expectations/compiler/integers/u16/ne.out
+++ b/tests/expectations/compiler/integers/u16/ne.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: ef617cb90b014b5c64ee4cdc8866715e243f5d3ed94db062f27935dbbdc06101
     ssa_ast: 39411e60db203817399b25a2601cd99306f26dea556b0c923be7e2b27354ce7b
     flattened_ast: eec5a44b08ca800d9fdd0d02f0f4a3dbb418442e652fbd4c26f4ecef671b1d3e
+    bytecode: 62201638b499e66c0503d022d2521704c9476c18e906af29dba710c86658348a
diff --git a/tests/expectations/compiler/integers/u16/operator_methods.out b/tests/expectations/compiler/integers/u16/operator_methods.out
index 100d0e6792..19c042dec4 100644
--- a/tests/expectations/compiler/integers/u16/operator_methods.out
+++ b/tests/expectations/compiler/integers/u16/operator_methods.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 77815f5c2c33977a41a54a5a559a54e080d7f144faa4ace19360dc7286d5494e
     ssa_ast: 2c1fee7633cc7440147771b402690e5cfd27dd2d800a1d7b28fc49e8f628a603
     flattened_ast: 6204725effc5051f362782626a8af4ac84b43156570608e50d132bb06c89cd85
+    bytecode: 0ed6c120433247bb3f147323abe1e05242d623d8ef8dfe69e26795c181b88888
diff --git a/tests/expectations/compiler/integers/u16/or.out b/tests/expectations/compiler/integers/u16/or.out
index 0dcb5a6ccb..c974989211 100644
--- a/tests/expectations/compiler/integers/u16/or.out
+++ b/tests/expectations/compiler/integers/u16/or.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 9bf79aa1d140791b10980e86525956f92433e97445adef4f08170871a7d35635
     ssa_ast: f6fdcc5cdb6d53d6e86e8da31f27b7f6cf4e885ef46ffafd63705a6ba0ce4e17
     flattened_ast: 3f21269b0736bd1e529aaa9d0d19c60cab13dfa2f1f8d52e7d9ca50ff3ada344
+    bytecode: f3ae8aae74e39312aba21f142a98675531f60dca221ceefec1a5f5168b675daa
diff --git a/tests/expectations/compiler/integers/u16/pow.out b/tests/expectations/compiler/integers/u16/pow.out
index 8adf316df7..e5cf789da7 100644
--- a/tests/expectations/compiler/integers/u16/pow.out
+++ b/tests/expectations/compiler/integers/u16/pow.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 3cf3511cb699bb0aeae01341c4cc05845fec8919294fc0f8362bb3ee1b453965
     ssa_ast: a0b0159881063b49c22d8cd120dfe3db34b95ef4a8f984056a8d59be8c35188b
     flattened_ast: 5f6a54342c7664114ba5e491c43d79b3304c1fc92b30bed4191db52c40b7a1b7
+    bytecode: 02f54418a16f130b642d241c152edae7921a53c84ce4e6c76a6f021e88816d81
diff --git a/tests/expectations/compiler/integers/u16/rem.out b/tests/expectations/compiler/integers/u16/rem.out
index d7e81c3667..98c5ddec9e 100644
--- a/tests/expectations/compiler/integers/u16/rem.out
+++ b/tests/expectations/compiler/integers/u16/rem.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 79e44f8d2ac8bb1a892315e5447760ce165d0222e7af7fccec38c507bafd5bf0
     ssa_ast: 1dd57df55082456c934054d58fc1b0c086bf777737ad12bc546512e808dfdf01
     flattened_ast: 009ce79e070debefaf2ae08fa9b021442ceeffc82ce8990fb53713db4b9b5d9e
+    bytecode: 47409f2d1e5aa02662a482ee2c1abfc392d6d46e16b260ed9a96680745e2f237
diff --git a/tests/expectations/compiler/integers/u16/shl.out b/tests/expectations/compiler/integers/u16/shl.out
index fd030d98bf..1965a2074f 100644
--- a/tests/expectations/compiler/integers/u16/shl.out
+++ b/tests/expectations/compiler/integers/u16/shl.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 14bdeb0bc62ca7a25ba07dcd353b99f9f911e99e7f4b689535f106385aca6215
     ssa_ast: 34d484f650e4a4c53d4ee15faad28f81bca949afa8c819fab3d2eb60bef83f89
     flattened_ast: 4a0101b470e3d40946e27e4e23af22cfe567caf78b455446ac9923bc2016702f
+    bytecode: 40c7270774b37bcbe32743ffb6c4500b87338670c0f188181135c6a069711375
diff --git a/tests/expectations/compiler/integers/u16/shr.out b/tests/expectations/compiler/integers/u16/shr.out
index 9a4245c0af..fe73f1f81c 100644
--- a/tests/expectations/compiler/integers/u16/shr.out
+++ b/tests/expectations/compiler/integers/u16/shr.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: ba77d5f6cad684639e0d52b2dfc29e0dcf549a77c490471ab168b165fe9396c9
     ssa_ast: cce9ae2f7af3386ff2cc8e3182c8f31e174bef60bfe4dd4185d339a9d46ac359
     flattened_ast: 963263742e1a2dde3daf2cb336a1530f5daf253893d29cf61b7befbddec8c0af
+    bytecode: 1e5f18a7a17246b9383073ddde5d563ef4d68cba62d0ea61812548c152baa1f8
diff --git a/tests/expectations/compiler/integers/u16/sub.out b/tests/expectations/compiler/integers/u16/sub.out
index 54ccd5ee54..708c75dd8d 100644
--- a/tests/expectations/compiler/integers/u16/sub.out
+++ b/tests/expectations/compiler/integers/u16/sub.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 65d1aaebb1bbc5104aa4c66f68650d9402d823ecec0d7d59f09bd17dbc4f543a
     ssa_ast: 2de02a510bc8766a711c8fa8715732560ee6bfc3be4a79f49d88dd1403db4823
     flattened_ast: 6d90e63da6335b6bb611b750225f07a02bbf33110381dbcf124ab01f6b55150e
+    bytecode: 3f7aa687c1b915adc86646e735591713028a9edbb51ce82964b3343a4cb597d0
diff --git a/tests/expectations/compiler/integers/u16/ternary.out b/tests/expectations/compiler/integers/u16/ternary.out
index 3b63dee005..a9c4d4fa0c 100644
--- a/tests/expectations/compiler/integers/u16/ternary.out
+++ b/tests/expectations/compiler/integers/u16/ternary.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 137a94b39c1dcde6fd20917e5e95ceb6b56fbe9d5cf1642531c13a5ca0a38850
     ssa_ast: c0468ccd627878cc0509a9924861bfb646e675c18eeecd86f8a44cad4375a5a0
     flattened_ast: 5f37a3f10a884a29d4efb0712fefee5c11005b3732baa03a94fc99a8027b65d3
+    bytecode: d0305b1f09132642d928c6bf349f6153a7da91fefd95b8f16e2e33f182836ddf
diff --git a/tests/expectations/compiler/integers/u16/xor.out b/tests/expectations/compiler/integers/u16/xor.out
index b74616ef2a..f80c382988 100644
--- a/tests/expectations/compiler/integers/u16/xor.out
+++ b/tests/expectations/compiler/integers/u16/xor.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 384a83bbed4385b4f2ae647984ebfcbed1d15dab3a8a4a7576a2be4360d35651
     ssa_ast: afb81872d5d96faf7e304ffdce0fac5088b5b70a6cb3543400e23f28ed97787f
     flattened_ast: 03f4aa19e1dce5fc851c7fb34cea5d80603acb08b614c06120a9ad0216e3348c
+    bytecode: 42cad1b1ce1e09199ad8861f797a95a2cb43d406825a88becb41a5d318f9341f
diff --git a/tests/expectations/compiler/integers/u32/add.out b/tests/expectations/compiler/integers/u32/add.out
index ba7fe7e46a..b68581b93a 100644
--- a/tests/expectations/compiler/integers/u32/add.out
+++ b/tests/expectations/compiler/integers/u32/add.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: a5801bd577fcef4ec8be5f9bacdbf637e98a1a505b7d6a9e0df199985f8ae891
     ssa_ast: bc3391df2b6f1193051499cb0411135ae7042752ca6b3e4a09ba385d1be9288e
     flattened_ast: 6b1234939e9404d6cb15e8391cf1161fa7c39ce6794b6659e94c7050a94a9e0e
+    bytecode: 3ded1a7996eb0f11477cad2c5c5e8d182e09170240812cbdb636ae16b9b7aa5b
diff --git a/tests/expectations/compiler/integers/u32/and.out b/tests/expectations/compiler/integers/u32/and.out
index 5a4208bb73..ad21464d40 100644
--- a/tests/expectations/compiler/integers/u32/and.out
+++ b/tests/expectations/compiler/integers/u32/and.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: c9bd8f821125ef87cf4b8beac01a44186400d4137c6476a43f7df56512bc5552
     ssa_ast: 6cf002c2ecc587a11d7a52d40418046b26bdd75fad7db0e3ad8fb4175f7333e5
     flattened_ast: 29d02569ae9bcfe64186f385b5c763ceb30b8a3b268e50c677c6cac6d6f758b6
+    bytecode: 3a5f76958a4110b8d0388a7e489e68542029338cf78070798ea397107d10c9a6
diff --git a/tests/expectations/compiler/integers/u32/console_assert.out b/tests/expectations/compiler/integers/u32/console_assert.out
index 8587e8a91b..848a224d10 100644
--- a/tests/expectations/compiler/integers/u32/console_assert.out
+++ b/tests/expectations/compiler/integers/u32/console_assert.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 1359d8d99bf89ee32819e8623ae352b30c0367c13ae4d01eaa58054ea58902d9
     ssa_ast: e55325d6209ea31c85148aefee496b119a85fbfae39aa1464e9ac8a4f19a868c
     flattened_ast: e2b4847f9e88eb833a7a3ab3c4305e73f023cb3357c454b07ed6d6285a6e1d8d
+    bytecode: f4c9bffb3e7a32c2e6922f2322af66153f047899fdc383d654dceeaee0b75936
diff --git a/tests/expectations/compiler/integers/u32/div.out b/tests/expectations/compiler/integers/u32/div.out
index 9df87594a3..a7c3429e84 100644
--- a/tests/expectations/compiler/integers/u32/div.out
+++ b/tests/expectations/compiler/integers/u32/div.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: a001addffe81304d56953fd8ba54dda5a43d2796337c1de0ec8672f86c32533b
     ssa_ast: c070642e63e42b7b7ace71b96b96983aab43af3dc9b7ac44f397fd81dfd95723
     flattened_ast: cbaaf49bcf4f12df6df88806c5e71fca0fffbafac025ab7cd5b18fa4f33aea84
+    bytecode: f17af0312ab97ed5f1cd2af6b3c745b673cb447581bef6f1c358a81594e02b63
diff --git a/tests/expectations/compiler/integers/u32/eq.out b/tests/expectations/compiler/integers/u32/eq.out
index d54fa48372..1fd4fd7974 100644
--- a/tests/expectations/compiler/integers/u32/eq.out
+++ b/tests/expectations/compiler/integers/u32/eq.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 97c979e1594fe0588f8b0adf1f699d4d994a87184b695b32f84444b4d3b4b9ff
     ssa_ast: f90b714069ebe259ecbe411a3dc1d80af4163c26ba4f71394db54d92f1d219f9
     flattened_ast: 9093930d341b32102ba3a50597f19cb6fcbf3de8033186dfbb9c295aa85be6ce
+    bytecode: e1a8bdccbb21108530629a18d3a73db59da82ece3c0e1f83022f160ed099d90a
diff --git a/tests/expectations/compiler/integers/u32/ge.out b/tests/expectations/compiler/integers/u32/ge.out
index 373bd5e22a..90bd8ee1e0 100644
--- a/tests/expectations/compiler/integers/u32/ge.out
+++ b/tests/expectations/compiler/integers/u32/ge.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: b1701c11c58e5e1f4378ebf52026f8389a83e9b54363837dffe9988960514b04
     ssa_ast: 9da330f7023798aa39024f63d468bc6127a587e6cefd769c08a7b208120665e0
     flattened_ast: 4a8ff1c01b0d1fd3d4e14de10ada0a583102191f077ee7224fb6a1bdcfd595f6
+    bytecode: 83b53d924626a5d279185858585b6a826be3670399330a38b51230716460cac9
diff --git a/tests/expectations/compiler/integers/u32/gt.out b/tests/expectations/compiler/integers/u32/gt.out
index a7e77dfd21..d986325ac8 100644
--- a/tests/expectations/compiler/integers/u32/gt.out
+++ b/tests/expectations/compiler/integers/u32/gt.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: bc3bfaa1441a4227eff6de35e63ac982e55689e3e99ce28d299a875d02166232
     ssa_ast: ba07f3fd8d75d8feadfa1254c6ffbb32f6109d6bc1c261edbafe1cae3a8d3103
     flattened_ast: 58e383eda974c74854d19af5bc1c1526612bb5d2ed8301edd1ba2624b173c3bf
+    bytecode: a7d5e36441243461635f13035d4c2b17e257b340d905c6d9368a25aaae6e7c78
diff --git a/tests/expectations/compiler/integers/u32/le.out b/tests/expectations/compiler/integers/u32/le.out
index e49cfca292..2064e2a39c 100644
--- a/tests/expectations/compiler/integers/u32/le.out
+++ b/tests/expectations/compiler/integers/u32/le.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: c69424c99b06258e019d8cc553325a34161604493d7e6365c21e537e4c1a177e
     ssa_ast: 71458cd742c00d80c2175438fbf989eb401ef0a552f18e4c3ad225ab66b91e8a
     flattened_ast: a46ba8ef8ed76706555b55dc9e01ef000a52cb228fb4974119ee0d4a78ec1ae1
+    bytecode: 84835e4d314e3795b36935bfc3412ca7794bcbafd8dcedaa48855b1b63e030c3
diff --git a/tests/expectations/compiler/integers/u32/lt.out b/tests/expectations/compiler/integers/u32/lt.out
index a32bbb1740..3feadab940 100644
--- a/tests/expectations/compiler/integers/u32/lt.out
+++ b/tests/expectations/compiler/integers/u32/lt.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: a75de99798d0cce8da3420963e49c5b97c0296b3e78df92162e30132606b0383
     ssa_ast: 68923f9ed4d878fdbc2ef474ffc1ba89bcc502eeda8582c6bef7eca3d5b0abbd
     flattened_ast: 3224271fd51d337c989c1457b36393232b88f609629d839eb5fa5ef5eee8ab4d
+    bytecode: 64a3bc8031d302c5bf6b6edb51dbd350c3209b28045d3cfebd6b837c0e246826
diff --git a/tests/expectations/compiler/integers/u32/max.out b/tests/expectations/compiler/integers/u32/max.out
index ab1de03f04..8bbb3dff35 100644
--- a/tests/expectations/compiler/integers/u32/max.out
+++ b/tests/expectations/compiler/integers/u32/max.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: b6b318d428063def3324a3f9ac64b08c3f9e329df68709111da7b993b2adaf27
     ssa_ast: 7bb6ab7b16f40cb76394aecf75a63e6edc7abbdaaa5d1d1cd3c1ab52a579c607
     flattened_ast: a13abbe849e8b34d24d1e2ea26e088440e092587b9fd307705c23533760500c8
+    bytecode: 9a1e5bb7b8d932d4afd347a856bfb38db144771f49a0d9589ef14236338e3dcf
diff --git a/tests/expectations/compiler/integers/u32/min.out b/tests/expectations/compiler/integers/u32/min.out
index 7097e3de59..23c5a8baa3 100644
--- a/tests/expectations/compiler/integers/u32/min.out
+++ b/tests/expectations/compiler/integers/u32/min.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 6a82d8768a8ba396e73039c3f0769721950589374c1fcdc53b8d60994106cba4
     ssa_ast: f0d57aa61ab4a5d22c26a3a8225378f817970a45c76d486f0fe6968a780d77c0
     flattened_ast: 18e21f7557ae696c8a511931a49166dbb01aacdfd4887864ee02fad85ec7c9ad
+    bytecode: 9a1e5bb7b8d932d4afd347a856bfb38db144771f49a0d9589ef14236338e3dcf
diff --git a/tests/expectations/compiler/integers/u32/mul.out b/tests/expectations/compiler/integers/u32/mul.out
index 10b993f9c6..b154d7368d 100644
--- a/tests/expectations/compiler/integers/u32/mul.out
+++ b/tests/expectations/compiler/integers/u32/mul.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 3efdcb73605bb437acaae813bb9e2170049d590d172e1e80f42f8da13c8626a6
     ssa_ast: 8d5e63a4d400a570b36ae0483e264f1f91bc7ee0da43840d9924316825e42752
     flattened_ast: a719975f3fad99624e57ca6cd7b075a37d588d6d059b0916046901effa33cc9c
+    bytecode: 7af3a41a18b6d5e929c72eb42b1dcf26553676d4297e8477c85c2660199e4843
diff --git a/tests/expectations/compiler/integers/u32/ne.out b/tests/expectations/compiler/integers/u32/ne.out
index b1bc69949b..32fe5e044e 100644
--- a/tests/expectations/compiler/integers/u32/ne.out
+++ b/tests/expectations/compiler/integers/u32/ne.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: b1cfaec449a41fc559fd8bcb7cb1cbd533ae84a2ec742a6f1ff7092a735217fa
     ssa_ast: c9ea73e61d79801814902f9a989b8ccda1d6b8e3741bf640d761b6ff33215ecc
     flattened_ast: fe72cf5348e4bfafce67adaa7c4c8db77aadad0dafb320a73488322e9eabf7a2
+    bytecode: 1297340f0d83c34cfcd5e861de7b4358083ecfb96f9bdc75ae2f78ffa20831cc
diff --git a/tests/expectations/compiler/integers/u32/operator_methods.out b/tests/expectations/compiler/integers/u32/operator_methods.out
index 9f7c7db86f..6947b4b7cf 100644
--- a/tests/expectations/compiler/integers/u32/operator_methods.out
+++ b/tests/expectations/compiler/integers/u32/operator_methods.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: e542850da93986b4a76dcbf27ee30e49ed8887608821422601855925ce24ff85
     ssa_ast: ea9a54f4ae25524edfe74fc86aad3ee83f8c24909aec5df50778b22cf7dd2eb0
     flattened_ast: 71794362f5a4d497010a8df9e6bd5659d54f1cc988cac6cdda680577ec699f7f
+    bytecode: b579a343446b8730bb6b28fee10fce002a41de1f622896bf8b19a14121e55bfc
diff --git a/tests/expectations/compiler/integers/u32/or.out b/tests/expectations/compiler/integers/u32/or.out
index 0a87c31b43..1e53c0bbf9 100644
--- a/tests/expectations/compiler/integers/u32/or.out
+++ b/tests/expectations/compiler/integers/u32/or.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 90ab809f08348a9c7fb6f68508d8a5ff71f370c6c627bb8f2e85af9275b1c383
     ssa_ast: ddddf1bfa333231e6bf2593401bf99ea65f37f286b6033fb7380eeb66b13e679
     flattened_ast: 8da35e3027bef8ebfe4db9a6119b4669bd9945e88b62811abca624a37f8d2879
+    bytecode: b4a60f9a659d2a10c8bd120e5849e06315701c890b9a042eb42161693f600082
diff --git a/tests/expectations/compiler/integers/u32/pow.out b/tests/expectations/compiler/integers/u32/pow.out
index 2fa102bcc3..768da51be2 100644
--- a/tests/expectations/compiler/integers/u32/pow.out
+++ b/tests/expectations/compiler/integers/u32/pow.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: edc0d4cbad41e827c02eec40fe465b64b6c0197b810393296884dd915984e1d0
     ssa_ast: dc9eecfed619a6875516fbca435c9567b22125e02884286beefaa3ac6e68bdd6
     flattened_ast: b27e7adaaa3b8aab296b38239faa98d4889e69a7fd37ad0e9fb95c9f4619b38e
+    bytecode: 5bbd2123413f7834055a8f71617bd2569dcc574e486736eeec7810a5a8642ee0
diff --git a/tests/expectations/compiler/integers/u32/rem.out b/tests/expectations/compiler/integers/u32/rem.out
index f95ceb13ff..71609c040c 100644
--- a/tests/expectations/compiler/integers/u32/rem.out
+++ b/tests/expectations/compiler/integers/u32/rem.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 772cabbf4ef65eb53cd0a2d43424307e9a7a952d3c9d13a6acd9ba5c7b962470
     ssa_ast: 2ce0b613385f8c98c20cc557f79d2cab64cd78f80c27b3b107c12222b45bbc85
     flattened_ast: 169f626b5a295be49056214e1e9772eac395563f6810244feecc9f773e48c44b
+    bytecode: cfc8529a88bc370481e0596e79d20913a011b529a210ef909d9d66c445b9ec98
diff --git a/tests/expectations/compiler/integers/u32/shl.out b/tests/expectations/compiler/integers/u32/shl.out
index 22aa877cd7..e38a0b99cb 100644
--- a/tests/expectations/compiler/integers/u32/shl.out
+++ b/tests/expectations/compiler/integers/u32/shl.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 92e4b5595e378451d0dbd7b35ff36000d23a7b251c7b29f8694b7d122d79d37a
     ssa_ast: b46fbc11a9458a3bf920cce13869582e069324092184f6a996ea31f3803fdd7d
     flattened_ast: e5ab29f4075b3b115ede3751dcf31401508e1b2d79998ac3dcb5944ed5eece34
+    bytecode: c9269f19329dd9d6e5faaa84693b869ff8040297c2ce894b35a244330f1f6ced
diff --git a/tests/expectations/compiler/integers/u32/shr.out b/tests/expectations/compiler/integers/u32/shr.out
index 0cb8a157ad..def6de9123 100644
--- a/tests/expectations/compiler/integers/u32/shr.out
+++ b/tests/expectations/compiler/integers/u32/shr.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 4e3e54f0993ae8da3f5d35e427208c633f7ed14e9d4d1cb9a4b1482ef59f5f41
     ssa_ast: dc79ab76a712100bd6632b9022c8a88c6001cb7b57659d197916f99236c0c1d6
     flattened_ast: a3896ec8fbcd2471cca1207960e925c8aa5e9a4ed2f4833c1a8784a5cccc36f4
+    bytecode: 0ed67d20829238f0a85c90cdeefb7d0463ffc0bdc7ba9523550c62849a69176b
diff --git a/tests/expectations/compiler/integers/u32/sub.out b/tests/expectations/compiler/integers/u32/sub.out
index 955050e7bd..ef608053ff 100644
--- a/tests/expectations/compiler/integers/u32/sub.out
+++ b/tests/expectations/compiler/integers/u32/sub.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: b2096b3fe3f1f04c396982615783f5e11d35791a42619341816eeedf2ec60350
     ssa_ast: eadee144c33adbea24e40805c8a29b87d9f65c9a75ec2f760c189e0c072962c6
     flattened_ast: 40c68b187491a42a49a92b2ad311aef172434d057597e80e8f91d91fc132511c
+    bytecode: a302075ca2b4aac635c7d45ad379a2b599cfcf7092c99fd104a5c1e5de7ce50f
diff --git a/tests/expectations/compiler/integers/u32/ternary.out b/tests/expectations/compiler/integers/u32/ternary.out
index c7c48c6ae5..5a2c1058a9 100644
--- a/tests/expectations/compiler/integers/u32/ternary.out
+++ b/tests/expectations/compiler/integers/u32/ternary.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 3ec482b818b01a2704e71c12cfa0b251b96442c6ab36ef2b715a90ceedc64e31
     ssa_ast: 57f63d0776068a14a5eb69aeb4d050341c808ec5a64077ff178611e2f30b0788
     flattened_ast: 2d8f418b5255f5b436fd74bae9d9cf7fe33914ed3d4cc6eb311a592be69904d0
+    bytecode: d095ae12af5337bd905f4f2cbb4b480905afe97216959e968bee1a5c6910af2a
diff --git a/tests/expectations/compiler/integers/u32/xor.out b/tests/expectations/compiler/integers/u32/xor.out
index 82667e85c0..5267f415d5 100644
--- a/tests/expectations/compiler/integers/u32/xor.out
+++ b/tests/expectations/compiler/integers/u32/xor.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: a776975ed1e58de71bafc88742ac7ebf1712ba51668d524777f29f2c3a194c93
     ssa_ast: e379f43c82393ece64a9e6b8c797760d244883d07b1a772542c510b0adf181a2
     flattened_ast: 5566e1fbfc02816bb3f86bc0ac4fa7810a540eef684f9f83e1fdfd120eaceeef
+    bytecode: f0b8958f3f4c4311e2308c5aed950b9a660d3eacdea6299d6e78c33e064c9cd1
diff --git a/tests/expectations/compiler/integers/u64/add.out b/tests/expectations/compiler/integers/u64/add.out
index b7ab8a39a6..061e028a94 100644
--- a/tests/expectations/compiler/integers/u64/add.out
+++ b/tests/expectations/compiler/integers/u64/add.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 0dc28187ac897d6a78385b051920d3ba8147219438ffcd996d016f4999277e0e
     ssa_ast: e118828e592bba9d9b598838b180d24e58fbcdc5a907c4b37b223f1d560e72da
     flattened_ast: f0fb85463f1d2e2a32bd643ad88ba51dc4d37588d3e00bc1afb92a56ccf55615
+    bytecode: abb8c69d4bd2b5834d385969f49c8ead068036e07c0afe9a96c6c022ce3d491f
diff --git a/tests/expectations/compiler/integers/u64/and.out b/tests/expectations/compiler/integers/u64/and.out
index 8396fcdd4c..00f0e6e6e0 100644
--- a/tests/expectations/compiler/integers/u64/and.out
+++ b/tests/expectations/compiler/integers/u64/and.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 98e97639bbfb6cc5bbd7041f1d541dc67d598f94d8b7a86879a10ce865d05258
     ssa_ast: 0ca8fcdc0e147b4d9c53f0a8f44e9c8932063385e05ef2e76f95236c4b7cdc20
     flattened_ast: 202fe52c391c02f514e549efe4ad9a984f6645eeafc71c050746d764557b0d45
+    bytecode: e15f4b54f9f4f2380c49a61ea310f77ebc2837f0058dac3255a3743d3ce31b49
diff --git a/tests/expectations/compiler/integers/u64/console_assert.out b/tests/expectations/compiler/integers/u64/console_assert.out
index c9bed5757d..717a4138e9 100644
--- a/tests/expectations/compiler/integers/u64/console_assert.out
+++ b/tests/expectations/compiler/integers/u64/console_assert.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: a11798b3a5edf58be034eb12fe0a3811855af528ec3904ba8c5fe2eadd57cca2
     ssa_ast: 60fc106798752dc16c57e67289358899ca5eaa48d70eb35c555996432c1d2e03
     flattened_ast: c326a2f1c2a18800615aa3e0808fe685116312b0ab52d8083a24d51f582b63a4
+    bytecode: 528d0e5eae513b94ac63a4b48646f04deae2de5b41de4488bec74d196b1a3177
diff --git a/tests/expectations/compiler/integers/u64/div.out b/tests/expectations/compiler/integers/u64/div.out
index 74b0d6ff98..bc67909da1 100644
--- a/tests/expectations/compiler/integers/u64/div.out
+++ b/tests/expectations/compiler/integers/u64/div.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 27de2397d201aa941553c88b3ff2c23e85f1980e8530d27ec27d9a027e2246df
     ssa_ast: 885b3105453a72fffd1ff429c1ba01d99be7b8e3fad9125a0e6b613f9a0e41a1
     flattened_ast: 83af310a603b680d4702361669c490d70348e398b687d899aaafcd8c371fa06a
+    bytecode: 6f756295de250a5a5c917f41e42c3b7fb0ff9387e25e0384b48058bf4093c35e
diff --git a/tests/expectations/compiler/integers/u64/eq.out b/tests/expectations/compiler/integers/u64/eq.out
index 408ba4a080..8cc55f905f 100644
--- a/tests/expectations/compiler/integers/u64/eq.out
+++ b/tests/expectations/compiler/integers/u64/eq.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 24cc971e1a09c53cfbd30ea81b0909f0ed24809577d564de336e4e8a687072a3
     ssa_ast: df30e092f2cdb8caaabeaaaa00284c1d3388aaefbd64b0749db283a26be285b7
     flattened_ast: d0132a729c1e1e5b53154627e70c9cbedd0fe162160e67854211ae138bce4420
+    bytecode: 3dc2579c9b4376c0ac3c15d6c791992bbc13baed767b4a84313db47aa14296f1
diff --git a/tests/expectations/compiler/integers/u64/ge.out b/tests/expectations/compiler/integers/u64/ge.out
index 33a61d1ace..caf5759984 100644
--- a/tests/expectations/compiler/integers/u64/ge.out
+++ b/tests/expectations/compiler/integers/u64/ge.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: c4a862fa50d5dcfa0ae301f80e8a33c5dde1671924d2eccedfce11f9513f7db5
     ssa_ast: 0005ae843f7454cf58b324a40d2f2abce397e2942f747d9ac8fa91eb3b35daf6
     flattened_ast: e1af49000d72bb436ce7b00f8ed4ef4cd133643787c54c5eda56b7def1d4acc0
+    bytecode: a614338051a535a74ee0794a7b2e1f4617263a3bca7be899ba2e68beae7748da
diff --git a/tests/expectations/compiler/integers/u64/gt.out b/tests/expectations/compiler/integers/u64/gt.out
index fae900f77b..24fafcd4c1 100644
--- a/tests/expectations/compiler/integers/u64/gt.out
+++ b/tests/expectations/compiler/integers/u64/gt.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 7638b452e08ad812dda4f144129b87058cf1f934c9bf78ca005057878691a294
     ssa_ast: 9300685cb30171e279a1d49f6bceae4b681cd8002058f3a514d83f518e7d24b0
     flattened_ast: a9ad38c59ff0a10012b297b996ec6459cd7ceaba62139b66bc43c69f6ab3eaec
+    bytecode: 3977504f6f75064e9a2125af4f7773742771babbfc1c290a3d0a794d42423663
diff --git a/tests/expectations/compiler/integers/u64/le.out b/tests/expectations/compiler/integers/u64/le.out
index e29f569a11..50ed92cd24 100644
--- a/tests/expectations/compiler/integers/u64/le.out
+++ b/tests/expectations/compiler/integers/u64/le.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: c37d70527e6706d12f957f6e1736bbb569256b762bde18cf4ca19714d925a753
     ssa_ast: a8bbf1cb18477f59fdde5a00a10018ee73c97be0b6da7d939b088c47ddae4b63
     flattened_ast: ebb98ca3c21a3a079341e91dbe0071805b5635e22b26d87bab2d0f7f29e55e48
+    bytecode: 8dc4649ab97faa73e36c483cda23375d32ab95a137908e5862c449fb4ddafe21
diff --git a/tests/expectations/compiler/integers/u64/lt.out b/tests/expectations/compiler/integers/u64/lt.out
index 09856674b2..c006ebcab0 100644
--- a/tests/expectations/compiler/integers/u64/lt.out
+++ b/tests/expectations/compiler/integers/u64/lt.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: b06ded2cca19bc72791584cfc9ad6870bba71144a49d69c9c6e91f1f3ecc5b58
     ssa_ast: b76a6a230cfda21801efb1415dd55460e0c308b730e26af267cc81f67216cb39
     flattened_ast: d82a37f797a289874020f7994c92a149cc3d24b42ed339d7c62107042ecd5264
+    bytecode: 63f280b70417f356c8a73c6b8e1f9ad16075516df68abdc4cc5d704f905141f2
diff --git a/tests/expectations/compiler/integers/u64/max.out b/tests/expectations/compiler/integers/u64/max.out
index 6e2a54cb32..18ecccc41a 100644
--- a/tests/expectations/compiler/integers/u64/max.out
+++ b/tests/expectations/compiler/integers/u64/max.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: b4b410616ccbe4feaa96988e98c6c41e17e897a66933e66d9956b8878bc0abdd
     ssa_ast: 714839f1735aff62fd474306f45956973a66a2b26207de395594e6c1b2642ade
     flattened_ast: b3abc35bae3a10020dd24afe1a593fcf96abf8cb05a57ee358a8de4029432918
+    bytecode: 9a1e5bb7b8d932d4afd347a856bfb38db144771f49a0d9589ef14236338e3dcf
diff --git a/tests/expectations/compiler/integers/u64/min.out b/tests/expectations/compiler/integers/u64/min.out
index 92c7c875f8..0db9a88d9b 100644
--- a/tests/expectations/compiler/integers/u64/min.out
+++ b/tests/expectations/compiler/integers/u64/min.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: d58c0d550facdc12fa5fc2ed5c4526802b16e6ad016ddde29bae11b766cb4d91
     ssa_ast: f2a644aa5c2e291cea8c05e294f016798db54b6461c14ab48232a9914fcc9897
     flattened_ast: 17c476e11530843bbff9b4d0b731639d5a1bb8631370e536509767446ff63b2d
+    bytecode: 9a1e5bb7b8d932d4afd347a856bfb38db144771f49a0d9589ef14236338e3dcf
diff --git a/tests/expectations/compiler/integers/u64/mul.out b/tests/expectations/compiler/integers/u64/mul.out
index 6d1e8b99aa..0476bf8ad3 100644
--- a/tests/expectations/compiler/integers/u64/mul.out
+++ b/tests/expectations/compiler/integers/u64/mul.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 1057c23f7ed1be66d0f127111cf34ea67fedb532b14c3f21c5161ee5b6a4e94b
     ssa_ast: 61c28a4da8fed9e78eae6dada40989d6149cb599807ff4c162ffcee2d385fdc2
     flattened_ast: df682933482e35d6163ad15daf1b5102f8382aec03857d4490585821bf1b0807
+    bytecode: 486a84afaf57084573210907b90196cb1114fa7410653ca1e6fb6e3c6c79b6b7
diff --git a/tests/expectations/compiler/integers/u64/ne.out b/tests/expectations/compiler/integers/u64/ne.out
index 46a178f367..387cb257ec 100644
--- a/tests/expectations/compiler/integers/u64/ne.out
+++ b/tests/expectations/compiler/integers/u64/ne.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 6f2afb2723010375b1b97763106841798da1c2e13ea8e465db053c77883268b2
     ssa_ast: f7897d2eb3a0055bdae8a3ee84d2503975f55cb2234d09b497546b66263e52e7
     flattened_ast: c177e659d8b8cfce44dc00d06a4abb4753e68f3b7a48bbe609ad01972a362098
+    bytecode: 8e8a975522ad3ffca502e1571834b1c8970eef450662ac7fddd3c49efeb639b6
diff --git a/tests/expectations/compiler/integers/u64/operator_methods.out b/tests/expectations/compiler/integers/u64/operator_methods.out
index ef44c9f396..f7a51f67df 100644
--- a/tests/expectations/compiler/integers/u64/operator_methods.out
+++ b/tests/expectations/compiler/integers/u64/operator_methods.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: fa7e15886458d23c094aeafbb9ebe4897519ddab14f29dda28b6ba0e243c92a6
     ssa_ast: 97b107fc347eee6926647e6de325a3d6a9f0356438eb4ee1b1f514ead67b1263
     flattened_ast: 7932b1495a691e8b77ef911a307102354bd17f4176f997671e0bc433a031f900
+    bytecode: 193cb1040ce4d18bf27ff8bb0bbfe6803dabc2bbf390137c35e7dde921ee5684
diff --git a/tests/expectations/compiler/integers/u64/or.out b/tests/expectations/compiler/integers/u64/or.out
index 01392f6919..e380d7698e 100644
--- a/tests/expectations/compiler/integers/u64/or.out
+++ b/tests/expectations/compiler/integers/u64/or.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 2fa19baffe354daeff34a8c61a0aa0f0493cd0c1a09be937b3584fe63216cd5c
     ssa_ast: 5ae24b41d8aa24186b4a62b03e4d68b4d6470365480d4e9cb4e6fe693b3337b5
     flattened_ast: f67a713d80a4d96e137b46a1b269d40e048dd38414019a2706d888fc7290e2a5
+    bytecode: 47598c8cd14b5c8d64211a0047245b3f871e19edd70e1522bc53b499086ddadb
diff --git a/tests/expectations/compiler/integers/u64/pow.out b/tests/expectations/compiler/integers/u64/pow.out
index 89ddf93456..3f8ec5736b 100644
--- a/tests/expectations/compiler/integers/u64/pow.out
+++ b/tests/expectations/compiler/integers/u64/pow.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: e7e7f349709881fd5c9e768010ac7672cfc244057881971fee4c3a4abe3a2248
     ssa_ast: f320efc8a5808936b9153f04cdcb68f848033745b796a0f614ea17e0b99d4f51
     flattened_ast: add58901945b0aaad945de755195a3d6e1cd81460668f6d3c5b9ccde9f790419
+    bytecode: 83a4a3e6bf44d3c123dddb1e75daf9ce1646eb28f1ab8cb29ef54f655f01d896
diff --git a/tests/expectations/compiler/integers/u64/rem.out b/tests/expectations/compiler/integers/u64/rem.out
index d03baaeda0..0ec14f123b 100644
--- a/tests/expectations/compiler/integers/u64/rem.out
+++ b/tests/expectations/compiler/integers/u64/rem.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 7fd037f1b4e49dfb7e0c72c1fc563ff9c8fb0b6c09888aa26387890a03ff0572
     ssa_ast: a2ffd9b8382c13d669fe7352056ec85db7e4c610d363bfee4d8d1ca6b85097df
     flattened_ast: 78ff6b1093432a9e6173fec056dcef00a044a0588252b1aafc53ec7bc1db630d
+    bytecode: 38c33340281b18d18928cf039ba05883bcf41ef355d7471a588657758ee7fafb
diff --git a/tests/expectations/compiler/integers/u64/shl.out b/tests/expectations/compiler/integers/u64/shl.out
index 0abecf996b..60b9a82dc3 100644
--- a/tests/expectations/compiler/integers/u64/shl.out
+++ b/tests/expectations/compiler/integers/u64/shl.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 0da7ed73604fbb71d3cf22093e7a4712de5371b12e07bd72e994c4973093565e
     ssa_ast: 9c71291a47f4f92a3f5bd5525f6c3cf8ac9493f675a8d57b089a7668dcc74303
     flattened_ast: b59634ef5da0b0b7fd072271a150e74f75755efae3d494ba08084b308f12d0cf
+    bytecode: 6abd2392fd4bdf825472989ac1375279ed65c8085607e574567a29036577a83b
diff --git a/tests/expectations/compiler/integers/u64/shr.out b/tests/expectations/compiler/integers/u64/shr.out
index abbf2fbeee..b8a825cc96 100644
--- a/tests/expectations/compiler/integers/u64/shr.out
+++ b/tests/expectations/compiler/integers/u64/shr.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: bd036534f2610dd4f4ed24b07b0928b6ef86cd62db1ad6fed0e394d79d6e0111
     ssa_ast: 73800536da731fdfafb737adbcf0efee6f5a330d9be60a490ecf63c0787998b9
     flattened_ast: 77b25631a41b0f0bdad2b86f665a29e9ba9ecb8ad6ac55fd3ffc39b87ca0f2c7
+    bytecode: fe81994a0915f712640ac94938914b1c35ed04f10bc82050aeb7bb88fa92681e
diff --git a/tests/expectations/compiler/integers/u64/sub.out b/tests/expectations/compiler/integers/u64/sub.out
index 48d0a5bb75..3dfe51420e 100644
--- a/tests/expectations/compiler/integers/u64/sub.out
+++ b/tests/expectations/compiler/integers/u64/sub.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 03718b3dc68acc4c12697b0a96ec89f52361bd71043097d528e4970267bcc358
     ssa_ast: c62cb75b18725362143ca8912acf74e1a574867c79b9548f1854faaefc5a29e0
     flattened_ast: 508c29808115f14e8f3b270cc3c236cb2186fb6f99fcbc89b553e3ad55d41a3d
+    bytecode: ef94f9ad01c6c378473388209a8d3c21f2071e447c5370032f52abbe3df13b0d
diff --git a/tests/expectations/compiler/integers/u64/ternary.out b/tests/expectations/compiler/integers/u64/ternary.out
index d160e9ed47..95b5012c49 100644
--- a/tests/expectations/compiler/integers/u64/ternary.out
+++ b/tests/expectations/compiler/integers/u64/ternary.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: e5aab6f122856f40f8d4fcaa2dd50c6543a37f6bfba56de42bfa0082ca389fa8
     ssa_ast: 4a0250cf13610d5cc2abe9f2cb84ba8e1d0c36607b072904569c9a1a451d3a81
     flattened_ast: b40c5db3cfe14b2f8b6ea1a082361c67086bb9b00a5356f9b1c2b4ea53f674be
+    bytecode: cf2304e9005774e8f4d611278dc0c52a55c4430daa32c89f4a039b7502672341
diff --git a/tests/expectations/compiler/integers/u64/xor.out b/tests/expectations/compiler/integers/u64/xor.out
index 34a15669ed..2532031020 100644
--- a/tests/expectations/compiler/integers/u64/xor.out
+++ b/tests/expectations/compiler/integers/u64/xor.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 7a97534f4bbb52508c8e37745ae18da9fc162eece84857e175af35d7ebb5c253
     ssa_ast: 8e4fdb6fa80bb1580a32a6251348d35eecf264ec415db67e78806490b4d7f06f
     flattened_ast: 3bf7d5edbc4f55290158d5c0428a651a5ebc0c540040e4f72766807868b25dd7
+    bytecode: fb6acd4ab6b90eb96a5fcbcad3bd407750c44e7e8c0d75bce53a5fb7c454f54b
diff --git a/tests/expectations/compiler/integers/u8/add.out b/tests/expectations/compiler/integers/u8/add.out
index 548a66271c..84c7a779c9 100644
--- a/tests/expectations/compiler/integers/u8/add.out
+++ b/tests/expectations/compiler/integers/u8/add.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 2970b3fe96cd4e3f283f5962e096d97a5e760d3b0867a631ddec952d5fb45659
     ssa_ast: 4d75173ee27211ef60c240ab8e979fb0b2b2c9d53225ea50cf16f60f488556f2
     flattened_ast: d5b3e01458230b724a1c99486ffa57005d4b571f6d1eecb702019ef5afa9f47a
+    bytecode: 5d87202e1d7ba9963bb54a1ee27ce00a44317ae7a231302898e8be40fe76610d
diff --git a/tests/expectations/compiler/integers/u8/and.out b/tests/expectations/compiler/integers/u8/and.out
index 8f411d624e..0f61f70dae 100644
--- a/tests/expectations/compiler/integers/u8/and.out
+++ b/tests/expectations/compiler/integers/u8/and.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: ee7056d7f3be8d1dac33400be79c9316b01bfb79a516eb7cccc4d210037e44eb
     ssa_ast: cc10049f1a669fb4c58451c7b9ab77424bee632eff57329faaabd777a17ca020
     flattened_ast: e7a9c15da16ad3d034018accf952dabb0cb9526e7be36ade782ab5348fad4bf0
+    bytecode: a039f2ce7be6da12461e29fb69ece10e8a6ccc0345328d2203e36df9398930af
diff --git a/tests/expectations/compiler/integers/u8/console_assert.out b/tests/expectations/compiler/integers/u8/console_assert.out
index 7db69959d5..b9e62748cb 100644
--- a/tests/expectations/compiler/integers/u8/console_assert.out
+++ b/tests/expectations/compiler/integers/u8/console_assert.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: d647c93abe9151a7c6ae9fe7098e08eaf9db3bf8dda43e96d1500f3187b4d340
     ssa_ast: 2bfa986237f2624c544ad9f8fdc82c6dfce06e92fadfe5e03fb27b03a30328b7
     flattened_ast: 17d9b9e60bfc8819624537799302899162396a7dffa2504f1d85741007ddc516
+    bytecode: a941d570e21a54677e4f738fa6b5b10eaf3c665a31f700ac998f3fa5991d3f96
diff --git a/tests/expectations/compiler/integers/u8/div.out b/tests/expectations/compiler/integers/u8/div.out
index 2f8a3e76c5..b2bea8f5fa 100644
--- a/tests/expectations/compiler/integers/u8/div.out
+++ b/tests/expectations/compiler/integers/u8/div.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: e7f7957feca5f994087003de388e946ce867bbf5d7b21cd016db709f317eccab
     ssa_ast: 0e4bdc463bac5d6846b8b58cb6e0318c8109aec0c1c1889feecbe6d47d2f5e2e
     flattened_ast: 7ef42e112c1446b4761379154e862c4837a6ec36f88c863bb863c396e0715998
+    bytecode: cfb3e8b0339e3774c4dd6d936a8d82b20c9bf0930974cd751daf5c39b8cea38a
diff --git a/tests/expectations/compiler/integers/u8/eq.out b/tests/expectations/compiler/integers/u8/eq.out
index 2727783465..d878bf8616 100644
--- a/tests/expectations/compiler/integers/u8/eq.out
+++ b/tests/expectations/compiler/integers/u8/eq.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 6cb78438d021a01917083c62ac54065607180b625ad5544c08e39865af4a037a
     ssa_ast: 1ac6319c479ab6432a77988724f7c2898fe669e44f5bd84860daa6aa4e9786ae
     flattened_ast: 0578c3c1cd213cb583c477a927dbfdf5aa4ee0c63dc19d9c5e22e4f8cfa66907
+    bytecode: 99f56a83a13830f7dc6fc2f1a80063a3882a8756f8bc33f3134c64d1b596958f
diff --git a/tests/expectations/compiler/integers/u8/ge.out b/tests/expectations/compiler/integers/u8/ge.out
index 171fceed43..de90a3be74 100644
--- a/tests/expectations/compiler/integers/u8/ge.out
+++ b/tests/expectations/compiler/integers/u8/ge.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 032da7c07fdb71154e8d489d23b4b575e6318d65cdea9d1585fe7f6ffeeab6fa
     ssa_ast: f72a447b0d799e292fd8cf50ef6826370122cc4f9905f2b622921e17820b34bf
     flattened_ast: 56984e49baac53c8e8edfeca8b585f258d680e85c41bf6ffa2f425a9a0c380b5
+    bytecode: b6c443f36f4e05d0bf1b0c714281eb0ea5502d3899762df421a382656c3f2a0d
diff --git a/tests/expectations/compiler/integers/u8/gt.out b/tests/expectations/compiler/integers/u8/gt.out
index 2207b167ab..1e8684a3c0 100644
--- a/tests/expectations/compiler/integers/u8/gt.out
+++ b/tests/expectations/compiler/integers/u8/gt.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: ef4db3611b84fa6b94185de591c8087f6a2d90c023f2b547064ba20215542c9e
     ssa_ast: ebe401a2075dc273ef321b5f5699dd878a09f8eca5bf8116ca937395435de499
     flattened_ast: 0df97830d3319d91193d9994a9e1db388d0fb941019ad0f41df05cd0a982ac51
+    bytecode: da7592d9bb8e0e8af0e5b9d9ddd8921411c7dd0d705c9a87fdd508169d0ad1f7
diff --git a/tests/expectations/compiler/integers/u8/le.out b/tests/expectations/compiler/integers/u8/le.out
index 3e9afe68bc..c0f85b138e 100644
--- a/tests/expectations/compiler/integers/u8/le.out
+++ b/tests/expectations/compiler/integers/u8/le.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: ae858a04fc6aa29ab7dc32f3bb58f3aca4e54e295b56fa2804cdafaffeed874c
     ssa_ast: d0b04ba0eeb5771c8e312ebc1f547dddf5c28e4d45ec5ed91a140a4810b994fa
     flattened_ast: 711d289e920e6290192c9f34bbac161069daec05d1e5ea4adb39f7155ec1f969
+    bytecode: e869ef253f8fdaefc80e84abd98141ab16355d333ddbfae3d7cca25fb7ebe10b
diff --git a/tests/expectations/compiler/integers/u8/lt.out b/tests/expectations/compiler/integers/u8/lt.out
index 2811edf16c..90327f0033 100644
--- a/tests/expectations/compiler/integers/u8/lt.out
+++ b/tests/expectations/compiler/integers/u8/lt.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: b0d4b768371bf8222bad214a4c1d7eae1ff56c12384b164a818a7815bc5bc03c
     ssa_ast: 9f5247ec070fbb1c12edb0e70330cc44e49660d3af7168fa665339ceceaa4d8a
     flattened_ast: c4e8a72d64c4dc35c7d0c90b6676741dc3281e2437f839bf3852c4a305905ccb
+    bytecode: 8b3b1c73d15c3f5ac4854c5e9c18cbfafae589747c9de009718ec757b099c267
diff --git a/tests/expectations/compiler/integers/u8/max.out b/tests/expectations/compiler/integers/u8/max.out
index c3d9706d8f..ea27521283 100644
--- a/tests/expectations/compiler/integers/u8/max.out
+++ b/tests/expectations/compiler/integers/u8/max.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 4446a938fbba71bc000ddedebb7a1c7b328f065af676cbf21b089c46fb04078e
     ssa_ast: 9b366714ef01d42650100ab49e838eb1c29b1437d97b9ed1ffd2b64f6c87681e
     flattened_ast: 06462f74aa74532b3cfabed4d771d4d1479745460f752b03b8bf9b0e1239857d
+    bytecode: 9a1e5bb7b8d932d4afd347a856bfb38db144771f49a0d9589ef14236338e3dcf
diff --git a/tests/expectations/compiler/integers/u8/min.out b/tests/expectations/compiler/integers/u8/min.out
index 8df736185e..a0df6cabec 100644
--- a/tests/expectations/compiler/integers/u8/min.out
+++ b/tests/expectations/compiler/integers/u8/min.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 63fef59187e392efa191aa06e983b4aad3942475a097295e8db8f86b9ac5b94e
     ssa_ast: 2ee0e7ebabb71733fddbe55a2bcafcabe91e47241cd8ec83c32a39e63a3c9083
     flattened_ast: 92b935e04101d60e836774b2dd25ad04d5e00463edd810ee3ae3cd25d76f2377
+    bytecode: 9a1e5bb7b8d932d4afd347a856bfb38db144771f49a0d9589ef14236338e3dcf
diff --git a/tests/expectations/compiler/integers/u8/mul.out b/tests/expectations/compiler/integers/u8/mul.out
index 72eb801dcc..9189c3ae13 100644
--- a/tests/expectations/compiler/integers/u8/mul.out
+++ b/tests/expectations/compiler/integers/u8/mul.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 8072e2c166461d55fe5f08c9d2acc77fb9e657ab4ec405e9b8cb715ba077df76
     ssa_ast: 532a81d76848559a85bf90e1c50ce15450fd50c8101371555fc5da5ee3a1a7eb
     flattened_ast: f9c435cebe2d76c2b0da0f78de679d3601621dfb9a159605d7f0bdc920c98621
+    bytecode: f3e8f78be42f2b1c4ffe738c22be8ed69d93030768e1493e91704069624161d1
diff --git a/tests/expectations/compiler/integers/u8/ne.out b/tests/expectations/compiler/integers/u8/ne.out
index e4ba007b4a..c0d9b7a2ba 100644
--- a/tests/expectations/compiler/integers/u8/ne.out
+++ b/tests/expectations/compiler/integers/u8/ne.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: b517510706e500161c638fdd381264b12627f2fbc74c7c0ba0c8efd37c880d7e
     ssa_ast: bd4ade2bd57d7d68268cfe7916ae9bc13c92a9089276da07e03a11c51fdefa63
     flattened_ast: b3a685fed1692db4daa4867b36a6ebf10d1827111b41ec4eed64df2cf91f2a41
+    bytecode: f3d5151dee5a9dc4ec37146ba94693a876f6520de94c3c6a3d8bad7ba513f5d8
diff --git a/tests/expectations/compiler/integers/u8/operator_methods.out b/tests/expectations/compiler/integers/u8/operator_methods.out
index 43ec98dff4..e9dbc63ccb 100644
--- a/tests/expectations/compiler/integers/u8/operator_methods.out
+++ b/tests/expectations/compiler/integers/u8/operator_methods.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 5f62c556cb77a8e5ab3c022ac8d1e0a748e317779bc795a9fff0a7947b41c3f8
     ssa_ast: df419fc00beabbf9493f814e01dea2da59f24e09db6227180c2329e93dc761f0
     flattened_ast: f02112665f8cf1aeb141ad54f8ef1e29496d6b050360d2b907ef57297a10b8a5
+    bytecode: 87035e18e5b9c111a9e8a5b223cfe3ba5f622b32fb3357ada76e0e441423d9a8
diff --git a/tests/expectations/compiler/integers/u8/or.out b/tests/expectations/compiler/integers/u8/or.out
index 8c7ebb521b..6584dc78d5 100644
--- a/tests/expectations/compiler/integers/u8/or.out
+++ b/tests/expectations/compiler/integers/u8/or.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: d1cd037758f04af2a818aeb0ca0459dc68d57d5e6d24f24d0f6d0008ec965596
     ssa_ast: c07776965801a4a70249838a02572f812c8de95e14b735ac81355098b8de6bdf
     flattened_ast: fdec7f6a1e48a8e3db6650f2b6a4abcd32b0ab9e7a2e8ea22b9b5d3b7711f2cc
+    bytecode: e074a88150455ba45e3055ec3e3ab7046242f12f6b6632e0b008a96e84818654
diff --git a/tests/expectations/compiler/integers/u8/pow.out b/tests/expectations/compiler/integers/u8/pow.out
index 8396b690ac..2ebb28731b 100644
--- a/tests/expectations/compiler/integers/u8/pow.out
+++ b/tests/expectations/compiler/integers/u8/pow.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 17b04a9c481d1c8fd4932bf96a240ce930a170ab3e1da5f56691364056cc579f
     ssa_ast: 042205ab3f1c305eb835ccf3fab10343d7ad8f49f966b11ce4e5411e86dcb0d8
     flattened_ast: 838ba236353e74fc79dff956d975b5ef9bc22f2690577ce7b3c62c5205d09fe8
+    bytecode: a48814ab5a0a2eb63c017974e4b5d5b80ee85a75baefb0f01c9d4794aa44f427
diff --git a/tests/expectations/compiler/integers/u8/rem.out b/tests/expectations/compiler/integers/u8/rem.out
index 49d50fa479..21742c48a3 100644
--- a/tests/expectations/compiler/integers/u8/rem.out
+++ b/tests/expectations/compiler/integers/u8/rem.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 483f92c5f4c830b810c9dd630d07de6a88f46b46ff24fe1a6052047675829dfb
     ssa_ast: 398fa81614ed01ec227ed549ce3b75724436ea628525a0b4958bc7abb3820b0b
     flattened_ast: 41c981394c0e4897c6f30434c73bf7064712137fe624231c367dddd6a1347225
+    bytecode: 2159912f354d44e770662e90da4184d94de184fa49e44a6228fb4fb9e9ce5bf3
diff --git a/tests/expectations/compiler/integers/u8/shl.out b/tests/expectations/compiler/integers/u8/shl.out
index 6a201e93c2..319bff4009 100644
--- a/tests/expectations/compiler/integers/u8/shl.out
+++ b/tests/expectations/compiler/integers/u8/shl.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 912cf46b787d0276f330027efb35fc6a33b7c239ff1bbdc0da5cf89f9f31ba18
     ssa_ast: 0088806492e388d7b21772a1b2a6efc303b3915e020e1b4ab75f78fe1e120146
     flattened_ast: 8a7e8f7130cde94569d404553418d63baac1ca795d6d5b3c7a577fd71d56bc07
+    bytecode: dabf4b298971b553d5d0009a749e4d4a993d58a0a5aa20453a0241716bceaaad
diff --git a/tests/expectations/compiler/integers/u8/shr.out b/tests/expectations/compiler/integers/u8/shr.out
index 77ef9868b7..022d068e59 100644
--- a/tests/expectations/compiler/integers/u8/shr.out
+++ b/tests/expectations/compiler/integers/u8/shr.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 4fe0a149eed2b794f9bffa6605765c1aede5805deb0a8973a915b06e66bc12a5
     ssa_ast: c94399a679381f8a66c65e6c9f4dbecedd9f9a3a9614ce17790f086fc6e1a69e
     flattened_ast: c95508e016dc67e8df291effe6553a35aa361a50a366a1825440ae8dfd81c4b1
+    bytecode: 5c4619b95890e250d3c57ecdcd585a9a20b1c5b4ca615b23c6ddf7fe5bd9b6c3
diff --git a/tests/expectations/compiler/integers/u8/sub.out b/tests/expectations/compiler/integers/u8/sub.out
index 5abe591d08..e5715ef4cb 100644
--- a/tests/expectations/compiler/integers/u8/sub.out
+++ b/tests/expectations/compiler/integers/u8/sub.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 43d74291b251e8fd1d37a52081d3663f3f7ba4e19ec7ad423dbf0a64ce2600e3
     ssa_ast: 4a588a82d900135b1674869981855c9f998bd6aceea03c26d03f86bb72e71b15
     flattened_ast: 9c5854a1007cfec0d746d29e7ef0ca3373fdcc2029a5f9e9125175991aac29eb
+    bytecode: d0baeac7c2175f2a975d1d36d8605405062fb8dbb8513604a5ea9d3e9902c6d2
diff --git a/tests/expectations/compiler/integers/u8/ternary.out b/tests/expectations/compiler/integers/u8/ternary.out
index 6441d6e38a..335522894a 100644
--- a/tests/expectations/compiler/integers/u8/ternary.out
+++ b/tests/expectations/compiler/integers/u8/ternary.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 1e23710b1f38c7c76f921a8c783a602ae941307c353ea601bd57b3f80cbe11ca
     ssa_ast: 952c257443a2724236a50d8dfa7758b0b708ea45e4f6156aa33cdf85cdacd771
     flattened_ast: 121216b8da30c32cf96ddd6165c3e51a93f6531d40a14cd54442208a09842d23
+    bytecode: 943036760ae202cb77ff7f514a6a556c890a8f542d7e8fef482b4185d6786b66
diff --git a/tests/expectations/compiler/integers/u8/xor.out b/tests/expectations/compiler/integers/u8/xor.out
index 2460ae94b8..7ce38319c2 100644
--- a/tests/expectations/compiler/integers/u8/xor.out
+++ b/tests/expectations/compiler/integers/u8/xor.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 953ffc76e6712094bb4a0d9888a04e1ce694f4ab6247f45746b0debd4e3c2b3a
     ssa_ast: c3ce0d6b496cba5c345a5647ebf1c3f2cd23278c980b78a90c0b7a24ed2eea91
     flattened_ast: e192e4bf87eb9fb6f10aadd3615c609af4fd1d57321b93a3e741b7d70b673290
+    bytecode: 8b7e98a7f450a6280c0427907077db96a5194953ac878f3096c126a8d8b75f62
diff --git a/tests/expectations/compiler/records/declaration.out b/tests/expectations/compiler/records/declaration.out
index ceefdacb39..d00f1601e8 100644
--- a/tests/expectations/compiler/records/declaration.out
+++ b/tests/expectations/compiler/records/declaration.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: bb7307edb38c7db57600f41289a531f3217986306065bd46f93d3c9f4a5f8c17
     ssa_ast: e6349909555c268ac418138ae06a0f39db94644406da8963fc6e9166d173ac49
     flattened_ast: 4e319787a57e5682933de2c56c28b321c4b8721a1cef840c8e23680440089a4b
+    bytecode: e6c7836da70dcac19600a14bc49655ff3aff5f254ca77a24b39564a3987cdb7f
diff --git a/tests/expectations/compiler/records/init_expression.out b/tests/expectations/compiler/records/init_expression.out
index 42f7dfd947..c250e66bb6 100644
--- a/tests/expectations/compiler/records/init_expression.out
+++ b/tests/expectations/compiler/records/init_expression.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: af8688e7fec694325b1df4310b5dade523d3d1f532f8eb8a3f188551b8a54a5a
     ssa_ast: 208d1844d8c905bb651c6c765d5fe3e4c2f92d3330976423732f37f2b221500d
     flattened_ast: 00f7eb5a7313a9f278c4c087d540a7779f775f7f9f90e9cb6b6984438bfef541
+    bytecode: 1cfa6fc08a9f2902f0fef6da253abd33115459891219263928dbaa69b44be3cf
diff --git a/tests/expectations/compiler/records/init_expression_shorthand.out b/tests/expectations/compiler/records/init_expression_shorthand.out
index c32bba5a5c..217dbeb845 100644
--- a/tests/expectations/compiler/records/init_expression_shorthand.out
+++ b/tests/expectations/compiler/records/init_expression_shorthand.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: b47c9ef287b42ddf6c86b3c5ee1fc4114b7afdfd4b6b4c639e070af7de31a15a
     ssa_ast: f71e0aae7438d2e2c8d8943dc8f1224b61e25a0544060f38b61bf31c05b935da
     flattened_ast: 5948d420fe0e1ec682f1bc1f4cfe31c844f95d3fda8a035fe70ebb2c01f3ff78
+    bytecode: 1cfa6fc08a9f2902f0fef6da253abd33115459891219263928dbaa69b44be3cf
diff --git a/tests/expectations/compiler/records/nested_record.out b/tests/expectations/compiler/records/nested_record.out
index 6a77804fbd..fb6478c850 100644
--- a/tests/expectations/compiler/records/nested_record.out
+++ b/tests/expectations/compiler/records/nested_record.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 3293c9012d90ddb83b5c9a0d38bc54ef1427271fbfbd657ef32b50467b098159
     ssa_ast: b97087356212f6fd7f3cb9a2fa28528d8f43958cac268790116a446bb7d40b3f
     flattened_ast: 6555a6b47a3842f6edd2deecf4eeb4b69f39dd439b3a22e8e14f8386dbd15c82
+    bytecode: 6c9eb1193b8d4f71dd8b701ae0f297d12212933b670ab59c89f0a20ab982f08a
diff --git a/tests/expectations/compiler/records/record_declaration_out_of_order.out b/tests/expectations/compiler/records/record_declaration_out_of_order.out
index 92ebd6b1b9..859a9e3fe9 100644
--- a/tests/expectations/compiler/records/record_declaration_out_of_order.out
+++ b/tests/expectations/compiler/records/record_declaration_out_of_order.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: cac9f749af7eb2ac5acefa19d653705e28085406b4bd89c9c047fdca98b7681e
     ssa_ast: b60f4c39976269cff9b12e5e477945ab79b37be03e5313fb9b6f47102b46b4eb
     flattened_ast: 4f99c8fb8e7f17667f1093f79b20d28597cc5df24d81408e4177ff49674da46b
+    bytecode: e6c7836da70dcac19600a14bc49655ff3aff5f254ca77a24b39564a3987cdb7f
diff --git a/tests/expectations/compiler/records/record_init_out_of_order.out b/tests/expectations/compiler/records/record_init_out_of_order.out
index 5e3d4c629b..8cb18944a8 100644
--- a/tests/expectations/compiler/records/record_init_out_of_order.out
+++ b/tests/expectations/compiler/records/record_init_out_of_order.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 42c56652c3fb3a31a6f85489f5022a32403b0545a554bf38e302c582d1524fcd
     ssa_ast: 084ca3351316cb42f9f27f2fbe4ba1b812b2691c2f8ae2d38b034df6e6f53d4e
     flattened_ast: f7483a9a8dde1baf59ca88ae6dab649ddfdb761de61bd48d06ccaf4eb99fc6d2
+    bytecode: 29844f1ea8a798be999d7a958052e759df9664aa3efb0d17a92534caa532ce89
diff --git a/tests/expectations/compiler/scalar/add.out b/tests/expectations/compiler/scalar/add.out
index 0efb0e7293..3f0b1035b9 100644
--- a/tests/expectations/compiler/scalar/add.out
+++ b/tests/expectations/compiler/scalar/add.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 42c912b1e1a53d4b0f6145e2152d46a6f4fcc7e565216eb1ce4b679e7863bbc1
     ssa_ast: 583e5ebee461167aaaa9e73ed11ef73dc361ad6018f756104fafb2e32e68b81f
     flattened_ast: 43093dd80c23decb821f9de2c13da251ecd9156e19bc7294e9b6fdc656072eba
+    bytecode: 90d57d70bb80ee3a60cbf18b20fe23889d36521d4d7e0fc2d478846deb16f1e2
diff --git a/tests/expectations/compiler/scalar/cmp.out b/tests/expectations/compiler/scalar/cmp.out
index deb0a7bb4f..79052a18fd 100644
--- a/tests/expectations/compiler/scalar/cmp.out
+++ b/tests/expectations/compiler/scalar/cmp.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: affad337b16ff74015a871fb06337b11eec266c345dcfe7fb5fabbfff4cf604b
     ssa_ast: 55fb96f90253035efa8edec804296d6e29c7bb07bb02e29613966c242fe42713
     flattened_ast: b973a5930d4db5669abd8cc97047ea03a55c1ae79d8d252944b8cb9700dc7886
+    bytecode: 11169bc0814efae73bb117306b656bcd8b9142527ec4d4350fc7bc6ca73f7ecb
diff --git a/tests/expectations/compiler/scalar/eq.out b/tests/expectations/compiler/scalar/eq.out
index 8703ccb15f..48c3cf3056 100644
--- a/tests/expectations/compiler/scalar/eq.out
+++ b/tests/expectations/compiler/scalar/eq.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 082bc2628c9800118835b00f7eecfa019dd0695bb98f2147b1748cee5ae99cc5
     ssa_ast: 058605098b04af88ef27c35e695229030fc4db49dc16b549dc6caaeef4c98a5d
     flattened_ast: dbb847038ac96d3d58f1e56a1a6e9b5f728286e0e822823969d6b8c52b5ce00b
+    bytecode: 8ee10dd27a2cce44dfbc5fad350e90aecd3bca09a0138b7b877f69e914615b88
diff --git a/tests/expectations/compiler/scalar/operator_methods.out b/tests/expectations/compiler/scalar/operator_methods.out
index fde6bf1f0b..8dd3a036f7 100644
--- a/tests/expectations/compiler/scalar/operator_methods.out
+++ b/tests/expectations/compiler/scalar/operator_methods.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: f95a48e7733e338d62e3da6a34f277bb8ded025b7c6f0157b515183d29faf785
     ssa_ast: 35cc858274c7ec2a6d14d93fa158fb85cca0ac824e501b5bfda06a7171604908
     flattened_ast: f3c3a4c3a8e3b55c40b04ce7b89aad18974f02f94840e6db4c876c377cf1cfdd
+    bytecode: 862939980a9659205eb6679bd91bf6eb401de987960788e65fd7e88948ad4b08
diff --git a/tests/expectations/compiler/scalar/scalar.out b/tests/expectations/compiler/scalar/scalar.out
index aadb658220..14964e4b27 100644
--- a/tests/expectations/compiler/scalar/scalar.out
+++ b/tests/expectations/compiler/scalar/scalar.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 7026ac1246d209b3065fb57c37974d0d4671a0b980c934265517f665019a2f51
     ssa_ast: 6accf439b526bb637642b6ee39536b1d1be064f056f0b3f2f25485142ea110e9
     flattened_ast: 409b2fbe931e982f5d502a63b9b6ef075ea5fe2bf6f191f701a09685285bda3a
+    bytecode: 59d4999dee3d39ffa16d0f41c6be0ef11d294b63ab99f9950b7213badcd4a2f5
diff --git a/tests/expectations/compiler/scalar/ternary.out b/tests/expectations/compiler/scalar/ternary.out
index ce990c446d..6d5db239ac 100644
--- a/tests/expectations/compiler/scalar/ternary.out
+++ b/tests/expectations/compiler/scalar/ternary.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: b44306c55e789ea23acd47511e2ac803a646f6738fb0c8f29f363185239e2631
     ssa_ast: 0c6149daeefd5e16fa1e5e61d8ec8682e32435633534a41f232c24c65cdb143e
     flattened_ast: c491a52835e5562d7104ddd67b74407ea1b5085168f229b0755455fd1dc2c6c1
+    bytecode: b43493bafe4f9d08e8dc30a46f254b482eded7ba195ee4b06a546bd844cfe44c
diff --git a/tests/expectations/compiler/statements/assign.out b/tests/expectations/compiler/statements/assign.out
index 8d92261723..3a47b069c9 100644
--- a/tests/expectations/compiler/statements/assign.out
+++ b/tests/expectations/compiler/statements/assign.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 8c40e0f2c19aa0677f43f6a65b9b28aada4e103a8903007dd751919a847953a1
     ssa_ast: ec457fd8beec2ad9f7a3dcec8d047554c12ae7d6b069f0dd1c8eb309ea117ed0
     flattened_ast: 30da8009cc4d9139aace5a9fbec44179ce7a56a80380c21c8ba5c6e3801da9fe
+    bytecode: 2ea7539936b0c489d167990b0abe8ba6b864ef981a8d77e97be46df11d7f78f5
diff --git a/tests/expectations/compiler/statements/block.out b/tests/expectations/compiler/statements/block.out
index d5717f0c4f..b788098b5d 100644
--- a/tests/expectations/compiler/statements/block.out
+++ b/tests/expectations/compiler/statements/block.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 33a43127eeeb0289799ef900b49b7a149da36cfaefee6e1ca49a73c354b79a4c
     ssa_ast: 977226b4afcbe88f8ecad10ab991e1d3caa3f23b4a77e762ad2d14f57495364d
     flattened_ast: 10fb7b3067dfffc93252849fd34dc155bba530a5be420388a3e3e99fc4f8675b
+    bytecode: ce399e998b6e09f8bc8733bfa797b1fcd0680de149fa4a3e21d0be4be7987f4b
diff --git a/tests/expectations/compiler/statements/chain.out b/tests/expectations/compiler/statements/chain.out
index a6785b1da1..5a17374c61 100644
--- a/tests/expectations/compiler/statements/chain.out
+++ b/tests/expectations/compiler/statements/chain.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 5e92f6e0387ee4ced587a7074847327de62f8e40294c40d6fd502f933cf687f1
     ssa_ast: 317614734ff9e301b2d006c01bf5526b12e58843e0f5b460ba673886dd2e9162
     flattened_ast: e4dbc7abe2e4587260b7bff79508c7eb1d1fb32d4530790d45e7fa741cf0a680
+    bytecode: b26e7efafe9624ccaa5ebe73afb04f718bffd1dd4094724a1a040dffd96ee6e8
diff --git a/tests/expectations/compiler/statements/expr_statement.out b/tests/expectations/compiler/statements/expr_statement.out
index 4b5adae054..5e949be242 100644
--- a/tests/expectations/compiler/statements/expr_statement.out
+++ b/tests/expectations/compiler/statements/expr_statement.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: b39a9a9105dcb2de0fe915866f0e401cd3dfd5a96930bfe29950edf323ce5614
     ssa_ast: 893057d66fa89c650a16d1bbe85438ce69904f583dc06c3b007e6adce2e6d910
     flattened_ast: 6edbf099085b9dbbfad5411c0e50c60b2a61cd6314a7bf220f5ff5993e6f56e9
+    bytecode: b55cf7fc6a466a6a3c045ce7c5a62416ff39e9f195f7afc5cebce98a9149031c
diff --git a/tests/expectations/compiler/statements/iteration_basic.out b/tests/expectations/compiler/statements/iteration_basic.out
index 0a54f73113..3e44334998 100644
--- a/tests/expectations/compiler/statements/iteration_basic.out
+++ b/tests/expectations/compiler/statements/iteration_basic.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 1155ed8bd23fb6e9f03560a14b61fa999716c73f596228a50b86073afeca3e7d
     ssa_ast: 4a88ae03ae334e122ae52f9d598b7db29d0515a16749fcccf3b8a56b3e381016
     flattened_ast: 1303e9f0e24514c3f8c5d82276c06fdea1f4adb6a36e5491d3e009238d0d3701
+    bytecode: d81714c646dc5825b148fba33931cabbb7a60c0e48cd8d7154f0906092f7849a
diff --git a/tests/expectations/compiler/statements/iteration_nested.out b/tests/expectations/compiler/statements/iteration_nested.out
index 6f551efb95..cd95106e3f 100644
--- a/tests/expectations/compiler/statements/iteration_nested.out
+++ b/tests/expectations/compiler/statements/iteration_nested.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: fcb0bb8e86e103e8583944ece2eb84ba869bc8d675087d7864592aadd8ac11b7
     ssa_ast: 0c4bea83791c1d37ac267098bc1c536966850fb02abc66b9f57980245da69058
     flattened_ast: 64a9e978257b9de7fe2c4f321327cf0bffd0fb0c74b6a3e42c7e4507bc17e02a
+    bytecode: a3b17d7db0a6f5298cf87c19baf24046e97725bf1f92177d7251bd85014b18a1
diff --git a/tests/expectations/compiler/statements/multiple_returns.out b/tests/expectations/compiler/statements/multiple_returns.out
index fca50690da..d35594155c 100644
--- a/tests/expectations/compiler/statements/multiple_returns.out
+++ b/tests/expectations/compiler/statements/multiple_returns.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: a040a0e1c56324458b3cc0364e31b9207a39894f02404e758f87bb14be139115
     ssa_ast: f5b45c95e7a8624bbcc0e0b88c56f54175d23d8bab0eeea53477653aa19af80f
     flattened_ast: 0fdfe3661d295a7540f2cbdf15ef52c169bbdd177f85dc763b595664144f2ea5
+    bytecode: c723974f88ddcec03425c959564231cbc891a32389e9ed5ccb04f582fce98ced
diff --git a/tests/expectations/compiler/statements/mutate.out b/tests/expectations/compiler/statements/mutate.out
index c321869df7..b34b36b8ad 100644
--- a/tests/expectations/compiler/statements/mutate.out
+++ b/tests/expectations/compiler/statements/mutate.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 45430f4f6209bd6df299fb2662238b88b6241c350918a968d4955e964e4f010f
     ssa_ast: 614d1648cefe4214b03ad4eb49d2f63094d344622d808de84d5844e93851738b
     flattened_ast: 4f7c702dd8166072aa9221ba7e85657de73a2771b0b736e4739f2bf57ddcae6f
+    bytecode: cc5b20b180a055db2277f296cff25f9c0fdfbf4ae278d88425bdd7481ba12592
diff --git a/tests/expectations/compiler/statements/operations/add_assign.out b/tests/expectations/compiler/statements/operations/add_assign.out
index 23068031c3..df88376985 100644
--- a/tests/expectations/compiler/statements/operations/add_assign.out
+++ b/tests/expectations/compiler/statements/operations/add_assign.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: e21d8c9c70057f40b76649098332f2d6a3e2ebfc84e857baa5f34f866fffdc7d
     ssa_ast: a224b2a506a6703696e4258ef243ac98d8bc2c9062118c9e2f32186d68e64ae3
     flattened_ast: 5313dfe1df585dd91cd490b0805162dadbd4ee3bcea00fccf3d08fa082158190
+    bytecode: 205bb73339d403ed74a8caee04e44c4092e998410ac23fe675e57c2dc28b52ea
diff --git a/tests/expectations/compiler/statements/operations/and_assign.out b/tests/expectations/compiler/statements/operations/and_assign.out
index b324871820..1267947611 100644
--- a/tests/expectations/compiler/statements/operations/and_assign.out
+++ b/tests/expectations/compiler/statements/operations/and_assign.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 7b97542baa30b955c3353a4e89d1ac7a10084cb9da768be6a8a77c201c296de3
     ssa_ast: 2a593d0b1a2e6868fa7fe69f420f20206a762b63a80278be4e15ff52bd65c370
     flattened_ast: a18881cb52deb0808f66f396277442b103d9bc0f51c9e45ef6c6761d0364d8cd
+    bytecode: 81396ad998cb48a02cd66339e769582c2dc445fa2f78d64ac28b78dd00be64c4
diff --git a/tests/expectations/compiler/statements/operations/bitand_assign.out b/tests/expectations/compiler/statements/operations/bitand_assign.out
index d999bd0e1c..a97d1a5a4c 100644
--- a/tests/expectations/compiler/statements/operations/bitand_assign.out
+++ b/tests/expectations/compiler/statements/operations/bitand_assign.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 74b73aef65800f40d96322c48e472a18b475f9e8b44e3c2e11c5e0884d0ce686
     ssa_ast: b0da38f6ef49751da5fec33861be6cda192209f61a58e6a93f134ae9e4872284
     flattened_ast: 32276913ad6b0ff7042c98ef8f9ce1790b496e431060e74caca8f6595c95d4b2
+    bytecode: 351e6362887a12504057143cc97596fbbd42153d0a64f338eb57641e84343159
diff --git a/tests/expectations/compiler/statements/operations/bitor_assign.out b/tests/expectations/compiler/statements/operations/bitor_assign.out
index 053a9e83c9..d65573f6cf 100644
--- a/tests/expectations/compiler/statements/operations/bitor_assign.out
+++ b/tests/expectations/compiler/statements/operations/bitor_assign.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: fdc160b1f29bb028aa2a5bb9ceef5c009660daa22b4680f99fdf884c87ae322f
     ssa_ast: 2bc88b253975dd1846fd5130fb60c172e9ca9af2d7811b66d0fb97dd4ebdc1d5
     flattened_ast: c5d1369849dd794d8159a9556886a28c9baf8abbd7c68bfb2ead9c170d348d9f
+    bytecode: 447d6082c0ca8f0c7c26a97e452e262649883e98cf4875b5c593da83c787901e
diff --git a/tests/expectations/compiler/statements/operations/bitxor_assign.out b/tests/expectations/compiler/statements/operations/bitxor_assign.out
index 5eaa9b60d6..90e2a081ea 100644
--- a/tests/expectations/compiler/statements/operations/bitxor_assign.out
+++ b/tests/expectations/compiler/statements/operations/bitxor_assign.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 9c1d94db65ec2e55bb6bd01e59f6a5da5edeba71bcd3ffcdbc1f1b6bedd31a79
     ssa_ast: f9eaffc47f22a1e4ebe13dae7dc3f95debe4b41bb95443f820453d8ffa0091aa
     flattened_ast: 2f0138989d8527ccfb807dac80cef06cd3828c5b83cfeccce864eba3aa0fe97a
+    bytecode: fedca756e063b895f8cc4bf76f1d9d1c88ff1cf9f4b1208a725edde115f9b42a
diff --git a/tests/expectations/compiler/statements/operations/div_assign.out b/tests/expectations/compiler/statements/operations/div_assign.out
index 8eba8b495d..e6e039de9f 100644
--- a/tests/expectations/compiler/statements/operations/div_assign.out
+++ b/tests/expectations/compiler/statements/operations/div_assign.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: dabcd44e46797bc591010b07216931df069338141184fbad5aa4388bbb213b59
     ssa_ast: 576ae2b82885dab2fca7d25833121229bb69347094c31fda047507fbb9c8fb34
     flattened_ast: b3038af4499648a03f9d7b78218aba90dae5a9dbad5a0e613df51ef5eb17e99b
+    bytecode: fb1dc12922cf851957984a8e2ee0dd72ee0fcff48ac8b0daf3443fa9fa2a4cd2
diff --git a/tests/expectations/compiler/statements/operations/mul_assign.out b/tests/expectations/compiler/statements/operations/mul_assign.out
index 89d2045187..e41d5c5051 100644
--- a/tests/expectations/compiler/statements/operations/mul_assign.out
+++ b/tests/expectations/compiler/statements/operations/mul_assign.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 6efe93af34dfbb871dd930029738f114912886c92030182b99f6a82fff363fd9
     ssa_ast: 7a2b8a8de8b02984833ee488c8b0a79acebb5b74d2e2d000a9361bcf4c25f442
     flattened_ast: 4b2457fbd57be059218a79f5b754d40e6b5c5d85b53874c05b06be474e8614aa
+    bytecode: b71e1622ce24f72e85d8bea2b611bbb30b73ba24acbcd0ce7c560d9e86906bfb
diff --git a/tests/expectations/compiler/statements/operations/or_assign.out b/tests/expectations/compiler/statements/operations/or_assign.out
index 267f5e2ac7..e1e3130780 100644
--- a/tests/expectations/compiler/statements/operations/or_assign.out
+++ b/tests/expectations/compiler/statements/operations/or_assign.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 2415c175c9fe999bf8d5b380e50b55e80cf468997c80d0d97fb4a1ebf9a57ae8
     ssa_ast: 8c1bbbfba871dbcfd7618a6a091a379eea5ad25fae2f3589507301a00c8e14a8
     flattened_ast: 7068c66117fdfc9f953c1f33f62e678769a1d764cb41ea4cfc1f17712a5c89ac
+    bytecode: da955e601b890215b4c0e7b8c1a0f86e02f8069c33085a8897b6d976a7759139
diff --git a/tests/expectations/compiler/statements/operations/pow_assign.out b/tests/expectations/compiler/statements/operations/pow_assign.out
index 4ea2896032..3daf59baa2 100644
--- a/tests/expectations/compiler/statements/operations/pow_assign.out
+++ b/tests/expectations/compiler/statements/operations/pow_assign.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 0772c0e4ebecdc104f81361924d78fa04296d5481c221934a12e1fe99e82247d
     ssa_ast: fd76f18bdd32ef4a16bdf51b91dc4275690df73e5bdf58973da60468551e1171
     flattened_ast: f2df5791fcc7e90a6cddc41230ca6ea0e431e3a85e76c2d57f6c7ca3edf1a2ab
+    bytecode: 4108ac88f7fdefec52773508ff4e95349dce1f77b55123870ccf6bb1adedc423
diff --git a/tests/expectations/compiler/statements/operations/rem_assign.out b/tests/expectations/compiler/statements/operations/rem_assign.out
index 13e52ef146..a091f09fd2 100644
--- a/tests/expectations/compiler/statements/operations/rem_assign.out
+++ b/tests/expectations/compiler/statements/operations/rem_assign.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: feb6e94fae01e9bfb3f7a7c5cc362fd6da30a8ad1f79b3544a3982cc815335ad
     ssa_ast: 64578deaa56286c58892886ec4fa1314e813e2c6aabf10fefba67859d4a6442c
     flattened_ast: ad93e5bb1af9648b6514f04e6439c4a4c87c10dcf3353aaae27731c1b2154f18
+    bytecode: 9b3c12479efabe9d85d3b8c07f1872c8d846425a5451c59a2127d69b7ca3a229
diff --git a/tests/expectations/compiler/statements/operations/shl_assign.out b/tests/expectations/compiler/statements/operations/shl_assign.out
index 8ec9ec8bf6..753475ec26 100644
--- a/tests/expectations/compiler/statements/operations/shl_assign.out
+++ b/tests/expectations/compiler/statements/operations/shl_assign.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 6b94ad7099fe8f5d16e06347155437428d32cbff69bfbaa61ac81eaba7bb317b
     ssa_ast: 3fddfdc7b221cd3c3330860fde0f9f00f401cce764db209681cb827a089b8bfe
     flattened_ast: b1fd4cdefbe1b6a390c5720b39f3e363da34cd5be093379894e05db0e685e221
+    bytecode: e3a22ebc4bc203291d1190f9711b5578da0f4c83b292d9f3adcf281db4922126
diff --git a/tests/expectations/compiler/statements/operations/shr_assign.out b/tests/expectations/compiler/statements/operations/shr_assign.out
index 35b8a64554..3cb9e92116 100644
--- a/tests/expectations/compiler/statements/operations/shr_assign.out
+++ b/tests/expectations/compiler/statements/operations/shr_assign.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 3ddc4b1a4f5735cabcac4e4771fc8558bcc3324d606b1c3a80ed132f72cc1544
     ssa_ast: 3797d72aa0c84b13f7e992573f3bfa2510a6f4ad24725737f99c08159b9ad544
     flattened_ast: 775eb85eee4f0c044af1e5d6e22f9933eb756b7ba6f41060af821356abb09747
+    bytecode: 8bde890ff271b82f5c35c517fa95e2fec5654dee843f5d1ca8771153410d9816
diff --git a/tests/expectations/compiler/statements/operations/sub_assign.out b/tests/expectations/compiler/statements/operations/sub_assign.out
index b46e4cab1a..ded8235e00 100644
--- a/tests/expectations/compiler/statements/operations/sub_assign.out
+++ b/tests/expectations/compiler/statements/operations/sub_assign.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: e0d4ab83a553d192b9c5dc318969458b6be8084a637d8f0e01c76bed50008680
     ssa_ast: 4ec0f00e2ff085fc7be1b0aa6af78090133f16a0b6ee2fa83f1d49610760cd32
     flattened_ast: a3dd70c4531c03e7fb568d5bcf8b38aacbd743fde23dfc6ac42514bfc9dc6dbc
+    bytecode: d1392a0607452a3256f9289af243a6700d69f63c0b507ac9a52ceb3616f5a742
diff --git a/tests/expectations/compiler/statements/ternary_explicit_and_implicit.out b/tests/expectations/compiler/statements/ternary_explicit_and_implicit.out
index db161a6ed7..4750aa8f69 100644
--- a/tests/expectations/compiler/statements/ternary_explicit_and_implicit.out
+++ b/tests/expectations/compiler/statements/ternary_explicit_and_implicit.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: e5307c5a6339383407552eaf75b21ac0f0ff65059045631532a1f2c655d32a68
     ssa_ast: 3003ef83a93f48b08803c66b16c704bde2d0a67f420bdd4a75ae93c7784474e8
     flattened_ast: 7e174242fa8f0e50773a72682d6a8a9d42229d81f0c833ce14e6f632033c8359
+    bytecode: 29c7986430a76fc69c77d416ab7581c42dbb7f2fc7821991cb7365b145079200
diff --git a/tests/expectations/compiler/structs/inline.out b/tests/expectations/compiler/structs/inline.out
index 804187e64a..68edff9ca5 100644
--- a/tests/expectations/compiler/structs/inline.out
+++ b/tests/expectations/compiler/structs/inline.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 833a9489a2a633e9a295cd1ab0bd607826d63747858eb83ad23167c7059ae095
     ssa_ast: 46b22193b16905cb2c2b5cafd609b434194ff90c687095a67d200495448d2121
     flattened_ast: 58f481fdd9f4f0a1b06c07f3b8df37be370fb96c58dd5a8ba7874257100822a8
+    bytecode: 8ee7f077a54a80ac5ce5d1cc894c81c880730a3d60857397dc6028d0d8423125
diff --git a/tests/expectations/compiler/structs/member_variable.out b/tests/expectations/compiler/structs/member_variable.out
index 8be5e4f1e0..c78e70c270 100644
--- a/tests/expectations/compiler/structs/member_variable.out
+++ b/tests/expectations/compiler/structs/member_variable.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 1e712899bd83225f751b5f9f5ad20373717e908d1fef5f39235f28454a0ad295
     ssa_ast: 2f437b91e9b21e0a501ad759bc20636f60ccc3cf11b36fbec78b3bfdd1aac1d1
     flattened_ast: ec8bbe315ace7a787d5c4667b8263f5eb7137206d7f65c67d1894b27fd5a592c
+    bytecode: a8874b5e3d3a000703943de2f132677372f9a275003bccf176c4ebfdf1b86466
diff --git a/tests/expectations/compiler/structs/struct_declaration_out_of_order.out b/tests/expectations/compiler/structs/struct_declaration_out_of_order.out
index 0fe554a77f..4fab74816c 100644
--- a/tests/expectations/compiler/structs/struct_declaration_out_of_order.out
+++ b/tests/expectations/compiler/structs/struct_declaration_out_of_order.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: f72bdc4075f8df04335f1ba943e103ffb347e2ef543ac78d09e9b23bb5e9b5ca
     ssa_ast: 3fbaa1d3291e3db9138bec025038bc5a72d61b1b9a57bca284d7fdca360f27eb
     flattened_ast: 840256ffdb159fc8b17ae81304f7173dc4c4d1c88d72d90ec9466d8ca754087e
+    bytecode: 6cc7359d48deaf0b2c03bdd35b80693511afe0033aeafeceb7065267697f022a
diff --git a/tests/expectations/compiler/structs/struct_init_out_of_order.out b/tests/expectations/compiler/structs/struct_init_out_of_order.out
index 578ff618f1..7024965086 100644
--- a/tests/expectations/compiler/structs/struct_init_out_of_order.out
+++ b/tests/expectations/compiler/structs/struct_init_out_of_order.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 6309cee270f16e07195581b2b698dd65d261112a4e875fd13d811c8247e65dba
     ssa_ast: 5d222042ed63771b08876d0623674f81a8fdcbe60d223927df9cd31038738044
     flattened_ast: c3514496a8fed91adcd4146e1a438d3bf3ff301d50e43e681e91e570366a42ea
+    bytecode: 035a98875b76db42e72bba26b053403c2c629c47683376fe1a33f3a61b3ad53f
diff --git a/tests/expectations/compiler/tuple/function_call_returns_tuple.out b/tests/expectations/compiler/tuple/function_call_returns_tuple.out
index 661031ae02..2d969441ba 100644
--- a/tests/expectations/compiler/tuple/function_call_returns_tuple.out
+++ b/tests/expectations/compiler/tuple/function_call_returns_tuple.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 07e1c5a9a3d0f029169d096165d90d4db77da7fd92bc37dd095c40b4f183e103
     ssa_ast: ffdec84b904fce4b3baa0f35f7b1fb0bfc064ae0fac4b5099564b2fc39180952
     flattened_ast: c50388961b33589150b80846157f64d929e50a51ea79168f96a3bacc6d548ed1
+    bytecode: c154c5c9344d976d14c6455e9f24f6d9d9dbffde47e9bf76b6ed35ffb3a75006
diff --git a/tests/expectations/compiler/tuple/function_early_return.out b/tests/expectations/compiler/tuple/function_early_return.out
index e6041e1885..f454680333 100644
--- a/tests/expectations/compiler/tuple/function_early_return.out
+++ b/tests/expectations/compiler/tuple/function_early_return.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 7a150fc05747c84a3f6d44e549cd379b241defde04162c9f2799213b0b770ec3
     ssa_ast: a72574094f846873420a14fff0ebe2a1df9aeac1a0e32d6bb5a615634ea893dc
     flattened_ast: 1c52d3030429bd3238be592b79ba99f17e4da29878e5bd354e6dff50bda35a08
+    bytecode: c5b9380beb403e862b352234944450588999c9314abceaff6166d98c8882a4b6
diff --git a/tests/expectations/compiler/tuple/function_return.out b/tests/expectations/compiler/tuple/function_return.out
index 6044f492f5..53f26d8845 100644
--- a/tests/expectations/compiler/tuple/function_return.out
+++ b/tests/expectations/compiler/tuple/function_return.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 0b2bfd171b852c4a6c4184ece345a7e855611fd515732dc02b516c6009d1a06d
     ssa_ast: 16ef33fe7fbe8247aefe45e09ef9541b1c2321914453404fb658591c52388e60
     flattened_ast: ee75622d552cee9dfece49ca40c171faa3b16ed9004730c01cd470560b1bdbed
+    bytecode: 2c8abaf0758c39eaedd2fe6bb2747525a452084cd96ce540fd75a7c63395c7ca
diff --git a/tests/expectations/compiler/tuple/function_return_nothing.out b/tests/expectations/compiler/tuple/function_return_nothing.out
index e60693bb5c..1ae15ce64c 100644
--- a/tests/expectations/compiler/tuple/function_return_nothing.out
+++ b/tests/expectations/compiler/tuple/function_return_nothing.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 23b933ce376492c9dd9d6aae7be44e6ee351469b97c05691185dccf12c183ba9
     ssa_ast: 23b933ce376492c9dd9d6aae7be44e6ee351469b97c05691185dccf12c183ba9
     flattened_ast: c4ad5783b89aaa701ced8f63ab0f9dc6add22f1e0126921c92896e3168e6b554
+    bytecode: 3dd2872e02c8030587f796df543d94855437d87460d22c177e74eb6647c1c7b1
diff --git a/tests/expectations/compiler/tuple/function_return_unit.out b/tests/expectations/compiler/tuple/function_return_unit.out
index e60693bb5c..1ae15ce64c 100644
--- a/tests/expectations/compiler/tuple/function_return_unit.out
+++ b/tests/expectations/compiler/tuple/function_return_unit.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 23b933ce376492c9dd9d6aae7be44e6ee351469b97c05691185dccf12c183ba9
     ssa_ast: 23b933ce376492c9dd9d6aae7be44e6ee351469b97c05691185dccf12c183ba9
     flattened_ast: c4ad5783b89aaa701ced8f63ab0f9dc6add22f1e0126921c92896e3168e6b554
+    bytecode: 3dd2872e02c8030587f796df543d94855437d87460d22c177e74eb6647c1c7b1
diff --git a/tests/expectations/compiler/tuple/function_return_varying_modes.out b/tests/expectations/compiler/tuple/function_return_varying_modes.out
index 988ac4efe1..c708d32555 100644
--- a/tests/expectations/compiler/tuple/function_return_varying_modes.out
+++ b/tests/expectations/compiler/tuple/function_return_varying_modes.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: e614de44d880fd94f9fd03625b6ad84e8637e7b9450b4a9731d773d11368a311
     ssa_ast: bef731f003fcc180bd82979f0365ead4a351837d14a13e305a56f2f06cfc54c7
     flattened_ast: 3667e8dd26a3a4cb9072b0da3bfe65d0f45ebebdfa8934d49e7e81900266d80e
+    bytecode: 712d619af623624abea3ee1932a204f2c7901f2d815a4f3c612386e6b457a430
diff --git a/tests/expectations/compiler/tuple/return_with_different_modes.out b/tests/expectations/compiler/tuple/return_with_different_modes.out
index 70a76de998..51178659ea 100644
--- a/tests/expectations/compiler/tuple/return_with_different_modes.out
+++ b/tests/expectations/compiler/tuple/return_with_different_modes.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 95da1f892800d24dff40c26661e11aa0f21ae829dc0729dba1805215886cea4a
     ssa_ast: 5f32d4138cb3bb0d8df91d4d4287fad79e823bd014495a1fca562410dc141758
     flattened_ast: 3062da8a091d1d44226eb4d5603cfc331e29c118d50fb964f737176fd1acab12
+    bytecode: 712d619af623624abea3ee1932a204f2c7901f2d815a4f3c612386e6b457a430
diff --git a/tests/expectations/compiler/tuple/tuple_access.out b/tests/expectations/compiler/tuple/tuple_access.out
index e2ad0251c4..64c7e1d41d 100644
--- a/tests/expectations/compiler/tuple/tuple_access.out
+++ b/tests/expectations/compiler/tuple/tuple_access.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: fca830511e1a0c1891d5209808abb10b6ecaf61d2977c9d3b36aef0cf5a7fbdc
     ssa_ast: e8f0dc54fe43c3866ddc5c043a4edb99e5c22f94b6d3ccaaef707566fd99b736
     flattened_ast: c8850b1205bae1d9f85a952bedd1c9ab040c58e9572232eca636145467beecaa
+    bytecode: 01001f0a4197adc24393c88758ad4747a51b21ee9119ec969b42a7f5ad3703cd
diff --git a/tests/expectations/compiler/tuple/tuple_destructure.out b/tests/expectations/compiler/tuple/tuple_destructure.out
index c0f12f8b64..c96d57b0e4 100644
--- a/tests/expectations/compiler/tuple/tuple_destructure.out
+++ b/tests/expectations/compiler/tuple/tuple_destructure.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 5de6e70195b821d3fe0184f177a222a841d024dcb3156d1b786a6e38895a4c2f
     ssa_ast: 14c2e02509b555182de3257416cfd9b1144539cc61e89eea91013885582316a6
     flattened_ast: 6a838d9101551fd578faac5f373a0db2c7e801755d34a22e179c1b71311b8c4b
+    bytecode: 4ea7af7cc45ebc1c65534c344f557881f7ad985a7cf7b2d1135f5fc1c1b11bf5
diff --git a/tests/expectations/compiler/tuple/tuple_in_assignment.out b/tests/expectations/compiler/tuple/tuple_in_assignment.out
index 2582727890..ab68f14a08 100644
--- a/tests/expectations/compiler/tuple/tuple_in_assignment.out
+++ b/tests/expectations/compiler/tuple/tuple_in_assignment.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 671825fcf613f43a5396e97399501987793909013566a1fcfe87e9d568b388cf
     ssa_ast: b62bf59e58e4efb2c1889f6943d18ff586bcccb77b7e63a5c3c5102e5c97a7fc
     flattened_ast: d3073942753075247bc73f82ebd4e059efb9b8ed373948f4ccb3cd0051b36dc0
+    bytecode: ca2bd4a18e97ee288c1e21bd35be693a6541d52293a94eacca62e48af67d3588
diff --git a/tests/expectations/compiler/tuple/tuple_in_definition.out b/tests/expectations/compiler/tuple/tuple_in_definition.out
index f790726d26..2df0d85373 100644
--- a/tests/expectations/compiler/tuple/tuple_in_definition.out
+++ b/tests/expectations/compiler/tuple/tuple_in_definition.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 889cb21e97d3f486b00b09445efb2cf010188e9c640a4b7c52d30c94723e6fdd
     ssa_ast: c08548614893ecaadeb0dcae18ce19c366a10d75d1d722508e184b291eb28583
     flattened_ast: 8cd65358f5e6653fa7af3b894c84f1c7a0aea3f9e3a7f4e21789dd2bacc0ac8a
+    bytecode: 5a4f25e917512c7596cf0eecb61d2fa9688ada34ded5714d5d1f58356c8b8910
diff --git a/tests/expectations/compiler/tuple/tuple_in_loop.out b/tests/expectations/compiler/tuple/tuple_in_loop.out
index d917d82409..e3b6ae68e9 100644
--- a/tests/expectations/compiler/tuple/tuple_in_loop.out
+++ b/tests/expectations/compiler/tuple/tuple_in_loop.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 6560e1d1944be40dc585b77394eb8575a134407f68152f9d511cdd5f2102c5d2
     ssa_ast: b7d7687498671fe73f17cc59016bbc035d4c3a04f046f6c17048cb4acdd3385d
     flattened_ast: 0420ce25a4930b15fb786ac49caf697b59cb7a05e7e383d83f13b99887865996
+    bytecode: f4577938c5c2372899e3894134e21850f7dd2dcc06830a3856b9e8a989ddff2e
diff --git a/tests/expectations/compiler/tuple/unit.out b/tests/expectations/compiler/tuple/unit.out
index 5c956262da..9d443eab84 100644
--- a/tests/expectations/compiler/tuple/unit.out
+++ b/tests/expectations/compiler/tuple/unit.out
@@ -6,3 +6,4 @@ outputs:
     unrolled_ast: 09a18b5b95816d46b1532923b9b59970b1fe67db0125bae53b32eafb1a22b14a
     ssa_ast: 09a18b5b95816d46b1532923b9b59970b1fe67db0125bae53b32eafb1a22b14a
     flattened_ast: 66f2d1ce15cc515ea89ce156961c87561c893ffbb9489e5ee54cab1fd5182398
+    bytecode: 6d63927b268b0e319d418ace15149e807636dff02ce5f14e037145ead86d2258
diff --git a/tests/expectations/execution/chain.out b/tests/expectations/execution/chain.out
index 1c3d21dd5a..2258a43fc4 100644
--- a/tests/expectations/execution/chain.out
+++ b/tests/expectations/execution/chain.out
@@ -2,10 +2,11 @@
 namespace: Execute
 expectation: Pass
 outputs:
-  - initial_ast: 273da1e42e4be39218e46f2a743701790655709cb9f016b12d07ac41a2c7fa7b
-    unrolled_ast: 273da1e42e4be39218e46f2a743701790655709cb9f016b12d07ac41a2c7fa7b
-    ssa_ast: 97419870ef8df8978d51677579898be33f260b36003b427ea3117156c0956c63
-    flattened_ast: 65625dd7ef152d4960dce674777e86ac631b87e83fb793b17bd53b90e78759ca
+  - initial_ast: 3c1a4035879a71f0f4b9a29f5ae565055141d2fccdd180071a4b228ad83c2d9b
+    unrolled_ast: 3c1a4035879a71f0f4b9a29f5ae565055141d2fccdd180071a4b228ad83c2d9b
+    ssa_ast: ad31bc1da505ff74ba0dc532e74c5b36603cb1f912c616bbe1694751b2557f61
+    flattened_ast: 6c838e3ae060537709075ea5cd05afdd745815bbd4925daf174268dfa5d58d64
+    bytecode: b26e7efafe9624ccaa5ebe73afb04f718bffd1dd4094724a1a040dffd96ee6e8
     results:
       main:
         - inputs: "[1u32]"
diff --git a/tests/expectations/tests/execution/chain.out b/tests/expectations/tests/execution/chain.out
deleted file mode 100644
index be4add6181..0000000000
--- a/tests/expectations/tests/execution/chain.out
+++ /dev/null
@@ -1,19 +0,0 @@
----
-namespace: Execute
-expectation: Pass
-outputs:
-  - initial_ast: 273da1e42e4be39218e46f2a743701790655709cb9f016b12d07ac41a2c7fa7b
-    unrolled_ast: 273da1e42e4be39218e46f2a743701790655709cb9f016b12d07ac41a2c7fa7b
-    ssa_ast: 97419870ef8df8978d51677579898be33f260b36003b427ea3117156c0956c63
-    flattened_ast: 65625dd7ef152d4960dce674777e86ac631b87e83fb793b17bd53b90e78759ca
-    bytecode: 509e7664972d0466ea9b1ad36d223e55b3974389502a8bd47335c9f9a8d6dad3
-    results:
-      main:
-        - inputs: "[1u32]"
-          outputs: "[true]"
-        - inputs: "[2u32]"
-          outputs: "[true]"
-        - inputs: "[3u32]"
-          outputs: "[true]"
-        - inputs: "[4u32]"
-          outputs: "[false]"
diff --git a/tests/expectations/tests/parser/expression/access/call.out b/tests/expectations/tests/parser/expression/access/call.out
deleted file mode 100644
index e03d6b6b51..0000000000
--- a/tests/expectations/tests/parser/expression/access/call.out
+++ /dev/null
@@ -1,50 +0,0 @@
----
-namespace: ParseExpression
-expectation: Pass
-outputs:
-  - Call:
-      function:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
-      arguments: []
-      external: ~
-      span:
-        lo: 0
-        hi: 3
-  - Call:
-      function:
-        Identifier: "{\"name\":\"X\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
-      arguments: []
-      external: ~
-      span:
-        lo: 0
-        hi: 3
-  - Call:
-      function:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
-      arguments:
-        - Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-      external: ~
-      span:
-        lo: 0
-        hi: 4
-  - Call:
-      function:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
-      arguments:
-        - Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-        - Identifier: "{\"name\":\"z\",\"span\":\"{\\\"lo\\\":5,\\\"hi\\\":6}\"}"
-      external: ~
-      span:
-        lo: 0
-        hi: 7
-  - Call:
-      function:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
-      arguments:
-        - Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-        - Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":5,\\\"hi\\\":6}\"}"
-        - Identifier: "{\"name\":\"z\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-      external: ~
-      span:
-        lo: 0
-        hi: 10
diff --git a/tests/expectations/tests/parser/expression/array_init_fail.out b/tests/expectations/tests/parser/expression/array_init_fail.out
deleted file mode 100644
index 66c99b3d13..0000000000
--- a/tests/expectations/tests/parser/expression/array_init_fail.out
+++ /dev/null
@@ -1,8 +0,0 @@
----
-namespace: ParseExpression
-expectation: Fail
-outputs:
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found '['\n    --> test:1:1\n     |\n   1 | [...0u8; 1]\n     | ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found '['\n    --> test:1:1\n     |\n   1 | [...0; 1]\n     | ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found '['\n    --> test:1:1\n     |\n   1 | [0; ()]\n     | ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found '['\n    --> test:1:1\n     |\n   1 | [0; (1)]\n     | ^"
diff --git a/tests/expectations/tests/parser/expression/array_inline_fail.out b/tests/expectations/tests/parser/expression/array_inline_fail.out
deleted file mode 100644
index 3b19a17abe..0000000000
--- a/tests/expectations/tests/parser/expression/array_inline_fail.out
+++ /dev/null
@@ -1,9 +0,0 @@
----
-namespace: ParseExpression
-expectation: Fail
-outputs:
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found '['\n    --> test:1:1\n     |\n   1 | [,]\n     | ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found '['\n    --> test:1:1\n     |\n   1 | [,,]\n     | ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found '['\n    --> test:1:1\n     |\n   1 | [0,,]\n     | ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found '['\n    --> test:1:1\n     |\n   1 | [,0]\n     | ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found '['\n    --> test:1:1\n     |\n   1 | [,0,]\n     | ^"
diff --git a/tests/expectations/tests/parser/expression/binary/add.out b/tests/expectations/tests/parser/expression/binary/add.out
deleted file mode 100644
index 4a37b71a7f..0000000000
--- a/tests/expectations/tests/parser/expression/binary/add.out
+++ /dev/null
@@ -1,481 +0,0 @@
----
-namespace: ParseExpression
-expectation: Pass
-outputs:
-  - Binary:
-      left:
-        Literal:
-          Integer:
-            - U8
-            - "1"
-            - span:
-                lo: 0
-                hi: 3
-      right:
-        Literal:
-          Integer:
-            - U8
-            - "1"
-            - span:
-                lo: 6
-                hi: 9
-      op: Add
-      span:
-        lo: 0
-        hi: 9
-  - Binary:
-      left:
-        Literal:
-          Integer:
-            - U8
-            - "2"
-            - span:
-                lo: 0
-                hi: 3
-      right:
-        Literal:
-          Integer:
-            - U8
-            - "3"
-            - span:
-                lo: 4
-                hi: 7
-      op: Add
-      span:
-        lo: 0
-        hi: 7
-  - Binary:
-      left:
-        Binary:
-          left:
-            Literal:
-              Integer:
-                - U8
-                - "1"
-                - span:
-                    lo: 0
-                    hi: 3
-          right:
-            Literal:
-              Integer:
-                - U8
-                - "2"
-                - span:
-                    lo: 6
-                    hi: 9
-          op: Add
-          span:
-            lo: 0
-            hi: 9
-      right:
-        Literal:
-          Integer:
-            - U8
-            - "3"
-            - span:
-                lo: 12
-                hi: 15
-      op: Add
-      span:
-        lo: 0
-        hi: 15
-  - Binary:
-      left:
-        Binary:
-          left:
-            Literal:
-              Integer:
-                - U8
-                - "1"
-                - span:
-                    lo: 0
-                    hi: 3
-          right:
-            Literal:
-              Integer:
-                - U8
-                - "2"
-                - span:
-                    lo: 6
-                    hi: 9
-          op: Mul
-          span:
-            lo: 0
-            hi: 9
-      right:
-        Binary:
-          left:
-            Literal:
-              Integer:
-                - U8
-                - "3"
-                - span:
-                    lo: 12
-                    hi: 15
-          right:
-            Literal:
-              Integer:
-                - U8
-                - "4"
-                - span:
-                    lo: 18
-                    hi: 21
-          op: Mul
-          span:
-            lo: 12
-            hi: 21
-      op: Add
-      span:
-        lo: 0
-        hi: 21
-  - Binary:
-      left:
-        Binary:
-          left:
-            Literal:
-              Integer:
-                - U8
-                - "1"
-                - span:
-                    lo: 0
-                    hi: 3
-          right:
-            Literal:
-              Integer:
-                - U8
-                - "2"
-                - span:
-                    lo: 6
-                    hi: 9
-          op: Add
-          span:
-            lo: 0
-            hi: 9
-      right:
-        Literal:
-          Integer:
-            - U8
-            - "3"
-            - span:
-                lo: 12
-                hi: 15
-      op: Sub
-      span:
-        lo: 0
-        hi: 15
-  - Binary:
-      left:
-        Binary:
-          left:
-            Binary:
-              left:
-                Literal:
-                  Integer:
-                    - U8
-                    - "1"
-                    - span:
-                        lo: 0
-                        hi: 3
-              right:
-                Literal:
-                  Integer:
-                    - U8
-                    - "2"
-                    - span:
-                        lo: 6
-                        hi: 9
-              op: Mul
-              span:
-                lo: 0
-                hi: 9
-          right:
-            Binary:
-              left:
-                Literal:
-                  Integer:
-                    - U8
-                    - "3"
-                    - span:
-                        lo: 12
-                        hi: 15
-              right:
-                Literal:
-                  Integer:
-                    - U8
-                    - "4"
-                    - span:
-                        lo: 18
-                        hi: 21
-              op: Mul
-              span:
-                lo: 12
-                hi: 21
-          op: Add
-          span:
-            lo: 0
-            hi: 21
-      right:
-        Binary:
-          left:
-            Literal:
-              Integer:
-                - U8
-                - "5"
-                - span:
-                    lo: 24
-                    hi: 27
-          right:
-            Literal:
-              Integer:
-                - U8
-                - "6"
-                - span:
-                    lo: 30
-                    hi: 33
-          op: Mul
-          span:
-            lo: 24
-            hi: 33
-      op: Sub
-      span:
-        lo: 0
-        hi: 33
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-              op: Add
-              span:
-                lo: 2
-                hi: 10
-          op: Negate
-          span:
-            lo: 1
-            hi: 10
-      op: Not
-      span:
-        lo: 0
-        hi: 10
-  - Binary:
-      left:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
-              op: Add
-              span:
-                lo: 0
-                hi: 8
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
-          op: Add
-          span:
-            lo: 0
-            hi: 15
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":20,\\\"hi\\\":21}\"}"
-      op: Add
-      span:
-        lo: 0
-        hi: 22
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
-          op: Add
-          span:
-            lo: 1
-            hi: 9
-      op: Negate
-      span:
-        lo: 0
-        hi: 9
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Negate
-          span:
-            lo: 1
-            hi: 3
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
-      op: Add
-      span:
-        lo: 1
-        hi: 11
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-          op: Add
-          span:
-            lo: 2
-            hi: 10
-      op: Negate
-      span:
-        lo: 0
-        hi: 10
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-              op: Add
-              span:
-                lo: 2
-                hi: 10
-          op: Negate
-          span:
-            lo: 1
-            hi: 10
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
-      op: Add
-      span:
-        lo: 1
-        hi: 18
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
-          op: Add
-          span:
-            lo: 1
-            hi: 9
-      op: Not
-      span:
-        lo: 0
-        hi: 9
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Not
-          span:
-            lo: 1
-            hi: 3
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
-      op: Add
-      span:
-        lo: 1
-        hi: 11
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-          op: Add
-          span:
-            lo: 2
-            hi: 10
-      op: Not
-      span:
-        lo: 0
-        hi: 10
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-              op: Add
-              span:
-                lo: 2
-                hi: 10
-          op: Not
-          span:
-            lo: 1
-            hi: 10
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
-      op: Add
-      span:
-        lo: 1
-        hi: 18
-  - Binary:
-      left:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
-              op: Add
-              span:
-                lo: 1
-                hi: 9
-          right:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":13}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":18,\\\"hi\\\":19}\"}"
-              op: Add
-              span:
-                lo: 12
-                hi: 20
-          op: Add
-          span:
-            lo: 1
-            hi: 20
-      right:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":26,\\\"hi\\\":27}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":32,\\\"hi\\\":33}\"}"
-              op: Add
-              span:
-                lo: 26
-                hi: 34
-          right:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":37,\\\"hi\\\":38}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":43,\\\"hi\\\":44}\"}"
-              op: Add
-              span:
-                lo: 37
-                hi: 45
-          op: Add
-          span:
-            lo: 26
-            hi: 45
-      op: Add
-      span:
-        lo: 1
-        hi: 46
diff --git a/tests/expectations/tests/parser/expression/binary/add_wrapped.out b/tests/expectations/tests/parser/expression/binary/add_wrapped.out
deleted file mode 100644
index c5c7cb64ba..0000000000
--- a/tests/expectations/tests/parser/expression/binary/add_wrapped.out
+++ /dev/null
@@ -1,243 +0,0 @@
----
-namespace: ParseExpression
-expectation: Pass
-outputs:
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
-              op: AddWrapped
-              span:
-                lo: 2
-                hi: 18
-          op: Negate
-          span:
-            lo: 1
-            hi: 18
-      op: Not
-      span:
-        lo: 0
-        hi: 18
-  - Binary:
-      left:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":14,\\\"hi\\\":15}\"}"
-              op: AddWrapped
-              span:
-                lo: 0
-                hi: 16
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":29,\\\"hi\\\":30}\"}"
-          op: AddWrapped
-          span:
-            lo: 0
-            hi: 31
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":44,\\\"hi\\\":45}\"}"
-      op: AddWrapped
-      span:
-        lo: 0
-        hi: 46
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
-          op: AddWrapped
-          span:
-            lo: 1
-            hi: 17
-      op: Negate
-      span:
-        lo: 0
-        hi: 17
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Negate
-          span:
-            lo: 1
-            hi: 3
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":17,\\\"hi\\\":18}\"}"
-      op: AddWrapped
-      span:
-        lo: 1
-        hi: 19
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
-          op: AddWrapped
-          span:
-            lo: 2
-            hi: 18
-      op: Negate
-      span:
-        lo: 0
-        hi: 18
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
-              op: AddWrapped
-              span:
-                lo: 2
-                hi: 18
-          op: Negate
-          span:
-            lo: 1
-            hi: 18
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":32,\\\"hi\\\":33}\"}"
-      op: AddWrapped
-      span:
-        lo: 1
-        hi: 34
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
-          op: AddWrapped
-          span:
-            lo: 1
-            hi: 17
-      op: Not
-      span:
-        lo: 0
-        hi: 17
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Not
-          span:
-            lo: 1
-            hi: 3
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":17,\\\"hi\\\":18}\"}"
-      op: AddWrapped
-      span:
-        lo: 1
-        hi: 19
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
-          op: AddWrapped
-          span:
-            lo: 2
-            hi: 18
-      op: Not
-      span:
-        lo: 0
-        hi: 18
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
-              op: AddWrapped
-              span:
-                lo: 2
-                hi: 18
-          op: Not
-          span:
-            lo: 1
-            hi: 18
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":32,\\\"hi\\\":33}\"}"
-      op: AddWrapped
-      span:
-        lo: 1
-        hi: 34
-  - Binary:
-      left:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
-              op: AddWrapped
-              span:
-                lo: 1
-                hi: 17
-          right:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":20,\\\"hi\\\":21}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":34,\\\"hi\\\":35}\"}"
-              op: AddWrapped
-              span:
-                lo: 20
-                hi: 36
-          op: Add
-          span:
-            lo: 1
-            hi: 36
-      right:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":50,\\\"hi\\\":51}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":64,\\\"hi\\\":65}\"}"
-              op: AddWrapped
-              span:
-                lo: 50
-                hi: 66
-          right:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":69,\\\"hi\\\":70}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":83,\\\"hi\\\":84}\"}"
-              op: AddWrapped
-              span:
-                lo: 69
-                hi: 85
-          op: Add
-          span:
-            lo: 50
-            hi: 85
-      op: AddWrapped
-      span:
-        lo: 1
-        hi: 86
diff --git a/tests/expectations/tests/parser/expression/binary/and.out b/tests/expectations/tests/parser/expression/binary/and.out
deleted file mode 100644
index 80c098ae8b..0000000000
--- a/tests/expectations/tests/parser/expression/binary/and.out
+++ /dev/null
@@ -1,313 +0,0 @@
----
-namespace: ParseExpression
-expectation: Pass
-outputs:
-  - Binary:
-      left:
-        Literal:
-          Boolean:
-            - true
-            - span:
-                lo: 0
-                hi: 4
-      right:
-        Literal:
-          Boolean:
-            - false
-            - span:
-                lo: 8
-                hi: 13
-      op: And
-      span:
-        lo: 0
-        hi: 13
-  - Binary:
-      left:
-        Literal:
-          Boolean:
-            - false
-            - span:
-                lo: 0
-                hi: 5
-      right:
-        Literal:
-          Boolean:
-            - true
-            - span:
-                lo: 7
-                hi: 11
-      op: And
-      span:
-        lo: 0
-        hi: 11
-  - Binary:
-      left:
-        Binary:
-          left:
-            Literal:
-              Boolean:
-                - true
-                - span:
-                    lo: 0
-                    hi: 4
-          right:
-            Literal:
-              Boolean:
-                - false
-                - span:
-                    lo: 6
-                    hi: 11
-          op: And
-          span:
-            lo: 0
-            hi: 11
-      right:
-        Literal:
-          Boolean:
-            - true
-            - span:
-                lo: 13
-                hi: 17
-      op: And
-      span:
-        lo: 0
-        hi: 17
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-              op: BitwiseAnd
-              span:
-                lo: 2
-                hi: 10
-          op: Negate
-          span:
-            lo: 1
-            hi: 10
-      op: Not
-      span:
-        lo: 0
-        hi: 10
-  - Binary:
-      left:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
-              op: BitwiseAnd
-              span:
-                lo: 0
-                hi: 8
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
-          op: BitwiseAnd
-          span:
-            lo: 0
-            hi: 15
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":20,\\\"hi\\\":21}\"}"
-      op: BitwiseAnd
-      span:
-        lo: 0
-        hi: 22
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
-          op: BitwiseAnd
-          span:
-            lo: 1
-            hi: 9
-      op: Negate
-      span:
-        lo: 0
-        hi: 9
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Negate
-          span:
-            lo: 1
-            hi: 3
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
-      op: BitwiseAnd
-      span:
-        lo: 1
-        hi: 11
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-          op: BitwiseAnd
-          span:
-            lo: 2
-            hi: 10
-      op: Negate
-      span:
-        lo: 0
-        hi: 10
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-              op: BitwiseAnd
-              span:
-                lo: 2
-                hi: 10
-          op: Negate
-          span:
-            lo: 1
-            hi: 10
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
-      op: BitwiseAnd
-      span:
-        lo: 1
-        hi: 18
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
-          op: BitwiseAnd
-          span:
-            lo: 1
-            hi: 9
-      op: Not
-      span:
-        lo: 0
-        hi: 9
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Not
-          span:
-            lo: 1
-            hi: 3
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
-      op: BitwiseAnd
-      span:
-        lo: 1
-        hi: 11
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-          op: BitwiseAnd
-          span:
-            lo: 2
-            hi: 10
-      op: Not
-      span:
-        lo: 0
-        hi: 10
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-              op: BitwiseAnd
-              span:
-                lo: 2
-                hi: 10
-          op: Not
-          span:
-            lo: 1
-            hi: 10
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
-      op: BitwiseAnd
-      span:
-        lo: 1
-        hi: 18
-  - Binary:
-      left:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
-              op: BitwiseAnd
-              span:
-                lo: 1
-                hi: 9
-          right:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":13}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":18,\\\"hi\\\":19}\"}"
-              op: BitwiseAnd
-              span:
-                lo: 12
-                hi: 20
-          op: Add
-          span:
-            lo: 1
-            hi: 20
-      right:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":26,\\\"hi\\\":27}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":32,\\\"hi\\\":33}\"}"
-              op: BitwiseAnd
-              span:
-                lo: 26
-                hi: 34
-          right:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":37,\\\"hi\\\":38}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":43,\\\"hi\\\":44}\"}"
-              op: BitwiseAnd
-              span:
-                lo: 37
-                hi: 45
-          op: Add
-          span:
-            lo: 26
-            hi: 45
-      op: BitwiseAnd
-      span:
-        lo: 1
-        hi: 46
diff --git a/tests/expectations/tests/parser/expression/binary/bit_and.out b/tests/expectations/tests/parser/expression/binary/bit_and.out
deleted file mode 100644
index 28816988e9..0000000000
--- a/tests/expectations/tests/parser/expression/binary/bit_and.out
+++ /dev/null
@@ -1,481 +0,0 @@
----
-namespace: ParseExpression
-expectation: Pass
-outputs:
-  - Binary:
-      left:
-        Literal:
-          Integer:
-            - U8
-            - "1"
-            - span:
-                lo: 0
-                hi: 3
-      right:
-        Literal:
-          Integer:
-            - U8
-            - "1"
-            - span:
-                lo: 6
-                hi: 9
-      op: BitwiseAnd
-      span:
-        lo: 0
-        hi: 9
-  - Binary:
-      left:
-        Literal:
-          Integer:
-            - U8
-            - "2"
-            - span:
-                lo: 0
-                hi: 3
-      right:
-        Literal:
-          Integer:
-            - U8
-            - "3"
-            - span:
-                lo: 4
-                hi: 7
-      op: BitwiseAnd
-      span:
-        lo: 0
-        hi: 7
-  - Binary:
-      left:
-        Binary:
-          left:
-            Literal:
-              Integer:
-                - U8
-                - "1"
-                - span:
-                    lo: 0
-                    hi: 3
-          right:
-            Literal:
-              Integer:
-                - U8
-                - "2"
-                - span:
-                    lo: 6
-                    hi: 9
-          op: BitwiseAnd
-          span:
-            lo: 0
-            hi: 9
-      right:
-        Literal:
-          Integer:
-            - U8
-            - "3"
-            - span:
-                lo: 12
-                hi: 15
-      op: BitwiseAnd
-      span:
-        lo: 0
-        hi: 15
-  - Binary:
-      left:
-        Binary:
-          left:
-            Literal:
-              Integer:
-                - U8
-                - "1"
-                - span:
-                    lo: 0
-                    hi: 3
-          right:
-            Binary:
-              left:
-                Literal:
-                  Integer:
-                    - U8
-                    - "2"
-                    - span:
-                        lo: 6
-                        hi: 9
-              right:
-                Literal:
-                  Integer:
-                    - U8
-                    - "3"
-                    - span:
-                        lo: 12
-                        hi: 15
-              op: BitwiseAnd
-              span:
-                lo: 6
-                hi: 15
-          op: BitwiseOr
-          span:
-            lo: 0
-            hi: 15
-      right:
-        Literal:
-          Integer:
-            - U8
-            - "4"
-            - span:
-                lo: 18
-                hi: 21
-      op: BitwiseOr
-      span:
-        lo: 0
-        hi: 21
-  - Binary:
-      left:
-        Binary:
-          left:
-            Literal:
-              Integer:
-                - U8
-                - "1"
-                - span:
-                    lo: 0
-                    hi: 3
-          right:
-            Literal:
-              Integer:
-                - U8
-                - "2"
-                - span:
-                    lo: 6
-                    hi: 9
-          op: BitwiseAnd
-          span:
-            lo: 0
-            hi: 9
-      right:
-        Literal:
-          Integer:
-            - U8
-            - "3"
-            - span:
-                lo: 12
-                hi: 15
-      op: BitwiseAnd
-      span:
-        lo: 0
-        hi: 15
-  - Binary:
-      left:
-        Binary:
-          left:
-            Binary:
-              left:
-                Literal:
-                  Integer:
-                    - U8
-                    - "1"
-                    - span:
-                        lo: 0
-                        hi: 3
-              right:
-                Binary:
-                  left:
-                    Literal:
-                      Integer:
-                        - U8
-                        - "2"
-                        - span:
-                            lo: 6
-                            hi: 9
-                  right:
-                    Literal:
-                      Integer:
-                        - U8
-                        - "3"
-                        - span:
-                            lo: 12
-                            hi: 15
-                  op: BitwiseAnd
-                  span:
-                    lo: 6
-                    hi: 15
-              op: BitwiseOr
-              span:
-                lo: 0
-                hi: 15
-          right:
-            Binary:
-              left:
-                Literal:
-                  Integer:
-                    - U8
-                    - "4"
-                    - span:
-                        lo: 18
-                        hi: 21
-              right:
-                Literal:
-                  Integer:
-                    - U8
-                    - "5"
-                    - span:
-                        lo: 24
-                        hi: 27
-              op: BitwiseAnd
-              span:
-                lo: 18
-                hi: 27
-          op: BitwiseOr
-          span:
-            lo: 0
-            hi: 27
-      right:
-        Literal:
-          Integer:
-            - U8
-            - "6"
-            - span:
-                lo: 30
-                hi: 33
-      op: BitwiseOr
-      span:
-        lo: 0
-        hi: 33
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-              op: BitwiseAnd
-              span:
-                lo: 2
-                hi: 10
-          op: Negate
-          span:
-            lo: 1
-            hi: 10
-      op: Not
-      span:
-        lo: 0
-        hi: 10
-  - Binary:
-      left:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
-              op: BitwiseAnd
-              span:
-                lo: 0
-                hi: 8
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
-          op: BitwiseAnd
-          span:
-            lo: 0
-            hi: 15
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":20,\\\"hi\\\":21}\"}"
-      op: BitwiseAnd
-      span:
-        lo: 0
-        hi: 22
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
-          op: BitwiseAnd
-          span:
-            lo: 1
-            hi: 9
-      op: Negate
-      span:
-        lo: 0
-        hi: 9
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Negate
-          span:
-            lo: 1
-            hi: 3
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
-      op: BitwiseAnd
-      span:
-        lo: 1
-        hi: 11
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-          op: BitwiseAnd
-          span:
-            lo: 2
-            hi: 10
-      op: Negate
-      span:
-        lo: 0
-        hi: 10
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-              op: BitwiseAnd
-              span:
-                lo: 2
-                hi: 10
-          op: Negate
-          span:
-            lo: 1
-            hi: 10
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
-      op: BitwiseAnd
-      span:
-        lo: 1
-        hi: 18
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
-          op: BitwiseAnd
-          span:
-            lo: 1
-            hi: 9
-      op: Not
-      span:
-        lo: 0
-        hi: 9
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Not
-          span:
-            lo: 1
-            hi: 3
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
-      op: BitwiseAnd
-      span:
-        lo: 1
-        hi: 11
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-          op: BitwiseAnd
-          span:
-            lo: 2
-            hi: 10
-      op: Not
-      span:
-        lo: 0
-        hi: 10
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-              op: BitwiseAnd
-              span:
-                lo: 2
-                hi: 10
-          op: Not
-          span:
-            lo: 1
-            hi: 10
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
-      op: BitwiseAnd
-      span:
-        lo: 1
-        hi: 18
-  - Binary:
-      left:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
-              op: BitwiseAnd
-              span:
-                lo: 1
-                hi: 9
-          right:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":13}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":18,\\\"hi\\\":19}\"}"
-              op: BitwiseAnd
-              span:
-                lo: 12
-                hi: 20
-          op: BitwiseAnd
-          span:
-            lo: 1
-            hi: 20
-      right:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":26,\\\"hi\\\":27}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":32,\\\"hi\\\":33}\"}"
-              op: BitwiseAnd
-              span:
-                lo: 26
-                hi: 34
-          right:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":37,\\\"hi\\\":38}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":43,\\\"hi\\\":44}\"}"
-              op: BitwiseAnd
-              span:
-                lo: 37
-                hi: 45
-          op: BitwiseAnd
-          span:
-            lo: 26
-            hi: 45
-      op: BitwiseAnd
-      span:
-        lo: 1
-        hi: 46
diff --git a/tests/expectations/tests/parser/expression/binary/bit_or.out b/tests/expectations/tests/parser/expression/binary/bit_or.out
deleted file mode 100644
index 2717872d8e..0000000000
--- a/tests/expectations/tests/parser/expression/binary/bit_or.out
+++ /dev/null
@@ -1,481 +0,0 @@
----
-namespace: ParseExpression
-expectation: Pass
-outputs:
-  - Binary:
-      left:
-        Literal:
-          Integer:
-            - U8
-            - "1"
-            - span:
-                lo: 0
-                hi: 3
-      right:
-        Literal:
-          Integer:
-            - U8
-            - "1"
-            - span:
-                lo: 6
-                hi: 9
-      op: BitwiseOr
-      span:
-        lo: 0
-        hi: 9
-  - Binary:
-      left:
-        Literal:
-          Integer:
-            - U8
-            - "2"
-            - span:
-                lo: 0
-                hi: 3
-      right:
-        Literal:
-          Integer:
-            - U8
-            - "3"
-            - span:
-                lo: 4
-                hi: 7
-      op: BitwiseOr
-      span:
-        lo: 0
-        hi: 7
-  - Binary:
-      left:
-        Binary:
-          left:
-            Literal:
-              Integer:
-                - U8
-                - "1"
-                - span:
-                    lo: 0
-                    hi: 3
-          right:
-            Literal:
-              Integer:
-                - U8
-                - "2"
-                - span:
-                    lo: 6
-                    hi: 9
-          op: BitwiseOr
-          span:
-            lo: 0
-            hi: 9
-      right:
-        Literal:
-          Integer:
-            - U8
-            - "3"
-            - span:
-                lo: 12
-                hi: 15
-      op: BitwiseOr
-      span:
-        lo: 0
-        hi: 15
-  - Binary:
-      left:
-        Binary:
-          left:
-            Literal:
-              Integer:
-                - U8
-                - "1"
-                - span:
-                    lo: 0
-                    hi: 3
-          right:
-            Binary:
-              left:
-                Literal:
-                  Integer:
-                    - U8
-                    - "2"
-                    - span:
-                        lo: 6
-                        hi: 9
-              right:
-                Literal:
-                  Integer:
-                    - U8
-                    - "3"
-                    - span:
-                        lo: 12
-                        hi: 15
-              op: BitwiseOr
-              span:
-                lo: 6
-                hi: 15
-          op: Xor
-          span:
-            lo: 0
-            hi: 15
-      right:
-        Literal:
-          Integer:
-            - U8
-            - "4"
-            - span:
-                lo: 18
-                hi: 21
-      op: Xor
-      span:
-        lo: 0
-        hi: 21
-  - Binary:
-      left:
-        Binary:
-          left:
-            Literal:
-              Integer:
-                - U8
-                - "1"
-                - span:
-                    lo: 0
-                    hi: 3
-          right:
-            Literal:
-              Integer:
-                - U8
-                - "2"
-                - span:
-                    lo: 6
-                    hi: 9
-          op: BitwiseOr
-          span:
-            lo: 0
-            hi: 9
-      right:
-        Literal:
-          Integer:
-            - U8
-            - "3"
-            - span:
-                lo: 12
-                hi: 15
-      op: BitwiseOr
-      span:
-        lo: 0
-        hi: 15
-  - Binary:
-      left:
-        Binary:
-          left:
-            Binary:
-              left:
-                Literal:
-                  Integer:
-                    - U8
-                    - "1"
-                    - span:
-                        lo: 0
-                        hi: 3
-              right:
-                Binary:
-                  left:
-                    Literal:
-                      Integer:
-                        - U8
-                        - "2"
-                        - span:
-                            lo: 6
-                            hi: 9
-                  right:
-                    Literal:
-                      Integer:
-                        - U8
-                        - "3"
-                        - span:
-                            lo: 12
-                            hi: 15
-                  op: BitwiseOr
-                  span:
-                    lo: 6
-                    hi: 15
-              op: Xor
-              span:
-                lo: 0
-                hi: 15
-          right:
-            Binary:
-              left:
-                Literal:
-                  Integer:
-                    - U8
-                    - "4"
-                    - span:
-                        lo: 18
-                        hi: 21
-              right:
-                Literal:
-                  Integer:
-                    - U8
-                    - "5"
-                    - span:
-                        lo: 24
-                        hi: 27
-              op: BitwiseOr
-              span:
-                lo: 18
-                hi: 27
-          op: Xor
-          span:
-            lo: 0
-            hi: 27
-      right:
-        Literal:
-          Integer:
-            - U8
-            - "6"
-            - span:
-                lo: 30
-                hi: 33
-      op: Xor
-      span:
-        lo: 0
-        hi: 33
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
-              op: BitwiseOr
-              span:
-                lo: 2
-                hi: 9
-          op: Negate
-          span:
-            lo: 1
-            hi: 9
-      op: Not
-      span:
-        lo: 0
-        hi: 9
-  - Binary:
-      left:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":5,\\\"hi\\\":6}\"}"
-              op: BitwiseOr
-              span:
-                lo: 0
-                hi: 7
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":11,\\\"hi\\\":12}\"}"
-          op: BitwiseOr
-          span:
-            lo: 0
-            hi: 13
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":17,\\\"hi\\\":18}\"}"
-      op: BitwiseOr
-      span:
-        lo: 0
-        hi: 19
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
-          op: BitwiseOr
-          span:
-            lo: 1
-            hi: 8
-      op: Negate
-      span:
-        lo: 0
-        hi: 8
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Negate
-          span:
-            lo: 1
-            hi: 3
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-      op: BitwiseOr
-      span:
-        lo: 1
-        hi: 10
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
-          op: BitwiseOr
-          span:
-            lo: 2
-            hi: 9
-      op: Negate
-      span:
-        lo: 0
-        hi: 9
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
-              op: BitwiseOr
-              span:
-                lo: 2
-                hi: 9
-          op: Negate
-          span:
-            lo: 1
-            hi: 9
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":14,\\\"hi\\\":15}\"}"
-      op: BitwiseOr
-      span:
-        lo: 1
-        hi: 16
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
-          op: BitwiseOr
-          span:
-            lo: 1
-            hi: 8
-      op: Not
-      span:
-        lo: 0
-        hi: 8
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Not
-          span:
-            lo: 1
-            hi: 3
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-      op: BitwiseOr
-      span:
-        lo: 1
-        hi: 10
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
-          op: BitwiseOr
-          span:
-            lo: 2
-            hi: 9
-      op: Not
-      span:
-        lo: 0
-        hi: 9
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
-              op: BitwiseOr
-              span:
-                lo: 2
-                hi: 9
-          op: Not
-          span:
-            lo: 1
-            hi: 9
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":14,\\\"hi\\\":15}\"}"
-      op: BitwiseOr
-      span:
-        lo: 1
-        hi: 16
-  - Binary:
-      left:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
-              op: BitwiseOr
-              span:
-                lo: 1
-                hi: 8
-          right:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":11,\\\"hi\\\":12}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
-              op: BitwiseOr
-              span:
-                lo: 11
-                hi: 18
-          op: BitwiseOr
-          span:
-            lo: 1
-            hi: 18
-      right:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":23,\\\"hi\\\":24}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":28,\\\"hi\\\":29}\"}"
-              op: BitwiseOr
-              span:
-                lo: 23
-                hi: 30
-          right:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":33,\\\"hi\\\":34}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":38,\\\"hi\\\":39}\"}"
-              op: BitwiseOr
-              span:
-                lo: 33
-                hi: 40
-          op: BitwiseOr
-          span:
-            lo: 23
-            hi: 40
-      op: BitwiseOr
-      span:
-        lo: 1
-        hi: 41
diff --git a/tests/expectations/tests/parser/expression/binary/bit_xor.out b/tests/expectations/tests/parser/expression/binary/bit_xor.out
deleted file mode 100644
index 92b087105d..0000000000
--- a/tests/expectations/tests/parser/expression/binary/bit_xor.out
+++ /dev/null
@@ -1,481 +0,0 @@
----
-namespace: ParseExpression
-expectation: Pass
-outputs:
-  - Binary:
-      left:
-        Literal:
-          Integer:
-            - U8
-            - "1"
-            - span:
-                lo: 0
-                hi: 3
-      right:
-        Literal:
-          Integer:
-            - U8
-            - "1"
-            - span:
-                lo: 6
-                hi: 9
-      op: Xor
-      span:
-        lo: 0
-        hi: 9
-  - Binary:
-      left:
-        Literal:
-          Integer:
-            - U8
-            - "2"
-            - span:
-                lo: 0
-                hi: 3
-      right:
-        Literal:
-          Integer:
-            - U8
-            - "3"
-            - span:
-                lo: 4
-                hi: 7
-      op: Xor
-      span:
-        lo: 0
-        hi: 7
-  - Binary:
-      left:
-        Binary:
-          left:
-            Literal:
-              Integer:
-                - U8
-                - "1"
-                - span:
-                    lo: 0
-                    hi: 3
-          right:
-            Literal:
-              Integer:
-                - U8
-                - "2"
-                - span:
-                    lo: 6
-                    hi: 9
-          op: Xor
-          span:
-            lo: 0
-            hi: 9
-      right:
-        Literal:
-          Integer:
-            - U8
-            - "3"
-            - span:
-                lo: 12
-                hi: 15
-      op: Xor
-      span:
-        lo: 0
-        hi: 15
-  - Binary:
-      left:
-        Binary:
-          left:
-            Literal:
-              Integer:
-                - U8
-                - "1"
-                - span:
-                    lo: 0
-                    hi: 3
-          right:
-            Literal:
-              Integer:
-                - U8
-                - "2"
-                - span:
-                    lo: 6
-                    hi: 9
-          op: BitwiseAnd
-          span:
-            lo: 0
-            hi: 9
-      right:
-        Binary:
-          left:
-            Literal:
-              Integer:
-                - U8
-                - "3"
-                - span:
-                    lo: 12
-                    hi: 15
-          right:
-            Literal:
-              Integer:
-                - U8
-                - "4"
-                - span:
-                    lo: 18
-                    hi: 21
-          op: BitwiseAnd
-          span:
-            lo: 12
-            hi: 21
-      op: Xor
-      span:
-        lo: 0
-        hi: 21
-  - Binary:
-      left:
-        Binary:
-          left:
-            Literal:
-              Integer:
-                - U8
-                - "1"
-                - span:
-                    lo: 0
-                    hi: 3
-          right:
-            Literal:
-              Integer:
-                - U8
-                - "2"
-                - span:
-                    lo: 6
-                    hi: 9
-          op: Xor
-          span:
-            lo: 0
-            hi: 9
-      right:
-        Literal:
-          Integer:
-            - U8
-            - "3"
-            - span:
-                lo: 12
-                hi: 15
-      op: Xor
-      span:
-        lo: 0
-        hi: 15
-  - Binary:
-      left:
-        Binary:
-          left:
-            Binary:
-              left:
-                Literal:
-                  Integer:
-                    - U8
-                    - "1"
-                    - span:
-                        lo: 0
-                        hi: 3
-              right:
-                Literal:
-                  Integer:
-                    - U8
-                    - "2"
-                    - span:
-                        lo: 6
-                        hi: 9
-              op: BitwiseAnd
-              span:
-                lo: 0
-                hi: 9
-          right:
-            Binary:
-              left:
-                Literal:
-                  Integer:
-                    - U8
-                    - "3"
-                    - span:
-                        lo: 12
-                        hi: 15
-              right:
-                Literal:
-                  Integer:
-                    - U8
-                    - "4"
-                    - span:
-                        lo: 18
-                        hi: 21
-              op: BitwiseAnd
-              span:
-                lo: 12
-                hi: 21
-          op: Xor
-          span:
-            lo: 0
-            hi: 21
-      right:
-        Binary:
-          left:
-            Literal:
-              Integer:
-                - U8
-                - "5"
-                - span:
-                    lo: 24
-                    hi: 27
-          right:
-            Literal:
-              Integer:
-                - U8
-                - "6"
-                - span:
-                    lo: 30
-                    hi: 33
-          op: BitwiseAnd
-          span:
-            lo: 24
-            hi: 33
-      op: Xor
-      span:
-        lo: 0
-        hi: 33
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-              op: Xor
-              span:
-                lo: 2
-                hi: 10
-          op: Negate
-          span:
-            lo: 1
-            hi: 10
-      op: Not
-      span:
-        lo: 0
-        hi: 10
-  - Binary:
-      left:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
-              op: Xor
-              span:
-                lo: 0
-                hi: 8
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
-          op: Xor
-          span:
-            lo: 0
-            hi: 15
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":20,\\\"hi\\\":21}\"}"
-      op: Xor
-      span:
-        lo: 0
-        hi: 22
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
-          op: Xor
-          span:
-            lo: 1
-            hi: 9
-      op: Negate
-      span:
-        lo: 0
-        hi: 9
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Negate
-          span:
-            lo: 1
-            hi: 3
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
-      op: Xor
-      span:
-        lo: 1
-        hi: 11
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-          op: Xor
-          span:
-            lo: 2
-            hi: 10
-      op: Negate
-      span:
-        lo: 0
-        hi: 10
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-              op: Xor
-              span:
-                lo: 2
-                hi: 10
-          op: Negate
-          span:
-            lo: 1
-            hi: 10
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
-      op: Xor
-      span:
-        lo: 1
-        hi: 18
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
-          op: Xor
-          span:
-            lo: 1
-            hi: 9
-      op: Not
-      span:
-        lo: 0
-        hi: 9
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Not
-          span:
-            lo: 1
-            hi: 3
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
-      op: Xor
-      span:
-        lo: 1
-        hi: 11
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-          op: Xor
-          span:
-            lo: 2
-            hi: 10
-      op: Not
-      span:
-        lo: 0
-        hi: 10
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-              op: Xor
-              span:
-                lo: 2
-                hi: 10
-          op: Not
-          span:
-            lo: 1
-            hi: 10
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
-      op: Xor
-      span:
-        lo: 1
-        hi: 18
-  - Binary:
-      left:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
-              op: Xor
-              span:
-                lo: 1
-                hi: 9
-          right:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":13}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":18,\\\"hi\\\":19}\"}"
-              op: Xor
-              span:
-                lo: 12
-                hi: 20
-          op: Xor
-          span:
-            lo: 1
-            hi: 20
-      right:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":26,\\\"hi\\\":27}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":32,\\\"hi\\\":33}\"}"
-              op: Xor
-              span:
-                lo: 26
-                hi: 34
-          right:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":37,\\\"hi\\\":38}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":43,\\\"hi\\\":44}\"}"
-              op: Xor
-              span:
-                lo: 37
-                hi: 45
-          op: Xor
-          span:
-            lo: 26
-            hi: 45
-      op: Xor
-      span:
-        lo: 1
-        hi: 46
diff --git a/tests/expectations/tests/parser/expression/binary/div.out b/tests/expectations/tests/parser/expression/binary/div.out
deleted file mode 100644
index 784a4cf719..0000000000
--- a/tests/expectations/tests/parser/expression/binary/div.out
+++ /dev/null
@@ -1,369 +0,0 @@
----
-namespace: ParseExpression
-expectation: Pass
-outputs:
-  - Binary:
-      left:
-        Literal:
-          Integer:
-            - U8
-            - "1"
-            - span:
-                lo: 0
-                hi: 3
-      right:
-        Literal:
-          Integer:
-            - U8
-            - "1"
-            - span:
-                lo: 6
-                hi: 9
-      op: Div
-      span:
-        lo: 0
-        hi: 9
-  - Binary:
-      left:
-        Literal:
-          Integer:
-            - U8
-            - "2"
-            - span:
-                lo: 0
-                hi: 3
-      right:
-        Literal:
-          Integer:
-            - U8
-            - "3"
-            - span:
-                lo: 4
-                hi: 7
-      op: Div
-      span:
-        lo: 0
-        hi: 7
-  - Binary:
-      left:
-        Binary:
-          left:
-            Literal:
-              Integer:
-                - U8
-                - "1"
-                - span:
-                    lo: 0
-                    hi: 3
-          right:
-            Literal:
-              Integer:
-                - U8
-                - "2"
-                - span:
-                    lo: 6
-                    hi: 9
-          op: Div
-          span:
-            lo: 0
-            hi: 9
-      right:
-        Literal:
-          Integer:
-            - U8
-            - "3"
-            - span:
-                lo: 12
-                hi: 15
-      op: Div
-      span:
-        lo: 0
-        hi: 15
-  - Binary:
-      left:
-        Binary:
-          left:
-            Literal:
-              Integer:
-                - U8
-                - "1"
-                - span:
-                    lo: 0
-                    hi: 3
-          right:
-            Literal:
-              Integer:
-                - U8
-                - "2"
-                - span:
-                    lo: 7
-                    hi: 10
-          op: Pow
-          span:
-            lo: 0
-            hi: 10
-      right:
-        Binary:
-          left:
-            Literal:
-              Integer:
-                - U8
-                - "3"
-                - span:
-                    lo: 13
-                    hi: 16
-          right:
-            Literal:
-              Integer:
-                - U8
-                - "4"
-                - span:
-                    lo: 20
-                    hi: 23
-          op: Pow
-          span:
-            lo: 13
-            hi: 23
-      op: Div
-      span:
-        lo: 0
-        hi: 23
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-              op: Div
-              span:
-                lo: 2
-                hi: 10
-          op: Negate
-          span:
-            lo: 1
-            hi: 10
-      op: Not
-      span:
-        lo: 0
-        hi: 10
-  - Binary:
-      left:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
-              op: Div
-              span:
-                lo: 0
-                hi: 8
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
-          op: Div
-          span:
-            lo: 0
-            hi: 15
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":20,\\\"hi\\\":21}\"}"
-      op: Div
-      span:
-        lo: 0
-        hi: 22
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
-          op: Div
-          span:
-            lo: 1
-            hi: 9
-      op: Negate
-      span:
-        lo: 0
-        hi: 9
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Negate
-          span:
-            lo: 1
-            hi: 3
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
-      op: Div
-      span:
-        lo: 1
-        hi: 11
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-          op: Div
-          span:
-            lo: 2
-            hi: 10
-      op: Negate
-      span:
-        lo: 0
-        hi: 10
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-              op: Div
-              span:
-                lo: 2
-                hi: 10
-          op: Negate
-          span:
-            lo: 1
-            hi: 10
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
-      op: Div
-      span:
-        lo: 1
-        hi: 18
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
-          op: Div
-          span:
-            lo: 1
-            hi: 9
-      op: Not
-      span:
-        lo: 0
-        hi: 9
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Not
-          span:
-            lo: 1
-            hi: 3
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
-      op: Div
-      span:
-        lo: 1
-        hi: 11
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-          op: Div
-          span:
-            lo: 2
-            hi: 10
-      op: Not
-      span:
-        lo: 0
-        hi: 10
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-              op: Div
-              span:
-                lo: 2
-                hi: 10
-          op: Not
-          span:
-            lo: 1
-            hi: 10
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
-      op: Div
-      span:
-        lo: 1
-        hi: 18
-  - Binary:
-      left:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
-              op: Div
-              span:
-                lo: 1
-                hi: 9
-          right:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":13}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":18,\\\"hi\\\":19}\"}"
-              op: Div
-              span:
-                lo: 12
-                hi: 20
-          op: Div
-          span:
-            lo: 1
-            hi: 20
-      right:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":26,\\\"hi\\\":27}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":32,\\\"hi\\\":33}\"}"
-              op: Div
-              span:
-                lo: 26
-                hi: 34
-          right:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":37,\\\"hi\\\":38}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":43,\\\"hi\\\":44}\"}"
-              op: Div
-              span:
-                lo: 37
-                hi: 45
-          op: Div
-          span:
-            lo: 26
-            hi: 45
-      op: Div
-      span:
-        lo: 1
-        hi: 46
diff --git a/tests/expectations/tests/parser/expression/binary/div_wrapped.out b/tests/expectations/tests/parser/expression/binary/div_wrapped.out
deleted file mode 100644
index f0c2bdfb82..0000000000
--- a/tests/expectations/tests/parser/expression/binary/div_wrapped.out
+++ /dev/null
@@ -1,243 +0,0 @@
----
-namespace: ParseExpression
-expectation: Pass
-outputs:
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-              op: Div
-              span:
-                lo: 2
-                hi: 10
-          op: Negate
-          span:
-            lo: 1
-            hi: 10
-      op: Not
-      span:
-        lo: 0
-        hi: 10
-  - Binary:
-      left:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
-              op: Div
-              span:
-                lo: 0
-                hi: 8
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
-          op: Div
-          span:
-            lo: 0
-            hi: 15
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":20,\\\"hi\\\":21}\"}"
-      op: Div
-      span:
-        lo: 0
-        hi: 22
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
-          op: Div
-          span:
-            lo: 1
-            hi: 9
-      op: Negate
-      span:
-        lo: 0
-        hi: 9
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Negate
-          span:
-            lo: 1
-            hi: 3
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
-      op: Div
-      span:
-        lo: 1
-        hi: 11
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-          op: Div
-          span:
-            lo: 2
-            hi: 10
-      op: Negate
-      span:
-        lo: 0
-        hi: 10
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-              op: Div
-              span:
-                lo: 2
-                hi: 10
-          op: Negate
-          span:
-            lo: 1
-            hi: 10
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
-      op: Div
-      span:
-        lo: 1
-        hi: 18
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
-          op: Div
-          span:
-            lo: 1
-            hi: 9
-      op: Not
-      span:
-        lo: 0
-        hi: 9
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Not
-          span:
-            lo: 1
-            hi: 3
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
-      op: Div
-      span:
-        lo: 1
-        hi: 11
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-          op: Div
-          span:
-            lo: 2
-            hi: 10
-      op: Not
-      span:
-        lo: 0
-        hi: 10
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-              op: Div
-              span:
-                lo: 2
-                hi: 10
-          op: Not
-          span:
-            lo: 1
-            hi: 10
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
-      op: Div
-      span:
-        lo: 1
-        hi: 18
-  - Binary:
-      left:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
-              op: Div
-              span:
-                lo: 1
-                hi: 9
-          right:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":13}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":18,\\\"hi\\\":19}\"}"
-              op: Div
-              span:
-                lo: 12
-                hi: 20
-          op: Div
-          span:
-            lo: 1
-            hi: 20
-      right:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":26,\\\"hi\\\":27}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":32,\\\"hi\\\":33}\"}"
-              op: Div
-              span:
-                lo: 26
-                hi: 34
-          right:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":37,\\\"hi\\\":38}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":43,\\\"hi\\\":44}\"}"
-              op: Div
-              span:
-                lo: 37
-                hi: 45
-          op: Div
-          span:
-            lo: 26
-            hi: 45
-      op: Div
-      span:
-        lo: 1
-        hi: 46
diff --git a/tests/expectations/tests/parser/expression/binary/eq.out b/tests/expectations/tests/parser/expression/binary/eq.out
deleted file mode 100644
index baf16a11b0..0000000000
--- a/tests/expectations/tests/parser/expression/binary/eq.out
+++ /dev/null
@@ -1,439 +0,0 @@
----
-namespace: ParseExpression
-expectation: Pass
-outputs:
-  - Binary:
-      left:
-        Literal:
-          Integer:
-            - U8
-            - "1"
-            - span:
-                lo: 0
-                hi: 3
-      right:
-        Literal:
-          Integer:
-            - U8
-            - "1"
-            - span:
-                lo: 7
-                hi: 10
-      op: Eq
-      span:
-        lo: 0
-        hi: 10
-  - Binary:
-      left:
-        Literal:
-          Integer:
-            - U8
-            - "2"
-            - span:
-                lo: 0
-                hi: 3
-      right:
-        Literal:
-          Integer:
-            - U8
-            - "3"
-            - span:
-                lo: 5
-                hi: 8
-      op: Eq
-      span:
-        lo: 0
-        hi: 8
-  - Binary:
-      left:
-        Binary:
-          left:
-            Literal:
-              Integer:
-                - U8
-                - "1"
-                - span:
-                    lo: 0
-                    hi: 3
-          right:
-            Literal:
-              Integer:
-                - U8
-                - "2"
-                - span:
-                    lo: 6
-                    hi: 9
-          op: Lt
-          span:
-            lo: 0
-            hi: 9
-      right:
-        Binary:
-          left:
-            Literal:
-              Integer:
-                - U8
-                - "3"
-                - span:
-                    lo: 13
-                    hi: 16
-          right:
-            Literal:
-              Integer:
-                - U8
-                - "4"
-                - span:
-                    lo: 19
-                    hi: 22
-          op: Lt
-          span:
-            lo: 13
-            hi: 22
-      op: Eq
-      span:
-        lo: 0
-        hi: 22
-  - Binary:
-      left:
-        Binary:
-          left:
-            Binary:
-              left:
-                Literal:
-                  Integer:
-                    - U8
-                    - "1"
-                    - span:
-                        lo: 0
-                        hi: 3
-              right:
-                Literal:
-                  Integer:
-                    - U8
-                    - "2"
-                    - span:
-                        lo: 6
-                        hi: 9
-              op: Lt
-              span:
-                lo: 0
-                hi: 9
-          right:
-            Binary:
-              left:
-                Literal:
-                  Integer:
-                    - U8
-                    - "3"
-                    - span:
-                        lo: 13
-                        hi: 16
-              right:
-                Literal:
-                  Integer:
-                    - U8
-                    - "4"
-                    - span:
-                        lo: 19
-                        hi: 22
-              op: Lt
-              span:
-                lo: 13
-                hi: 22
-          op: Eq
-          span:
-            lo: 0
-            hi: 22
-      right:
-        Binary:
-          left:
-            Binary:
-              left:
-                Literal:
-                  Integer:
-                    - U8
-                    - "3"
-                    - span:
-                        lo: 26
-                        hi: 29
-              right:
-                Literal:
-                  Integer:
-                    - U8
-                    - "4"
-                    - span:
-                        lo: 32
-                        hi: 35
-              op: Lt
-              span:
-                lo: 26
-                hi: 35
-          right:
-            Binary:
-              left:
-                Literal:
-                  Integer:
-                    - U8
-                    - "5"
-                    - span:
-                        lo: 39
-                        hi: 42
-              right:
-                Literal:
-                  Integer:
-                    - U8
-                    - "6"
-                    - span:
-                        lo: 45
-                        hi: 48
-              op: Lt
-              span:
-                lo: 39
-                hi: 48
-          op: Eq
-          span:
-            lo: 26
-            hi: 48
-      op: And
-      span:
-        lo: 0
-        hi: 48
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
-              op: Eq
-              span:
-                lo: 2
-                hi: 9
-          op: Negate
-          span:
-            lo: 1
-            hi: 9
-      op: Not
-      span:
-        lo: 0
-        hi: 9
-  - Binary:
-      left:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":5,\\\"hi\\\":6}\"}"
-              op: Eq
-              span:
-                lo: 0
-                hi: 7
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":11,\\\"hi\\\":12}\"}"
-          op: Eq
-          span:
-            lo: 0
-            hi: 13
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":17,\\\"hi\\\":18}\"}"
-      op: Eq
-      span:
-        lo: 0
-        hi: 19
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
-          op: Eq
-          span:
-            lo: 1
-            hi: 8
-      op: Negate
-      span:
-        lo: 0
-        hi: 8
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Negate
-          span:
-            lo: 1
-            hi: 3
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-      op: Eq
-      span:
-        lo: 1
-        hi: 10
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
-          op: Eq
-          span:
-            lo: 2
-            hi: 9
-      op: Negate
-      span:
-        lo: 0
-        hi: 9
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
-              op: Eq
-              span:
-                lo: 2
-                hi: 9
-          op: Negate
-          span:
-            lo: 1
-            hi: 9
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":14,\\\"hi\\\":15}\"}"
-      op: Eq
-      span:
-        lo: 1
-        hi: 16
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
-          op: Eq
-          span:
-            lo: 1
-            hi: 8
-      op: Not
-      span:
-        lo: 0
-        hi: 8
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Not
-          span:
-            lo: 1
-            hi: 3
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-      op: Eq
-      span:
-        lo: 1
-        hi: 10
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
-          op: Eq
-          span:
-            lo: 2
-            hi: 9
-      op: Not
-      span:
-        lo: 0
-        hi: 9
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
-              op: Eq
-              span:
-                lo: 2
-                hi: 9
-          op: Not
-          span:
-            lo: 1
-            hi: 9
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":14,\\\"hi\\\":15}\"}"
-      op: Eq
-      span:
-        lo: 1
-        hi: 16
-  - Binary:
-      left:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
-              op: Eq
-              span:
-                lo: 1
-                hi: 8
-          right:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":13}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":17,\\\"hi\\\":18}\"}"
-              op: Eq
-              span:
-                lo: 12
-                hi: 19
-          op: Eq
-          span:
-            lo: 1
-            hi: 19
-      right:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":24,\\\"hi\\\":25}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":29,\\\"hi\\\":30}\"}"
-              op: Eq
-              span:
-                lo: 24
-                hi: 31
-          right:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":35,\\\"hi\\\":36}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":40,\\\"hi\\\":41}\"}"
-              op: Eq
-              span:
-                lo: 35
-                hi: 42
-          op: Eq
-          span:
-            lo: 24
-            hi: 42
-      op: Eq
-      span:
-        lo: 1
-        hi: 43
diff --git a/tests/expectations/tests/parser/expression/binary/eq_fail.out b/tests/expectations/tests/parser/expression/binary/eq_fail.out
deleted file mode 100644
index 409481cfe9..0000000000
--- a/tests/expectations/tests/parser/expression/binary/eq_fail.out
+++ /dev/null
@@ -1,5 +0,0 @@
----
-namespace: ParseExpression
-expectation: Fail
-outputs:
-  - "Error [EPAR0370017]: Could not parse the implicit value: 1.\n    --> test:1:1\n     |\n   1 | 1 == 2 == 3\n     | ^"
diff --git a/tests/expectations/tests/parser/expression/binary/ge.out b/tests/expectations/tests/parser/expression/binary/ge.out
deleted file mode 100644
index ab8e053aef..0000000000
--- a/tests/expectations/tests/parser/expression/binary/ge.out
+++ /dev/null
@@ -1,334 +0,0 @@
----
-namespace: ParseExpression
-expectation: Pass
-outputs:
-  - Binary:
-      left:
-        Literal:
-          Integer:
-            - U8
-            - "1"
-            - span:
-                lo: 0
-                hi: 3
-      right:
-        Literal:
-          Integer:
-            - U8
-            - "1"
-            - span:
-                lo: 7
-                hi: 10
-      op: Gte
-      span:
-        lo: 0
-        hi: 10
-  - Binary:
-      left:
-        Literal:
-          Integer:
-            - U8
-            - "2"
-            - span:
-                lo: 0
-                hi: 3
-      right:
-        Literal:
-          Integer:
-            - U8
-            - "3"
-            - span:
-                lo: 7
-                hi: 10
-      op: Gte
-      span:
-        lo: 0
-        hi: 10
-  - Binary:
-      left:
-        Binary:
-          left:
-            Literal:
-              Integer:
-                - U8
-                - "1"
-                - span:
-                    lo: 0
-                    hi: 3
-          right:
-            Literal:
-              Integer:
-                - U8
-                - "2"
-                - span:
-                    lo: 6
-                    hi: 9
-          op: Add
-          span:
-            lo: 0
-            hi: 9
-      right:
-        Binary:
-          left:
-            Literal:
-              Integer:
-                - U8
-                - "3"
-                - span:
-                    lo: 13
-                    hi: 16
-          right:
-            Literal:
-              Integer:
-                - U8
-                - "4"
-                - span:
-                    lo: 19
-                    hi: 22
-          op: Add
-          span:
-            lo: 13
-            hi: 22
-      op: Gte
-      span:
-        lo: 0
-        hi: 22
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-              op: Gte
-              span:
-                lo: 2
-                hi: 10
-          op: Negate
-          span:
-            lo: 1
-            hi: 10
-      op: Not
-      span:
-        lo: 0
-        hi: 10
-  - Binary:
-      left:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
-              op: Gte
-              span:
-                lo: 0
-                hi: 8
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
-          op: Gte
-          span:
-            lo: 0
-            hi: 15
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":20,\\\"hi\\\":21}\"}"
-      op: Gte
-      span:
-        lo: 0
-        hi: 22
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
-          op: Gte
-          span:
-            lo: 1
-            hi: 9
-      op: Negate
-      span:
-        lo: 0
-        hi: 9
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Negate
-          span:
-            lo: 1
-            hi: 3
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
-      op: Gte
-      span:
-        lo: 1
-        hi: 11
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-          op: Gte
-          span:
-            lo: 2
-            hi: 10
-      op: Negate
-      span:
-        lo: 0
-        hi: 10
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-              op: Gte
-              span:
-                lo: 2
-                hi: 10
-          op: Negate
-          span:
-            lo: 1
-            hi: 10
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
-      op: Gte
-      span:
-        lo: 1
-        hi: 18
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
-          op: Gte
-          span:
-            lo: 1
-            hi: 9
-      op: Not
-      span:
-        lo: 0
-        hi: 9
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Not
-          span:
-            lo: 1
-            hi: 3
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
-      op: Gte
-      span:
-        lo: 1
-        hi: 11
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-          op: Gte
-          span:
-            lo: 2
-            hi: 10
-      op: Not
-      span:
-        lo: 0
-        hi: 10
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-              op: Gte
-              span:
-                lo: 2
-                hi: 10
-          op: Not
-          span:
-            lo: 1
-            hi: 10
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
-      op: Gte
-      span:
-        lo: 1
-        hi: 18
-  - Binary:
-      left:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
-              op: Gte
-              span:
-                lo: 1
-                hi: 9
-          right:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":19,\\\"hi\\\":20}\"}"
-              op: Gte
-              span:
-                lo: 13
-                hi: 21
-          op: Gte
-          span:
-            lo: 1
-            hi: 21
-      right:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":27,\\\"hi\\\":28}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":33,\\\"hi\\\":34}\"}"
-              op: Gte
-              span:
-                lo: 27
-                hi: 35
-          right:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":39,\\\"hi\\\":40}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":45,\\\"hi\\\":46}\"}"
-              op: Gte
-              span:
-                lo: 39
-                hi: 47
-          op: Gte
-          span:
-            lo: 27
-            hi: 47
-      op: Gte
-      span:
-        lo: 1
-        hi: 48
diff --git a/tests/expectations/tests/parser/expression/binary/ge_fail.out b/tests/expectations/tests/parser/expression/binary/ge_fail.out
deleted file mode 100644
index cb0658f61b..0000000000
--- a/tests/expectations/tests/parser/expression/binary/ge_fail.out
+++ /dev/null
@@ -1,7 +0,0 @@
----
-namespace: ParseExpression
-expectation: Fail
-outputs:
-  - "did not consume all input: '>=' @ 1:12-14\n'3' @ 1:15-16\n'u8' @ 1:16-18\n"
-  - "did not consume all input: '>=' @ 1:12-14\n'3' @ 1:15-16\n'u8' @ 1:16-18\n"
-  - "did not consume all input: '>=' @ 1:24-26\n'5' @ 1:27-28\n'u8' @ 1:28-30\n'+' @ 1:31-32\n'6' @ 1:33-34\n'u8' @ 1:34-36\n"
diff --git a/tests/expectations/tests/parser/expression/binary/gt.out b/tests/expectations/tests/parser/expression/binary/gt.out
deleted file mode 100644
index e63a5ad20a..0000000000
--- a/tests/expectations/tests/parser/expression/binary/gt.out
+++ /dev/null
@@ -1,334 +0,0 @@
----
-namespace: ParseExpression
-expectation: Pass
-outputs:
-  - Binary:
-      left:
-        Literal:
-          Integer:
-            - U8
-            - "1"
-            - span:
-                lo: 0
-                hi: 3
-      right:
-        Literal:
-          Integer:
-            - U8
-            - "1"
-            - span:
-                lo: 6
-                hi: 9
-      op: Gt
-      span:
-        lo: 0
-        hi: 9
-  - Binary:
-      left:
-        Literal:
-          Integer:
-            - U8
-            - "2"
-            - span:
-                lo: 0
-                hi: 3
-      right:
-        Literal:
-          Integer:
-            - U8
-            - "3"
-            - span:
-                lo: 4
-                hi: 7
-      op: Gt
-      span:
-        lo: 0
-        hi: 7
-  - Binary:
-      left:
-        Binary:
-          left:
-            Literal:
-              Integer:
-                - U8
-                - "1"
-                - span:
-                    lo: 0
-                    hi: 3
-          right:
-            Literal:
-              Integer:
-                - U8
-                - "2"
-                - span:
-                    lo: 6
-                    hi: 9
-          op: Add
-          span:
-            lo: 0
-            hi: 9
-      right:
-        Binary:
-          left:
-            Literal:
-              Integer:
-                - U8
-                - "3"
-                - span:
-                    lo: 12
-                    hi: 15
-          right:
-            Literal:
-              Integer:
-                - U8
-                - "4"
-                - span:
-                    lo: 18
-                    hi: 21
-          op: Add
-          span:
-            lo: 12
-            hi: 21
-      op: Gt
-      span:
-        lo: 0
-        hi: 21
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
-              op: Gt
-              span:
-                lo: 2
-                hi: 9
-          op: Negate
-          span:
-            lo: 1
-            hi: 9
-      op: Not
-      span:
-        lo: 0
-        hi: 9
-  - Binary:
-      left:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":5,\\\"hi\\\":6}\"}"
-              op: Gt
-              span:
-                lo: 0
-                hi: 7
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":11,\\\"hi\\\":12}\"}"
-          op: Gt
-          span:
-            lo: 0
-            hi: 13
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":17,\\\"hi\\\":18}\"}"
-      op: Gt
-      span:
-        lo: 0
-        hi: 19
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
-          op: Gt
-          span:
-            lo: 1
-            hi: 8
-      op: Negate
-      span:
-        lo: 0
-        hi: 8
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Negate
-          span:
-            lo: 1
-            hi: 3
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-      op: Gt
-      span:
-        lo: 1
-        hi: 10
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
-          op: Gt
-          span:
-            lo: 2
-            hi: 9
-      op: Negate
-      span:
-        lo: 0
-        hi: 9
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
-              op: Gt
-              span:
-                lo: 2
-                hi: 9
-          op: Negate
-          span:
-            lo: 1
-            hi: 9
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":14,\\\"hi\\\":15}\"}"
-      op: Gt
-      span:
-        lo: 1
-        hi: 16
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
-          op: Gt
-          span:
-            lo: 1
-            hi: 8
-      op: Not
-      span:
-        lo: 0
-        hi: 8
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Not
-          span:
-            lo: 1
-            hi: 3
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-      op: Gt
-      span:
-        lo: 1
-        hi: 10
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
-          op: Gt
-          span:
-            lo: 2
-            hi: 9
-      op: Not
-      span:
-        lo: 0
-        hi: 9
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
-              op: Gt
-              span:
-                lo: 2
-                hi: 9
-          op: Not
-          span:
-            lo: 1
-            hi: 9
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":14,\\\"hi\\\":15}\"}"
-      op: Gt
-      span:
-        lo: 1
-        hi: 16
-  - Binary:
-      left:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
-              op: Gt
-              span:
-                lo: 1
-                hi: 8
-          right:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":11,\\\"hi\\\":12}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
-              op: Gt
-              span:
-                lo: 11
-                hi: 18
-          op: Gt
-          span:
-            lo: 1
-            hi: 18
-      right:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":23,\\\"hi\\\":24}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":28,\\\"hi\\\":29}\"}"
-              op: Gt
-              span:
-                lo: 23
-                hi: 30
-          right:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":33,\\\"hi\\\":34}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":38,\\\"hi\\\":39}\"}"
-              op: Gt
-              span:
-                lo: 33
-                hi: 40
-          op: Gt
-          span:
-            lo: 23
-            hi: 40
-      op: Gt
-      span:
-        lo: 1
-        hi: 41
diff --git a/tests/expectations/tests/parser/expression/binary/gt_fail.out b/tests/expectations/tests/parser/expression/binary/gt_fail.out
deleted file mode 100644
index 87fca2dd48..0000000000
--- a/tests/expectations/tests/parser/expression/binary/gt_fail.out
+++ /dev/null
@@ -1,7 +0,0 @@
----
-namespace: ParseExpression
-expectation: Fail
-outputs:
-  - "did not consume all input: '>' @ 1:11-12\n'3' @ 1:13-14\n'u8' @ 1:14-16\n"
-  - "did not consume all input: '>' @ 1:11-12\n'3' @ 1:13-14\n'u8' @ 1:14-16\n"
-  - "did not consume all input: '>' @ 1:23-24\n'5' @ 1:25-26\n'u8' @ 1:26-28\n'+' @ 1:29-30\n'6' @ 1:31-32\n'u8' @ 1:32-34\n"
diff --git a/tests/expectations/tests/parser/expression/binary/le.out b/tests/expectations/tests/parser/expression/binary/le.out
deleted file mode 100644
index ffb8cc8bc8..0000000000
--- a/tests/expectations/tests/parser/expression/binary/le.out
+++ /dev/null
@@ -1,334 +0,0 @@
----
-namespace: ParseExpression
-expectation: Pass
-outputs:
-  - Binary:
-      left:
-        Literal:
-          Integer:
-            - U8
-            - "1"
-            - span:
-                lo: 0
-                hi: 3
-      right:
-        Literal:
-          Integer:
-            - U8
-            - "1"
-            - span:
-                lo: 7
-                hi: 10
-      op: Lte
-      span:
-        lo: 0
-        hi: 10
-  - Binary:
-      left:
-        Literal:
-          Integer:
-            - U8
-            - "2"
-            - span:
-                lo: 0
-                hi: 3
-      right:
-        Literal:
-          Integer:
-            - U8
-            - "3"
-            - span:
-                lo: 7
-                hi: 10
-      op: Lte
-      span:
-        lo: 0
-        hi: 10
-  - Binary:
-      left:
-        Binary:
-          left:
-            Literal:
-              Integer:
-                - U8
-                - "1"
-                - span:
-                    lo: 0
-                    hi: 3
-          right:
-            Literal:
-              Integer:
-                - U8
-                - "2"
-                - span:
-                    lo: 6
-                    hi: 9
-          op: Add
-          span:
-            lo: 0
-            hi: 9
-      right:
-        Binary:
-          left:
-            Literal:
-              Integer:
-                - U8
-                - "3"
-                - span:
-                    lo: 13
-                    hi: 16
-          right:
-            Literal:
-              Integer:
-                - U8
-                - "4"
-                - span:
-                    lo: 19
-                    hi: 22
-          op: Add
-          span:
-            lo: 13
-            hi: 22
-      op: Lte
-      span:
-        lo: 0
-        hi: 22
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-              op: Lte
-              span:
-                lo: 2
-                hi: 10
-          op: Negate
-          span:
-            lo: 1
-            hi: 10
-      op: Not
-      span:
-        lo: 0
-        hi: 10
-  - Binary:
-      left:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
-              op: Lte
-              span:
-                lo: 0
-                hi: 8
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
-          op: Lte
-          span:
-            lo: 0
-            hi: 15
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":20,\\\"hi\\\":21}\"}"
-      op: Lte
-      span:
-        lo: 0
-        hi: 22
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
-          op: Lte
-          span:
-            lo: 1
-            hi: 9
-      op: Negate
-      span:
-        lo: 0
-        hi: 9
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Negate
-          span:
-            lo: 1
-            hi: 3
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
-      op: Lte
-      span:
-        lo: 1
-        hi: 11
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-          op: Lte
-          span:
-            lo: 2
-            hi: 10
-      op: Negate
-      span:
-        lo: 0
-        hi: 10
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-              op: Lte
-              span:
-                lo: 2
-                hi: 10
-          op: Negate
-          span:
-            lo: 1
-            hi: 10
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
-      op: Lte
-      span:
-        lo: 1
-        hi: 18
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
-          op: Lte
-          span:
-            lo: 1
-            hi: 9
-      op: Not
-      span:
-        lo: 0
-        hi: 9
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Not
-          span:
-            lo: 1
-            hi: 3
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
-      op: Lte
-      span:
-        lo: 1
-        hi: 11
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-          op: Lte
-          span:
-            lo: 2
-            hi: 10
-      op: Not
-      span:
-        lo: 0
-        hi: 10
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-              op: Lte
-              span:
-                lo: 2
-                hi: 10
-          op: Not
-          span:
-            lo: 1
-            hi: 10
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
-      op: Lte
-      span:
-        lo: 1
-        hi: 18
-  - Binary:
-      left:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
-              op: Lte
-              span:
-                lo: 1
-                hi: 9
-          right:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":19,\\\"hi\\\":20}\"}"
-              op: Lte
-              span:
-                lo: 13
-                hi: 21
-          op: Lte
-          span:
-            lo: 1
-            hi: 21
-      right:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":27,\\\"hi\\\":28}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":33,\\\"hi\\\":34}\"}"
-              op: Lte
-              span:
-                lo: 27
-                hi: 35
-          right:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":39,\\\"hi\\\":40}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":45,\\\"hi\\\":46}\"}"
-              op: Lte
-              span:
-                lo: 39
-                hi: 47
-          op: Lte
-          span:
-            lo: 27
-            hi: 47
-      op: Lte
-      span:
-        lo: 1
-        hi: 48
diff --git a/tests/expectations/tests/parser/expression/binary/le_fail.out b/tests/expectations/tests/parser/expression/binary/le_fail.out
deleted file mode 100644
index 2f754fbf41..0000000000
--- a/tests/expectations/tests/parser/expression/binary/le_fail.out
+++ /dev/null
@@ -1,7 +0,0 @@
----
-namespace: ParseExpression
-expectation: Fail
-outputs:
-  - "did not consume all input: '<=' @ 1:12-14\n'3' @ 1:15-16\n'u8' @ 1:16-18\n"
-  - "did not consume all input: '<=' @ 1:12-14\n'3' @ 1:15-16\n'u8' @ 1:16-18\n"
-  - "did not consume all input: '<=' @ 1:24-26\n'5' @ 1:27-28\n'u8' @ 1:28-30\n'+' @ 1:31-32\n'6' @ 1:33-34\n'u8' @ 1:34-36\n"
diff --git a/tests/expectations/tests/parser/expression/binary/lt.out b/tests/expectations/tests/parser/expression/binary/lt.out
deleted file mode 100644
index 12ad96fed1..0000000000
--- a/tests/expectations/tests/parser/expression/binary/lt.out
+++ /dev/null
@@ -1,334 +0,0 @@
----
-namespace: ParseExpression
-expectation: Pass
-outputs:
-  - Binary:
-      left:
-        Literal:
-          Integer:
-            - U8
-            - "1"
-            - span:
-                lo: 0
-                hi: 3
-      right:
-        Literal:
-          Integer:
-            - U8
-            - "1"
-            - span:
-                lo: 6
-                hi: 9
-      op: Lt
-      span:
-        lo: 0
-        hi: 9
-  - Binary:
-      left:
-        Literal:
-          Integer:
-            - U8
-            - "2"
-            - span:
-                lo: 0
-                hi: 3
-      right:
-        Literal:
-          Integer:
-            - U8
-            - "3"
-            - span:
-                lo: 4
-                hi: 7
-      op: Lt
-      span:
-        lo: 0
-        hi: 7
-  - Binary:
-      left:
-        Binary:
-          left:
-            Literal:
-              Integer:
-                - U8
-                - "1"
-                - span:
-                    lo: 0
-                    hi: 3
-          right:
-            Literal:
-              Integer:
-                - U8
-                - "2"
-                - span:
-                    lo: 6
-                    hi: 9
-          op: Add
-          span:
-            lo: 0
-            hi: 9
-      right:
-        Binary:
-          left:
-            Literal:
-              Integer:
-                - U8
-                - "3"
-                - span:
-                    lo: 12
-                    hi: 15
-          right:
-            Literal:
-              Integer:
-                - U8
-                - "4"
-                - span:
-                    lo: 18
-                    hi: 21
-          op: Add
-          span:
-            lo: 12
-            hi: 21
-      op: Lt
-      span:
-        lo: 0
-        hi: 21
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
-              op: Lt
-              span:
-                lo: 2
-                hi: 9
-          op: Negate
-          span:
-            lo: 1
-            hi: 9
-      op: Not
-      span:
-        lo: 0
-        hi: 9
-  - Binary:
-      left:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":5,\\\"hi\\\":6}\"}"
-              op: Lt
-              span:
-                lo: 0
-                hi: 7
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":11,\\\"hi\\\":12}\"}"
-          op: Lt
-          span:
-            lo: 0
-            hi: 13
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":17,\\\"hi\\\":18}\"}"
-      op: Lt
-      span:
-        lo: 0
-        hi: 19
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
-          op: Lt
-          span:
-            lo: 1
-            hi: 8
-      op: Negate
-      span:
-        lo: 0
-        hi: 8
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Negate
-          span:
-            lo: 1
-            hi: 3
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-      op: Lt
-      span:
-        lo: 1
-        hi: 10
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
-          op: Lt
-          span:
-            lo: 2
-            hi: 9
-      op: Negate
-      span:
-        lo: 0
-        hi: 9
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
-              op: Lt
-              span:
-                lo: 2
-                hi: 9
-          op: Negate
-          span:
-            lo: 1
-            hi: 9
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":14,\\\"hi\\\":15}\"}"
-      op: Lt
-      span:
-        lo: 1
-        hi: 16
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
-          op: Lt
-          span:
-            lo: 1
-            hi: 8
-      op: Not
-      span:
-        lo: 0
-        hi: 8
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Not
-          span:
-            lo: 1
-            hi: 3
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-      op: Lt
-      span:
-        lo: 1
-        hi: 10
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
-          op: Lt
-          span:
-            lo: 2
-            hi: 9
-      op: Not
-      span:
-        lo: 0
-        hi: 9
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
-              op: Lt
-              span:
-                lo: 2
-                hi: 9
-          op: Not
-          span:
-            lo: 1
-            hi: 9
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":14,\\\"hi\\\":15}\"}"
-      op: Lt
-      span:
-        lo: 1
-        hi: 16
-  - Binary:
-      left:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
-              op: Lt
-              span:
-                lo: 1
-                hi: 8
-          right:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":11,\\\"hi\\\":12}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
-              op: Lt
-              span:
-                lo: 11
-                hi: 18
-          op: Lt
-          span:
-            lo: 1
-            hi: 18
-      right:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":23,\\\"hi\\\":24}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":28,\\\"hi\\\":29}\"}"
-              op: Lt
-              span:
-                lo: 23
-                hi: 30
-          right:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":33,\\\"hi\\\":34}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":38,\\\"hi\\\":39}\"}"
-              op: Lt
-              span:
-                lo: 33
-                hi: 40
-          op: Lt
-          span:
-            lo: 23
-            hi: 40
-      op: Lt
-      span:
-        lo: 1
-        hi: 41
diff --git a/tests/expectations/tests/parser/expression/binary/lt_fail.out b/tests/expectations/tests/parser/expression/binary/lt_fail.out
deleted file mode 100644
index 76f35f9d39..0000000000
--- a/tests/expectations/tests/parser/expression/binary/lt_fail.out
+++ /dev/null
@@ -1,7 +0,0 @@
----
-namespace: ParseExpression
-expectation: Fail
-outputs:
-  - "did not consume all input: '<' @ 1:11-12\n'3' @ 1:13-14\n'u8' @ 1:14-16\n"
-  - "did not consume all input: '<' @ 1:11-12\n'3' @ 1:13-14\n'u8' @ 1:14-16\n"
-  - "did not consume all input: '<' @ 1:23-24\n'5' @ 1:25-26\n'u8' @ 1:26-28\n'+' @ 1:29-30\n'6' @ 1:31-32\n'u8' @ 1:32-34\n"
diff --git a/tests/expectations/tests/parser/expression/binary/modulo.out b/tests/expectations/tests/parser/expression/binary/modulo.out
deleted file mode 100644
index 0a3681be9e..0000000000
--- a/tests/expectations/tests/parser/expression/binary/modulo.out
+++ /dev/null
@@ -1,243 +0,0 @@
----
-namespace: ParseExpression
-expectation: Pass
-outputs:
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-              op: Mod
-              span:
-                lo: 2
-                hi: 10
-          op: Negate
-          span:
-            lo: 1
-            hi: 10
-      op: Not
-      span:
-        lo: 0
-        hi: 10
-  - Binary:
-      left:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
-              op: Mod
-              span:
-                lo: 0
-                hi: 8
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
-          op: Mod
-          span:
-            lo: 0
-            hi: 15
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":20,\\\"hi\\\":21}\"}"
-      op: Mod
-      span:
-        lo: 0
-        hi: 22
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
-          op: Mod
-          span:
-            lo: 1
-            hi: 9
-      op: Negate
-      span:
-        lo: 0
-        hi: 9
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Negate
-          span:
-            lo: 1
-            hi: 3
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
-      op: Mod
-      span:
-        lo: 1
-        hi: 11
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-          op: Mod
-          span:
-            lo: 2
-            hi: 10
-      op: Negate
-      span:
-        lo: 0
-        hi: 10
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-              op: Mod
-              span:
-                lo: 2
-                hi: 10
-          op: Negate
-          span:
-            lo: 1
-            hi: 10
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
-      op: Mod
-      span:
-        lo: 1
-        hi: 18
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
-          op: Mod
-          span:
-            lo: 1
-            hi: 9
-      op: Not
-      span:
-        lo: 0
-        hi: 9
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Not
-          span:
-            lo: 1
-            hi: 3
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
-      op: Mod
-      span:
-        lo: 1
-        hi: 11
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-          op: Mod
-          span:
-            lo: 2
-            hi: 10
-      op: Not
-      span:
-        lo: 0
-        hi: 10
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-              op: Mod
-              span:
-                lo: 2
-                hi: 10
-          op: Not
-          span:
-            lo: 1
-            hi: 10
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
-      op: Mod
-      span:
-        lo: 1
-        hi: 18
-  - Binary:
-      left:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
-              op: Mod
-              span:
-                lo: 1
-                hi: 9
-          right:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":13}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":18,\\\"hi\\\":19}\"}"
-              op: Mod
-              span:
-                lo: 12
-                hi: 20
-          op: Div
-          span:
-            lo: 1
-            hi: 20
-      right:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":26,\\\"hi\\\":27}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":32,\\\"hi\\\":33}\"}"
-              op: Mod
-              span:
-                lo: 26
-                hi: 34
-          right:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":37,\\\"hi\\\":38}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":43,\\\"hi\\\":44}\"}"
-              op: Mod
-              span:
-                lo: 37
-                hi: 45
-          op: Div
-          span:
-            lo: 26
-            hi: 45
-      op: Mod
-      span:
-        lo: 1
-        hi: 46
diff --git a/tests/expectations/tests/parser/expression/binary/mul.out b/tests/expectations/tests/parser/expression/binary/mul.out
deleted file mode 100644
index 2a9ef88f99..0000000000
--- a/tests/expectations/tests/parser/expression/binary/mul.out
+++ /dev/null
@@ -1,446 +0,0 @@
----
-namespace: ParseExpression
-expectation: Pass
-outputs:
-  - Binary:
-      left:
-        Literal:
-          Integer:
-            - U8
-            - "1"
-            - span:
-                lo: 0
-                hi: 3
-      right:
-        Literal:
-          Integer:
-            - U8
-            - "1"
-            - span:
-                lo: 6
-                hi: 9
-      op: Mul
-      span:
-        lo: 0
-        hi: 9
-  - Binary:
-      left:
-        Literal:
-          Integer:
-            - U8
-            - "2"
-            - span:
-                lo: 0
-                hi: 3
-      right:
-        Literal:
-          Integer:
-            - U8
-            - "3"
-            - span:
-                lo: 4
-                hi: 7
-      op: Mul
-      span:
-        lo: 0
-        hi: 7
-  - Binary:
-      left:
-        Binary:
-          left:
-            Literal:
-              Integer:
-                - U8
-                - "1"
-                - span:
-                    lo: 0
-                    hi: 3
-          right:
-            Literal:
-              Integer:
-                - U8
-                - "2"
-                - span:
-                    lo: 6
-                    hi: 9
-          op: Mul
-          span:
-            lo: 0
-            hi: 9
-      right:
-        Literal:
-          Integer:
-            - U8
-            - "3"
-            - span:
-                lo: 12
-                hi: 15
-      op: Mul
-      span:
-        lo: 0
-        hi: 15
-  - Binary:
-      left:
-        Binary:
-          left:
-            Literal:
-              Integer:
-                - U8
-                - "1"
-                - span:
-                    lo: 0
-                    hi: 3
-          right:
-            Literal:
-              Integer:
-                - U8
-                - "2"
-                - span:
-                    lo: 7
-                    hi: 10
-          op: Pow
-          span:
-            lo: 0
-            hi: 10
-      right:
-        Binary:
-          left:
-            Literal:
-              Integer:
-                - U8
-                - "3"
-                - span:
-                    lo: 13
-                    hi: 16
-          right:
-            Literal:
-              Integer:
-                - U8
-                - "4"
-                - span:
-                    lo: 20
-                    hi: 23
-          op: Pow
-          span:
-            lo: 13
-            hi: 23
-      op: Mul
-      span:
-        lo: 0
-        hi: 23
-  - Binary:
-      left:
-        Binary:
-          left:
-            Binary:
-              left:
-                Literal:
-                  Integer:
-                    - U8
-                    - "1"
-                    - span:
-                        lo: 0
-                        hi: 3
-              right:
-                Literal:
-                  Integer:
-                    - U8
-                    - "2"
-                    - span:
-                        lo: 7
-                        hi: 10
-              op: Pow
-              span:
-                lo: 0
-                hi: 10
-          right:
-            Binary:
-              left:
-                Literal:
-                  Integer:
-                    - U8
-                    - "3"
-                    - span:
-                        lo: 13
-                        hi: 16
-              right:
-                Literal:
-                  Integer:
-                    - U8
-                    - "4"
-                    - span:
-                        lo: 20
-                        hi: 23
-              op: Pow
-              span:
-                lo: 13
-                hi: 23
-          op: Mul
-          span:
-            lo: 0
-            hi: 23
-      right:
-        Binary:
-          left:
-            Literal:
-              Integer:
-                - U8
-                - "5"
-                - span:
-                    lo: 26
-                    hi: 29
-          right:
-            Literal:
-              Integer:
-                - U8
-                - "6"
-                - span:
-                    lo: 33
-                    hi: 36
-          op: Pow
-          span:
-            lo: 26
-            hi: 36
-      op: Div
-      span:
-        lo: 0
-        hi: 36
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-              op: Mul
-              span:
-                lo: 2
-                hi: 10
-          op: Negate
-          span:
-            lo: 1
-            hi: 10
-      op: Not
-      span:
-        lo: 0
-        hi: 10
-  - Binary:
-      left:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
-              op: Mul
-              span:
-                lo: 0
-                hi: 8
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
-          op: Mul
-          span:
-            lo: 0
-            hi: 15
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":20,\\\"hi\\\":21}\"}"
-      op: Mul
-      span:
-        lo: 0
-        hi: 22
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
-          op: Mul
-          span:
-            lo: 1
-            hi: 9
-      op: Negate
-      span:
-        lo: 0
-        hi: 9
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Negate
-          span:
-            lo: 1
-            hi: 3
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
-      op: Mul
-      span:
-        lo: 1
-        hi: 11
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-          op: Mul
-          span:
-            lo: 2
-            hi: 10
-      op: Negate
-      span:
-        lo: 0
-        hi: 10
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-              op: Mul
-              span:
-                lo: 2
-                hi: 10
-          op: Negate
-          span:
-            lo: 1
-            hi: 10
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
-      op: Mul
-      span:
-        lo: 1
-        hi: 18
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
-          op: Mul
-          span:
-            lo: 1
-            hi: 9
-      op: Not
-      span:
-        lo: 0
-        hi: 9
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Not
-          span:
-            lo: 1
-            hi: 3
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
-      op: Mul
-      span:
-        lo: 1
-        hi: 11
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-          op: Mul
-          span:
-            lo: 2
-            hi: 10
-      op: Not
-      span:
-        lo: 0
-        hi: 10
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-              op: Mul
-              span:
-                lo: 2
-                hi: 10
-          op: Not
-          span:
-            lo: 1
-            hi: 10
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
-      op: Mul
-      span:
-        lo: 1
-        hi: 18
-  - Binary:
-      left:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
-              op: Mul
-              span:
-                lo: 1
-                hi: 9
-          right:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":13}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":18,\\\"hi\\\":19}\"}"
-              op: Mul
-              span:
-                lo: 12
-                hi: 20
-          op: Mul
-          span:
-            lo: 1
-            hi: 20
-      right:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":26,\\\"hi\\\":27}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":32,\\\"hi\\\":33}\"}"
-              op: Mul
-              span:
-                lo: 26
-                hi: 34
-          right:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":37,\\\"hi\\\":38}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":43,\\\"hi\\\":44}\"}"
-              op: Mul
-              span:
-                lo: 37
-                hi: 45
-          op: Mul
-          span:
-            lo: 26
-            hi: 45
-      op: Mul
-      span:
-        lo: 1
-        hi: 46
diff --git a/tests/expectations/tests/parser/expression/binary/mul_wrapped.out b/tests/expectations/tests/parser/expression/binary/mul_wrapped.out
deleted file mode 100644
index e9e0dcb376..0000000000
--- a/tests/expectations/tests/parser/expression/binary/mul_wrapped.out
+++ /dev/null
@@ -1,243 +0,0 @@
----
-namespace: ParseExpression
-expectation: Pass
-outputs:
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
-              op: MulWrapped
-              span:
-                lo: 2
-                hi: 18
-          op: Negate
-          span:
-            lo: 1
-            hi: 18
-      op: Not
-      span:
-        lo: 0
-        hi: 18
-  - Binary:
-      left:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":14,\\\"hi\\\":15}\"}"
-              op: MulWrapped
-              span:
-                lo: 0
-                hi: 16
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":29,\\\"hi\\\":30}\"}"
-          op: MulWrapped
-          span:
-            lo: 0
-            hi: 31
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":44,\\\"hi\\\":45}\"}"
-      op: MulWrapped
-      span:
-        lo: 0
-        hi: 46
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
-          op: MulWrapped
-          span:
-            lo: 1
-            hi: 17
-      op: Negate
-      span:
-        lo: 0
-        hi: 17
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Negate
-          span:
-            lo: 1
-            hi: 3
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":17,\\\"hi\\\":18}\"}"
-      op: MulWrapped
-      span:
-        lo: 1
-        hi: 19
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
-          op: MulWrapped
-          span:
-            lo: 2
-            hi: 18
-      op: Negate
-      span:
-        lo: 0
-        hi: 18
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
-              op: MulWrapped
-              span:
-                lo: 2
-                hi: 18
-          op: Negate
-          span:
-            lo: 1
-            hi: 18
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":32,\\\"hi\\\":33}\"}"
-      op: MulWrapped
-      span:
-        lo: 1
-        hi: 34
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
-          op: MulWrapped
-          span:
-            lo: 1
-            hi: 17
-      op: Not
-      span:
-        lo: 0
-        hi: 17
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Not
-          span:
-            lo: 1
-            hi: 3
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":17,\\\"hi\\\":18}\"}"
-      op: MulWrapped
-      span:
-        lo: 1
-        hi: 19
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
-          op: MulWrapped
-          span:
-            lo: 2
-            hi: 18
-      op: Not
-      span:
-        lo: 0
-        hi: 18
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
-              op: MulWrapped
-              span:
-                lo: 2
-                hi: 18
-          op: Not
-          span:
-            lo: 1
-            hi: 18
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":32,\\\"hi\\\":33}\"}"
-      op: MulWrapped
-      span:
-        lo: 1
-        hi: 34
-  - Binary:
-      left:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
-              op: MulWrapped
-              span:
-                lo: 1
-                hi: 17
-          right:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":20,\\\"hi\\\":21}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":34,\\\"hi\\\":35}\"}"
-              op: MulWrapped
-              span:
-                lo: 20
-                hi: 36
-          op: Mul
-          span:
-            lo: 1
-            hi: 36
-      right:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":50,\\\"hi\\\":51}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":64,\\\"hi\\\":65}\"}"
-              op: MulWrapped
-              span:
-                lo: 50
-                hi: 66
-          right:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":69,\\\"hi\\\":70}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":83,\\\"hi\\\":84}\"}"
-              op: MulWrapped
-              span:
-                lo: 69
-                hi: 85
-          op: Mul
-          span:
-            lo: 50
-            hi: 85
-      op: MulWrapped
-      span:
-        lo: 1
-        hi: 86
diff --git a/tests/expectations/tests/parser/expression/binary/nand.out b/tests/expectations/tests/parser/expression/binary/nand.out
deleted file mode 100644
index 4062b297dd..0000000000
--- a/tests/expectations/tests/parser/expression/binary/nand.out
+++ /dev/null
@@ -1,243 +0,0 @@
----
-namespace: ParseExpression
-expectation: Pass
-outputs:
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
-              op: Nand
-              span:
-                lo: 2
-                hi: 11
-          op: Negate
-          span:
-            lo: 1
-            hi: 11
-      op: Not
-      span:
-        lo: 0
-        hi: 11
-  - Binary:
-      left:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
-              op: Nand
-              span:
-                lo: 0
-                hi: 9
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
-          op: Nand
-          span:
-            lo: 0
-            hi: 17
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":23,\\\"hi\\\":24}\"}"
-      op: Nand
-      span:
-        lo: 0
-        hi: 25
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-          op: Nand
-          span:
-            lo: 1
-            hi: 10
-      op: Negate
-      span:
-        lo: 0
-        hi: 10
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Negate
-          span:
-            lo: 1
-            hi: 3
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":10,\\\"hi\\\":11}\"}"
-      op: Nand
-      span:
-        lo: 1
-        hi: 12
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
-          op: Nand
-          span:
-            lo: 2
-            hi: 11
-      op: Negate
-      span:
-        lo: 0
-        hi: 11
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
-              op: Nand
-              span:
-                lo: 2
-                hi: 11
-          op: Negate
-          span:
-            lo: 1
-            hi: 11
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":18,\\\"hi\\\":19}\"}"
-      op: Nand
-      span:
-        lo: 1
-        hi: 20
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-          op: Nand
-          span:
-            lo: 1
-            hi: 10
-      op: Not
-      span:
-        lo: 0
-        hi: 10
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Not
-          span:
-            lo: 1
-            hi: 3
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":10,\\\"hi\\\":11}\"}"
-      op: Nand
-      span:
-        lo: 1
-        hi: 12
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
-          op: Nand
-          span:
-            lo: 2
-            hi: 11
-      op: Not
-      span:
-        lo: 0
-        hi: 11
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
-              op: Nand
-              span:
-                lo: 2
-                hi: 11
-          op: Not
-          span:
-            lo: 1
-            hi: 11
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":18,\\\"hi\\\":19}\"}"
-      op: Nand
-      span:
-        lo: 1
-        hi: 20
-  - Binary:
-      left:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-              op: Nand
-              span:
-                lo: 1
-                hi: 10
-          right:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":20,\\\"hi\\\":21}\"}"
-              op: Nand
-              span:
-                lo: 13
-                hi: 22
-          op: BitwiseAnd
-          span:
-            lo: 1
-            hi: 22
-      right:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":29,\\\"hi\\\":30}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":36,\\\"hi\\\":37}\"}"
-              op: Nand
-              span:
-                lo: 29
-                hi: 38
-          right:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":41,\\\"hi\\\":42}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":48,\\\"hi\\\":49}\"}"
-              op: Nand
-              span:
-                lo: 41
-                hi: 50
-          op: BitwiseAnd
-          span:
-            lo: 29
-            hi: 50
-      op: Nand
-      span:
-        lo: 1
-        hi: 51
diff --git a/tests/expectations/tests/parser/expression/binary/neq.out b/tests/expectations/tests/parser/expression/binary/neq.out
deleted file mode 100644
index faadb4b150..0000000000
--- a/tests/expectations/tests/parser/expression/binary/neq.out
+++ /dev/null
@@ -1,439 +0,0 @@
----
-namespace: ParseExpression
-expectation: Pass
-outputs:
-  - Binary:
-      left:
-        Literal:
-          Integer:
-            - U8
-            - "1"
-            - span:
-                lo: 0
-                hi: 3
-      right:
-        Literal:
-          Integer:
-            - U8
-            - "1"
-            - span:
-                lo: 7
-                hi: 10
-      op: Neq
-      span:
-        lo: 0
-        hi: 10
-  - Binary:
-      left:
-        Literal:
-          Integer:
-            - U8
-            - "2"
-            - span:
-                lo: 0
-                hi: 3
-      right:
-        Literal:
-          Integer:
-            - U8
-            - "3"
-            - span:
-                lo: 5
-                hi: 8
-      op: Neq
-      span:
-        lo: 0
-        hi: 8
-  - Binary:
-      left:
-        Binary:
-          left:
-            Literal:
-              Integer:
-                - U8
-                - "1"
-                - span:
-                    lo: 0
-                    hi: 3
-          right:
-            Literal:
-              Integer:
-                - U8
-                - "2"
-                - span:
-                    lo: 6
-                    hi: 9
-          op: Lt
-          span:
-            lo: 0
-            hi: 9
-      right:
-        Binary:
-          left:
-            Literal:
-              Integer:
-                - U8
-                - "3"
-                - span:
-                    lo: 13
-                    hi: 16
-          right:
-            Literal:
-              Integer:
-                - U8
-                - "4"
-                - span:
-                    lo: 19
-                    hi: 22
-          op: Lt
-          span:
-            lo: 13
-            hi: 22
-      op: Neq
-      span:
-        lo: 0
-        hi: 22
-  - Binary:
-      left:
-        Binary:
-          left:
-            Binary:
-              left:
-                Literal:
-                  Integer:
-                    - U8
-                    - "1"
-                    - span:
-                        lo: 0
-                        hi: 3
-              right:
-                Literal:
-                  Integer:
-                    - U8
-                    - "2"
-                    - span:
-                        lo: 6
-                        hi: 9
-              op: Lt
-              span:
-                lo: 0
-                hi: 9
-          right:
-            Binary:
-              left:
-                Literal:
-                  Integer:
-                    - U8
-                    - "3"
-                    - span:
-                        lo: 13
-                        hi: 16
-              right:
-                Literal:
-                  Integer:
-                    - U8
-                    - "4"
-                    - span:
-                        lo: 19
-                        hi: 22
-              op: Lt
-              span:
-                lo: 13
-                hi: 22
-          op: Neq
-          span:
-            lo: 0
-            hi: 22
-      right:
-        Binary:
-          left:
-            Binary:
-              left:
-                Literal:
-                  Integer:
-                    - U8
-                    - "3"
-                    - span:
-                        lo: 26
-                        hi: 29
-              right:
-                Literal:
-                  Integer:
-                    - U8
-                    - "4"
-                    - span:
-                        lo: 32
-                        hi: 35
-              op: Lt
-              span:
-                lo: 26
-                hi: 35
-          right:
-            Binary:
-              left:
-                Literal:
-                  Integer:
-                    - U8
-                    - "5"
-                    - span:
-                        lo: 39
-                        hi: 42
-              right:
-                Literal:
-                  Integer:
-                    - U8
-                    - "6"
-                    - span:
-                        lo: 45
-                        hi: 48
-              op: Lt
-              span:
-                lo: 39
-                hi: 48
-          op: Neq
-          span:
-            lo: 26
-            hi: 48
-      op: Or
-      span:
-        lo: 0
-        hi: 48
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-              op: Neq
-              span:
-                lo: 2
-                hi: 10
-          op: Negate
-          span:
-            lo: 1
-            hi: 10
-      op: Not
-      span:
-        lo: 0
-        hi: 10
-  - Binary:
-      left:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
-              op: Neq
-              span:
-                lo: 0
-                hi: 8
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
-          op: Neq
-          span:
-            lo: 0
-            hi: 15
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":20,\\\"hi\\\":21}\"}"
-      op: Neq
-      span:
-        lo: 0
-        hi: 22
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
-          op: Neq
-          span:
-            lo: 1
-            hi: 9
-      op: Negate
-      span:
-        lo: 0
-        hi: 9
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Negate
-          span:
-            lo: 1
-            hi: 3
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
-      op: Neq
-      span:
-        lo: 1
-        hi: 11
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-          op: Neq
-          span:
-            lo: 2
-            hi: 10
-      op: Negate
-      span:
-        lo: 0
-        hi: 10
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-              op: Neq
-              span:
-                lo: 2
-                hi: 10
-          op: Negate
-          span:
-            lo: 1
-            hi: 10
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
-      op: Neq
-      span:
-        lo: 1
-        hi: 18
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
-          op: Neq
-          span:
-            lo: 1
-            hi: 9
-      op: Not
-      span:
-        lo: 0
-        hi: 9
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Not
-          span:
-            lo: 1
-            hi: 3
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
-      op: Neq
-      span:
-        lo: 1
-        hi: 11
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-          op: Neq
-          span:
-            lo: 2
-            hi: 10
-      op: Not
-      span:
-        lo: 0
-        hi: 10
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-              op: Neq
-              span:
-                lo: 2
-                hi: 10
-          op: Not
-          span:
-            lo: 1
-            hi: 10
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
-      op: Neq
-      span:
-        lo: 1
-        hi: 18
-  - Binary:
-      left:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
-              op: Neq
-              span:
-                lo: 1
-                hi: 9
-          right:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":19,\\\"hi\\\":20}\"}"
-              op: Neq
-              span:
-                lo: 13
-                hi: 21
-          op: Neq
-          span:
-            lo: 1
-            hi: 21
-      right:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":27,\\\"hi\\\":28}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":33,\\\"hi\\\":34}\"}"
-              op: Neq
-              span:
-                lo: 27
-                hi: 35
-          right:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":39,\\\"hi\\\":40}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":45,\\\"hi\\\":46}\"}"
-              op: Neq
-              span:
-                lo: 39
-                hi: 47
-          op: Neq
-          span:
-            lo: 27
-            hi: 47
-      op: Neq
-      span:
-        lo: 1
-        hi: 48
diff --git a/tests/expectations/tests/parser/expression/binary/neq_fail.out b/tests/expectations/tests/parser/expression/binary/neq_fail.out
deleted file mode 100644
index bd982be8b1..0000000000
--- a/tests/expectations/tests/parser/expression/binary/neq_fail.out
+++ /dev/null
@@ -1,5 +0,0 @@
----
-namespace: ParseExpression
-expectation: Fail
-outputs:
-  - "Error [EPAR0370017]: Could not parse the implicit value: 1.\n    --> test:1:1\n     |\n   1 | 1 != 2 != 3\n     | ^"
diff --git a/tests/expectations/tests/parser/expression/binary/nor.out b/tests/expectations/tests/parser/expression/binary/nor.out
deleted file mode 100644
index 7523b7b32c..0000000000
--- a/tests/expectations/tests/parser/expression/binary/nor.out
+++ /dev/null
@@ -1,243 +0,0 @@
----
-namespace: ParseExpression
-expectation: Pass
-outputs:
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-              op: Nor
-              span:
-                lo: 2
-                hi: 10
-          op: Negate
-          span:
-            lo: 1
-            hi: 10
-      op: Not
-      span:
-        lo: 0
-        hi: 10
-  - Binary:
-      left:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
-              op: Nor
-              span:
-                lo: 0
-                hi: 8
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
-          op: Nor
-          span:
-            lo: 0
-            hi: 15
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":20,\\\"hi\\\":21}\"}"
-      op: Nor
-      span:
-        lo: 0
-        hi: 22
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
-          op: Nor
-          span:
-            lo: 1
-            hi: 9
-      op: Negate
-      span:
-        lo: 0
-        hi: 9
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Negate
-          span:
-            lo: 1
-            hi: 3
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
-      op: Nor
-      span:
-        lo: 1
-        hi: 11
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-          op: Nor
-          span:
-            lo: 2
-            hi: 10
-      op: Negate
-      span:
-        lo: 0
-        hi: 10
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-              op: Nor
-              span:
-                lo: 2
-                hi: 10
-          op: Negate
-          span:
-            lo: 1
-            hi: 10
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
-      op: Nor
-      span:
-        lo: 1
-        hi: 18
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
-          op: Nor
-          span:
-            lo: 1
-            hi: 9
-      op: Not
-      span:
-        lo: 0
-        hi: 9
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Not
-          span:
-            lo: 1
-            hi: 3
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
-      op: Nor
-      span:
-        lo: 1
-        hi: 11
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-          op: Nor
-          span:
-            lo: 2
-            hi: 10
-      op: Not
-      span:
-        lo: 0
-        hi: 10
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-              op: Nor
-              span:
-                lo: 2
-                hi: 10
-          op: Not
-          span:
-            lo: 1
-            hi: 10
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
-      op: Nor
-      span:
-        lo: 1
-        hi: 18
-  - Binary:
-      left:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
-              op: Nor
-              span:
-                lo: 1
-                hi: 9
-          right:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":19,\\\"hi\\\":20}\"}"
-              op: Nor
-              span:
-                lo: 13
-                hi: 21
-          op: Neq
-          span:
-            lo: 1
-            hi: 21
-      right:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":27,\\\"hi\\\":28}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":33,\\\"hi\\\":34}\"}"
-              op: Nor
-              span:
-                lo: 27
-                hi: 35
-          right:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":39,\\\"hi\\\":40}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":45,\\\"hi\\\":46}\"}"
-              op: Nor
-              span:
-                lo: 39
-                hi: 47
-          op: Neq
-          span:
-            lo: 27
-            hi: 47
-      op: Nor
-      span:
-        lo: 1
-        hi: 48
diff --git a/tests/expectations/tests/parser/expression/binary/or.out b/tests/expectations/tests/parser/expression/binary/or.out
deleted file mode 100644
index cfbb0b1aa8..0000000000
--- a/tests/expectations/tests/parser/expression/binary/or.out
+++ /dev/null
@@ -1,164 +0,0 @@
----
-namespace: ParseExpression
-expectation: Pass
-outputs:
-  - Binary:
-      left:
-        Literal:
-          Boolean:
-            - true
-            - span:
-                lo: 0
-                hi: 4
-      right:
-        Literal:
-          Boolean:
-            - true
-            - span:
-                lo: 8
-                hi: 12
-      op: Or
-      span:
-        lo: 0
-        hi: 12
-  - Binary:
-      left:
-        Literal:
-          Boolean:
-            - false
-            - span:
-                lo: 0
-                hi: 5
-      right:
-        Literal:
-          Boolean:
-            - true
-            - span:
-                lo: 7
-                hi: 11
-      op: Or
-      span:
-        lo: 0
-        hi: 11
-  - Binary:
-      left:
-        Binary:
-          left:
-            Literal:
-              Boolean:
-                - true
-                - span:
-                    lo: 0
-                    hi: 4
-          right:
-            Literal:
-              Boolean:
-                - false
-                - span:
-                    lo: 6
-                    hi: 11
-          op: Or
-          span:
-            lo: 0
-            hi: 11
-      right:
-        Literal:
-          Boolean:
-            - false
-            - span:
-                lo: 15
-                hi: 20
-      op: Or
-      span:
-        lo: 0
-        hi: 20
-  - Binary:
-      left:
-        Binary:
-          left:
-            Binary:
-              left:
-                Literal:
-                  Boolean:
-                    - true
-                    - span:
-                        lo: 0
-                        hi: 4
-              right:
-                Literal:
-                  Boolean:
-                    - false
-                    - span:
-                        lo: 8
-                        hi: 13
-              op: Or
-              span:
-                lo: 0
-                hi: 13
-          right:
-            Literal:
-              Boolean:
-                - true
-                - span:
-                    lo: 17
-                    hi: 21
-          op: Or
-          span:
-            lo: 0
-            hi: 21
-      right:
-        Literal:
-          Boolean:
-            - false
-            - span:
-                lo: 25
-                hi: 30
-      op: Or
-      span:
-        lo: 0
-        hi: 30
-  - Binary:
-      left:
-        Binary:
-          left:
-            Literal:
-              Boolean:
-                - true
-                - span:
-                    lo: 0
-                    hi: 4
-          right:
-            Binary:
-              left:
-                Literal:
-                  Boolean:
-                    - true
-                    - span:
-                        lo: 9
-                        hi: 13
-              right:
-                Literal:
-                  Boolean:
-                    - false
-                    - span:
-                        lo: 17
-                        hi: 22
-              op: Or
-              span:
-                lo: 9
-                hi: 22
-          op: Or
-          span:
-            lo: 0
-            hi: 22
-      right:
-        Literal:
-          Boolean:
-            - true
-            - span:
-                lo: 27
-                hi: 31
-      op: Or
-      span:
-        lo: 0
-        hi: 31
diff --git a/tests/expectations/tests/parser/expression/binary/pow.out b/tests/expectations/tests/parser/expression/binary/pow.out
deleted file mode 100644
index 3518b91ced..0000000000
--- a/tests/expectations/tests/parser/expression/binary/pow.out
+++ /dev/null
@@ -1,320 +0,0 @@
----
-namespace: ParseExpression
-expectation: Pass
-outputs:
-  - Binary:
-      left:
-        Literal:
-          Integer:
-            - U8
-            - "1"
-            - span:
-                lo: 0
-                hi: 3
-      right:
-        Literal:
-          Integer:
-            - U8
-            - "1"
-            - span:
-                lo: 7
-                hi: 10
-      op: Pow
-      span:
-        lo: 0
-        hi: 10
-  - Binary:
-      left:
-        Literal:
-          Integer:
-            - U8
-            - "2"
-            - span:
-                lo: 0
-                hi: 3
-      right:
-        Literal:
-          Integer:
-            - U8
-            - "3"
-            - span:
-                lo: 5
-                hi: 8
-      op: Pow
-      span:
-        lo: 0
-        hi: 8
-  - Binary:
-      left:
-        Literal:
-          Integer:
-            - U8
-            - "1"
-            - span:
-                lo: 0
-                hi: 3
-      right:
-        Binary:
-          left:
-            Literal:
-              Integer:
-                - U8
-                - "2"
-                - span:
-                    lo: 7
-                    hi: 10
-          right:
-            Literal:
-              Integer:
-                - U8
-                - "3"
-                - span:
-                    lo: 14
-                    hi: 17
-          op: Pow
-          span:
-            lo: 7
-            hi: 17
-      op: Pow
-      span:
-        lo: 0
-        hi: 17
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-              op: Pow
-              span:
-                lo: 2
-                hi: 10
-          op: Negate
-          span:
-            lo: 1
-            hi: 10
-      op: Not
-      span:
-        lo: 0
-        hi: 10
-  - Binary:
-      left:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
-              op: Pow
-              span:
-                lo: 0
-                hi: 8
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
-          op: Pow
-          span:
-            lo: 0
-            hi: 15
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":20,\\\"hi\\\":21}\"}"
-      op: Pow
-      span:
-        lo: 0
-        hi: 22
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
-          op: Pow
-          span:
-            lo: 1
-            hi: 9
-      op: Negate
-      span:
-        lo: 0
-        hi: 9
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Negate
-          span:
-            lo: 1
-            hi: 3
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
-      op: Pow
-      span:
-        lo: 1
-        hi: 11
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-          op: Pow
-          span:
-            lo: 2
-            hi: 10
-      op: Negate
-      span:
-        lo: 0
-        hi: 10
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-              op: Pow
-              span:
-                lo: 2
-                hi: 10
-          op: Negate
-          span:
-            lo: 1
-            hi: 10
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
-      op: Pow
-      span:
-        lo: 1
-        hi: 18
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
-          op: Pow
-          span:
-            lo: 1
-            hi: 9
-      op: Not
-      span:
-        lo: 0
-        hi: 9
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Not
-          span:
-            lo: 1
-            hi: 3
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
-      op: Pow
-      span:
-        lo: 1
-        hi: 11
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-          op: Pow
-          span:
-            lo: 2
-            hi: 10
-      op: Not
-      span:
-        lo: 0
-        hi: 10
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-              op: Pow
-              span:
-                lo: 2
-                hi: 10
-          op: Not
-          span:
-            lo: 1
-            hi: 10
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
-      op: Pow
-      span:
-        lo: 1
-        hi: 18
-  - Binary:
-      left:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
-              op: Pow
-              span:
-                lo: 1
-                hi: 9
-          right:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":19,\\\"hi\\\":20}\"}"
-              op: Pow
-              span:
-                lo: 13
-                hi: 21
-          op: Pow
-          span:
-            lo: 1
-            hi: 21
-      right:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":27,\\\"hi\\\":28}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":33,\\\"hi\\\":34}\"}"
-              op: Pow
-              span:
-                lo: 27
-                hi: 35
-          right:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":39,\\\"hi\\\":40}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":45,\\\"hi\\\":46}\"}"
-              op: Pow
-              span:
-                lo: 39
-                hi: 47
-          op: Pow
-          span:
-            lo: 27
-            hi: 47
-      op: Pow
-      span:
-        lo: 1
-        hi: 48
diff --git a/tests/expectations/tests/parser/expression/binary/pow_wrapped.out b/tests/expectations/tests/parser/expression/binary/pow_wrapped.out
deleted file mode 100644
index 223a91ff76..0000000000
--- a/tests/expectations/tests/parser/expression/binary/pow_wrapped.out
+++ /dev/null
@@ -1,243 +0,0 @@
----
-namespace: ParseExpression
-expectation: Pass
-outputs:
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
-              op: PowWrapped
-              span:
-                lo: 2
-                hi: 18
-          op: Negate
-          span:
-            lo: 1
-            hi: 18
-      op: Not
-      span:
-        lo: 0
-        hi: 18
-  - Binary:
-      left:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":14,\\\"hi\\\":15}\"}"
-              op: PowWrapped
-              span:
-                lo: 0
-                hi: 16
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":29,\\\"hi\\\":30}\"}"
-          op: PowWrapped
-          span:
-            lo: 0
-            hi: 31
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":44,\\\"hi\\\":45}\"}"
-      op: PowWrapped
-      span:
-        lo: 0
-        hi: 46
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
-          op: PowWrapped
-          span:
-            lo: 1
-            hi: 17
-      op: Negate
-      span:
-        lo: 0
-        hi: 17
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Negate
-          span:
-            lo: 1
-            hi: 3
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":17,\\\"hi\\\":18}\"}"
-      op: PowWrapped
-      span:
-        lo: 1
-        hi: 19
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
-          op: PowWrapped
-          span:
-            lo: 2
-            hi: 18
-      op: Negate
-      span:
-        lo: 0
-        hi: 18
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
-              op: PowWrapped
-              span:
-                lo: 2
-                hi: 18
-          op: Negate
-          span:
-            lo: 1
-            hi: 18
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":32,\\\"hi\\\":33}\"}"
-      op: PowWrapped
-      span:
-        lo: 1
-        hi: 34
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
-          op: PowWrapped
-          span:
-            lo: 1
-            hi: 17
-      op: Not
-      span:
-        lo: 0
-        hi: 17
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Not
-          span:
-            lo: 1
-            hi: 3
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":17,\\\"hi\\\":18}\"}"
-      op: PowWrapped
-      span:
-        lo: 1
-        hi: 19
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
-          op: PowWrapped
-          span:
-            lo: 2
-            hi: 18
-      op: Not
-      span:
-        lo: 0
-        hi: 18
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
-              op: PowWrapped
-              span:
-                lo: 2
-                hi: 18
-          op: Not
-          span:
-            lo: 1
-            hi: 18
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":32,\\\"hi\\\":33}\"}"
-      op: PowWrapped
-      span:
-        lo: 1
-        hi: 34
-  - Binary:
-      left:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
-              op: PowWrapped
-              span:
-                lo: 1
-                hi: 17
-          right:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":21,\\\"hi\\\":22}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":35,\\\"hi\\\":36}\"}"
-              op: PowWrapped
-              span:
-                lo: 21
-                hi: 37
-          op: Pow
-          span:
-            lo: 1
-            hi: 37
-      right:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":51,\\\"hi\\\":52}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":65,\\\"hi\\\":66}\"}"
-              op: PowWrapped
-              span:
-                lo: 51
-                hi: 67
-          right:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":71,\\\"hi\\\":72}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":85,\\\"hi\\\":86}\"}"
-              op: PowWrapped
-              span:
-                lo: 71
-                hi: 87
-          op: Pow
-          span:
-            lo: 51
-            hi: 87
-      op: PowWrapped
-      span:
-        lo: 1
-        hi: 88
diff --git a/tests/expectations/tests/parser/expression/binary/rem.out b/tests/expectations/tests/parser/expression/binary/rem.out
deleted file mode 100644
index 6f660566ab..0000000000
--- a/tests/expectations/tests/parser/expression/binary/rem.out
+++ /dev/null
@@ -1,369 +0,0 @@
----
-namespace: ParseExpression
-expectation: Pass
-outputs:
-  - Binary:
-      left:
-        Literal:
-          Integer:
-            - U8
-            - "1"
-            - span:
-                lo: 0
-                hi: 3
-      right:
-        Literal:
-          Integer:
-            - U8
-            - "1"
-            - span:
-                lo: 6
-                hi: 9
-      op: Rem
-      span:
-        lo: 0
-        hi: 9
-  - Binary:
-      left:
-        Literal:
-          Integer:
-            - U8
-            - "2"
-            - span:
-                lo: 0
-                hi: 3
-      right:
-        Literal:
-          Integer:
-            - U8
-            - "3"
-            - span:
-                lo: 4
-                hi: 7
-      op: Rem
-      span:
-        lo: 0
-        hi: 7
-  - Binary:
-      left:
-        Binary:
-          left:
-            Literal:
-              Integer:
-                - U8
-                - "1"
-                - span:
-                    lo: 0
-                    hi: 3
-          right:
-            Literal:
-              Integer:
-                - U8
-                - "2"
-                - span:
-                    lo: 6
-                    hi: 9
-          op: Rem
-          span:
-            lo: 0
-            hi: 9
-      right:
-        Literal:
-          Integer:
-            - U8
-            - "3"
-            - span:
-                lo: 12
-                hi: 15
-      op: Rem
-      span:
-        lo: 0
-        hi: 15
-  - Binary:
-      left:
-        Binary:
-          left:
-            Literal:
-              Integer:
-                - U8
-                - "1"
-                - span:
-                    lo: 0
-                    hi: 3
-          right:
-            Literal:
-              Integer:
-                - U8
-                - "2"
-                - span:
-                    lo: 7
-                    hi: 10
-          op: Pow
-          span:
-            lo: 0
-            hi: 10
-      right:
-        Binary:
-          left:
-            Literal:
-              Integer:
-                - U8
-                - "3"
-                - span:
-                    lo: 13
-                    hi: 16
-          right:
-            Literal:
-              Integer:
-                - U8
-                - "4"
-                - span:
-                    lo: 20
-                    hi: 23
-          op: Pow
-          span:
-            lo: 13
-            hi: 23
-      op: Rem
-      span:
-        lo: 0
-        hi: 23
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-              op: Rem
-              span:
-                lo: 2
-                hi: 10
-          op: Negate
-          span:
-            lo: 1
-            hi: 10
-      op: Not
-      span:
-        lo: 0
-        hi: 10
-  - Binary:
-      left:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
-              op: Rem
-              span:
-                lo: 0
-                hi: 8
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
-          op: Rem
-          span:
-            lo: 0
-            hi: 15
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":20,\\\"hi\\\":21}\"}"
-      op: Rem
-      span:
-        lo: 0
-        hi: 22
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
-          op: Rem
-          span:
-            lo: 1
-            hi: 9
-      op: Negate
-      span:
-        lo: 0
-        hi: 9
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Negate
-          span:
-            lo: 1
-            hi: 3
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
-      op: Rem
-      span:
-        lo: 1
-        hi: 11
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-          op: Rem
-          span:
-            lo: 2
-            hi: 10
-      op: Negate
-      span:
-        lo: 0
-        hi: 10
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-              op: Rem
-              span:
-                lo: 2
-                hi: 10
-          op: Negate
-          span:
-            lo: 1
-            hi: 10
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
-      op: Rem
-      span:
-        lo: 1
-        hi: 18
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
-          op: Rem
-          span:
-            lo: 1
-            hi: 9
-      op: Not
-      span:
-        lo: 0
-        hi: 9
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Not
-          span:
-            lo: 1
-            hi: 3
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
-      op: Rem
-      span:
-        lo: 1
-        hi: 11
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-          op: Rem
-          span:
-            lo: 2
-            hi: 10
-      op: Not
-      span:
-        lo: 0
-        hi: 10
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-              op: Rem
-              span:
-                lo: 2
-                hi: 10
-          op: Not
-          span:
-            lo: 1
-            hi: 10
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
-      op: Rem
-      span:
-        lo: 1
-        hi: 18
-  - Binary:
-      left:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
-              op: Rem
-              span:
-                lo: 1
-                hi: 9
-          right:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":13}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":18,\\\"hi\\\":19}\"}"
-              op: Rem
-              span:
-                lo: 12
-                hi: 20
-          op: Rem
-          span:
-            lo: 1
-            hi: 20
-      right:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":26,\\\"hi\\\":27}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":32,\\\"hi\\\":33}\"}"
-              op: Rem
-              span:
-                lo: 26
-                hi: 34
-          right:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":37,\\\"hi\\\":38}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":43,\\\"hi\\\":44}\"}"
-              op: Rem
-              span:
-                lo: 37
-                hi: 45
-          op: Rem
-          span:
-            lo: 26
-            hi: 45
-      op: Rem
-      span:
-        lo: 1
-        hi: 46
diff --git a/tests/expectations/tests/parser/expression/binary/rem_wrapped.out b/tests/expectations/tests/parser/expression/binary/rem_wrapped.out
deleted file mode 100644
index 9492d35ccb..0000000000
--- a/tests/expectations/tests/parser/expression/binary/rem_wrapped.out
+++ /dev/null
@@ -1,243 +0,0 @@
----
-namespace: ParseExpression
-expectation: Pass
-outputs:
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
-              op: RemWrapped
-              span:
-                lo: 2
-                hi: 18
-          op: Negate
-          span:
-            lo: 1
-            hi: 18
-      op: Not
-      span:
-        lo: 0
-        hi: 18
-  - Binary:
-      left:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":14,\\\"hi\\\":15}\"}"
-              op: RemWrapped
-              span:
-                lo: 0
-                hi: 16
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":29,\\\"hi\\\":30}\"}"
-          op: RemWrapped
-          span:
-            lo: 0
-            hi: 31
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":44,\\\"hi\\\":45}\"}"
-      op: RemWrapped
-      span:
-        lo: 0
-        hi: 46
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
-          op: RemWrapped
-          span:
-            lo: 1
-            hi: 17
-      op: Negate
-      span:
-        lo: 0
-        hi: 17
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Negate
-          span:
-            lo: 1
-            hi: 3
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":17,\\\"hi\\\":18}\"}"
-      op: RemWrapped
-      span:
-        lo: 1
-        hi: 19
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
-          op: RemWrapped
-          span:
-            lo: 2
-            hi: 18
-      op: Negate
-      span:
-        lo: 0
-        hi: 18
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
-              op: RemWrapped
-              span:
-                lo: 2
-                hi: 18
-          op: Negate
-          span:
-            lo: 1
-            hi: 18
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":32,\\\"hi\\\":33}\"}"
-      op: RemWrapped
-      span:
-        lo: 1
-        hi: 34
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
-          op: RemWrapped
-          span:
-            lo: 1
-            hi: 17
-      op: Not
-      span:
-        lo: 0
-        hi: 17
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Not
-          span:
-            lo: 1
-            hi: 3
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":17,\\\"hi\\\":18}\"}"
-      op: RemWrapped
-      span:
-        lo: 1
-        hi: 19
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
-          op: RemWrapped
-          span:
-            lo: 2
-            hi: 18
-      op: Not
-      span:
-        lo: 0
-        hi: 18
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
-              op: RemWrapped
-              span:
-                lo: 2
-                hi: 18
-          op: Not
-          span:
-            lo: 1
-            hi: 18
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":32,\\\"hi\\\":33}\"}"
-      op: RemWrapped
-      span:
-        lo: 1
-        hi: 34
-  - Binary:
-      left:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
-              op: RemWrapped
-              span:
-                lo: 1
-                hi: 17
-          right:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":20,\\\"hi\\\":21}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":34,\\\"hi\\\":35}\"}"
-              op: RemWrapped
-              span:
-                lo: 20
-                hi: 36
-          op: Div
-          span:
-            lo: 1
-            hi: 36
-      right:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":50,\\\"hi\\\":51}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":64,\\\"hi\\\":65}\"}"
-              op: RemWrapped
-              span:
-                lo: 50
-                hi: 66
-          right:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":69,\\\"hi\\\":70}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":83,\\\"hi\\\":84}\"}"
-              op: RemWrapped
-              span:
-                lo: 69
-                hi: 85
-          op: Div
-          span:
-            lo: 50
-            hi: 85
-      op: RemWrapped
-      span:
-        lo: 1
-        hi: 86
diff --git a/tests/expectations/tests/parser/expression/binary/shl.out b/tests/expectations/tests/parser/expression/binary/shl.out
deleted file mode 100644
index b48a76d608..0000000000
--- a/tests/expectations/tests/parser/expression/binary/shl.out
+++ /dev/null
@@ -1,481 +0,0 @@
----
-namespace: ParseExpression
-expectation: Pass
-outputs:
-  - Binary:
-      left:
-        Literal:
-          Integer:
-            - U8
-            - "1"
-            - span:
-                lo: 0
-                hi: 3
-      right:
-        Literal:
-          Integer:
-            - U8
-            - "1"
-            - span:
-                lo: 7
-                hi: 10
-      op: Shl
-      span:
-        lo: 0
-        hi: 10
-  - Binary:
-      left:
-        Literal:
-          Integer:
-            - U8
-            - "2"
-            - span:
-                lo: 0
-                hi: 3
-      right:
-        Literal:
-          Integer:
-            - U8
-            - "3"
-            - span:
-                lo: 5
-                hi: 8
-      op: Shl
-      span:
-        lo: 0
-        hi: 8
-  - Binary:
-      left:
-        Binary:
-          left:
-            Literal:
-              Integer:
-                - U8
-                - "1"
-                - span:
-                    lo: 0
-                    hi: 3
-          right:
-            Literal:
-              Integer:
-                - U8
-                - "2"
-                - span:
-                    lo: 7
-                    hi: 10
-          op: Shl
-          span:
-            lo: 0
-            hi: 10
-      right:
-        Literal:
-          Integer:
-            - U8
-            - "3"
-            - span:
-                lo: 14
-                hi: 17
-      op: Shl
-      span:
-        lo: 0
-        hi: 17
-  - Binary:
-      left:
-        Binary:
-          left:
-            Literal:
-              Integer:
-                - U8
-                - "1"
-                - span:
-                    lo: 0
-                    hi: 3
-          right:
-            Literal:
-              Integer:
-                - U8
-                - "2"
-                - span:
-                    lo: 6
-                    hi: 9
-          op: Add
-          span:
-            lo: 0
-            hi: 9
-      right:
-        Binary:
-          left:
-            Literal:
-              Integer:
-                - U8
-                - "3"
-                - span:
-                    lo: 13
-                    hi: 16
-          right:
-            Literal:
-              Integer:
-                - U8
-                - "4"
-                - span:
-                    lo: 19
-                    hi: 22
-          op: Add
-          span:
-            lo: 13
-            hi: 22
-      op: Shl
-      span:
-        lo: 0
-        hi: 22
-  - Binary:
-      left:
-        Binary:
-          left:
-            Literal:
-              Integer:
-                - U8
-                - "1"
-                - span:
-                    lo: 0
-                    hi: 3
-          right:
-            Literal:
-              Integer:
-                - U8
-                - "2"
-                - span:
-                    lo: 7
-                    hi: 10
-          op: Shl
-          span:
-            lo: 0
-            hi: 10
-      right:
-        Literal:
-          Integer:
-            - U8
-            - "3"
-            - span:
-                lo: 14
-                hi: 17
-      op: Shl
-      span:
-        lo: 0
-        hi: 17
-  - Binary:
-      left:
-        Binary:
-          left:
-            Binary:
-              left:
-                Literal:
-                  Integer:
-                    - U8
-                    - "1"
-                    - span:
-                        lo: 0
-                        hi: 3
-              right:
-                Literal:
-                  Integer:
-                    - U8
-                    - "2"
-                    - span:
-                        lo: 6
-                        hi: 9
-              op: Add
-              span:
-                lo: 0
-                hi: 9
-          right:
-            Binary:
-              left:
-                Literal:
-                  Integer:
-                    - U8
-                    - "3"
-                    - span:
-                        lo: 13
-                        hi: 16
-              right:
-                Literal:
-                  Integer:
-                    - U8
-                    - "4"
-                    - span:
-                        lo: 19
-                        hi: 22
-              op: Add
-              span:
-                lo: 13
-                hi: 22
-          op: Shl
-          span:
-            lo: 0
-            hi: 22
-      right:
-        Binary:
-          left:
-            Literal:
-              Integer:
-                - U8
-                - "5"
-                - span:
-                    lo: 26
-                    hi: 29
-          right:
-            Literal:
-              Integer:
-                - U8
-                - "6"
-                - span:
-                    lo: 32
-                    hi: 35
-          op: Add
-          span:
-            lo: 26
-            hi: 35
-      op: Shl
-      span:
-        lo: 0
-        hi: 35
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-              op: Shl
-              span:
-                lo: 2
-                hi: 10
-          op: Negate
-          span:
-            lo: 1
-            hi: 10
-      op: Not
-      span:
-        lo: 0
-        hi: 10
-  - Binary:
-      left:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
-              op: Shl
-              span:
-                lo: 0
-                hi: 8
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
-          op: Shl
-          span:
-            lo: 0
-            hi: 15
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":20,\\\"hi\\\":21}\"}"
-      op: Shl
-      span:
-        lo: 0
-        hi: 22
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
-          op: Shl
-          span:
-            lo: 1
-            hi: 9
-      op: Negate
-      span:
-        lo: 0
-        hi: 9
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Negate
-          span:
-            lo: 1
-            hi: 3
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
-      op: Shl
-      span:
-        lo: 1
-        hi: 11
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-          op: Shl
-          span:
-            lo: 2
-            hi: 10
-      op: Negate
-      span:
-        lo: 0
-        hi: 10
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-              op: Shl
-              span:
-                lo: 2
-                hi: 10
-          op: Negate
-          span:
-            lo: 1
-            hi: 10
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
-      op: Shl
-      span:
-        lo: 1
-        hi: 18
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
-          op: Shl
-          span:
-            lo: 1
-            hi: 9
-      op: Not
-      span:
-        lo: 0
-        hi: 9
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Not
-          span:
-            lo: 1
-            hi: 3
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
-      op: Shl
-      span:
-        lo: 1
-        hi: 11
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-          op: Shl
-          span:
-            lo: 2
-            hi: 10
-      op: Not
-      span:
-        lo: 0
-        hi: 10
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-              op: Shl
-              span:
-                lo: 2
-                hi: 10
-          op: Not
-          span:
-            lo: 1
-            hi: 10
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
-      op: Shl
-      span:
-        lo: 1
-        hi: 18
-  - Binary:
-      left:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
-              op: Shl
-              span:
-                lo: 1
-                hi: 9
-          right:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":19,\\\"hi\\\":20}\"}"
-              op: Shl
-              span:
-                lo: 13
-                hi: 21
-          op: Shl
-          span:
-            lo: 1
-            hi: 21
-      right:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":27,\\\"hi\\\":28}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":33,\\\"hi\\\":34}\"}"
-              op: Shl
-              span:
-                lo: 27
-                hi: 35
-          right:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":39,\\\"hi\\\":40}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":45,\\\"hi\\\":46}\"}"
-              op: Shl
-              span:
-                lo: 39
-                hi: 47
-          op: Shl
-          span:
-            lo: 27
-            hi: 47
-      op: Shl
-      span:
-        lo: 1
-        hi: 48
diff --git a/tests/expectations/tests/parser/expression/binary/shl_wrapped.out b/tests/expectations/tests/parser/expression/binary/shl_wrapped.out
deleted file mode 100644
index 478abf1ade..0000000000
--- a/tests/expectations/tests/parser/expression/binary/shl_wrapped.out
+++ /dev/null
@@ -1,243 +0,0 @@
----
-namespace: ParseExpression
-expectation: Pass
-outputs:
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
-              op: ShlWrapped
-              span:
-                lo: 2
-                hi: 18
-          op: Negate
-          span:
-            lo: 1
-            hi: 18
-      op: Not
-      span:
-        lo: 0
-        hi: 18
-  - Binary:
-      left:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":14,\\\"hi\\\":15}\"}"
-              op: ShlWrapped
-              span:
-                lo: 0
-                hi: 16
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":29,\\\"hi\\\":30}\"}"
-          op: ShlWrapped
-          span:
-            lo: 0
-            hi: 31
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":44,\\\"hi\\\":45}\"}"
-      op: ShlWrapped
-      span:
-        lo: 0
-        hi: 46
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
-          op: ShlWrapped
-          span:
-            lo: 1
-            hi: 17
-      op: Negate
-      span:
-        lo: 0
-        hi: 17
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Negate
-          span:
-            lo: 1
-            hi: 3
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":17,\\\"hi\\\":18}\"}"
-      op: ShlWrapped
-      span:
-        lo: 1
-        hi: 19
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
-          op: ShlWrapped
-          span:
-            lo: 2
-            hi: 18
-      op: Negate
-      span:
-        lo: 0
-        hi: 18
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
-              op: ShlWrapped
-              span:
-                lo: 2
-                hi: 18
-          op: Negate
-          span:
-            lo: 1
-            hi: 18
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":32,\\\"hi\\\":33}\"}"
-      op: ShlWrapped
-      span:
-        lo: 1
-        hi: 34
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
-          op: ShlWrapped
-          span:
-            lo: 1
-            hi: 17
-      op: Not
-      span:
-        lo: 0
-        hi: 17
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Not
-          span:
-            lo: 1
-            hi: 3
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":17,\\\"hi\\\":18}\"}"
-      op: ShlWrapped
-      span:
-        lo: 1
-        hi: 19
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
-          op: ShlWrapped
-          span:
-            lo: 2
-            hi: 18
-      op: Not
-      span:
-        lo: 0
-        hi: 18
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
-              op: ShlWrapped
-              span:
-                lo: 2
-                hi: 18
-          op: Not
-          span:
-            lo: 1
-            hi: 18
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":32,\\\"hi\\\":33}\"}"
-      op: ShlWrapped
-      span:
-        lo: 1
-        hi: 34
-  - Binary:
-      left:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
-              op: ShlWrapped
-              span:
-                lo: 1
-                hi: 17
-          right:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":21,\\\"hi\\\":22}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":35,\\\"hi\\\":36}\"}"
-              op: ShlWrapped
-              span:
-                lo: 21
-                hi: 37
-          op: Shl
-          span:
-            lo: 1
-            hi: 37
-      right:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":51,\\\"hi\\\":52}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":65,\\\"hi\\\":66}\"}"
-              op: ShlWrapped
-              span:
-                lo: 51
-                hi: 67
-          right:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":71,\\\"hi\\\":72}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":85,\\\"hi\\\":86}\"}"
-              op: ShlWrapped
-              span:
-                lo: 71
-                hi: 87
-          op: Shl
-          span:
-            lo: 51
-            hi: 87
-      op: ShlWrapped
-      span:
-        lo: 1
-        hi: 88
diff --git a/tests/expectations/tests/parser/expression/binary/shr.out b/tests/expectations/tests/parser/expression/binary/shr.out
deleted file mode 100644
index 8db4b5803d..0000000000
--- a/tests/expectations/tests/parser/expression/binary/shr.out
+++ /dev/null
@@ -1,481 +0,0 @@
----
-namespace: ParseExpression
-expectation: Pass
-outputs:
-  - Binary:
-      left:
-        Literal:
-          Integer:
-            - U8
-            - "1"
-            - span:
-                lo: 0
-                hi: 3
-      right:
-        Literal:
-          Integer:
-            - U8
-            - "1"
-            - span:
-                lo: 7
-                hi: 10
-      op: Shr
-      span:
-        lo: 0
-        hi: 10
-  - Binary:
-      left:
-        Literal:
-          Integer:
-            - U8
-            - "2"
-            - span:
-                lo: 0
-                hi: 3
-      right:
-        Literal:
-          Integer:
-            - U8
-            - "3"
-            - span:
-                lo: 5
-                hi: 8
-      op: Shr
-      span:
-        lo: 0
-        hi: 8
-  - Binary:
-      left:
-        Binary:
-          left:
-            Literal:
-              Integer:
-                - U8
-                - "1"
-                - span:
-                    lo: 0
-                    hi: 3
-          right:
-            Literal:
-              Integer:
-                - U8
-                - "2"
-                - span:
-                    lo: 7
-                    hi: 10
-          op: Shr
-          span:
-            lo: 0
-            hi: 10
-      right:
-        Literal:
-          Integer:
-            - U8
-            - "3"
-            - span:
-                lo: 14
-                hi: 17
-      op: Shr
-      span:
-        lo: 0
-        hi: 17
-  - Binary:
-      left:
-        Binary:
-          left:
-            Literal:
-              Integer:
-                - U8
-                - "1"
-                - span:
-                    lo: 0
-                    hi: 3
-          right:
-            Literal:
-              Integer:
-                - U8
-                - "2"
-                - span:
-                    lo: 6
-                    hi: 9
-          op: Add
-          span:
-            lo: 0
-            hi: 9
-      right:
-        Binary:
-          left:
-            Literal:
-              Integer:
-                - U8
-                - "3"
-                - span:
-                    lo: 13
-                    hi: 16
-          right:
-            Literal:
-              Integer:
-                - U8
-                - "4"
-                - span:
-                    lo: 19
-                    hi: 22
-          op: Add
-          span:
-            lo: 13
-            hi: 22
-      op: Shr
-      span:
-        lo: 0
-        hi: 22
-  - Binary:
-      left:
-        Binary:
-          left:
-            Literal:
-              Integer:
-                - U8
-                - "1"
-                - span:
-                    lo: 0
-                    hi: 3
-          right:
-            Literal:
-              Integer:
-                - U8
-                - "2"
-                - span:
-                    lo: 7
-                    hi: 10
-          op: Shr
-          span:
-            lo: 0
-            hi: 10
-      right:
-        Literal:
-          Integer:
-            - U8
-            - "3"
-            - span:
-                lo: 14
-                hi: 17
-      op: Shr
-      span:
-        lo: 0
-        hi: 17
-  - Binary:
-      left:
-        Binary:
-          left:
-            Binary:
-              left:
-                Literal:
-                  Integer:
-                    - U8
-                    - "1"
-                    - span:
-                        lo: 0
-                        hi: 3
-              right:
-                Literal:
-                  Integer:
-                    - U8
-                    - "2"
-                    - span:
-                        lo: 6
-                        hi: 9
-              op: Add
-              span:
-                lo: 0
-                hi: 9
-          right:
-            Binary:
-              left:
-                Literal:
-                  Integer:
-                    - U8
-                    - "3"
-                    - span:
-                        lo: 13
-                        hi: 16
-              right:
-                Literal:
-                  Integer:
-                    - U8
-                    - "4"
-                    - span:
-                        lo: 19
-                        hi: 22
-              op: Add
-              span:
-                lo: 13
-                hi: 22
-          op: Shr
-          span:
-            lo: 0
-            hi: 22
-      right:
-        Binary:
-          left:
-            Literal:
-              Integer:
-                - U8
-                - "5"
-                - span:
-                    lo: 26
-                    hi: 29
-          right:
-            Literal:
-              Integer:
-                - U8
-                - "6"
-                - span:
-                    lo: 32
-                    hi: 35
-          op: Add
-          span:
-            lo: 26
-            hi: 35
-      op: Shr
-      span:
-        lo: 0
-        hi: 35
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-              op: Shr
-              span:
-                lo: 2
-                hi: 10
-          op: Negate
-          span:
-            lo: 1
-            hi: 10
-      op: Not
-      span:
-        lo: 0
-        hi: 10
-  - Binary:
-      left:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
-              op: Shr
-              span:
-                lo: 0
-                hi: 8
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
-          op: Shr
-          span:
-            lo: 0
-            hi: 15
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":20,\\\"hi\\\":21}\"}"
-      op: Shr
-      span:
-        lo: 0
-        hi: 22
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
-          op: Shr
-          span:
-            lo: 1
-            hi: 9
-      op: Negate
-      span:
-        lo: 0
-        hi: 9
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Negate
-          span:
-            lo: 1
-            hi: 3
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
-      op: Shr
-      span:
-        lo: 1
-        hi: 11
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-          op: Shr
-          span:
-            lo: 2
-            hi: 10
-      op: Negate
-      span:
-        lo: 0
-        hi: 10
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-              op: Shr
-              span:
-                lo: 2
-                hi: 10
-          op: Negate
-          span:
-            lo: 1
-            hi: 10
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
-      op: Shr
-      span:
-        lo: 1
-        hi: 18
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
-          op: Shr
-          span:
-            lo: 1
-            hi: 9
-      op: Not
-      span:
-        lo: 0
-        hi: 9
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Not
-          span:
-            lo: 1
-            hi: 3
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
-      op: Shr
-      span:
-        lo: 1
-        hi: 11
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-          op: Shr
-          span:
-            lo: 2
-            hi: 10
-      op: Not
-      span:
-        lo: 0
-        hi: 10
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-              op: Shr
-              span:
-                lo: 2
-                hi: 10
-          op: Not
-          span:
-            lo: 1
-            hi: 10
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
-      op: Shr
-      span:
-        lo: 1
-        hi: 18
-  - Binary:
-      left:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
-              op: Shr
-              span:
-                lo: 1
-                hi: 9
-          right:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":19,\\\"hi\\\":20}\"}"
-              op: Shr
-              span:
-                lo: 13
-                hi: 21
-          op: Shr
-          span:
-            lo: 1
-            hi: 21
-      right:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":27,\\\"hi\\\":28}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":33,\\\"hi\\\":34}\"}"
-              op: Shr
-              span:
-                lo: 27
-                hi: 35
-          right:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":39,\\\"hi\\\":40}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":45,\\\"hi\\\":46}\"}"
-              op: Shr
-              span:
-                lo: 39
-                hi: 47
-          op: Shr
-          span:
-            lo: 27
-            hi: 47
-      op: Shr
-      span:
-        lo: 1
-        hi: 48
diff --git a/tests/expectations/tests/parser/expression/binary/shr_wrapped.out b/tests/expectations/tests/parser/expression/binary/shr_wrapped.out
deleted file mode 100644
index fca601254b..0000000000
--- a/tests/expectations/tests/parser/expression/binary/shr_wrapped.out
+++ /dev/null
@@ -1,243 +0,0 @@
----
-namespace: ParseExpression
-expectation: Pass
-outputs:
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
-              op: ShrWrapped
-              span:
-                lo: 2
-                hi: 18
-          op: Negate
-          span:
-            lo: 1
-            hi: 18
-      op: Not
-      span:
-        lo: 0
-        hi: 18
-  - Binary:
-      left:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":14,\\\"hi\\\":15}\"}"
-              op: ShrWrapped
-              span:
-                lo: 0
-                hi: 16
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":29,\\\"hi\\\":30}\"}"
-          op: ShrWrapped
-          span:
-            lo: 0
-            hi: 31
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":44,\\\"hi\\\":45}\"}"
-      op: ShrWrapped
-      span:
-        lo: 0
-        hi: 46
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
-          op: ShrWrapped
-          span:
-            lo: 1
-            hi: 17
-      op: Negate
-      span:
-        lo: 0
-        hi: 17
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Negate
-          span:
-            lo: 1
-            hi: 3
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":17,\\\"hi\\\":18}\"}"
-      op: ShrWrapped
-      span:
-        lo: 1
-        hi: 19
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
-          op: ShrWrapped
-          span:
-            lo: 2
-            hi: 18
-      op: Negate
-      span:
-        lo: 0
-        hi: 18
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
-              op: ShrWrapped
-              span:
-                lo: 2
-                hi: 18
-          op: Negate
-          span:
-            lo: 1
-            hi: 18
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":32,\\\"hi\\\":33}\"}"
-      op: ShrWrapped
-      span:
-        lo: 1
-        hi: 34
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
-          op: ShrWrapped
-          span:
-            lo: 1
-            hi: 17
-      op: Not
-      span:
-        lo: 0
-        hi: 17
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Not
-          span:
-            lo: 1
-            hi: 3
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":17,\\\"hi\\\":18}\"}"
-      op: ShrWrapped
-      span:
-        lo: 1
-        hi: 19
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
-          op: ShrWrapped
-          span:
-            lo: 2
-            hi: 18
-      op: Not
-      span:
-        lo: 0
-        hi: 18
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
-              op: ShrWrapped
-              span:
-                lo: 2
-                hi: 18
-          op: Not
-          span:
-            lo: 1
-            hi: 18
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":32,\\\"hi\\\":33}\"}"
-      op: ShrWrapped
-      span:
-        lo: 1
-        hi: 34
-  - Binary:
-      left:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
-              op: ShrWrapped
-              span:
-                lo: 1
-                hi: 17
-          right:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":21,\\\"hi\\\":22}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":35,\\\"hi\\\":36}\"}"
-              op: ShrWrapped
-              span:
-                lo: 21
-                hi: 37
-          op: Shr
-          span:
-            lo: 1
-            hi: 37
-      right:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":51,\\\"hi\\\":52}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":65,\\\"hi\\\":66}\"}"
-              op: ShrWrapped
-              span:
-                lo: 51
-                hi: 67
-          right:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":71,\\\"hi\\\":72}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":85,\\\"hi\\\":86}\"}"
-              op: ShrWrapped
-              span:
-                lo: 71
-                hi: 87
-          op: Shr
-          span:
-            lo: 51
-            hi: 87
-      op: ShrWrapped
-      span:
-        lo: 1
-        hi: 88
diff --git a/tests/expectations/tests/parser/expression/binary/sub.out b/tests/expectations/tests/parser/expression/binary/sub.out
deleted file mode 100644
index 9135e81167..0000000000
--- a/tests/expectations/tests/parser/expression/binary/sub.out
+++ /dev/null
@@ -1,369 +0,0 @@
----
-namespace: ParseExpression
-expectation: Pass
-outputs:
-  - Binary:
-      left:
-        Literal:
-          Integer:
-            - U8
-            - "1"
-            - span:
-                lo: 0
-                hi: 3
-      right:
-        Literal:
-          Integer:
-            - U8
-            - "1"
-            - span:
-                lo: 6
-                hi: 9
-      op: Sub
-      span:
-        lo: 0
-        hi: 9
-  - Binary:
-      left:
-        Literal:
-          Integer:
-            - U16
-            - "2"
-            - span:
-                lo: 0
-                hi: 4
-      right:
-        Literal:
-          Integer:
-            - U64
-            - "3"
-            - span:
-                lo: 5
-                hi: 9
-      op: Sub
-      span:
-        lo: 0
-        hi: 9
-  - Binary:
-      left:
-        Binary:
-          left:
-            Literal:
-              Integer:
-                - U32
-                - "1"
-                - span:
-                    lo: 0
-                    hi: 4
-          right:
-            Literal:
-              Integer:
-                - U32
-                - "2"
-                - span:
-                    lo: 7
-                    hi: 11
-          op: Sub
-          span:
-            lo: 0
-            hi: 11
-      right:
-        Literal:
-          Integer:
-            - U32
-            - "3"
-            - span:
-                lo: 14
-                hi: 18
-      op: Sub
-      span:
-        lo: 0
-        hi: 18
-  - Binary:
-      left:
-        Binary:
-          left:
-            Literal:
-              Integer:
-                - U8
-                - "1"
-                - span:
-                    lo: 0
-                    hi: 3
-          right:
-            Literal:
-              Integer:
-                - U16
-                - "2"
-                - span:
-                    lo: 6
-                    hi: 10
-          op: Mul
-          span:
-            lo: 0
-            hi: 10
-      right:
-        Binary:
-          left:
-            Literal:
-              Integer:
-                - U32
-                - "3"
-                - span:
-                    lo: 13
-                    hi: 17
-          right:
-            Literal:
-              Integer:
-                - I64
-                - "4"
-                - span:
-                    lo: 20
-                    hi: 24
-          op: Mul
-          span:
-            lo: 13
-            hi: 24
-      op: Sub
-      span:
-        lo: 0
-        hi: 24
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-              op: Sub
-              span:
-                lo: 2
-                hi: 10
-          op: Negate
-          span:
-            lo: 1
-            hi: 10
-      op: Not
-      span:
-        lo: 0
-        hi: 10
-  - Binary:
-      left:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
-              op: Sub
-              span:
-                lo: 0
-                hi: 8
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
-          op: Sub
-          span:
-            lo: 0
-            hi: 15
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":20,\\\"hi\\\":21}\"}"
-      op: Sub
-      span:
-        lo: 0
-        hi: 22
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
-          op: Sub
-          span:
-            lo: 1
-            hi: 9
-      op: Negate
-      span:
-        lo: 0
-        hi: 9
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Negate
-          span:
-            lo: 1
-            hi: 3
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
-      op: Sub
-      span:
-        lo: 1
-        hi: 11
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-          op: Sub
-          span:
-            lo: 2
-            hi: 10
-      op: Negate
-      span:
-        lo: 0
-        hi: 10
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-              op: Sub
-              span:
-                lo: 2
-                hi: 10
-          op: Negate
-          span:
-            lo: 1
-            hi: 10
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
-      op: Sub
-      span:
-        lo: 1
-        hi: 18
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
-          op: Sub
-          span:
-            lo: 1
-            hi: 9
-      op: Not
-      span:
-        lo: 0
-        hi: 9
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Not
-          span:
-            lo: 1
-            hi: 3
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
-      op: Sub
-      span:
-        lo: 1
-        hi: 11
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-          op: Sub
-          span:
-            lo: 2
-            hi: 10
-      op: Not
-      span:
-        lo: 0
-        hi: 10
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-              op: Sub
-              span:
-                lo: 2
-                hi: 10
-          op: Not
-          span:
-            lo: 1
-            hi: 10
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
-      op: Sub
-      span:
-        lo: 1
-        hi: 18
-  - Binary:
-      left:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
-              op: Sub
-              span:
-                lo: 1
-                hi: 9
-          right:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":19,\\\"hi\\\":20}\"}"
-              op: Sub
-              span:
-                lo: 13
-                hi: 21
-          op: Shl
-          span:
-            lo: 1
-            hi: 21
-      right:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":27,\\\"hi\\\":28}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":33,\\\"hi\\\":34}\"}"
-              op: Sub
-              span:
-                lo: 27
-                hi: 35
-          right:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":39,\\\"hi\\\":40}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":45,\\\"hi\\\":46}\"}"
-              op: Sub
-              span:
-                lo: 39
-                hi: 47
-          op: Shl
-          span:
-            lo: 27
-            hi: 47
-      op: Sub
-      span:
-        lo: 1
-        hi: 48
diff --git a/tests/expectations/tests/parser/expression/binary/sub_wrapped.out b/tests/expectations/tests/parser/expression/binary/sub_wrapped.out
deleted file mode 100644
index accd061554..0000000000
--- a/tests/expectations/tests/parser/expression/binary/sub_wrapped.out
+++ /dev/null
@@ -1,243 +0,0 @@
----
-namespace: ParseExpression
-expectation: Pass
-outputs:
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
-              op: SubWrapped
-              span:
-                lo: 2
-                hi: 18
-          op: Negate
-          span:
-            lo: 1
-            hi: 18
-      op: Not
-      span:
-        lo: 0
-        hi: 18
-  - Binary:
-      left:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":14,\\\"hi\\\":15}\"}"
-              op: SubWrapped
-              span:
-                lo: 0
-                hi: 16
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":29,\\\"hi\\\":30}\"}"
-          op: SubWrapped
-          span:
-            lo: 0
-            hi: 31
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":44,\\\"hi\\\":45}\"}"
-      op: SubWrapped
-      span:
-        lo: 0
-        hi: 46
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
-          op: SubWrapped
-          span:
-            lo: 1
-            hi: 17
-      op: Negate
-      span:
-        lo: 0
-        hi: 17
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Negate
-          span:
-            lo: 1
-            hi: 3
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":17,\\\"hi\\\":18}\"}"
-      op: SubWrapped
-      span:
-        lo: 1
-        hi: 19
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
-          op: SubWrapped
-          span:
-            lo: 2
-            hi: 18
-      op: Negate
-      span:
-        lo: 0
-        hi: 18
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
-              op: SubWrapped
-              span:
-                lo: 2
-                hi: 18
-          op: Negate
-          span:
-            lo: 1
-            hi: 18
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":32,\\\"hi\\\":33}\"}"
-      op: SubWrapped
-      span:
-        lo: 1
-        hi: 34
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
-          op: SubWrapped
-          span:
-            lo: 1
-            hi: 17
-      op: Not
-      span:
-        lo: 0
-        hi: 17
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Not
-          span:
-            lo: 1
-            hi: 3
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":17,\\\"hi\\\":18}\"}"
-      op: SubWrapped
-      span:
-        lo: 1
-        hi: 19
-  - Unary:
-      receiver:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
-          op: SubWrapped
-          span:
-            lo: 2
-            hi: 18
-      op: Not
-      span:
-        lo: 0
-        hi: 18
-  - Binary:
-      left:
-        Unary:
-          receiver:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
-              op: SubWrapped
-              span:
-                lo: 2
-                hi: 18
-          op: Not
-          span:
-            lo: 1
-            hi: 18
-      right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":32,\\\"hi\\\":33}\"}"
-      op: SubWrapped
-      span:
-        lo: 1
-        hi: 34
-  - Binary:
-      left:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
-              op: SubWrapped
-              span:
-                lo: 1
-                hi: 17
-          right:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":21,\\\"hi\\\":22}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":35,\\\"hi\\\":36}\"}"
-              op: SubWrapped
-              span:
-                lo: 21
-                hi: 37
-          op: Shl
-          span:
-            lo: 1
-            hi: 37
-      right:
-        Binary:
-          left:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":51,\\\"hi\\\":52}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":65,\\\"hi\\\":66}\"}"
-              op: SubWrapped
-              span:
-                lo: 51
-                hi: 67
-          right:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":71,\\\"hi\\\":72}\"}"
-              right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":85,\\\"hi\\\":86}\"}"
-              op: SubWrapped
-              span:
-                lo: 71
-                hi: 87
-          op: Shl
-          span:
-            lo: 51
-            hi: 87
-      op: SubWrapped
-      span:
-        lo: 1
-        hi: 88
diff --git a/tests/expectations/tests/parser/expression/circuit_init_fail.out b/tests/expectations/tests/parser/expression/circuit_init_fail.out
deleted file mode 100644
index a1898918cf..0000000000
--- a/tests/expectations/tests/parser/expression/circuit_init_fail.out
+++ /dev/null
@@ -1,16 +0,0 @@
----
-namespace: ParseExpression
-expectation: Fail
-outputs:
-  - "Error [EPAR0370009]: unexpected string: expected 'identifier', found '<eof>'\n    --> test:1:3\n     |\n   1 | x {\n     |   ^"
-  - "did not consume all input: '}' @ 1:3-4\n"
-  - "Error [EPAR0370009]: unexpected string: expected 'identifier', found ','\n    --> test:1:4\n     |\n   1 | x {,}\n     |    ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'identifier', found ','\n    --> test:1:5\n     |\n   1 | x { , }\n     |     ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'identifier', found ','\n    --> test:1:4\n     |\n   1 | x {,,,}\n     |    ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'identifier', found ','\n    --> test:1:6\n     |\n   1 | x {x,,}\n     |      ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'identifier', found ','\n    --> test:1:4\n     |\n   1 | x {,,x}\n     |    ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'identifier', found ','\n    --> test:1:4\n     |\n   1 | x {,x}\n     |    ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'identifier', found ','\n    --> test:1:8\n     |\n   1 | x {x:y,,}\n     |        ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'identifier', found ','\n    --> test:1:4\n     |\n   1 | x {,,x:y}\n     |    ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'identifier', found ','\n    --> test:1:4\n     |\n   1 | x {,x:y}\n     |    ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found '}'\n    --> test:1:6\n     |\n   1 | x {x:}\n     |      ^"
diff --git a/tests/expectations/tests/parser/expression/ident.out b/tests/expectations/tests/parser/expression/ident.out
deleted file mode 100644
index 17dcc95565..0000000000
--- a/tests/expectations/tests/parser/expression/ident.out
+++ /dev/null
@@ -1,23 +0,0 @@
----
-namespace: ParseExpression
-expectation: Pass
-outputs:
-  - Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
-  - Identifier: "{\"name\":\"X\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
-  - Identifier: "{\"name\":\"xxx\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":3}\"}"
-  - Identifier: "{\"name\":\"XXX\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":3}\"}"
-  - Identifier: "{\"name\":\"x1\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":2}\"}"
-  - Identifier: "{\"name\":\"xu32\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":4}\"}"
-  - Identifier: "{\"name\":\"testx\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":5}\"}"
-  - Identifier: "{\"name\":\"truex\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":5}\"}"
-  - Identifier: "{\"name\":\"TRUE\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":4}\"}"
-  - Identifier: "{\"name\":\"testX\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":5}\"}"
-  - Identifier: "{\"name\":\"letX\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":4}\"}"
-  - Identifier: "{\"name\":\"constX\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":6}\"}"
-  - Identifier: "{\"name\":\"test_test\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":9}\"}"
-  - Identifier: "{\"name\":\"self\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":4}\"}"
-  - Identifier: "{\"name\":\"Self\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":4}\"}"
-  - Identifier: "{\"name\":\"input\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":5}\"}"
-  - Identifier: "{\"name\":\"selfX\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":5}\"}"
-  - Identifier: "{\"name\":\"SelfX\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":5}\"}"
-  - Identifier: "{\"name\":\"inputX\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":6}\"}"
diff --git a/tests/expectations/tests/parser/expression/literal/address.out b/tests/expectations/tests/parser/expression/literal/address.out
deleted file mode 100644
index b0e997ef27..0000000000
--- a/tests/expectations/tests/parser/expression/literal/address.out
+++ /dev/null
@@ -1,10 +0,0 @@
----
-namespace: Token
-expectation: Pass
-outputs:
-  - "'aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8s7pyjh9' @ 1:1-64"
-  - "'ALEO1' @ 1:1-6"
-  - "'Aleo1' @ 1:1-6"
-  - "'aleO1' @ 1:1-6"
-  - "'aleo2qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57d9' @ 1:1-64"
-  - "'bleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57d9' @ 1:1-64"
diff --git a/tests/expectations/tests/parser/expression/literal/address_fail.out b/tests/expectations/tests/parser/expression/literal/address_fail.out
deleted file mode 100644
index 23b56de7c9..0000000000
--- a/tests/expectations/tests/parser/expression/literal/address_fail.out
+++ /dev/null
@@ -1,14 +0,0 @@
----
-namespace: ParseExpression
-expectation: Fail
-outputs:
-  - "Error [EPAR0370001]: invalid address literal: 'aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57d1aleo1'\n    --> test:1:1\n     |\n   1 | aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57d1aleo1\n     | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^"
-  - "Error [EPAR0370001]: invalid address literal: 'aleo1qnr4dkkvkgfqph0vzc3y6Z2eu975wnpz2925ntjccd5cfqxtyu8sta57J9'\n    --> test:1:1\n     |\n   1 | aleo1qnr4dkkvkgfqph0vzc3y6Z2eu975wnpz2925ntjccd5cfqxtyu8sta57J9\n     | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^"
-  - "Error [EPAR0370001]: invalid address literal: 'aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j9'\n    --> test:1:1\n     |\n   1 | aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j9\n     | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^"
-  - "Error [EPAR0370001]: invalid address literal: 'aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57d'\n    --> test:1:1\n     |\n   1 | aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57d\n     | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^"
-  - "Error [EPAR0370001]: invalid address literal: 'aleo1'\n    --> test:1:1\n     |\n   1 | aleo1\n     | ^^^^^"
-  - "Error [EPAR0370001]: invalid address literal: 'aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8st'\n    --> test:1:1\n     |\n   1 | aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8st\n     | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^"
-  - "Error [EPAR0370001]: invalid address literal: 'aleo1'\n    --> test:1:1\n     |\n   1 | aleo1\n     | ^^^^^"
-  - "Error [EPAR0370001]: invalid address literal: 'aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57d1aleo1'\n    --> test:1:1\n     |\n   1 | aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57d1aleo1\n     | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^"
-  - "Error [EPAR0370001]: invalid address literal: 'aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57d11'\n    --> test:1:1\n     |\n   1 | aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57d11\n     | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^"
-  - "Error [EPAR0370001]: invalid address literal: 'aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57d1x'\n    --> test:1:1\n     |\n   1 | aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57d1x + aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57d1x\n     | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\nError [EPAR0370001]: invalid address literal: 'aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57d1x'\n    --> test:1:68\n     |\n   1 | aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57d1x + aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57d1x\n     |                                                                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^"
diff --git a/tests/expectations/tests/parser/expression/literal/address_parse.out b/tests/expectations/tests/parser/expression/literal/address_parse.out
deleted file mode 100644
index 536b2d1efe..0000000000
--- a/tests/expectations/tests/parser/expression/literal/address_parse.out
+++ /dev/null
@@ -1,10 +0,0 @@
----
-namespace: ParseExpression
-expectation: Pass
-outputs:
-  - Literal:
-      Address:
-        - aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8s7pyjh9
-        - span:
-            lo: 0
-            hi: 63
diff --git a/tests/expectations/tests/parser/expression/literal/bool.out b/tests/expectations/tests/parser/expression/literal/bool.out
deleted file mode 100644
index 9222f3dd49..0000000000
--- a/tests/expectations/tests/parser/expression/literal/bool.out
+++ /dev/null
@@ -1,12 +0,0 @@
----
-namespace: Token
-expectation: Pass
-outputs:
-  - "'true' @ 1:1-5"
-  - "'True' @ 1:1-5"
-  - "'TRUE' @ 1:1-5"
-  - "'truE' @ 1:1-5"
-  - "'false' @ 1:1-6"
-  - "'False' @ 1:1-6"
-  - "'FALSE' @ 1:1-6"
-  - "'falsE' @ 1:1-6"
diff --git a/tests/expectations/tests/parser/expression/literal/bool_parse.out b/tests/expectations/tests/parser/expression/literal/bool_parse.out
deleted file mode 100644
index e2dfa68011..0000000000
--- a/tests/expectations/tests/parser/expression/literal/bool_parse.out
+++ /dev/null
@@ -1,16 +0,0 @@
----
-namespace: ParseExpression
-expectation: Pass
-outputs:
-  - Literal:
-      Boolean:
-        - true
-        - span:
-            lo: 0
-            hi: 4
-  - Literal:
-      Boolean:
-        - false
-        - span:
-            lo: 0
-            hi: 5
diff --git a/tests/expectations/tests/parser/expression/literal/char.out b/tests/expectations/tests/parser/expression/literal/char.out
deleted file mode 100644
index 3a268084ba..0000000000
--- a/tests/expectations/tests/parser/expression/literal/char.out
+++ /dev/null
@@ -1,57 +0,0 @@
----
-namespace: Token
-expectation: Fail
-outputs:
-  - "Error [EPAR0370016]: Could not lex the following content: `'a'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'Z'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\\"'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\''`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\t'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\r'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\0'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\u{F}'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `''`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\u{E5}'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'å'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\u{4e0}'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'Ӡ'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\u{d800}'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\u{2764}'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'❤'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\u{1F622}'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'😭'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\u{10001F}'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\x2A'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\x7f'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\x00'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\x01'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\x02'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\x03'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\x04'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\x05'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\x06'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\x07'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\x10'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\x11'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\x12'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\x13'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\x14'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\x15'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\x16'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\x17'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\x20'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\x21'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\x22'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\x23'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\x24'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\x25'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\x26'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\x27'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\x30'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\x31'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\x32'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\x33'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\x34'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\x35'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\x36'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\x37'`.\n"
diff --git a/tests/expectations/tests/parser/expression/literal/char_fail.out b/tests/expectations/tests/parser/expression/literal/char_fail.out
deleted file mode 100644
index 0efb1627ae..0000000000
--- a/tests/expectations/tests/parser/expression/literal/char_fail.out
+++ /dev/null
@@ -1,51 +0,0 @@
----
-namespace: Token
-expectation: Fail
-outputs:
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `\\`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `\\n`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'a`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `''`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\x`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\x7'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\xz'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\x9A'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\x7g'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\x80'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\xc1'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\xc2'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\xDF'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\xC0'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\xe0'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\x9f'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'abcdefg'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\a'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\z'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\A'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\Z'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\1'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\9'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\*'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\x'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\u'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\t\\t'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\uz'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\u1'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\u}`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'🦀\\n'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\u123'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'🦀1🦀'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\u6🦀}'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\u{af🦀'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\u{2764z'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\u{276g}'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\u9999999'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\u00000000'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\u01000000'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\u{110000}'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\u{1234567890}'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\u{bbbbb}\\u{aaaa}'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'😭😂😘'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'⁩'`.\n"
diff --git a/tests/expectations/tests/parser/expression/literal/char_parse.out b/tests/expectations/tests/parser/expression/literal/char_parse.out
deleted file mode 100644
index 38f3f31389..0000000000
--- a/tests/expectations/tests/parser/expression/literal/char_parse.out
+++ /dev/null
@@ -1,55 +0,0 @@
----
-namespace: Token
-expectation: Fail
-outputs:
-  - "Error [EPAR0370016]: Could not lex the following content: `'a'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'Z'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\\"'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\t'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\r'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\0'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\u{F}'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `''`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\u{E5}'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'å'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\u{4e0}'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'Ӡ'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\u{2764}'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'❤'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\u{1F622}'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'😭'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\u{10001F}'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\x2A'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\x7f'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\x00'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\x01'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\x02'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\x03'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\x04'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\x05'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\x06'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\x07'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\x10'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\x11'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\x12'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\x13'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\x14'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\x15'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\x16'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\x17'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\x20'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\x21'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\x22'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\x23'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\x24'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\x25'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\x26'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\x27'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\x30'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\x31'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\x32'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\x33'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\x34'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\x35'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\x36'`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\x37'`.\n"
diff --git a/tests/expectations/tests/parser/expression/literal/comment.out b/tests/expectations/tests/parser/expression/literal/comment.out
deleted file mode 100644
index 75124c3fb7..0000000000
--- a/tests/expectations/tests/parser/expression/literal/comment.out
+++ /dev/null
@@ -1,14 +0,0 @@
----
-namespace: Parse
-expectation: Pass
-outputs:
-  - imports: {}
-    program_scopes:
-      "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":126,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":130}\\\\\\\"}\\\"\"}":
-        program_id: "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":126,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":130}\\\\\\\"}\\\"\"}"
-        structs: {}
-        mappings: {}
-        functions: {}
-        span:
-          lo: 113
-          hi: 235
diff --git a/tests/expectations/tests/parser/expression/literal/comment_fail.out b/tests/expectations/tests/parser/expression/literal/comment_fail.out
deleted file mode 100644
index 111441936c..0000000000
--- a/tests/expectations/tests/parser/expression/literal/comment_fail.out
+++ /dev/null
@@ -1,15 +0,0 @@
----
-namespace: ParseExpression
-expectation: Fail
-outputs:
-  - "Error [EPAR0370014]: Empty block comment."
-  - "Error [EPAR0370015]: Block comment does not close with content: `/* test`."
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found '/'\n    --> test:1:1\n     |\n   1 | / /\n     | ^"
-  - "Error [EPAR0370015]: Block comment does not close with content: `/*/`."
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found '*'\n    --> test:1:1\n     |\n   1 | */\n     | ^"
-  - "Error [EPAR0370016]: Could not lex the following content: `🦀**/`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `🦀*/`.\n"
-  - "Error [EPAR0370015]: Block comment does not close with content: `/*🦀/`."
-  - "Error [EPAR0370015]: Block comment does not close with content: `/**🦀`."
-  - "Error [EPAR0370015]: Block comment does not close with content: `/*🦀`."
-  - "Error [EPAR0370015]: Block comment does not close with content: `/*/*`."
diff --git a/tests/expectations/tests/parser/expression/literal/formatted_string.out b/tests/expectations/tests/parser/expression/literal/formatted_string.out
deleted file mode 100644
index 47fddf9292..0000000000
--- a/tests/expectations/tests/parser/expression/literal/formatted_string.out
+++ /dev/null
@@ -1,24 +0,0 @@
----
-namespace: Token
-expectation: Pass
-outputs:
-  - "'\"{}\"' @ 1:1-5"
-  - "'\" {} \"' @ 1:1-7"
-  - "'\"{}d\"' @ 1:1-6"
-  - "'\"{}D\"' @ 1:1-6"
-  - "'\"d{}\"' @ 1:1-6"
-  - "'\"D{}\"' @ 1:1-6"
-  - "'\"D{}D\"' @ 1:1-7"
-  - "'\"{}{}\"' @ 1:1-7"
-  - "'\"D{}{}D\"' @ 1:1-9"
-  - "'\"D{}{}\"' @ 1:1-8"
-  - "'\"{}{}D\"' @ 1:1-8"
-  - "'\"D{}D{}D\"' @ 1:1-10"
-  - "'\"{{}}\"' @ 1:1-7"
-  - "'\"}}\"' @ 1:1-5"
-  - "'\"{{\"' @ 1:1-5"
-  - "'\"}}{{\"' @ 1:1-7"
-  - "'\"{{}\"' @ 1:1-6"
-  - "'\"{}}\"' @ 1:1-6"
-  - "'\"{\"' @ 1:1-4"
-  - "'\"}\"' @ 1:1-4"
diff --git a/tests/expectations/tests/parser/expression/literal/group.out b/tests/expectations/tests/parser/expression/literal/group.out
deleted file mode 100644
index 6573e4ac8f..0000000000
--- a/tests/expectations/tests/parser/expression/literal/group.out
+++ /dev/null
@@ -1,442 +0,0 @@
----
-namespace: ParseExpression
-expectation: Pass
-outputs:
-  - Literal:
-      Group:
-        Tuple:
-          x: SignHigh
-          y: Inferred
-          span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Group:
-        Tuple:
-          x: Inferred
-          y: SignLow
-          span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Group:
-        Tuple:
-          x: SignHigh
-          y: SignLow
-          span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Group:
-        Tuple:
-          x: SignLow
-          y: SignHigh
-          span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Group:
-        Tuple:
-          x: SignHigh
-          y: SignHigh
-          span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Group:
-        Tuple:
-          x: SignLow
-          y: SignLow
-          span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Group:
-        Tuple:
-          x: Inferred
-          y: Inferred
-          span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Group:
-        Tuple:
-          x:
-            Number:
-              - "123"
-              - span:
-                  lo: 1
-                  hi: 4
-          y:
-            Number:
-              - "-456"
-              - span:
-                  lo: 6
-                  hi: 9
-          span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Group:
-        Tuple:
-          x:
-            Number:
-              - "-123"
-              - span:
-                  lo: 2
-                  hi: 5
-          y:
-            Number:
-              - "456"
-              - span:
-                  lo: 6
-                  hi: 9
-          span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Group:
-        Tuple:
-          x:
-            Number:
-              - "-123"
-              - span:
-                  lo: 2
-                  hi: 5
-          y:
-            Number:
-              - "456"
-              - span:
-                  lo: 6
-                  hi: 9
-          span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Group:
-        Tuple:
-          x:
-            Number:
-              - "123"
-              - span:
-                  lo: 1
-                  hi: 4
-          y: Inferred
-          span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Group:
-        Tuple:
-          x:
-            Number:
-              - "123"
-              - span:
-                  lo: 1
-                  hi: 4
-          y: SignLow
-          span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Group:
-        Tuple:
-          x:
-            Number:
-              - "123"
-              - span:
-                  lo: 1
-                  hi: 4
-          y: SignLow
-          span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Group:
-        Tuple:
-          x:
-            Number:
-              - "123"
-              - span:
-                  lo: 1
-                  hi: 4
-          y: SignHigh
-          span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Group:
-        Tuple:
-          x:
-            Number:
-              - "123"
-              - span:
-                  lo: 1
-                  hi: 4
-          y: SignHigh
-          span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Group:
-        Tuple:
-          x:
-            Number:
-              - "123"
-              - span:
-                  lo: 1
-                  hi: 4
-          y: SignLow
-          span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Group:
-        Tuple:
-          x:
-            Number:
-              - "123"
-              - span:
-                  lo: 1
-                  hi: 4
-          y: Inferred
-          span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Group:
-        Tuple:
-          x: SignHigh
-          y:
-            Number:
-              - "345"
-              - span:
-                  lo: 4
-                  hi: 7
-          span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Group:
-        Tuple:
-          x: Inferred
-          y:
-            Number:
-              - "345"
-              - span:
-                  lo: 4
-                  hi: 7
-          span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Group:
-        Tuple:
-          x: SignHigh
-          y:
-            Number:
-              - "345"
-              - span:
-                  lo: 4
-                  hi: 7
-          span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Group:
-        Tuple:
-          x: SignLow
-          y:
-            Number:
-              - "345"
-              - span:
-                  lo: 4
-                  hi: 7
-          span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Group:
-        Tuple:
-          x: SignHigh
-          y:
-            Number:
-              - "345"
-              - span:
-                  lo: 4
-                  hi: 7
-          span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Group:
-        Tuple:
-          x: SignLow
-          y:
-            Number:
-              - "345"
-              - span:
-                  lo: 4
-                  hi: 7
-          span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Group:
-        Tuple:
-          x: Inferred
-          y:
-            Number:
-              - "345"
-              - span:
-                  lo: 4
-                  hi: 7
-          span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Group:
-        Tuple:
-          x:
-            Number:
-              - "123"
-              - span:
-                  lo: 1
-                  hi: 4
-          y:
-            Number:
-              - "456"
-              - span:
-                  lo: 6
-                  hi: 9
-          span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Group:
-        Tuple:
-          x:
-            Number:
-              - "123"
-              - span:
-                  lo: 1
-                  hi: 4
-          y:
-            Number:
-              - "456"
-              - span:
-                  lo: 6
-                  hi: 9
-          span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Group:
-        Tuple:
-          x:
-            Number:
-              - "123"
-              - span:
-                  lo: 1
-                  hi: 4
-          y:
-            Number:
-              - "456"
-              - span:
-                  lo: 6
-                  hi: 9
-          span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Group:
-        Tuple:
-          x:
-            Number:
-              - "123"
-              - span:
-                  lo: 1
-                  hi: 4
-          y:
-            Number:
-              - "456"
-              - span:
-                  lo: 6
-                  hi: 9
-          span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Group:
-        Tuple:
-          x:
-            Number:
-              - "123"
-              - span:
-                  lo: 1
-                  hi: 4
-          y:
-            Number:
-              - "456"
-              - span:
-                  lo: 6
-                  hi: 9
-          span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Group:
-        Tuple:
-          x:
-            Number:
-              - "123"
-              - span:
-                  lo: 1
-                  hi: 4
-          y:
-            Number:
-              - "456"
-              - span:
-                  lo: 6
-                  hi: 9
-          span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Group:
-        Tuple:
-          x:
-            Number:
-              - "123"
-              - span:
-                  lo: 1
-                  hi: 4
-          y:
-            Number:
-              - "456"
-              - span:
-                  lo: 6
-                  hi: 9
-          span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Group:
-        Single:
-          - "1"
-          - span:
-              lo: 0
-              hi: 6
-  - Unary:
-      receiver:
-        Literal:
-          Group:
-            Single:
-              - "1"
-              - span:
-                  lo: 1
-                  hi: 7
-      op: Negate
-      span:
-        lo: 0
-        hi: 7
diff --git a/tests/expectations/tests/parser/expression/literal/group_fail.out b/tests/expectations/tests/parser/expression/literal/group_fail.out
deleted file mode 100644
index 42e5867a06..0000000000
--- a/tests/expectations/tests/parser/expression/literal/group_fail.out
+++ /dev/null
@@ -1,16 +0,0 @@
----
-namespace: ParseExpression
-expectation: Fail
-outputs:
-  - "did not consume all input: 'group' @ 1:3-8\n"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 123.\n    --> test:1:2\n     |\n   1 | (123)group\n     |  ^^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found ','\n    --> test:1:2\n     |\n   1 | (,)group\n     |  ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found '+'\n    --> test:1:2\n     |\n   1 | (+, -,)group\n     |  ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found ','\n    --> test:1:2\n     |\n   1 | (,+, -)group\n     |  ^"
-  - "did not consume all input: 'group' @ 1:6-11\n"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 123.\n    --> test:1:2\n     |\n   1 | (123,456u8)group\n     |  ^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 123.\n    --> test:1:2\n     |\n   1 | (123,456field)group\n     |  ^^^"
-  - "Error [EPAR0370004]: Unexpected white space between terms (123,456) and group\n    --> test:1:11\n     |\n   1 | (123, 456) group\n     |           ^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 123.\n    --> test:1:2\n     |\n   1 | (123, )group\n     |  ^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 123.\n    --> test:1:2\n     |\n   1 | (123, 456, 789)group\n     |  ^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 123.\n    --> test:1:2\n     |\n   1 | (123, 456)bool\n     |  ^^^"
diff --git a/tests/expectations/tests/parser/expression/literal/int.out b/tests/expectations/tests/parser/expression/literal/int.out
deleted file mode 100644
index ccac03f213..0000000000
--- a/tests/expectations/tests/parser/expression/literal/int.out
+++ /dev/null
@@ -1,111 +0,0 @@
----
-namespace: Token
-expectation: Pass
-outputs:
-  - "'123' @ 1:1-4,'abc123' @ 1:4-10"
-  - "'123' @ 1:1-4,'abc' @ 1:4-7"
-  - "'123' @ 1:1-4"
-  - "'456' @ 1:1-4"
-  - "'123' @ 1:1-4,'456' @ 1:5-8"
-  - "'87377802873778028737780287377802873778028737780287377802873778028737780287377802' @ 1:1-81"
-  - "'8737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802' @ 1:1-401"
-  - "'340130024' @ 1:1-10"
-  - "'158951116' @ 1:1-10"
-  - "'155529659' @ 1:1-10"
-  - "'642023166' @ 1:1-10"
-  - "'228481736' @ 1:1-10"
-  - "'469712960' @ 1:1-10"
-  - "'929437719' @ 1:1-10"
-  - "'721072814' @ 1:1-10"
-  - "'363254789' @ 1:1-10"
-  - "'906732565' @ 1:1-10"
-  - "'288246391' @ 1:1-10"
-  - "'724940549' @ 1:1-10"
-  - "'487101620' @ 1:1-10"
-  - "'261373583' @ 1:1-10"
-  - "'891163927' @ 1:1-10"
-  - "'743967544' @ 1:1-10"
-  - "'8372586' @ 1:1-8"
-  - "'461793278' @ 1:1-10"
-  - "'806307045' @ 1:1-10"
-  - "'122764546' @ 1:1-10"
-  - "'356336181' @ 1:1-10"
-  - "'158370903' @ 1:1-10"
-  - "'774460877' @ 1:1-10"
-  - "'557174131' @ 1:1-10"
-  - "'492401267' @ 1:1-10"
-  - "'893445620' @ 1:1-10"
-  - "'957757048' @ 1:1-10"
-  - "'721540649' @ 1:1-10"
-  - "'390746493' @ 1:1-10"
-  - "'211251725' @ 1:1-10"
-  - "'938266114' @ 1:1-10"
-  - "'156985870' @ 1:1-10"
-  - "'703831126' @ 1:1-10"
-  - "'729964155' @ 1:1-10"
-  - "'988151305' @ 1:1-10"
-  - "'320872435' @ 1:1-10"
-  - "'719287167' @ 1:1-10"
-  - "'152289486' @ 1:1-10"
-  - "'740067975' @ 1:1-10"
-  - "'728627816' @ 1:1-10"
-  - "'385008978' @ 1:1-10"
-  - "'553967635' @ 1:1-10"
-  - "'71980713' @ 1:1-9"
-  - "'519444716' @ 1:1-10"
-  - "'116499965' @ 1:1-10"
-  - "'717422268' @ 1:1-10"
-  - "'18966279' @ 1:1-9"
-  - "'22458638' @ 1:1-9"
-  - "'857282620' @ 1:1-10"
-  - "'920675898' @ 1:1-10"
-  - "'762235516' @ 1:1-10"
-  - "'469018377' @ 1:1-10"
-  - "'199986521' @ 1:1-10"
-  - "'536679358' @ 1:1-10"
-  - "'591399452' @ 1:1-10"
-  - "'83083158' @ 1:1-9"
-  - "'599449051' @ 1:1-10"
-  - "'445442318' @ 1:1-10"
-  - "'585486590' @ 1:1-10"
-  - "'209278800' @ 1:1-10"
-  - "'873568117' @ 1:1-10"
-  - "'664470940' @ 1:1-10"
-  - "'465262783' @ 1:1-10"
-  - "'605652874' @ 1:1-10"
-  - "'376803940' @ 1:1-10"
-  - "'965247040' @ 1:1-10"
-  - "'598474509' @ 1:1-10"
-  - "'845119918' @ 1:1-10"
-  - "'648159133' @ 1:1-10"
-  - "'669051032' @ 1:1-10"
-  - "'800600261' @ 1:1-10"
-  - "'434689764' @ 1:1-10"
-  - "'520060080' @ 1:1-10"
-  - "'804659385' @ 1:1-10"
-  - "'537828058' @ 1:1-10"
-  - "'716600292' @ 1:1-10"
-  - "'387020273' @ 1:1-10"
-  - "'199375617' @ 1:1-10"
-  - "'680337189' @ 1:1-10"
-  - "'818479931' @ 1:1-10"
-  - "'893693281' @ 1:1-10"
-  - "'87377802' @ 1:1-9"
-  - "'84699261' @ 1:1-9"
-  - "'292826090' @ 1:1-10"
-  - "'569171405' @ 1:1-10"
-  - "'387436237' @ 1:1-10"
-  - "'150682190' @ 1:1-10"
-  - "'888770419' @ 1:1-10"
-  - "'824696431' @ 1:1-10"
-  - "'765659803' @ 1:1-10"
-  - "'270163693' @ 1:1-10"
-  - "'427940240' @ 1:1-10"
-  - "'504997332' @ 1:1-10"
-  - "'337808338' @ 1:1-10"
-  - "'907200008' @ 1:1-10"
-  - "'757177889' @ 1:1-10"
-  - "'696697188' @ 1:1-10"
-  - "'41376051' @ 1:1-9"
-  - "'496293518' @ 1:1-10"
-  - "'251218820' @ 1:1-10"
diff --git a/tests/expectations/tests/parser/expression/literal/int_fail.out b/tests/expectations/tests/parser/expression/literal/int_fail.out
deleted file mode 100644
index d94e7e2ccf..0000000000
--- a/tests/expectations/tests/parser/expression/literal/int_fail.out
+++ /dev/null
@@ -1,7 +0,0 @@
----
-namespace: ParseExpression
-expectation: Fail
-outputs:
-  - "Error [EPAR0370018]: A hex number `0x..` was provided but hex is not allowed."
-  - "Error [EPAR0370018]: A hex number `0x..` was provided but hex is not allowed."
-  - "Error [EPAR0370018]: A hex number `0x..` was provided but hex is not allowed."
diff --git a/tests/expectations/tests/parser/expression/literal/int_parse/field.out b/tests/expectations/tests/parser/expression/literal/int_parse/field.out
deleted file mode 100644
index 9789a049b3..0000000000
--- a/tests/expectations/tests/parser/expression/literal/int_parse/field.out
+++ /dev/null
@@ -1,634 +0,0 @@
----
-namespace: ParseExpression
-expectation: Pass
-outputs:
-  - Literal:
-      Field:
-        - "123"
-        - span:
-            lo: 0
-            hi: 8
-  - Literal:
-      Field:
-        - "123"
-        - span:
-            lo: 0
-            hi: 8
-  - Literal:
-      Field:
-        - "456"
-        - span:
-            lo: 0
-            hi: 8
-  - Literal:
-      Field:
-        - "87377802873778028737780287377802873778028737780287377802873778028737780287377802"
-        - span:
-            lo: 0
-            hi: 85
-  - Literal:
-      Field:
-        - "8737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802"
-        - span:
-            lo: 0
-            hi: 405
-  - Literal:
-      Field:
-        - "340130024"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "158951116"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "155529659"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "642023166"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "228481736"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "469712960"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "929437719"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "721072814"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "363254789"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "906732565"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "288246391"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "724940549"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "487101620"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "261373583"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "891163927"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "743967544"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "8372586"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Field:
-        - "461793278"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "806307045"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "122764546"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "356336181"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "158370903"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "774460877"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "557174131"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "492401267"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "893445620"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "957757048"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "721540649"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "390746493"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "211251725"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "938266114"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "156985870"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "703831126"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "729964155"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "988151305"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "320872435"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "719287167"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "152289486"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "740067975"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "728627816"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "385008978"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "553967635"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "71980713"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Field:
-        - "519444716"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "116499965"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "717422268"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "18966279"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Field:
-        - "22458638"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Field:
-        - "857282620"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "920675898"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "762235516"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "469018377"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "199986521"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "536679358"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "591399452"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "83083158"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Field:
-        - "599449051"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "445442318"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "585486590"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "209278800"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "873568117"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "664470940"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "465262783"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "605652874"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "376803940"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "965247040"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "598474509"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "845119918"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "648159133"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "669051032"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "800600261"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "434689764"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "520060080"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "804659385"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "537828058"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "716600292"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "387020273"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "199375617"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "680337189"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "818479931"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "893693281"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "87377802"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Field:
-        - "84699261"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Field:
-        - "292826090"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "569171405"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "387436237"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "150682190"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "888770419"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "824696431"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "765659803"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "270163693"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "427940240"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "504997332"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "337808338"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "907200008"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "757177889"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "696697188"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "41376051"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Field:
-        - "496293518"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Field:
-        - "251218820"
-        - span:
-            lo: 0
-            hi: 14
diff --git a/tests/expectations/tests/parser/expression/literal/int_parse/field_fail.out b/tests/expectations/tests/parser/expression/literal/int_parse/field_fail.out
deleted file mode 100644
index d329b63341..0000000000
--- a/tests/expectations/tests/parser/expression/literal/int_parse/field_fail.out
+++ /dev/null
@@ -1,5 +0,0 @@
----
-namespace: ParseExpression
-expectation: Fail
-outputs:
-  - "Error [EPAR0370018]: A hex number `0x..` was provided but hex is not allowed."
diff --git a/tests/expectations/tests/parser/expression/literal/int_parse/i128.out b/tests/expectations/tests/parser/expression/literal/int_parse/i128.out
deleted file mode 100644
index d54232b9b3..0000000000
--- a/tests/expectations/tests/parser/expression/literal/int_parse/i128.out
+++ /dev/null
@@ -1,739 +0,0 @@
----
-namespace: ParseExpression
-expectation: Pass
-outputs:
-  - Literal:
-      Integer:
-        - I128
-        - "123"
-        - span:
-            lo: 0
-            hi: 7
-  - Literal:
-      Integer:
-        - I128
-        - "123"
-        - span:
-            lo: 0
-            hi: 7
-  - Literal:
-      Integer:
-        - I128
-        - "456"
-        - span:
-            lo: 0
-            hi: 7
-  - Literal:
-      Integer:
-        - I128
-        - "87377802873778028737780287377802873778028737780287377802873778028737780287377802"
-        - span:
-            lo: 0
-            hi: 84
-  - Literal:
-      Integer:
-        - I128
-        - "8737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802"
-        - span:
-            lo: 0
-            hi: 404
-  - Literal:
-      Integer:
-        - I128
-        - "340130024"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "158951116"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "155529659"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "642023166"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "228481736"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "469712960"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "929437719"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "721072814"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "363254789"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "906732565"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "288246391"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "724940549"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "487101620"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "261373583"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "891163927"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "743967544"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "8372586"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I128
-        - "461793278"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "806307045"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "122764546"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "356336181"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "158370903"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "774460877"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "557174131"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "492401267"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "893445620"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "957757048"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "721540649"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "390746493"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "211251725"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "938266114"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "156985870"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "703831126"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "729964155"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "988151305"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "320872435"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "719287167"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "152289486"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "740067975"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "728627816"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "385008978"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "553967635"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "71980713"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I128
-        - "519444716"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "116499965"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "717422268"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "18966279"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I128
-        - "22458638"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I128
-        - "857282620"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "920675898"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "762235516"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "469018377"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "199986521"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "536679358"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "591399452"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "83083158"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I128
-        - "599449051"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "445442318"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "585486590"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "209278800"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "873568117"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "664470940"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "465262783"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "605652874"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "376803940"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "965247040"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "598474509"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "845119918"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "648159133"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "669051032"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "800600261"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "434689764"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "520060080"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "804659385"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "537828058"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "716600292"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "387020273"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "199375617"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "680337189"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "818479931"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "893693281"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "87377802"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I128
-        - "84699261"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I128
-        - "292826090"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "569171405"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "387436237"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "150682190"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "888770419"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "824696431"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "765659803"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "270163693"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "427940240"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "504997332"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "337808338"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "907200008"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "757177889"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "696697188"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "41376051"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I128
-        - "496293518"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - I128
-        - "251218820"
-        - span:
-            lo: 0
-            hi: 13
diff --git a/tests/expectations/tests/parser/expression/literal/int_parse/i16.out b/tests/expectations/tests/parser/expression/literal/int_parse/i16.out
deleted file mode 100644
index 5ed924e1a1..0000000000
--- a/tests/expectations/tests/parser/expression/literal/int_parse/i16.out
+++ /dev/null
@@ -1,739 +0,0 @@
----
-namespace: ParseExpression
-expectation: Pass
-outputs:
-  - Literal:
-      Integer:
-        - I16
-        - "123"
-        - span:
-            lo: 0
-            hi: 6
-  - Literal:
-      Integer:
-        - I16
-        - "123"
-        - span:
-            lo: 0
-            hi: 6
-  - Literal:
-      Integer:
-        - I16
-        - "456"
-        - span:
-            lo: 0
-            hi: 6
-  - Literal:
-      Integer:
-        - I16
-        - "87377802873778028737780287377802873778028737780287377802873778028737780287377802"
-        - span:
-            lo: 0
-            hi: 83
-  - Literal:
-      Integer:
-        - I16
-        - "8737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802"
-        - span:
-            lo: 0
-            hi: 403
-  - Literal:
-      Integer:
-        - I16
-        - "340130024"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "158951116"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "155529659"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "642023166"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "228481736"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "469712960"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "929437719"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "721072814"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "363254789"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "906732565"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "288246391"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "724940549"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "487101620"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "261373583"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "891163927"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "743967544"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "8372586"
-        - span:
-            lo: 0
-            hi: 10
-  - Literal:
-      Integer:
-        - I16
-        - "461793278"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "806307045"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "122764546"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "356336181"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "158370903"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "774460877"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "557174131"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "492401267"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "893445620"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "957757048"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "721540649"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "390746493"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "211251725"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "938266114"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "156985870"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "703831126"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "729964155"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "988151305"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "320872435"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "719287167"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "152289486"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "740067975"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "728627816"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "385008978"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "553967635"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "71980713"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I16
-        - "519444716"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "116499965"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "717422268"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "18966279"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I16
-        - "22458638"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I16
-        - "857282620"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "920675898"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "762235516"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "469018377"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "199986521"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "536679358"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "591399452"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "83083158"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I16
-        - "599449051"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "445442318"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "585486590"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "209278800"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "873568117"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "664470940"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "465262783"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "605652874"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "376803940"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "965247040"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "598474509"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "845119918"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "648159133"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "669051032"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "800600261"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "434689764"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "520060080"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "804659385"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "537828058"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "716600292"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "387020273"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "199375617"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "680337189"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "818479931"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "893693281"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "87377802"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I16
-        - "84699261"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I16
-        - "292826090"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "569171405"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "387436237"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "150682190"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "888770419"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "824696431"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "765659803"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "270163693"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "427940240"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "504997332"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "337808338"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "907200008"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "757177889"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "696697188"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "41376051"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I16
-        - "496293518"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I16
-        - "251218820"
-        - span:
-            lo: 0
-            hi: 12
diff --git a/tests/expectations/tests/parser/expression/literal/int_parse/i32.out b/tests/expectations/tests/parser/expression/literal/int_parse/i32.out
deleted file mode 100644
index cd2750609b..0000000000
--- a/tests/expectations/tests/parser/expression/literal/int_parse/i32.out
+++ /dev/null
@@ -1,739 +0,0 @@
----
-namespace: ParseExpression
-expectation: Pass
-outputs:
-  - Literal:
-      Integer:
-        - I32
-        - "123"
-        - span:
-            lo: 0
-            hi: 6
-  - Literal:
-      Integer:
-        - I32
-        - "123"
-        - span:
-            lo: 0
-            hi: 6
-  - Literal:
-      Integer:
-        - I32
-        - "456"
-        - span:
-            lo: 0
-            hi: 6
-  - Literal:
-      Integer:
-        - I32
-        - "87377802873778028737780287377802873778028737780287377802873778028737780287377802"
-        - span:
-            lo: 0
-            hi: 83
-  - Literal:
-      Integer:
-        - I32
-        - "8737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802"
-        - span:
-            lo: 0
-            hi: 403
-  - Literal:
-      Integer:
-        - I32
-        - "340130024"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "158951116"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "155529659"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "642023166"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "228481736"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "469712960"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "929437719"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "721072814"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "363254789"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "906732565"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "288246391"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "724940549"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "487101620"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "261373583"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "891163927"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "743967544"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "8372586"
-        - span:
-            lo: 0
-            hi: 10
-  - Literal:
-      Integer:
-        - I32
-        - "461793278"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "806307045"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "122764546"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "356336181"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "158370903"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "774460877"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "557174131"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "492401267"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "893445620"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "957757048"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "721540649"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "390746493"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "211251725"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "938266114"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "156985870"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "703831126"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "729964155"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "988151305"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "320872435"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "719287167"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "152289486"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "740067975"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "728627816"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "385008978"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "553967635"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "71980713"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I32
-        - "519444716"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "116499965"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "717422268"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "18966279"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I32
-        - "22458638"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I32
-        - "857282620"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "920675898"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "762235516"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "469018377"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "199986521"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "536679358"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "591399452"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "83083158"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I32
-        - "599449051"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "445442318"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "585486590"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "209278800"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "873568117"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "664470940"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "465262783"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "605652874"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "376803940"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "965247040"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "598474509"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "845119918"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "648159133"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "669051032"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "800600261"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "434689764"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "520060080"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "804659385"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "537828058"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "716600292"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "387020273"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "199375617"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "680337189"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "818479931"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "893693281"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "87377802"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I32
-        - "84699261"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I32
-        - "292826090"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "569171405"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "387436237"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "150682190"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "888770419"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "824696431"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "765659803"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "270163693"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "427940240"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "504997332"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "337808338"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "907200008"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "757177889"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "696697188"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "41376051"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I32
-        - "496293518"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I32
-        - "251218820"
-        - span:
-            lo: 0
-            hi: 12
diff --git a/tests/expectations/tests/parser/expression/literal/int_parse/i64.out b/tests/expectations/tests/parser/expression/literal/int_parse/i64.out
deleted file mode 100644
index e2d0a25612..0000000000
--- a/tests/expectations/tests/parser/expression/literal/int_parse/i64.out
+++ /dev/null
@@ -1,739 +0,0 @@
----
-namespace: ParseExpression
-expectation: Pass
-outputs:
-  - Literal:
-      Integer:
-        - I64
-        - "123"
-        - span:
-            lo: 0
-            hi: 6
-  - Literal:
-      Integer:
-        - I64
-        - "123"
-        - span:
-            lo: 0
-            hi: 6
-  - Literal:
-      Integer:
-        - I64
-        - "456"
-        - span:
-            lo: 0
-            hi: 6
-  - Literal:
-      Integer:
-        - I64
-        - "87377802873778028737780287377802873778028737780287377802873778028737780287377802"
-        - span:
-            lo: 0
-            hi: 83
-  - Literal:
-      Integer:
-        - I64
-        - "8737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802"
-        - span:
-            lo: 0
-            hi: 403
-  - Literal:
-      Integer:
-        - I64
-        - "340130024"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "158951116"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "155529659"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "642023166"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "228481736"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "469712960"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "929437719"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "721072814"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "363254789"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "906732565"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "288246391"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "724940549"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "487101620"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "261373583"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "891163927"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "743967544"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "8372586"
-        - span:
-            lo: 0
-            hi: 10
-  - Literal:
-      Integer:
-        - I64
-        - "461793278"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "806307045"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "122764546"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "356336181"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "158370903"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "774460877"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "557174131"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "492401267"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "893445620"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "957757048"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "721540649"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "390746493"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "211251725"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "938266114"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "156985870"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "703831126"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "729964155"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "988151305"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "320872435"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "719287167"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "152289486"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "740067975"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "728627816"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "385008978"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "553967635"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "71980713"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I64
-        - "519444716"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "116499965"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "717422268"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "18966279"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I64
-        - "22458638"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I64
-        - "857282620"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "920675898"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "762235516"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "469018377"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "199986521"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "536679358"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "591399452"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "83083158"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I64
-        - "599449051"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "445442318"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "585486590"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "209278800"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "873568117"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "664470940"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "465262783"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "605652874"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "376803940"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "965247040"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "598474509"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "845119918"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "648159133"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "669051032"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "800600261"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "434689764"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "520060080"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "804659385"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "537828058"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "716600292"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "387020273"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "199375617"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "680337189"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "818479931"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "893693281"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "87377802"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I64
-        - "84699261"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I64
-        - "292826090"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "569171405"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "387436237"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "150682190"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "888770419"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "824696431"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "765659803"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "270163693"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "427940240"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "504997332"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "337808338"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "907200008"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "757177889"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "696697188"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "41376051"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I64
-        - "496293518"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - I64
-        - "251218820"
-        - span:
-            lo: 0
-            hi: 12
diff --git a/tests/expectations/tests/parser/expression/literal/int_parse/i8.out b/tests/expectations/tests/parser/expression/literal/int_parse/i8.out
deleted file mode 100644
index fc26243b66..0000000000
--- a/tests/expectations/tests/parser/expression/literal/int_parse/i8.out
+++ /dev/null
@@ -1,739 +0,0 @@
----
-namespace: ParseExpression
-expectation: Pass
-outputs:
-  - Literal:
-      Integer:
-        - I8
-        - "123"
-        - span:
-            lo: 0
-            hi: 5
-  - Literal:
-      Integer:
-        - I8
-        - "123"
-        - span:
-            lo: 0
-            hi: 5
-  - Literal:
-      Integer:
-        - I8
-        - "456"
-        - span:
-            lo: 0
-            hi: 5
-  - Literal:
-      Integer:
-        - I8
-        - "87377802873778028737780287377802873778028737780287377802873778028737780287377802"
-        - span:
-            lo: 0
-            hi: 82
-  - Literal:
-      Integer:
-        - I8
-        - "8737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802"
-        - span:
-            lo: 0
-            hi: 402
-  - Literal:
-      Integer:
-        - I8
-        - "340130024"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "158951116"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "155529659"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "642023166"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "228481736"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "469712960"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "929437719"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "721072814"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "363254789"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "906732565"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "288246391"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "724940549"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "487101620"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "261373583"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "891163927"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "743967544"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "8372586"
-        - span:
-            lo: 0
-            hi: 9
-  - Literal:
-      Integer:
-        - I8
-        - "461793278"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "806307045"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "122764546"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "356336181"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "158370903"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "774460877"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "557174131"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "492401267"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "893445620"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "957757048"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "721540649"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "390746493"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "211251725"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "938266114"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "156985870"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "703831126"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "729964155"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "988151305"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "320872435"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "719287167"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "152289486"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "740067975"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "728627816"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "385008978"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "553967635"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "71980713"
-        - span:
-            lo: 0
-            hi: 10
-  - Literal:
-      Integer:
-        - I8
-        - "519444716"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "116499965"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "717422268"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "18966279"
-        - span:
-            lo: 0
-            hi: 10
-  - Literal:
-      Integer:
-        - I8
-        - "22458638"
-        - span:
-            lo: 0
-            hi: 10
-  - Literal:
-      Integer:
-        - I8
-        - "857282620"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "920675898"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "762235516"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "469018377"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "199986521"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "536679358"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "591399452"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "83083158"
-        - span:
-            lo: 0
-            hi: 10
-  - Literal:
-      Integer:
-        - I8
-        - "599449051"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "445442318"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "585486590"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "209278800"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "873568117"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "664470940"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "465262783"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "605652874"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "376803940"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "965247040"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "598474509"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "845119918"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "648159133"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "669051032"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "800600261"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "434689764"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "520060080"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "804659385"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "537828058"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "716600292"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "387020273"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "199375617"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "680337189"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "818479931"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "893693281"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "87377802"
-        - span:
-            lo: 0
-            hi: 10
-  - Literal:
-      Integer:
-        - I8
-        - "84699261"
-        - span:
-            lo: 0
-            hi: 10
-  - Literal:
-      Integer:
-        - I8
-        - "292826090"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "569171405"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "387436237"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "150682190"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "888770419"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "824696431"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "765659803"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "270163693"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "427940240"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "504997332"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "337808338"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "907200008"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "757177889"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "696697188"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "41376051"
-        - span:
-            lo: 0
-            hi: 10
-  - Literal:
-      Integer:
-        - I8
-        - "496293518"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - I8
-        - "251218820"
-        - span:
-            lo: 0
-            hi: 11
diff --git a/tests/expectations/tests/parser/expression/literal/int_parse/implicit.out b/tests/expectations/tests/parser/expression/literal/int_parse/implicit.out
deleted file mode 100644
index eb2292a9cb..0000000000
--- a/tests/expectations/tests/parser/expression/literal/int_parse/implicit.out
+++ /dev/null
@@ -1,109 +0,0 @@
----
-namespace: ParseExpression
-expectation: Fail
-outputs:
-  - "Error [EPAR0370017]: Could not parse the implicit value: 123.\n    --> test:1:1\n     |\n   1 | 123\n     | ^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 123.\n    --> test:1:1\n     |\n   1 | 123\n     | ^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 456.\n    --> test:1:1\n     |\n   1 | 456\n     | ^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 87377802873778028737780287377802873778028737780287377802873778028737780287377802.\n    --> test:1:1\n     |\n   1 | 87377802873778028737780287377802873778028737780287377802873778028737780287377802\n     | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 8737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802.\n    --> test:1:1\n     |\n   1 | 8737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802\n     | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 340130024.\n    --> test:1:1\n     |\n   1 | 340130024\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 158951116.\n    --> test:1:1\n     |\n   1 | 158951116\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 155529659.\n    --> test:1:1\n     |\n   1 | 155529659\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 642023166.\n    --> test:1:1\n     |\n   1 | 642023166\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 228481736.\n    --> test:1:1\n     |\n   1 | 228481736\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 469712960.\n    --> test:1:1\n     |\n   1 | 469712960\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 929437719.\n    --> test:1:1\n     |\n   1 | 929437719\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 721072814.\n    --> test:1:1\n     |\n   1 | 721072814\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 363254789.\n    --> test:1:1\n     |\n   1 | 363254789\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 906732565.\n    --> test:1:1\n     |\n   1 | 906732565\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 288246391.\n    --> test:1:1\n     |\n   1 | 288246391\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 724940549.\n    --> test:1:1\n     |\n   1 | 724940549\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 487101620.\n    --> test:1:1\n     |\n   1 | 487101620\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 261373583.\n    --> test:1:1\n     |\n   1 | 261373583\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 891163927.\n    --> test:1:1\n     |\n   1 | 891163927\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 743967544.\n    --> test:1:1\n     |\n   1 | 743967544\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 8372586.\n    --> test:1:1\n     |\n   1 | 8372586\n     | ^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 461793278.\n    --> test:1:1\n     |\n   1 | 461793278\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 806307045.\n    --> test:1:1\n     |\n   1 | 806307045\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 122764546.\n    --> test:1:1\n     |\n   1 | 122764546\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 356336181.\n    --> test:1:1\n     |\n   1 | 356336181\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 158370903.\n    --> test:1:1\n     |\n   1 | 158370903\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 774460877.\n    --> test:1:1\n     |\n   1 | 774460877\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 557174131.\n    --> test:1:1\n     |\n   1 | 557174131\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 492401267.\n    --> test:1:1\n     |\n   1 | 492401267\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 893445620.\n    --> test:1:1\n     |\n   1 | 893445620\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 957757048.\n    --> test:1:1\n     |\n   1 | 957757048\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 721540649.\n    --> test:1:1\n     |\n   1 | 721540649\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 390746493.\n    --> test:1:1\n     |\n   1 | 390746493\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 211251725.\n    --> test:1:1\n     |\n   1 | 211251725\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 938266114.\n    --> test:1:1\n     |\n   1 | 938266114\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 156985870.\n    --> test:1:1\n     |\n   1 | 156985870\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 703831126.\n    --> test:1:1\n     |\n   1 | 703831126\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 729964155.\n    --> test:1:1\n     |\n   1 | 729964155\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 988151305.\n    --> test:1:1\n     |\n   1 | 988151305\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 320872435.\n    --> test:1:1\n     |\n   1 | 320872435\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 719287167.\n    --> test:1:1\n     |\n   1 | 719287167\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 152289486.\n    --> test:1:1\n     |\n   1 | 152289486\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 740067975.\n    --> test:1:1\n     |\n   1 | 740067975\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 728627816.\n    --> test:1:1\n     |\n   1 | 728627816\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 385008978.\n    --> test:1:1\n     |\n   1 | 385008978\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 553967635.\n    --> test:1:1\n     |\n   1 | 553967635\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 71980713.\n    --> test:1:1\n     |\n   1 | 71980713\n     | ^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 519444716.\n    --> test:1:1\n     |\n   1 | 519444716\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 116499965.\n    --> test:1:1\n     |\n   1 | 116499965\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 717422268.\n    --> test:1:1\n     |\n   1 | 717422268\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 18966279.\n    --> test:1:1\n     |\n   1 | 18966279\n     | ^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 22458638.\n    --> test:1:1\n     |\n   1 | 22458638\n     | ^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 857282620.\n    --> test:1:1\n     |\n   1 | 857282620\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 920675898.\n    --> test:1:1\n     |\n   1 | 920675898\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 762235516.\n    --> test:1:1\n     |\n   1 | 762235516\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 469018377.\n    --> test:1:1\n     |\n   1 | 469018377\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 199986521.\n    --> test:1:1\n     |\n   1 | 199986521\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 536679358.\n    --> test:1:1\n     |\n   1 | 536679358\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 591399452.\n    --> test:1:1\n     |\n   1 | 591399452\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 83083158.\n    --> test:1:1\n     |\n   1 | 83083158\n     | ^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 599449051.\n    --> test:1:1\n     |\n   1 | 599449051\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 445442318.\n    --> test:1:1\n     |\n   1 | 445442318\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 585486590.\n    --> test:1:1\n     |\n   1 | 585486590\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 209278800.\n    --> test:1:1\n     |\n   1 | 209278800\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 873568117.\n    --> test:1:1\n     |\n   1 | 873568117\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 664470940.\n    --> test:1:1\n     |\n   1 | 664470940\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 465262783.\n    --> test:1:1\n     |\n   1 | 465262783\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 605652874.\n    --> test:1:1\n     |\n   1 | 605652874\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 376803940.\n    --> test:1:1\n     |\n   1 | 376803940\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 965247040.\n    --> test:1:1\n     |\n   1 | 965247040\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 598474509.\n    --> test:1:1\n     |\n   1 | 598474509\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 845119918.\n    --> test:1:1\n     |\n   1 | 845119918\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 648159133.\n    --> test:1:1\n     |\n   1 | 648159133\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 669051032.\n    --> test:1:1\n     |\n   1 | 669051032\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 800600261.\n    --> test:1:1\n     |\n   1 | 800600261\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 434689764.\n    --> test:1:1\n     |\n   1 | 434689764\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 520060080.\n    --> test:1:1\n     |\n   1 | 520060080\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 804659385.\n    --> test:1:1\n     |\n   1 | 804659385\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 537828058.\n    --> test:1:1\n     |\n   1 | 537828058\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 716600292.\n    --> test:1:1\n     |\n   1 | 716600292\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 387020273.\n    --> test:1:1\n     |\n   1 | 387020273\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 199375617.\n    --> test:1:1\n     |\n   1 | 199375617\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 680337189.\n    --> test:1:1\n     |\n   1 | 680337189\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 818479931.\n    --> test:1:1\n     |\n   1 | 818479931\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 893693281.\n    --> test:1:1\n     |\n   1 | 893693281\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 87377802.\n    --> test:1:1\n     |\n   1 | 87377802\n     | ^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 84699261.\n    --> test:1:1\n     |\n   1 | 84699261\n     | ^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 292826090.\n    --> test:1:1\n     |\n   1 | 292826090\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 569171405.\n    --> test:1:1\n     |\n   1 | 569171405\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 387436237.\n    --> test:1:1\n     |\n   1 | 387436237\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 150682190.\n    --> test:1:1\n     |\n   1 | 150682190\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 888770419.\n    --> test:1:1\n     |\n   1 | 888770419\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 824696431.\n    --> test:1:1\n     |\n   1 | 824696431\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 765659803.\n    --> test:1:1\n     |\n   1 | 765659803\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 270163693.\n    --> test:1:1\n     |\n   1 | 270163693\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 427940240.\n    --> test:1:1\n     |\n   1 | 427940240\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 504997332.\n    --> test:1:1\n     |\n   1 | 504997332\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 337808338.\n    --> test:1:1\n     |\n   1 | 337808338\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 907200008.\n    --> test:1:1\n     |\n   1 | 907200008\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 757177889.\n    --> test:1:1\n     |\n   1 | 757177889\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 696697188.\n    --> test:1:1\n     |\n   1 | 696697188\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 41376051.\n    --> test:1:1\n     |\n   1 | 41376051\n     | ^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 496293518.\n    --> test:1:1\n     |\n   1 | 496293518\n     | ^^^^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 251218820.\n    --> test:1:1\n     |\n   1 | 251218820\n     | ^^^^^^^^^"
diff --git a/tests/expectations/tests/parser/expression/literal/int_parse/mono_group.out b/tests/expectations/tests/parser/expression/literal/int_parse/mono_group.out
deleted file mode 100644
index d8ebd0c812..0000000000
--- a/tests/expectations/tests/parser/expression/literal/int_parse/mono_group.out
+++ /dev/null
@@ -1,739 +0,0 @@
----
-namespace: ParseExpression
-expectation: Pass
-outputs:
-  - Literal:
-      Group:
-        Single:
-          - "123"
-          - span:
-              lo: 0
-              hi: 8
-  - Literal:
-      Group:
-        Single:
-          - "123"
-          - span:
-              lo: 0
-              hi: 8
-  - Literal:
-      Group:
-        Single:
-          - "456"
-          - span:
-              lo: 0
-              hi: 8
-  - Literal:
-      Group:
-        Single:
-          - "87377802873778028737780287377802873778028737780287377802873778028737780287377802"
-          - span:
-              lo: 0
-              hi: 85
-  - Literal:
-      Group:
-        Single:
-          - "8737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802"
-          - span:
-              lo: 0
-              hi: 405
-  - Literal:
-      Group:
-        Single:
-          - "340130024"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "158951116"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "155529659"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "642023166"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "228481736"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "469712960"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "929437719"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "721072814"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "363254789"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "906732565"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "288246391"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "724940549"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "487101620"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "261373583"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "891163927"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "743967544"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "8372586"
-          - span:
-              lo: 0
-              hi: 12
-  - Literal:
-      Group:
-        Single:
-          - "461793278"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "806307045"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "122764546"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "356336181"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "158370903"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "774460877"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "557174131"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "492401267"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "893445620"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "957757048"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "721540649"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "390746493"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "211251725"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "938266114"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "156985870"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "703831126"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "729964155"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "988151305"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "320872435"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "719287167"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "152289486"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "740067975"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "728627816"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "385008978"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "553967635"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "71980713"
-          - span:
-              lo: 0
-              hi: 13
-  - Literal:
-      Group:
-        Single:
-          - "519444716"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "116499965"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "717422268"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "18966279"
-          - span:
-              lo: 0
-              hi: 13
-  - Literal:
-      Group:
-        Single:
-          - "22458638"
-          - span:
-              lo: 0
-              hi: 13
-  - Literal:
-      Group:
-        Single:
-          - "857282620"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "920675898"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "762235516"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "469018377"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "199986521"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "536679358"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "591399452"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "83083158"
-          - span:
-              lo: 0
-              hi: 13
-  - Literal:
-      Group:
-        Single:
-          - "599449051"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "445442318"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "585486590"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "209278800"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "873568117"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "664470940"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "465262783"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "605652874"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "376803940"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "965247040"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "598474509"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "845119918"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "648159133"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "669051032"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "800600261"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "434689764"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "520060080"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "804659385"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "537828058"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "716600292"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "387020273"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "199375617"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "680337189"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "818479931"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "893693281"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "87377802"
-          - span:
-              lo: 0
-              hi: 13
-  - Literal:
-      Group:
-        Single:
-          - "84699261"
-          - span:
-              lo: 0
-              hi: 13
-  - Literal:
-      Group:
-        Single:
-          - "292826090"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "569171405"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "387436237"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "150682190"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "888770419"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "824696431"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "765659803"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "270163693"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "427940240"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "504997332"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "337808338"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "907200008"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "757177889"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "696697188"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "41376051"
-          - span:
-              lo: 0
-              hi: 13
-  - Literal:
-      Group:
-        Single:
-          - "496293518"
-          - span:
-              lo: 0
-              hi: 14
-  - Literal:
-      Group:
-        Single:
-          - "251218820"
-          - span:
-              lo: 0
-              hi: 14
diff --git a/tests/expectations/tests/parser/expression/literal/int_parse/scalar.out b/tests/expectations/tests/parser/expression/literal/int_parse/scalar.out
deleted file mode 100644
index 23e5fd754d..0000000000
--- a/tests/expectations/tests/parser/expression/literal/int_parse/scalar.out
+++ /dev/null
@@ -1,634 +0,0 @@
----
-namespace: ParseExpression
-expectation: Pass
-outputs:
-  - Literal:
-      Scalar:
-        - "123"
-        - span:
-            lo: 0
-            hi: 9
-  - Literal:
-      Scalar:
-        - "123"
-        - span:
-            lo: 0
-            hi: 9
-  - Literal:
-      Scalar:
-        - "456"
-        - span:
-            lo: 0
-            hi: 9
-  - Literal:
-      Scalar:
-        - "87377802873778028737780287377802873778028737780287377802873778028737780287377802"
-        - span:
-            lo: 0
-            hi: 86
-  - Literal:
-      Scalar:
-        - "8737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802"
-        - span:
-            lo: 0
-            hi: 406
-  - Literal:
-      Scalar:
-        - "340130024"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "158951116"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "155529659"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "642023166"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "228481736"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "469712960"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "929437719"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "721072814"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "363254789"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "906732565"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "288246391"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "724940549"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "487101620"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "261373583"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "891163927"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "743967544"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "8372586"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Scalar:
-        - "461793278"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "806307045"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "122764546"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "356336181"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "158370903"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "774460877"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "557174131"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "492401267"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "893445620"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "957757048"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "721540649"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "390746493"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "211251725"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "938266114"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "156985870"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "703831126"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "729964155"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "988151305"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "320872435"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "719287167"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "152289486"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "740067975"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "728627816"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "385008978"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "553967635"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "71980713"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Scalar:
-        - "519444716"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "116499965"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "717422268"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "18966279"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Scalar:
-        - "22458638"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Scalar:
-        - "857282620"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "920675898"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "762235516"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "469018377"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "199986521"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "536679358"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "591399452"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "83083158"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Scalar:
-        - "599449051"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "445442318"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "585486590"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "209278800"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "873568117"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "664470940"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "465262783"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "605652874"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "376803940"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "965247040"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "598474509"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "845119918"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "648159133"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "669051032"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "800600261"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "434689764"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "520060080"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "804659385"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "537828058"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "716600292"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "387020273"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "199375617"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "680337189"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "818479931"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "893693281"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "87377802"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Scalar:
-        - "84699261"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Scalar:
-        - "292826090"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "569171405"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "387436237"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "150682190"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "888770419"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "824696431"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "765659803"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "270163693"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "427940240"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "504997332"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "337808338"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "907200008"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "757177889"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "696697188"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "41376051"
-        - span:
-            lo: 0
-            hi: 14
-  - Literal:
-      Scalar:
-        - "496293518"
-        - span:
-            lo: 0
-            hi: 15
-  - Literal:
-      Scalar:
-        - "251218820"
-        - span:
-            lo: 0
-            hi: 15
diff --git a/tests/expectations/tests/parser/expression/literal/int_parse/u128.out b/tests/expectations/tests/parser/expression/literal/int_parse/u128.out
deleted file mode 100644
index 50de8b53dc..0000000000
--- a/tests/expectations/tests/parser/expression/literal/int_parse/u128.out
+++ /dev/null
@@ -1,739 +0,0 @@
----
-namespace: ParseExpression
-expectation: Pass
-outputs:
-  - Literal:
-      Integer:
-        - U128
-        - "123"
-        - span:
-            lo: 0
-            hi: 7
-  - Literal:
-      Integer:
-        - U128
-        - "123"
-        - span:
-            lo: 0
-            hi: 7
-  - Literal:
-      Integer:
-        - U128
-        - "456"
-        - span:
-            lo: 0
-            hi: 7
-  - Literal:
-      Integer:
-        - U128
-        - "87377802873778028737780287377802873778028737780287377802873778028737780287377802"
-        - span:
-            lo: 0
-            hi: 84
-  - Literal:
-      Integer:
-        - U128
-        - "8737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802"
-        - span:
-            lo: 0
-            hi: 404
-  - Literal:
-      Integer:
-        - U128
-        - "340130024"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "158951116"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "155529659"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "642023166"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "228481736"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "469712960"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "929437719"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "721072814"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "363254789"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "906732565"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "288246391"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "724940549"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "487101620"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "261373583"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "891163927"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "743967544"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "8372586"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U128
-        - "461793278"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "806307045"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "122764546"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "356336181"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "158370903"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "774460877"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "557174131"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "492401267"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "893445620"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "957757048"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "721540649"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "390746493"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "211251725"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "938266114"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "156985870"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "703831126"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "729964155"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "988151305"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "320872435"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "719287167"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "152289486"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "740067975"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "728627816"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "385008978"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "553967635"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "71980713"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U128
-        - "519444716"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "116499965"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "717422268"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "18966279"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U128
-        - "22458638"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U128
-        - "857282620"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "920675898"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "762235516"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "469018377"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "199986521"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "536679358"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "591399452"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "83083158"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U128
-        - "599449051"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "445442318"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "585486590"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "209278800"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "873568117"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "664470940"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "465262783"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "605652874"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "376803940"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "965247040"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "598474509"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "845119918"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "648159133"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "669051032"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "800600261"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "434689764"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "520060080"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "804659385"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "537828058"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "716600292"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "387020273"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "199375617"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "680337189"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "818479931"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "893693281"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "87377802"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U128
-        - "84699261"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U128
-        - "292826090"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "569171405"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "387436237"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "150682190"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "888770419"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "824696431"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "765659803"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "270163693"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "427940240"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "504997332"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "337808338"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "907200008"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "757177889"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "696697188"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "41376051"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U128
-        - "496293518"
-        - span:
-            lo: 0
-            hi: 13
-  - Literal:
-      Integer:
-        - U128
-        - "251218820"
-        - span:
-            lo: 0
-            hi: 13
diff --git a/tests/expectations/tests/parser/expression/literal/int_parse/u16.out b/tests/expectations/tests/parser/expression/literal/int_parse/u16.out
deleted file mode 100644
index 6ff88e91f0..0000000000
--- a/tests/expectations/tests/parser/expression/literal/int_parse/u16.out
+++ /dev/null
@@ -1,739 +0,0 @@
----
-namespace: ParseExpression
-expectation: Pass
-outputs:
-  - Literal:
-      Integer:
-        - U16
-        - "123"
-        - span:
-            lo: 0
-            hi: 6
-  - Literal:
-      Integer:
-        - U16
-        - "123"
-        - span:
-            lo: 0
-            hi: 6
-  - Literal:
-      Integer:
-        - U16
-        - "456"
-        - span:
-            lo: 0
-            hi: 6
-  - Literal:
-      Integer:
-        - U16
-        - "87377802873778028737780287377802873778028737780287377802873778028737780287377802"
-        - span:
-            lo: 0
-            hi: 83
-  - Literal:
-      Integer:
-        - U16
-        - "8737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802"
-        - span:
-            lo: 0
-            hi: 403
-  - Literal:
-      Integer:
-        - U16
-        - "340130024"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "158951116"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "155529659"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "642023166"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "228481736"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "469712960"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "929437719"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "721072814"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "363254789"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "906732565"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "288246391"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "724940549"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "487101620"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "261373583"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "891163927"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "743967544"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "8372586"
-        - span:
-            lo: 0
-            hi: 10
-  - Literal:
-      Integer:
-        - U16
-        - "461793278"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "806307045"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "122764546"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "356336181"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "158370903"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "774460877"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "557174131"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "492401267"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "893445620"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "957757048"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "721540649"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "390746493"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "211251725"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "938266114"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "156985870"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "703831126"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "729964155"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "988151305"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "320872435"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "719287167"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "152289486"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "740067975"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "728627816"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "385008978"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "553967635"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "71980713"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U16
-        - "519444716"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "116499965"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "717422268"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "18966279"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U16
-        - "22458638"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U16
-        - "857282620"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "920675898"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "762235516"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "469018377"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "199986521"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "536679358"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "591399452"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "83083158"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U16
-        - "599449051"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "445442318"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "585486590"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "209278800"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "873568117"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "664470940"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "465262783"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "605652874"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "376803940"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "965247040"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "598474509"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "845119918"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "648159133"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "669051032"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "800600261"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "434689764"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "520060080"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "804659385"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "537828058"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "716600292"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "387020273"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "199375617"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "680337189"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "818479931"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "893693281"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "87377802"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U16
-        - "84699261"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U16
-        - "292826090"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "569171405"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "387436237"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "150682190"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "888770419"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "824696431"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "765659803"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "270163693"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "427940240"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "504997332"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "337808338"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "907200008"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "757177889"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "696697188"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "41376051"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U16
-        - "496293518"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U16
-        - "251218820"
-        - span:
-            lo: 0
-            hi: 12
diff --git a/tests/expectations/tests/parser/expression/literal/int_parse/u32.out b/tests/expectations/tests/parser/expression/literal/int_parse/u32.out
deleted file mode 100644
index 40ce000c3b..0000000000
--- a/tests/expectations/tests/parser/expression/literal/int_parse/u32.out
+++ /dev/null
@@ -1,739 +0,0 @@
----
-namespace: ParseExpression
-expectation: Pass
-outputs:
-  - Literal:
-      Integer:
-        - U32
-        - "123"
-        - span:
-            lo: 0
-            hi: 6
-  - Literal:
-      Integer:
-        - U32
-        - "123"
-        - span:
-            lo: 0
-            hi: 6
-  - Literal:
-      Integer:
-        - U32
-        - "456"
-        - span:
-            lo: 0
-            hi: 6
-  - Literal:
-      Integer:
-        - U32
-        - "87377802873778028737780287377802873778028737780287377802873778028737780287377802"
-        - span:
-            lo: 0
-            hi: 83
-  - Literal:
-      Integer:
-        - U32
-        - "8737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802"
-        - span:
-            lo: 0
-            hi: 403
-  - Literal:
-      Integer:
-        - U32
-        - "340130024"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "158951116"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "155529659"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "642023166"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "228481736"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "469712960"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "929437719"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "721072814"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "363254789"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "906732565"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "288246391"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "724940549"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "487101620"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "261373583"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "891163927"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "743967544"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "8372586"
-        - span:
-            lo: 0
-            hi: 10
-  - Literal:
-      Integer:
-        - U32
-        - "461793278"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "806307045"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "122764546"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "356336181"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "158370903"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "774460877"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "557174131"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "492401267"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "893445620"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "957757048"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "721540649"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "390746493"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "211251725"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "938266114"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "156985870"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "703831126"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "729964155"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "988151305"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "320872435"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "719287167"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "152289486"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "740067975"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "728627816"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "385008978"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "553967635"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "71980713"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U32
-        - "519444716"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "116499965"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "717422268"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "18966279"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U32
-        - "22458638"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U32
-        - "857282620"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "920675898"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "762235516"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "469018377"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "199986521"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "536679358"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "591399452"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "83083158"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U32
-        - "599449051"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "445442318"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "585486590"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "209278800"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "873568117"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "664470940"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "465262783"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "605652874"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "376803940"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "965247040"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "598474509"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "845119918"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "648159133"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "669051032"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "800600261"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "434689764"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "520060080"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "804659385"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "537828058"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "716600292"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "387020273"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "199375617"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "680337189"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "818479931"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "893693281"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "87377802"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U32
-        - "84699261"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U32
-        - "292826090"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "569171405"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "387436237"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "150682190"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "888770419"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "824696431"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "765659803"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "270163693"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "427940240"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "504997332"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "337808338"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "907200008"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "757177889"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "696697188"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "41376051"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U32
-        - "496293518"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U32
-        - "251218820"
-        - span:
-            lo: 0
-            hi: 12
diff --git a/tests/expectations/tests/parser/expression/literal/int_parse/u64.out b/tests/expectations/tests/parser/expression/literal/int_parse/u64.out
deleted file mode 100644
index 218688217d..0000000000
--- a/tests/expectations/tests/parser/expression/literal/int_parse/u64.out
+++ /dev/null
@@ -1,739 +0,0 @@
----
-namespace: ParseExpression
-expectation: Pass
-outputs:
-  - Literal:
-      Integer:
-        - U64
-        - "123"
-        - span:
-            lo: 0
-            hi: 6
-  - Literal:
-      Integer:
-        - U64
-        - "123"
-        - span:
-            lo: 0
-            hi: 6
-  - Literal:
-      Integer:
-        - U64
-        - "456"
-        - span:
-            lo: 0
-            hi: 6
-  - Literal:
-      Integer:
-        - U64
-        - "87377802873778028737780287377802873778028737780287377802873778028737780287377802"
-        - span:
-            lo: 0
-            hi: 83
-  - Literal:
-      Integer:
-        - U64
-        - "8737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802"
-        - span:
-            lo: 0
-            hi: 403
-  - Literal:
-      Integer:
-        - U64
-        - "340130024"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "158951116"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "155529659"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "642023166"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "228481736"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "469712960"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "929437719"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "721072814"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "363254789"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "906732565"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "288246391"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "724940549"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "487101620"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "261373583"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "891163927"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "743967544"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "8372586"
-        - span:
-            lo: 0
-            hi: 10
-  - Literal:
-      Integer:
-        - U64
-        - "461793278"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "806307045"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "122764546"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "356336181"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "158370903"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "774460877"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "557174131"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "492401267"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "893445620"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "957757048"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "721540649"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "390746493"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "211251725"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "938266114"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "156985870"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "703831126"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "729964155"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "988151305"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "320872435"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "719287167"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "152289486"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "740067975"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "728627816"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "385008978"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "553967635"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "71980713"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U64
-        - "519444716"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "116499965"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "717422268"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "18966279"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U64
-        - "22458638"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U64
-        - "857282620"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "920675898"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "762235516"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "469018377"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "199986521"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "536679358"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "591399452"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "83083158"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U64
-        - "599449051"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "445442318"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "585486590"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "209278800"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "873568117"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "664470940"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "465262783"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "605652874"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "376803940"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "965247040"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "598474509"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "845119918"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "648159133"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "669051032"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "800600261"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "434689764"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "520060080"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "804659385"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "537828058"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "716600292"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "387020273"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "199375617"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "680337189"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "818479931"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "893693281"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "87377802"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U64
-        - "84699261"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U64
-        - "292826090"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "569171405"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "387436237"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "150682190"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "888770419"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "824696431"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "765659803"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "270163693"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "427940240"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "504997332"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "337808338"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "907200008"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "757177889"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "696697188"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "41376051"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U64
-        - "496293518"
-        - span:
-            lo: 0
-            hi: 12
-  - Literal:
-      Integer:
-        - U64
-        - "251218820"
-        - span:
-            lo: 0
-            hi: 12
diff --git a/tests/expectations/tests/parser/expression/literal/int_parse/u8.out b/tests/expectations/tests/parser/expression/literal/int_parse/u8.out
deleted file mode 100644
index 251b5521d4..0000000000
--- a/tests/expectations/tests/parser/expression/literal/int_parse/u8.out
+++ /dev/null
@@ -1,739 +0,0 @@
----
-namespace: ParseExpression
-expectation: Pass
-outputs:
-  - Literal:
-      Integer:
-        - U8
-        - "123"
-        - span:
-            lo: 0
-            hi: 5
-  - Literal:
-      Integer:
-        - U8
-        - "123"
-        - span:
-            lo: 0
-            hi: 5
-  - Literal:
-      Integer:
-        - U8
-        - "456"
-        - span:
-            lo: 0
-            hi: 5
-  - Literal:
-      Integer:
-        - U8
-        - "87377802873778028737780287377802873778028737780287377802873778028737780287377802"
-        - span:
-            lo: 0
-            hi: 82
-  - Literal:
-      Integer:
-        - U8
-        - "8737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802"
-        - span:
-            lo: 0
-            hi: 402
-  - Literal:
-      Integer:
-        - U8
-        - "340130024"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "158951116"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "155529659"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "642023166"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "228481736"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "469712960"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "929437719"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "721072814"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "363254789"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "906732565"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "288246391"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "724940549"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "487101620"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "261373583"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "891163927"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "743967544"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "8372586"
-        - span:
-            lo: 0
-            hi: 9
-  - Literal:
-      Integer:
-        - U8
-        - "461793278"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "806307045"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "122764546"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "356336181"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "158370903"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "774460877"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "557174131"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "492401267"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "893445620"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "957757048"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "721540649"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "390746493"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "211251725"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "938266114"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "156985870"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "703831126"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "729964155"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "988151305"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "320872435"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "719287167"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "152289486"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "740067975"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "728627816"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "385008978"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "553967635"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "71980713"
-        - span:
-            lo: 0
-            hi: 10
-  - Literal:
-      Integer:
-        - U8
-        - "519444716"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "116499965"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "717422268"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "18966279"
-        - span:
-            lo: 0
-            hi: 10
-  - Literal:
-      Integer:
-        - U8
-        - "22458638"
-        - span:
-            lo: 0
-            hi: 10
-  - Literal:
-      Integer:
-        - U8
-        - "857282620"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "920675898"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "762235516"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "469018377"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "199986521"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "536679358"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "591399452"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "83083158"
-        - span:
-            lo: 0
-            hi: 10
-  - Literal:
-      Integer:
-        - U8
-        - "599449051"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "445442318"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "585486590"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "209278800"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "873568117"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "664470940"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "465262783"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "605652874"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "376803940"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "965247040"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "598474509"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "845119918"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "648159133"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "669051032"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "800600261"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "434689764"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "520060080"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "804659385"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "537828058"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "716600292"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "387020273"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "199375617"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "680337189"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "818479931"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "893693281"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "87377802"
-        - span:
-            lo: 0
-            hi: 10
-  - Literal:
-      Integer:
-        - U8
-        - "84699261"
-        - span:
-            lo: 0
-            hi: 10
-  - Literal:
-      Integer:
-        - U8
-        - "292826090"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "569171405"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "387436237"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "150682190"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "888770419"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "824696431"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "765659803"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "270163693"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "427940240"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "504997332"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "337808338"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "907200008"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "757177889"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "696697188"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "41376051"
-        - span:
-            lo: 0
-            hi: 10
-  - Literal:
-      Integer:
-        - U8
-        - "496293518"
-        - span:
-            lo: 0
-            hi: 11
-  - Literal:
-      Integer:
-        - U8
-        - "251218820"
-        - span:
-            lo: 0
-            hi: 11
diff --git a/tests/expectations/tests/parser/expression/literal/postfix_types.out b/tests/expectations/tests/parser/expression/literal/postfix_types.out
deleted file mode 100644
index 00ff4531d4..0000000000
--- a/tests/expectations/tests/parser/expression/literal/postfix_types.out
+++ /dev/null
@@ -1,62 +0,0 @@
----
-namespace: Token
-expectation: Pass
-outputs:
-  - "'field' @ 1:1-6"
-  - "'Field' @ 1:1-6"
-  - "'fielD' @ 1:1-6"
-  - "'FIELD' @ 1:1-6"
-  - "'group' @ 1:1-6"
-  - "'Group' @ 1:1-6"
-  - "'grouP' @ 1:1-6"
-  - "'GROUP' @ 1:1-6"
-  - "'u8' @ 1:1-3"
-  - "'u16' @ 1:1-4"
-  - "'u32' @ 1:1-4"
-  - "'u64' @ 1:1-4"
-  - "'u128' @ 1:1-5"
-  - "'i8' @ 1:1-3"
-  - "'i16' @ 1:1-4"
-  - "'i32' @ 1:1-4"
-  - "'i64' @ 1:1-4"
-  - "'i128' @ 1:1-5"
-  - "'U8' @ 1:1-3"
-  - "'U16' @ 1:1-4"
-  - "'U32' @ 1:1-4"
-  - "'U64' @ 1:1-4"
-  - "'U128' @ 1:1-5"
-  - "'U8' @ 1:1-3"
-  - "'U16' @ 1:1-4"
-  - "'U32' @ 1:1-4"
-  - "'U64' @ 1:1-4"
-  - "'U128' @ 1:1-5"
-  - "'u' @ 1:1-2"
-  - "'8' @ 1:1-2"
-  - "'u' @ 1:1-2"
-  - "'16' @ 1:1-3"
-  - "'u' @ 1:1-2"
-  - "'32' @ 1:1-3"
-  - "'u' @ 1:1-2"
-  - "'64' @ 1:1-3"
-  - "'u' @ 1:1-2"
-  - "'128' @ 1:1-4"
-  - "'i' @ 1:1-2"
-  - "'8' @ 1:1-2"
-  - "'i' @ 1:1-2"
-  - "'16' @ 1:1-3"
-  - "'i' @ 1:1-2"
-  - "'32' @ 1:1-3"
-  - "'i' @ 1:1-2"
-  - "'64' @ 1:1-3"
-  - "'i' @ 1:1-2"
-  - "'128' @ 1:1-4"
-  - "'U' @ 1:1-2,'8' @ 1:3-4"
-  - "'U' @ 1:1-2,'16' @ 1:3-5"
-  - "'U' @ 1:1-2,'32' @ 1:3-5"
-  - "'U' @ 1:1-2,'64' @ 1:3-5"
-  - "'U' @ 1:1-2,'128' @ 1:3-6"
-  - "'U' @ 1:1-2,'8' @ 1:3-4"
-  - "'U' @ 1:1-2,'16' @ 1:3-5"
-  - "'U' @ 1:1-2,'32' @ 1:3-5"
-  - "'U' @ 1:1-2,'64' @ 1:3-5"
-  - "'U' @ 1:1-2,'128' @ 1:3-6"
diff --git a/tests/expectations/tests/parser/expression/literal/string.out b/tests/expectations/tests/parser/expression/literal/string.out
deleted file mode 100644
index f2647db005..0000000000
--- a/tests/expectations/tests/parser/expression/literal/string.out
+++ /dev/null
@@ -1,25 +0,0 @@
----
-namespace: Token
-expectation: Pass
-outputs:
-  - "'\"string\"' @ 1:1-9"
-  - "'\"another { } string\"' @ 1:1-21"
-  - "'\"{ ] [ ; a\"' @ 1:1-12"
-  - "'\"test 😒€\"' @ 1:1-10"
-  - "'\"😭😂😘\"' @ 1:1-6"
-  - "'\"✋🏿\"' @ 1:1-5"
-  - "'\"🦀\"' @ 1:1-4"
-  - "'\"￿\"' @ 1:1-4"
-  - "'\"���\"' @ 1:1-6"
-  - "'\"（>３<）三\"' @ 1:1-9"
-  - "'\"ヽ༼ ಠ益ಠ ༽ﾉ\"' @ 1:1-12"
-  - "'\"(╯°□°）╯︵ ┻━┻\"' @ 1:1-15"
-  - "'\"┬─┬ ノ( ゜-゜ノ)\"' @ 1:1-15"
-  - "'\"( ͡° ͜ʖ ͡°)\"' @ 1:1-14"
-  - "'\"b\"' @ 1:1-4"
-  - "'\"ᕙ(▀̿ĺ̯▀̿ ̿)ᕗ\"' @ 1:1-15"
-  - "'\"♥╣[-_-]╠♥\"' @ 1:1-12"
-  - "'\"b\"' @ 1:1-4"
-  - "'\"(⑅∫°ਊ°)∫\"' @ 1:1-11"
-  - "'\"b\"' @ 1:1-4"
-  - "'\"🦀°1\"' @ 1:1-6"
diff --git a/tests/expectations/tests/parser/expression/literal/string_fail.out b/tests/expectations/tests/parser/expression/literal/string_fail.out
deleted file mode 100644
index 6f3c6a0113..0000000000
--- a/tests/expectations/tests/parser/expression/literal/string_fail.out
+++ /dev/null
@@ -1,8 +0,0 @@
----
-namespace: Token
-expectation: Fail
-outputs:
-  - "Error [EPAR0370013]: Expected a closed string but found `Hello world!`."
-  - "Error [EPAR0370013]: Expected a closed string but found `\\`."
-  - "Error [EPAR0370013]: Expected a closed string but found `⭇😍;`."
-  - "Error [EPAR0370020]: Unicode bidi override code point encountered."
diff --git a/tests/expectations/tests/parser/expression/ternary.out b/tests/expectations/tests/parser/expression/ternary.out
deleted file mode 100644
index 07651c1b8f..0000000000
--- a/tests/expectations/tests/parser/expression/ternary.out
+++ /dev/null
@@ -1,52 +0,0 @@
----
-namespace: ParseExpression
-expectation: Pass
-outputs:
-  - Ternary:
-      condition:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
-      if_true:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
-      if_false:
-        Identifier: "{\"name\":\"z\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-      span:
-        lo: 0
-        hi: 9
-  - Ternary:
-      condition:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
-      if_true:
-        Ternary:
-          condition:
-            Identifier: "{\"name\":\"a\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
-          if_true:
-            Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-          if_false:
-            Identifier: "{\"name\":\"c\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":13}\"}"
-          span:
-            lo: 4
-            hi: 13
-      if_false:
-        Identifier: "{\"name\":\"z\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
-      span:
-        lo: 0
-        hi: 17
-  - Ternary:
-      condition:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
-      if_true:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
-      if_false:
-        Ternary:
-          condition:
-            Identifier: "{\"name\":\"a\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-          if_true:
-            Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":13}\"}"
-          if_false:
-            Identifier: "{\"name\":\"c\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
-          span:
-            lo: 8
-            hi: 17
-      span:
-        lo: 0
-        hi: 17
diff --git a/tests/expectations/tests/parser/expression/token_format.out b/tests/expectations/tests/parser/expression/token_format.out
deleted file mode 100644
index bf4524b7a9..0000000000
--- a/tests/expectations/tests/parser/expression/token_format.out
+++ /dev/null
@@ -1,74 +0,0 @@
----
-namespace: ParseExpression
-expectation: Fail
-outputs:
-  - "Error [EPAR0370016]: Could not lex the following content: `~`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `~`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `~`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `~`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `~`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `~`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `'h'`.\n"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found '@'\n    --> test:1:1\n     |\n   1 | @test\n     | ^"
-  - "Error [EPAR0370016]: Could not lex the following content: `~`.\n"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found '&&'\n    --> test:1:1\n     |\n   1 | &&\n     | ^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found '||'\n    --> test:1:1\n     |\n   1 | ||\n     | ^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found '=='\n    --> test:1:1\n     |\n   1 | ==\n     | ^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found '!='\n    --> test:1:1\n     |\n   1 | !=\n     | ^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found '<'\n    --> test:1:1\n     |\n   1 | <\n     | ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found '<='\n    --> test:1:1\n     |\n   1 | <=\n     | ^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found '>'\n    --> test:1:1\n     |\n   1 | >\n     | ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found '>='\n    --> test:1:1\n     |\n   1 | >=\n     | ^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found '+'\n    --> test:1:1\n     |\n   1 | +\n     | ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found '<eof>'\n    --> test:1:1\n     |\n   1 | -\n     | ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found '*'\n    --> test:1:1\n     |\n   1 | *\n     | ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found '**'\n    --> test:1:1\n     |\n   1 | **\n     | ^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found '/'\n    --> test:1:1\n     |\n   1 | /\n     | ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found '='\n    --> test:1:1\n     |\n   1 | =\n     | ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found '+='\n    --> test:1:1\n     |\n   1 | +=\n     | ^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found '-='\n    --> test:1:1\n     |\n   1 | -=\n     | ^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found '*='\n    --> test:1:1\n     |\n   1 | *=\n     | ^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found '/='\n    --> test:1:1\n     |\n   1 | /=\n     | ^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found '**='\n    --> test:1:1\n     |\n   1 | **=\n     | ^^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found '<eof>'\n    --> test:1:1\n     |\n   1 | (\n     | ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found ')'\n    --> test:1:1\n     |\n   1 | )\n     | ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found '['\n    --> test:1:1\n     |\n   1 | [\n     | ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found ']'\n    --> test:1:1\n     |\n   1 | ]\n     | ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found '{'\n    --> test:1:1\n     |\n   1 | {\n     | ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found '}'\n    --> test:1:1\n     |\n   1 | }\n     | ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found ','\n    --> test:1:1\n     |\n   1 | ,\n     | ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found '.'\n    --> test:1:1\n     |\n   1 | .\n     | ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found '..'\n    --> test:1:1\n     |\n   1 | ..\n     | ^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found '..'\n    --> test:1:1\n     |\n   1 | ...\n     | ^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found ';'\n    --> test:1:1\n     |\n   1 | ;\n     | ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found ':'\n    --> test:1:1\n     |\n   1 | :\n     | ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'identifier', found '<eof>'\n    --> test:1:2\n     |\n   1 | h::\n     |  ^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found '?'\n    --> test:1:1\n     |\n   1 | ?\n     | ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found '->'\n    --> test:1:1\n     |\n   1 | ->\n     | ^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found '_'\n    --> test:1:1\n     |\n   1 | _\n     | ^"
-  - "Error [EPAR0370016]: Could not lex the following content: `~`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `~`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `~`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `~`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `~`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `~`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `~`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `~`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `~`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `~`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `~`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `~`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `~`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `~`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `~`.\n"
-  - "Error [EPAR0370016]: Could not lex the following content: `~`.\n"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found 'console'\n    --> test:1:1\n     |\n   1 | console\n     | ^^^^^^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found 'const'\n    --> test:1:1\n     |\n   1 | const\n     | ^^^^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found 'else'\n    --> test:1:1\n     |\n   1 | else\n     | ^^^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found 'for'\n    --> test:1:1\n     |\n   1 | for\n     | ^^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found 'function'\n    --> test:1:1\n     |\n   1 | function\n     | ^^^^^^^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found 'if'\n    --> test:1:1\n     |\n   1 | if\n     | ^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found 'in'\n    --> test:1:1\n     |\n   1 | in\n     | ^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found 'let'\n    --> test:1:1\n     |\n   1 | let\n     | ^^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found '&'\n    --> test:1:1\n     |\n   1 | &\n     | ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found 'return'\n    --> test:1:1\n     |\n   1 | return\n     | ^^^^^^"
diff --git a/tests/expectations/tests/parser/expression/unary/abs.out b/tests/expectations/tests/parser/expression/unary/abs.out
deleted file mode 100644
index 5d95459b3f..0000000000
--- a/tests/expectations/tests/parser/expression/unary/abs.out
+++ /dev/null
@@ -1,146 +0,0 @@
----
-namespace: ParseExpression
-expectation: Pass
-outputs:
-  - Unary:
-      receiver:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
-      op: Abs
-      span:
-        lo: 0
-        hi: 7
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Unary:
-              receiver:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
-              op: Abs
-              span:
-                lo: 0
-                hi: 7
-          op: Abs
-          span:
-            lo: 0
-            hi: 13
-      op: Abs
-      span:
-        lo: 0
-        hi: 19
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-          op: Abs
-          span:
-            lo: 1
-            hi: 8
-      op: Negate
-      span:
-        lo: 0
-        hi: 8
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Negate
-          span:
-            lo: 1
-            hi: 3
-      op: Abs
-      span:
-        lo: 1
-        hi: 10
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Abs
-          span:
-            lo: 2
-            hi: 9
-      op: Negate
-      span:
-        lo: 0
-        hi: 9
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Unary:
-              receiver:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              op: Abs
-              span:
-                lo: 2
-                hi: 9
-          op: Negate
-          span:
-            lo: 1
-            hi: 9
-      op: Abs
-      span:
-        lo: 1
-        hi: 16
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-          op: Abs
-          span:
-            lo: 1
-            hi: 8
-      op: Not
-      span:
-        lo: 0
-        hi: 8
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Not
-          span:
-            lo: 1
-            hi: 3
-      op: Abs
-      span:
-        lo: 1
-        hi: 10
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Abs
-          span:
-            lo: 2
-            hi: 9
-      op: Not
-      span:
-        lo: 0
-        hi: 9
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Unary:
-              receiver:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              op: Abs
-              span:
-                lo: 2
-                hi: 9
-          op: Not
-          span:
-            lo: 1
-            hi: 9
-      op: Abs
-      span:
-        lo: 1
-        hi: 16
diff --git a/tests/expectations/tests/parser/expression/unary/abs_wrapped.out b/tests/expectations/tests/parser/expression/unary/abs_wrapped.out
deleted file mode 100644
index 5433c93542..0000000000
--- a/tests/expectations/tests/parser/expression/unary/abs_wrapped.out
+++ /dev/null
@@ -1,146 +0,0 @@
----
-namespace: ParseExpression
-expectation: Pass
-outputs:
-  - Unary:
-      receiver:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
-      op: AbsWrapped
-      span:
-        lo: 0
-        hi: 15
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Unary:
-              receiver:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
-              op: AbsWrapped
-              span:
-                lo: 0
-                hi: 15
-          op: AbsWrapped
-          span:
-            lo: 0
-            hi: 29
-      op: AbsWrapped
-      span:
-        lo: 0
-        hi: 43
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-          op: AbsWrapped
-          span:
-            lo: 1
-            hi: 16
-      op: Negate
-      span:
-        lo: 0
-        hi: 16
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Negate
-          span:
-            lo: 1
-            hi: 3
-      op: AbsWrapped
-      span:
-        lo: 1
-        hi: 18
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: AbsWrapped
-          span:
-            lo: 2
-            hi: 17
-      op: Negate
-      span:
-        lo: 0
-        hi: 17
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Unary:
-              receiver:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              op: AbsWrapped
-              span:
-                lo: 2
-                hi: 17
-          op: Negate
-          span:
-            lo: 1
-            hi: 17
-      op: AbsWrapped
-      span:
-        lo: 1
-        hi: 32
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-          op: AbsWrapped
-          span:
-            lo: 1
-            hi: 16
-      op: Not
-      span:
-        lo: 0
-        hi: 16
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Not
-          span:
-            lo: 1
-            hi: 3
-      op: AbsWrapped
-      span:
-        lo: 1
-        hi: 18
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: AbsWrapped
-          span:
-            lo: 2
-            hi: 17
-      op: Not
-      span:
-        lo: 0
-        hi: 17
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Unary:
-              receiver:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              op: AbsWrapped
-              span:
-                lo: 2
-                hi: 17
-          op: Not
-          span:
-            lo: 1
-            hi: 17
-      op: AbsWrapped
-      span:
-        lo: 1
-        hi: 32
diff --git a/tests/expectations/tests/parser/expression/unary/double.out b/tests/expectations/tests/parser/expression/unary/double.out
deleted file mode 100644
index f3dbdaaed1..0000000000
--- a/tests/expectations/tests/parser/expression/unary/double.out
+++ /dev/null
@@ -1,146 +0,0 @@
----
-namespace: ParseExpression
-expectation: Pass
-outputs:
-  - Unary:
-      receiver:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
-      op: Double
-      span:
-        lo: 0
-        hi: 10
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Unary:
-              receiver:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
-              op: Double
-              span:
-                lo: 0
-                hi: 10
-          op: Double
-          span:
-            lo: 0
-            hi: 19
-      op: Double
-      span:
-        lo: 0
-        hi: 28
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-          op: Double
-          span:
-            lo: 1
-            hi: 11
-      op: Negate
-      span:
-        lo: 0
-        hi: 11
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Negate
-          span:
-            lo: 1
-            hi: 3
-      op: Double
-      span:
-        lo: 1
-        hi: 13
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Double
-          span:
-            lo: 2
-            hi: 12
-      op: Negate
-      span:
-        lo: 0
-        hi: 12
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Unary:
-              receiver:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              op: Double
-              span:
-                lo: 2
-                hi: 12
-          op: Negate
-          span:
-            lo: 1
-            hi: 12
-      op: Double
-      span:
-        lo: 1
-        hi: 22
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-          op: Double
-          span:
-            lo: 1
-            hi: 11
-      op: Not
-      span:
-        lo: 0
-        hi: 11
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Not
-          span:
-            lo: 1
-            hi: 3
-      op: Double
-      span:
-        lo: 1
-        hi: 13
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Double
-          span:
-            lo: 2
-            hi: 12
-      op: Not
-      span:
-        lo: 0
-        hi: 12
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Unary:
-              receiver:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              op: Double
-              span:
-                lo: 2
-                hi: 12
-          op: Not
-          span:
-            lo: 1
-            hi: 12
-      op: Double
-      span:
-        lo: 1
-        hi: 22
diff --git a/tests/expectations/tests/parser/expression/unary/inv.out b/tests/expectations/tests/parser/expression/unary/inv.out
deleted file mode 100644
index a42f31203b..0000000000
--- a/tests/expectations/tests/parser/expression/unary/inv.out
+++ /dev/null
@@ -1,146 +0,0 @@
----
-namespace: ParseExpression
-expectation: Pass
-outputs:
-  - Unary:
-      receiver:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
-      op: Inverse
-      span:
-        lo: 0
-        hi: 7
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Unary:
-              receiver:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
-              op: Inverse
-              span:
-                lo: 0
-                hi: 7
-          op: Inverse
-          span:
-            lo: 0
-            hi: 13
-      op: Inverse
-      span:
-        lo: 0
-        hi: 19
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-          op: Inverse
-          span:
-            lo: 1
-            hi: 8
-      op: Negate
-      span:
-        lo: 0
-        hi: 8
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Negate
-          span:
-            lo: 1
-            hi: 3
-      op: Inverse
-      span:
-        lo: 1
-        hi: 10
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Inverse
-          span:
-            lo: 2
-            hi: 9
-      op: Negate
-      span:
-        lo: 0
-        hi: 9
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Unary:
-              receiver:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              op: Inverse
-              span:
-                lo: 2
-                hi: 9
-          op: Negate
-          span:
-            lo: 1
-            hi: 9
-      op: Inverse
-      span:
-        lo: 1
-        hi: 16
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-          op: Inverse
-          span:
-            lo: 1
-            hi: 8
-      op: Not
-      span:
-        lo: 0
-        hi: 8
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Not
-          span:
-            lo: 1
-            hi: 3
-      op: Inverse
-      span:
-        lo: 1
-        hi: 10
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Inverse
-          span:
-            lo: 2
-            hi: 9
-      op: Not
-      span:
-        lo: 0
-        hi: 9
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Unary:
-              receiver:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              op: Inverse
-              span:
-                lo: 2
-                hi: 9
-          op: Not
-          span:
-            lo: 1
-            hi: 9
-      op: Inverse
-      span:
-        lo: 1
-        hi: 16
diff --git a/tests/expectations/tests/parser/expression/unary/neg.out b/tests/expectations/tests/parser/expression/unary/neg.out
deleted file mode 100644
index 9d58bf243e..0000000000
--- a/tests/expectations/tests/parser/expression/unary/neg.out
+++ /dev/null
@@ -1,220 +0,0 @@
----
-namespace: ParseExpression
-expectation: Pass
-outputs:
-  - Unary:
-      receiver:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-      op: Negate
-      span:
-        lo: 0
-        hi: 2
-  - Unary:
-      receiver:
-        Call:
-          function:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-          arguments: []
-          external: ~
-          span:
-            lo: 1
-            hi: 4
-      op: Negate
-      span:
-        lo: 0
-        hi: 4
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Negate
-          span:
-            lo: 1
-            hi: 3
-      op: Negate
-      span:
-        lo: 0
-        hi: 3
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Not
-          span:
-            lo: 1
-            hi: 3
-      op: Negate
-      span:
-        lo: 0
-        hi: 3
-  - Literal:
-      Integer:
-        - I8
-        - "-5"
-        - span:
-            lo: 0
-            hi: 4
-  - Literal:
-      Integer:
-        - I8
-        - "-128"
-        - span:
-            lo: 0
-            hi: 6
-  - Unary:
-      receiver:
-        Literal:
-          Integer:
-            - I8
-            - "128"
-            - span:
-                lo: 2
-                hi: 7
-      op: Negate
-      span:
-        lo: 0
-        hi: 7
-  - Unary:
-      receiver:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
-      op: Negate
-      span:
-        lo: 0
-        hi: 7
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Unary:
-              receiver:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
-              op: Negate
-              span:
-                lo: 0
-                hi: 7
-          op: Negate
-          span:
-            lo: 0
-            hi: 13
-      op: Negate
-      span:
-        lo: 0
-        hi: 19
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-          op: Negate
-          span:
-            lo: 1
-            hi: 8
-      op: Negate
-      span:
-        lo: 0
-        hi: 8
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Negate
-          span:
-            lo: 1
-            hi: 3
-      op: Negate
-      span:
-        lo: 1
-        hi: 10
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Negate
-          span:
-            lo: 2
-            hi: 9
-      op: Negate
-      span:
-        lo: 0
-        hi: 9
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Unary:
-              receiver:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              op: Negate
-              span:
-                lo: 2
-                hi: 9
-          op: Negate
-          span:
-            lo: 1
-            hi: 9
-      op: Negate
-      span:
-        lo: 1
-        hi: 16
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-          op: Negate
-          span:
-            lo: 1
-            hi: 8
-      op: Not
-      span:
-        lo: 0
-        hi: 8
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Not
-          span:
-            lo: 1
-            hi: 3
-      op: Negate
-      span:
-        lo: 1
-        hi: 10
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Negate
-          span:
-            lo: 2
-            hi: 9
-      op: Not
-      span:
-        lo: 0
-        hi: 9
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Unary:
-              receiver:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              op: Negate
-              span:
-                lo: 2
-                hi: 9
-          op: Not
-          span:
-            lo: 1
-            hi: 9
-      op: Negate
-      span:
-        lo: 1
-        hi: 16
diff --git a/tests/expectations/tests/parser/expression/unary/not.out b/tests/expectations/tests/parser/expression/unary/not.out
deleted file mode 100644
index f731da7f84..0000000000
--- a/tests/expectations/tests/parser/expression/unary/not.out
+++ /dev/null
@@ -1,192 +0,0 @@
----
-namespace: ParseExpression
-expectation: Pass
-outputs:
-  - Unary:
-      receiver:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-      op: Not
-      span:
-        lo: 0
-        hi: 2
-  - Unary:
-      receiver:
-        Call:
-          function:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-          arguments: []
-          external: ~
-          span:
-            lo: 1
-            hi: 4
-      op: Not
-      span:
-        lo: 0
-        hi: 4
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Not
-          span:
-            lo: 1
-            hi: 3
-      op: Not
-      span:
-        lo: 0
-        hi: 3
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Unary:
-              receiver:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              op: Not
-              span:
-                lo: 2
-                hi: 9
-          op: Negate
-          span:
-            lo: 1
-            hi: 9
-      op: Not
-      span:
-        lo: 0
-        hi: 9
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Unary:
-              receiver:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
-              op: Not
-              span:
-                lo: 0
-                hi: 7
-          op: Not
-          span:
-            lo: 0
-            hi: 13
-      op: Not
-      span:
-        lo: 0
-        hi: 19
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-          op: Not
-          span:
-            lo: 1
-            hi: 8
-      op: Negate
-      span:
-        lo: 0
-        hi: 8
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Negate
-          span:
-            lo: 1
-            hi: 3
-      op: Not
-      span:
-        lo: 1
-        hi: 10
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Not
-          span:
-            lo: 2
-            hi: 9
-      op: Negate
-      span:
-        lo: 0
-        hi: 9
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Unary:
-              receiver:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              op: Not
-              span:
-                lo: 2
-                hi: 9
-          op: Negate
-          span:
-            lo: 1
-            hi: 9
-      op: Not
-      span:
-        lo: 1
-        hi: 16
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-          op: Not
-          span:
-            lo: 1
-            hi: 8
-      op: Not
-      span:
-        lo: 0
-        hi: 8
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Not
-          span:
-            lo: 1
-            hi: 3
-      op: Not
-      span:
-        lo: 1
-        hi: 10
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Not
-          span:
-            lo: 2
-            hi: 9
-      op: Not
-      span:
-        lo: 0
-        hi: 9
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Unary:
-              receiver:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              op: Not
-              span:
-                lo: 2
-                hi: 9
-          op: Not
-          span:
-            lo: 1
-            hi: 9
-      op: Not
-      span:
-        lo: 1
-        hi: 16
diff --git a/tests/expectations/tests/parser/expression/unary/sqrt.out b/tests/expectations/tests/parser/expression/unary/sqrt.out
deleted file mode 100644
index e719601954..0000000000
--- a/tests/expectations/tests/parser/expression/unary/sqrt.out
+++ /dev/null
@@ -1,158 +0,0 @@
----
-namespace: ParseExpression
-expectation: Pass
-outputs:
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Unary:
-              receiver:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              op: SquareRoot
-              span:
-                lo: 2
-                hi: 17
-          op: Negate
-          span:
-            lo: 1
-            hi: 17
-      op: Not
-      span:
-        lo: 0
-        hi: 17
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Unary:
-              receiver:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
-              op: SquareRoot
-              span:
-                lo: 0
-                hi: 15
-          op: SquareRoot
-          span:
-            lo: 0
-            hi: 29
-      op: SquareRoot
-      span:
-        lo: 0
-        hi: 43
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-          op: SquareRoot
-          span:
-            lo: 1
-            hi: 16
-      op: Negate
-      span:
-        lo: 0
-        hi: 16
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Negate
-          span:
-            lo: 1
-            hi: 3
-      op: SquareRoot
-      span:
-        lo: 1
-        hi: 18
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: SquareRoot
-          span:
-            lo: 2
-            hi: 17
-      op: Negate
-      span:
-        lo: 0
-        hi: 17
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Unary:
-              receiver:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              op: SquareRoot
-              span:
-                lo: 2
-                hi: 17
-          op: Negate
-          span:
-            lo: 1
-            hi: 17
-      op: SquareRoot
-      span:
-        lo: 1
-        hi: 32
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-          op: SquareRoot
-          span:
-            lo: 1
-            hi: 16
-      op: Not
-      span:
-        lo: 0
-        hi: 16
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Not
-          span:
-            lo: 1
-            hi: 3
-      op: SquareRoot
-      span:
-        lo: 1
-        hi: 18
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: SquareRoot
-          span:
-            lo: 2
-            hi: 17
-      op: Not
-      span:
-        lo: 0
-        hi: 17
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Unary:
-              receiver:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              op: SquareRoot
-              span:
-                lo: 2
-                hi: 17
-          op: Not
-          span:
-            lo: 1
-            hi: 17
-      op: SquareRoot
-      span:
-        lo: 1
-        hi: 32
diff --git a/tests/expectations/tests/parser/expression/unary/square.out b/tests/expectations/tests/parser/expression/unary/square.out
deleted file mode 100644
index da10785118..0000000000
--- a/tests/expectations/tests/parser/expression/unary/square.out
+++ /dev/null
@@ -1,158 +0,0 @@
----
-namespace: ParseExpression
-expectation: Pass
-outputs:
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Unary:
-              receiver:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              op: Square
-              span:
-                lo: 2
-                hi: 12
-          op: Negate
-          span:
-            lo: 1
-            hi: 12
-      op: Not
-      span:
-        lo: 0
-        hi: 12
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Unary:
-              receiver:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
-              op: Square
-              span:
-                lo: 0
-                hi: 10
-          op: Square
-          span:
-            lo: 0
-            hi: 19
-      op: Square
-      span:
-        lo: 0
-        hi: 28
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-          op: Square
-          span:
-            lo: 1
-            hi: 11
-      op: Negate
-      span:
-        lo: 0
-        hi: 11
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Negate
-          span:
-            lo: 1
-            hi: 3
-      op: Square
-      span:
-        lo: 1
-        hi: 13
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Square
-          span:
-            lo: 2
-            hi: 12
-      op: Negate
-      span:
-        lo: 0
-        hi: 12
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Unary:
-              receiver:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              op: Square
-              span:
-                lo: 2
-                hi: 12
-          op: Negate
-          span:
-            lo: 1
-            hi: 12
-      op: Square
-      span:
-        lo: 1
-        hi: 22
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
-          op: Square
-          span:
-            lo: 1
-            hi: 11
-      op: Not
-      span:
-        lo: 0
-        hi: 11
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Not
-          span:
-            lo: 1
-            hi: 3
-      op: Square
-      span:
-        lo: 1
-        hi: 13
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Square
-          span:
-            lo: 2
-            hi: 12
-      op: Not
-      span:
-        lo: 0
-        hi: 12
-  - Unary:
-      receiver:
-        Unary:
-          receiver:
-            Unary:
-              receiver:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-              op: Square
-              span:
-                lo: 2
-                hi: 12
-          op: Not
-          span:
-            lo: 1
-            hi: 12
-      op: Square
-      span:
-        lo: 1
-        hi: 22
diff --git a/tests/expectations/tests/parser/finalize/decrement.out b/tests/expectations/tests/parser/finalize/decrement.out
deleted file mode 100644
index db8db2fb0c..0000000000
--- a/tests/expectations/tests/parser/finalize/decrement.out
+++ /dev/null
@@ -1,34 +0,0 @@
----
-namespace: ParseStatement
-expectation: Pass
-outputs:
-  - Decrement:
-      mapping: "{\"name\":\"foo\",\"span\":\"{\\\"lo\\\":10,\\\"hi\\\":13}\"}"
-      index:
-        Identifier: "{\"name\":\"bar\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":18}\"}"
-      amount:
-        Identifier: "{\"name\":\"baz\",\"span\":\"{\\\"lo\\\":20,\\\"hi\\\":23}\"}"
-      span:
-        lo: 0
-        hi: 24
-  - Decrement:
-      mapping: "{\"name\":\"foo\",\"span\":\"{\\\"lo\\\":10,\\\"hi\\\":13}\"}"
-      index:
-        Literal:
-          Integer:
-            - U8
-            - "2"
-            - span:
-                lo: 15
-                hi: 18
-      amount:
-        Literal:
-          Integer:
-            - U8
-            - "3"
-            - span:
-                lo: 20
-                hi: 23
-      span:
-        lo: 0
-        hi: 24
diff --git a/tests/expectations/tests/parser/finalize/decrement_fail.out b/tests/expectations/tests/parser/finalize/decrement_fail.out
deleted file mode 100644
index 81358c4704..0000000000
--- a/tests/expectations/tests/parser/finalize/decrement_fail.out
+++ /dev/null
@@ -1,9 +0,0 @@
----
-namespace: ParseStatement
-expectation: Fail
-outputs:
-  - "Error [EPAR0370005]: expected ( -- found '['\n    --> test:1:10\n     |\n   1 | decrement[foo, bar, baz];\n     |          ^"
-  - "Error [EPAR0370005]: expected , -- found ')'\n    --> test:1:19\n     |\n   1 | decrement(foo, bar);\n     |                   ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'identifier', found ')'\n    --> test:1:11\n     |\n   1 | decrement();\n     |           ^"
-  - "Error [EPAR0370005]: expected , -- found ')'\n    --> test:1:15\n     |\n   1 | decrement(floo)\n     |               ^"
-  - "Error [EPAR0370005]: expected ( -- found 'foo'\n    --> test:1:11\n     |\n   1 | decrement foo[bar] by baz;\n     |           ^^^"
diff --git a/tests/expectations/tests/parser/finalize/finalize.out b/tests/expectations/tests/parser/finalize/finalize.out
deleted file mode 100644
index 39d58cddb3..0000000000
--- a/tests/expectations/tests/parser/finalize/finalize.out
+++ /dev/null
@@ -1,106 +0,0 @@
----
-namespace: Parse
-expectation: Pass
-outputs:
-  - imports: {}
-    program_scopes:
-      "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}":
-        program_id: "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}"
-        structs: {}
-        mappings: {}
-        functions:
-          "{\"name\":\"main\",\"span\":\"{\\\"lo\\\":39,\\\"hi\\\":43}\"}":
-            annotations: []
-            call_type: Standard
-            identifier: "{\"name\":\"main\",\"span\":\"{\\\"lo\\\":39,\\\"hi\\\":43}\"}"
-            input: []
-            output:
-              - Internal:
-                  mode: None
-                  type_: Boolean
-                  span:
-                    lo: 49
-                    hi: 53
-            output_type: Boolean
-            block:
-              statements: []
-              span:
-                lo: 54
-                hi: 66
-            finalize:
-              identifier: "{\"name\":\"main\",\"span\":\"{\\\"lo\\\":85,\\\"hi\\\":89}\"}"
-              input: []
-              output: []
-              output_type: Unit
-              block:
-                statements: []
-                span:
-                  lo: 92
-                  hi: 104
-              span:
-                lo: 76
-                hi: 104
-            span:
-              lo: 30
-              hi: 66
-          "{\"name\":\"main\",\"span\":\"{\\\"lo\\\":123,\\\"hi\\\":127}\"}":
-            annotations: []
-            call_type: Standard
-            identifier: "{\"name\":\"main\",\"span\":\"{\\\"lo\\\":123,\\\"hi\\\":127}\"}"
-            input: []
-            output:
-              - Internal:
-                  mode: None
-                  type_: Boolean
-                  span:
-                    lo: 133
-                    hi: 137
-            output_type: Boolean
-            block:
-              statements: []
-              span:
-                lo: 138
-                hi: 150
-            finalize:
-              identifier: "{\"name\":\"main\",\"span\":\"{\\\"lo\\\":160,\\\"hi\\\":164}\"}"
-              input:
-                - Internal:
-                    identifier: "{\"name\":\"a\",\"span\":\"{\\\"lo\\\":165,\\\"hi\\\":166}\"}"
-                    mode: None
-                    type_:
-                      Identifier: "{\"name\":\"foo\",\"span\":\"{\\\"lo\\\":168,\\\"hi\\\":171}\"}"
-                    span:
-                      lo: 165
-                      hi: 166
-                - Internal:
-                    identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":173,\\\"hi\\\":174}\"}"
-                    mode: None
-                    type_:
-                      Identifier: "{\"name\":\"bar\",\"span\":\"{\\\"lo\\\":176,\\\"hi\\\":179}\"}"
-                    span:
-                      lo: 173
-                      hi: 174
-              output:
-                - Internal:
-                    mode: None
-                    type_:
-                      Identifier: "{\"name\":\"baz\",\"span\":\"{\\\"lo\\\":184,\\\"hi\\\":187}\"}"
-                    span:
-                      lo: 184
-                      hi: 187
-              output_type:
-                Identifier: "{\"name\":\"baz\",\"span\":\"{\\\"lo\\\":184,\\\"hi\\\":187}\"}"
-              block:
-                statements: []
-                span:
-                  lo: 188
-                  hi: 200
-              span:
-                lo: 151
-                hi: 200
-            span:
-              lo: 114
-              hi: 150
-        span:
-          lo: 2
-          hi: 212
diff --git a/tests/expectations/tests/parser/finalize/finalize_fail.out b/tests/expectations/tests/parser/finalize/finalize_fail.out
deleted file mode 100644
index 8f20024058..0000000000
--- a/tests/expectations/tests/parser/finalize/finalize_fail.out
+++ /dev/null
@@ -1,5 +0,0 @@
----
-namespace: Parse
-expectation: Fail
-outputs:
-  - "Error [EPAR0370009]: unexpected string: expected 'identifier', found '{'\n    --> test:6:16\n     |\n   6 |     } finalize {\n     |                ^"
diff --git a/tests/expectations/tests/parser/finalize/finalize_statement.out b/tests/expectations/tests/parser/finalize/finalize_statement.out
deleted file mode 100644
index a40db230ae..0000000000
--- a/tests/expectations/tests/parser/finalize/finalize_statement.out
+++ /dev/null
@@ -1,47 +0,0 @@
----
-namespace: ParseStatement
-expectation: Pass
-outputs:
-  - Return:
-      expression:
-        Unit:
-          span:
-            lo: 7
-            hi: 11
-      finalize_arguments: []
-      span:
-        lo: 0
-        hi: 21
-  - Return:
-      expression:
-        Unit:
-          span:
-            lo: 7
-            hi: 11
-      finalize_arguments: []
-      span:
-        lo: 0
-        hi: 23
-  - Return:
-      expression:
-        Unit:
-          span:
-            lo: 7
-            hi: 11
-      finalize_arguments:
-        - Identifier: "{\"name\":\"foo\",\"span\":\"{\\\"lo\\\":21,\\\"hi\\\":24}\"}"
-      span:
-        lo: 0
-        hi: 26
-  - Return:
-      expression:
-        Unit:
-          span:
-            lo: 7
-            hi: 11
-      finalize_arguments:
-        - Identifier: "{\"name\":\"foo\",\"span\":\"{\\\"lo\\\":21,\\\"hi\\\":24}\"}"
-        - Identifier: "{\"name\":\"bar\",\"span\":\"{\\\"lo\\\":26,\\\"hi\\\":29}\"}"
-      span:
-        lo: 0
-        hi: 31
diff --git a/tests/expectations/tests/parser/finalize/finalize_statement_fail.out b/tests/expectations/tests/parser/finalize/finalize_statement_fail.out
deleted file mode 100644
index 59e3aede7c..0000000000
--- a/tests/expectations/tests/parser/finalize/finalize_statement_fail.out
+++ /dev/null
@@ -1,11 +0,0 @@
----
-namespace: ParseStatement
-expectation: Fail
-outputs:
-  - "Error [EPAR0370031]: `finalize` statements are deprecated.\n    --> test:1:1\n     |\n   1 | finalize(;\n     | ^^^^^^^^\n     |\n     = Use `return <expr> then finalize(<args>)` instead."
-  - "Error [EPAR0370031]: `finalize` statements are deprecated.\n    --> test:1:1\n     |\n   1 | finalize(foo, ,);\n     | ^^^^^^^^\n     |\n     = Use `return <expr> then finalize(<args>)` instead."
-  - "Error [EPAR0370031]: `finalize` statements are deprecated.\n    --> test:1:1\n     |\n   1 | finalize(foo, bar)\n     | ^^^^^^^^\n     |\n     = Use `return <expr> then finalize(<args>)` instead."
-  - "Error [EPAR0370030]: `async finalize` is deprecated.\n    --> test:1:1\n     |\n   1 | async async finalize(foo);\n     | ^^^^^\n     |\n     = Use `return <expr> then finalize(<args>)` instead."
-  - "Error [EPAR0370031]: `finalize` statements are deprecated.\n    --> test:1:1\n     |\n   1 | finalize;\n     | ^^^^^^^^\n     |\n     = Use `return <expr> then finalize(<args>)` instead."
-  - "Error [EPAR0370005]: expected ; -- found 'finalize'\n    --> test:1:6\n     |\n   1 | asyn finalize(foo);\n     |      ^^^^^^^^"
-  - "Error [EPAR0370005]: expected finalize -- found 'fin'\n    --> test:1:13\n     |\n   1 | return then fin;\n     |             ^^^"
diff --git a/tests/expectations/tests/parser/finalize/increment.out b/tests/expectations/tests/parser/finalize/increment.out
deleted file mode 100644
index a40f01a482..0000000000
--- a/tests/expectations/tests/parser/finalize/increment.out
+++ /dev/null
@@ -1,34 +0,0 @@
----
-namespace: ParseStatement
-expectation: Pass
-outputs:
-  - Increment:
-      mapping: "{\"name\":\"foo\",\"span\":\"{\\\"lo\\\":10,\\\"hi\\\":13}\"}"
-      index:
-        Identifier: "{\"name\":\"bar\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":18}\"}"
-      amount:
-        Identifier: "{\"name\":\"baz\",\"span\":\"{\\\"lo\\\":20,\\\"hi\\\":23}\"}"
-      span:
-        lo: 0
-        hi: 24
-  - Increment:
-      mapping: "{\"name\":\"foo\",\"span\":\"{\\\"lo\\\":10,\\\"hi\\\":13}\"}"
-      index:
-        Literal:
-          Integer:
-            - U8
-            - "2"
-            - span:
-                lo: 15
-                hi: 18
-      amount:
-        Literal:
-          Integer:
-            - U8
-            - "3"
-            - span:
-                lo: 20
-                hi: 23
-      span:
-        lo: 0
-        hi: 24
diff --git a/tests/expectations/tests/parser/finalize/increment_fail.out b/tests/expectations/tests/parser/finalize/increment_fail.out
deleted file mode 100644
index 0532074b14..0000000000
--- a/tests/expectations/tests/parser/finalize/increment_fail.out
+++ /dev/null
@@ -1,9 +0,0 @@
----
-namespace: ParseStatement
-expectation: Fail
-outputs:
-  - "Error [EPAR0370005]: expected ( -- found '['\n    --> test:1:10\n     |\n   1 | increment[foo, bar, baz];\n     |          ^"
-  - "Error [EPAR0370005]: expected , -- found ')'\n    --> test:1:19\n     |\n   1 | increment(foo, bar);\n     |                   ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'identifier', found ')'\n    --> test:1:11\n     |\n   1 | increment();\n     |           ^"
-  - "Error [EPAR0370005]: expected , -- found ')'\n    --> test:1:15\n     |\n   1 | increment(floo)\n     |               ^"
-  - "Error [EPAR0370005]: expected ( -- found 'foo'\n    --> test:1:11\n     |\n   1 | increment foo[bar] by baz;\n     |           ^^^"
diff --git a/tests/expectations/tests/parser/finalize/mapping.out b/tests/expectations/tests/parser/finalize/mapping.out
deleted file mode 100644
index 4599afe87a..0000000000
--- a/tests/expectations/tests/parser/finalize/mapping.out
+++ /dev/null
@@ -1,32 +0,0 @@
----
-namespace: Parse
-expectation: Pass
-outputs:
-  - imports: {}
-    program_scopes:
-      "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}":
-        program_id: "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}"
-        structs: {}
-        mappings:
-          "{\"name\":\"foo\",\"span\":\"{\\\"lo\\\":38,\\\"hi\\\":41}\"}":
-            identifier: "{\"name\":\"foo\",\"span\":\"{\\\"lo\\\":38,\\\"hi\\\":41}\"}"
-            key_type:
-              Identifier: "{\"name\":\"bar\",\"span\":\"{\\\"lo\\\":43,\\\"hi\\\":46}\"}"
-            value_type:
-              Identifier: "{\"name\":\"baz\",\"span\":\"{\\\"lo\\\":50,\\\"hi\\\":53}\"}"
-            span:
-              lo: 30
-              hi: 54
-          "{\"name\":\"foo\",\"span\":\"{\\\"lo\\\":72,\\\"hi\\\":75}\"}":
-            identifier: "{\"name\":\"foo\",\"span\":\"{\\\"lo\\\":72,\\\"hi\\\":75}\"}"
-            key_type:
-              Integer: U8
-            value_type:
-              Integer: U8
-            span:
-              lo: 64
-              hi: 86
-        functions: {}
-        span:
-          lo: 2
-          hi: 88
diff --git a/tests/expectations/tests/parser/finalize/mapping_fail.out b/tests/expectations/tests/parser/finalize/mapping_fail.out
deleted file mode 100644
index 55ed732df2..0000000000
--- a/tests/expectations/tests/parser/finalize/mapping_fail.out
+++ /dev/null
@@ -1,5 +0,0 @@
----
-namespace: Parse
-expectation: Fail
-outputs:
-  - "Error [EPAR0370009]: unexpected string: expected 'identifier', found 'u8'\n    --> test:4:13\n     |\n   4 |     mapping u8: u8 => u8;\n     |             ^^"
diff --git a/tests/expectations/tests/parser/functions/annotated_arg_not_ident_fail.out b/tests/expectations/tests/parser/functions/annotated_arg_not_ident_fail.out
deleted file mode 100644
index f2c51fd743..0000000000
--- a/tests/expectations/tests/parser/functions/annotated_arg_not_ident_fail.out
+++ /dev/null
@@ -1,5 +0,0 @@
----
-namespace: Parse
-expectation: Fail
-outputs:
-  - "Error [EPAR0370005]: expected 'function', 'transition' -- found '('\n    --> test:4:9\n     |\n   4 |     @foo(?, bar, ?)\n     |         ^"
diff --git a/tests/expectations/tests/parser/functions/annotated_context.out b/tests/expectations/tests/parser/functions/annotated_context.out
deleted file mode 100644
index b040c5d108..0000000000
--- a/tests/expectations/tests/parser/functions/annotated_context.out
+++ /dev/null
@@ -1,96 +0,0 @@
----
-namespace: Parse
-expectation: Pass
-outputs:
-  - imports: {}
-    program_scopes:
-      "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}":
-        program_id: "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}"
-        structs: {}
-        mappings: {}
-        functions:
-          "{\"name\":\"f\",\"span\":\"{\\\"lo\\\":52,\\\"hi\\\":53}\"}":
-            annotations:
-              - identifier: "{\"name\":\"context\",\"span\":\"{\\\"lo\\\":31,\\\"hi\\\":38}\"}"
-                span:
-                  lo: 30
-                  hi: 38
-            call_type: Standard
-            identifier: "{\"name\":\"f\",\"span\":\"{\\\"lo\\\":52,\\\"hi\\\":53}\"}"
-            input: []
-            output:
-              - Internal:
-                  mode: None
-                  type_:
-                    Integer: U8
-                  span:
-                    lo: 59
-                    hi: 61
-            output_type:
-              Integer: U8
-            block:
-              statements:
-                - Return:
-                    expression:
-                      Literal:
-                        Integer:
-                          - U8
-                          - "1"
-                          - span:
-                              lo: 79
-                              hi: 82
-                    finalize_arguments: ~
-                    span:
-                      lo: 72
-                      hi: 83
-              span:
-                lo: 62
-                hi: 89
-            finalize: ~
-            span:
-              lo: 43
-              hi: 89
-          "{\"name\":\"g\",\"span\":\"{\\\"lo\\\":141,\\\"hi\\\":142}\"}":
-            annotations:
-              - identifier: "{\"name\":\"context\",\"span\":\"{\\\"lo\\\":100,\\\"hi\\\":107}\"}"
-                span:
-                  lo: 99
-                  hi: 107
-            call_type: Standard
-            identifier: "{\"name\":\"g\",\"span\":\"{\\\"lo\\\":141,\\\"hi\\\":142}\"}"
-            input: []
-            output:
-              - Internal:
-                  mode: None
-                  type_:
-                    Integer: U8
-                  span:
-                    lo: 148
-                    hi: 150
-            output_type:
-              Integer: U8
-            block:
-              statements:
-                - Return:
-                    expression:
-                      Literal:
-                        Integer:
-                          - U8
-                          - "2"
-                          - span:
-                              lo: 168
-                              hi: 171
-                    finalize_arguments: ~
-                    span:
-                      lo: 161
-                      hi: 172
-              span:
-                lo: 151
-                hi: 178
-            finalize: ~
-            span:
-              lo: 132
-              hi: 178
-        span:
-          lo: 2
-          hi: 180
diff --git a/tests/expectations/tests/parser/functions/annotated_functions.out b/tests/expectations/tests/parser/functions/annotated_functions.out
deleted file mode 100644
index c2578e99ed..0000000000
--- a/tests/expectations/tests/parser/functions/annotated_functions.out
+++ /dev/null
@@ -1,130 +0,0 @@
----
-namespace: Parse
-expectation: Pass
-outputs:
-  - imports: {}
-    program_scopes:
-      "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}":
-        program_id: "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}"
-        structs: {}
-        mappings: {}
-        functions:
-          "{\"name\":\"foo\",\"span\":\"{\\\"lo\\\":66,\\\"hi\\\":69}\"}":
-            annotations:
-              - identifier: "{\"name\":\"foo\",\"span\":\"{\\\"lo\\\":31,\\\"hi\\\":34}\"}"
-                span:
-                  lo: 30
-                  hi: 34
-              - identifier: "{\"name\":\"bar\",\"span\":\"{\\\"lo\\\":40,\\\"hi\\\":43}\"}"
-                span:
-                  lo: 39
-                  hi: 43
-              - identifier: "{\"name\":\"baz\",\"span\":\"{\\\"lo\\\":49,\\\"hi\\\":52}\"}"
-                span:
-                  lo: 48
-                  hi: 52
-            call_type: Standard
-            identifier: "{\"name\":\"foo\",\"span\":\"{\\\"lo\\\":66,\\\"hi\\\":69}\"}"
-            input: []
-            output:
-              - Internal:
-                  mode: None
-                  type_:
-                    Integer: U8
-                  span:
-                    lo: 75
-                    hi: 77
-            output_type:
-              Integer: U8
-            block:
-              statements: []
-              span:
-                lo: 78
-                hi: 80
-            finalize: ~
-            span:
-              lo: 57
-              hi: 80
-          "{\"name\":\"mint\",\"span\":\"{\\\"lo\\\":101,\\\"hi\\\":105}\"}":
-            annotations: []
-            call_type: Transition
-            identifier: "{\"name\":\"mint\",\"span\":\"{\\\"lo\\\":101,\\\"hi\\\":105}\"}"
-            input: []
-            output:
-              - Internal:
-                  mode: None
-                  type_:
-                    Integer: U8
-                  span:
-                    lo: 111
-                    hi: 113
-            output_type:
-              Integer: U8
-            block:
-              statements: []
-              span:
-                lo: 114
-                hi: 116
-            finalize: ~
-            span:
-              lo: 90
-              hi: 116
-          "{\"name\":\"test\",\"span\":\"{\\\"lo\\\":145,\\\"hi\\\":149}\"}":
-            annotations:
-              - identifier: "{\"name\":\"test\",\"span\":\"{\\\"lo\\\":127,\\\"hi\\\":131}\"}"
-                span:
-                  lo: 126
-                  hi: 131
-            call_type: Standard
-            identifier: "{\"name\":\"test\",\"span\":\"{\\\"lo\\\":145,\\\"hi\\\":149}\"}"
-            input: []
-            output:
-              - Internal:
-                  mode: None
-                  type_:
-                    Integer: U8
-                  span:
-                    lo: 155
-                    hi: 157
-            output_type:
-              Integer: U8
-            block:
-              statements: []
-              span:
-                lo: 158
-                hi: 160
-            finalize: ~
-            span:
-              lo: 136
-              hi: 160
-          "{\"name\":\"foo\",\"span\":\"{\\\"lo\\\":192,\\\"hi\\\":195}\"}":
-            annotations:
-              - identifier: "{\"name\":\"program\",\"span\":\"{\\\"lo\\\":171,\\\"hi\\\":178}\"}"
-                span:
-                  lo: 170
-                  hi: 178
-            call_type: Standard
-            identifier: "{\"name\":\"foo\",\"span\":\"{\\\"lo\\\":192,\\\"hi\\\":195}\"}"
-            input: []
-            output:
-              - Internal:
-                  mode: None
-                  type_:
-                    Integer: U8
-                  span:
-                    lo: 201
-                    hi: 203
-            output_type:
-              Integer: U8
-            block:
-              statements: []
-              span:
-                lo: 204
-                hi: 206
-            finalize: ~
-            span:
-              lo: 183
-              hi: 206
-        span:
-          lo: 2
-          hi: 208
diff --git a/tests/expectations/tests/parser/functions/bounded_recursion.out b/tests/expectations/tests/parser/functions/bounded_recursion.out
deleted file mode 100644
index d3b0a79f1d..0000000000
--- a/tests/expectations/tests/parser/functions/bounded_recursion.out
+++ /dev/null
@@ -1,156 +0,0 @@
----
-namespace: Parse
-expectation: Pass
-outputs:
-  - imports: {}
-    program_scopes:
-      "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}":
-        program_id: "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}"
-        structs: {}
-        mappings: {}
-        functions:
-          "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":39,\\\"hi\\\":40}\"}":
-            annotations: []
-            call_type: Standard
-            identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":39,\\\"hi\\\":40}\"}"
-            input:
-              - Internal:
-                  identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":50,\\\"hi\\\":51}\"}"
-                  mode: Const
-                  type_:
-                    Integer: U32
-                  span:
-                    lo: 50
-                    hi: 51
-            output:
-              - Internal:
-                  mode: None
-                  type_:
-                    Integer: U8
-                  span:
-                    lo: 61
-                    hi: 63
-            output_type:
-              Integer: U8
-            block:
-              statements:
-                - Conditional:
-                    condition:
-                      Binary:
-                        left:
-                          Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":77,\\\"hi\\\":78}\"}"
-                        right:
-                          Literal:
-                            Integer:
-                              - U32
-                              - "5"
-                              - span:
-                                  lo: 81
-                                  hi: 85
-                        op: Lt
-                        span:
-                          lo: 77
-                          hi: 85
-                    then:
-                      statements:
-                        - Expression:
-                            expression:
-                              Call:
-                                function:
-                                  Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":100,\\\"hi\\\":101}\"}"
-                                arguments:
-                                  - Binary:
-                                      left:
-                                        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":102,\\\"hi\\\":103}\"}"
-                                      right:
-                                        Literal:
-                                          Integer:
-                                            - U32
-                                            - "1"
-                                            - span:
-                                                lo: 104
-                                                hi: 108
-                                      op: Add
-                                      span:
-                                        lo: 102
-                                        hi: 108
-                                external: ~
-                                span:
-                                  lo: 100
-                                  hi: 109
-                            span:
-                              lo: 100
-                              hi: 110
-                      span:
-                        lo: 86
-                        hi: 120
-                    otherwise: ~
-                    span:
-                      lo: 74
-                      hi: 120
-              span:
-                lo: 64
-                hi: 126
-            finalize: ~
-            span:
-              lo: 30
-              hi: 126
-          "{\"name\":\"main\",\"span\":\"{\\\"lo\\\":145,\\\"hi\\\":149}\"}":
-            annotations: []
-            call_type: Standard
-            identifier: "{\"name\":\"main\",\"span\":\"{\\\"lo\\\":145,\\\"hi\\\":149}\"}"
-            input:
-              - Internal:
-                  identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":150,\\\"hi\\\":151}\"}"
-                  mode: None
-                  type_: Boolean
-                  span:
-                    lo: 150
-                    hi: 151
-            output:
-              - Internal:
-                  mode: None
-                  type_: Boolean
-                  span:
-                    lo: 162
-                    hi: 166
-            output_type: Boolean
-            block:
-              statements:
-                - Expression:
-                    expression:
-                      Call:
-                        function:
-                          Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":177,\\\"hi\\\":178}\"}"
-                        arguments:
-                          - Literal:
-                              Integer:
-                                - U32
-                                - "1"
-                                - span:
-                                    lo: 179
-                                    hi: 183
-                        external: ~
-                        span:
-                          lo: 177
-                          hi: 184
-                    span:
-                      lo: 177
-                      hi: 185
-                - Return:
-                    expression:
-                      Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":201,\\\"hi\\\":202}\"}"
-                    finalize_arguments: ~
-                    span:
-                      lo: 194
-                      hi: 203
-              span:
-                lo: 167
-                hi: 209
-            finalize: ~
-            span:
-              lo: 136
-              hi: 209
-        span:
-          lo: 2
-          hi: 211
diff --git a/tests/expectations/tests/parser/functions/const_input.out b/tests/expectations/tests/parser/functions/const_input.out
deleted file mode 100644
index 14a1f706c4..0000000000
--- a/tests/expectations/tests/parser/functions/const_input.out
+++ /dev/null
@@ -1,78 +0,0 @@
----
-namespace: Parse
-expectation: Pass
-outputs:
-  - imports: {}
-    program_scopes:
-      "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}":
-        program_id: "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}"
-        structs: {}
-        mappings: {}
-        functions:
-          "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":39,\\\"hi\\\":40}\"}":
-            annotations: []
-            call_type: Standard
-            identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":39,\\\"hi\\\":40}\"}"
-            input:
-              - Internal:
-                  identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":47,\\\"hi\\\":48}\"}"
-                  mode: Const
-                  type_:
-                    Integer: U8
-                  span:
-                    lo: 47
-                    hi: 48
-            output:
-              - Internal:
-                  mode: None
-                  type_:
-                    Integer: U8
-                  span:
-                    lo: 57
-                    hi: 59
-            output_type:
-              Integer: U8
-            block:
-              statements: []
-              span:
-                lo: 60
-                hi: 62
-            finalize: ~
-            span:
-              lo: 30
-              hi: 62
-          "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":81,\\\"hi\\\":82}\"}":
-            annotations: []
-            call_type: Standard
-            identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":81,\\\"hi\\\":82}\"}"
-            input:
-              - Internal:
-                  identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":92,\\\"hi\\\":93}\"}"
-                  mode: Const
-                  type_:
-                    Integer: U64
-                  span:
-                    lo: 92
-                    hi: 93
-            output:
-              - Internal:
-                  mode: None
-                  type_:
-                    Integer: U8
-                  span:
-                    lo: 103
-                    hi: 105
-            output_type:
-              Integer: U8
-            block:
-              statements: []
-              span:
-                lo: 106
-                hi: 108
-            finalize: ~
-            span:
-              lo: 72
-              hi: 108
-        span:
-          lo: 2
-          hi: 109
diff --git a/tests/expectations/tests/parser/functions/const_param.out b/tests/expectations/tests/parser/functions/const_param.out
deleted file mode 100644
index 2da9d7d824..0000000000
--- a/tests/expectations/tests/parser/functions/const_param.out
+++ /dev/null
@@ -1,120 +0,0 @@
----
-namespace: Parse
-expectation: Pass
-outputs:
-  - imports: {}
-    program_scopes:
-      "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}":
-        program_id: "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}"
-        structs: {}
-        mappings: {}
-        functions:
-          "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":39,\\\"hi\\\":40}\"}":
-            annotations: []
-            call_type: Standard
-            identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":39,\\\"hi\\\":40}\"}"
-            input:
-              - Internal:
-                  identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":41,\\\"hi\\\":42}\"}"
-                  mode: None
-                  type_:
-                    Integer: U32
-                  span:
-                    lo: 41
-                    hi: 42
-              - Internal:
-                  identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":58,\\\"hi\\\":59}\"}"
-                  mode: Const
-                  type_:
-                    Integer: I32
-                  span:
-                    lo: 58
-                    hi: 59
-            output:
-              - Internal:
-                  mode: None
-                  type_:
-                    Integer: U8
-                  span:
-                    lo: 69
-                    hi: 71
-            output_type:
-              Integer: U8
-            block:
-              statements:
-                - Return:
-                    expression:
-                      Literal:
-                        Integer:
-                          - U8
-                          - "0"
-                          - span:
-                              lo: 89
-                              hi: 92
-                    finalize_arguments: ~
-                    span:
-                      lo: 82
-                      hi: 93
-              span:
-                lo: 72
-                hi: 99
-            finalize: ~
-            span:
-              lo: 30
-              hi: 99
-          "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":118,\\\"hi\\\":119}\"}":
-            annotations: []
-            call_type: Standard
-            identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":118,\\\"hi\\\":119}\"}"
-            input:
-              - Internal:
-                  identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":129,\\\"hi\\\":130}\"}"
-                  mode: Const
-                  type_:
-                    Integer: U32
-                  span:
-                    lo: 129
-                    hi: 130
-              - Internal:
-                  identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":137,\\\"hi\\\":138}\"}"
-                  mode: None
-                  type_:
-                    Integer: I32
-                  span:
-                    lo: 137
-                    hi: 138
-            output:
-              - Internal:
-                  mode: None
-                  type_:
-                    Integer: U8
-                  span:
-                    lo: 148
-                    hi: 150
-            output_type:
-              Integer: U8
-            block:
-              statements:
-                - Return:
-                    expression:
-                      Literal:
-                        Integer:
-                          - U8
-                          - "0"
-                          - span:
-                              lo: 168
-                              hi: 171
-                    finalize_arguments: ~
-                    span:
-                      lo: 161
-                      hi: 172
-              span:
-                lo: 151
-                hi: 178
-            finalize: ~
-            span:
-              lo: 109
-              hi: 178
-        span:
-          lo: 2
-          hi: 179
diff --git a/tests/expectations/tests/parser/functions/const_public_param_fail.out b/tests/expectations/tests/parser/functions/const_public_param_fail.out
deleted file mode 100644
index 23d755d747..0000000000
--- a/tests/expectations/tests/parser/functions/const_public_param_fail.out
+++ /dev/null
@@ -1,5 +0,0 @@
----
-namespace: Parse
-expectation: Fail
-outputs:
-  - "Error [EPAR0370009]: unexpected string: expected 'identifier', found 'public'\n    --> test:4:30\n     |\n   4 |     function x(x: u32, const public y: i32) {\n     |                              ^^^^^^"
diff --git a/tests/expectations/tests/parser/functions/danling_annotations_fail.out b/tests/expectations/tests/parser/functions/danling_annotations_fail.out
deleted file mode 100644
index cc10be4c21..0000000000
--- a/tests/expectations/tests/parser/functions/danling_annotations_fail.out
+++ /dev/null
@@ -1,42 +0,0 @@
----
-namespace: Parse
-expectation: Pass
-outputs:
-  - imports: {}
-    program_scopes:
-      "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}":
-        program_id: "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}"
-        structs: {}
-        mappings: {}
-        functions:
-          "{\"name\":\"test\",\"span\":\"{\\\"lo\\\":134,\\\"hi\\\":138}\"}":
-            annotations:
-              - identifier: "{\"name\":\"test\",\"span\":\"{\\\"lo\\\":111,\\\"hi\\\":115}\"}"
-                span:
-                  lo: 110
-                  hi: 115
-            call_type: Standard
-            identifier: "{\"name\":\"test\",\"span\":\"{\\\"lo\\\":134,\\\"hi\\\":138}\"}"
-            input: []
-            output:
-              - Internal:
-                  mode: None
-                  type_:
-                    Integer: U8
-                  span:
-                    lo: 144
-                    hi: 146
-            output_type:
-              Integer: U8
-            block:
-              statements: []
-              span:
-                lo: 147
-                hi: 149
-            finalize: ~
-            span:
-              lo: 125
-              hi: 149
-        span:
-          lo: 2
-          hi: 151
diff --git a/tests/expectations/tests/parser/functions/empty2.out b/tests/expectations/tests/parser/functions/empty2.out
deleted file mode 100644
index 1b0db96608..0000000000
--- a/tests/expectations/tests/parser/functions/empty2.out
+++ /dev/null
@@ -1,38 +0,0 @@
----
-namespace: Parse
-expectation: Pass
-outputs:
-  - imports: {}
-    program_scopes:
-      "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}":
-        program_id: "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}"
-        structs: {}
-        mappings: {}
-        functions:
-          "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":39,\\\"hi\\\":40}\"}":
-            annotations: []
-            call_type: Standard
-            identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":39,\\\"hi\\\":40}\"}"
-            input: []
-            output:
-              - Internal:
-                  mode: None
-                  type_:
-                    Integer: U8
-                  span:
-                    lo: 46
-                    hi: 48
-            output_type:
-              Integer: U8
-            block:
-              statements: []
-              span:
-                lo: 49
-                hi: 51
-            finalize: ~
-            span:
-              lo: 30
-              hi: 51
-        span:
-          lo: 2
-          hi: 52
diff --git a/tests/expectations/tests/parser/functions/escape_fail.out b/tests/expectations/tests/parser/functions/escape_fail.out
deleted file mode 100644
index 79b466976a..0000000000
--- a/tests/expectations/tests/parser/functions/escape_fail.out
+++ /dev/null
@@ -1,5 +0,0 @@
----
-namespace: Parse
-expectation: Fail
-outputs:
-  - "Error [EPAR0370016]: Could not lex the following content: `\\}`.\n"
diff --git a/tests/expectations/tests/parser/functions/ident_token_fail.out b/tests/expectations/tests/parser/functions/ident_token_fail.out
deleted file mode 100644
index 9cdcbac4c4..0000000000
--- a/tests/expectations/tests/parser/functions/ident_token_fail.out
+++ /dev/null
@@ -1,5 +0,0 @@
----
-namespace: Parse
-expectation: Fail
-outputs:
-  - "Error [EPAR0370005]: expected 'struct', 'record', 'mapping', '@', 'function', 'transition' -- found '1'\n    --> test:4:5\n     |\n   4 |     1 main() {}}\n     |     ^"
diff --git a/tests/expectations/tests/parser/functions/infinite_recursion.out b/tests/expectations/tests/parser/functions/infinite_recursion.out
deleted file mode 100644
index e047cac2f3..0000000000
--- a/tests/expectations/tests/parser/functions/infinite_recursion.out
+++ /dev/null
@@ -1,100 +0,0 @@
----
-namespace: Parse
-expectation: Pass
-outputs:
-  - imports: {}
-    program_scopes:
-      "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}":
-        program_id: "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}"
-        structs: {}
-        mappings: {}
-        functions:
-          "{\"name\":\"inf\",\"span\":\"{\\\"lo\\\":39,\\\"hi\\\":42}\"}":
-            annotations: []
-            call_type: Standard
-            identifier: "{\"name\":\"inf\",\"span\":\"{\\\"lo\\\":39,\\\"hi\\\":42}\"}"
-            input: []
-            output:
-              - Internal:
-                  mode: None
-                  type_:
-                    Integer: U8
-                  span:
-                    lo: 48
-                    hi: 50
-            output_type:
-              Integer: U8
-            block:
-              statements:
-                - Expression:
-                    expression:
-                      Call:
-                        function:
-                          Identifier: "{\"name\":\"inf\",\"span\":\"{\\\"lo\\\":61,\\\"hi\\\":64}\"}"
-                        arguments: []
-                        external: ~
-                        span:
-                          lo: 61
-                          hi: 66
-                    span:
-                      lo: 61
-                      hi: 67
-              span:
-                lo: 51
-                hi: 73
-            finalize: ~
-            span:
-              lo: 30
-              hi: 73
-          "{\"name\":\"main\",\"span\":\"{\\\"lo\\\":92,\\\"hi\\\":96}\"}":
-            annotations: []
-            call_type: Standard
-            identifier: "{\"name\":\"main\",\"span\":\"{\\\"lo\\\":92,\\\"hi\\\":96}\"}"
-            input:
-              - Internal:
-                  identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":97,\\\"hi\\\":98}\"}"
-                  mode: None
-                  type_: Boolean
-                  span:
-                    lo: 97
-                    hi: 98
-            output:
-              - Internal:
-                  mode: None
-                  type_: Boolean
-                  span:
-                    lo: 109
-                    hi: 113
-            output_type: Boolean
-            block:
-              statements:
-                - Expression:
-                    expression:
-                      Call:
-                        function:
-                          Identifier: "{\"name\":\"inf\",\"span\":\"{\\\"lo\\\":124,\\\"hi\\\":127}\"}"
-                        arguments: []
-                        external: ~
-                        span:
-                          lo: 124
-                          hi: 129
-                    span:
-                      lo: 124
-                      hi: 130
-                - Return:
-                    expression:
-                      Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":146,\\\"hi\\\":147}\"}"
-                    finalize_arguments: ~
-                    span:
-                      lo: 139
-                      hi: 148
-              span:
-                lo: 114
-                hi: 154
-            finalize: ~
-            span:
-              lo: 83
-              hi: 154
-        span:
-          lo: 2
-          hi: 156
diff --git a/tests/expectations/tests/parser/functions/mode_outside_tuple.out b/tests/expectations/tests/parser/functions/mode_outside_tuple.out
deleted file mode 100644
index 348fca4532..0000000000
--- a/tests/expectations/tests/parser/functions/mode_outside_tuple.out
+++ /dev/null
@@ -1,5 +0,0 @@
----
-namespace: Parse
-expectation: Fail
-outputs:
-  - "Error [EPAR0370009]: unexpected string: expected 'identifier', found '('\n    --> test:4:15\n     |\n   4 |     transition(a: u8) -> public (u8, u8) {\n     |               ^"
diff --git a/tests/expectations/tests/parser/functions/mut_input_fail.out b/tests/expectations/tests/parser/functions/mut_input_fail.out
deleted file mode 100644
index 8e831b473c..0000000000
--- a/tests/expectations/tests/parser/functions/mut_input_fail.out
+++ /dev/null
@@ -1,5 +0,0 @@
----
-namespace: Parse
-expectation: Fail
-outputs:
-  - "Error [EPAR0370005]: expected : -- found 'a'\n    --> test:4:20\n     |\n   4 |     function f(mut a: u8) {}}\n     |                    ^"
diff --git a/tests/expectations/tests/parser/functions/params.out b/tests/expectations/tests/parser/functions/params.out
deleted file mode 100644
index 271caa1aa9..0000000000
--- a/tests/expectations/tests/parser/functions/params.out
+++ /dev/null
@@ -1,67 +0,0 @@
----
-namespace: Parse
-expectation: Pass
-outputs:
-  - imports: {}
-    program_scopes:
-      "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}":
-        program_id: "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}"
-        structs: {}
-        mappings: {}
-        functions:
-          "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":39,\\\"hi\\\":40}\"}":
-            annotations: []
-            call_type: Standard
-            identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":39,\\\"hi\\\":40}\"}"
-            input:
-              - Internal:
-                  identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":41,\\\"hi\\\":42}\"}"
-                  mode: None
-                  type_:
-                    Integer: U32
-                  span:
-                    lo: 41
-                    hi: 42
-              - Internal:
-                  identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":49,\\\"hi\\\":50}\"}"
-                  mode: None
-                  type_:
-                    Integer: I32
-                  span:
-                    lo: 49
-                    hi: 50
-            output:
-              - Internal:
-                  mode: None
-                  type_:
-                    Integer: U8
-                  span:
-                    lo: 60
-                    hi: 62
-            output_type:
-              Integer: U8
-            block:
-              statements:
-                - Return:
-                    expression:
-                      Literal:
-                        Integer:
-                          - U8
-                          - "0"
-                          - span:
-                              lo: 80
-                              hi: 83
-                    finalize_arguments: ~
-                    span:
-                      lo: 73
-                      hi: 84
-              span:
-                lo: 63
-                hi: 90
-            finalize: ~
-            span:
-              lo: 30
-              hi: 90
-        span:
-          lo: 2
-          hi: 91
diff --git a/tests/expectations/tests/parser/functions/params_return.out b/tests/expectations/tests/parser/functions/params_return.out
deleted file mode 100644
index 620a65b8c4..0000000000
--- a/tests/expectations/tests/parser/functions/params_return.out
+++ /dev/null
@@ -1,67 +0,0 @@
----
-namespace: Parse
-expectation: Pass
-outputs:
-  - imports: {}
-    program_scopes:
-      "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}":
-        program_id: "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}"
-        structs: {}
-        mappings: {}
-        functions:
-          "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":39,\\\"hi\\\":40}\"}":
-            annotations: []
-            call_type: Standard
-            identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":39,\\\"hi\\\":40}\"}"
-            input:
-              - Internal:
-                  identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":41,\\\"hi\\\":42}\"}"
-                  mode: None
-                  type_:
-                    Integer: U32
-                  span:
-                    lo: 41
-                    hi: 42
-              - Internal:
-                  identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":49,\\\"hi\\\":50}\"}"
-                  mode: None
-                  type_:
-                    Integer: I32
-                  span:
-                    lo: 49
-                    hi: 50
-            output:
-              - Internal:
-                  mode: None
-                  type_:
-                    Integer: U32
-                  span:
-                    lo: 60
-                    hi: 63
-            output_type:
-              Integer: U32
-            block:
-              statements:
-                - Return:
-                    expression:
-                      Literal:
-                        Integer:
-                          - U8
-                          - "0"
-                          - span:
-                              lo: 81
-                              hi: 84
-                    finalize_arguments: ~
-                    span:
-                      lo: 74
-                      hi: 85
-              span:
-                lo: 64
-                hi: 91
-            finalize: ~
-            span:
-              lo: 30
-              hi: 91
-        span:
-          lo: 2
-          hi: 92
diff --git a/tests/expectations/tests/parser/functions/public_const_param_fail.out b/tests/expectations/tests/parser/functions/public_const_param_fail.out
deleted file mode 100644
index 7b1f424768..0000000000
--- a/tests/expectations/tests/parser/functions/public_const_param_fail.out
+++ /dev/null
@@ -1,5 +0,0 @@
----
-namespace: Parse
-expectation: Fail
-outputs:
-  - "Error [EPAR0370019]: A parameter cannot have multiple modes.\n    --> test:4:24\n     |\n   4 |     function x(x: u32, public const y: i32) {\n     |                        ^^^^^^^^^^^^\n     |\n     = Consider using either `constant`, `public`, `private`, or none at all."
diff --git a/tests/expectations/tests/parser/functions/public_param.out b/tests/expectations/tests/parser/functions/public_param.out
deleted file mode 100644
index d1cbaa5841..0000000000
--- a/tests/expectations/tests/parser/functions/public_param.out
+++ /dev/null
@@ -1,120 +0,0 @@
----
-namespace: Parse
-expectation: Pass
-outputs:
-  - imports: {}
-    program_scopes:
-      "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}":
-        program_id: "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}"
-        structs: {}
-        mappings: {}
-        functions:
-          "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":39,\\\"hi\\\":40}\"}":
-            annotations: []
-            call_type: Standard
-            identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":39,\\\"hi\\\":40}\"}"
-            input:
-              - Internal:
-                  identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":41,\\\"hi\\\":42}\"}"
-                  mode: None
-                  type_:
-                    Integer: U32
-                  span:
-                    lo: 41
-                    hi: 42
-              - Internal:
-                  identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":56,\\\"hi\\\":57}\"}"
-                  mode: Public
-                  type_:
-                    Integer: I32
-                  span:
-                    lo: 56
-                    hi: 57
-            output:
-              - Internal:
-                  mode: None
-                  type_:
-                    Integer: U8
-                  span:
-                    lo: 67
-                    hi: 69
-            output_type:
-              Integer: U8
-            block:
-              statements:
-                - Return:
-                    expression:
-                      Literal:
-                        Integer:
-                          - U8
-                          - "0"
-                          - span:
-                              lo: 87
-                              hi: 90
-                    finalize_arguments: ~
-                    span:
-                      lo: 80
-                      hi: 91
-              span:
-                lo: 70
-                hi: 97
-            finalize: ~
-            span:
-              lo: 30
-              hi: 97
-          "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":116,\\\"hi\\\":117}\"}":
-            annotations: []
-            call_type: Standard
-            identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":116,\\\"hi\\\":117}\"}"
-            input:
-              - Internal:
-                  identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":125,\\\"hi\\\":126}\"}"
-                  mode: Public
-                  type_:
-                    Integer: U32
-                  span:
-                    lo: 125
-                    hi: 126
-              - Internal:
-                  identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":133,\\\"hi\\\":134}\"}"
-                  mode: None
-                  type_:
-                    Integer: I32
-                  span:
-                    lo: 133
-                    hi: 134
-            output:
-              - Internal:
-                  mode: None
-                  type_:
-                    Integer: U8
-                  span:
-                    lo: 144
-                    hi: 146
-            output_type:
-              Integer: U8
-            block:
-              statements:
-                - Return:
-                    expression:
-                      Literal:
-                        Integer:
-                          - U8
-                          - "0"
-                          - span:
-                              lo: 164
-                              hi: 167
-                    finalize_arguments: ~
-                    span:
-                      lo: 157
-                      hi: 168
-              span:
-                lo: 147
-                hi: 174
-            finalize: ~
-            span:
-              lo: 107
-              hi: 174
-        span:
-          lo: 2
-          hi: 176
diff --git a/tests/expectations/tests/parser/functions/return.out b/tests/expectations/tests/parser/functions/return.out
deleted file mode 100644
index 05107b8dbc..0000000000
--- a/tests/expectations/tests/parser/functions/return.out
+++ /dev/null
@@ -1,51 +0,0 @@
----
-namespace: Parse
-expectation: Pass
-outputs:
-  - imports: {}
-    program_scopes:
-      "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}":
-        program_id: "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}"
-        structs: {}
-        mappings: {}
-        functions:
-          "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":39,\\\"hi\\\":40}\"}":
-            annotations: []
-            call_type: Standard
-            identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":39,\\\"hi\\\":40}\"}"
-            input: []
-            output:
-              - Internal:
-                  mode: None
-                  type_:
-                    Integer: U32
-                  span:
-                    lo: 46
-                    hi: 49
-            output_type:
-              Integer: U32
-            block:
-              statements:
-                - Return:
-                    expression:
-                      Literal:
-                        Integer:
-                          - U8
-                          - "0"
-                          - span:
-                              lo: 67
-                              hi: 70
-                    finalize_arguments: ~
-                    span:
-                      lo: 60
-                      hi: 71
-              span:
-                lo: 50
-                hi: 77
-            finalize: ~
-            span:
-              lo: 30
-              hi: 77
-        span:
-          lo: 2
-          hi: 78
diff --git a/tests/expectations/tests/parser/functions/spaced_annotation_fail.out b/tests/expectations/tests/parser/functions/spaced_annotation_fail.out
deleted file mode 100644
index dd4e4b7235..0000000000
--- a/tests/expectations/tests/parser/functions/spaced_annotation_fail.out
+++ /dev/null
@@ -1,5 +0,0 @@
----
-namespace: Parse
-expectation: Fail
-outputs:
-  - "Error [EPAR0370024]: Illegal spacing in the annotation declaration.\n    --> test:4:5\n     |\n   4 |     @ test\n     |     ^^^^^^\n     |\n     = Remove whitespace between the `@` symbol and the identifier."
diff --git a/tests/expectations/tests/parser/functions/test_keyword_fail.out b/tests/expectations/tests/parser/functions/test_keyword_fail.out
deleted file mode 100644
index 0f84dd4df6..0000000000
--- a/tests/expectations/tests/parser/functions/test_keyword_fail.out
+++ /dev/null
@@ -1,5 +0,0 @@
----
-namespace: Parse
-expectation: Fail
-outputs:
-  - "Error [EPAR0370005]: expected 'struct', 'record', 'mapping', '@', 'function', 'transition' -- found 'test'\n    --> test:4:5\n     |\n   4 |     test main() {}}\n     |     ^^^^"
diff --git a/tests/expectations/tests/parser/inputs/input_const.out b/tests/expectations/tests/parser/inputs/input_const.out
deleted file mode 100644
index 7e3adb68a3..0000000000
--- a/tests/expectations/tests/parser/inputs/input_const.out
+++ /dev/null
@@ -1,203 +0,0 @@
----
-namespace: Input
-expectation: Pass
-outputs:
-  - sections:
-      - name: main
-        definitions:
-          - mode: Const
-            type_: Boolean
-            name: "{\"name\":\"a\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
-            value:
-              Literal:
-                Boolean:
-                  - true
-                  - span:
-                      lo: 26
-                      hi: 30
-            span:
-              lo: 18
-              hi: 22
-          - mode: Const
-            type_:
-              Integer: U8
-            name: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":38,\\\"hi\\\":39}\"}"
-            value:
-              Literal:
-                Integer:
-                  - U8
-                  - "2"
-                  - span:
-                      lo: 49
-                      hi: 52
-            span:
-              lo: 41
-              hi: 43
-          - mode: Const
-            type_: Field
-            name: "{\"name\":\"c\",\"span\":\"{\\\"lo\\\":60,\\\"hi\\\":61}\"}"
-            value:
-              Literal:
-                Field:
-                  - "0"
-                  - span:
-                      lo: 71
-                      hi: 77
-            span:
-              lo: 63
-              hi: 68
-          - mode: Const
-            type_: Group
-            name: "{\"name\":\"d\",\"span\":\"{\\\"lo\\\":85,\\\"hi\\\":86}\"}"
-            value:
-              Literal:
-                Group:
-                  Tuple:
-                    x:
-                      Number:
-                        - "0"
-                        - span:
-                            lo: 97
-                            hi: 98
-                    y:
-                      Number:
-                        - "1"
-                        - span:
-                            lo: 100
-                            hi: 101
-                    span:
-                      lo: 96
-                      hi: 107
-            span:
-              lo: 88
-              hi: 93
-          - mode: Const
-            type_: Address
-            name: "{\"name\":\"e\",\"span\":\"{\\\"lo\\\":115,\\\"hi\\\":116}\"}"
-            value:
-              Literal:
-                Address:
-                  - aleo1fj982yqchhy973kz7e9jk6er7t6qd6jm9anplnlprem507w6lv9spwvfxx
-                  - span:
-                      lo: 128
-                      hi: 191
-            span:
-              lo: 118
-              hi: 125
-          - mode: Const
-            type_:
-              Integer: I8
-            name: "{\"name\":\"f\",\"span\":\"{\\\"lo\\\":199,\\\"hi\\\":200}\"}"
-            value:
-              Literal:
-                Integer:
-                  - I8
-                  - "-2"
-                  - span:
-                      lo: 210
-                      hi: 214
-            span:
-              lo: 202
-              hi: 204
-        span:
-          lo: 3
-          hi: 7
-      - name: registers
-        definitions:
-          - mode: None
-            type_: Boolean
-            name: "{\"name\":\"r0\",\"span\":\"{\\\"lo\\\":229,\\\"hi\\\":231}\"}"
-            value:
-              Literal:
-                Boolean:
-                  - true
-                  - span:
-                      lo: 241
-                      hi: 245
-            span:
-              lo: 233
-              hi: 237
-          - mode: None
-            type_:
-              Integer: U8
-            name: "{\"name\":\"r1\",\"span\":\"{\\\"lo\\\":247,\\\"hi\\\":249}\"}"
-            value:
-              Literal:
-                Integer:
-                  - U8
-                  - "2"
-                  - span:
-                      lo: 259
-                      hi: 262
-            span:
-              lo: 251
-              hi: 253
-          - mode: None
-            type_: Field
-            name: "{\"name\":\"r2\",\"span\":\"{\\\"lo\\\":264,\\\"hi\\\":266}\"}"
-            value:
-              Literal:
-                Field:
-                  - "0"
-                  - span:
-                      lo: 276
-                      hi: 282
-            span:
-              lo: 268
-              hi: 273
-          - mode: None
-            type_: Group
-            name: "{\"name\":\"r3\",\"span\":\"{\\\"lo\\\":284,\\\"hi\\\":286}\"}"
-            value:
-              Literal:
-                Group:
-                  Tuple:
-                    x:
-                      Number:
-                        - "0"
-                        - span:
-                            lo: 297
-                            hi: 298
-                    y:
-                      Number:
-                        - "1"
-                        - span:
-                            lo: 300
-                            hi: 301
-                    span:
-                      lo: 296
-                      hi: 307
-            span:
-              lo: 288
-              hi: 293
-          - mode: None
-            type_: Address
-            name: "{\"name\":\"r4\",\"span\":\"{\\\"lo\\\":309,\\\"hi\\\":311}\"}"
-            value:
-              Literal:
-                Address:
-                  - aleo1fj982yqchhy973kz7e9jk6er7t6qd6jm9anplnlprem507w6lv9spwvfxx
-                  - span:
-                      lo: 323
-                      hi: 386
-            span:
-              lo: 313
-              hi: 320
-          - mode: None
-            type_:
-              Integer: I8
-            name: "{\"name\":\"r4\",\"span\":\"{\\\"lo\\\":388,\\\"hi\\\":390}\"}"
-            value:
-              Literal:
-                Integer:
-                  - I8
-                  - "-1"
-                  - span:
-                      lo: 397
-                      hi: 401
-            span:
-              lo: 392
-              hi: 394
-        span:
-          lo: 218
-          hi: 227
diff --git a/tests/expectations/tests/parser/inputs/input_constant.out b/tests/expectations/tests/parser/inputs/input_constant.out
deleted file mode 100644
index 1722335e47..0000000000
--- a/tests/expectations/tests/parser/inputs/input_constant.out
+++ /dev/null
@@ -1,203 +0,0 @@
----
-namespace: Input
-expectation: Pass
-outputs:
-  - sections:
-      - name: main
-        definitions:
-          - mode: Const
-            type_: Boolean
-            name: "{\"name\":\"a\",\"span\":\"{\\\"lo\\\":18,\\\"hi\\\":19}\"}"
-            value:
-              Literal:
-                Boolean:
-                  - true
-                  - span:
-                      lo: 29
-                      hi: 33
-            span:
-              lo: 21
-              hi: 25
-          - mode: Const
-            type_:
-              Integer: U8
-            name: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":44,\\\"hi\\\":45}\"}"
-            value:
-              Literal:
-                Integer:
-                  - U8
-                  - "2"
-                  - span:
-                      lo: 55
-                      hi: 58
-            span:
-              lo: 47
-              hi: 49
-          - mode: Const
-            type_: Field
-            name: "{\"name\":\"c\",\"span\":\"{\\\"lo\\\":69,\\\"hi\\\":70}\"}"
-            value:
-              Literal:
-                Field:
-                  - "0"
-                  - span:
-                      lo: 80
-                      hi: 86
-            span:
-              lo: 72
-              hi: 77
-          - mode: Const
-            type_: Group
-            name: "{\"name\":\"d\",\"span\":\"{\\\"lo\\\":97,\\\"hi\\\":98}\"}"
-            value:
-              Literal:
-                Group:
-                  Tuple:
-                    x:
-                      Number:
-                        - "0"
-                        - span:
-                            lo: 109
-                            hi: 110
-                    y:
-                      Number:
-                        - "1"
-                        - span:
-                            lo: 112
-                            hi: 113
-                    span:
-                      lo: 108
-                      hi: 119
-            span:
-              lo: 100
-              hi: 105
-          - mode: Const
-            type_: Address
-            name: "{\"name\":\"e\",\"span\":\"{\\\"lo\\\":130,\\\"hi\\\":131}\"}"
-            value:
-              Literal:
-                Address:
-                  - aleo1fj982yqchhy973kz7e9jk6er7t6qd6jm9anplnlprem507w6lv9spwvfxx
-                  - span:
-                      lo: 143
-                      hi: 206
-            span:
-              lo: 133
-              hi: 140
-          - mode: Const
-            type_:
-              Integer: I8
-            name: "{\"name\":\"f\",\"span\":\"{\\\"lo\\\":217,\\\"hi\\\":218}\"}"
-            value:
-              Literal:
-                Integer:
-                  - I8
-                  - "-2"
-                  - span:
-                      lo: 228
-                      hi: 232
-            span:
-              lo: 220
-              hi: 222
-        span:
-          lo: 3
-          hi: 7
-      - name: registers
-        definitions:
-          - mode: None
-            type_: Boolean
-            name: "{\"name\":\"r0\",\"span\":\"{\\\"lo\\\":247,\\\"hi\\\":249}\"}"
-            value:
-              Literal:
-                Boolean:
-                  - true
-                  - span:
-                      lo: 259
-                      hi: 263
-            span:
-              lo: 251
-              hi: 255
-          - mode: None
-            type_:
-              Integer: U8
-            name: "{\"name\":\"r1\",\"span\":\"{\\\"lo\\\":265,\\\"hi\\\":267}\"}"
-            value:
-              Literal:
-                Integer:
-                  - U8
-                  - "2"
-                  - span:
-                      lo: 277
-                      hi: 280
-            span:
-              lo: 269
-              hi: 271
-          - mode: None
-            type_: Field
-            name: "{\"name\":\"r2\",\"span\":\"{\\\"lo\\\":282,\\\"hi\\\":284}\"}"
-            value:
-              Literal:
-                Field:
-                  - "0"
-                  - span:
-                      lo: 294
-                      hi: 300
-            span:
-              lo: 286
-              hi: 291
-          - mode: None
-            type_: Group
-            name: "{\"name\":\"r3\",\"span\":\"{\\\"lo\\\":302,\\\"hi\\\":304}\"}"
-            value:
-              Literal:
-                Group:
-                  Tuple:
-                    x:
-                      Number:
-                        - "0"
-                        - span:
-                            lo: 315
-                            hi: 316
-                    y:
-                      Number:
-                        - "1"
-                        - span:
-                            lo: 318
-                            hi: 319
-                    span:
-                      lo: 314
-                      hi: 325
-            span:
-              lo: 306
-              hi: 311
-          - mode: None
-            type_: Address
-            name: "{\"name\":\"r4\",\"span\":\"{\\\"lo\\\":327,\\\"hi\\\":329}\"}"
-            value:
-              Literal:
-                Address:
-                  - aleo1fj982yqchhy973kz7e9jk6er7t6qd6jm9anplnlprem507w6lv9spwvfxx
-                  - span:
-                      lo: 341
-                      hi: 404
-            span:
-              lo: 331
-              hi: 338
-          - mode: None
-            type_:
-              Integer: I8
-            name: "{\"name\":\"r4\",\"span\":\"{\\\"lo\\\":406,\\\"hi\\\":408}\"}"
-            value:
-              Literal:
-                Integer:
-                  - I8
-                  - "-1"
-                  - span:
-                      lo: 415
-                      hi: 419
-            span:
-              lo: 410
-              hi: 412
-        span:
-          lo: 236
-          hi: 245
diff --git a/tests/expectations/tests/parser/inputs/input_constant_public_fail.out b/tests/expectations/tests/parser/inputs/input_constant_public_fail.out
deleted file mode 100644
index 3a6bfe1661..0000000000
--- a/tests/expectations/tests/parser/inputs/input_constant_public_fail.out
+++ /dev/null
@@ -1,5 +0,0 @@
----
-namespace: Input
-expectation: Fail
-outputs:
-  - "Error [EPAR0370009]: unexpected string: expected 'identifier', found 'public'\n    --> test:4:10\n     |\n   4 | constant public a: bool  = true;                 \n     |          ^^^^^^"
diff --git a/tests/expectations/tests/parser/inputs/input_fail.out b/tests/expectations/tests/parser/inputs/input_fail.out
deleted file mode 100644
index 5f8bf95de3..0000000000
--- a/tests/expectations/tests/parser/inputs/input_fail.out
+++ /dev/null
@@ -1,5 +0,0 @@
----
-namespace: Input
-expectation: Fail
-outputs:
-  - "Error [EPAR0370000]: main\n    --> test:3:1\n     |\n   3 | main\n     | ^^^^"
diff --git a/tests/expectations/tests/parser/inputs/input_public.out b/tests/expectations/tests/parser/inputs/input_public.out
deleted file mode 100644
index 341286a657..0000000000
--- a/tests/expectations/tests/parser/inputs/input_public.out
+++ /dev/null
@@ -1,203 +0,0 @@
----
-namespace: Input
-expectation: Pass
-outputs:
-  - sections:
-      - name: main
-        definitions:
-          - mode: Public
-            type_: Boolean
-            name: "{\"name\":\"a\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
-            value:
-              Literal:
-                Boolean:
-                  - true
-                  - span:
-                      lo: 27
-                      hi: 31
-            span:
-              lo: 19
-              hi: 23
-          - mode: Public
-            type_:
-              Integer: U8
-            name: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":57,\\\"hi\\\":58}\"}"
-            value:
-              Literal:
-                Integer:
-                  - U8
-                  - "2"
-                  - span:
-                      lo: 68
-                      hi: 71
-            span:
-              lo: 60
-              hi: 62
-          - mode: Public
-            type_: Field
-            name: "{\"name\":\"c\",\"span\":\"{\\\"lo\\\":100,\\\"hi\\\":101}\"}"
-            value:
-              Literal:
-                Field:
-                  - "0"
-                  - span:
-                      lo: 111
-                      hi: 117
-            span:
-              lo: 103
-              hi: 108
-          - mode: Public
-            type_: Group
-            name: "{\"name\":\"d\",\"span\":\"{\\\"lo\\\":146,\\\"hi\\\":147}\"}"
-            value:
-              Literal:
-                Group:
-                  Tuple:
-                    x:
-                      Number:
-                        - "0"
-                        - span:
-                            lo: 158
-                            hi: 159
-                    y:
-                      Number:
-                        - "1"
-                        - span:
-                            lo: 161
-                            hi: 162
-                    span:
-                      lo: 157
-                      hi: 168
-            span:
-              lo: 149
-              hi: 154
-          - mode: Public
-            type_: Address
-            name: "{\"name\":\"e\",\"span\":\"{\\\"lo\\\":187,\\\"hi\\\":188}\"}"
-            value:
-              Literal:
-                Address:
-                  - aleo1fj982yqchhy973kz7e9jk6er7t6qd6jm9anplnlprem507w6lv9spwvfxx
-                  - span:
-                      lo: 200
-                      hi: 263
-            span:
-              lo: 190
-              hi: 197
-          - mode: Public
-            type_:
-              Integer: I8
-            name: "{\"name\":\"f\",\"span\":\"{\\\"lo\\\":272,\\\"hi\\\":273}\"}"
-            value:
-              Literal:
-                Integer:
-                  - I8
-                  - "-2"
-                  - span:
-                      lo: 283
-                      hi: 287
-            span:
-              lo: 275
-              hi: 277
-        span:
-          lo: 3
-          hi: 7
-      - name: registers
-        definitions:
-          - mode: None
-            type_: Boolean
-            name: "{\"name\":\"r0\",\"span\":\"{\\\"lo\\\":302,\\\"hi\\\":304}\"}"
-            value:
-              Literal:
-                Boolean:
-                  - true
-                  - span:
-                      lo: 314
-                      hi: 318
-            span:
-              lo: 306
-              hi: 310
-          - mode: None
-            type_:
-              Integer: U8
-            name: "{\"name\":\"r1\",\"span\":\"{\\\"lo\\\":337,\\\"hi\\\":339}\"}"
-            value:
-              Literal:
-                Integer:
-                  - U8
-                  - "2"
-                  - span:
-                      lo: 349
-                      hi: 352
-            span:
-              lo: 341
-              hi: 343
-          - mode: None
-            type_: Field
-            name: "{\"name\":\"r2\",\"span\":\"{\\\"lo\\\":374,\\\"hi\\\":376}\"}"
-            value:
-              Literal:
-                Field:
-                  - "0"
-                  - span:
-                      lo: 386
-                      hi: 392
-            span:
-              lo: 378
-              hi: 383
-          - mode: None
-            type_: Group
-            name: "{\"name\":\"r3\",\"span\":\"{\\\"lo\\\":414,\\\"hi\\\":416}\"}"
-            value:
-              Literal:
-                Group:
-                  Tuple:
-                    x:
-                      Number:
-                        - "0"
-                        - span:
-                            lo: 427
-                            hi: 428
-                    y:
-                      Number:
-                        - "1"
-                        - span:
-                            lo: 430
-                            hi: 431
-                    span:
-                      lo: 426
-                      hi: 437
-            span:
-              lo: 418
-              hi: 423
-          - mode: None
-            type_: Address
-            name: "{\"name\":\"r4\",\"span\":\"{\\\"lo\\\":449,\\\"hi\\\":451}\"}"
-            value:
-              Literal:
-                Address:
-                  - aleo1fj982yqchhy973kz7e9jk6er7t6qd6jm9anplnlprem507w6lv9spwvfxx
-                  - span:
-                      lo: 463
-                      hi: 526
-            span:
-              lo: 453
-              hi: 460
-          - mode: None
-            type_:
-              Integer: I8
-            name: "{\"name\":\"r4\",\"span\":\"{\\\"lo\\\":528,\\\"hi\\\":530}\"}"
-            value:
-              Literal:
-                Integer:
-                  - I8
-                  - "-1"
-                  - span:
-                      lo: 537
-                      hi: 541
-            span:
-              lo: 532
-              hi: 534
-        span:
-          lo: 291
-          hi: 300
diff --git a/tests/expectations/tests/parser/inputs/input_public_constant_fail.out b/tests/expectations/tests/parser/inputs/input_public_constant_fail.out
deleted file mode 100644
index dda0297a22..0000000000
--- a/tests/expectations/tests/parser/inputs/input_public_constant_fail.out
+++ /dev/null
@@ -1,5 +0,0 @@
----
-namespace: Input
-expectation: Fail
-outputs:
-  - "Error [EPAR0370019]: A parameter cannot have multiple modes.\n    --> test:4:1\n     |\n   4 | public constant a: bool  = true;\n     | ^^^^^^^^^^^^^^^\n     |\n     = Consider using either `constant`, `public`, `private`, or none at all."
diff --git a/tests/expectations/tests/parser/program/backslash_eof.out b/tests/expectations/tests/parser/program/backslash_eof.out
deleted file mode 100644
index 79b466976a..0000000000
--- a/tests/expectations/tests/parser/program/backslash_eof.out
+++ /dev/null
@@ -1,5 +0,0 @@
----
-namespace: Parse
-expectation: Fail
-outputs:
-  - "Error [EPAR0370016]: Could not lex the following content: `\\}`.\n"
diff --git a/tests/expectations/tests/parser/program/bidi_comment_2_fail.out b/tests/expectations/tests/parser/program/bidi_comment_2_fail.out
deleted file mode 100644
index 8e08efdd8b..0000000000
--- a/tests/expectations/tests/parser/program/bidi_comment_2_fail.out
+++ /dev/null
@@ -1,5 +0,0 @@
----
-namespace: Parse
-expectation: Fail
-outputs:
-  - "Error [EPAR0370020]: Unicode bidi override code point encountered."
diff --git a/tests/expectations/tests/parser/program/bidi_comment_fail.out b/tests/expectations/tests/parser/program/bidi_comment_fail.out
deleted file mode 100644
index 8e08efdd8b..0000000000
--- a/tests/expectations/tests/parser/program/bidi_comment_fail.out
+++ /dev/null
@@ -1,5 +0,0 @@
----
-namespace: Parse
-expectation: Fail
-outputs:
-  - "Error [EPAR0370020]: Unicode bidi override code point encountered."
diff --git a/tests/expectations/tests/parser/program/circuit_deprecated_fail.out b/tests/expectations/tests/parser/program/circuit_deprecated_fail.out
deleted file mode 100644
index 463c1aeb4a..0000000000
--- a/tests/expectations/tests/parser/program/circuit_deprecated_fail.out
+++ /dev/null
@@ -1,5 +0,0 @@
----
-namespace: Parse
-expectation: Fail
-outputs:
-  - "Error [EPAR0370025]: The keyword `circuit` is deprecated.\n    --> test:5:5\n     |\n   5 |     circuit Foo {\n     |     ^^^^^^^\n     |\n     = Use `struct` instead."
diff --git a/tests/expectations/tests/parser/program/dollar_eof.out b/tests/expectations/tests/parser/program/dollar_eof.out
deleted file mode 100644
index 47ee95447d..0000000000
--- a/tests/expectations/tests/parser/program/dollar_eof.out
+++ /dev/null
@@ -1,5 +0,0 @@
----
-namespace: Parse
-expectation: Fail
-outputs:
-  - "Error [EPAR0370016]: Could not lex the following content: `$}`.\n"
diff --git a/tests/expectations/tests/parser/program/escape_u8_eof.out b/tests/expectations/tests/parser/program/escape_u8_eof.out
deleted file mode 100644
index 7706d99333..0000000000
--- a/tests/expectations/tests/parser/program/escape_u8_eof.out
+++ /dev/null
@@ -1,5 +0,0 @@
----
-namespace: Parse
-expectation: Fail
-outputs:
-  - "Error [EPAR0370016]: Could not lex the following content: `\\1u8}`.\n"
diff --git a/tests/expectations/tests/parser/program/hex_eof.out b/tests/expectations/tests/parser/program/hex_eof.out
deleted file mode 100644
index 2d3fd9c9b2..0000000000
--- a/tests/expectations/tests/parser/program/hex_eof.out
+++ /dev/null
@@ -1,5 +0,0 @@
----
-namespace: Parse
-expectation: Fail
-outputs:
-  - "Error [EPAR0370018]: A hex number `0x..` was provided but hex is not allowed."
diff --git a/tests/expectations/tests/parser/program/mapping.out b/tests/expectations/tests/parser/program/mapping.out
deleted file mode 100644
index 8d4d3aa263..0000000000
--- a/tests/expectations/tests/parser/program/mapping.out
+++ /dev/null
@@ -1,31 +0,0 @@
----
-namespace: Parse
-expectation: Pass
-outputs:
-  - imports: {}
-    program_scopes:
-      "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}":
-        program_id: "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}"
-        structs: {}
-        mappings:
-          "{\"name\":\"balances\",\"span\":\"{\\\"lo\\\":38,\\\"hi\\\":46}\"}":
-            identifier: "{\"name\":\"balances\",\"span\":\"{\\\"lo\\\":38,\\\"hi\\\":46}\"}"
-            key_type: Address
-            value_type:
-              Integer: U128
-            span:
-              lo: 30
-              hi: 64
-          "{\"name\":\"foo\",\"span\":\"{\\\"lo\\\":82,\\\"hi\\\":85}\"}":
-            identifier: "{\"name\":\"foo\",\"span\":\"{\\\"lo\\\":82,\\\"hi\\\":85}\"}"
-            key_type:
-              Identifier: "{\"name\":\"bar\",\"span\":\"{\\\"lo\\\":87,\\\"hi\\\":90}\"}"
-            value_type:
-              Identifier: "{\"name\":\"baz\",\"span\":\"{\\\"lo\\\":94,\\\"hi\\\":97}\"}"
-            span:
-              lo: 74
-              hi: 98
-        functions: {}
-        span:
-          lo: 2
-          hi: 100
diff --git a/tests/expectations/tests/parser/program/mapping_fail.out b/tests/expectations/tests/parser/program/mapping_fail.out
deleted file mode 100644
index c5baba5e44..0000000000
--- a/tests/expectations/tests/parser/program/mapping_fail.out
+++ /dev/null
@@ -1,5 +0,0 @@
----
-namespace: Parse
-expectation: Fail
-outputs:
-  - "Error [EPAR0370005]: expected 'struct', 'record', 'mapping', '@', 'function', 'transition' -- found 'mappin'\n    --> test:4:5\n     |\n   4 |     mappin balances: address => u128;\n     |     ^^^^^^"
diff --git a/tests/expectations/tests/parser/program/pipe_eof.out b/tests/expectations/tests/parser/program/pipe_eof.out
deleted file mode 100644
index bbb1309aa2..0000000000
--- a/tests/expectations/tests/parser/program/pipe_eof.out
+++ /dev/null
@@ -1,5 +0,0 @@
----
-namespace: Parse
-expectation: Fail
-outputs:
-  - "Error [EPAR0370005]: expected : -- found '='\n    --> test:5:15\n     |\n   5 |         let x = 1u8;\n     |               ^"
diff --git a/tests/expectations/tests/parser/program/q_eof.out b/tests/expectations/tests/parser/program/q_eof.out
deleted file mode 100644
index 9fe147e531..0000000000
--- a/tests/expectations/tests/parser/program/q_eof.out
+++ /dev/null
@@ -1,5 +0,0 @@
----
-namespace: Parse
-expectation: Fail
-outputs:
-  - "Error [EPAR0370013]: Expected a closed string but found `}\n`."
diff --git a/tests/expectations/tests/parser/program/sq_eof.out b/tests/expectations/tests/parser/program/sq_eof.out
deleted file mode 100644
index 01a321631c..0000000000
--- a/tests/expectations/tests/parser/program/sq_eof.out
+++ /dev/null
@@ -1,5 +0,0 @@
----
-namespace: Parse
-expectation: Fail
-outputs:
-  - "Error [EPAR0370016]: Could not lex the following content: `'}`.\n"
diff --git a/tests/expectations/tests/parser/program/tilde_eof.out b/tests/expectations/tests/parser/program/tilde_eof.out
deleted file mode 100644
index d78406bfac..0000000000
--- a/tests/expectations/tests/parser/program/tilde_eof.out
+++ /dev/null
@@ -1,5 +0,0 @@
----
-namespace: Parse
-expectation: Fail
-outputs:
-  - "Error [EPAR0370016]: Could not lex the following content: `~}`.\n"
diff --git a/tests/expectations/tests/parser/program/unclosed_unicode_eof_fail.out b/tests/expectations/tests/parser/program/unclosed_unicode_eof_fail.out
deleted file mode 100644
index d2ffeb2118..0000000000
--- a/tests/expectations/tests/parser/program/unclosed_unicode_eof_fail.out
+++ /dev/null
@@ -1,5 +0,0 @@
----
-namespace: Parse
-expectation: Fail
-outputs:
-  - "Error [EPAR0370016]: Could not lex the following content: `'\\u}`.\n"
diff --git a/tests/expectations/tests/parser/serialize/one_plus_one.out b/tests/expectations/tests/parser/serialize/one_plus_one.out
deleted file mode 100644
index 01ba3d88fa..0000000000
--- a/tests/expectations/tests/parser/serialize/one_plus_one.out
+++ /dev/null
@@ -1,41 +0,0 @@
----
-namespace: Serialize
-expectation: Pass
-outputs:
-  - imports: {}
-    program_scopes:
-      "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}":
-        program_id: "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}"
-        structs: {}
-        mappings: {}
-        functions:
-          "{\"name\":\"main\",\"span\":\"{\\\"lo\\\":35,\\\"hi\\\":39}\"}":
-            annotations: []
-            call_type: Standard
-            identifier: "{\"name\":\"main\",\"span\":\"{\\\"lo\\\":35,\\\"hi\\\":39}\"}"
-            input: []
-            output:
-              - Internal:
-                  mode: None
-                  type_:
-                    Integer: U8
-            output_type:
-              Integer: U8
-            block:
-              statements:
-                - Return:
-                    expression:
-                      Binary:
-                        left:
-                          Literal:
-                            Integer:
-                              - U8
-                              - "1"
-                        right:
-                          Literal:
-                            Integer:
-                              - U8
-                              - "1"
-                        op: Add
-                    finalize_arguments: ~
-            finalize: ~
diff --git a/tests/expectations/tests/parser/serialize/parser_error.out b/tests/expectations/tests/parser/serialize/parser_error.out
deleted file mode 100644
index e68253302d..0000000000
--- a/tests/expectations/tests/parser/serialize/parser_error.out
+++ /dev/null
@@ -1,5 +0,0 @@
----
-namespace: Serialize
-expectation: Fail
-outputs:
-  - "Error [EPAR0370005]: expected 'import', 'program' -- found 'invalid'\n    --> test:3:1\n     |\n   3 | invalid\n     | ^^^^^^^"
diff --git a/tests/expectations/tests/parser/statement/assert.out b/tests/expectations/tests/parser/statement/assert.out
deleted file mode 100644
index f31359f57d..0000000000
--- a/tests/expectations/tests/parser/statement/assert.out
+++ /dev/null
@@ -1,56 +0,0 @@
----
-namespace: ParseStatement
-expectation: Pass
-outputs:
-  - Assert:
-      variant:
-        AssertEq:
-          - Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":10,\\\"hi\\\":11}\"}"
-          - Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
-      span:
-        lo: 0
-        hi: 9
-  - Assert:
-      variant:
-        AssertEq:
-          - Struct:
-              name: "{\"name\":\"Foo\",\"span\":\"{\\\"lo\\\":10,\\\"hi\\\":13}\"}"
-              members:
-                - identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
-                  expression:
-                    Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":19,\\\"hi\\\":20}\"}"
-              span:
-                lo: 10
-                hi: 22
-          - Struct:
-              name: "{\"name\":\"Foo\",\"span\":\"{\\\"lo\\\":24,\\\"hi\\\":27}\"}"
-              members:
-                - identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":30,\\\"hi\\\":31}\"}"
-                  expression:
-                    Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":33,\\\"hi\\\":34}\"}"
-              span:
-                lo: 24
-                hi: 36
-      span:
-        lo: 0
-        hi: 9
-  - Assert:
-      variant:
-        AssertNeq:
-          - Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":11,\\\"hi\\\":12}\"}"
-          - Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":14,\\\"hi\\\":15}\"}"
-      span:
-        lo: 0
-        hi: 10
-  - Assert:
-      variant:
-        Assert:
-          Literal:
-            Boolean:
-              - false
-              - span:
-                  lo: 7
-                  hi: 12
-      span:
-        lo: 0
-        hi: 6
diff --git a/tests/expectations/tests/parser/statement/assign.out b/tests/expectations/tests/parser/statement/assign.out
deleted file mode 100644
index bf1e2590d6..0000000000
--- a/tests/expectations/tests/parser/statement/assign.out
+++ /dev/null
@@ -1,43 +0,0 @@
----
-namespace: ParseStatement
-expectation: Pass
-outputs:
-  - Assign:
-      place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
-      value:
-        Identifier: "{\"name\":\"expr\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":8}\"}"
-      span:
-        lo: 0
-        hi: 8
-  - Assign:
-      place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
-      value:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
-          op: Add
-          span:
-            lo: 4
-            hi: 7
-      span:
-        lo: 0
-        hi: 7
-  - Assign:
-      place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
-      value:
-        Call:
-          function:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
-          arguments: []
-          external: ~
-          span:
-            lo: 4
-            hi: 7
-      span:
-        lo: 0
-        hi: 7
diff --git a/tests/expectations/tests/parser/statement/async_fail.out b/tests/expectations/tests/parser/statement/async_fail.out
deleted file mode 100644
index 96c8d4b6df..0000000000
--- a/tests/expectations/tests/parser/statement/async_fail.out
+++ /dev/null
@@ -1,5 +0,0 @@
----
-namespace: ParseStatement
-expectation: Fail
-outputs:
-  - "Error [EPAR0370030]: `async finalize` is deprecated.\n    --> test:1:1\n     |\n   1 | async finalize(foo);\n     | ^^^^^\n     |\n     = Use `return <expr> then finalize(<args>)` instead."
diff --git a/tests/expectations/tests/parser/statement/block.out b/tests/expectations/tests/parser/statement/block.out
deleted file mode 100644
index 3d883dce1d..0000000000
--- a/tests/expectations/tests/parser/statement/block.out
+++ /dev/null
@@ -1,90 +0,0 @@
----
-namespace: ParseStatement
-expectation: Pass
-outputs:
-  - Block:
-      statements: []
-      span:
-        lo: 0
-        hi: 2
-  - Block:
-      statements:
-        - Return:
-            expression:
-              Literal:
-                Integer:
-                  - U8
-                  - "0"
-                  - span:
-                      lo: 9
-                      hi: 12
-            finalize_arguments: ~
-            span:
-              lo: 2
-              hi: 13
-      span:
-        lo: 0
-        hi: 15
-  - Block:
-      statements:
-        - Block:
-            statements: []
-            span:
-              lo: 1
-              hi: 3
-      span:
-        lo: 0
-        hi: 4
-  - Block:
-      statements:
-        - Block:
-            statements:
-              - Return:
-                  expression:
-                    Literal:
-                      Integer:
-                        - U8
-                        - "0"
-                        - span:
-                            lo: 11
-                            hi: 14
-                  finalize_arguments: ~
-                  span:
-                    lo: 4
-                    hi: 15
-            span:
-              lo: 2
-              hi: 17
-      span:
-        lo: 0
-        hi: 19
-  - Block:
-      statements:
-        - Conditional:
-            condition:
-              Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":5,\\\"hi\\\":6}\"}"
-            then:
-              statements:
-                - Return:
-                    expression:
-                      Literal:
-                        Integer:
-                          - U8
-                          - "0"
-                          - span:
-                              lo: 16
-                              hi: 19
-                    finalize_arguments: ~
-                    span:
-                      lo: 9
-                      hi: 20
-              span:
-                lo: 7
-                hi: 22
-            otherwise: ~
-            span:
-              lo: 2
-              hi: 22
-      span:
-        lo: 0
-        hi: 24
diff --git a/tests/expectations/tests/parser/statement/conditional.out b/tests/expectations/tests/parser/statement/conditional.out
deleted file mode 100644
index 7fd224c65d..0000000000
--- a/tests/expectations/tests/parser/statement/conditional.out
+++ /dev/null
@@ -1,149 +0,0 @@
----
-namespace: ParseStatement
-expectation: Pass
-outputs:
-  - Conditional:
-      condition:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":3,\\\"hi\\\":4}\"}"
-      then:
-        statements:
-          - Return:
-              expression:
-                Literal:
-                  Integer:
-                    - U8
-                    - "0"
-                    - span:
-                        lo: 14
-                        hi: 17
-              finalize_arguments: ~
-              span:
-                lo: 7
-                hi: 18
-        span:
-          lo: 5
-          hi: 20
-      otherwise: ~
-      span:
-        lo: 0
-        hi: 20
-  - Conditional:
-      condition:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
-      then:
-        statements:
-          - Return:
-              expression:
-                Literal:
-                  Integer:
-                    - U8
-                    - "0"
-                    - span:
-                        lo: 16
-                        hi: 19
-              finalize_arguments: ~
-              span:
-                lo: 9
-                hi: 20
-        span:
-          lo: 7
-          hi: 22
-      otherwise: ~
-      span:
-        lo: 0
-        hi: 22
-  - Conditional:
-      condition:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
-      then:
-        statements: []
-        span:
-          lo: 7
-          hi: 9
-      otherwise:
-        Block:
-          statements: []
-          span:
-            lo: 15
-            hi: 17
-      span:
-        lo: 0
-        hi: 17
-  - Conditional:
-      condition:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":3,\\\"hi\\\":4}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":5,\\\"hi\\\":6}\"}"
-          op: Add
-          span:
-            lo: 3
-            hi: 6
-      then:
-        statements: []
-        span:
-          lo: 7
-          hi: 9
-      otherwise:
-        Conditional:
-          condition:
-            Binary:
-              left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":18,\\\"hi\\\":19}\"}"
-              right:
-                Identifier: "{\"name\":\"z\",\"span\":\"{\\\"lo\\\":20,\\\"hi\\\":21}\"}"
-              op: Add
-              span:
-                lo: 18
-                hi: 21
-          then:
-            statements: []
-            span:
-              lo: 22
-              hi: 24
-          otherwise:
-            Block:
-              statements: []
-              span:
-                lo: 30
-                hi: 32
-          span:
-            lo: 15
-            hi: 32
-      span:
-        lo: 0
-        hi: 32
-  - Conditional:
-      condition:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":3,\\\"hi\\\":4}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":5,\\\"hi\\\":6}\"}"
-          op: Add
-          span:
-            lo: 3
-            hi: 6
-      then:
-        statements:
-          - Return:
-              expression:
-                Literal:
-                  Integer:
-                    - U8
-                    - "0"
-                    - span:
-                        lo: 16
-                        hi: 19
-              finalize_arguments: ~
-              span:
-                lo: 9
-                hi: 20
-        span:
-          lo: 7
-          hi: 22
-      otherwise: ~
-      span:
-        lo: 0
-        hi: 22
diff --git a/tests/expectations/tests/parser/statement/conditional_fail.out b/tests/expectations/tests/parser/statement/conditional_fail.out
deleted file mode 100644
index 6282f02aa2..0000000000
--- a/tests/expectations/tests/parser/statement/conditional_fail.out
+++ /dev/null
@@ -1,5 +0,0 @@
----
-namespace: ParseStatement
-expectation: Fail
-outputs:
-  - "Error [EPAR0370005]: expected : -- found '='\n    --> test:1:23\n     |\n   1 | if true {} else let x = 2;\n     |                       ^"
diff --git a/tests/expectations/tests/parser/statement/console_fail.out b/tests/expectations/tests/parser/statement/console_fail.out
deleted file mode 100644
index 185c1f36e3..0000000000
--- a/tests/expectations/tests/parser/statement/console_fail.out
+++ /dev/null
@@ -1,16 +0,0 @@
----
-namespace: ParseStatement
-expectation: Fail
-outputs:
-  - "Error [EPAR0370020]: Unicode bidi override code point encountered."
-  - "Error [EPAR0370032]: `console` statements are not yet supported.\n    --> test:1:1\n     |\n   1 | console.log(1);\n     | ^^^^^^^\n     |\n     = Consider using `assert`, `assert_eq`, or `assert_neq` instead."
-  - "Error [EPAR0370032]: `console` statements are not yet supported.\n    --> test:1:1\n     |\n   1 | console.test();\n     | ^^^^^^^\n     |\n     = Consider using `assert`, `assert_eq`, or `assert_neq` instead."
-  - "Error [EPAR0370032]: `console` statements are not yet supported.\n    --> test:1:1\n     |\n   1 | console.error(\"{}\", x);\n     | ^^^^^^^\n     |\n     = Consider using `assert`, `assert_eq`, or `assert_neq` instead."
-  - "Error [EPAR0370032]: `console` statements are not yet supported.\n    --> test:1:1\n     |\n   1 | console.error(\"{}{}\", x, y);\n     | ^^^^^^^\n     |\n     = Consider using `assert`, `assert_eq`, or `assert_neq` instead."
-  - "Error [EPAR0370032]: `console` statements are not yet supported.\n    --> test:1:1\n     |\n   1 | console.error(\"x\");\n     | ^^^^^^^\n     |\n     = Consider using `assert`, `assert_eq`, or `assert_neq` instead."
-  - "Error [EPAR0370032]: `console` statements are not yet supported.\n    --> test:1:1\n     |\n   1 | console.assert(true);\n     | ^^^^^^^\n     |\n     = Consider using `assert`, `assert_eq`, or `assert_neq` instead."
-  - "Error [EPAR0370032]: `console` statements are not yet supported.\n    --> test:1:1\n     |\n   1 | console.assert_eq(1u32, 2u32);\n     | ^^^^^^^\n     |\n     = Consider using `assert`, `assert_eq`, or `assert_neq` instead."
-  - "Error [EPAR0370032]: `console` statements are not yet supported.\n    --> test:1:1\n     |\n   1 | console.assert_neq(true, false);\n     | ^^^^^^^\n     |\n     = Consider using `assert`, `assert_eq`, or `assert_neq` instead."
-  - "Error [EPAR0370032]: `console` statements are not yet supported.\n    --> test:1:1\n     |\n   1 | console.log(\"{}\", x);\n     | ^^^^^^^\n     |\n     = Consider using `assert`, `assert_eq`, or `assert_neq` instead."
-  - "Error [EPAR0370032]: `console` statements are not yet supported.\n    --> test:1:1\n     |\n   1 | console.log(\"{}{}\", x, y);\n     | ^^^^^^^\n     |\n     = Consider using `assert`, `assert_eq`, or `assert_neq` instead."
-  - "Error [EPAR0370032]: `console` statements are not yet supported.\n    --> test:1:1\n     |\n   1 | console.log(\"x\");\n     | ^^^^^^^\n     |\n     = Consider using `assert`, `assert_eq`, or `assert_neq` instead."
diff --git a/tests/expectations/tests/parser/statement/definition.out b/tests/expectations/tests/parser/statement/definition.out
deleted file mode 100644
index d40c90a982..0000000000
--- a/tests/expectations/tests/parser/statement/definition.out
+++ /dev/null
@@ -1,231 +0,0 @@
----
-namespace: ParseStatement
-expectation: Pass
-outputs:
-  - Definition:
-      declaration_type: Let
-      place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
-      type_:
-        Integer: U8
-      value:
-        Identifier: "{\"name\":\"expr\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":16}\"}"
-      span:
-        lo: 0
-        hi: 16
-  - Definition:
-      declaration_type: Let
-      place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
-      type_:
-        Integer: U16
-      value:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
-          op: Add
-          span:
-            lo: 13
-            hi: 16
-      span:
-        lo: 0
-        hi: 16
-  - Definition:
-      declaration_type: Let
-      place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
-      type_:
-        Integer: U8
-      value:
-        Call:
-          function:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":13}\"}"
-          arguments: []
-          external: ~
-          span:
-            lo: 12
-            hi: 15
-      span:
-        lo: 0
-        hi: 15
-  - Definition:
-      declaration_type: Let
-      place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
-      type_: String
-      value:
-        Identifier: "{\"name\":\"expr\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":20}\"}"
-      span:
-        lo: 0
-        hi: 20
-  - Definition:
-      declaration_type: Const
-      place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
-      type_:
-        Integer: I8
-      value:
-        Identifier: "{\"name\":\"expr\",\"span\":\"{\\\"lo\\\":14,\\\"hi\\\":18}\"}"
-      span:
-        lo: 0
-        hi: 18
-  - Definition:
-      declaration_type: Const
-      place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
-      type_:
-        Integer: I16
-      value:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":17,\\\"hi\\\":18}\"}"
-          op: Add
-          span:
-            lo: 15
-            hi: 18
-      span:
-        lo: 0
-        hi: 18
-  - Definition:
-      declaration_type: Const
-      place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
-      type_:
-        Integer: I8
-      value:
-        Call:
-          function:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":14,\\\"hi\\\":15}\"}"
-          arguments: []
-          external: ~
-          span:
-            lo: 14
-            hi: 17
-      span:
-        lo: 0
-        hi: 17
-  - Definition:
-      declaration_type: Const
-      place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
-      type_: String
-      value:
-        Identifier: "{\"name\":\"expr\",\"span\":\"{\\\"lo\\\":18,\\\"hi\\\":22}\"}"
-      span:
-        lo: 0
-        hi: 22
-  - Definition:
-      declaration_type: Let
-      place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
-      type_:
-        Integer: U32
-      value:
-        Identifier: "{\"name\":\"expr\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":17}\"}"
-      span:
-        lo: 0
-        hi: 17
-  - Definition:
-      declaration_type: Let
-      place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
-      type_:
-        Integer: U32
-      value:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
-          op: Add
-          span:
-            lo: 13
-            hi: 16
-      span:
-        lo: 0
-        hi: 16
-  - Definition:
-      declaration_type: Let
-      place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
-      type_:
-        Integer: U32
-      value:
-        Call:
-          function:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
-          arguments: []
-          external: ~
-          span:
-            lo: 13
-            hi: 16
-      span:
-        lo: 0
-        hi: 16
-  - Definition:
-      declaration_type: Const
-      place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
-      type_:
-        Integer: U32
-      value:
-        Identifier: "{\"name\":\"expr\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":19}\"}"
-      span:
-        lo: 0
-        hi: 19
-  - Definition:
-      declaration_type: Const
-      place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
-      type_:
-        Integer: U32
-      value:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":17,\\\"hi\\\":18}\"}"
-          op: Add
-          span:
-            lo: 15
-            hi: 18
-      span:
-        lo: 0
-        hi: 18
-  - Definition:
-      declaration_type: Const
-      place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
-      type_:
-        Integer: U32
-      value:
-        Call:
-          function:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
-          arguments: []
-          external: ~
-          span:
-            lo: 15
-            hi: 18
-      span:
-        lo: 0
-        hi: 18
-  - Definition:
-      declaration_type: Let
-      place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
-      type_: Address
-      value:
-        Literal:
-          Address:
-            - aleo1fj982yqchhy973kz7e9jk6er7t6qd6jm9anplnlprem507w6lv9spwvfxx
-            - span:
-                lo: 17
-                hi: 80
-      span:
-        lo: 0
-        hi: 80
diff --git a/tests/expectations/tests/parser/statement/definition_fail.out b/tests/expectations/tests/parser/statement/definition_fail.out
deleted file mode 100644
index 931ec8f69a..0000000000
--- a/tests/expectations/tests/parser/statement/definition_fail.out
+++ /dev/null
@@ -1,47 +0,0 @@
----
-namespace: ParseStatement
-expectation: Fail
-outputs:
-  - "Error [EPAR0370005]: expected : -- found 'x'\n    --> test:1:9\n     |\n   1 | let mut x = expr;\n     |         ^"
-  - "Error [EPAR0370005]: expected : -- found 'x'\n    --> test:1:9\n     |\n   1 | let mut x = ();\n     |         ^"
-  - "Error [EPAR0370005]: expected : -- found 'x'\n    --> test:1:9\n     |\n   1 | let mut x = x+y;\n     |         ^"
-  - "Error [EPAR0370005]: expected : -- found 'x'\n    --> test:1:9\n     |\n   1 | let mut x = (x,y);\n     |         ^"
-  - "Error [EPAR0370005]: expected : -- found 'x'\n    --> test:1:9\n     |\n   1 | let mut x = x();\n     |         ^"
-  - "Error [EPAR0370005]: expected : -- found 'x'\n    --> test:1:11\n     |\n   1 | const mut x = expr;\n     |           ^"
-  - "Error [EPAR0370005]: expected : -- found 'x'\n    --> test:1:11\n     |\n   1 | const mut x = ();\n     |           ^"
-  - "Error [EPAR0370005]: expected : -- found 'x'\n    --> test:1:11\n     |\n   1 | const mut x = x+y;\n     |           ^"
-  - "Error [EPAR0370005]: expected : -- found 'x'\n    --> test:1:11\n     |\n   1 | const mut x = (x,y);\n     |           ^"
-  - "Error [EPAR0370005]: expected : -- found 'x'\n    --> test:1:11\n     |\n   1 | const mut x = x();\n     |           ^"
-  - "Error [EPAR0370005]: expected : -- found 'x'\n    --> test:1:9\n     |\n   1 | let mut x: u32 = expr;\n     |         ^"
-  - "Error [EPAR0370005]: expected : -- found 'x'\n    --> test:1:9\n     |\n   1 | let mut x: u32 = ();\n     |         ^"
-  - "Error [EPAR0370005]: expected : -- found 'x'\n    --> test:1:9\n     |\n   1 | let mut x: u32 = x+y;\n     |         ^"
-  - "Error [EPAR0370005]: expected : -- found 'x'\n    --> test:1:9\n     |\n   1 | let mut x: u32 = (x,y);\n     |         ^"
-  - "Error [EPAR0370005]: expected : -- found 'x'\n    --> test:1:9\n     |\n   1 | let mut x: u32 = x();\n     |         ^"
-  - "Error [EPAR0370005]: expected : -- found 'x'\n    --> test:1:11\n     |\n   1 | const mut x: u32 = expr;\n     |           ^"
-  - "Error [EPAR0370005]: expected : -- found 'x'\n    --> test:1:11\n     |\n   1 | const mut x: u32 = ();\n     |           ^"
-  - "Error [EPAR0370005]: expected : -- found 'x'\n    --> test:1:11\n     |\n   1 | const mut x: u32 = x+y;\n     |           ^"
-  - "Error [EPAR0370005]: expected : -- found 'x'\n    --> test:1:11\n     |\n   1 | const mut x: u32 = (x,y);\n     |           ^"
-  - "Error [EPAR0370005]: expected : -- found 'x'\n    --> test:1:11\n     |\n   1 | const mut x: u32 = x();\n     |           ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found ','\n    --> test:1:10\n     |\n   1 | let (x,y,,) = ();\n     |          ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found ','\n    --> test:1:6\n     |\n   1 | let (,x,y) = ();\n     |      ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found ','\n    --> test:1:8\n     |\n   1 | let (x,,y) = ();\n     |        ^"
-  - "Error [EPAR0370005]: expected 'address', 'bool', 'field', 'group', 'scalar', 'string', 'i8', 'i16', 'i32', 'i64', 'i128', 'u8', 'u16', 'u32', 'u64', 'u128' -- found '['\n    --> test:1:8\n     |\n   1 | let x: [u8; (2,,)] = [[0,0], [0,0]];\n     |        ^"
-  - "Error [EPAR0370005]: expected 'address', 'bool', 'field', 'group', 'scalar', 'string', 'i8', 'i16', 'i32', 'i64', 'i128', 'u8', 'u16', 'u32', 'u64', 'u128' -- found 'const'\n    --> test:1:8\n     |\n   1 | let x: const = expr;\n     |        ^^^^^"
-  - "Error [EPAR0370005]: expected 'address', 'bool', 'field', 'group', 'scalar', 'string', 'i8', 'i16', 'i32', 'i64', 'i128', 'u8', 'u16', 'u32', 'u64', 'u128' -- found 'let'\n    --> test:1:10\n     |\n   1 | const x: let = expr;\n     |          ^^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found '<eof>'\n    --> test:1:1\n     |\n   1 | let\n     | ^^^"
-  - "Error [EPAR0370005]: expected : -- found '<eof>'\n    --> test:1:5\n     |\n   1 | let x\n     |     ^"
-  - "Error [EPAR0370005]: expected 'address', 'bool', 'field', 'group', 'scalar', 'string', 'i8', 'i16', 'i32', 'i64', 'i128', 'u8', 'u16', 'u32', 'u64', 'u128' -- found '<eof>'\n    --> test:1:6\n     |\n   1 | let x:\n     |      ^"
-  - "Error [EPAR0370005]: expected : -- found '='\n    --> test:1:7\n     |\n   1 | let x = (a, y]);\n     |       ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found '='\n    --> test:1:5\n     |\n   1 | let = 1u8;\n     |     ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found ';'\n    --> test:1:4\n     |\n   1 | let;\n     |    ^"
-  - "Error [EPAR0370005]: expected : -- found '1'\n    --> test:1:7\n     |\n   1 | let x 1u8;\n     |       ^"
-  - "Error [EPAR0370005]: expected = -- found ';'\n    --> test:1:10\n     |\n   1 | let x: u8;\n     |          ^"
-  - "Error [EPAR0370005]: expected = -- found '<eof>'\n    --> test:1:8\n     |\n   1 | let x: u8\n     |        ^^"
-  - "Error [EPAR0370005]: expected 'address', 'bool', 'field', 'group', 'scalar', 'string', 'i8', 'i16', 'i32', 'i64', 'i128', 'u8', 'u16', 'u32', 'u64', 'u128' -- found '='\n    --> test:1:8\n     |\n   1 | let x: = 1;\n     |        ^"
-  - "Error [EPAR0370005]: expected 'address', 'bool', 'field', 'group', 'scalar', 'string', 'i8', 'i16', 'i32', 'i64', 'i128', 'u8', 'u16', 'u32', 'u64', 'u128' -- found '['\n    --> test:1:8\n     |\n   1 | let x: [u8] = 1;\n     |        ^"
-  - "Error [EPAR0370005]: expected 'address', 'bool', 'field', 'group', 'scalar', 'string', 'i8', 'i16', 'i32', 'i64', 'i128', 'u8', 'u16', 'u32', 'u64', 'u128' -- found '['\n    --> test:1:8\n     |\n   1 | let x: [u8;\n     |        ^"
-  - "Error [EPAR0370005]: expected 'address', 'bool', 'field', 'group', 'scalar', 'string', 'i8', 'i16', 'i32', 'i64', 'i128', 'u8', 'u16', 'u32', 'u64', 'u128' -- found '['\n    --> test:1:8\n     |\n   1 | let x: [u8; 1u8] = [1,\n     |        ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found ']'\n    --> test:1:15\n     |\n   1 | let dbg: u8 = ];\n     |               ^"
-  - "Error [EPAR0370016]: Could not lex the following content: `🦀:`.\n"
-  - "Error [EPAR0370005]: expected : -- found '='\n    --> test:1:9\n     |\n   1 | let (x) = ...;\n     |         ^"
-  - "Error [EPAR0370029]: A tuple expression must have at least two elements.\n    --> test:1:5\n     |\n   1 | let (x,) = ...;\n     |     ^^^^"
diff --git a/tests/expectations/tests/parser/statement/expression.out b/tests/expectations/tests/parser/statement/expression.out
deleted file mode 100644
index d1ea850aaa..0000000000
--- a/tests/expectations/tests/parser/statement/expression.out
+++ /dev/null
@@ -1,37 +0,0 @@
----
-namespace: ParseStatement
-expectation: Pass
-outputs:
-  - Expression:
-      expression:
-        Identifier: "{\"name\":\"expr\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":4}\"}"
-      span:
-        lo: 0
-        hi: 5
-  - Expression:
-      expression:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
-          right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-          op: Add
-          span:
-            lo: 0
-            hi: 3
-      span:
-        lo: 0
-        hi: 4
-  - Expression:
-      expression:
-        Call:
-          function:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
-          arguments: []
-          external: ~
-          span:
-            lo: 0
-            hi: 3
-      span:
-        lo: 0
-        hi: 4
diff --git a/tests/expectations/tests/parser/statement/expression_fail.out b/tests/expectations/tests/parser/statement/expression_fail.out
deleted file mode 100644
index b8ea953893..0000000000
--- a/tests/expectations/tests/parser/statement/expression_fail.out
+++ /dev/null
@@ -1,10 +0,0 @@
----
-namespace: ParseStatement
-expectation: Fail
-outputs:
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found ']'\n    --> test:1:2\n     |\n   1 | (];\n     |  ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found '['\n    --> test:1:1\n     |\n   1 | [);\n     | ^"
-  - "Error [EPAR0370016]: Could not lex the following content: `\\y`.\n"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found ';'\n    --> test:1:6\n     |\n   1 | (x,y|;\n     |      ^"
-  - "Error [EPAR0370005]: expected ; -- found '['\n    --> test:1:2\n     |\n   1 | x[};\n     |  ^"
-  - "Error [EPAR0370005]: expected ) -- found ']'\n    --> test:1:6\n     |\n   1 | (x, y];\n     |      ^"
diff --git a/tests/expectations/tests/parser/statement/finalize_fail.out b/tests/expectations/tests/parser/statement/finalize_fail.out
deleted file mode 100644
index ee6a180f32..0000000000
--- a/tests/expectations/tests/parser/statement/finalize_fail.out
+++ /dev/null
@@ -1,5 +0,0 @@
----
-namespace: ParseStatement
-expectation: Fail
-outputs:
-  - "Error [EPAR0370031]: `finalize` statements are deprecated.\n    --> test:1:1\n     |\n   1 | finalize(foo);\n     | ^^^^^^^^\n     |\n     = Use `return <expr> then finalize(<args>)` instead."
diff --git a/tests/expectations/tests/parser/statement/hex_int_fail.out b/tests/expectations/tests/parser/statement/hex_int_fail.out
deleted file mode 100644
index 36d0508a72..0000000000
--- a/tests/expectations/tests/parser/statement/hex_int_fail.out
+++ /dev/null
@@ -1,7 +0,0 @@
----
-namespace: ParseStatement
-expectation: Fail
-outputs:
-  - "Error [EPAR0370018]: A hex number `0x..` was provided but hex is not allowed."
-  - "Error [EPAR0370018]: A hex number `0x..` was provided but hex is not allowed."
-  - "Error [EPAR0370018]: A hex number `0x..` was provided but hex is not allowed."
diff --git a/tests/expectations/tests/parser/statement/iteration.out b/tests/expectations/tests/parser/statement/iteration.out
deleted file mode 100644
index 069f1da51e..0000000000
--- a/tests/expectations/tests/parser/statement/iteration.out
+++ /dev/null
@@ -1,150 +0,0 @@
----
-namespace: ParseStatement
-expectation: Pass
-outputs:
-  - Iteration:
-      variable: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
-      type_:
-        Integer: U8
-      start:
-        Literal:
-          Integer:
-            - U8
-            - "0"
-            - span:
-                lo: 13
-                hi: 16
-      stop:
-        Literal:
-          Integer:
-            - U8
-            - "7"
-            - span:
-                lo: 18
-                hi: 21
-      inclusive: false
-      block:
-        statements: []
-        span:
-          lo: 22
-          hi: 24
-      span:
-        lo: 0
-        hi: 24
-  - Iteration:
-      variable: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
-      type_:
-        Integer: I64
-      start:
-        Literal:
-          Integer:
-            - I64
-            - "0"
-            - span:
-                lo: 14
-                hi: 18
-      stop:
-        Literal:
-          Integer:
-            - I64
-            - "7"
-            - span:
-                lo: 20
-                hi: 24
-      inclusive: false
-      block:
-        statements:
-          - Return:
-              expression:
-                Literal:
-                  Integer:
-                    - U8
-                    - "1"
-                    - span:
-                        lo: 34
-                        hi: 37
-              finalize_arguments: ~
-              span:
-                lo: 27
-                hi: 38
-        span:
-          lo: 25
-          hi: 40
-      span:
-        lo: 0
-        hi: 40
-  - Iteration:
-      variable: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
-      type_: Field
-      start:
-        Literal:
-          Field:
-            - "0"
-            - span:
-                lo: 16
-                hi: 22
-      stop:
-        Literal:
-          Integer:
-            - U8
-            - "99"
-            - span:
-                lo: 24
-                hi: 28
-      inclusive: false
-      block:
-        statements:
-          - Return:
-              expression:
-                Literal:
-                  Integer:
-                    - U8
-                    - "1"
-                    - span:
-                        lo: 38
-                        hi: 41
-              finalize_arguments: ~
-              span:
-                lo: 31
-                hi: 42
-        span:
-          lo: 29
-          hi: 44
-      span:
-        lo: 0
-        hi: 44
-  - Iteration:
-      variable: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
-      type_: Boolean
-      start:
-        Literal:
-          Integer:
-            - U8
-            - "0"
-            - span:
-                lo: 15
-                hi: 18
-      stop:
-        Identifier: "{\"name\":\"Self\",\"span\":\"{\\\"lo\\\":20,\\\"hi\\\":24}\"}"
-      inclusive: false
-      block:
-        statements:
-          - Return:
-              expression:
-                Literal:
-                  Integer:
-                    - U8
-                    - "1"
-                    - span:
-                        lo: 34
-                        hi: 37
-              finalize_arguments: ~
-              span:
-                lo: 27
-                hi: 38
-        span:
-          lo: 25
-          hi: 40
-      span:
-        lo: 0
-        hi: 40
diff --git a/tests/expectations/tests/parser/statement/let_mut_recover.out b/tests/expectations/tests/parser/statement/let_mut_recover.out
deleted file mode 100644
index 1bc597519f..0000000000
--- a/tests/expectations/tests/parser/statement/let_mut_recover.out
+++ /dev/null
@@ -1,5 +0,0 @@
----
-namespace: Parse
-expectation: Fail
-outputs:
-  - "Error [EPAR0370005]: expected : -- found 'x'\n    --> test:5:17\n     |\n   5 |         let mut x = 0;\n     |                 ^"
diff --git a/tests/expectations/tests/parser/statement/return.out b/tests/expectations/tests/parser/statement/return.out
deleted file mode 100644
index 4ec54c81c7..0000000000
--- a/tests/expectations/tests/parser/statement/return.out
+++ /dev/null
@@ -1,24 +0,0 @@
----
-namespace: ParseStatement
-expectation: Pass
-outputs:
-  - Return:
-      expression:
-        Identifier: "{\"name\":\"expr\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":11}\"}"
-      finalize_arguments: ~
-      span:
-        lo: 0
-        hi: 12
-  - Return:
-      expression:
-        Literal:
-          Integer:
-            - U8
-            - "5"
-            - span:
-                lo: 7
-                hi: 10
-      finalize_arguments: ~
-      span:
-        lo: 0
-        hi: 11
diff --git a/tests/expectations/tests/parser/statement/return_fail.out b/tests/expectations/tests/parser/statement/return_fail.out
deleted file mode 100644
index 1c7e8875dd..0000000000
--- a/tests/expectations/tests/parser/statement/return_fail.out
+++ /dev/null
@@ -1,7 +0,0 @@
----
-namespace: ParseStatement
-expectation: Fail
-outputs:
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found '<eof>'\n    --> test:1:1\n     |\n   1 | return\n     | ^^^^^^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 5.\n    --> test:1:8\n     |\n   1 | return 5\n     |        ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found 'if'\n    --> test:2:1\n     |\n   2 | if x {}\n     | ^^"
diff --git a/tests/expectations/tests/parser/unreachable/define.out b/tests/expectations/tests/parser/unreachable/define.out
deleted file mode 100644
index c9db5def6b..0000000000
--- a/tests/expectations/tests/parser/unreachable/define.out
+++ /dev/null
@@ -1,49 +0,0 @@
----
-namespace: ParseStatement
-expectation: Fail
-outputs:
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found ';'\n    --> test:1:1\n     |\n   1 | ; x = 10u8;\n     | ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found '.'\n    --> test:1:1\n     |\n   1 | . x = 10u8;\n     | ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found 'import'\n    --> test:1:1\n     |\n   1 | import x = 10u8;\n     | ^^^^^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found ','\n    --> test:1:1\n     |\n   1 | , x = 10u8;\n     | ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found '['\n    --> test:1:1\n     |\n   1 | [ x = 10u8;\n     | ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found ']'\n    --> test:1:1\n     |\n   1 | ] x = 10u8;\n     | ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found '<eof>'\n    --> test:1:11\n     |\n   1 | { x = 10u8;\n     |           ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found '}'\n    --> test:1:1\n     |\n   1 | } x = 10u8;\n     | ^"
-  - "Error [EPAR0370005]: expected ) -- found '='\n    --> test:1:5\n     |\n   1 | ( x = 10u8;\n     |     ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found ')'\n    --> test:1:1\n     |\n   1 | ) x = 10u8;\n     | ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found ':'\n    --> test:1:1\n     |\n   1 | : x = 10u8;\n     | ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found '::'\n    --> test:1:1\n     |\n   1 | :: x = 10u8;\n     | ^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found '?'\n    --> test:1:1\n     |\n   1 | ? x = 10u8;\n     | ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found '_'\n    --> test:1:1\n     |\n   1 | _ x = 10u8;\n     | ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found '='\n    --> test:1:1\n     |\n   1 | = x = 10u8;\n     | ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found '=='\n    --> test:1:1\n     |\n   1 | == x = 10u8;\n     | ^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found '!='\n    --> test:1:1\n     |\n   1 | != x = 10u8;\n     | ^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found '>'\n    --> test:1:1\n     |\n   1 | > x = 10u8;\n     | ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found '>='\n    --> test:1:1\n     |\n   1 | >= x = 10u8;\n     | ^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found '<'\n    --> test:1:1\n     |\n   1 | < x = 10u8;\n     | ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found '<='\n    --> test:1:1\n     |\n   1 | <= x = 10u8;\n     | ^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found '>'\n    --> test:1:1\n     |\n   1 | > x = 10u8;\n     | ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found '..'\n    --> test:1:1\n     |\n   1 | .. x = 10u8;\n     | ^^"
-  - "Error [EPAR0370005]: expected ; -- found 'x'\n    --> test:1:4\n     |\n   1 | as x = 10u8;\n     |    ^"
-  - "Error [EPAR0370032]: `console` statements are not yet supported.\n    --> test:1:1\n     |\n   1 | console x = 10u8;\n     | ^^^^^^^\n     |\n     = Consider using `assert`, `assert_eq`, or `assert_neq` instead."
-  - "Error [EPAR0370005]: expected : -- found '='\n    --> test:1:7\n     |\n   1 | for x = 10u8;\n     |       ^"
-  - "Error [EPAR0370005]: expected { -- found '='\n    --> test:1:6\n     |\n   1 | if x = 10u8;\n     |      ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found 'else'\n    --> test:1:1\n     |\n   1 | else x = 10u8;\n     | ^^^^"
-  - "Error [EPAR0370005]: expected ; -- found 'x'\n    --> test:1:4\n     |\n   1 | i8 x = 10u8;\n     |    ^"
-  - "Error [EPAR0370005]: expected ; -- found 'x'\n    --> test:1:5\n     |\n   1 | i16 x = 10u8;\n     |     ^"
-  - "Error [EPAR0370005]: expected ; -- found 'x'\n    --> test:1:5\n     |\n   1 | i32 x = 10u8;\n     |     ^"
-  - "Error [EPAR0370005]: expected ; -- found 'x'\n    --> test:1:5\n     |\n   1 | i64 x = 10u8;\n     |     ^"
-  - "Error [EPAR0370005]: expected ; -- found 'x'\n    --> test:1:6\n     |\n   1 | i128 x = 10u8;\n     |      ^"
-  - "Error [EPAR0370005]: expected ; -- found 'x'\n    --> test:1:4\n     |\n   1 | u8 x = 10u8;\n     |    ^"
-  - "Error [EPAR0370005]: expected ; -- found 'x'\n    --> test:1:5\n     |\n   1 | u16 x = 10u8;\n     |     ^"
-  - "Error [EPAR0370005]: expected ; -- found 'x'\n    --> test:1:5\n     |\n   1 | u32 x = 10u8;\n     |     ^"
-  - "Error [EPAR0370005]: expected ; -- found 'x'\n    --> test:1:5\n     |\n   1 | u64 x = 10u8;\n     |     ^"
-  - "Error [EPAR0370005]: expected ; -- found 'x'\n    --> test:1:6\n     |\n   1 | u128 x = 10u8;\n     |      ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found '&'\n    --> test:1:1\n     |\n   1 | & x = 10u8;\n     | ^"
-  - "Error [EPAR0370005]: expected ; -- found '='\n    --> test:1:10\n     |\n   1 | return x = 10u8;\n     |          ^"
-  - "Error [EPAR0370005]: expected ; -- found 'x'\n    --> test:1:6\n     |\n   1 | self x = 10u8;\n     |      ^"
-  - "Error [EPAR0370005]: expected ; -- found 'x'\n    --> test:1:6\n     |\n   1 | Self x = 10u8;\n     |      ^"
-  - "Error [EPAR0370005]: expected ; -- found 'x'\n    --> test:1:6\n     |\n   1 | true x = 10u8;\n     |      ^"
-  - "Error [EPAR0370005]: expected ; -- found 'x'\n    --> test:1:7\n     |\n   1 | false x = 10u8;\n     |       ^"
-  - "Error [EPAR0370017]: Could not parse the implicit value: 0.\n    --> test:1:1\n     |\n   1 | 0 x = 10u8;\n     | ^"
diff --git a/tests/expectations/tests/parser/unreachable/eat_ident.out b/tests/expectations/tests/parser/unreachable/eat_ident.out
deleted file mode 100644
index 039961c0e0..0000000000
--- a/tests/expectations/tests/parser/unreachable/eat_ident.out
+++ /dev/null
@@ -1,5 +0,0 @@
----
-namespace: Parse
-expectation: Fail
-outputs:
-  - "Error [EPAR0370005]: expected 'import', 'program' -- found 'struct'\n    --> test:2:1\n     |\n   2 | struct import\n     | ^^^^^^"
diff --git a/tests/expectations/tests/parser/unreachable/eat_int.out b/tests/expectations/tests/parser/unreachable/eat_int.out
deleted file mode 100644
index 600a89e081..0000000000
--- a/tests/expectations/tests/parser/unreachable/eat_int.out
+++ /dev/null
@@ -1,56 +0,0 @@
----
-namespace: ParseStatement
-expectation: Fail
-outputs:
-  - "Error [EPAR0370009]: unexpected string: expected 'identifier', found '-'\n    --> test:1:3\n     |\n   1 | x.-12\n     |   ^"
-  - "Error [EPAR0370005]: expected ; -- found '_'\n    --> test:1:4\n     |\n   1 | x.0_;\n     |    ^"
-  - "Error [EPAR0370005]: expected ; -- found '_'\n    --> test:1:4\n     |\n   1 | x.0_.\n     |    ^"
-  - "Error [EPAR0370005]: expected ; -- found '_'\n    --> test:1:4\n     |\n   1 | x.0_import\n     |    ^"
-  - "Error [EPAR0370005]: expected ; -- found '_'\n    --> test:1:4\n     |\n   1 | x.0_,\n     |    ^"
-  - "Error [EPAR0370005]: expected ; -- found '_'\n    --> test:1:4\n     |\n   1 | x.0_*\n     |    ^"
-  - "Error [EPAR0370005]: expected ; -- found '_'\n    --> test:1:4\n     |\n   1 | x.0_+\n     |    ^"
-  - "Error [EPAR0370005]: expected ; -- found '_'\n    --> test:1:4\n     |\n   1 | x.0_-\n     |    ^"
-  - "Error [EPAR0370005]: expected ; -- found '_'\n    --> test:1:4\n     |\n   1 | x.0_/\n     |    ^"
-  - "Error [EPAR0370005]: expected ; -- found '_'\n    --> test:1:4\n     |\n   1 | x.0_[\n     |    ^"
-  - "Error [EPAR0370005]: expected ; -- found '_'\n    --> test:1:4\n     |\n   1 | x.0_]\n     |    ^"
-  - "Error [EPAR0370005]: expected ; -- found '_'\n    --> test:1:4\n     |\n   1 | x.0_{\n     |    ^"
-  - "Error [EPAR0370005]: expected ; -- found '_'\n    --> test:1:4\n     |\n   1 | x.0_}\n     |    ^"
-  - "Error [EPAR0370005]: expected ; -- found '_'\n    --> test:1:4\n     |\n   1 | x.0_(\n     |    ^"
-  - "Error [EPAR0370005]: expected ; -- found '_'\n    --> test:1:4\n     |\n   1 | x.0_)\n     |    ^"
-  - "Error [EPAR0370005]: expected ; -- found '_'\n    --> test:1:4\n     |\n   1 | x.0_:\n     |    ^"
-  - "Error [EPAR0370005]: expected ; -- found '_'\n    --> test:1:4\n     |\n   1 | x.0_::\n     |    ^"
-  - "Error [EPAR0370005]: expected ; -- found '_'\n    --> test:1:4\n     |\n   1 | x.0_?\n     |    ^"
-  - "Error [EPAR0370005]: expected ; -- found '_'\n    --> test:1:4\n     |\n   1 | x.0__\n     |    ^"
-  - "Error [EPAR0370005]: expected ; -- found '_'\n    --> test:1:4\n     |\n   1 | x.0_=\n     |    ^"
-  - "Error [EPAR0370005]: expected ; -- found '_'\n    --> test:1:4\n     |\n   1 | x.0_==\n     |    ^"
-  - "Error [EPAR0370005]: expected ; -- found '_'\n    --> test:1:4\n     |\n   1 | x.0_!\n     |    ^"
-  - "Error [EPAR0370005]: expected ; -- found '_'\n    --> test:1:4\n     |\n   1 | x.0_!=\n     |    ^"
-  - "Error [EPAR0370005]: expected ; -- found '_'\n    --> test:1:4\n     |\n   1 | x.0_>\n     |    ^"
-  - "Error [EPAR0370005]: expected ; -- found '_'\n    --> test:1:4\n     |\n   1 | x.0_>=\n     |    ^"
-  - "Error [EPAR0370005]: expected ; -- found '_'\n    --> test:1:4\n     |\n   1 | x.0_<\n     |    ^"
-  - "Error [EPAR0370005]: expected ; -- found '_'\n    --> test:1:4\n     |\n   1 | x.0_<=\n     |    ^"
-  - "Error [EPAR0370005]: expected ; -- found '_'\n    --> test:1:4\n     |\n   1 | x.0_>\n     |    ^"
-  - "Error [EPAR0370005]: expected ; -- found '_'\n    --> test:1:4\n     |\n   1 | x.0_..\n     |    ^"
-  - "Error [EPAR0370005]: expected ; -- found '_'\n    --> test:1:4\n     |\n   1 | x.0_as\n     |    ^"
-  - "Error [EPAR0370005]: expected ; -- found '_'\n    --> test:1:4\n     |\n   1 | x.0_console\n     |    ^"
-  - "Error [EPAR0370005]: expected ; -- found '_'\n    --> test:1:4\n     |\n   1 | x.0_const\n     |    ^"
-  - "Error [EPAR0370005]: expected ; -- found '_'\n    --> test:1:4\n     |\n   1 | x.0_let\n     |    ^"
-  - "Error [EPAR0370005]: expected ; -- found '_'\n    --> test:1:4\n     |\n   1 | x.0_for\n     |    ^"
-  - "Error [EPAR0370005]: expected ; -- found '_'\n    --> test:1:4\n     |\n   1 | x.0_if\n     |    ^"
-  - "Error [EPAR0370005]: expected ; -- found '_'\n    --> test:1:4\n     |\n   1 | x.0_else\n     |    ^"
-  - "Error [EPAR0370005]: expected ; -- found '_'\n    --> test:1:4\n     |\n   1 | x.0_i8\n     |    ^"
-  - "Error [EPAR0370005]: expected ; -- found '_'\n    --> test:1:4\n     |\n   1 | x.0_i16\n     |    ^"
-  - "Error [EPAR0370005]: expected ; -- found '_'\n    --> test:1:4\n     |\n   1 | x.0_i32\n     |    ^"
-  - "Error [EPAR0370005]: expected ; -- found '_'\n    --> test:1:4\n     |\n   1 | x.0_i64\n     |    ^"
-  - "Error [EPAR0370005]: expected ; -- found '_'\n    --> test:1:4\n     |\n   1 | x.0_i128\n     |    ^"
-  - "Error [EPAR0370005]: expected ; -- found '_'\n    --> test:1:4\n     |\n   1 | x.0_u8\n     |    ^"
-  - "Error [EPAR0370005]: expected ; -- found '_'\n    --> test:1:4\n     |\n   1 | x.0_u16\n     |    ^"
-  - "Error [EPAR0370005]: expected ; -- found '_'\n    --> test:1:4\n     |\n   1 | x.0_u32\n     |    ^"
-  - "Error [EPAR0370005]: expected ; -- found '_'\n    --> test:1:4\n     |\n   1 | x.0_u64\n     |    ^"
-  - "Error [EPAR0370005]: expected ; -- found '_'\n    --> test:1:4\n     |\n   1 | x.0_u128\n     |    ^"
-  - "Error [EPAR0370005]: expected ; -- found '_'\n    --> test:1:4\n     |\n   1 | x.0_&\n     |    ^"
-  - "Error [EPAR0370005]: expected ; -- found '_'\n    --> test:1:4\n     |\n   1 | x.0_return\n     |    ^"
-  - "Error [EPAR0370005]: expected ; -- found '_'\n    --> test:1:4\n     |\n   1 | x.0_self\n     |    ^"
-  - "Error [EPAR0370005]: expected ; -- found '_'\n    --> test:1:4\n     |\n   1 | x.0_Self\n     |    ^"
-  - "Error [EPAR0370005]: expected ; -- found '_'\n    --> test:1:4\n     |\n   1 | x.0_true\n     |    ^"
-  - "Error [EPAR0370005]: expected ; -- found '_'\n    --> test:1:4\n     |\n   1 | x.0_false\n     |    ^"
diff --git a/tests/expectations/tests/parser/unreachable/equality_and_order_expression.out b/tests/expectations/tests/parser/unreachable/equality_and_order_expression.out
deleted file mode 100644
index 6fa21e2342..0000000000
--- a/tests/expectations/tests/parser/unreachable/equality_and_order_expression.out
+++ /dev/null
@@ -1,56 +0,0 @@
----
-namespace: ParseExpression
-expectation: Fail
-outputs:
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found 'if'\n    --> test:1:1\n     |\n   1 | if 10 ; {}\n     | ^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found 'if'\n    --> test:1:1\n     |\n   1 | if 10 . {}\n     | ^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found 'if'\n    --> test:1:1\n     |\n   1 | if 10 import {}\n     | ^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found 'if'\n    --> test:1:1\n     |\n   1 | if 10 , {}\n     | ^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found 'if'\n    --> test:1:1\n     |\n   1 | if 10 * {}\n     | ^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found 'if'\n    --> test:1:1\n     |\n   1 | if 10 + {}\n     | ^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found 'if'\n    --> test:1:1\n     |\n   1 | if 10 - {}\n     | ^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found 'if'\n    --> test:1:1\n     |\n   1 | if 10 / {}\n     | ^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found 'if'\n    --> test:1:1\n     |\n   1 | if 10 [ {}\n     | ^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found 'if'\n    --> test:1:1\n     |\n   1 | if 10 ] {}\n     | ^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found 'if'\n    --> test:1:1\n     |\n   1 | if 10 { {}\n     | ^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found 'if'\n    --> test:1:1\n     |\n   1 | if 10 } {}\n     | ^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found 'if'\n    --> test:1:1\n     |\n   1 | if 10 ( {}\n     | ^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found 'if'\n    --> test:1:1\n     |\n   1 | if 10 ) {}\n     | ^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found 'if'\n    --> test:1:1\n     |\n   1 | if 10 : {}\n     | ^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found 'if'\n    --> test:1:1\n     |\n   1 | if 10 :: {}\n     | ^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found 'if'\n    --> test:1:1\n     |\n   1 | if 10 ? {}\n     | ^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found 'if'\n    --> test:1:1\n     |\n   1 | if 10 _ {}\n     | ^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found 'if'\n    --> test:1:1\n     |\n   1 | if 10 = {}\n     | ^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found 'if'\n    --> test:1:1\n     |\n   1 | if 10 == {}\n     | ^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found 'if'\n    --> test:1:1\n     |\n   1 | if 10 ! {}\n     | ^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found 'if'\n    --> test:1:1\n     |\n   1 | if 10 != {}\n     | ^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found 'if'\n    --> test:1:1\n     |\n   1 | if 10 > {}\n     | ^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found 'if'\n    --> test:1:1\n     |\n   1 | if 10 >= {}\n     | ^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found 'if'\n    --> test:1:1\n     |\n   1 | if 10 < {}\n     | ^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found 'if'\n    --> test:1:1\n     |\n   1 | if 10 <= {}\n     | ^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found 'if'\n    --> test:1:1\n     |\n   1 | if 10 > {}\n     | ^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found 'if'\n    --> test:1:1\n     |\n   1 | if 10 .. {}\n     | ^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found 'if'\n    --> test:1:1\n     |\n   1 | if 10 as {}\n     | ^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found 'if'\n    --> test:1:1\n     |\n   1 | if 10 console {}\n     | ^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found 'if'\n    --> test:1:1\n     |\n   1 | if 10 const {}\n     | ^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found 'if'\n    --> test:1:1\n     |\n   1 | if 10 let {}\n     | ^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found 'if'\n    --> test:1:1\n     |\n   1 | if 10 for {}\n     | ^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found 'if'\n    --> test:1:1\n     |\n   1 | if 10 if {}\n     | ^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found 'if'\n    --> test:1:1\n     |\n   1 | if 10 else {}\n     | ^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found 'if'\n    --> test:1:1\n     |\n   1 | if 10 i8 {}\n     | ^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found 'if'\n    --> test:1:1\n     |\n   1 | if 10 i16 {}\n     | ^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found 'if'\n    --> test:1:1\n     |\n   1 | if 10 i32 {}\n     | ^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found 'if'\n    --> test:1:1\n     |\n   1 | if 10 i64 {}\n     | ^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found 'if'\n    --> test:1:1\n     |\n   1 | if 10 i128 {}\n     | ^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found 'if'\n    --> test:1:1\n     |\n   1 | if 10 u8 {}\n     | ^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found 'if'\n    --> test:1:1\n     |\n   1 | if 10 u16 {}\n     | ^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found 'if'\n    --> test:1:1\n     |\n   1 | if 10 u32 {}\n     | ^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found 'if'\n    --> test:1:1\n     |\n   1 | if 10 u64 {}\n     | ^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found 'if'\n    --> test:1:1\n     |\n   1 | if 10 u128 {}\n     | ^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found 'if'\n    --> test:1:1\n     |\n   1 | if 10 & {}\n     | ^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found 'if'\n    --> test:1:1\n     |\n   1 | if 10 return {}\n     | ^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found 'if'\n    --> test:1:1\n     |\n   1 | if 10 self {}\n     | ^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found 'if'\n    --> test:1:1\n     |\n   1 | if 10 Self {}\n     | ^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found 'if'\n    --> test:1:1\n     |\n   1 | if 10 true {}\n     | ^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found 'if'\n    --> test:1:1\n     |\n   1 | if 10 false {}\n     | ^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found 'if'\n    --> test:1:1\n     |\n   1 | if 10 0 {}\n     | ^^"
diff --git a/tests/expectations/tests/parser/unreachable/expect_ident.out b/tests/expectations/tests/parser/unreachable/expect_ident.out
deleted file mode 100644
index 1982b4600f..0000000000
--- a/tests/expectations/tests/parser/unreachable/expect_ident.out
+++ /dev/null
@@ -1,56 +0,0 @@
----
-namespace: ParseStatement
-expectation: Fail
-outputs:
-  - "Error [EPAR0370009]: unexpected string: expected 'identifier', found ';'\n    --> test:1:4\n     |\n   1 | x::;\n     |    ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'identifier', found '.'\n    --> test:1:4\n     |\n   1 | x::.\n     |    ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'identifier', found 'import'\n    --> test:1:4\n     |\n   1 | x::import\n     |    ^^^^^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'identifier', found ','\n    --> test:1:4\n     |\n   1 | x::,\n     |    ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'identifier', found '*'\n    --> test:1:4\n     |\n   1 | x::*\n     |    ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'identifier', found '+'\n    --> test:1:4\n     |\n   1 | x::+\n     |    ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'identifier', found '-'\n    --> test:1:4\n     |\n   1 | x::-\n     |    ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'identifier', found '/'\n    --> test:1:4\n     |\n   1 | x::/\n     |    ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'identifier', found '['\n    --> test:1:4\n     |\n   1 | x::[\n     |    ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'identifier', found ']'\n    --> test:1:4\n     |\n   1 | x::]\n     |    ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'identifier', found '{'\n    --> test:1:4\n     |\n   1 | x::{\n     |    ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'identifier', found '}'\n    --> test:1:4\n     |\n   1 | x::}\n     |    ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'identifier', found '('\n    --> test:1:4\n     |\n   1 | x::(\n     |    ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'identifier', found ')'\n    --> test:1:4\n     |\n   1 | x::)\n     |    ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'identifier', found ':'\n    --> test:1:4\n     |\n   1 | x:::\n     |    ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'identifier', found '::'\n    --> test:1:4\n     |\n   1 | x::::\n     |    ^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'identifier', found '?'\n    --> test:1:4\n     |\n   1 | x::?\n     |    ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'identifier', found '_'\n    --> test:1:4\n     |\n   1 | x::_\n     |    ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'identifier', found '='\n    --> test:1:4\n     |\n   1 | x::=\n     |    ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'identifier', found '=='\n    --> test:1:4\n     |\n   1 | x::==\n     |    ^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'identifier', found '!'\n    --> test:1:4\n     |\n   1 | x::!\n     |    ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'identifier', found '!='\n    --> test:1:4\n     |\n   1 | x::!=\n     |    ^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'identifier', found '>'\n    --> test:1:4\n     |\n   1 | x::>\n     |    ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'identifier', found '>='\n    --> test:1:4\n     |\n   1 | x::>=\n     |    ^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'identifier', found '<'\n    --> test:1:4\n     |\n   1 | x::<\n     |    ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'identifier', found '<='\n    --> test:1:4\n     |\n   1 | x::<=\n     |    ^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'identifier', found '>'\n    --> test:1:4\n     |\n   1 | x::>\n     |    ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'identifier', found '..'\n    --> test:1:4\n     |\n   1 | x::..\n     |    ^^"
-  - "Error [EPAR0370005]: expected ; -- found '<eof>'\n    --> test:1:4\n     |\n   1 | x::as\n     |    ^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'identifier', found 'console'\n    --> test:1:4\n     |\n   1 | x::console\n     |    ^^^^^^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'identifier', found 'const'\n    --> test:1:4\n     |\n   1 | x::const\n     |    ^^^^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'identifier', found 'let'\n    --> test:1:4\n     |\n   1 | x::let\n     |    ^^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'identifier', found 'for'\n    --> test:1:4\n     |\n   1 | x::for\n     |    ^^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'identifier', found 'if'\n    --> test:1:4\n     |\n   1 | x::if\n     |    ^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'identifier', found 'else'\n    --> test:1:4\n     |\n   1 | x::else\n     |    ^^^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'identifier', found 'i8'\n    --> test:1:4\n     |\n   1 | x::i8\n     |    ^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'identifier', found 'i16'\n    --> test:1:4\n     |\n   1 | x::i16\n     |    ^^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'identifier', found 'i32'\n    --> test:1:4\n     |\n   1 | x::i32\n     |    ^^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'identifier', found 'i64'\n    --> test:1:4\n     |\n   1 | x::i64\n     |    ^^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'identifier', found 'i128'\n    --> test:1:4\n     |\n   1 | x::i128\n     |    ^^^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'identifier', found 'u8'\n    --> test:1:4\n     |\n   1 | x::u8\n     |    ^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'identifier', found 'u16'\n    --> test:1:4\n     |\n   1 | x::u16\n     |    ^^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'identifier', found 'u32'\n    --> test:1:4\n     |\n   1 | x::u32\n     |    ^^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'identifier', found 'u64'\n    --> test:1:4\n     |\n   1 | x::u64\n     |    ^^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'identifier', found 'u128'\n    --> test:1:4\n     |\n   1 | x::u128\n     |    ^^^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'identifier', found '&'\n    --> test:1:4\n     |\n   1 | x::&\n     |    ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'identifier', found 'return'\n    --> test:1:4\n     |\n   1 | x::return\n     |    ^^^^^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'identifier', found 'self'\n    --> test:1:4\n     |\n   1 | x::self\n     |    ^^^^"
-  - "Error [EPAR0370005]: expected ; -- found '<eof>'\n    --> test:1:4\n     |\n   1 | x::Self\n     |    ^^^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'identifier', found 'true'\n    --> test:1:4\n     |\n   1 | x::true\n     |    ^^^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'identifier', found 'false'\n    --> test:1:4\n     |\n   1 | x::false\n     |    ^^^^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'identifier', found '0'\n    --> test:1:4\n     |\n   1 | x::0\n     |    ^"
diff --git a/tests/expectations/tests/parser/unreachable/math_op_fail.out b/tests/expectations/tests/parser/unreachable/math_op_fail.out
deleted file mode 100644
index a487ea664c..0000000000
--- a/tests/expectations/tests/parser/unreachable/math_op_fail.out
+++ /dev/null
@@ -1,58 +0,0 @@
----
-namespace: ParseStatement
-expectation: Fail
-outputs:
-  - "Error [EPAR0370005]: expected : -- found '='\n    --> test:1:7\n     |\n   1 | let x = a ; b;\n     |       ^"
-  - "Error [EPAR0370005]: expected : -- found '='\n    --> test:1:7\n     |\n   1 | let x = a import b;\n     |       ^"
-  - "Error [EPAR0370005]: expected : -- found '='\n    --> test:1:7\n     |\n   1 | let x = a , b;\n     |       ^"
-  - "Error [EPAR0370005]: expected : -- found '='\n    --> test:1:7\n     |\n   1 | let x = a [ b;\n     |       ^"
-  - "Error [EPAR0370005]: expected : -- found '='\n    --> test:1:7\n     |\n   1 | let x = a ] b;\n     |       ^"
-  - "Error [EPAR0370005]: expected : -- found '='\n    --> test:1:7\n     |\n   1 | let x = a { b;\n     |       ^"
-  - "Error [EPAR0370005]: expected : -- found '='\n    --> test:1:7\n     |\n   1 | let x = a } b;\n     |       ^"
-  - "Error [EPAR0370005]: expected : -- found '='\n    --> test:1:7\n     |\n   1 | let x = a ( b;\n     |       ^"
-  - "Error [EPAR0370005]: expected : -- found '='\n    --> test:1:7\n     |\n   1 | let x = a ) b;\n     |       ^"
-  - "Error [EPAR0370005]: expected : -- found '='\n    --> test:1:7\n     |\n   1 | let x = a : b;\n     |       ^"
-  - "Error [EPAR0370005]: expected : -- found '='\n    --> test:1:7\n     |\n   1 | let x = a ? b;\n     |       ^"
-  - "Error [EPAR0370005]: expected : -- found '='\n    --> test:1:7\n     |\n   1 | let x = a _ b;\n     |       ^"
-  - "Error [EPAR0370005]: expected : -- found '='\n    --> test:1:7\n     |\n   1 | let x = a = b;\n     |       ^"
-  - "Error [EPAR0370005]: expected : -- found '='\n    --> test:1:7\n     |\n   1 | let x = a ! b;\n     |       ^"
-  - "Error [EPAR0370005]: expected : -- found '='\n    --> test:1:7\n     |\n   1 | let x = a .. b;\n     |       ^"
-  - "Error [EPAR0370005]: expected : -- found '='\n    --> test:1:7\n     |\n   1 | let x = a console b;\n     |       ^"
-  - "Error [EPAR0370005]: expected : -- found '='\n    --> test:1:7\n     |\n   1 | let x = a const b;\n     |       ^"
-  - "Error [EPAR0370005]: expected : -- found '='\n    --> test:1:7\n     |\n   1 | let x = a let b;\n     |       ^"
-  - "Error [EPAR0370005]: expected : -- found '='\n    --> test:1:7\n     |\n   1 | let x = a for b;\n     |       ^"
-  - "Error [EPAR0370005]: expected : -- found '='\n    --> test:1:7\n     |\n   1 | let x = a if b;\n     |       ^"
-  - "Error [EPAR0370005]: expected : -- found '='\n    --> test:1:7\n     |\n   1 | let x = a else b;\n     |       ^"
-  - "Error [EPAR0370005]: expected : -- found '='\n    --> test:1:7\n     |\n   1 | let x = a i8 b;\n     |       ^"
-  - "Error [EPAR0370005]: expected : -- found '='\n    --> test:1:7\n     |\n   1 | let x = a i16 b;\n     |       ^"
-  - "Error [EPAR0370005]: expected : -- found '='\n    --> test:1:7\n     |\n   1 | let x = a i32 b;\n     |       ^"
-  - "Error [EPAR0370005]: expected : -- found '='\n    --> test:1:7\n     |\n   1 | let x = a i64 b;\n     |       ^"
-  - "Error [EPAR0370005]: expected : -- found '='\n    --> test:1:7\n     |\n   1 | let x = a i128 b;\n     |       ^"
-  - "Error [EPAR0370005]: expected : -- found '='\n    --> test:1:7\n     |\n   1 | let x = a u8 b;\n     |       ^"
-  - "Error [EPAR0370005]: expected : -- found '='\n    --> test:1:7\n     |\n   1 | let x = a u16 b;\n     |       ^"
-  - "Error [EPAR0370005]: expected : -- found '='\n    --> test:1:7\n     |\n   1 | let x = a u32 b;\n     |       ^"
-  - "Error [EPAR0370005]: expected : -- found '='\n    --> test:1:7\n     |\n   1 | let x = a u64 b;\n     |       ^"
-  - "Error [EPAR0370005]: expected : -- found '='\n    --> test:1:7\n     |\n   1 | let x = a u128 b;\n     |       ^"
-  - "Error [EPAR0370005]: expected : -- found '='\n    --> test:1:7\n     |\n   1 | let x = a & b;\n     |       ^"
-  - "Error [EPAR0370005]: expected : -- found '='\n    --> test:1:7\n     |\n   1 | let x = a return b;\n     |       ^"
-  - "Error [EPAR0370005]: expected : -- found '='\n    --> test:1:7\n     |\n   1 | let x = a self b;\n     |       ^"
-  - "Error [EPAR0370005]: expected : -- found '='\n    --> test:1:7\n     |\n   1 | let x = a Self b;\n     |       ^"
-  - "Error [EPAR0370005]: expected : -- found '='\n    --> test:1:7\n     |\n   1 | let x = a true b;\n     |       ^"
-  - "Error [EPAR0370005]: expected : -- found '='\n    --> test:1:7\n     |\n   1 | let x = a false b;\n     |       ^"
-  - "Error [EPAR0370005]: expected : -- found '='\n    --> test:1:7\n     |\n   1 | let x = a 0 b;\n     |       ^"
-  - "did not consume all input: '=' @ 1:3-4\n'b' @ 1:4-5\n';' @ 1:5-6\n"
-  - "Error [EPAR0370009]: unexpected string: expected 'identifier', found '='\n    --> test:1:3\n     |\n   1 | x.=b;\n     |   ^"
-  - "Error [EPAR0370005]: expected ; -- found ','\n    --> test:1:2\n     |\n   1 | x,=b; // 43\n     |  ^"
-  - "Error [EPAR0370005]: expected ; -- found '['\n    --> test:1:2\n     |\n   1 | x[=b;\n     |  ^"
-  - "Error [EPAR0370005]: expected ; -- found ']'\n    --> test:1:2\n     |\n   1 | x]=b;\n     |  ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'identifier', found '='\n    --> test:1:3\n     |\n   1 | x{=b;\n     |   ^"
-  - "Error [EPAR0370005]: expected ; -- found '}'\n    --> test:1:2\n     |\n   1 | x}=b;\n     |  ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found ';'\n    --> test:1:4\n     |\n   1 | x=(;\n     |    ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found ')'\n    --> test:1:3\n     |\n   1 | x=);\n     |   ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found ':'\n    --> test:1:3\n     |\n   1 | x=:;\n     |   ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found '::'\n    --> test:1:3\n     |\n   1 | x=::;\n     |   ^^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found '='\n    --> test:1:3\n     |\n   1 | x?=b;\n     |   ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found '='\n    --> test:1:4\n     |\n   1 | x!==b;\n     |    ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found '='\n    --> test:1:4\n     |\n   1 | x>==b;\n     |    ^"
-  - "Error [EPAR0370009]: unexpected string: expected 'expression', found '='\n    --> test:1:4\n     |\n   1 | x<==b;\n     |    ^"
-  - "Error [EPAR0370005]: expected ; -- found '..'\n    --> test:1:2\n     |\n   1 | x..=b;\n     |  ^^"
diff --git a/tests/expectations/tests/parser/unreachable/math_op_pass.out b/tests/expectations/tests/parser/unreachable/math_op_pass.out
deleted file mode 100644
index 02847a7bdc..0000000000
--- a/tests/expectations/tests/parser/unreachable/math_op_pass.out
+++ /dev/null
@@ -1,305 +0,0 @@
----
-namespace: ParseStatement
-expectation: Pass
-outputs:
-  - Definition:
-      declaration_type: Let
-      place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
-      type_:
-        Integer: U8
-      value:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"a\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":13}\"}"
-          right:
-            Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":17,\\\"hi\\\":18}\"}"
-          op: Eq
-          span:
-            lo: 12
-            hi: 18
-      span:
-        lo: 0
-        hi: 18
-  - Definition:
-      declaration_type: Let
-      place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
-      type_:
-        Integer: U8
-      value:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"a\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":13}\"}"
-          right:
-            Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":17,\\\"hi\\\":18}\"}"
-          op: Neq
-          span:
-            lo: 12
-            hi: 18
-      span:
-        lo: 0
-        hi: 18
-  - Definition:
-      declaration_type: Let
-      place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
-      type_:
-        Integer: U8
-      value:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"a\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":13}\"}"
-          right:
-            Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
-          op: Gt
-          span:
-            lo: 12
-            hi: 17
-      span:
-        lo: 0
-        hi: 17
-  - Definition:
-      declaration_type: Let
-      place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
-      type_:
-        Integer: U8
-      value:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"a\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":13}\"}"
-          right:
-            Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":17,\\\"hi\\\":18}\"}"
-          op: Gte
-          span:
-            lo: 12
-            hi: 18
-      span:
-        lo: 0
-        hi: 18
-  - Definition:
-      declaration_type: Let
-      place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
-      type_:
-        Integer: U8
-      value:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"a\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":13}\"}"
-          right:
-            Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
-          op: Lt
-          span:
-            lo: 12
-            hi: 17
-      span:
-        lo: 0
-        hi: 17
-  - Definition:
-      declaration_type: Let
-      place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
-      type_:
-        Integer: U8
-      value:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"a\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":13}\"}"
-          right:
-            Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":17,\\\"hi\\\":18}\"}"
-          op: Lte
-          span:
-            lo: 12
-            hi: 18
-      span:
-        lo: 0
-        hi: 18
-  - Definition:
-      declaration_type: Let
-      place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
-      type_:
-        Integer: U8
-      value:
-        Binary:
-          left:
-            Identifier: "{\"name\":\"a\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":13}\"}"
-          right:
-            Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
-          op: Gt
-          span:
-            lo: 12
-            hi: 17
-      span:
-        lo: 0
-        hi: 17
-  - Assign:
-      place:
-        Identifier: "{\"name\":\"x_\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":2}\"}"
-      value:
-        Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":3,\\\"hi\\\":4}\"}"
-      span:
-        lo: 0
-        hi: 4
-  - Assign:
-      place:
-        Identifier: "{\"name\":\"xconsole\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":8}\"}"
-      value:
-        Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
-      span:
-        lo: 0
-        hi: 10
-  - Assign:
-      place:
-        Identifier: "{\"name\":\"xconst\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":6}\"}"
-      value:
-        Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
-      span:
-        lo: 0
-        hi: 8
-  - Assign:
-      place:
-        Identifier: "{\"name\":\"xlet\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":4}\"}"
-      value:
-        Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":5,\\\"hi\\\":6}\"}"
-      span:
-        lo: 0
-        hi: 6
-  - Assign:
-      place:
-        Identifier: "{\"name\":\"xfor\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":4}\"}"
-      value:
-        Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":5,\\\"hi\\\":6}\"}"
-      span:
-        lo: 0
-        hi: 6
-  - Assign:
-      place:
-        Identifier: "{\"name\":\"xif\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":3}\"}"
-      value:
-        Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
-      span:
-        lo: 0
-        hi: 5
-  - Assign:
-      place:
-        Identifier: "{\"name\":\"xelse\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":5}\"}"
-      value:
-        Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
-      span:
-        lo: 0
-        hi: 7
-  - Assign:
-      place:
-        Identifier: "{\"name\":\"xi8\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":3}\"}"
-      value:
-        Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
-      span:
-        lo: 0
-        hi: 5
-  - Assign:
-      place:
-        Identifier: "{\"name\":\"xi16\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":4}\"}"
-      value:
-        Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":5,\\\"hi\\\":6}\"}"
-      span:
-        lo: 0
-        hi: 6
-  - Assign:
-      place:
-        Identifier: "{\"name\":\"xi32\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":4}\"}"
-      value:
-        Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":5,\\\"hi\\\":6}\"}"
-      span:
-        lo: 0
-        hi: 6
-  - Assign:
-      place:
-        Identifier: "{\"name\":\"xi64\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":4}\"}"
-      value:
-        Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":5,\\\"hi\\\":6}\"}"
-      span:
-        lo: 0
-        hi: 6
-  - Assign:
-      place:
-        Identifier: "{\"name\":\"xi128\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":5}\"}"
-      value:
-        Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
-      span:
-        lo: 0
-        hi: 7
-  - Assign:
-      place:
-        Identifier: "{\"name\":\"xu8\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":3}\"}"
-      value:
-        Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
-      span:
-        lo: 0
-        hi: 5
-  - Assign:
-      place:
-        Identifier: "{\"name\":\"xu16\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":4}\"}"
-      value:
-        Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":5,\\\"hi\\\":6}\"}"
-      span:
-        lo: 0
-        hi: 6
-  - Assign:
-      place:
-        Identifier: "{\"name\":\"xu32\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":4}\"}"
-      value:
-        Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":5,\\\"hi\\\":6}\"}"
-      span:
-        lo: 0
-        hi: 6
-  - Assign:
-      place:
-        Identifier: "{\"name\":\"xu64\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":4}\"}"
-      value:
-        Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":5,\\\"hi\\\":6}\"}"
-      span:
-        lo: 0
-        hi: 6
-  - Assign:
-      place:
-        Identifier: "{\"name\":\"xu128\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":5}\"}"
-      value:
-        Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
-      span:
-        lo: 0
-        hi: 7
-  - Assign:
-      place:
-        Identifier: "{\"name\":\"xreturn\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":7}\"}"
-      value:
-        Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
-      span:
-        lo: 0
-        hi: 9
-  - Assign:
-      place:
-        Identifier: "{\"name\":\"xtrue\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":5}\"}"
-      value:
-        Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
-      span:
-        lo: 0
-        hi: 7
-  - Assign:
-      place:
-        Identifier: "{\"name\":\"xfalse\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":6}\"}"
-      value:
-        Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
-      span:
-        lo: 0
-        hi: 8
-  - Assign:
-      place:
-        Identifier: "{\"name\":\"x0\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":2}\"}"
-      value:
-        Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":3,\\\"hi\\\":4}\"}"
-      span:
-        lo: 0
-        hi: 4
diff --git a/tests/expectations/tests/parser/unreachable/postfix_fail.out b/tests/expectations/tests/parser/unreachable/postfix_fail.out
deleted file mode 100644
index 1391c02928..0000000000
--- a/tests/expectations/tests/parser/unreachable/postfix_fail.out
+++ /dev/null
@@ -1,24 +0,0 @@
----
-namespace: ParseStatement
-expectation: Fail
-outputs:
-  - "Error [EPAR0370005]: expected : -- found '='\n    --> test:1:7\n     |\n   1 | let x = a;;\n     |       ^"
-  - "Error [EPAR0370005]: expected : -- found '='\n    --> test:1:7\n     |\n   1 | let x = a.;\n     |       ^"
-  - "Error [EPAR0370005]: expected : -- found '='\n    --> test:1:7\n     |\n   1 | let x = a,;\n     |       ^"
-  - "Error [EPAR0370005]: expected : -- found '='\n    --> test:1:7\n     |\n   1 | let x = a[;\n     |       ^"
-  - "Error [EPAR0370005]: expected : -- found '='\n    --> test:1:7\n     |\n   1 | let x = a];\n     |       ^"
-  - "Error [EPAR0370005]: expected : -- found '='\n    --> test:1:7\n     |\n   1 | let x = a{;\n     |       ^"
-  - "Error [EPAR0370005]: expected : -- found '='\n    --> test:1:7\n     |\n   1 | let x = a};\n     |       ^"
-  - "Error [EPAR0370005]: expected : -- found '='\n    --> test:1:7\n     |\n   1 | let x = a);\n     |       ^"
-  - "Error [EPAR0370005]: expected : -- found '='\n    --> test:1:7\n     |\n   1 | let x = a:;\n     |       ^"
-  - "Error [EPAR0370005]: expected : -- found '='\n    --> test:1:7\n     |\n   1 | let x = a?;\n     |       ^"
-  - "Error [EPAR0370005]: expected : -- found '='\n    --> test:1:7\n     |\n   1 | let x = a=;\n     |       ^"
-  - "Error [EPAR0370005]: expected : -- found '='\n    --> test:1:7\n     |\n   1 | let x = a==;\n     |       ^"
-  - "Error [EPAR0370005]: expected : -- found '='\n    --> test:1:7\n     |\n   1 | let x = a!;\n     |       ^"
-  - "Error [EPAR0370005]: expected : -- found '='\n    --> test:1:7\n     |\n   1 | let x = a!=;\n     |       ^"
-  - "Error [EPAR0370005]: expected : -- found '='\n    --> test:1:7\n     |\n   1 | let x = a>;\n     |       ^"
-  - "Error [EPAR0370005]: expected : -- found '='\n    --> test:1:7\n     |\n   1 | let x = a>=;\n     |       ^"
-  - "Error [EPAR0370005]: expected : -- found '='\n    --> test:1:7\n     |\n   1 | let x = a<;\n     |       ^"
-  - "Error [EPAR0370005]: expected : -- found '='\n    --> test:1:7\n     |\n   1 | let x = a<=;\n     |       ^"
-  - "Error [EPAR0370005]: expected : -- found '='\n    --> test:1:7\n     |\n   1 | let x = a>;\n     |       ^"
-  - "Error [EPAR0370005]: expected : -- found '='\n    --> test:1:7\n     |\n   1 | let x = a..;\n     |       ^"
diff --git a/tests/expectations/tests/parser/unreachable/postfix_pass.out b/tests/expectations/tests/parser/unreachable/postfix_pass.out
deleted file mode 100644
index abfb038b75..0000000000
--- a/tests/expectations/tests/parser/unreachable/postfix_pass.out
+++ /dev/null
@@ -1,279 +0,0 @@
----
-namespace: ParseStatement
-expectation: Pass
-outputs:
-  - Definition:
-      declaration_type: Let
-      place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
-      type_:
-        Integer: U8
-      value:
-        Identifier: "{\"name\":\"aimport\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":19}\"}"
-      span:
-        lo: 0
-        hi: 19
-  - Definition:
-      declaration_type: Let
-      place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
-      type_:
-        Integer: U8
-      value:
-        Identifier: "{\"name\":\"a_\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":14}\"}"
-      span:
-        lo: 0
-        hi: 14
-  - Definition:
-      declaration_type: Let
-      place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
-      type_:
-        Integer: U8
-      value:
-        Identifier: "{\"name\":\"aas\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":15}\"}"
-      span:
-        lo: 0
-        hi: 15
-  - Definition:
-      declaration_type: Let
-      place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
-      type_:
-        Integer: U8
-      value:
-        Identifier: "{\"name\":\"aconsole\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":20}\"}"
-      span:
-        lo: 0
-        hi: 20
-  - Definition:
-      declaration_type: Let
-      place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
-      type_:
-        Integer: U8
-      value:
-        Identifier: "{\"name\":\"aconst\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":18}\"}"
-      span:
-        lo: 0
-        hi: 18
-  - Definition:
-      declaration_type: Let
-      place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
-      type_:
-        Integer: U8
-      value:
-        Identifier: "{\"name\":\"alet\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":16}\"}"
-      span:
-        lo: 0
-        hi: 16
-  - Definition:
-      declaration_type: Let
-      place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
-      type_:
-        Integer: U8
-      value:
-        Identifier: "{\"name\":\"afor\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":16}\"}"
-      span:
-        lo: 0
-        hi: 16
-  - Definition:
-      declaration_type: Let
-      place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
-      type_:
-        Integer: U8
-      value:
-        Identifier: "{\"name\":\"aif\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":15}\"}"
-      span:
-        lo: 0
-        hi: 15
-  - Definition:
-      declaration_type: Let
-      place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
-      type_:
-        Integer: U8
-      value:
-        Identifier: "{\"name\":\"aelse\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":17}\"}"
-      span:
-        lo: 0
-        hi: 17
-  - Definition:
-      declaration_type: Let
-      place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
-      type_:
-        Integer: U8
-      value:
-        Identifier: "{\"name\":\"ai8\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":15}\"}"
-      span:
-        lo: 0
-        hi: 15
-  - Definition:
-      declaration_type: Let
-      place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
-      type_:
-        Integer: U8
-      value:
-        Identifier: "{\"name\":\"ai16\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":16}\"}"
-      span:
-        lo: 0
-        hi: 16
-  - Definition:
-      declaration_type: Let
-      place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
-      type_:
-        Integer: U8
-      value:
-        Identifier: "{\"name\":\"ai32\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":16}\"}"
-      span:
-        lo: 0
-        hi: 16
-  - Definition:
-      declaration_type: Let
-      place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
-      type_:
-        Integer: U8
-      value:
-        Identifier: "{\"name\":\"ai64\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":16}\"}"
-      span:
-        lo: 0
-        hi: 16
-  - Definition:
-      declaration_type: Let
-      place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
-      type_:
-        Integer: U8
-      value:
-        Identifier: "{\"name\":\"ai128\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":17}\"}"
-      span:
-        lo: 0
-        hi: 17
-  - Definition:
-      declaration_type: Let
-      place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
-      type_:
-        Integer: U8
-      value:
-        Identifier: "{\"name\":\"au8\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":15}\"}"
-      span:
-        lo: 0
-        hi: 15
-  - Definition:
-      declaration_type: Let
-      place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
-      type_:
-        Integer: U8
-      value:
-        Identifier: "{\"name\":\"au16\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":16}\"}"
-      span:
-        lo: 0
-        hi: 16
-  - Definition:
-      declaration_type: Let
-      place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
-      type_:
-        Integer: U8
-      value:
-        Identifier: "{\"name\":\"au32\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":16}\"}"
-      span:
-        lo: 0
-        hi: 16
-  - Definition:
-      declaration_type: Let
-      place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
-      type_:
-        Integer: U8
-      value:
-        Identifier: "{\"name\":\"au64\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":16}\"}"
-      span:
-        lo: 0
-        hi: 16
-  - Definition:
-      declaration_type: Let
-      place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
-      type_:
-        Integer: U8
-      value:
-        Identifier: "{\"name\":\"au128\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":17}\"}"
-      span:
-        lo: 0
-        hi: 17
-  - Definition:
-      declaration_type: Let
-      place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
-      type_:
-        Integer: U8
-      value:
-        Identifier: "{\"name\":\"areturn\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":19}\"}"
-      span:
-        lo: 0
-        hi: 19
-  - Definition:
-      declaration_type: Let
-      place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
-      type_:
-        Integer: U8
-      value:
-        Identifier: "{\"name\":\"aself\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":17}\"}"
-      span:
-        lo: 0
-        hi: 17
-  - Definition:
-      declaration_type: Let
-      place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
-      type_:
-        Integer: U8
-      value:
-        Identifier: "{\"name\":\"aSelf\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":17}\"}"
-      span:
-        lo: 0
-        hi: 17
-  - Definition:
-      declaration_type: Let
-      place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
-      type_:
-        Integer: U8
-      value:
-        Identifier: "{\"name\":\"atrue\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":17}\"}"
-      span:
-        lo: 0
-        hi: 17
-  - Definition:
-      declaration_type: Let
-      place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
-      type_:
-        Integer: U8
-      value:
-        Identifier: "{\"name\":\"afalse\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":18}\"}"
-      span:
-        lo: 0
-        hi: 18
-  - Definition:
-      declaration_type: Let
-      place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
-      type_:
-        Integer: U8
-      value:
-        Identifier: "{\"name\":\"a0\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":14}\"}"
-      span:
-        lo: 0
-        hi: 14
diff --git a/tests/test-framework/src/runner.rs b/tests/test-framework/src/runner.rs
index 3d07b9ab2a..6b72b0e2bb 100644
--- a/tests/test-framework/src/runner.rs
+++ b/tests/test-framework/src/runner.rs
@@ -84,21 +84,19 @@ fn take_hook(
 pub struct TestCases {
     tests: Vec<(PathBuf, String)>,
     path_prefix: PathBuf,
+    expectation_category: String,
     fail_categories: Vec<TestFailure>,
 }
 
 impl TestCases {
     fn new(expectation_category: &str, additional_check: impl Fn(&TestConfig) -> bool) -> (Self, Vec<TestConfig>) {
         let mut path_prefix = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
-        path_prefix.push("../../tests/tests");
-        path_prefix.push(expectation_category);
-        if let Ok(p) = std::env::var("TEST_FILTER") {
-            path_prefix.push(p);
-        }
+        path_prefix.push("../../tests");
 
         let mut new = Self {
             tests: Vec::new(),
             path_prefix,
+            expectation_category: expectation_category.to_string(),
             fail_categories: Vec::new(),
         };
         let tests = new.load_tests(additional_check);
@@ -108,7 +106,14 @@ impl TestCases {
     fn load_tests(&mut self, additional_check: impl Fn(&TestConfig) -> bool) -> Vec<TestConfig> {
         let mut configs = Vec::new();
 
-        self.tests = find_tests(&self.path_prefix.clone())
+        let mut test_path = self.path_prefix.clone();
+        test_path.push("tests");
+        test_path.push(&self.expectation_category);
+        if let Ok(p) = std::env::var("TEST_FILTER") {
+            test_path.push(p);
+        }
+
+        self.tests = find_tests(&test_path)
             .filter(|(path, content)| match extract_test_config(content) {
                 None => {
                     self.fail_categories.push(TestFailure {
@@ -153,11 +158,16 @@ impl TestCases {
     }
 
     fn load_expectations(&self, path: &Path) -> (PathBuf, Option<TestExpectation>) {
-        let test_dir = [env!("CARGO_MANIFEST_DIR"), "../../tests/"].iter().collect::<PathBuf>();
-        let relative_path = path.strip_prefix(&test_dir).expect("path error for test");
+        let test_dir = [env!("CARGO_MANIFEST_DIR"), "../../tests"].iter().collect::<PathBuf>();
+        let relative_path = path
+            .strip_prefix(&test_dir)
+            .expect("path error for test")
+            .strip_prefix("tests")
+            .expect("path error for test");
+
         let expectation_path = test_dir
             .join("expectations")
-            .join(relative_path.parent().expect("no parent dir for test"))
+            .join(relative_path.parent().expect("no parent for test"))
             .join(relative_path.file_name().expect("no file name for test"))
             .with_extension("out");
 
@@ -241,6 +251,7 @@ pub fn run_tests<T: Runner>(runner: &T, expectation_category: &str) {
 
         if errors.is_empty() {
             if expectations.is_none() {
+                println!("expectation_path: {:?}", expectation_path);
                 outputs.push((
                     expectation_path,
                     TestExpectation {
@@ -279,6 +290,7 @@ pub fn run_tests<T: Runner>(runner: &T, expectation_category: &str) {
         );
     } else {
         for (path, new_expectation) in outputs {
+            println!("writing expectation to {:?}", path);
             std::fs::create_dir_all(path.parent().unwrap()).expect("failed to make test expectation parent directory");
             std::fs::write(
                 &path,