From 649088905d3ed5d3eab07c1f030bb0b12c6d9dad Mon Sep 17 00:00:00 2001
From: gluaxspeed <jonathan.t.pavlik@gmail.com>
Date: Fri, 27 Aug 2021 07:28:02 -0700
Subject: [PATCH] standardize ast generation in ast and test runner

---
 Cargo.lock                                    |   1 -
 compiler/Cargo.toml                           |   3 -
 compiler/src/compiler.rs                      |   2 +-
 compiler/src/test.rs                          |  37 ++---
 parser/src/errors/deprecated.rs               |  58 --------
 parser/src/errors/mod.rs                      |  15 --
 parser/src/errors/syntax.rs                   | 129 ------------------
 parser/src/errors/token.rs                    |  39 ------
 test-framework/src/bin/tgc.rs                 |   8 +-
 test-framework/src/runner.rs                  |   7 +-
 .../compiler/compiler/address/branch.leo.out  |   6 +-
 .../compiler/compiler/address/equal.leo.out   |   6 +-
 .../compiler/compiler/address/index.leo.out   |   6 +-
 .../compiler/compiler/address/ternary.leo.out |   6 +-
 .../array/array_range_access_fail.leo.out     |   2 +-
 .../array/array_size_zero_fail.leo.out        |   2 +-
 .../compiler/array/complex_access.leo.out     |   6 +-
 .../compiler/array/equal_initializer.leo.out  |   6 +-
 .../array/equal_initializer_2.leo.out         |   6 +-
 .../compiler/array/input_nested_3x2.leo.out   |   6 +-
 .../array/input_nested_3x2_fail.leo.out       |   2 +-
 .../compiler/array/input_tuple_3x2.leo.out    |   6 +-
 .../array/multi_fail_initializer.leo.out      |   2 +-
 .../compiler/array/multi_fail_inline.leo.out  |   2 +-
 .../compiler/array/multi_initializer.leo.out  |   6 +-
 .../array/multi_initializer_fail.leo.out      |   2 +-
 .../compiler/compiler/array/nested.leo.out    |   6 +-
 .../compiler/array/nested_3x2_value.leo.out   |   6 +-
 .../array/nested_3x2_value_fail.leo.out       |   2 +-
 .../compiler/compiler/array/registers.leo.out |   6 +-
 .../compiler/compiler/array/slice.leo.out     |   6 +-
 .../compiler/array/slice_lower.leo.out        |   6 +-
 .../compiler/compiler/array/spread.leo.out    |   6 +-
 .../compiler/array/ternary_in_array.leo.out   |   6 +-
 .../compiler/array/tuple_3x2_value.leo.out    |   6 +-
 .../array/tuple_3x2_value_fail.leo.out        |   2 +-
 .../compiler/compiler/array/type_fail.leo.out |   2 +-
 .../compiler/array/type_input_3x2.leo.out     |   6 +-
 .../compiler/array/type_input_4x3x2.leo.out   |   6 +-
 .../type_nested_value_nested_3x2.leo.out      |   6 +-
 .../type_nested_value_nested_3x2_fail.leo.out |   2 +-
 .../type_nested_value_nested_4x3x2.leo.out    |   6 +-
 ...ype_nested_value_nested_4x3x2_fail.leo.out |   2 +-
 .../array/type_nested_value_tuple_3x2.leo.out |   6 +-
 .../type_nested_value_tuple_3x2_fail.leo.out  |   2 +-
 .../type_nested_value_tuple_4x3x2.leo.out     |   6 +-
 ...type_nested_value_tuple_4x3x2_fail.leo.out |   2 +-
 .../array/type_tuple_value_nested_3x2.leo.out |   6 +-
 .../type_tuple_value_nested_3x2_fail.leo.out  |   2 +-
 .../type_tuple_value_nested_4x3x2.leo.out     |   6 +-
 ...type_tuple_value_nested_4x3x2_fail.leo.out |   2 +-
 .../array/type_tuple_value_tuple_3x2.leo.out  |   6 +-
 .../type_tuple_value_tuple_3x2_fail.leo.out   |   2 +-
 .../type_tuple_value_tuple_4x3x2.leo.out      |   6 +-
 .../type_tuple_value_tuple_4x3x2_fail.leo.out |   2 +-
 .../array/variable_slice_fail.leo.out         |   2 +-
 .../compiler/compiler/boolean/and.leo.out     |   6 +-
 .../compiler/boolean/conditional.leo.out      |   6 +-
 .../compiler/compiler/boolean/equal.leo.out   |   6 +-
 .../compiler/boolean/not_equal.leo.out        |   6 +-
 .../compiler/compiler/boolean/or.leo.out      |   6 +-
 .../compiler/compiler/char/circuit.leo.out    |   6 +-
 .../compiler/char/invalid_char.leo.out        |   2 +-
 .../compiler/compiler/char/neq.leo.out        |   6 +-
 .../compiler/char/nonprinting.leo.out         |   6 +-
 .../compiler/compiler/char/out.leo.out        |   6 +-
 .../big_self_in_circuit_replacement.leo.out   |   6 +-
 .../big_self_outside_circuit_fail.leo.out     |   2 +-
 .../circuits/const_self_variable.leo.out      |   6 +-
 .../circuits/const_self_variable_fail.leo.out |   2 +-
 ...ne_circuit_inside_circuit_function.leo.out |   6 +-
 .../circuits/duplicate_name_context.leo.out   |   6 +-
 .../compiler/compiler/circuits/inline.leo.out |   6 +-
 .../compiler/circuits/inline_fail.leo.out     |   2 +-
 .../circuits/inline_member_fail.leo.out       |   2 +-
 .../circuits/inline_member_pass.leo.out       |   6 +-
 .../circuits/inline_undefined.leo.out         |   2 +-
 .../compiler/circuits/member_function.leo.out |   6 +-
 .../circuits/member_function_fail.leo.out     |   2 +-
 .../circuits/member_function_invalid.leo.out  |   2 +-
 .../circuits/member_function_nested.leo.out   |   6 +-
 .../circuits/member_static_function.leo.out   |   6 +-
 .../member_static_function_invalid.leo.out    |   2 +-
 .../member_static_function_nested.leo.out     |   6 +-
 .../member_static_function_undefined.leo.out  |   2 +-
 .../compiler/circuits/member_variable.leo.out |   6 +-
 .../member_variable_and_function.leo.out      |   6 +-
 .../circuits/member_variable_fail.leo.out     |   2 +-
 .../circuits/mut_function_fail.leo.out        |   2 +-
 .../circuits/mut_self_function_fail.leo.out   |   2 +-
 .../mut_self_static_function_fail.leo.out     |   2 +-
 .../circuits/mut_self_variable.leo.out        |   6 +-
 .../circuits/mut_self_variable_branch.leo.out |   6 +-
 .../mut_self_variable_conditional.leo.out     |   6 +-
 .../circuits/mut_self_variable_fail.leo.out   |   2 +-
 .../circuits/mut_static_function_fail.leo.out |   2 +-
 .../compiler/circuits/mut_variable.leo.out    |   6 +-
 .../circuits/mut_variable_fail.leo.out        |   2 +-
 .../mutable_call_immutable_context.leo.out    |   6 +-
 .../compiler/circuits/pedersen_mock.leo.out   |   6 +-
 .../circuits/return_self_type_array.leo.out   |   6 +-
 .../circuits/return_self_type_tuple.leo.out   |   6 +-
 .../compiler/circuits/self_circuit.leo.out    |   2 +-
 .../compiler/circuits/self_fail.leo.out       |   2 +-
 .../compiler/circuits/self_member.leo.out     |   6 +-
 .../circuits/self_member_invalid.leo.out      |   2 +-
 .../circuits/self_member_undefined.leo.out    |   2 +-
 .../compiler/compiler/console/assert.leo.out  |   6 +-
 .../console/conditional_assert.leo.out        |   6 +-
 .../compiler/compiler/console/error.leo.out   |   6 +-
 .../compiler/compiler/console/log.leo.out     |   6 +-
 .../compiler/console/log_conditional.leo.out  |   6 +-
 .../compiler/console/log_fail.leo.out         |   2 +-
 .../compiler/console/log_input.leo.out        |   6 +-
 .../compiler/console/log_parameter.leo.out    |   6 +-
 .../console/log_parameter_fail_empty.leo.out  |   2 +-
 .../console/log_parameter_fail_none.leo.out   |   2 +-
 .../log_parameter_fail_unknown.leo.out        |   2 +-
 .../console/log_parameter_many.leo.out        |   6 +-
 .../core/core_circuit_invalid.leo.out         |   2 +-
 .../compiler/definition/out_of_order.leo.out  |   6 +-
 .../out_of_order_with_import.leo.out          |   6 +-
 .../compiler/compiler/field/add.leo.out       |   6 +-
 .../compiler/compiler/field/div.leo.out       |   6 +-
 .../compiler/compiler/field/eq.leo.out        |   6 +-
 .../compiler/compiler/field/field.leo.out     |   6 +-
 .../compiler/compiler/field/mul.leo.out       |   6 +-
 .../compiler/compiler/field/negate.leo.out    |   6 +-
 .../field/no_space_between_literal.leo.out    |   2 +-
 .../compiler/function/array_input.leo.out     |   6 +-
 .../function/array_params_direct_call.leo.out |   6 +-
 .../function/conditional_return.leo.out       |   6 +-
 .../duplicate_definition_fail.leo.out         |   2 +-
 .../compiler/compiler/function/empty.leo.out  |   6 +-
 .../compiler/function/iteration.leo.out       |   6 +-
 .../function/iteration_repeated.leo.out       |   6 +-
 .../function/multiple_returns.leo.out         |   6 +-
 .../function/multiple_returns_fail.leo.out    |   2 +-
 .../multiple_returns_fail_conditional.leo.out |   2 +-
 .../function/multiple_returns_main.leo.out    |   6 +-
 .../compiler/function/newlines.leo.out        |   6 +-
 .../compiler/function/repeated.leo.out        |   6 +-
 .../compiler/compiler/function/return.leo.out |   6 +-
 .../function/return_array_nested_fail.leo.out |   2 +-
 .../function/return_array_nested_pass.leo.out |   6 +-
 .../function/return_array_tuple_fail.leo.out  |   2 +-
 .../function/return_array_tuple_pass.leo.out  |   6 +-
 .../compiler/function/return_tuple.leo.out    |   6 +-
 .../function/return_tuple_conditional.leo.out |   6 +-
 .../compiler/function/scope_fail.leo.out      |   2 +-
 .../compiler/function/undefined.leo.out       |   2 +-
 .../compiler/function/value_unchanged.leo.out |   6 +-
 .../global_consts/global_const_types.leo.out  |   6 +-
 .../global_consts/modify_global_const.leo.out |   2 +-
 .../tests/import_dependency_folder.leo.out    |   6 +-
 .../compiler/import_local/import_all.leo.out  |   6 +-
 .../compiler/import_local/import_as.leo.out   |   6 +-
 .../compiler/import_local/import_dir.leo.out  |   6 +-
 .../import_local/import_files.leo.out         |   6 +-
 .../compiler/import_local/import_many.leo.out |   6 +-
 .../import_local/import_weird_names.leo.out   |   6 +-
 .../import_weird_names_nested.leo.out         |   6 +-
 .../const_input_non_const.leo.out             |   2 +-
 .../const_var_in_both_sections_fail.leo.out   |   2 +-
 .../input_files/program_input/main.leo.out    |   6 +-
 .../program_input/main_array.leo.out          |   6 +-
 .../program_input/main_array_fail.leo.out     |   2 +-
 .../program_input/main_char.leo.out           |   6 +-
 .../program_input/main_field.leo.out          |   6 +-
 .../program_input/main_group.leo.out          |   6 +-
 .../main_multi_dimension_array.leo.out        |   6 +-
 .../program_input/main_multiple.leo.out       |   6 +-
 .../program_input/main_string.leo.out         |   6 +-
 .../program_input/main_tuple.leo.out          |   6 +-
 .../program_input/main_tuple_fail.leo.out     |   2 +-
 .../non_const_input_const.leo.out             |   2 +-
 .../var_in_both_sections_fail.leo.out         |   2 +-
 .../basic.leo.out                             |   6 +-
 .../token_withdraw.leo.out                    |   6 +-
 .../program_input_constants/main.leo.out      |   6 +-
 .../main_array.leo.out                        |   6 +-
 .../main_array_fail.leo.out                   |   2 +-
 .../program_input_constants/main_char.leo.out |   6 +-
 .../main_field.leo.out                        |   6 +-
 .../main_group.leo.out                        |   6 +-
 .../main_multi_dimension_array.leo.out        |   6 +-
 .../main_multiple.leo.out                     |   6 +-
 .../main_string.leo.out                       |   6 +-
 .../main_tuple.leo.out                        |   6 +-
 .../main_tuple_fail.leo.out                   |   2 +-
 .../program_registers/registers_array.leo.out |   6 +-
 .../program_registers/registers_fail.leo.out  |   2 +-
 .../program_registers/registers_pass.leo.out  |   6 +-
 .../program_state/access_all.leo.out          |   6 +-
 .../program_state/access_state.leo.out        |   6 +-
 .../input_files/program_state/basic.leo.out   |   6 +-
 .../compiler/integers/i128/add.leo.out        |   6 +-
 .../integers/i128/console_assert.leo.out      |   6 +-
 .../compiler/integers/i128/div.leo.out        |   6 +-
 .../compiler/integers/i128/eq.leo.out         |   6 +-
 .../compiler/integers/i128/ge.leo.out         |   6 +-
 .../compiler/integers/i128/gt.leo.out         |   6 +-
 .../compiler/integers/i128/le.leo.out         |   6 +-
 .../compiler/integers/i128/lt.leo.out         |   6 +-
 .../compiler/integers/i128/max.leo.out        |   6 +-
 .../compiler/integers/i128/max_fail.leo.out   |   2 +-
 .../compiler/integers/i128/min.leo.out        |   6 +-
 .../compiler/integers/i128/min_fail.leo.out   |   2 +-
 .../compiler/integers/i128/mul.leo.out        |   6 +-
 .../compiler/integers/i128/ne.leo.out         |   6 +-
 .../compiler/integers/i128/negate.leo.out     |   6 +-
 .../compiler/integers/i128/negate_min.leo.out |   6 +-
 .../integers/i128/negate_zero.leo.out         |   6 +-
 .../i128/no_space_between_literal.leo.out     |   2 +-
 .../compiler/integers/i128/sub.leo.out        |   6 +-
 .../compiler/integers/i128/ternary.leo.out    |   6 +-
 .../compiler/integers/i16/add.leo.out         |   6 +-
 .../integers/i16/console_assert.leo.out       |   6 +-
 .../compiler/integers/i16/div.leo.out         |   6 +-
 .../compiler/compiler/integers/i16/eq.leo.out |   6 +-
 .../compiler/compiler/integers/i16/ge.leo.out |   6 +-
 .../compiler/compiler/integers/i16/gt.leo.out |   6 +-
 .../compiler/compiler/integers/i16/le.leo.out |   6 +-
 .../compiler/compiler/integers/i16/lt.leo.out |   6 +-
 .../compiler/integers/i16/max.leo.out         |   6 +-
 .../compiler/integers/i16/max_fail.leo.out    |   2 +-
 .../compiler/integers/i16/min.leo.out         |   6 +-
 .../compiler/integers/i16/min_fail.leo.out    |   2 +-
 .../compiler/integers/i16/mul.leo.out         |   6 +-
 .../compiler/compiler/integers/i16/ne.leo.out |   6 +-
 .../compiler/integers/i16/negate.leo.out      |   6 +-
 .../compiler/integers/i16/negate_min.leo.out  |   6 +-
 .../compiler/integers/i16/negate_zero.leo.out |   6 +-
 .../i16/no_space_between_literal.leo.out      |   2 +-
 .../compiler/integers/i16/sub.leo.out         |   6 +-
 .../compiler/integers/i16/ternary.leo.out     |   6 +-
 .../compiler/integers/i32/add.leo.out         |   6 +-
 .../integers/i32/console_assert.leo.out       |   6 +-
 .../compiler/integers/i32/div.leo.out         |   6 +-
 .../compiler/compiler/integers/i32/eq.leo.out |   6 +-
 .../compiler/compiler/integers/i32/ge.leo.out |   6 +-
 .../compiler/compiler/integers/i32/gt.leo.out |   6 +-
 .../compiler/compiler/integers/i32/le.leo.out |   6 +-
 .../compiler/compiler/integers/i32/lt.leo.out |   6 +-
 .../compiler/integers/i32/max.leo.out         |   6 +-
 .../compiler/integers/i32/max_fail.leo.out    |   2 +-
 .../compiler/integers/i32/min.leo.out         |   6 +-
 .../compiler/integers/i32/min_fail.leo.out    |   2 +-
 .../compiler/integers/i32/mul.leo.out         |   6 +-
 .../compiler/compiler/integers/i32/ne.leo.out |   6 +-
 .../compiler/integers/i32/negate.leo.out      |   6 +-
 .../compiler/integers/i32/negate_min.leo.out  |   6 +-
 .../compiler/integers/i32/negate_zero.leo.out |   6 +-
 .../i32/no_space_between_literal.leo.out      |   2 +-
 .../compiler/integers/i32/sub.leo.out         |   6 +-
 .../compiler/integers/i32/ternary.leo.out     |   6 +-
 .../compiler/integers/i64/add.leo.out         |   6 +-
 .../integers/i64/console_assert.leo.out       |   6 +-
 .../compiler/integers/i64/div.leo.out         |   6 +-
 .../compiler/compiler/integers/i64/eq.leo.out |   6 +-
 .../compiler/compiler/integers/i64/ge.leo.out |   6 +-
 .../compiler/compiler/integers/i64/gt.leo.out |   6 +-
 .../compiler/compiler/integers/i64/le.leo.out |   6 +-
 .../compiler/compiler/integers/i64/lt.leo.out |   6 +-
 .../compiler/integers/i64/max.leo.out         |   6 +-
 .../compiler/integers/i64/max_fail.leo.out    |   2 +-
 .../compiler/integers/i64/min.leo.out         |   6 +-
 .../compiler/integers/i64/min_fail.leo.out    |   2 +-
 .../compiler/integers/i64/mul.leo.out         |   6 +-
 .../compiler/compiler/integers/i64/ne.leo.out |   6 +-
 .../compiler/integers/i64/negate.leo.out      |   6 +-
 .../compiler/integers/i64/negate_min.leo.out  |   6 +-
 .../compiler/integers/i64/negate_zero.leo.out |   6 +-
 .../i64/no_space_between_literal.leo.out      |   2 +-
 .../compiler/integers/i64/sub.leo.out         |   6 +-
 .../compiler/integers/i64/ternary.leo.out     |   6 +-
 .../compiler/compiler/integers/i8/add.leo.out |   6 +-
 .../integers/i8/console_assert.leo.out        |   6 +-
 .../compiler/compiler/integers/i8/div.leo.out |   6 +-
 .../compiler/compiler/integers/i8/eq.leo.out  |   6 +-
 .../compiler/compiler/integers/i8/ge.leo.out  |   6 +-
 .../compiler/compiler/integers/i8/gt.leo.out  |   6 +-
 .../compiler/compiler/integers/i8/le.leo.out  |   6 +-
 .../compiler/compiler/integers/i8/lt.leo.out  |   6 +-
 .../compiler/compiler/integers/i8/max.leo.out |   6 +-
 .../compiler/integers/i8/max_fail.leo.out     |   2 +-
 .../compiler/compiler/integers/i8/min.leo.out |   6 +-
 .../compiler/integers/i8/min_fail.leo.out     |   2 +-
 .../compiler/compiler/integers/i8/mul.leo.out |   6 +-
 .../compiler/compiler/integers/i8/ne.leo.out  |   6 +-
 .../compiler/integers/i8/negate.leo.out       |   6 +-
 .../compiler/integers/i8/negate_min.leo.out   |   2 +-
 .../compiler/integers/i8/negate_zero.leo.out  |   6 +-
 .../i8/no_space_between_literal.leo.out       |   2 +-
 .../compiler/compiler/integers/i8/sub.leo.out |   6 +-
 .../compiler/integers/i8/ternary.leo.out      |   6 +-
 .../compiler/integers/u128/add.leo.out        |   6 +-
 .../integers/u128/console_assert.leo.out      |   6 +-
 .../compiler/integers/u128/div.leo.out        |   6 +-
 .../compiler/integers/u128/eq.leo.out         |   6 +-
 .../compiler/integers/u128/ge.leo.out         |   6 +-
 .../compiler/integers/u128/gt.leo.out         |   6 +-
 .../compiler/integers/u128/input.leo.out      |   6 +-
 .../compiler/integers/u128/le.leo.out         |   6 +-
 .../compiler/integers/u128/lt.leo.out         |   6 +-
 .../compiler/integers/u128/max.leo.out        |   6 +-
 .../compiler/integers/u128/max_fail.leo.out   |   2 +-
 .../compiler/integers/u128/min.leo.out        |   6 +-
 .../compiler/integers/u128/min_fail.leo.out   |   2 +-
 .../compiler/integers/u128/mul.leo.out        |   6 +-
 .../compiler/integers/u128/ne.leo.out         |   6 +-
 .../integers/u128/negative_input_fail.leo.out |   2 +-
 .../u128/no_space_between_literal.leo.out     |   2 +-
 .../compiler/integers/u128/sub.leo.out        |   6 +-
 .../compiler/integers/u128/ternary.leo.out    |   6 +-
 .../compiler/integers/u16/add.leo.out         |   6 +-
 .../integers/u16/console_assert.leo.out       |   6 +-
 .../compiler/integers/u16/div.leo.out         |   6 +-
 .../compiler/compiler/integers/u16/eq.leo.out |   6 +-
 .../compiler/compiler/integers/u16/ge.leo.out |   6 +-
 .../compiler/compiler/integers/u16/gt.leo.out |   6 +-
 .../compiler/integers/u16/input.leo.out       |   6 +-
 .../compiler/compiler/integers/u16/le.leo.out |   6 +-
 .../compiler/compiler/integers/u16/lt.leo.out |   6 +-
 .../compiler/integers/u16/max.leo.out         |   6 +-
 .../compiler/integers/u16/max_fail.leo.out    |   2 +-
 .../compiler/integers/u16/min.leo.out         |   6 +-
 .../compiler/integers/u16/min_fail.leo.out    |   2 +-
 .../compiler/integers/u16/mul.leo.out         |   6 +-
 .../compiler/compiler/integers/u16/ne.leo.out |   6 +-
 .../integers/u16/negative_input_fail.leo.out  |   2 +-
 .../u16/no_space_between_literal.leo.out      |   2 +-
 .../compiler/integers/u16/sub.leo.out         |   6 +-
 .../compiler/integers/u16/ternary.leo.out     |   6 +-
 .../compiler/integers/u32/add.leo.out         |   6 +-
 .../integers/u32/console_assert.leo.out       |   6 +-
 .../compiler/integers/u32/div.leo.out         |   6 +-
 .../compiler/compiler/integers/u32/eq.leo.out |   6 +-
 .../compiler/compiler/integers/u32/ge.leo.out |   6 +-
 .../compiler/compiler/integers/u32/gt.leo.out |   6 +-
 .../compiler/integers/u32/input.leo.out       |   6 +-
 .../compiler/compiler/integers/u32/le.leo.out |   6 +-
 .../compiler/compiler/integers/u32/lt.leo.out |   6 +-
 .../compiler/integers/u32/max.leo.out         |   6 +-
 .../compiler/integers/u32/max_fail.leo.out    |   2 +-
 .../compiler/integers/u32/min.leo.out         |   6 +-
 .../compiler/integers/u32/min_fail.leo.out    |   2 +-
 .../compiler/integers/u32/mul.leo.out         |   6 +-
 .../compiler/compiler/integers/u32/ne.leo.out |   6 +-
 .../integers/u32/negative_input_fail.leo.out  |   2 +-
 .../u32/no_space_between_literal.leo.out      |   2 +-
 .../compiler/integers/u32/sub.leo.out         |   6 +-
 .../compiler/integers/u32/ternary.leo.out     |   6 +-
 .../compiler/integers/u64/add.leo.out         |   6 +-
 .../integers/u64/console_assert.leo.out       |   6 +-
 .../compiler/integers/u64/div.leo.out         |   6 +-
 .../compiler/compiler/integers/u64/eq.leo.out |   6 +-
 .../compiler/compiler/integers/u64/ge.leo.out |   6 +-
 .../compiler/compiler/integers/u64/gt.leo.out |   6 +-
 .../compiler/integers/u64/input.leo.out       |   6 +-
 .../compiler/compiler/integers/u64/le.leo.out |   6 +-
 .../compiler/compiler/integers/u64/lt.leo.out |   6 +-
 .../compiler/integers/u64/max.leo.out         |   6 +-
 .../compiler/integers/u64/max_fail.leo.out    |   2 +-
 .../compiler/integers/u64/min.leo.out         |   6 +-
 .../compiler/integers/u64/min_fail.leo.out    |   2 +-
 .../compiler/integers/u64/mul.leo.out         |   6 +-
 .../compiler/compiler/integers/u64/ne.leo.out |   6 +-
 .../integers/u64/negative_input_fail.leo.out  |   2 +-
 .../u64/no_space_between_literal.leo.out      |   2 +-
 .../compiler/integers/u64/sub.leo.out         |   6 +-
 .../compiler/integers/u64/ternary.leo.out     |   6 +-
 .../compiler/compiler/integers/u8/add.leo.out |   6 +-
 .../integers/u8/console_assert.leo.out        |   6 +-
 .../compiler/compiler/integers/u8/div.leo.out |   6 +-
 .../compiler/compiler/integers/u8/eq.leo.out  |   6 +-
 .../compiler/compiler/integers/u8/ge.leo.out  |   6 +-
 .../compiler/compiler/integers/u8/gt.leo.out  |   6 +-
 .../compiler/integers/u8/input.leo.out        |   6 +-
 .../compiler/compiler/integers/u8/le.leo.out  |   6 +-
 .../compiler/compiler/integers/u8/lt.leo.out  |   6 +-
 .../compiler/compiler/integers/u8/max.leo.out |   6 +-
 .../compiler/integers/u8/max_fail.leo.out     |   2 +-
 .../compiler/compiler/integers/u8/min.leo.out |   6 +-
 .../compiler/integers/u8/min_fail.leo.out     |   2 +-
 .../compiler/compiler/integers/u8/mul.leo.out |   6 +-
 .../compiler/compiler/integers/u8/ne.leo.out  |   6 +-
 .../integers/u8/negative_input_fail.leo.out   |   2 +-
 .../u8/no_space_between_literal.leo.out       |   2 +-
 .../compiler/compiler/integers/u8/sub.leo.out |   6 +-
 .../compiler/integers/u8/ternary.leo.out      |   6 +-
 .../compiler/mutability/array_dyn_mut.leo.out |   6 +-
 .../mutability/array_dyn_mut_indirect.leo.out |   6 +-
 .../compiler/mutability/array_fail.leo.out    |   2 +-
 .../compiler/mutability/array_mut.leo.out     |   6 +-
 .../mutability/array_splice_mut.leo.out       |   6 +-
 .../mutability/array_tuple_mut.leo.out        |   6 +-
 .../compiler/mutability/circuit_fail.leo.out  |   2 +-
 .../mutability/circuit_function_const.leo.out |   2 +-
 .../mutability/circuit_function_mut.leo.out   |   6 +-
 .../circuit_static_function_mut_fail.leo.out  |   2 +-
 .../mutability/circuit_variable_mut.leo.out   |   6 +-
 .../compiler/mutability/cond_mut.leo.out      |   6 +-
 .../compiler/mutability/const.leo.out         |   2 +-
 .../mutability/function_input.leo.out         |   2 +-
 .../mutability/function_input_mut.leo.out     |   6 +-
 .../compiler/mutability/let_fail.leo.out      |   2 +-
 .../compiler/mutability/let_mut.leo.out       |   6 +-
 .../mutability/let_mut_nested.leo.out         |   6 +-
 .../compiler/compiler/mutability/swap.leo.out |   6 +-
 .../compiler/statements/all_loops.leo.out     |   6 +-
 .../statements/assign_ternary.leo.out         |   2 +-
 .../compiler/statements/block.leo.out         |   6 +-
 .../compiler/statements/chain.leo.out         |   6 +-
 .../statements/compound_assignment.leo.out    |   6 +-
 .../statements/duplicate_variable.leo.out     |   2 +-
 .../compiler/statements/for_loop.leo.out      |   6 +-
 .../statements/iteration_basic.leo.out        |   6 +-
 .../statements/iteration_variable.leo.out     |   6 +-
 .../statements/multiple_returns.leo.out       |   6 +-
 .../compiler/statements/mutate.leo.out        |   6 +-
 .../compiler/statements/nested_mutate.leo.out |   6 +-
 .../compiler/statements/reverse_loops.leo.out |   6 +-
 .../compiler/statements/reverse_one.leo.out   |   6 +-
 .../ternary_explicit_and_implicit.leo.out     |   6 +-
 .../statements/ternary_non_const_fail.leo.out |   2 +-
 .../compiler/compiler/string/circuit.leo.out  |   6 +-
 .../compiler/compiler/string/equality.leo.out |   6 +-
 .../compiler/compiler/string/replace.leo.out  |   6 +-
 .../string/string_transformation.leo.out      |   6 +-
 .../compiler/compiler/tuples/access.leo.out   |   6 +-
 .../compiler/compiler/tuples/basic.leo.out    |   6 +-
 .../compiler/tuples/dependent.leo.out         |   6 +-
 .../compiler/tuples/destructured.leo.out      |   6 +-
 .../compiler/tuples/nested_access.leo.out     |   6 +-
 435 files changed, 1079 insertions(+), 1338 deletions(-)
 delete mode 100644 parser/src/errors/deprecated.rs
 delete mode 100644 parser/src/errors/mod.rs
 delete mode 100644 parser/src/errors/syntax.rs
 delete mode 100644 parser/src/errors/token.rs

diff --git a/Cargo.lock b/Cargo.lock
index 701dc9d718..163e527296 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1235,7 +1235,6 @@ name = "leo-compiler"
 version = "1.5.3"
 dependencies = [
  "bincode",
- "hex",
  "indexmap",
  "leo-asg",
  "leo-asg-passes",
diff --git a/compiler/Cargo.toml b/compiler/Cargo.toml
index a2f90bc3b6..46e5e9252b 100644
--- a/compiler/Cargo.toml
+++ b/compiler/Cargo.toml
@@ -87,9 +87,6 @@ version = "0.7.6"
 [dependencies.bincode]
 version = "1.3"
 
-[dependencies.hex]
-version = "0.4.2"
-
 [dependencies.indexmap]
 version = "1.7.0"
 features = [ "serde-1" ]
diff --git a/compiler/src/compiler.rs b/compiler/src/compiler.rs
index c7b27872b8..327f5c6f21 100644
--- a/compiler/src/compiler.rs
+++ b/compiler/src/compiler.rs
@@ -333,7 +333,7 @@ impl<'a, F: PrimeField, G: GroupType<F>> Compiler<'a, F, G> {
         hasher.update(unparsed_file.as_bytes());
         let hash = hasher.finalize();
 
-        Ok(hex::encode(hash))
+        Ok(format!("{:x}", hash))
     }
 
     /// TODO (howardwu): Incorporate this for real program executions and intentionally-real
diff --git a/compiler/src/test.rs b/compiler/src/test.rs
index bb8c688799..2763442dbf 100644
--- a/compiler/src/test.rs
+++ b/compiler/src/test.rs
@@ -20,7 +20,6 @@ use std::{
 };
 
 use leo_asg::*;
-use leo_ast::{Ast, Program};
 use leo_errors::Result;
 
 use leo_synthesizer::{CircuitSynthesizer, SerializedCircuit, SummarizedCircuit};
@@ -58,13 +57,14 @@ fn new_compiler(path: PathBuf, theorem_options: Option<AstSnapshotOptions>) -> E
     )
 }
 
-fn hash(input: String) -> String {
+fn hash_file(path: &std::path::Path) -> String {
     use sha2::{Digest, Sha256};
-
+    let mut file = std::fs::File::open(&path).unwrap();
     let mut hasher = Sha256::new();
-    hasher.update(input.as_bytes());
-    let output = hasher.finalize();
-    hex::encode(&output[..])
+    std::io::copy(&mut file, &mut hasher).unwrap();
+    let hash = hasher.finalize();
+
+    format!("{:x}", hash)
 }
 
 pub(crate) fn parse_program(
@@ -211,28 +211,13 @@ impl Namespace for CompileNamespace {
             });
         }
 
-        let initial_ast: String = hash(
-            Ast::from_json_file("/tmp/output/initial_ast.json".into())
-                .unwrap_or_else(|_| Ast::new(Program::new("Error reading initial theorem.".to_string())))
-                .to_json_string()
-                .unwrap_or_else(|_| "Error converting ast to string.".to_string()),
-        );
-        let canonicalized_ast: String = hash(
-            Ast::from_json_file("/tmp/output/canonicalization_ast.json".into())
-                .unwrap_or_else(|_| Ast::new(Program::new("Error reading canonicalized theorem.".to_string())))
-                .to_json_string()
-                .unwrap_or_else(|_| "Error converting ast to string.".to_string()),
-        );
-        let type_inferenced_ast = hash(
-            Ast::from_json_file("/tmp/output/type_inferenced_ast.json".into())
-                .unwrap_or_else(|_| Ast::new(Program::new("Error reading type inferenced theorem.".to_string())))
-                .to_json_string()
-                .unwrap_or_else(|_| "Error converting ast to string.".to_string()),
-        );
+        let initial_ast: String = hash_file(Path::new("/tmp/output/initial_ast.json"));
+        let canonicalized_ast: String = hash_file(Path::new("/tmp/output/canonicalization_ast.json"));
+        let type_inferenced_ast = hash_file(Path::new("/tmp/output/type_inferenced_ast.json"));
 
-        if std::fs::read_dir("/tmp/output").is_ok() {
+        /* if std::fs::read_dir("/tmp/output").is_ok() {
             std::fs::remove_dir_all(std::path::Path::new("/tmp/output")).expect("Error failed to clean up output dir.");
-        }
+        } */
 
         let final_output = CompileOutput {
             circuit: last_circuit.unwrap(),
diff --git a/parser/src/errors/deprecated.rs b/parser/src/errors/deprecated.rs
deleted file mode 100644
index d41857b161..0000000000
--- a/parser/src/errors/deprecated.rs
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright (C) 2019-2021 Aleo Systems Inc.
-// This file is part of the Leo library.
-
-// The Leo library is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// The Leo library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with the Leo library. If not, see <https://www.gnu.org/licenses/>.
-
-use leo_ast::{FormattedError, LeoError, Span};
-
-#[derive(Debug, Error)]
-pub enum DeprecatedError {
-    #[error("{}", _0)]
-    Error(#[from] FormattedError),
-}
-
-impl DeprecatedError {
-    fn new_from_span(message: String, span: &Span) -> Self {
-        DeprecatedError::Error(FormattedError::new_from_span(message, span))
-    }
-}
-
-impl LeoError for DeprecatedError {}
-
-impl DeprecatedError {
-    pub fn mut_function_input(mut span: Span) -> Self {
-        let message =
-            "function func(mut a: u32) { ... } is deprecated. Passed variables are mutable by default.".to_string();
-        span.col_start -= 1;
-        span.col_stop -= 1;
-        Self::new_from_span(message, &span)
-    }
-
-    pub fn let_mut_statement(mut span: Span) -> Self {
-        let message = "let mut = ... is deprecated. `let` keyword implies mutabality by default.".to_string();
-        span.col_start -= 1;
-        span.col_stop -= 1;
-        Self::new_from_span(message, &span)
-    }
-
-    pub fn test_function(span: &Span) -> Self {
-        let message = "\"test function...\" is deprecated. Did you mean @test annotation?".to_string();
-        Self::new_from_span(message, span)
-    }
-
-    pub fn context_annotation(span: &Span) -> Self {
-        let message = "\"@context(...)\" is deprecated. Did you mean @test annotation?".to_string();
-        Self::new_from_span(message, span)
-    }
-}
diff --git a/parser/src/errors/mod.rs b/parser/src/errors/mod.rs
deleted file mode 100644
index ff53f73aae..0000000000
--- a/parser/src/errors/mod.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (C) 2019-2021 Aleo Systems Inc.
-// This file is part of the Leo library.
-
-// The Leo library is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// The Leo library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with the Leo library. If not, see <https://www.gnu.org/licenses/>.
diff --git a/parser/src/errors/syntax.rs b/parser/src/errors/syntax.rs
deleted file mode 100644
index 306719b5a4..0000000000
--- a/parser/src/errors/syntax.rs
+++ /dev/null
@@ -1,129 +0,0 @@
-// Copyright (C) 2019-2021 Aleo Systems Inc.
-// This file is part of the Leo library.
-
-// The Leo library is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// The Leo library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with the Leo library. If not, see <https://www.gnu.org/licenses/>.
-
-use leo_ast::{FormattedError, LeoError, Span};
-
-use crate::{DeprecatedError, SyntaxResult, Token, TokenError};
-
-#[derive(Debug, Error)]
-pub enum SyntaxError {
-    #[error("{}", _0)]
-    Error(#[from] FormattedError),
-
-    #[error("{}", _0)]
-    TokenError(#[from] TokenError),
-
-    #[error("{}", _0)]
-    DeprecatedError(#[from] DeprecatedError),
-}
-
-impl LeoError for SyntaxError {}
-
-pub fn assert_no_whitespace(left_span: &Span, right_span: &Span, left: &str, right: &str) -> SyntaxResult<()> {
-    if left_span.col_stop != right_span.col_start {
-        let mut error_span = left_span + right_span;
-        error_span.col_start = left_span.col_stop - 1;
-        error_span.col_stop = right_span.col_start - 1;
-        return Err(SyntaxError::unexpected_whitespace(left, right, &error_span));
-    }
-
-    Ok(())
-}
-
-impl SyntaxError {
-    fn new_from_span(message: String, span: &Span) -> Self {
-        SyntaxError::Error(FormattedError::new_from_span(message, span))
-    }
-
-    pub fn invalid_import_list(span: &Span) -> Self {
-        Self::new_from_span("Cannot import empty list".to_string(), span)
-    }
-
-    pub fn unexpected_eof(span: &Span) -> Self {
-        Self::new_from_span("unexpected EOF".to_string(), span)
-    }
-
-    pub fn unexpected_whitespace(left: &str, right: &str, span: &Span) -> Self {
-        Self::new_from_span(
-            format!("Unexpected white space between terms {} and {}", left, right),
-            span,
-        )
-    }
-
-    pub fn unexpected(got: &Token, expected: &[Token], span: &Span) -> Self {
-        Self::new_from_span(
-            format!(
-                "expected {} -- got '{}'",
-                expected
-                    .iter()
-                    .map(|x| format!("'{}'", x))
-                    .collect::<Vec<_>>()
-                    .join(", "),
-                got.to_string()
-            ),
-            span,
-        )
-    }
-
-    pub fn mixed_commas_and_semicolons(span: &Span) -> Self {
-        Self::new_from_span(
-            "Cannot mix use of commas and semi-colons for circuit member variable declarations.".to_string(),
-            span,
-        )
-    }
-
-    pub fn unexpected_ident(got: &str, expected: &[&str], span: &Span) -> Self {
-        Self::new_from_span(
-            format!(
-                "expected identifier {} -- got '{}'",
-                expected
-                    .iter()
-                    .map(|x| format!("'{}'", x))
-                    .collect::<Vec<_>>()
-                    .join(", "),
-                got
-            ),
-            span,
-        )
-    }
-
-    pub fn unexpected_statement(got: String, expected: &str, span: &Span) -> Self {
-        Self::new_from_span(format!("expected '{}', got '{}'", expected, got), span)
-    }
-
-    pub fn unexpected_str(got: &Token, expected: &str, span: &Span) -> Self {
-        Self::new_from_span(format!("expected '{}', got '{}'", expected, got.to_string()), span)
-    }
-
-    pub fn spread_in_array_init(span: &Span) -> Self {
-        Self::new_from_span("illegal spread in array initializer".to_string(), span)
-    }
-
-    pub fn invalid_assignment_target(span: &Span) -> Self {
-        Self::new_from_span("invalid assignment target".to_string(), span)
-    }
-
-    pub fn invalid_package_name(span: &Span) -> Self {
-        Self::new_from_span(
-            "package names must be lowercase alphanumeric ascii with underscores and singular dashes".to_string(),
-            span,
-        )
-    }
-
-    pub fn illegal_self_const(span: &Span) -> Self {
-        Self::new_from_span("cannot have const self".to_string(), span)
-    }
-}
diff --git a/parser/src/errors/token.rs b/parser/src/errors/token.rs
deleted file mode 100644
index ec07fbe4ba..0000000000
--- a/parser/src/errors/token.rs
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright (C) 2019-2021 Aleo Systems Inc.
-// This file is part of the Leo library.
-
-// The Leo library is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-o// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// The Leo library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with the Leo library. If not, see <https://www.gnu.org/licenses/>.
-
-use leo_ast::{FormattedError, LeoError, Span};
-
-#[derive(Debug, Error)]
-pub enum TokenError {
-    #[error("{}", _0)]
-    Error(#[from] FormattedError),
-}
-
-impl LeoError for TokenError {}
-
-impl TokenError {
-    fn new_from_span(message: String, span: &Span) -> Self {
-        TokenError::Error(FormattedError::new_from_span(message, span))
-    }
-
-    pub fn unexpected_token(token: &str, span: &Span) -> Self {
-        TokenError::new_from_span(format!("unexpected token: '{}'", token), span)
-    }
-
-    pub fn invalid_address_lit(token: &str, span: &Span) -> Self {
-        TokenError::new_from_span(format!("invalid address literal: '{}'", token), span)
-    }
-}
diff --git a/test-framework/src/bin/tgc.rs b/test-framework/src/bin/tgc.rs
index fc62bcb413..6b67642ee2 100644
--- a/test-framework/src/bin/tgc.rs
+++ b/test-framework/src/bin/tgc.rs
@@ -107,7 +107,7 @@ fn run_with_args(opt: Opt) -> Result<(), Box<dyn Error>> {
                     cwd.pop();
                     cwd.join(&val.as_str().unwrap())
                 })
-                .unwrap_or(PathBuf::from(path));
+                .unwrap_or_else(|| PathBuf::from(path));
 
             // Write all files into the directory.
             let (initial, canonicalized, type_inferenced) = generate_asts(cwd, text)?;
@@ -129,7 +129,9 @@ fn run_with_args(opt: Opt) -> Result<(), Box<dyn Error>> {
 }
 
 /// Do what Compiler does - prepare 3 stages of AST: initial, canonicalized and type_inferenced
-fn generate_asts(path: PathBuf, text: &String) -> Result<(String, String, String), Box<dyn Error>> {
+fn generate_asts(path: PathBuf, text: &str) -> Result<(String, String, String), Box<dyn Error>> {
+    std::env::set_var("LEO_TESTFRAMEWORK", "true");
+
     let mut ast = leo_parser::parse_ast(path.clone().into_os_string().into_string().unwrap(), text)?;
     let initial = ast.to_json_string()?;
 
@@ -147,6 +149,8 @@ fn generate_asts(path: PathBuf, text: &String) -> Result<(String, String, String
         .expect("Failed to produce type inference ast.")
         .to_json_string()?;
 
+    std::env::remove_var("LEO_TESTFRAMEWORK");
+
     Ok((initial, canonicalized, type_inferenced))
 }
 
diff --git a/test-framework/src/runner.rs b/test-framework/src/runner.rs
index 6e9a6ccd77..297b8e9201 100644
--- a/test-framework/src/runner.rs
+++ b/test-framework/src/runner.rs
@@ -123,15 +123,12 @@ pub fn run_tests<T: Runner>(runner: &T, expectation_category: &str) {
             None
         };
 
-        let end_of_header = content.find("*/").expect("failed to find header block in test");
-        let content = &content[end_of_header + 2..];
-
         let tests = match namespace.parse_type() {
-            ParseType::Line => crate::fetch::split_tests_oneline(content)
+            ParseType::Line => crate::fetch::split_tests_oneline(&content)
                 .into_iter()
                 .map(|x| x.to_string())
                 .collect(),
-            ParseType::ContinuousLines => crate::fetch::split_tests_twoline(content),
+            ParseType::ContinuousLines => crate::fetch::split_tests_twoline(&content),
             ParseType::Whole => vec![content.to_string()],
         };
 
diff --git a/tests/expectations/compiler/compiler/address/branch.leo.out b/tests/expectations/compiler/compiler/address/branch.leo.out
index 3d0a5f4dce..a697c89e10 100644
--- a/tests/expectations/compiler/compiler/address/branch.leo.out
+++ b/tests/expectations/compiler/compiler/address/branch.leo.out
@@ -16,6 +16,6 @@ outputs:
             a:
               type: bool
               value: "true"
-    initial_ast: 0788eb39577304b655f147fe3045e1fad995b31811444afadc228bf99f505994
-    canonicalized_ast: 0788eb39577304b655f147fe3045e1fad995b31811444afadc228bf99f505994
-    type_inferenced_ast: 57aa71789a8ba7ac075f734ecc0450ae4b56b2343cff19e345cdab9c7715e1ee
+    initial_ast: b94a0eb19cdcf4606fd76a5d7e66d1329ec1ed3639c00e619af8a9e9b9879878
+    canonicalized_ast: b94a0eb19cdcf4606fd76a5d7e66d1329ec1ed3639c00e619af8a9e9b9879878
+    type_inferenced_ast: e9e24193aa212153fb45b3ea6c6f20743235e9071ff14071bc1278f457f7c465
diff --git a/tests/expectations/compiler/compiler/address/equal.leo.out b/tests/expectations/compiler/compiler/address/equal.leo.out
index 491c8bb576..9b2e80fc82 100644
--- a/tests/expectations/compiler/compiler/address/equal.leo.out
+++ b/tests/expectations/compiler/compiler/address/equal.leo.out
@@ -22,6 +22,6 @@ outputs:
             a:
               type: bool
               value: "false"
-    initial_ast: e057591dddc93027645e671870d9bb932a32647a600a452657e0a8a3748f0921
-    canonicalized_ast: e057591dddc93027645e671870d9bb932a32647a600a452657e0a8a3748f0921
-    type_inferenced_ast: 1d32fc5c118dc328274a6e2c4048c0efeea2b128fa2d2733ddf7d4fde4daf46f
+    initial_ast: ad17fba2b75a570467bd36de678d39b312aa0e99de288330ce3b69193e21786a
+    canonicalized_ast: ad17fba2b75a570467bd36de678d39b312aa0e99de288330ce3b69193e21786a
+    type_inferenced_ast: 354044b121427055b5fe24ecce425c6e1e3f5b234fd1e4c585018438b09358d7
diff --git a/tests/expectations/compiler/compiler/address/index.leo.out b/tests/expectations/compiler/compiler/address/index.leo.out
index 59194f6bf4..ce011fc8bb 100644
--- a/tests/expectations/compiler/compiler/address/index.leo.out
+++ b/tests/expectations/compiler/compiler/address/index.leo.out
@@ -16,6 +16,6 @@ outputs:
             a:
               type: bool
               value: "true"
-    initial_ast: 76cba1a1eb179db8b21c2e05403861e133983feec9b987c764a5584da78c16fb
-    canonicalized_ast: 76cba1a1eb179db8b21c2e05403861e133983feec9b987c764a5584da78c16fb
-    type_inferenced_ast: 822de2e0c4fdf74f7b476666b6a8a38782bd828dc2d216a7a68bf70edc444fbf
+    initial_ast: faaab01ea5a01d60ebe5f21468125b71430cb3b5d4732ea258ba762e2256d223
+    canonicalized_ast: faaab01ea5a01d60ebe5f21468125b71430cb3b5d4732ea258ba762e2256d223
+    type_inferenced_ast: adaf76557d43d25d1ee0a3a0270e2d58038372d6d946a52b811394e913150eee
diff --git a/tests/expectations/compiler/compiler/address/ternary.leo.out b/tests/expectations/compiler/compiler/address/ternary.leo.out
index fb25d02dd7..d1af9e0347 100644
--- a/tests/expectations/compiler/compiler/address/ternary.leo.out
+++ b/tests/expectations/compiler/compiler/address/ternary.leo.out
@@ -22,6 +22,6 @@ outputs:
             a:
               type: bool
               value: "false"
-    initial_ast: 8a34bf070edd7585daad47802214b7df49b6df6dd9a6344644a4f121b320e449
-    canonicalized_ast: 8a34bf070edd7585daad47802214b7df49b6df6dd9a6344644a4f121b320e449
-    type_inferenced_ast: 2254abca31e4326444ef2066c8f85b3280505a3ecbaffaf7e472276a3034cc2f
+    initial_ast: 854c8706b316c50672c61fe2f5949e6cb67b330289501cd8eee6782e2c33838a
+    canonicalized_ast: 854c8706b316c50672c61fe2f5949e6cb67b330289501cd8eee6782e2c33838a
+    type_inferenced_ast: 8ff2bfdc3ba353fe5d32c10252dd00ed932b874499e4265f233a3e0c7fd7e357
diff --git a/tests/expectations/compiler/compiler/array/array_range_access_fail.leo.out b/tests/expectations/compiler/compiler/array/array_range_access_fail.leo.out
index e28da3683a..4b33f72976 100644
--- a/tests/expectations/compiler/compiler/array/array_range_access_fail.leo.out
+++ b/tests/expectations/compiler/compiler/array/array_range_access_fail.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EASG0373020]: array index out of bounds: '0'\n    --> compiler-test:7:24\n     |\n   7 |     const z: [u8; 2] = y[..1u32][..x];\n     |                        ^^^^^^^^^^^^^^"
+  - "Error [EASG0373020]: array index out of bounds: '0'\n    --> compiler-test:11:24\n     |\n  11 |     const z: [u8; 2] = y[..1u32][..x];\n     |                        ^^^^^^^^^^^^^^"
diff --git a/tests/expectations/compiler/compiler/array/array_size_zero_fail.leo.out b/tests/expectations/compiler/compiler/array/array_size_zero_fail.leo.out
index 018bc69003..befaf7fc27 100644
--- a/tests/expectations/compiler/compiler/array/array_size_zero_fail.leo.out
+++ b/tests/expectations/compiler/compiler/array/array_size_zero_fail.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EAST0372006]: received dimension size of 0, expected it to be 1 or larger.\n    --> compiler-test:4:13\n     |\n   4 |     let a = [true; (0)];\n     |             ^^^^^^^^^^^"
+  - "Error [EAST0372006]: received dimension size of 0, expected it to be 1 or larger.\n    --> compiler-test:8:13\n     |\n   8 |     let a = [true; (0)];\n     |             ^^^^^^^^^^^"
diff --git a/tests/expectations/compiler/compiler/array/complex_access.leo.out b/tests/expectations/compiler/compiler/array/complex_access.leo.out
index 4cd59df22f..c48c810fe6 100644
--- a/tests/expectations/compiler/compiler/array/complex_access.leo.out
+++ b/tests/expectations/compiler/compiler/array/complex_access.leo.out
@@ -16,6 +16,6 @@ outputs:
             out:
               type: bool
               value: "true"
-    initial_ast: 9a4630fa0959a626a26800f00d05a203e35f4389a9d17a6dc491eb725ef3a529
-    canonicalized_ast: 6c7df16234b6b4d8aaa6ca1d761bcffb5b05893cc515b6f4d72118bc8e495b7e
-    type_inferenced_ast: 4aa60801f15fb817e16eb9f9bd4d6bed555c9130d88edebb3ba78302879703a1
+    initial_ast: 7d259bad0175e047425c0a4fcbec3254b4673c45f3acd7498891531b65c2b237
+    canonicalized_ast: 12fa89aa3775eeb399492df41472507c0488681d5e79a580040d34b24a83c55d
+    type_inferenced_ast: addefe59b9b8e8d82c507389538636be4771c83a8834c249f003b33c3ba938cc
diff --git a/tests/expectations/compiler/compiler/array/equal_initializer.leo.out b/tests/expectations/compiler/compiler/array/equal_initializer.leo.out
index f593750149..61a6582c00 100644
--- a/tests/expectations/compiler/compiler/array/equal_initializer.leo.out
+++ b/tests/expectations/compiler/compiler/array/equal_initializer.leo.out
@@ -22,6 +22,6 @@ outputs:
             x:
               type: bool
               value: "false"
-    initial_ast: c4b7aca1f9002da95f8efab340d4dc5d38e64d97274b1815126e7f88f40e155a
-    canonicalized_ast: c8b633546058b56b76a0864ab0fce2aa7169554b716e17250ebc688708dcd206
-    type_inferenced_ast: 9411e52e1ab1ddec7d5d1111aa8c10a5ec916b9d5e86d24ed5348462ec0adb71
+    initial_ast: a00e1308d2a6ae6f8b5c3cde6e2c54c86b1b9daad6961df79d66e8b23fd6a4af
+    canonicalized_ast: e4172132eaaf7c2c3d7e3cc7bf5444b1c8a8cf665d1353862891d33e0514a7f9
+    type_inferenced_ast: 942f6c3baf30fed978b792e80c208e6ca5939b6f331938540f3c54c830f421f0
diff --git a/tests/expectations/compiler/compiler/array/equal_initializer_2.leo.out b/tests/expectations/compiler/compiler/array/equal_initializer_2.leo.out
index 2068f31405..6584922b56 100644
--- a/tests/expectations/compiler/compiler/array/equal_initializer_2.leo.out
+++ b/tests/expectations/compiler/compiler/array/equal_initializer_2.leo.out
@@ -22,6 +22,6 @@ outputs:
             x:
               type: bool
               value: "true"
-    initial_ast: 2cbe00dbca8111c92a55dcb9a18766ddb9a407e71535ae62d3bf4d6ec409fca2
-    canonicalized_ast: 75d8d33b9a5376fea14bb9821abe1bc5e1661cfccbf962f58facb42e539b1b04
-    type_inferenced_ast: 45b1b5d994a229da8fb761d97c474778a65b8a5fdd87cfbd6e4aaa4a1ddef7a0
+    initial_ast: f357a93faf7e20acfa71f209da0a9ce4ff445f0b3deb1a8f032f9571502929a3
+    canonicalized_ast: 1d7d52142f512bb09e83a9692e754d0501a59374393a2ea387338cd49bd794d6
+    type_inferenced_ast: 6cafae2971f44ab56e6d676f4849c1bb2f070a5b786b6cd037698d9da932e860
diff --git a/tests/expectations/compiler/compiler/array/input_nested_3x2.leo.out b/tests/expectations/compiler/compiler/array/input_nested_3x2.leo.out
index bc64293f28..1b75ed6c25 100644
--- a/tests/expectations/compiler/compiler/array/input_nested_3x2.leo.out
+++ b/tests/expectations/compiler/compiler/array/input_nested_3x2.leo.out
@@ -16,6 +16,6 @@ outputs:
             x:
               type: bool
               value: "true"
-    initial_ast: 002647d1f55a3b5f358cbd27beff81736973fc142dc3d708f8df8d634c1e8fa4
-    canonicalized_ast: b36a5f62c09093fcfce2797b89fe936c4bb94fe1e4aca6608cda4f529677b005
-    type_inferenced_ast: 524e0682eec030dda6f12637fb92af0122a7cf3986a8d7c974a2bc8a1554552d
+    initial_ast: 649081117b5752b42843cc551ffc9343283260e444db76c886dcfe02fa6b9322
+    canonicalized_ast: a1062e68a4f268d7cb83997d0af4bf1cefcb2b8b5f751d549a61d768736fc3ce
+    type_inferenced_ast: 7ad14ee71824314d1519d9f1be0813a27625021ab9c39ec679cec22dfdc0bdeb
diff --git a/tests/expectations/compiler/compiler/array/input_nested_3x2_fail.leo.out b/tests/expectations/compiler/compiler/array/input_nested_3x2_fail.leo.out
index 498d522f18..56efd3f10b 100644
--- a/tests/expectations/compiler/compiler/array/input_nested_3x2_fail.leo.out
+++ b/tests/expectations/compiler/compiler/array/input_nested_3x2_fail.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EPAR0370005]: expected ] -- got ')'\n    --> compiler-test:4:29\n     |\n   4 |     return a == [[0u8; 2]; 3)]; // This should be written the right way as this test is for the input file.\n     |                             ^"
+  - "Error [EPAR0370005]: expected ] -- got ')'\n    --> compiler-test:8:29\n     |\n   8 |     return a == [[0u8; 2]; 3)]; // This should be written the right way as this test is for the input file.\n     |                             ^"
diff --git a/tests/expectations/compiler/compiler/array/input_tuple_3x2.leo.out b/tests/expectations/compiler/compiler/array/input_tuple_3x2.leo.out
index 16b86824b3..36d318fcd7 100644
--- a/tests/expectations/compiler/compiler/array/input_tuple_3x2.leo.out
+++ b/tests/expectations/compiler/compiler/array/input_tuple_3x2.leo.out
@@ -16,6 +16,6 @@ outputs:
             x:
               type: bool
               value: "true"
-    initial_ast: c4b7aca1f9002da95f8efab340d4dc5d38e64d97274b1815126e7f88f40e155a
-    canonicalized_ast: c8b633546058b56b76a0864ab0fce2aa7169554b716e17250ebc688708dcd206
-    type_inferenced_ast: 9411e52e1ab1ddec7d5d1111aa8c10a5ec916b9d5e86d24ed5348462ec0adb71
+    initial_ast: 85129e4920b16da398acbdd1425015a3d9ae95729fd883567015035f9870944b
+    canonicalized_ast: bfcb3cf664334650a2210e2223965a762287ef4bc04c11e828429d6e30dfa7db
+    type_inferenced_ast: a9dfe86a3062d172bd4a0567d9bdbf003d0b0c1acf348df647480bffaf8f354f
diff --git a/tests/expectations/compiler/compiler/array/multi_fail_initializer.leo.out b/tests/expectations/compiler/compiler/array/multi_fail_initializer.leo.out
index c6849d72e8..7dc2eef4f4 100644
--- a/tests/expectations/compiler/compiler/array/multi_fail_initializer.leo.out
+++ b/tests/expectations/compiler/compiler/array/multi_fail_initializer.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EASG0373026]: unexpected type, expected: 'array of length 2', received: 'array of length 1'\n    --> compiler-test:4:31\n     |\n   4 |     const arr: [u8; (2, 2)] = [[1u8; 2]; 1]; // incorrect dimensions\n     |                               ^^^^^^^^^^^^^"
+  - "Error [EASG0373026]: unexpected type, expected: 'array of length 2', received: 'array of length 1'\n    --> compiler-test:8:31\n     |\n   8 |     const arr: [u8; (2, 2)] = [[1u8; 2]; 1]; // incorrect dimensions\n     |                               ^^^^^^^^^^^^^"
diff --git a/tests/expectations/compiler/compiler/array/multi_fail_inline.leo.out b/tests/expectations/compiler/compiler/array/multi_fail_inline.leo.out
index 08e07e5508..069ca5f1d9 100644
--- a/tests/expectations/compiler/compiler/array/multi_fail_inline.leo.out
+++ b/tests/expectations/compiler/compiler/array/multi_fail_inline.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EASG0373026]: unexpected type, expected: 'array of length 2', received: 'array of length 1'\n    --> compiler-test:5:35\n     |\n   5 |                                   [1u8]];   // incorrect dimensions\n     |                                   ^^^^^"
+  - "Error [EASG0373026]: unexpected type, expected: 'array of length 2', received: 'array of length 1'\n    --> compiler-test:9:35\n     |\n   9 |                                   [1u8]];   // incorrect dimensions\n     |                                   ^^^^^"
diff --git a/tests/expectations/compiler/compiler/array/multi_initializer.leo.out b/tests/expectations/compiler/compiler/array/multi_initializer.leo.out
index b8fe56c3cb..d43a41903f 100644
--- a/tests/expectations/compiler/compiler/array/multi_initializer.leo.out
+++ b/tests/expectations/compiler/compiler/array/multi_initializer.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 411fd383234eaff206ddb89e59c53eb3cf89cc0584065cbcc6a407f7b6c657da
-    canonicalized_ast: 8730ae623fae334d698ea4169b630365f3026e6b39264da353e194feb07c0863
-    type_inferenced_ast: 48ede78fbd4de76d6693bc2a50b813f119024f80d0a6c73f174f1a7ba56a92ce
+    initial_ast: eca1758f42351dfedfe1995abc3551d84d88e65bd10e1e7020673f5ef69e51d9
+    canonicalized_ast: 1849c1993d00a61bb1b4c277a828095bcf219ac28c862682523047de568d51e3
+    type_inferenced_ast: 2c637fb635b741c913de7f529401d959b295d56feba4d3d5da9994bc9c3a3c9a
diff --git a/tests/expectations/compiler/compiler/array/multi_initializer_fail.leo.out b/tests/expectations/compiler/compiler/array/multi_initializer_fail.leo.out
index 75c810dc3b..7e5a320bf4 100644
--- a/tests/expectations/compiler/compiler/array/multi_initializer_fail.leo.out
+++ b/tests/expectations/compiler/compiler/array/multi_initializer_fail.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EASG0373026]: unexpected type, expected: 'array of length 2', received: 'array of length 1'\n    --> compiler-test:4:31\n     |\n   4 |     const arr: [u8; (2, 2)] = [1u8; (2, 1)]; // incorrect dimensions\n     |                               ^^^^^^^^^^^^^"
+  - "Error [EASG0373026]: unexpected type, expected: 'array of length 2', received: 'array of length 1'\n    --> compiler-test:8:31\n     |\n   8 |     const arr: [u8; (2, 2)] = [1u8; (2, 1)]; // incorrect dimensions\n     |                               ^^^^^^^^^^^^^"
diff --git a/tests/expectations/compiler/compiler/array/nested.leo.out b/tests/expectations/compiler/compiler/array/nested.leo.out
index a372f6cfae..822fd30681 100644
--- a/tests/expectations/compiler/compiler/array/nested.leo.out
+++ b/tests/expectations/compiler/compiler/array/nested.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 436ce80cb3f81cd43e5747a105b14947964f29c0c35070c394728cd2cd9b1fa3
-    canonicalized_ast: 3097d80c877f857bd36f1e3ca56aefd7524a2fc46239959190ae9c5ef166ba9a
-    type_inferenced_ast: 873a71a8f9894e1967f0f750d63011597f17e0a51b5cd42ea0b74191ffa357a1
+    initial_ast: 1291922b32056201b137e1d0152c827c0a92e526a9bf0ca89df25b963ad47403
+    canonicalized_ast: 37c7078195718d1883d4e0aaec7005e53d05620afd7682a7500c45c0f9bd8cf1
+    type_inferenced_ast: 1cc4ba488717dadf27c187b095bc956459057b9ee7566ae26622eca0dff98b1f
diff --git a/tests/expectations/compiler/compiler/array/nested_3x2_value.leo.out b/tests/expectations/compiler/compiler/array/nested_3x2_value.leo.out
index 5f11aa99e8..b417d12dc5 100644
--- a/tests/expectations/compiler/compiler/array/nested_3x2_value.leo.out
+++ b/tests/expectations/compiler/compiler/array/nested_3x2_value.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 33a39a0f27f018eee2f2986d1356bcc9354ce3128447a60859f4392b8a4e4f29
-    canonicalized_ast: c227ab0a4e864f62af90e4b1d843dcd41e65b65354107558cf26383831010a1d
-    type_inferenced_ast: c2515f900d7b2ae04c80ed1f7a3bf5729fec502dffc910cae03ac8cf02530dce
+    initial_ast: 650a327b399596259bd48cbb4a1ca8ea49ddcd1665d76d67d65f24170363a8a5
+    canonicalized_ast: ae92e1195ad8136858b70b17e01df90f5bd62a1b773e0eb52c630bbddcc1b65b
+    type_inferenced_ast: 2c187405389a7326b6bd85556510a674eff80c34d9a67cd01edd13543890635f
diff --git a/tests/expectations/compiler/compiler/array/nested_3x2_value_fail.leo.out b/tests/expectations/compiler/compiler/array/nested_3x2_value_fail.leo.out
index ac7a7d9c6f..fe44fa3df3 100644
--- a/tests/expectations/compiler/compiler/array/nested_3x2_value_fail.leo.out
+++ b/tests/expectations/compiler/compiler/array/nested_3x2_value_fail.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EASG0373026]: unexpected type, expected: 'array of length 3', received: 'array of length 2'\n    --> compiler-test:6:30\n     |\n   6 |     const a: [u32; (3, 2)] = [[0; 3]; 2]; // initializer (incorrectly reversed ordering)\n     |                              ^^^^^^^^^^^"
+  - "Error [EASG0373026]: unexpected type, expected: 'array of length 3', received: 'array of length 2'\n    --> compiler-test:10:30\n     |\n  10 |     const a: [u32; (3, 2)] = [[0; 3]; 2]; // initializer (incorrectly reversed ordering)\n     |                              ^^^^^^^^^^^"
diff --git a/tests/expectations/compiler/compiler/array/registers.leo.out b/tests/expectations/compiler/compiler/array/registers.leo.out
index 6d859f9cb0..1dd44ddcc8 100644
--- a/tests/expectations/compiler/compiler/array/registers.leo.out
+++ b/tests/expectations/compiler/compiler/array/registers.leo.out
@@ -22,6 +22,6 @@ outputs:
             r:
               type: "[u8; 3]"
               value: "\"123\""
-    initial_ast: 1c07965336635dce8cd66c67eddf25a51f61a3b90513f87ef123c642a9b5b18a
-    canonicalized_ast: 1c07965336635dce8cd66c67eddf25a51f61a3b90513f87ef123c642a9b5b18a
-    type_inferenced_ast: cf35fa9ca18f19ac75ca522a77e310b02ff56ac1d748cd5df5c2204bba4a4802
+    initial_ast: eeeba820649099d1985752f7153fede6ecadbc58d52481a1330e0ebb3f0453ca
+    canonicalized_ast: eeeba820649099d1985752f7153fede6ecadbc58d52481a1330e0ebb3f0453ca
+    type_inferenced_ast: 10edff2c28a6a963d49dc1f0c18dcc1f18c1d947937463fcc371e95ca6bb809f
diff --git a/tests/expectations/compiler/compiler/array/slice.leo.out b/tests/expectations/compiler/compiler/array/slice.leo.out
index 4eb93da246..c826e9a78b 100644
--- a/tests/expectations/compiler/compiler/array/slice.leo.out
+++ b/tests/expectations/compiler/compiler/array/slice.leo.out
@@ -16,6 +16,6 @@ outputs:
             x:
               type: bool
               value: "true"
-    initial_ast: e75ae154dab0f64ed38fc12e28289351e79787787e882847fbc020a780bc429f
-    canonicalized_ast: e75ae154dab0f64ed38fc12e28289351e79787787e882847fbc020a780bc429f
-    type_inferenced_ast: c5a14533d3c5d0751b98beb612a88eac2c7687ae77858dfcbc3424b160f1cd7d
+    initial_ast: aad43f9950c4406b866b625d01583f681aaf8512281816a44b62f97e78cac7bd
+    canonicalized_ast: aad43f9950c4406b866b625d01583f681aaf8512281816a44b62f97e78cac7bd
+    type_inferenced_ast: 7284c4adb18812b5d1348a5371ba854b0a9306e4b7d45d8a7a53af8e8844bf6f
diff --git a/tests/expectations/compiler/compiler/array/slice_lower.leo.out b/tests/expectations/compiler/compiler/array/slice_lower.leo.out
index a93da800f0..0fc84a986e 100644
--- a/tests/expectations/compiler/compiler/array/slice_lower.leo.out
+++ b/tests/expectations/compiler/compiler/array/slice_lower.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 748ad013543f1352f922fc5b566b38bf6a9de939a566c4484660f17460ef5cee
-    canonicalized_ast: 748ad013543f1352f922fc5b566b38bf6a9de939a566c4484660f17460ef5cee
-    type_inferenced_ast: 80f8d5b301bc982f189c63a4d908c7bf7a9a2d5ea351778d740035bad95f166a
+    initial_ast: a6f591e216938a43e40db4130543a12cb131787f654057d085f58171ae4006e2
+    canonicalized_ast: a6f591e216938a43e40db4130543a12cb131787f654057d085f58171ae4006e2
+    type_inferenced_ast: 61c6ebde5af2f91d3df398ba25a9b6e2b9cedc806c98f82ecef7921b768b330d
diff --git a/tests/expectations/compiler/compiler/array/spread.leo.out b/tests/expectations/compiler/compiler/array/spread.leo.out
index 09685b4e01..2ae176f092 100644
--- a/tests/expectations/compiler/compiler/array/spread.leo.out
+++ b/tests/expectations/compiler/compiler/array/spread.leo.out
@@ -16,6 +16,6 @@ outputs:
             x:
               type: bool
               value: "true"
-    initial_ast: 97004d55104bcf3b6698926656fb23c849cc1c488e387d151c1f3e2be4438fe0
-    canonicalized_ast: 97004d55104bcf3b6698926656fb23c849cc1c488e387d151c1f3e2be4438fe0
-    type_inferenced_ast: 7294dc3dee9189573cbf54b90692869b2a02a78fb3bbb6fe3e2436d2cca377fc
+    initial_ast: 8aff34e4f3d00dd8ecc54aa2a7971175cda5e26a1a913f77414dec7ed93c76fc
+    canonicalized_ast: 8aff34e4f3d00dd8ecc54aa2a7971175cda5e26a1a913f77414dec7ed93c76fc
+    type_inferenced_ast: 425cabf7a2a4669be929ce7325824910a315a118e8627fa5191bbcee05e956b2
diff --git a/tests/expectations/compiler/compiler/array/ternary_in_array.leo.out b/tests/expectations/compiler/compiler/array/ternary_in_array.leo.out
index 360c7d70c1..4eec112b8e 100644
--- a/tests/expectations/compiler/compiler/array/ternary_in_array.leo.out
+++ b/tests/expectations/compiler/compiler/array/ternary_in_array.leo.out
@@ -16,6 +16,6 @@ outputs:
             x:
               type: bool
               value: "true"
-    initial_ast: aa978e3283733cfee6cef1e6eff20b4847cf56962ccb3501b6501d31cd42ddb5
-    canonicalized_ast: aa978e3283733cfee6cef1e6eff20b4847cf56962ccb3501b6501d31cd42ddb5
-    type_inferenced_ast: edcba3eea639506ff172054105ac6533c6d184c131240e73f896f307983ba3c2
+    initial_ast: fdd1c43d2dc2f5c97057cd8bd13098d566a2ac4b63661fdb107af830cc8929ad
+    canonicalized_ast: fdd1c43d2dc2f5c97057cd8bd13098d566a2ac4b63661fdb107af830cc8929ad
+    type_inferenced_ast: c95481649332d64c2e08a6e82ae6111a5e74ff925995dd3007fa8b9e238e43c7
diff --git a/tests/expectations/compiler/compiler/array/tuple_3x2_value.leo.out b/tests/expectations/compiler/compiler/array/tuple_3x2_value.leo.out
index e31f9bed5d..23e457177d 100644
--- a/tests/expectations/compiler/compiler/array/tuple_3x2_value.leo.out
+++ b/tests/expectations/compiler/compiler/array/tuple_3x2_value.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: f92dd478e6c8fdb9a7f0dfd3ad0cf9e6e0239c59e5ee1fda0851fdcdfb2ca589
-    canonicalized_ast: 0ce7eb5522cc65d45b259560b138eca8750b7a4231435f6b5df21c906db4d5ba
-    type_inferenced_ast: 1aeacac3268aed9b99f7d5a7736e9f32cd1a65905d3234d11ec5f6027bd68c66
+    initial_ast: b5ed4361628768e5d29f309a2e363846ab8e9e1237b5522776cd4c1ec68c601b
+    canonicalized_ast: 1e8e83fa6a4e13fbb155df09806a6bc503f9321510a0d935608ef28043585ca0
+    type_inferenced_ast: e83ec826f93f45ca04a1bd2c5dd8b3bff60c6df241afa672568b9eff27d365bc
diff --git a/tests/expectations/compiler/compiler/array/tuple_3x2_value_fail.leo.out b/tests/expectations/compiler/compiler/array/tuple_3x2_value_fail.leo.out
index 1812da5de7..731fa064f4 100644
--- a/tests/expectations/compiler/compiler/array/tuple_3x2_value_fail.leo.out
+++ b/tests/expectations/compiler/compiler/array/tuple_3x2_value_fail.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EASG0373026]: unexpected type, expected: 'array of length 3', received: 'array of length 2'\n    --> compiler-test:5:30\n     |\n   5 |     const a: [u32; (3, 2)] = [0; (2, 3)]; // initializer (incorrectly reversed ordering)\n     |                              ^^^^^^^^^^^"
+  - "Error [EASG0373026]: unexpected type, expected: 'array of length 3', received: 'array of length 2'\n    --> compiler-test:8:30\n     |\n   8 |     const a: [u32; (3, 2)] = [0; (2, 3)]; // initializer (incorrectly reversed ordering)\n     |                              ^^^^^^^^^^^"
diff --git a/tests/expectations/compiler/compiler/array/type_fail.leo.out b/tests/expectations/compiler/compiler/array/type_fail.leo.out
index 06738a76cd..02c49d1bd1 100644
--- a/tests/expectations/compiler/compiler/array/type_fail.leo.out
+++ b/tests/expectations/compiler/compiler/array/type_fail.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EPAR0370005]: expected ( -- got '-'\n    --> compiler-test:4:19\n     |\n   4 |     const a: [u8; -2] = [0u32; 2];\n     |                   ^"
+  - "Error [EPAR0370005]: expected ( -- got '-'\n    --> compiler-test:7:19\n     |\n   7 |     const a: [u8; -2] = [0u32; 2];\n     |                   ^"
diff --git a/tests/expectations/compiler/compiler/array/type_input_3x2.leo.out b/tests/expectations/compiler/compiler/array/type_input_3x2.leo.out
index 66d3e5d43c..d019dc7f8f 100644
--- a/tests/expectations/compiler/compiler/array/type_input_3x2.leo.out
+++ b/tests/expectations/compiler/compiler/array/type_input_3x2.leo.out
@@ -16,6 +16,6 @@ outputs:
             x:
               type: bool
               value: "true"
-    initial_ast: ab709670db7a5cc6642a175a78541054b53210f6be39a174d90ee57f3c5570f5
-    canonicalized_ast: ab709670db7a5cc6642a175a78541054b53210f6be39a174d90ee57f3c5570f5
-    type_inferenced_ast: f870e0b5181e4187da90ea8f7ea562596f0fea420425a403a972d761131718af
+    initial_ast: 556192af13c817701b5337b58ba4dc7f0f4509c4b35aebb2ef8885f558c9d877
+    canonicalized_ast: 556192af13c817701b5337b58ba4dc7f0f4509c4b35aebb2ef8885f558c9d877
+    type_inferenced_ast: 29369e02493bef27d3b8bda3f299938178dd1ed2df328b4cecd063be92c43565
diff --git a/tests/expectations/compiler/compiler/array/type_input_4x3x2.leo.out b/tests/expectations/compiler/compiler/array/type_input_4x3x2.leo.out
index 03baa309e3..ef2b1d06ef 100644
--- a/tests/expectations/compiler/compiler/array/type_input_4x3x2.leo.out
+++ b/tests/expectations/compiler/compiler/array/type_input_4x3x2.leo.out
@@ -16,6 +16,6 @@ outputs:
             x:
               type: bool
               value: "true"
-    initial_ast: 05ee62d30364f4d4ea3a6f680b049c3743d6fcb2cd7e751d798e61b38f1f0c70
-    canonicalized_ast: 05ee62d30364f4d4ea3a6f680b049c3743d6fcb2cd7e751d798e61b38f1f0c70
-    type_inferenced_ast: a1307016717f76519ff0f813ead70ed5460644e0e8414827665a1bd066159a76
+    initial_ast: 68b036cbee1e38611c9328065a91ba3414fa3e4b241c74a76de8d69fc486e6d3
+    canonicalized_ast: 68b036cbee1e38611c9328065a91ba3414fa3e4b241c74a76de8d69fc486e6d3
+    type_inferenced_ast: a6118f60ed2d9e8b58b8abcd440e78c9b47711bea0afe9f50938492fc0946303
diff --git a/tests/expectations/compiler/compiler/array/type_nested_value_nested_3x2.leo.out b/tests/expectations/compiler/compiler/array/type_nested_value_nested_3x2.leo.out
index d77376c25f..3cb88726be 100644
--- a/tests/expectations/compiler/compiler/array/type_nested_value_nested_3x2.leo.out
+++ b/tests/expectations/compiler/compiler/array/type_nested_value_nested_3x2.leo.out
@@ -16,6 +16,6 @@ outputs:
             x:
               type: bool
               value: "true"
-    initial_ast: 8caeaa858353e7f461b14364b898d538508c2e45c477c36dddc2960d4d626ed9
-    canonicalized_ast: 8caeaa858353e7f461b14364b898d538508c2e45c477c36dddc2960d4d626ed9
-    type_inferenced_ast: a61912871814695d648b0f176feaa0409b3d6bae3cb7c7a1234bf6543e015a5f
+    initial_ast: 1656fa54c1a5e95548cc4232c70e27649b6dec2eef37b1e05df729736a00994f
+    canonicalized_ast: 1656fa54c1a5e95548cc4232c70e27649b6dec2eef37b1e05df729736a00994f
+    type_inferenced_ast: 275526f498b666f68485a61ccc8a0c97402fb55253d1060efb6e511a766b2810
diff --git a/tests/expectations/compiler/compiler/array/type_nested_value_nested_3x2_fail.leo.out b/tests/expectations/compiler/compiler/array/type_nested_value_nested_3x2_fail.leo.out
index 217955800f..94499563a3 100644
--- a/tests/expectations/compiler/compiler/array/type_nested_value_nested_3x2_fail.leo.out
+++ b/tests/expectations/compiler/compiler/array/type_nested_value_nested_3x2_fail.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EASG0373026]: unexpected type, expected: 'array of length 3', received: 'array of length 2'\n    --> compiler-test:4:29\n     |\n   4 |     const b: [[u8; 2]; 3] = [[0; 3]; 2]; // initializer (incorrectly reversed ordering)\n     |                             ^^^^^^^^^^^"
+  - "Error [EASG0373026]: unexpected type, expected: 'array of length 3', received: 'array of length 2'\n    --> compiler-test:7:29\n     |\n   7 |     const b: [[u8; 2]; 3] = [[0; 3]; 2]; // initializer (incorrectly reversed ordering)\n     |                             ^^^^^^^^^^^"
diff --git a/tests/expectations/compiler/compiler/array/type_nested_value_nested_4x3x2.leo.out b/tests/expectations/compiler/compiler/array/type_nested_value_nested_4x3x2.leo.out
index 10106726b4..a003530706 100644
--- a/tests/expectations/compiler/compiler/array/type_nested_value_nested_4x3x2.leo.out
+++ b/tests/expectations/compiler/compiler/array/type_nested_value_nested_4x3x2.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 77b015384e8f21d34eef7f56465605fa133e739863a6bc33b01315232a86647e
-    canonicalized_ast: 77b015384e8f21d34eef7f56465605fa133e739863a6bc33b01315232a86647e
-    type_inferenced_ast: 4be69d8478185f5b9d4dcee3fc16ad4af858b7a47122bbc8e757d0dbc4bf92d8
+    initial_ast: 662a9450d998537f83bb696515ccf7c6924c318324d1fcc46f3e4b9b1874986f
+    canonicalized_ast: 662a9450d998537f83bb696515ccf7c6924c318324d1fcc46f3e4b9b1874986f
+    type_inferenced_ast: 9005f46215571f707dd5666067f93618e1d5b699bc80465c33d303fe95705ee9
diff --git a/tests/expectations/compiler/compiler/array/type_nested_value_nested_4x3x2_fail.leo.out b/tests/expectations/compiler/compiler/array/type_nested_value_nested_4x3x2_fail.leo.out
index 54c025b34a..bb7cc9c7ad 100644
--- a/tests/expectations/compiler/compiler/array/type_nested_value_nested_4x3x2_fail.leo.out
+++ b/tests/expectations/compiler/compiler/array/type_nested_value_nested_4x3x2_fail.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EASG0373026]: unexpected type, expected: 'array of length 4', received: 'array of length 2'\n    --> compiler-test:4:34\n     |\n   4 |     const b: [[[u8; 2]; 3]; 4] = [[[0; 4]; 3]; 2]; // initializer (incorrectly reversed ordering)\n     |                                  ^^^^^^^^^^^^^^^^"
+  - "Error [EASG0373026]: unexpected type, expected: 'array of length 4', received: 'array of length 2'\n    --> compiler-test:7:34\n     |\n   7 |     const b: [[[u8; 2]; 3]; 4] = [[[0; 4]; 3]; 2]; // initializer (incorrectly reversed ordering)\n     |                                  ^^^^^^^^^^^^^^^^"
diff --git a/tests/expectations/compiler/compiler/array/type_nested_value_tuple_3x2.leo.out b/tests/expectations/compiler/compiler/array/type_nested_value_tuple_3x2.leo.out
index 97d78e0fef..439eaa0d35 100644
--- a/tests/expectations/compiler/compiler/array/type_nested_value_tuple_3x2.leo.out
+++ b/tests/expectations/compiler/compiler/array/type_nested_value_tuple_3x2.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: ce12666930386785c7a5afe142793c47eae62145ff1d50c590dc82c2b4baded6
-    canonicalized_ast: 8220bc2881fe07bbfa873376696618fc182aff993d2a7d1a23ace5cc00965ff8
-    type_inferenced_ast: c14a7e89debd9289883db476fdbc814d14bfc410d40d1ac100bbece88d35b7c8
+    initial_ast: 42c6550b53e8769f01a77bf1354ddf6578eb79224e63041af9aaa022a778e41f
+    canonicalized_ast: 51cf98ff687fc786eb9973fdab3b243502805e58caede1c0ffdc437e1ba1f148
+    type_inferenced_ast: 0d4f573e6dc4e05a34afa4d64c99dddd505fba2183670b6810275cdaa4cfad77
diff --git a/tests/expectations/compiler/compiler/array/type_nested_value_tuple_3x2_fail.leo.out b/tests/expectations/compiler/compiler/array/type_nested_value_tuple_3x2_fail.leo.out
index d1af91c904..7fdad6a351 100644
--- a/tests/expectations/compiler/compiler/array/type_nested_value_tuple_3x2_fail.leo.out
+++ b/tests/expectations/compiler/compiler/array/type_nested_value_tuple_3x2_fail.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EASG0373026]: unexpected type, expected: 'array of length 3', received: 'array of length 2'\n    --> compiler-test:4:29\n     |\n   4 |     const b: [[u8; 2]; 3] = [0; (2, 3)]; // initializer (incorrectly reversed ordering)\n     |                             ^^^^^^^^^^^"
+  - "Error [EASG0373026]: unexpected type, expected: 'array of length 3', received: 'array of length 2'\n    --> compiler-test:7:29\n     |\n   7 |     const b: [[u8; 2]; 3] = [0; (2, 3)]; // initializer (incorrectly reversed ordering)\n     |                             ^^^^^^^^^^^"
diff --git a/tests/expectations/compiler/compiler/array/type_nested_value_tuple_4x3x2.leo.out b/tests/expectations/compiler/compiler/array/type_nested_value_tuple_4x3x2.leo.out
index 4c0c8b246d..e82edb43d1 100644
--- a/tests/expectations/compiler/compiler/array/type_nested_value_tuple_4x3x2.leo.out
+++ b/tests/expectations/compiler/compiler/array/type_nested_value_tuple_4x3x2.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 609dfd962592e1dbf90051979163cead865cb69c0722c641517fad4f3091ec57
-    canonicalized_ast: 4d6b8380c844ac6655c7dcc4c4a2ff45f14001577c82f21d87b4546e04c7e776
-    type_inferenced_ast: d86da787361b7cea05474815138f2a1f98642b93232641bf399647788c0d5ecd
+    initial_ast: ac564347c0564834b439dccb87b1329502458c4d75fab158d7cc31253fb5af8f
+    canonicalized_ast: 0a61c2694f461bce3cbf0528df7af8179afd2ef464dcbe10b34a0f7da4abacf6
+    type_inferenced_ast: f5befbd335c89629273e4455ec0b3669d65adc1c248edd476815a28bc2319357
diff --git a/tests/expectations/compiler/compiler/array/type_nested_value_tuple_4x3x2_fail.leo.out b/tests/expectations/compiler/compiler/array/type_nested_value_tuple_4x3x2_fail.leo.out
index bf875ee25e..e732612b72 100644
--- a/tests/expectations/compiler/compiler/array/type_nested_value_tuple_4x3x2_fail.leo.out
+++ b/tests/expectations/compiler/compiler/array/type_nested_value_tuple_4x3x2_fail.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EASG0373026]: unexpected type, expected: 'array of length 4', received: 'array of length 2'\n    --> compiler-test:4:34\n     |\n   4 |     const b: [[[u8; 2]; 3]; 4] = [0; (2, 3, 4)]; // initializer (incorrectly reversed ordering)\n     |                                  ^^^^^^^^^^^^^^"
+  - "Error [EASG0373026]: unexpected type, expected: 'array of length 4', received: 'array of length 2'\n    --> compiler-test:7:34\n     |\n   7 |     const b: [[[u8; 2]; 3]; 4] = [0; (2, 3, 4)]; // initializer (incorrectly reversed ordering)\n     |                                  ^^^^^^^^^^^^^^"
diff --git a/tests/expectations/compiler/compiler/array/type_tuple_value_nested_3x2.leo.out b/tests/expectations/compiler/compiler/array/type_tuple_value_nested_3x2.leo.out
index 621b4b1bed..19ee99cabb 100644
--- a/tests/expectations/compiler/compiler/array/type_tuple_value_nested_3x2.leo.out
+++ b/tests/expectations/compiler/compiler/array/type_tuple_value_nested_3x2.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 67cb2ae1b5b3e19a7c7aa8783d0f566b69bfb995e7848ec7746e1af0448c1aa8
-    canonicalized_ast: 4aba053c866851bfcd22da037e0270ad43a7fabbdc263629af52eea38d577b7a
-    type_inferenced_ast: b44ceb7749802ff53c82221efad075565264531500665a01aa94f745e0c304cd
+    initial_ast: 73337f6874a6e1b33240f0406c74ec8c21971dc58ea2c91ad6dca5e21796a770
+    canonicalized_ast: 6bbaab9e111d45b2509bb8bc50a3f45806a36716892a88be00ceeeaba446c805
+    type_inferenced_ast: 64bdaa95aebca13ef3dc6fbbf331e614403bdae7d7f4f33de63d05a2b3d2e7fa
diff --git a/tests/expectations/compiler/compiler/array/type_tuple_value_nested_3x2_fail.leo.out b/tests/expectations/compiler/compiler/array/type_tuple_value_nested_3x2_fail.leo.out
index d9ade042ec..29e9eba721 100644
--- a/tests/expectations/compiler/compiler/array/type_tuple_value_nested_3x2_fail.leo.out
+++ b/tests/expectations/compiler/compiler/array/type_tuple_value_nested_3x2_fail.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EASG0373026]: unexpected type, expected: 'array of length 2', received: 'array of length 3'\n    --> compiler-test:4:29\n     |\n   4 |     const b: [u8; (2, 3)] = [[0; 2]; 3]; // initializer (incorrectly reversed ordering)\n     |                             ^^^^^^^^^^^"
+  - "Error [EASG0373026]: unexpected type, expected: 'array of length 2', received: 'array of length 3'\n    --> compiler-test:8:29\n     |\n   8 |     const b: [u8; (2, 3)] = [[0; 2]; 3]; // initializer (incorrectly reversed ordering)\n     |                             ^^^^^^^^^^^"
diff --git a/tests/expectations/compiler/compiler/array/type_tuple_value_nested_4x3x2.leo.out b/tests/expectations/compiler/compiler/array/type_tuple_value_nested_4x3x2.leo.out
index 29a8a9c198..4159fe4ede 100644
--- a/tests/expectations/compiler/compiler/array/type_tuple_value_nested_4x3x2.leo.out
+++ b/tests/expectations/compiler/compiler/array/type_tuple_value_nested_4x3x2.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 9867f722c5ce3ccbc3701238c216acc2b7e37bdc6163a8f7a4a4d88b7f19b73a
-    canonicalized_ast: d5f9deb2b7806ec665a6c6a5a6a0bee2c76310ecec4f34a8a479aa6934902b3a
-    type_inferenced_ast: ed9cee663a3a9dc51ba06a80e5f192fdcc49e62b8e4cb0ae9582f3a7f7b1de25
+    initial_ast: cd71bce2b90ef48459088b8c9a002fe743892716b23f2481477cfc5067efb474
+    canonicalized_ast: 5ce99a61723ea9e44f27e34394f01adc100ebbfaa3ceefb1fcd98c355d35bf20
+    type_inferenced_ast: 8fb4a68c510b546395c8930e50755a51be8ac536220fd753845d04f7255ba855
diff --git a/tests/expectations/compiler/compiler/array/type_tuple_value_nested_4x3x2_fail.leo.out b/tests/expectations/compiler/compiler/array/type_tuple_value_nested_4x3x2_fail.leo.out
index f236a3578a..0790adc876 100644
--- a/tests/expectations/compiler/compiler/array/type_tuple_value_nested_4x3x2_fail.leo.out
+++ b/tests/expectations/compiler/compiler/array/type_tuple_value_nested_4x3x2_fail.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EASG0373026]: unexpected type, expected: 'array of length 4', received: 'array of length 2'\n    --> compiler-test:4:32\n     |\n   4 |     const b: [u8; (4, 3, 2)] = [[[0; 4]; 3]; 2]; // initializer (incorrectly reversed ordering)\n     |                                ^^^^^^^^^^^^^^^^"
+  - "Error [EASG0373026]: unexpected type, expected: 'array of length 4', received: 'array of length 2'\n    --> compiler-test:7:32\n     |\n   7 |     const b: [u8; (4, 3, 2)] = [[[0; 4]; 3]; 2]; // initializer (incorrectly reversed ordering)\n     |                                ^^^^^^^^^^^^^^^^"
diff --git a/tests/expectations/compiler/compiler/array/type_tuple_value_tuple_3x2.leo.out b/tests/expectations/compiler/compiler/array/type_tuple_value_tuple_3x2.leo.out
index 20cd329a0c..4ff7f98d4e 100644
--- a/tests/expectations/compiler/compiler/array/type_tuple_value_tuple_3x2.leo.out
+++ b/tests/expectations/compiler/compiler/array/type_tuple_value_tuple_3x2.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 222950738e89721363dd15b8f5d240befa46d434c45f486857ec4898806d0e84
-    canonicalized_ast: b89098b4159b284f07be789cfb5b196515c9d33821be1411c4bc25ae3c90425f
-    type_inferenced_ast: 4e0acee05ff837a30c1057dec0c5cc18a6ce573e5891218990f88584fef683a7
+    initial_ast: 3b6f3b5c0550568d6af9abe967266e7fdf485bc5725991bcde99f09e9d83aa15
+    canonicalized_ast: 47e20a88ce51e388ae5746d446db2b542593f5d617cca7b82c350942673fb146
+    type_inferenced_ast: dafcf6df6b76d3275356153bf229cb4ca0a50c7ad416e134b8a81102b1b51048
diff --git a/tests/expectations/compiler/compiler/array/type_tuple_value_tuple_3x2_fail.leo.out b/tests/expectations/compiler/compiler/array/type_tuple_value_tuple_3x2_fail.leo.out
index 243e146be8..2ec38f5175 100644
--- a/tests/expectations/compiler/compiler/array/type_tuple_value_tuple_3x2_fail.leo.out
+++ b/tests/expectations/compiler/compiler/array/type_tuple_value_tuple_3x2_fail.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EASG0373026]: unexpected type, expected: 'array of length 2', received: 'array of length 3'\n    --> compiler-test:4:29\n     |\n   4 |     const b: [u8; (2, 3)] = [0; (3, 2)]; // initializer (incorrectly reversed ordering)\n     |                             ^^^^^^^^^^^"
+  - "Error [EASG0373026]: unexpected type, expected: 'array of length 2', received: 'array of length 3'\n    --> compiler-test:7:29\n     |\n   7 |     const b: [u8; (2, 3)] = [0; (3, 2)]; // initializer (incorrectly reversed ordering)\n     |                             ^^^^^^^^^^^"
diff --git a/tests/expectations/compiler/compiler/array/type_tuple_value_tuple_4x3x2.leo.out b/tests/expectations/compiler/compiler/array/type_tuple_value_tuple_4x3x2.leo.out
index cb1620363c..52a9a06074 100644
--- a/tests/expectations/compiler/compiler/array/type_tuple_value_tuple_4x3x2.leo.out
+++ b/tests/expectations/compiler/compiler/array/type_tuple_value_tuple_4x3x2.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: a312fb26b99d2c4a7891d482079f0220663dba780bc68b9f651def2cd9bad960
-    canonicalized_ast: 01c472ee0495bbb164f67159e86483a29421918178a7115ebd3b905d6909150f
-    type_inferenced_ast: ac2c37891e21027028b4a1e4b8f5972e5ee64f91f6b2ba6a85218c622192ce02
+    initial_ast: d509360798609482b9932f3868d5e5c36be224900c1b1ee15805189cdd245c47
+    canonicalized_ast: 9722920d99b744a31247e8db729d2d4694696416c1b33fee8c71801852019858
+    type_inferenced_ast: 5878c12faf593e2163872d1cfdb9615f41469f45bd8fc1ae17cb31bd9ef8fc2e
diff --git a/tests/expectations/compiler/compiler/array/type_tuple_value_tuple_4x3x2_fail.leo.out b/tests/expectations/compiler/compiler/array/type_tuple_value_tuple_4x3x2_fail.leo.out
index 370d7730e6..258737751e 100644
--- a/tests/expectations/compiler/compiler/array/type_tuple_value_tuple_4x3x2_fail.leo.out
+++ b/tests/expectations/compiler/compiler/array/type_tuple_value_tuple_4x3x2_fail.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EASG0373026]: unexpected type, expected: 'array of length 4', received: 'array of length 2'\n    --> compiler-test:4:32\n     |\n   4 |     const b: [u8; (4, 3, 2)] = [0; (2, 3, 4)]; // initializer (incorrectly reversed order)\n     |                                ^^^^^^^^^^^^^^"
+  - "Error [EASG0373026]: unexpected type, expected: 'array of length 4', received: 'array of length 2'\n    --> compiler-test:7:32\n     |\n   7 |     const b: [u8; (4, 3, 2)] = [0; (2, 3, 4)]; // initializer (incorrectly reversed order)\n     |                                ^^^^^^^^^^^^^^"
diff --git a/tests/expectations/compiler/compiler/array/variable_slice_fail.leo.out b/tests/expectations/compiler/compiler/array/variable_slice_fail.leo.out
index 2362a9a01e..3739108aa3 100644
--- a/tests/expectations/compiler/compiler/array/variable_slice_fail.leo.out
+++ b/tests/expectations/compiler/compiler/array/variable_slice_fail.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EPAR0370007]: unexpected identifier: expected 'assert', 'error', 'log' -- got 'debug'\n    --> compiler-test:7:17\n     |\n   7 |         console.debug(\"{}\", x);\n     |                 ^^^^^"
+  - "Error [EPAR0370007]: unexpected identifier: expected 'assert', 'error', 'log' -- got 'debug'\n    --> compiler-test:10:17\n     |\n  10 |         console.debug(\"{}\", x);\n     |                 ^^^^^"
diff --git a/tests/expectations/compiler/compiler/boolean/and.leo.out b/tests/expectations/compiler/compiler/boolean/and.leo.out
index 5714d0de0b..33fa69f4c1 100644
--- a/tests/expectations/compiler/compiler/boolean/and.leo.out
+++ b/tests/expectations/compiler/compiler/boolean/and.leo.out
@@ -34,6 +34,6 @@ outputs:
             x:
               type: bool
               value: "true"
-    initial_ast: 9f6929c30448a269b4a22f3001085be75f91bc91503978f2804f4d6bf7dd246f
-    canonicalized_ast: 9f6929c30448a269b4a22f3001085be75f91bc91503978f2804f4d6bf7dd246f
-    type_inferenced_ast: b41ada9ca834d73d94641fa3f28c95bea6e6862819bab431ac4b02cc342fb659
+    initial_ast: 60dfd95f6708d08f1772ac051daf7d351c942e789318748d5112199afc5e5538
+    canonicalized_ast: 60dfd95f6708d08f1772ac051daf7d351c942e789318748d5112199afc5e5538
+    type_inferenced_ast: 6da4799d52a8b19274ce772ffea9cd6ae657bf8e28e30c373e7f385fbc7bac1a
diff --git a/tests/expectations/compiler/compiler/boolean/conditional.leo.out b/tests/expectations/compiler/compiler/boolean/conditional.leo.out
index 0551b1c42f..73c53b7ac2 100644
--- a/tests/expectations/compiler/compiler/boolean/conditional.leo.out
+++ b/tests/expectations/compiler/compiler/boolean/conditional.leo.out
@@ -34,6 +34,6 @@ outputs:
             x:
               type: bool
               value: "true"
-    initial_ast: 3de9d88d40969c01145790a5903ab2dfa1a7614ec4f4d62c20b86b917653008e
-    canonicalized_ast: 3de9d88d40969c01145790a5903ab2dfa1a7614ec4f4d62c20b86b917653008e
-    type_inferenced_ast: 53a91ffe37b6a96f1c239669f04ab600f51d2a200a8aed2dee0dc50bb5fa4f7d
+    initial_ast: dd6eab6d13c1d4fd2a85722a7a2bba96e28ea10db6bbf728bbde4fa190ae31f0
+    canonicalized_ast: dd6eab6d13c1d4fd2a85722a7a2bba96e28ea10db6bbf728bbde4fa190ae31f0
+    type_inferenced_ast: 521001453905ff47c0d03f922cd2852e0194d8741ea88c238fdd2d3a57381839
diff --git a/tests/expectations/compiler/compiler/boolean/equal.leo.out b/tests/expectations/compiler/compiler/boolean/equal.leo.out
index 8e0ba59214..ad1c0657c1 100644
--- a/tests/expectations/compiler/compiler/boolean/equal.leo.out
+++ b/tests/expectations/compiler/compiler/boolean/equal.leo.out
@@ -34,6 +34,6 @@ outputs:
             x:
               type: bool
               value: "true"
-    initial_ast: 7fe0c7281b31c1f126d41c425f852930de3283b0deb54362fba0834b6eb83ae3
-    canonicalized_ast: 7fe0c7281b31c1f126d41c425f852930de3283b0deb54362fba0834b6eb83ae3
-    type_inferenced_ast: 5c851d6f023000766f370ec5bc048af431212368c68fb1ba674500ae7451a36e
+    initial_ast: a5d8769328ff3d4738851ee3887012f5dac72f7c4260808062bd4d051ed38e65
+    canonicalized_ast: a5d8769328ff3d4738851ee3887012f5dac72f7c4260808062bd4d051ed38e65
+    type_inferenced_ast: 917e75ad9ef5a93dc06382d53d49264dc78e80902c19414f5849da3098bf65bb
diff --git a/tests/expectations/compiler/compiler/boolean/not_equal.leo.out b/tests/expectations/compiler/compiler/boolean/not_equal.leo.out
index 04575f4f5e..5223a74606 100644
--- a/tests/expectations/compiler/compiler/boolean/not_equal.leo.out
+++ b/tests/expectations/compiler/compiler/boolean/not_equal.leo.out
@@ -34,6 +34,6 @@ outputs:
             x:
               type: bool
               value: "false"
-    initial_ast: aae17ba5bd2ce376b5c440df42be442b0731feb499fa37b133b89f364a8790bf
-    canonicalized_ast: aae17ba5bd2ce376b5c440df42be442b0731feb499fa37b133b89f364a8790bf
-    type_inferenced_ast: 5b110c3aa3e0d65942f7a7fdbdccfc745aa810ea7d71137358f220d2bfecb0b7
+    initial_ast: 3b7f05f3b1b0bbe1c99fe29573d9227a67fc0a9c00bdb8346ca67735c835a138
+    canonicalized_ast: 3b7f05f3b1b0bbe1c99fe29573d9227a67fc0a9c00bdb8346ca67735c835a138
+    type_inferenced_ast: 6d1867ff6b517894b3a7a45d75332ecd82a47f75f7ba79bab1ce10268b9448f6
diff --git a/tests/expectations/compiler/compiler/boolean/or.leo.out b/tests/expectations/compiler/compiler/boolean/or.leo.out
index 19ef883621..4d58dcfe06 100644
--- a/tests/expectations/compiler/compiler/boolean/or.leo.out
+++ b/tests/expectations/compiler/compiler/boolean/or.leo.out
@@ -34,6 +34,6 @@ outputs:
             x:
               type: bool
               value: "true"
-    initial_ast: 35fd6670d1c00d5c70861e58f988536f86dbe84d26cb1cdf601228a3b784296e
-    canonicalized_ast: 35fd6670d1c00d5c70861e58f988536f86dbe84d26cb1cdf601228a3b784296e
-    type_inferenced_ast: 3dd86ce4e1ecce14619b49e274f1c3275ec7561f82655eadda4752f20e771802
+    initial_ast: 1925069aa0f5296440460a131266179325e8a470b4bb0f83fdf5971b83f711fe
+    canonicalized_ast: 1925069aa0f5296440460a131266179325e8a470b4bb0f83fdf5971b83f711fe
+    type_inferenced_ast: 242c318c7969b4d2950376b852feb50798882d77fd459a40d3180b53be67017b
diff --git a/tests/expectations/compiler/compiler/char/circuit.leo.out b/tests/expectations/compiler/compiler/char/circuit.leo.out
index fa42a4859a..4ff8dec4cd 100644
--- a/tests/expectations/compiler/compiler/char/circuit.leo.out
+++ b/tests/expectations/compiler/compiler/char/circuit.leo.out
@@ -100,6 +100,6 @@ outputs:
             r:
               type: char
               value: "'\\u{1f62d}'"
-    initial_ast: 41f5ad78f58a182b6b99dd22151fabb0dc621c4a45c39d087cbc05f89c99eccc
-    canonicalized_ast: 41f5ad78f58a182b6b99dd22151fabb0dc621c4a45c39d087cbc05f89c99eccc
-    type_inferenced_ast: 0463676a90b25002f29b0c056e44945f9c461c535bdf11b47112ace4c3e0eac1
+    initial_ast: b096b1d1540d8cb12f39acb77e580c30209a91aecb3e2b38596de5b88516e40b
+    canonicalized_ast: b096b1d1540d8cb12f39acb77e580c30209a91aecb3e2b38596de5b88516e40b
+    type_inferenced_ast: cabbd5dffc41fe4741fa5bb6b28b7f88265c49dbe6f913221c153a89d9a7adb2
diff --git a/tests/expectations/compiler/compiler/char/invalid_char.leo.out b/tests/expectations/compiler/compiler/char/invalid_char.leo.out
index 1044b2dbf1..6ab5690e56 100644
--- a/tests/expectations/compiler/compiler/char/invalid_char.leo.out
+++ b/tests/expectations/compiler/compiler/char/invalid_char.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EPAR0370000]: '\n    --> compiler-test:4:23\n     |\n   4 |     const not_valid = '';\n     |                       ^\n     |\n     = HELP TODO"
+  - "Error [EPAR0370000]: '\n    --> compiler-test:7:23\n     |\n   7 |     const not_valid = '';\n     |                       ^\n     |\n     = HELP TODO"
diff --git a/tests/expectations/compiler/compiler/char/neq.leo.out b/tests/expectations/compiler/compiler/char/neq.leo.out
index b78933acc7..f91896353b 100644
--- a/tests/expectations/compiler/compiler/char/neq.leo.out
+++ b/tests/expectations/compiler/compiler/char/neq.leo.out
@@ -100,6 +100,6 @@ outputs:
             r:
               type: char
               value: "'a'"
-    initial_ast: d3a773c0b0555cc2c3a6d2fafb9e567488ea8fd91ea965f758ec9f58a4679dd7
-    canonicalized_ast: d3a773c0b0555cc2c3a6d2fafb9e567488ea8fd91ea965f758ec9f58a4679dd7
-    type_inferenced_ast: 460b284982e0fb9819768800b2c84ab682929bba1b6056f03e5e90bfe7f92420
+    initial_ast: 74cb4d0101c42e5649d2644e96aca6b0da6cdf1226f28a8433f473917f80c33f
+    canonicalized_ast: 74cb4d0101c42e5649d2644e96aca6b0da6cdf1226f28a8433f473917f80c33f
+    type_inferenced_ast: e5bdffa94546209c897a4190999c3128360d24c63154302e9eee70db32e6ef88
diff --git a/tests/expectations/compiler/compiler/char/nonprinting.leo.out b/tests/expectations/compiler/compiler/char/nonprinting.leo.out
index d38c31d75c..7b69b85c40 100644
--- a/tests/expectations/compiler/compiler/char/nonprinting.leo.out
+++ b/tests/expectations/compiler/compiler/char/nonprinting.leo.out
@@ -19,6 +19,6 @@ outputs:
             r1:
               type: bool
               value: "true"
-    initial_ast: 4e9ef2d8121eabed385e2d358e2d9ed1dc64d88894c3dbfc078d5da34902ce4c
-    canonicalized_ast: 4e9ef2d8121eabed385e2d358e2d9ed1dc64d88894c3dbfc078d5da34902ce4c
-    type_inferenced_ast: 489e02b2ed42362bf493fe2fb58cf03ab06cfb95abd49b7ba0329a8e8d7c3daa
+    initial_ast: b75fd945d38e193c910fcf363c6b49d689d7f102b46bbe2eb0a14c1ed68f775b
+    canonicalized_ast: b75fd945d38e193c910fcf363c6b49d689d7f102b46bbe2eb0a14c1ed68f775b
+    type_inferenced_ast: e65fa8136044413c5f89fec8fb41659d38db8a65be11a7a641421e1e94a26ed8
diff --git a/tests/expectations/compiler/compiler/char/out.leo.out b/tests/expectations/compiler/compiler/char/out.leo.out
index 52b322b5b0..dd93d338b8 100644
--- a/tests/expectations/compiler/compiler/char/out.leo.out
+++ b/tests/expectations/compiler/compiler/char/out.leo.out
@@ -100,6 +100,6 @@ outputs:
             r:
               type: char
               value: "'\\u{1f62d}'"
-    initial_ast: 2e1dc058de58dbe98a1f19e7b883fed916d58fc5087de2c2bd06bb98324411d5
-    canonicalized_ast: 2e1dc058de58dbe98a1f19e7b883fed916d58fc5087de2c2bd06bb98324411d5
-    type_inferenced_ast: 40d126753bfa96341a167671ffc7244c6430d8f40934d8197c969baa9b49c785
+    initial_ast: ff50865a1ca02623cf960313ab12a6c497e545130c47b0d1d53d52c3784f8c55
+    canonicalized_ast: ff50865a1ca02623cf960313ab12a6c497e545130c47b0d1d53d52c3784f8c55
+    type_inferenced_ast: f0860ef3f25bed9efe1cbeda98b9f66b6c17598b8b94eb466b460486d5170cfd
diff --git a/tests/expectations/compiler/compiler/circuits/big_self_in_circuit_replacement.leo.out b/tests/expectations/compiler/compiler/circuits/big_self_in_circuit_replacement.leo.out
index 11d7c42755..308445a250 100644
--- a/tests/expectations/compiler/compiler/circuits/big_self_in_circuit_replacement.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/big_self_in_circuit_replacement.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: bc330763338677f23601b03f5665bd8f42f8143f59cc9b4803fb693b3cfa0311
-    canonicalized_ast: fbff610ef772ee7f997b4bc4cd7c2a3f2024d70af35b94a966ca6a0f19f15194
-    type_inferenced_ast: f6b0159f6bffeff8e3cde7f13c97ac5d537b40855271a4a13d07a84d24d78504
+    initial_ast: 3678518f2364040cf8723b72974f03bf7250f504358f54fad71bddf03615bb58
+    canonicalized_ast: 57a5b1b94f04aa2db64914b8ac507be082558a18439102cf402f6a2c5339fab0
+    type_inferenced_ast: efc0e62188f81169fe6afa9a2e035ded5c60f96fbad7961ecbb5679fe47cfa0c
diff --git a/tests/expectations/compiler/compiler/circuits/big_self_outside_circuit_fail.leo.out b/tests/expectations/compiler/compiler/circuits/big_self_outside_circuit_fail.leo.out
index 7d1e87d756..25c6624aa9 100644
--- a/tests/expectations/compiler/compiler/circuits/big_self_outside_circuit_fail.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/big_self_outside_circuit_fail.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EAST0372005]: cannot call keyword `Self` outside of a circuit function\n    --> compiler-test:16:3\n     |\n  16 |   let foo: Self = Foo::new();\n     |   ^^^^^^^^^^^^^^^^^^^^^^^^^^"
+  - "Error [EAST0372005]: cannot call keyword `Self` outside of a circuit function\n    --> compiler-test:20:3\n     |\n  20 |   let foo: Self = Foo::new();\n     |   ^^^^^^^^^^^^^^^^^^^^^^^^^^"
diff --git a/tests/expectations/compiler/compiler/circuits/const_self_variable.leo.out b/tests/expectations/compiler/compiler/circuits/const_self_variable.leo.out
index 9261e9d0ff..779e23d96a 100644
--- a/tests/expectations/compiler/compiler/circuits/const_self_variable.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/const_self_variable.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 601fb882472ee0ff4aea3330822936a9df64bfc8ceefcd83f000bb3094878d47
-    canonicalized_ast: 601fb882472ee0ff4aea3330822936a9df64bfc8ceefcd83f000bb3094878d47
-    type_inferenced_ast: 110a4e51c4c0ace6c0f3aa385e1735cb4ecf3cfea2a9d2ab7591da3826582c31
+    initial_ast: 57573afa16f60eec53c2c2dbcbddd3f74e1aa9cab5e11d071ab8e2c2ebc264cb
+    canonicalized_ast: 57573afa16f60eec53c2c2dbcbddd3f74e1aa9cab5e11d071ab8e2c2ebc264cb
+    type_inferenced_ast: d326fe25c49e69b7ea315c2dd34d52357e3ab45a0397f8431d7db81a4f8bb644
diff --git a/tests/expectations/compiler/compiler/circuits/const_self_variable_fail.leo.out b/tests/expectations/compiler/compiler/circuits/const_self_variable_fail.leo.out
index d3d1a707f1..1bfb8998f2 100644
--- a/tests/expectations/compiler/compiler/circuits/const_self_variable_fail.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/const_self_variable_fail.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EASG0373033]: illegal assignment to immutable variable 'self'\n    --> compiler-test:7:9\n     |\n   7 |         self.a = new;\n     |         ^^^^^^^^^^^^"
+  - "Error [EASG0373033]: illegal assignment to immutable variable 'self'\n    --> compiler-test:10:9\n     |\n  10 |         self.a = new;\n     |         ^^^^^^^^^^^^"
diff --git a/tests/expectations/compiler/compiler/circuits/define_circuit_inside_circuit_function.leo.out b/tests/expectations/compiler/compiler/circuits/define_circuit_inside_circuit_function.leo.out
index 8ec377987f..4fd47d2061 100644
--- a/tests/expectations/compiler/compiler/circuits/define_circuit_inside_circuit_function.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/define_circuit_inside_circuit_function.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 63f34a3b537f3221e8711828f7d0953c0766627c0cdb2e37933b88a93550e261
-    canonicalized_ast: 63f34a3b537f3221e8711828f7d0953c0766627c0cdb2e37933b88a93550e261
-    type_inferenced_ast: 29604fd57ee8658f83e552bc6496541ebcebb91afa313a1706b285fe18385c4c
+    initial_ast: d4b08b986cf725d84faf6e1f7b8d913b724704bd868e4663f7e5e67b973deeb9
+    canonicalized_ast: d4b08b986cf725d84faf6e1f7b8d913b724704bd868e4663f7e5e67b973deeb9
+    type_inferenced_ast: 99eb30261fdb656658b38b967c50bffcd7bdfaa1a25b6f5d2d99024a2feac089
diff --git a/tests/expectations/compiler/compiler/circuits/duplicate_name_context.leo.out b/tests/expectations/compiler/compiler/circuits/duplicate_name_context.leo.out
index ab25d96b9a..8e751178c5 100644
--- a/tests/expectations/compiler/compiler/circuits/duplicate_name_context.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/duplicate_name_context.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 46d600c5f3b64378fbdcff7b4097d54e3855eded01d642f5af25fa3aef44eede
-    canonicalized_ast: 46d600c5f3b64378fbdcff7b4097d54e3855eded01d642f5af25fa3aef44eede
-    type_inferenced_ast: e5cdf935d34157bdbc2eb228c94e2222887c91fc3bc1c9f24bc6e84fddde9730
+    initial_ast: ad72e31b5cd49eec3618538ecd57ccc3ee0cfdc9aff7d6959e884972795cf8f0
+    canonicalized_ast: ad72e31b5cd49eec3618538ecd57ccc3ee0cfdc9aff7d6959e884972795cf8f0
+    type_inferenced_ast: 897982d1fae87cba7e25f3b2da2a3ce77f80713b334e96c60b664247a77e1040
diff --git a/tests/expectations/compiler/compiler/circuits/inline.leo.out b/tests/expectations/compiler/compiler/circuits/inline.leo.out
index ed4bcd5da5..bbca99230b 100644
--- a/tests/expectations/compiler/compiler/circuits/inline.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/inline.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: u32
               value: "100"
-    initial_ast: c76bd461573b9bb3622a74b5c5a10a98402b8c86c13086c01c161b77aac0c642
-    canonicalized_ast: c76bd461573b9bb3622a74b5c5a10a98402b8c86c13086c01c161b77aac0c642
-    type_inferenced_ast: 213f747571838133c62a73574f769d25fd42afce151e580be42d1d9d7b62033b
+    initial_ast: 849a0cbbc46368c5aed51041416ccbed73e8a7581606a893f797a855088ab89b
+    canonicalized_ast: 849a0cbbc46368c5aed51041416ccbed73e8a7581606a893f797a855088ab89b
+    type_inferenced_ast: 55480af9be6c93cc699f0c42546e7ac671deefa6d8a3525c90bfd819fa564a75
diff --git a/tests/expectations/compiler/compiler/circuits/inline_fail.leo.out b/tests/expectations/compiler/compiler/circuits/inline_fail.leo.out
index 6854a2bc6f..4127a76a35 100644
--- a/tests/expectations/compiler/compiler/circuits/inline_fail.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/inline_fail.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EASG0373003]: missing circuit member 'x' for initialization of circuit 'Foo'\n    --> compiler-test:9:15\n     |\n   9 |     const a = Foo { y: 0u32 };\n     |               ^^^^^^^^^^^^^^^"
+  - "Error [EASG0373003]: missing circuit member 'x' for initialization of circuit 'Foo'\n    --> compiler-test:12:15\n     |\n  12 |     const a = Foo { y: 0u32 };\n     |               ^^^^^^^^^^^^^^^"
diff --git a/tests/expectations/compiler/compiler/circuits/inline_member_fail.leo.out b/tests/expectations/compiler/compiler/circuits/inline_member_fail.leo.out
index a6b6460e54..c856fd865d 100644
--- a/tests/expectations/compiler/compiler/circuits/inline_member_fail.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/inline_member_fail.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EASG0373003]: missing circuit member 'x' for initialization of circuit 'Foo'\n    --> compiler-test:9:15\n     |\n   9 |     const a = Foo { y };\n     |               ^^^^^^^^^"
+  - "Error [EASG0373003]: missing circuit member 'x' for initialization of circuit 'Foo'\n    --> compiler-test:12:15\n     |\n  12 |     const a = Foo { y };\n     |               ^^^^^^^^^"
diff --git a/tests/expectations/compiler/compiler/circuits/inline_member_pass.leo.out b/tests/expectations/compiler/compiler/circuits/inline_member_pass.leo.out
index 4ee319c61d..ce1ffd6565 100644
--- a/tests/expectations/compiler/compiler/circuits/inline_member_pass.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/inline_member_pass.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 3b07cdd6e203ad5775a6c75a4598330e4bf7b04616bdbd532df20bd7bba1981d
-    canonicalized_ast: f87f269c06e5eb1d6802b4a92c9a4af2a3966583dbaa2454b5468b3f56114a15
-    type_inferenced_ast: 73ed7092d40d9b7e5be744e14da191eaa7f0758b6027c7e984365bd33e07ae2d
+    initial_ast: 3cb0dc7f78b63faff3a15f46441db2ff2c2621055e5c4c4b7b4d3d1c25485c2f
+    canonicalized_ast: 580e75874deb3a33d82bd22d1a47d42112ea1a1470191d747b964be46b7d4b9f
+    type_inferenced_ast: 3ecd1a3869556473464f57dff59632a85d377f0e05c1f293f4bc5d9fdb4449b2
diff --git a/tests/expectations/compiler/compiler/circuits/inline_undefined.leo.out b/tests/expectations/compiler/compiler/circuits/inline_undefined.leo.out
index 690ccca5b5..01c1b9bba7 100644
--- a/tests/expectations/compiler/compiler/circuits/inline_undefined.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/inline_undefined.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EASG0373000]: failed to resolve circuit: 'Foo'\n    --> compiler-test:4:15\n     |\n   4 |     const a = Foo { };\n     |               ^^^"
+  - "Error [EASG0373000]: failed to resolve circuit: 'Foo'\n    --> compiler-test:7:15\n     |\n   7 |     const a = Foo { };\n     |               ^^^"
diff --git a/tests/expectations/compiler/compiler/circuits/member_function.leo.out b/tests/expectations/compiler/compiler/circuits/member_function.leo.out
index 23b1484e46..1609fff405 100644
--- a/tests/expectations/compiler/compiler/circuits/member_function.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/member_function.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: b53c2c321c3f6ee2202eaca1e709607f5e82f9e456be132b08493de57b1c4089
-    canonicalized_ast: b53c2c321c3f6ee2202eaca1e709607f5e82f9e456be132b08493de57b1c4089
-    type_inferenced_ast: a94dfe431aa43189323427aadb33120d4ac03e19b9a898353858c26b624869ed
+    initial_ast: a8d57a614a02e614f6348371df26c8d5e14b9010f7030b996f095f9269e321a6
+    canonicalized_ast: a8d57a614a02e614f6348371df26c8d5e14b9010f7030b996f095f9269e321a6
+    type_inferenced_ast: 8e7cc4f886a8879b3e6ff6a480f0bde2a35b899828b13f7d0c717305c31528cb
diff --git a/tests/expectations/compiler/compiler/circuits/member_function_fail.leo.out b/tests/expectations/compiler/compiler/circuits/member_function_fail.leo.out
index 5c34a23b9d..b4d3ca3f1a 100644
--- a/tests/expectations/compiler/compiler/circuits/member_function_fail.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/member_function_fail.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EASG0373002]: illegal reference to non-existant member 'echoed' of circuit 'Foo'\n    --> compiler-test:11:17\n     |\n  11 |     const err = a.echoed(1u32);\n     |                 ^^^^^^^^"
+  - "Error [EASG0373002]: illegal reference to non-existant member 'echoed' of circuit 'Foo'\n    --> compiler-test:14:17\n     |\n  14 |     const err = a.echoed(1u32);\n     |                 ^^^^^^^^"
diff --git a/tests/expectations/compiler/compiler/circuits/member_function_invalid.leo.out b/tests/expectations/compiler/compiler/circuits/member_function_invalid.leo.out
index 50f8f5a0b5..9c6ff5f5c7 100644
--- a/tests/expectations/compiler/compiler/circuits/member_function_invalid.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/member_function_invalid.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EASG0373009]: cannot call static function 'echo' of circuit 'Foo' from target\n    --> compiler-test:11:17\n     |\n  11 |     const err = a.echo(1u32); // echo is a static function and must be accessed using `::`\n     |                 ^^^^^^"
+  - "Error [EASG0373009]: cannot call static function 'echo' of circuit 'Foo' from target\n    --> compiler-test:14:17\n     |\n  14 |     const err = a.echo(1u32); // echo is a static function and must be accessed using `::`\n     |                 ^^^^^^"
diff --git a/tests/expectations/compiler/compiler/circuits/member_function_nested.leo.out b/tests/expectations/compiler/compiler/circuits/member_function_nested.leo.out
index 6760a49a72..6c03a35ee2 100644
--- a/tests/expectations/compiler/compiler/circuits/member_function_nested.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/member_function_nested.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 8b7192c1472be002b294589105832ae0e979e964fc62e63ba22b1f0cf3b762e5
-    canonicalized_ast: 8b7192c1472be002b294589105832ae0e979e964fc62e63ba22b1f0cf3b762e5
-    type_inferenced_ast: 14d9f0f0a222b6ec4236b0eb75e0740d624279181bb7ab9281752529b0a0f417
+    initial_ast: fce7f3121253c1816f714f477363129ad6d1d0ced57bf95d077018b662d37e2e
+    canonicalized_ast: fce7f3121253c1816f714f477363129ad6d1d0ced57bf95d077018b662d37e2e
+    type_inferenced_ast: f51786fa63d23648c8f5dbe7e68044ce5932cfaeb4959c4b6aace752d4e1d9be
diff --git a/tests/expectations/compiler/compiler/circuits/member_static_function.leo.out b/tests/expectations/compiler/compiler/circuits/member_static_function.leo.out
index 997cb9340a..aa70bd57bb 100644
--- a/tests/expectations/compiler/compiler/circuits/member_static_function.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/member_static_function.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: da39dd8a0b9ddb1304cfe1fd1dd555c01c43750524db4021d27e1425ec175322
-    canonicalized_ast: da39dd8a0b9ddb1304cfe1fd1dd555c01c43750524db4021d27e1425ec175322
-    type_inferenced_ast: 6cdc6a128cc2fb9220293b7c34ba4066cc63911f5ffbe00959142992f358e488
+    initial_ast: aa990d905a80b0c553cb00121b6489a093737b25430626b0ab213768c6578dd4
+    canonicalized_ast: aa990d905a80b0c553cb00121b6489a093737b25430626b0ab213768c6578dd4
+    type_inferenced_ast: c28318f0aa35886141aafdbcbd073bb5aeb7574a4415f36ac5a2ba3512c9249b
diff --git a/tests/expectations/compiler/compiler/circuits/member_static_function_invalid.leo.out b/tests/expectations/compiler/compiler/circuits/member_static_function_invalid.leo.out
index 0fedea2143..e6c57eca9d 100644
--- a/tests/expectations/compiler/compiler/circuits/member_static_function_invalid.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/member_static_function_invalid.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EASG0373028]: failed to resolve variable reference 'Foo'\n    --> compiler-test:10:17\n     |\n  10 |     const err = Foo.echo(1u32); // Invalid, echo is a static function and must be accessed using `::`\n     |                 ^^^"
+  - "Error [EASG0373028]: failed to resolve variable reference 'Foo'\n    --> compiler-test:13:17\n     |\n  13 |     const err = Foo.echo(1u32); // Invalid, echo is a static function and must be accessed using `::`\n     |                 ^^^"
diff --git a/tests/expectations/compiler/compiler/circuits/member_static_function_nested.leo.out b/tests/expectations/compiler/compiler/circuits/member_static_function_nested.leo.out
index 65a10e56bf..33dba02dae 100644
--- a/tests/expectations/compiler/compiler/circuits/member_static_function_nested.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/member_static_function_nested.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 380f44a5f5d7c1ef76c593da32936d480e79240bb7cd17fce0122b18c9e7f722
-    canonicalized_ast: 82f1edfa14a6e28b57828bf5f4be2aaaf21fb5468c0388088a56a4e44adb31fe
-    type_inferenced_ast: ab690a29d11e08699223ec4009174acdec23c3667d523af63556187d7396e66b
+    initial_ast: 6b7330aea358edabfdc424c8f1bc5e09bbd4d8ee7837c541a936c7ba969e408f
+    canonicalized_ast: 1908b80b37e8e3e8f8d842c460e67107f7c4b116da7c4bd411d48a88f2eb4680
+    type_inferenced_ast: ad5377f0e9b59f882d08b2e4013dcbb7a92ed8f68cf32f5012c73de5d4af0a5f
diff --git a/tests/expectations/compiler/compiler/circuits/member_static_function_undefined.leo.out b/tests/expectations/compiler/compiler/circuits/member_static_function_undefined.leo.out
index 66b5cccfc3..3cc7bd954a 100644
--- a/tests/expectations/compiler/compiler/circuits/member_static_function_undefined.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/member_static_function_undefined.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EASG0373002]: illegal reference to non-existant member 'echoed' of circuit 'Foo'\n    --> compiler-test:10:17\n     |\n  10 |     const err = Foo::echoed(1u32);\n     |                 ^^^^^^^^^^^"
+  - "Error [EASG0373002]: illegal reference to non-existant member 'echoed' of circuit 'Foo'\n    --> compiler-test:13:17\n     |\n  13 |     const err = Foo::echoed(1u32);\n     |                 ^^^^^^^^^^^"
diff --git a/tests/expectations/compiler/compiler/circuits/member_variable.leo.out b/tests/expectations/compiler/compiler/circuits/member_variable.leo.out
index b048ef8625..2b5dce2875 100644
--- a/tests/expectations/compiler/compiler/circuits/member_variable.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/member_variable.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 7abdf292d56f99ef05e39c1a55a6071d9d69ca8c8e537e08201472f057e7a127
-    canonicalized_ast: 7abdf292d56f99ef05e39c1a55a6071d9d69ca8c8e537e08201472f057e7a127
-    type_inferenced_ast: db8685abd4ffc32fa55786b847eff1d0694b871c1757eec70757879d82856872
+    initial_ast: f974cbe4ee74fe5b7fb214f7b8eab4c8a82c8c0f9c723b39869766d412d6f51d
+    canonicalized_ast: f974cbe4ee74fe5b7fb214f7b8eab4c8a82c8c0f9c723b39869766d412d6f51d
+    type_inferenced_ast: 5def83ccc0943b9f4623b4029782fbf4e5a43b806eb6048a8374509a29b19cea
diff --git a/tests/expectations/compiler/compiler/circuits/member_variable_and_function.leo.out b/tests/expectations/compiler/compiler/circuits/member_variable_and_function.leo.out
index 17d2be5676..c8f36a39cd 100644
--- a/tests/expectations/compiler/compiler/circuits/member_variable_and_function.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/member_variable_and_function.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: ca98bec50adc76ce348e28e7020d6e99cb6aa8fb733e0e0bce023ca8d1e3e4b6
-    canonicalized_ast: ca98bec50adc76ce348e28e7020d6e99cb6aa8fb733e0e0bce023ca8d1e3e4b6
-    type_inferenced_ast: ec5aad932c3d0d016142a7d288328547949da8add55025076c5d404d2451917d
+    initial_ast: 9f51ce1f8641def4b58ffefde0327cd71e3d7f372317a190acdb743676204d07
+    canonicalized_ast: 9f51ce1f8641def4b58ffefde0327cd71e3d7f372317a190acdb743676204d07
+    type_inferenced_ast: 95d30601df73b59f26b38c79e99e13cc28fc6f7eee094da6445dbd2522706036
diff --git a/tests/expectations/compiler/compiler/circuits/member_variable_fail.leo.out b/tests/expectations/compiler/compiler/circuits/member_variable_fail.leo.out
index f80585c1ea..3c9d05a3b0 100644
--- a/tests/expectations/compiler/compiler/circuits/member_variable_fail.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/member_variable_fail.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EASG0373002]: illegal reference to non-existant member 'y' of circuit 'Foo'\n    --> compiler-test:9:17\n     |\n   9 |     const err = a.y;\n     |                 ^^^"
+  - "Error [EASG0373002]: illegal reference to non-existant member 'y' of circuit 'Foo'\n    --> compiler-test:12:17\n     |\n  12 |     const err = a.y;\n     |                 ^^^"
diff --git a/tests/expectations/compiler/compiler/circuits/mut_function_fail.leo.out b/tests/expectations/compiler/compiler/circuits/mut_function_fail.leo.out
index 550752bee7..c030558bb8 100644
--- a/tests/expectations/compiler/compiler/circuits/mut_function_fail.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/mut_function_fail.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EASG0373007]: attempt to assign to function 'bar'\n    --> compiler-test:12:5\n     |\n  12 |     f.bar = 1u8;\n     |     ^^^^^^^^^^^"
+  - "Error [EASG0373007]: attempt to assign to function 'bar'\n    --> compiler-test:15:5\n     |\n  15 |     f.bar = 1u8;\n     |     ^^^^^^^^^^^"
diff --git a/tests/expectations/compiler/compiler/circuits/mut_self_function_fail.leo.out b/tests/expectations/compiler/compiler/circuits/mut_self_function_fail.leo.out
index e1958638b2..7f3f4984ec 100644
--- a/tests/expectations/compiler/compiler/circuits/mut_self_function_fail.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/mut_self_function_fail.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EASG0373007]: attempt to assign to function 'bar'\n    --> compiler-test:9:9\n     |\n   9 |         self.bar = new;\n     |         ^^^^^^^^^^^^^^"
+  - "Error [EASG0373007]: attempt to assign to function 'bar'\n    --> compiler-test:12:9\n     |\n  12 |         self.bar = new;\n     |         ^^^^^^^^^^^^^^"
diff --git a/tests/expectations/compiler/compiler/circuits/mut_self_static_function_fail.leo.out b/tests/expectations/compiler/compiler/circuits/mut_self_static_function_fail.leo.out
index e1958638b2..7f3f4984ec 100644
--- a/tests/expectations/compiler/compiler/circuits/mut_self_static_function_fail.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/mut_self_static_function_fail.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EASG0373007]: attempt to assign to function 'bar'\n    --> compiler-test:9:9\n     |\n   9 |         self.bar = new;\n     |         ^^^^^^^^^^^^^^"
+  - "Error [EASG0373007]: attempt to assign to function 'bar'\n    --> compiler-test:12:9\n     |\n  12 |         self.bar = new;\n     |         ^^^^^^^^^^^^^^"
diff --git a/tests/expectations/compiler/compiler/circuits/mut_self_variable.leo.out b/tests/expectations/compiler/compiler/circuits/mut_self_variable.leo.out
index 82325e1425..4d66eae1e8 100644
--- a/tests/expectations/compiler/compiler/circuits/mut_self_variable.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/mut_self_variable.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: a9313db75382b5afb38e9453bdb0dd6c0aa7368cf11e208eb0ca8124ea615d8b
-    canonicalized_ast: 3d4bb330e687601978d3f68544582d93c3bace6c0d3e8808c409b8534c563403
-    type_inferenced_ast: 14b0aa9c6d83ca85c625cdc78e4cf96dcbe1672b98c379e8783744d59d699bb1
+    initial_ast: 487137b6056b6581848325c184f203e6b8e1126a07c3edeef5fd09f782a14140
+    canonicalized_ast: 0137d626b6716a21c5bc65039d3a91e59c78c47b5ed1faed7ab1714c687331ae
+    type_inferenced_ast: dde0d4242540437765771b4f1b0ab71bcf84846231787a26407fde686c4b87bc
diff --git a/tests/expectations/compiler/compiler/circuits/mut_self_variable_branch.leo.out b/tests/expectations/compiler/compiler/circuits/mut_self_variable_branch.leo.out
index ed07a0a376..8ba5f842e0 100644
--- a/tests/expectations/compiler/compiler/circuits/mut_self_variable_branch.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/mut_self_variable_branch.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: ff029cd4035cb046857e7e8c0ff56c843969d2f04db76ced2698a20cf0491485
-    canonicalized_ast: 88447a6c1f7b92f4af7d9cecd7fd8d6fa5e96ed5dd6c6fde5897cf3df3f5cbc5
-    type_inferenced_ast: 51a081de631b9b95b2055ea5ba6a52d17972caf8bf7c70dadd49801af9d011f9
+    initial_ast: cadaffe377627256cf3c7e255647642b376168c5b81a9c1c1cb6684775abb110
+    canonicalized_ast: 1ee85d9839667f2949d24a0be13d272dd079ea09d2e4fb08e62a7e3b8e5ecf17
+    type_inferenced_ast: 1f34c95fc0a1ec28b980b199e54b6f239789d91447d41e89c2e099c437282ad2
diff --git a/tests/expectations/compiler/compiler/circuits/mut_self_variable_conditional.leo.out b/tests/expectations/compiler/compiler/circuits/mut_self_variable_conditional.leo.out
index eb9e16f4fd..a4f1fffad4 100644
--- a/tests/expectations/compiler/compiler/circuits/mut_self_variable_conditional.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/mut_self_variable_conditional.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 5d815c98c76a76dd93051902eae718df3db66e0268ba9af8ae62ef7af19b1d48
-    canonicalized_ast: 798961ad9da5a767a98882ff36944483f1f1412dcf10f67acf1f390a19bfc138
-    type_inferenced_ast: 6dbfd429fa50f0017a01dae57ae2a98e7452ab7c54bfcd251e1ed40e5f28176c
+    initial_ast: 983751a1008df24a1250b76c647f3a093060668ef3fe496bb32c2e2207c5663a
+    canonicalized_ast: f451f85f99ffe4c2fdd7699f1acf4f1bc7d15cc85ea9584fa8f5cff500ff33d9
+    type_inferenced_ast: 91209927df3bbfa0a98523a8014b96683642bfcd9170cd0f34e68cd0556aa4f7
diff --git a/tests/expectations/compiler/compiler/circuits/mut_self_variable_fail.leo.out b/tests/expectations/compiler/compiler/circuits/mut_self_variable_fail.leo.out
index d3d1a707f1..1bfb8998f2 100644
--- a/tests/expectations/compiler/compiler/circuits/mut_self_variable_fail.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/mut_self_variable_fail.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EASG0373033]: illegal assignment to immutable variable 'self'\n    --> compiler-test:7:9\n     |\n   7 |         self.a = new;\n     |         ^^^^^^^^^^^^"
+  - "Error [EASG0373033]: illegal assignment to immutable variable 'self'\n    --> compiler-test:10:9\n     |\n  10 |         self.a = new;\n     |         ^^^^^^^^^^^^"
diff --git a/tests/expectations/compiler/compiler/circuits/mut_static_function_fail.leo.out b/tests/expectations/compiler/compiler/circuits/mut_static_function_fail.leo.out
index db91c8aeef..cd0436165c 100644
--- a/tests/expectations/compiler/compiler/circuits/mut_static_function_fail.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/mut_static_function_fail.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EASG0373006]: extra circuit member 'a' for initialization of circuit 'Foo' is not allowed\n    --> compiler-test:8:19\n     |\n   8 |     let f = Foo { a: 0u8 };\n     |                   ^"
+  - "Error [EASG0373006]: extra circuit member 'a' for initialization of circuit 'Foo' is not allowed\n    --> compiler-test:11:19\n     |\n  11 |     let f = Foo { a: 0u8 };\n     |                   ^"
diff --git a/tests/expectations/compiler/compiler/circuits/mut_variable.leo.out b/tests/expectations/compiler/compiler/circuits/mut_variable.leo.out
index 23dca1d641..dbeda21096 100644
--- a/tests/expectations/compiler/compiler/circuits/mut_variable.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/mut_variable.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 357f19fd5e1fbbbeec8a18bcf14c30a7504feacbc88ffbd26e78eedf1d593275
-    canonicalized_ast: 357f19fd5e1fbbbeec8a18bcf14c30a7504feacbc88ffbd26e78eedf1d593275
-    type_inferenced_ast: aa3bf1734030119bb595a42d268b30509506ee06cf413b14bcde4e9056679dac
+    initial_ast: 4efab89c2c0c158574a22cdbd67147a1671396e64683d11a0429be322da8eaef
+    canonicalized_ast: 4efab89c2c0c158574a22cdbd67147a1671396e64683d11a0429be322da8eaef
+    type_inferenced_ast: 5a0c615cbf1a7a9e0678f9c19fc67d1cff86dab2daa744e97ed75aedd52553d5
diff --git a/tests/expectations/compiler/compiler/circuits/mut_variable_fail.leo.out b/tests/expectations/compiler/compiler/circuits/mut_variable_fail.leo.out
index d56bfa412b..ca8acf6dca 100644
--- a/tests/expectations/compiler/compiler/circuits/mut_variable_fail.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/mut_variable_fail.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EASG0373033]: illegal assignment to immutable variable 'f'\n    --> compiler-test:10:5\n     |\n  10 |     f.a = 1u8;\n     |     ^^^^^^^^^"
+  - "Error [EASG0373033]: illegal assignment to immutable variable 'f'\n    --> compiler-test:13:5\n     |\n  13 |     f.a = 1u8;\n     |     ^^^^^^^^^"
diff --git a/tests/expectations/compiler/compiler/circuits/mutable_call_immutable_context.leo.out b/tests/expectations/compiler/compiler/circuits/mutable_call_immutable_context.leo.out
index 6dcfa937a1..7299aac736 100644
--- a/tests/expectations/compiler/compiler/circuits/mutable_call_immutable_context.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/mutable_call_immutable_context.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: bb1ea12ac46ffd912b45b6febd71de41691c9aa064d07d5492e31845e72d00f2
-    canonicalized_ast: ad957837a54fca62c6da8665a04dbf57cb87b5c5a000038a1b900c2be359a178
-    type_inferenced_ast: 0fe1f5ac625424734a5140253228e3a6cde9f548b6deb18907f3ac49871180cc
+    initial_ast: f3c1f752d79bf6e33e9ce04cdfe79bcc4748e75b540c8e7738bdd6acd53286c2
+    canonicalized_ast: c2f39a6371a632676b8ac4a01aa51d70b848a50f5ed846f8f3a5f45f1680156f
+    type_inferenced_ast: f9f74212c1f9fbfbe5e6ed6f6c7a19be3c7128c1fdad29aac34447d2d7ec880c
diff --git a/tests/expectations/compiler/compiler/circuits/pedersen_mock.leo.out b/tests/expectations/compiler/compiler/circuits/pedersen_mock.leo.out
index 60234864fe..095197fc26 100644
--- a/tests/expectations/compiler/compiler/circuits/pedersen_mock.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/pedersen_mock.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 41a569090cff5eba31d9640b3f9e8d8585dfcd817d25a42a48edcd2d522fbb72
-    canonicalized_ast: 5150d7b2463ec10096f925fde523a4b956093ca44579487a82f15554fd7c32ed
-    type_inferenced_ast: 71d1f128ff9c4fa1df5189139360f4ccb3a460e83034c635952e6875c7fe41bb
+    initial_ast: f49f2da00f26e2285667ddf27968026e98196e5b8fdb26bc7146eb3da8679607
+    canonicalized_ast: b12bf33d368ecb7ca2e50cac999ba06c28354bf635df82625a5f84f717ab3516
+    type_inferenced_ast: c5d54c79f04a89b623ba2338400ef3192f95d258be829437e1979de43b177a3a
diff --git a/tests/expectations/compiler/compiler/circuits/return_self_type_array.leo.out b/tests/expectations/compiler/compiler/circuits/return_self_type_array.leo.out
index 43b372e66e..3e7f78ddd4 100644
--- a/tests/expectations/compiler/compiler/circuits/return_self_type_array.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/return_self_type_array.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: f7e0f5bba37e3a25b8fdf655d2588054659ff212cade431c17bb548757a7781d
-    canonicalized_ast: 8425ce431117fc5d543a83ddde9e0cf946e0435146ede09096906a0f1fe9eff2
-    type_inferenced_ast: da1985f44598222e3940c14fefed9ce269e43d474aaf15b622292cd63f3efe87
+    initial_ast: a1c2bcb13bef9b8e683deb19ffe7ab50001993a6e148869a10d631374bea527b
+    canonicalized_ast: 4f6462a921a9f91de1579d3dfbed3c9f8684febfb371db997747f6fe29729d6a
+    type_inferenced_ast: 561aa58ee05e847851feecfa9e73d77b0a4bda3f2b299c3292af32b0c338bc6d
diff --git a/tests/expectations/compiler/compiler/circuits/return_self_type_tuple.leo.out b/tests/expectations/compiler/compiler/circuits/return_self_type_tuple.leo.out
index 41f11b772c..18660f6ce2 100644
--- a/tests/expectations/compiler/compiler/circuits/return_self_type_tuple.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/return_self_type_tuple.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: ab5c9ec7a0930713141b84e303355a1ddf69340f5222699c2192868e0e0dc8c4
-    canonicalized_ast: 3442d75d2ced2e10abfde09306d9bf91046cecd295a5e48e66a1823abff28ffc
-    type_inferenced_ast: ace67f309b2535d71ec2b277b42569fa3f89e6bcb817e8b911f7a773c9c4186e
+    initial_ast: cc72431e2056037a50a7c9f31a2fbe80b7c398b5628dfce39eea1ff37c70a0e8
+    canonicalized_ast: 4a25b01250f71e20cc410a0ecab3083a4ec0e2724dd2250cf88b304191fd905e
+    type_inferenced_ast: f2618ca3b13ec75ca0f7b722aa215d033b4024bece414c4cd156461f541a2b13
diff --git a/tests/expectations/compiler/compiler/circuits/self_circuit.leo.out b/tests/expectations/compiler/compiler/circuits/self_circuit.leo.out
index d12165d6a1..435cc83dea 100644
--- a/tests/expectations/compiler/compiler/circuits/self_circuit.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/self_circuit.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EPAR0370009]: unexpected string: expected 'ident', got 'static'\n    --> compiler-test:5:5\n     |\n   5 |     static function new() -> Self {\n     |     ^^^^^^"
+  - "Error [EPAR0370009]: unexpected string: expected 'ident', got 'static'\n    --> compiler-test:8:5\n     |\n   8 |     static function new() -> Self {\n     |     ^^^^^^"
diff --git a/tests/expectations/compiler/compiler/circuits/self_fail.leo.out b/tests/expectations/compiler/compiler/circuits/self_fail.leo.out
index 25126ce204..f0ec64d2ba 100644
--- a/tests/expectations/compiler/compiler/circuits/self_fail.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/self_fail.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EASG0373000]: failed to resolve circuit: 'Self'\n    --> compiler-test:4:5\n     |\n   4 |     Self::main();\n     |     ^^^^"
+  - "Error [EASG0373000]: failed to resolve circuit: 'Self'\n    --> compiler-test:7:5\n     |\n   7 |     Self::main();\n     |     ^^^^"
diff --git a/tests/expectations/compiler/compiler/circuits/self_member.leo.out b/tests/expectations/compiler/compiler/circuits/self_member.leo.out
index cbe4c9f992..f98fbfec42 100644
--- a/tests/expectations/compiler/compiler/circuits/self_member.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/self_member.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 5627039d5f3151255d4c7fff31fa548febc788fe2717606a4814a91937fee405
-    canonicalized_ast: 5627039d5f3151255d4c7fff31fa548febc788fe2717606a4814a91937fee405
-    type_inferenced_ast: 88e398f6f173de48fb7a6109fe886fd59b2fae70d1b9ccc53fd447d9b46ad0a3
+    initial_ast: 7d4f929c3da97a00b99dee24578cf434398755575b5004876f7b064de2610391
+    canonicalized_ast: 7d4f929c3da97a00b99dee24578cf434398755575b5004876f7b064de2610391
+    type_inferenced_ast: 6baf29bf3bc1846c6840a15f2462f18f292d32f2e8c19612eff22918b568d5cc
diff --git a/tests/expectations/compiler/compiler/circuits/self_member_invalid.leo.out b/tests/expectations/compiler/compiler/circuits/self_member_invalid.leo.out
index 8056d661ae..cda635d3bc 100644
--- a/tests/expectations/compiler/compiler/circuits/self_member_invalid.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/self_member_invalid.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EASG0373009]: cannot call static function 'bar' of circuit 'Foo' from target\n    --> compiler-test:13:17\n     |\n  13 |     const err = foo.bar();\n     |                 ^^^^^^^"
+  - "Error [EASG0373009]: cannot call static function 'bar' of circuit 'Foo' from target\n    --> compiler-test:16:17\n     |\n  16 |     const err = foo.bar();\n     |                 ^^^^^^^"
diff --git a/tests/expectations/compiler/compiler/circuits/self_member_undefined.leo.out b/tests/expectations/compiler/compiler/circuits/self_member_undefined.leo.out
index 357c5dcc1e..c988b9dbde 100644
--- a/tests/expectations/compiler/compiler/circuits/self_member_undefined.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/self_member_undefined.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EASG0373009]: cannot call static function 'bar' of circuit 'Foo' from target\n    --> compiler-test:11:17\n     |\n  11 |     const err = foo.bar();\n     |                 ^^^^^^^"
+  - "Error [EASG0373009]: cannot call static function 'bar' of circuit 'Foo' from target\n    --> compiler-test:14:17\n     |\n  14 |     const err = foo.bar();\n     |                 ^^^^^^^"
diff --git a/tests/expectations/compiler/compiler/console/assert.leo.out b/tests/expectations/compiler/compiler/console/assert.leo.out
index 6d42c7f054..2bd4155c08 100644
--- a/tests/expectations/compiler/compiler/console/assert.leo.out
+++ b/tests/expectations/compiler/compiler/console/assert.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 8a1b1671e3685c54d7974b31fbc758210d2cafd8443c33ed8a3b14ad3a1b9fc4
-    canonicalized_ast: 8a1b1671e3685c54d7974b31fbc758210d2cafd8443c33ed8a3b14ad3a1b9fc4
-    type_inferenced_ast: e60210b668a87ade79886bffd2ebc8ded95f47d12d5c8b67adfd896ea3a1009e
+    initial_ast: 63e71b86e15c71b00b02a0536e8623389dfd0c867983b1f36a7bc9411b40894f
+    canonicalized_ast: 63e71b86e15c71b00b02a0536e8623389dfd0c867983b1f36a7bc9411b40894f
+    type_inferenced_ast: cbfdd4475be39754c38ba64f5435b11f45abb9f1b5f7ebc8a155a8aa7b00d3b7
diff --git a/tests/expectations/compiler/compiler/console/conditional_assert.leo.out b/tests/expectations/compiler/compiler/console/conditional_assert.leo.out
index df7e07e181..3299682fb6 100644
--- a/tests/expectations/compiler/compiler/console/conditional_assert.leo.out
+++ b/tests/expectations/compiler/compiler/console/conditional_assert.leo.out
@@ -16,6 +16,6 @@ outputs:
       - input_file: cond_2.in
         output:
           registers: {}
-    initial_ast: 4bafaebf2c6733478fdff48ba2aca4892da0874d88a8cde9a9ea7299939cfa92
-    canonicalized_ast: 036d49891c7d9eb0c713eb9eaf7a66321fdd32ff225fa1428f9a7184ebf3679e
-    type_inferenced_ast: 3d13c527af96ec05f92678c2009047200736e8799fd29875ba371fd34d95ce5a
+    initial_ast: 22b051994432b793a22d4933801da06dfecdcdf74237218a2fdefe3f725ced6d
+    canonicalized_ast: 97d44ebf5ca53a17a018995119a69adc23b6ac41fc2ddad504d3d5e21c407a71
+    type_inferenced_ast: b1f9cdb0e21fef49e4220f1f87485905c707ce9e817023d387f549f44f9ae703
diff --git a/tests/expectations/compiler/compiler/console/error.leo.out b/tests/expectations/compiler/compiler/console/error.leo.out
index d198e0551d..60294c0b92 100644
--- a/tests/expectations/compiler/compiler/console/error.leo.out
+++ b/tests/expectations/compiler/compiler/console/error.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: d9518f1fbefe56299388ca536aa8d0cc8070eb4ddebf824472d369111578f4ec
-    canonicalized_ast: d9518f1fbefe56299388ca536aa8d0cc8070eb4ddebf824472d369111578f4ec
-    type_inferenced_ast: f45369f6227b5fed3322d1d28718bc84382c1312214b6fa0b315b3e02c66f48b
+    initial_ast: b38fbc4f10d86e3855a5e018f01dd2ba1533774ee883dbc401e566d02b539dd5
+    canonicalized_ast: b38fbc4f10d86e3855a5e018f01dd2ba1533774ee883dbc401e566d02b539dd5
+    type_inferenced_ast: 499df1f990f99e9128500affaaa96514017c6d9c41b693f3a0f913de19e4cf0e
diff --git a/tests/expectations/compiler/compiler/console/log.leo.out b/tests/expectations/compiler/compiler/console/log.leo.out
index a03f02f37b..d7266a4dc4 100644
--- a/tests/expectations/compiler/compiler/console/log.leo.out
+++ b/tests/expectations/compiler/compiler/console/log.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: aecf83a2f4aa6587964d65a38e106eb9547d25267fde72fcf078d2498944818b
-    canonicalized_ast: aecf83a2f4aa6587964d65a38e106eb9547d25267fde72fcf078d2498944818b
-    type_inferenced_ast: a5345a4bf0f979eef1166902ee0e70ba3635125f1793b0b0742162cc98f46681
+    initial_ast: 1d81a8acb5b4e33103d6cf60a3ce52653c1f389f106511e05afd4347300725d0
+    canonicalized_ast: 1d81a8acb5b4e33103d6cf60a3ce52653c1f389f106511e05afd4347300725d0
+    type_inferenced_ast: c972f3cc92a4ea26f3f4f97711c65ea24813a49fa345a838a1f849fa879e7880
diff --git a/tests/expectations/compiler/compiler/console/log_conditional.leo.out b/tests/expectations/compiler/compiler/console/log_conditional.leo.out
index d11c386ccd..a8b6f21c12 100644
--- a/tests/expectations/compiler/compiler/console/log_conditional.leo.out
+++ b/tests/expectations/compiler/compiler/console/log_conditional.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: f8e35dfef4049fcb03445300a6c86627b4b2b3934e948d4e15849f0464ad318b
-    canonicalized_ast: f8e35dfef4049fcb03445300a6c86627b4b2b3934e948d4e15849f0464ad318b
-    type_inferenced_ast: 684c132f914cd9b2bbe55cc7fa868d9f4818a5951cefba287989d787c13c40d3
+    initial_ast: 66b42770e4439a680790b66009e46cd232ef11bf959a543765344077d0d7d69b
+    canonicalized_ast: 66b42770e4439a680790b66009e46cd232ef11bf959a543765344077d0d7d69b
+    type_inferenced_ast: 068d02ae17bb5647f8a009f22ea72aafdcd0373661b617b3542e498e0df134f6
diff --git a/tests/expectations/compiler/compiler/console/log_fail.leo.out b/tests/expectations/compiler/compiler/console/log_fail.leo.out
index 3d62711430..c09dad1c43 100644
--- a/tests/expectations/compiler/compiler/console/log_fail.leo.out
+++ b/tests/expectations/compiler/compiler/console/log_fail.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EPAR0370009]: unexpected string: expected 'formatted string', got 'hello'\n    --> compiler-test:4:18\n     |\n   4 |     console.log( hello );\n     |                  ^^^^^"
+  - "Error [EPAR0370009]: unexpected string: expected 'formatted string', got 'hello'\n    --> compiler-test:7:18\n     |\n   7 |     console.log( hello );\n     |                  ^^^^^"
diff --git a/tests/expectations/compiler/compiler/console/log_input.leo.out b/tests/expectations/compiler/compiler/console/log_input.leo.out
index bf67ccd495..cb36762994 100644
--- a/tests/expectations/compiler/compiler/console/log_input.leo.out
+++ b/tests/expectations/compiler/compiler/console/log_input.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 92825fee401d5b953f2fbb155a1069148ba9ceb7dc61efadd5b29bc2ac483ac7
-    canonicalized_ast: 92825fee401d5b953f2fbb155a1069148ba9ceb7dc61efadd5b29bc2ac483ac7
-    type_inferenced_ast: 0b2d12419a1f32d70683f171ddaad7c5d683fe7975e2315cb6167dbcd16f382d
+    initial_ast: 942d0d9cfc204b89557793ecc95f74bb08f7aaebd5a2dc74d3ed806284f0eaf2
+    canonicalized_ast: 942d0d9cfc204b89557793ecc95f74bb08f7aaebd5a2dc74d3ed806284f0eaf2
+    type_inferenced_ast: 608f17ceaef4110bb9b437a1f324d6268c4f3fece4279589adf9ae6fa76c912d
diff --git a/tests/expectations/compiler/compiler/console/log_parameter.leo.out b/tests/expectations/compiler/compiler/console/log_parameter.leo.out
index cea1bf46f7..aa57840fc2 100644
--- a/tests/expectations/compiler/compiler/console/log_parameter.leo.out
+++ b/tests/expectations/compiler/compiler/console/log_parameter.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: ab38ae5a77b338e05dcf4554f9510f78d48277964a5f10fb58506967d9e4be8a
-    canonicalized_ast: ab38ae5a77b338e05dcf4554f9510f78d48277964a5f10fb58506967d9e4be8a
-    type_inferenced_ast: 0af520b7cbdb4f67914880e62a5ba7ead23ee6c3f173d4573b0d306532f4bf03
+    initial_ast: 10b6433571f5ec7b10bf70f4dadecb9dfe7ee1c60a92261aef7e5e24bae500cf
+    canonicalized_ast: 10b6433571f5ec7b10bf70f4dadecb9dfe7ee1c60a92261aef7e5e24bae500cf
+    type_inferenced_ast: d2c4c5bb8d81a155ae3f0954fbe4f6e9c86dd4e27f1fd41217aaf7a3165bafa7
diff --git a/tests/expectations/compiler/compiler/console/log_parameter_fail_empty.leo.out b/tests/expectations/compiler/compiler/console/log_parameter_fail_empty.leo.out
index a29353bd2f..0eae434427 100644
--- a/tests/expectations/compiler/compiler/console/log_parameter_fail_empty.leo.out
+++ b/tests/expectations/compiler/compiler/console/log_parameter_fail_empty.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [ECMP0376006]: Formatter given 1 containers and found 0 parameters\n    --> compiler-test:4:17\n     |\n   4 |     console.log(\"{}\");\n     |                 ^^^^"
+  - "Error [ECMP0376006]: Formatter given 1 containers and found 0 parameters\n    --> compiler-test:7:17\n     |\n   7 |     console.log(\"{}\");\n     |                 ^^^^"
diff --git a/tests/expectations/compiler/compiler/console/log_parameter_fail_none.leo.out b/tests/expectations/compiler/compiler/console/log_parameter_fail_none.leo.out
index 7af538b8d5..b7675f2c0c 100644
--- a/tests/expectations/compiler/compiler/console/log_parameter_fail_none.leo.out
+++ b/tests/expectations/compiler/compiler/console/log_parameter_fail_none.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [ECMP0376006]: Formatter given 0 containers and found 1 parameters\n    --> compiler-test:4:17\n     |\n   4 |     console.log(\"\", 1u32);\n     |                 ^^^^^^^^"
+  - "Error [ECMP0376006]: Formatter given 0 containers and found 1 parameters\n    --> compiler-test:7:17\n     |\n   7 |     console.log(\"\", 1u32);\n     |                 ^^^^^^^^"
diff --git a/tests/expectations/compiler/compiler/console/log_parameter_fail_unknown.leo.out b/tests/expectations/compiler/compiler/console/log_parameter_fail_unknown.leo.out
index 0693d53502..e5fb597a12 100644
--- a/tests/expectations/compiler/compiler/console/log_parameter_fail_unknown.leo.out
+++ b/tests/expectations/compiler/compiler/console/log_parameter_fail_unknown.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EASG0373028]: failed to resolve variable reference 'a'\n    --> compiler-test:4:23\n     |\n   4 |     console.log(\"{}\", a);\n     |                       ^"
+  - "Error [EASG0373028]: failed to resolve variable reference 'a'\n    --> compiler-test:7:23\n     |\n   7 |     console.log(\"{}\", a);\n     |                       ^"
diff --git a/tests/expectations/compiler/compiler/console/log_parameter_many.leo.out b/tests/expectations/compiler/compiler/console/log_parameter_many.leo.out
index c8452bd882..e140ea8105 100644
--- a/tests/expectations/compiler/compiler/console/log_parameter_many.leo.out
+++ b/tests/expectations/compiler/compiler/console/log_parameter_many.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 746e67c3c32b565a747779078d83f41197856a657b59eeb9cc9ea4e60677dac0
-    canonicalized_ast: 746e67c3c32b565a747779078d83f41197856a657b59eeb9cc9ea4e60677dac0
-    type_inferenced_ast: a586b22d1a595440d7a0262c959ae1b668be2980d131c056ebc6536827606454
+    initial_ast: a8fd5fa849f29ffffb5d8aa791673c8d63f5003456d9b7f075c4fbd3ba855b3d
+    canonicalized_ast: a8fd5fa849f29ffffb5d8aa791673c8d63f5003456d9b7f075c4fbd3ba855b3d
+    type_inferenced_ast: f5a657cb1eab3f4ec79ac388e1247812af930ff2d373a3cf734b847d288b4e91
diff --git a/tests/expectations/compiler/compiler/core/core_circuit_invalid.leo.out b/tests/expectations/compiler/compiler/core/core_circuit_invalid.leo.out
index 0fe84aeec0..78dc74d65a 100644
--- a/tests/expectations/compiler/compiler/core/core_circuit_invalid.leo.out
+++ b/tests/expectations/compiler/compiler/core/core_circuit_invalid.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EASG0373001]: failed to resolve import: 'core.unstable.blake2s.BadCircuit'\n    --> compiler-test:3:30\n     |\n   3 | import core.unstable.blake2s.BadCircuit; // `BadCircuit` is not included in the blake2s package\n     |                              ^^^^^^^^^^"
+  - "Error [EASG0373001]: failed to resolve import: 'core.unstable.blake2s.BadCircuit'\n    --> compiler-test:6:30\n     |\n   6 | import core.unstable.blake2s.BadCircuit; // `BadCircuit` is not included in the blake2s package\n     |                              ^^^^^^^^^^"
diff --git a/tests/expectations/compiler/compiler/definition/out_of_order.leo.out b/tests/expectations/compiler/compiler/definition/out_of_order.leo.out
index e11f80b6f7..3dc5ce5c73 100644
--- a/tests/expectations/compiler/compiler/definition/out_of_order.leo.out
+++ b/tests/expectations/compiler/compiler/definition/out_of_order.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 61087d13f528efabd02f9993e0e5ff23051fa0de9e93a96ef8835f3a0457d87c
-    canonicalized_ast: 36bde977c62949baf95dd50d0cfaadd1a4a926a2a4d7f55388b21beaefd5e43c
-    type_inferenced_ast: ab6c6ed97331a676348142fb242cf0f589468f893f97c3e4832f60d4736fc0ca
+    initial_ast: 0bbeca67367d50802fa0f0506d197c11448778796980f04053efb46a5c2dd843
+    canonicalized_ast: 2d626e407c1100f5a2f914b6466de396d8a13df4e7129cd4aed1a609343be127
+    type_inferenced_ast: 85c7a980a02ee0532ae7d5143dca01ddaae08d9b09d8d837682adebe45fa06ae
diff --git a/tests/expectations/compiler/compiler/definition/out_of_order_with_import.leo.out b/tests/expectations/compiler/compiler/definition/out_of_order_with_import.leo.out
index 6ce8d6fb90..37b719472f 100644
--- a/tests/expectations/compiler/compiler/definition/out_of_order_with_import.leo.out
+++ b/tests/expectations/compiler/compiler/definition/out_of_order_with_import.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: e1792bcb7fe5be2fdb8ca2abd21feb63c9aadbc367d2cba1750fff1b34b8d1b2
-    canonicalized_ast: 9badf16677c761fbcb56ea79f0e67b46f8e12c3dc83a9c3fc35559cbc509ff88
-    type_inferenced_ast: 571f7723bd45c3e54c04038aa20707640282efe293ba23dfff65b1b318a3a173
+    initial_ast: 742df540c6f46466d248ce34596083fe6d9fd15b9416c360d6a73e7e14bbe054
+    canonicalized_ast: 8c802b4b421b9b2ee747c3596c115c32499baf37104e91f1932ad30e9e1e9ebc
+    type_inferenced_ast: e2703ab816b9550f6207d099f9e50e0b554ca5d69a45c16b3aa1d505e2546a6a
diff --git a/tests/expectations/compiler/compiler/field/add.leo.out b/tests/expectations/compiler/compiler/field/add.leo.out
index 7f7f43887e..3d8627f71b 100644
--- a/tests/expectations/compiler/compiler/field/add.leo.out
+++ b/tests/expectations/compiler/compiler/field/add.leo.out
@@ -16,6 +16,6 @@ outputs:
             r:
               type: bool
               value: "true"
-    initial_ast: ade887261346e7629dcda78e09b43be2bf742af8cf7aa5e8d3f22d1d9c2c2f24
-    canonicalized_ast: ade887261346e7629dcda78e09b43be2bf742af8cf7aa5e8d3f22d1d9c2c2f24
-    type_inferenced_ast: af10005d855a2c6277340bd98a1a8893dbc90827eda252f9956e25b131a4dc6c
+    initial_ast: 031f2e919d6b77b1dafe73e6ddc888881d865e2250362dc6e19c39165f0ac9e0
+    canonicalized_ast: 031f2e919d6b77b1dafe73e6ddc888881d865e2250362dc6e19c39165f0ac9e0
+    type_inferenced_ast: 0791dc7e6673ab4eee6e7c759f6aa019554a0f5ea1b6cfa461ff16cc75b56e64
diff --git a/tests/expectations/compiler/compiler/field/div.leo.out b/tests/expectations/compiler/compiler/field/div.leo.out
index 7d881df6d0..c80b53ed36 100644
--- a/tests/expectations/compiler/compiler/field/div.leo.out
+++ b/tests/expectations/compiler/compiler/field/div.leo.out
@@ -16,6 +16,6 @@ outputs:
             r:
               type: bool
               value: "true"
-    initial_ast: 150c20bc77cda0c046ef9c2f77fe3db7887722125912ee4bc45e61aca3b3275a
-    canonicalized_ast: 150c20bc77cda0c046ef9c2f77fe3db7887722125912ee4bc45e61aca3b3275a
-    type_inferenced_ast: 3c72b501b373df6d34d8c9a20c7d73e1e1e6f61cbaa3713b3324c157036f866e
+    initial_ast: d54f76ef8d8f009c3cdca936216a45ccb40305878e95376b703e954e00c68d0e
+    canonicalized_ast: d54f76ef8d8f009c3cdca936216a45ccb40305878e95376b703e954e00c68d0e
+    type_inferenced_ast: 795d182d1f1fd8b9f734069441788598d7d7d9ac3a127420339349d0e481012a
diff --git a/tests/expectations/compiler/compiler/field/eq.leo.out b/tests/expectations/compiler/compiler/field/eq.leo.out
index 804084d676..c3b209e679 100644
--- a/tests/expectations/compiler/compiler/field/eq.leo.out
+++ b/tests/expectations/compiler/compiler/field/eq.leo.out
@@ -16,6 +16,6 @@ outputs:
             r:
               type: bool
               value: "true"
-    initial_ast: 00df32b9a2a3cc1c3b8ec2e4b7f1a15e38d4539992e4a805764814062fd3614e
-    canonicalized_ast: 00df32b9a2a3cc1c3b8ec2e4b7f1a15e38d4539992e4a805764814062fd3614e
-    type_inferenced_ast: 786b1a7c74542185e90e6690d6034487b19b1ba7047e3985cc9b85824c98b26f
+    initial_ast: 6df1fed18f7e8455169cb63f4291b0a371afa183077cae243fc4f66390109226
+    canonicalized_ast: 6df1fed18f7e8455169cb63f4291b0a371afa183077cae243fc4f66390109226
+    type_inferenced_ast: 76a2e0b489f71eda6917126bf98455931e70cd49f3103e646921605cdd8261bc
diff --git a/tests/expectations/compiler/compiler/field/field.leo.out b/tests/expectations/compiler/compiler/field/field.leo.out
index ebfa1d2868..fae70f6bc3 100644
--- a/tests/expectations/compiler/compiler/field/field.leo.out
+++ b/tests/expectations/compiler/compiler/field/field.leo.out
@@ -16,6 +16,6 @@ outputs:
             r:
               type: bool
               value: "true"
-    initial_ast: 2fcfda40a52babd238ce5125a6a0b2b829ade39f94d2ce0b216387939c59431e
-    canonicalized_ast: 2fcfda40a52babd238ce5125a6a0b2b829ade39f94d2ce0b216387939c59431e
-    type_inferenced_ast: b63f0f712a535d3f14f8c1a443568c3af9f140440e6b115de23e463a1728debf
+    initial_ast: 04d3374e571bc76f41d1a277c0adad51b2d350e6ed09e80751b026e43268586b
+    canonicalized_ast: 04d3374e571bc76f41d1a277c0adad51b2d350e6ed09e80751b026e43268586b
+    type_inferenced_ast: 1a703ee50f8e4964eb63ac8831df4941b4f14a5b954c758148b65ee5487306fa
diff --git a/tests/expectations/compiler/compiler/field/mul.leo.out b/tests/expectations/compiler/compiler/field/mul.leo.out
index 0218d43581..befc29de1c 100644
--- a/tests/expectations/compiler/compiler/field/mul.leo.out
+++ b/tests/expectations/compiler/compiler/field/mul.leo.out
@@ -16,6 +16,6 @@ outputs:
             r:
               type: bool
               value: "false"
-    initial_ast: 2635739c604a7ae3a3555480bb442b819af18179044e24bf19faf5ba546c307a
-    canonicalized_ast: 2635739c604a7ae3a3555480bb442b819af18179044e24bf19faf5ba546c307a
-    type_inferenced_ast: 813b8fb791cf91468b34722fb4cb8b2a0005cddb135eee6e1688675104794ab5
+    initial_ast: 29e1be1292ecca000c52a808b41741449c8ee50f6c79311da45ed094caa90e60
+    canonicalized_ast: 29e1be1292ecca000c52a808b41741449c8ee50f6c79311da45ed094caa90e60
+    type_inferenced_ast: dd65ae6e295d2eea9dc137e4af32060a74914e1520f787bf90bc43f76eca1550
diff --git a/tests/expectations/compiler/compiler/field/negate.leo.out b/tests/expectations/compiler/compiler/field/negate.leo.out
index e5ea188c6a..96db922f16 100644
--- a/tests/expectations/compiler/compiler/field/negate.leo.out
+++ b/tests/expectations/compiler/compiler/field/negate.leo.out
@@ -16,6 +16,6 @@ outputs:
             r:
               type: bool
               value: "true"
-    initial_ast: 3584ba6c06f32660612d44e78a7d8a83075046a49ff4cd47a6165d603ebf85c3
-    canonicalized_ast: 3584ba6c06f32660612d44e78a7d8a83075046a49ff4cd47a6165d603ebf85c3
-    type_inferenced_ast: 336ecb6f4ead5395c4c5ad52fa5eb29993aa7db2ab65749acdb39c068961e64b
+    initial_ast: 35e9685e509391c831ef91147833093389455b546882a00643c5bc9f38fd8dda
+    canonicalized_ast: 35e9685e509391c831ef91147833093389455b546882a00643c5bc9f38fd8dda
+    type_inferenced_ast: 126401fc88dc298b7d4f9234e7a5cb2791af3ffe6f3c7f7569847765d3e3f87e
diff --git a/tests/expectations/compiler/compiler/field/no_space_between_literal.leo.out b/tests/expectations/compiler/compiler/field/no_space_between_literal.leo.out
index bcdd357d41..c440384904 100644
--- a/tests/expectations/compiler/compiler/field/no_space_between_literal.leo.out
+++ b/tests/expectations/compiler/compiler/field/no_space_between_literal.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EPAR0370004]: Unexpected white space between terms 1 and field\n    --> compiler-test:4:13\n     |\n   4 |   const f = 1 field;\n     |             ^"
+  - "Error [EPAR0370004]: Unexpected white space between terms 1 and field\n    --> compiler-test:7:13\n     |\n   7 |   const f = 1 field;\n     |             ^"
diff --git a/tests/expectations/compiler/compiler/function/array_input.leo.out b/tests/expectations/compiler/compiler/function/array_input.leo.out
index ede2412315..da6887063a 100644
--- a/tests/expectations/compiler/compiler/function/array_input.leo.out
+++ b/tests/expectations/compiler/compiler/function/array_input.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: f57c7199a6f40d6f898133390fc69cc7ac17c6522adc2653eba92635eddad340
-    canonicalized_ast: 6402aa395f7030e58a146ed91755220ee495693e59b9b544f7db59e190b3ef17
-    type_inferenced_ast: 94a3c2e3632d3ab5fd7af3ea51b9f8bedb82f00762686a10764d103b35787261
+    initial_ast: fffad08a5c9f7ccc0ff6ca3731ee3ca0a87ba7a5cd79b6123115902b9ad00b4e
+    canonicalized_ast: cab609893a1812fa3e285c7926cce56402a4f7e861d44585b6bf978fd1c4f9fa
+    type_inferenced_ast: b7043f56e3b06c6e73b4b84626cb3449533961331bf0fc27be340e8196e867bf
diff --git a/tests/expectations/compiler/compiler/function/array_params_direct_call.leo.out b/tests/expectations/compiler/compiler/function/array_params_direct_call.leo.out
index 27d44cf87f..da8cfbbc23 100644
--- a/tests/expectations/compiler/compiler/function/array_params_direct_call.leo.out
+++ b/tests/expectations/compiler/compiler/function/array_params_direct_call.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 8e231f37db8feb5d0490f9ee8ad1b4844327cc213238b849b9250dcd416c578c
-    canonicalized_ast: 63c46bc9757274e52cecf05bdab4b2adaa2177ccc3ced0a8e6a6e0d3ec73038d
-    type_inferenced_ast: 958cf68742c142d071df29899bb8b81f66e9c5d325325b71d94543762c804001
+    initial_ast: 22cc489a96d9094922816060b6d7868d308a5c62fb9f7d5e6be124befa8ac329
+    canonicalized_ast: fbde3797ca7da25b614de1de1937bf65397181deb574bc7f53c2681a8d16331e
+    type_inferenced_ast: ab7c69bbbd8acb791b38903999d877e50b4c95eb413bb0aa3bcc0507a47b93b4
diff --git a/tests/expectations/compiler/compiler/function/conditional_return.leo.out b/tests/expectations/compiler/compiler/function/conditional_return.leo.out
index decebbaae1..6e8a50766d 100644
--- a/tests/expectations/compiler/compiler/function/conditional_return.leo.out
+++ b/tests/expectations/compiler/compiler/function/conditional_return.leo.out
@@ -16,6 +16,6 @@ outputs:
             a:
               type: u32
               value: "4"
-    initial_ast: 606414e516d1f59459d71c58f650c63cea9e3213ab59ebbcc617001677d9eea3
-    canonicalized_ast: 606414e516d1f59459d71c58f650c63cea9e3213ab59ebbcc617001677d9eea3
-    type_inferenced_ast: 74c63a94510e5e000a5b6fb213f34c89bc1d35c69a549eea3b5aad627dd7c43a
+    initial_ast: 810528e8438b9623f6da955f99801cff66e8cbd6b3947877b0005e0142ec1c79
+    canonicalized_ast: 810528e8438b9623f6da955f99801cff66e8cbd6b3947877b0005e0142ec1c79
+    type_inferenced_ast: e5f7755adf05e04ec7ae15c93ec3be2f2bd3d528c879920869a9dcfdc171fdb0
diff --git a/tests/expectations/compiler/compiler/function/duplicate_definition_fail.leo.out b/tests/expectations/compiler/compiler/function/duplicate_definition_fail.leo.out
index c8c2dd729f..75b1565044 100644
--- a/tests/expectations/compiler/compiler/function/duplicate_definition_fail.leo.out
+++ b/tests/expectations/compiler/compiler/function/duplicate_definition_fail.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EASG0373016]: a function named \"main\" already exists in this scope\n    --> compiler-test:8:1\n     |\n   8 | function main() {\n   9 |      ...\n  10 | }\n     | ^"
+  - "Error [EASG0373016]: a function named \"main\" already exists in this scope\n    --> compiler-test:12:1\n     |\n  12 | function main() {\n  13 |      ...\n  14 | }\n     | ^"
diff --git a/tests/expectations/compiler/compiler/function/empty.leo.out b/tests/expectations/compiler/compiler/function/empty.leo.out
index 40c161337f..6964afa76c 100644
--- a/tests/expectations/compiler/compiler/function/empty.leo.out
+++ b/tests/expectations/compiler/compiler/function/empty.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 2dd3bd6fa202a0356e48f757a1e745888aafab1c89721e272eb65534f658a8ef
-    canonicalized_ast: 689cc7ed7957d488050014971ea55b69970e43a8863fe36176f95224fa601323
-    type_inferenced_ast: c8b358ff7af51a9f0e11db6ceb465ff36142bbc14159a7aaeefba55ce9c18a69
+    initial_ast: 27214811195edfe332ddf30df53c46c89cd0b1d155564c0f98399952a1583786
+    canonicalized_ast: 42587828117145591f5771141265f67a3d01d074bb6969be95aaf1d4d5caf905
+    type_inferenced_ast: 84b58b239ea56e5108480c16df6016d429ab9f16139f32538abe22451858c3ae
diff --git a/tests/expectations/compiler/compiler/function/iteration.leo.out b/tests/expectations/compiler/compiler/function/iteration.leo.out
index b2a2865bb1..ee03d67b3c 100644
--- a/tests/expectations/compiler/compiler/function/iteration.leo.out
+++ b/tests/expectations/compiler/compiler/function/iteration.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: bce6dc51b76cc0f285be76d5c35f28dc1121a2b814e60e0094c858d58e83272e
-    canonicalized_ast: ac7e9987e1a6c30c0ee21665fa824e201b58e186b2d662b6f3817eab3ac3dfa9
-    type_inferenced_ast: bd8524c62243e04203ac7b1f1ce7f22c7969c8511463eef2d63ae55ea5d21b69
+    initial_ast: 83c6c4e453f500e10ca736608e53df8f882130b40f08000b674aeab8bd1fa92c
+    canonicalized_ast: 7fec4d1ef26249b1184986185e29f2788b5afe9566d7b0b5bdef35856d30ffcb
+    type_inferenced_ast: 709bcfa7af8291565680bf649d39fdd357efa244f1cddb3bc5943c25100cca8b
diff --git a/tests/expectations/compiler/compiler/function/iteration_repeated.leo.out b/tests/expectations/compiler/compiler/function/iteration_repeated.leo.out
index 94c85ceefe..08f974ae6b 100644
--- a/tests/expectations/compiler/compiler/function/iteration_repeated.leo.out
+++ b/tests/expectations/compiler/compiler/function/iteration_repeated.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: e00d6916d7234d7ed9f405c02e281301bc5482800ca70c5b6d3f72e84ea22f58
-    canonicalized_ast: bfba19b1a25966ba895c0b318845f4e0e2bf32eb98cba02c1a332fb6f211c532
-    type_inferenced_ast: f6c7f08d785a0dc516a4ffd1165e63b54b7e04c6e9d4b22c12ffd3c282562d0b
+    initial_ast: de8451e4d932195cff9b31a519b303bcd8065669057d0f25aa5fa768b1734d74
+    canonicalized_ast: 08a8e8bab451030b0b908e58c839e40f9e9c926bd4a774ad4ce658be77574f0b
+    type_inferenced_ast: c942d5bf9a6efa7c6ffc5ea35ff2508fc340993ce8c37ef63c1436144229b8f4
diff --git a/tests/expectations/compiler/compiler/function/multiple_returns.leo.out b/tests/expectations/compiler/compiler/function/multiple_returns.leo.out
index 800cc96588..079dd2272c 100644
--- a/tests/expectations/compiler/compiler/function/multiple_returns.leo.out
+++ b/tests/expectations/compiler/compiler/function/multiple_returns.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 8bbbd1ddbb1a616fb3b6cc813734f6dec1989f305dcf2b1580c66c91e023e3db
-    canonicalized_ast: 8bbbd1ddbb1a616fb3b6cc813734f6dec1989f305dcf2b1580c66c91e023e3db
-    type_inferenced_ast: 88fbd7fea3a02a091f2f00347f1e862710a621898f80d8acc91d4041e3adc9f2
+    initial_ast: 6e808814bac9810bca7ffd17e943197e78c6fc738b3b06453010475ecffa5e97
+    canonicalized_ast: 6e808814bac9810bca7ffd17e943197e78c6fc738b3b06453010475ecffa5e97
+    type_inferenced_ast: 26c9b3d565d981d8b17d588b561472ad7f5cc84fb4fb56ba23879d2e616f7b85
diff --git a/tests/expectations/compiler/compiler/function/multiple_returns_fail.leo.out b/tests/expectations/compiler/compiler/function/multiple_returns_fail.leo.out
index 68c53fc358..cd6efca79c 100644
--- a/tests/expectations/compiler/compiler/function/multiple_returns_fail.leo.out
+++ b/tests/expectations/compiler/compiler/function/multiple_returns_fail.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EASG0373035]: function 'main' failed to validate return path: 'cannot have asymmetrical return in if statement'\n    --> compiler-test:4:5\n     |\n   4 |     if true {\n   5 |          ...\n   6 |     }\n     |     ^"
+  - "Error [EASG0373035]: function 'main' failed to validate return path: 'cannot have asymmetrical return in if statement'\n    --> compiler-test:8:5\n     |\n   8 |     if true {\n   9 |          ...\n  10 |     }\n     |     ^"
diff --git a/tests/expectations/compiler/compiler/function/multiple_returns_fail_conditional.leo.out b/tests/expectations/compiler/compiler/function/multiple_returns_fail_conditional.leo.out
index a8b0dfd0c9..242172518a 100644
--- a/tests/expectations/compiler/compiler/function/multiple_returns_fail_conditional.leo.out
+++ b/tests/expectations/compiler/compiler/function/multiple_returns_fail_conditional.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EASG0373034]: function 'main' missing return for all paths\n    --> compiler-test:3:1\n     |\n   3 | function main() -> bool {\n   4 |      ...\n   5 |      ...\n   6 |      ...\n   7 |      ...\n   8 |      ...\n   9 |      ...\n  10 |      ...\n  11 | }\n     | ^"
+  - "Error [EASG0373034]: function 'main' missing return for all paths\n    --> compiler-test:7:1\n     |\n   7 | function main() -> bool {\n   8 |      ...\n   9 |      ...\n  10 |      ...\n  11 |      ...\n  12 |      ...\n  13 |      ...\n  14 |      ...\n  15 | }\n     | ^"
diff --git a/tests/expectations/compiler/compiler/function/multiple_returns_main.leo.out b/tests/expectations/compiler/compiler/function/multiple_returns_main.leo.out
index 3743c4a177..0aea0599a0 100644
--- a/tests/expectations/compiler/compiler/function/multiple_returns_main.leo.out
+++ b/tests/expectations/compiler/compiler/function/multiple_returns_main.leo.out
@@ -19,6 +19,6 @@ outputs:
             r1:
               type: bool
               value: "true"
-    initial_ast: db801c467c6e6bd413b951d6a8f95e841e0254a3f00a3e1ff903ab2dcd63b253
-    canonicalized_ast: db801c467c6e6bd413b951d6a8f95e841e0254a3f00a3e1ff903ab2dcd63b253
-    type_inferenced_ast: 575c9b880a4a061bce5ace598d6d4195ca0f41278afc2b1a950c74052b2b9cef
+    initial_ast: 4c6b00d4272467310c82f2ef450891577d95bbd16ba7a8a2e4a88d215fde883a
+    canonicalized_ast: 4c6b00d4272467310c82f2ef450891577d95bbd16ba7a8a2e4a88d215fde883a
+    type_inferenced_ast: 462fe8ec3c6806cf6b83f041dde71e17f29be8ee56908baa96e9945a3f4ceacd
diff --git a/tests/expectations/compiler/compiler/function/newlines.leo.out b/tests/expectations/compiler/compiler/function/newlines.leo.out
index 7dfc3aefb5..163026ae14 100644
--- a/tests/expectations/compiler/compiler/function/newlines.leo.out
+++ b/tests/expectations/compiler/compiler/function/newlines.leo.out
@@ -19,6 +19,6 @@ outputs:
             b:
               type: u32
               value: "0"
-    initial_ast: 15f65ebeef2a1394bad8e787b7f85b4ce097c92d4f83723d2f04fc94a2f704fe
-    canonicalized_ast: 15f65ebeef2a1394bad8e787b7f85b4ce097c92d4f83723d2f04fc94a2f704fe
-    type_inferenced_ast: 80d4650ca4846bc858164dc5d39d8e9333046ed58a655a0c739a5fb2b3018b90
+    initial_ast: 303a976db37f523738c655f93c6ddb9f2ae63830c1b4041b9df0010153218dab
+    canonicalized_ast: 303a976db37f523738c655f93c6ddb9f2ae63830c1b4041b9df0010153218dab
+    type_inferenced_ast: fbd29a4bb27447e5a1e403600541eb45c6d37d4a5328f3407dd24d1f4c851fc2
diff --git a/tests/expectations/compiler/compiler/function/repeated.leo.out b/tests/expectations/compiler/compiler/function/repeated.leo.out
index 871d97f0fb..2dc5b124bc 100644
--- a/tests/expectations/compiler/compiler/function/repeated.leo.out
+++ b/tests/expectations/compiler/compiler/function/repeated.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 500b33c3ca695738a761854a5c97d7d46ef4689e80fcf0c2dc4694ab09499b7f
-    canonicalized_ast: 500b33c3ca695738a761854a5c97d7d46ef4689e80fcf0c2dc4694ab09499b7f
-    type_inferenced_ast: 1383b0311db00a303f411f023eb3d87c8c29b95776bcf09d8b9622ab3af789f6
+    initial_ast: 8b78042904ab9357c2ba8c53d28d88250a9355b7144be8121bba5b7dcc0d785c
+    canonicalized_ast: 8b78042904ab9357c2ba8c53d28d88250a9355b7144be8121bba5b7dcc0d785c
+    type_inferenced_ast: fea11b8bd74333dd67d93dbaea7a6caf4a531d583b185fed839fbe179b1cd9f7
diff --git a/tests/expectations/compiler/compiler/function/return.leo.out b/tests/expectations/compiler/compiler/function/return.leo.out
index 8561fede33..940d3d97ba 100644
--- a/tests/expectations/compiler/compiler/function/return.leo.out
+++ b/tests/expectations/compiler/compiler/function/return.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: bb569604b5c03343d63deca1fb42fbfb2a275a78d22009e24c58dfc3ac0156ab
-    canonicalized_ast: bb569604b5c03343d63deca1fb42fbfb2a275a78d22009e24c58dfc3ac0156ab
-    type_inferenced_ast: fb793f59586351711471dd75136a8c380c154690feccf9cf7174cef82591e6f7
+    initial_ast: b36c97c0af076574fce68d188a6fca17a777841984d9af4125011c932a2d7c6e
+    canonicalized_ast: b36c97c0af076574fce68d188a6fca17a777841984d9af4125011c932a2d7c6e
+    type_inferenced_ast: eb62014d26c513e7e32443d99dc2e1e6b8ae681adf3f27d4cb62fe8f8d10fcc4
diff --git a/tests/expectations/compiler/compiler/function/return_array_nested_fail.leo.out b/tests/expectations/compiler/compiler/function/return_array_nested_fail.leo.out
index ec70067b21..dd6aa8f7f1 100644
--- a/tests/expectations/compiler/compiler/function/return_array_nested_fail.leo.out
+++ b/tests/expectations/compiler/compiler/function/return_array_nested_fail.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EASG0373026]: unexpected type, expected: 'array of length 3', received: 'array of length 2'\n    --> compiler-test:4:12\n     |\n   4 |     return [0u8; (2, 3)]; // The correct 3x2 array tuple is `[0u8; (3, 2)]`\n     |            ^^^^^^^^^^^^^"
+  - "Error [EASG0373026]: unexpected type, expected: 'array of length 3', received: 'array of length 2'\n    --> compiler-test:8:12\n     |\n   8 |     return [0u8; (2, 3)]; // The correct 3x2 array tuple is `[0u8; (3, 2)]`\n     |            ^^^^^^^^^^^^^"
diff --git a/tests/expectations/compiler/compiler/function/return_array_nested_pass.leo.out b/tests/expectations/compiler/compiler/function/return_array_nested_pass.leo.out
index a26c9321b3..1cdc949691 100644
--- a/tests/expectations/compiler/compiler/function/return_array_nested_pass.leo.out
+++ b/tests/expectations/compiler/compiler/function/return_array_nested_pass.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 0d5b759de15703ed61e503ca8d70f2f8423e29dc817d2612ca384fb29d204f15
-    canonicalized_ast: 9698b926f7b85ac3fbb6183a37a08b4681eeea8ccae65aeaa66e691f62487d0b
-    type_inferenced_ast: 3bf56872a33b1c61d71dd0141acb87050cef59915ea7dbf6559f15345c9d6736
+    initial_ast: 1ee72f7a81b574cb252a2e2f9ebcf5a122aeb146b89a797298cf8d97f15389bb
+    canonicalized_ast: aaada2e394eac55d3bc4c85be57239b4b7c2e08ac21348afface809574ce0c0c
+    type_inferenced_ast: c2f03a1e54214a35090a9cda58e5767457bfa72a8eea2a891cba4ddf3dd62251
diff --git a/tests/expectations/compiler/compiler/function/return_array_tuple_fail.leo.out b/tests/expectations/compiler/compiler/function/return_array_tuple_fail.leo.out
index e2256628cb..0e2077f73f 100644
--- a/tests/expectations/compiler/compiler/function/return_array_tuple_fail.leo.out
+++ b/tests/expectations/compiler/compiler/function/return_array_tuple_fail.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EASG0373026]: unexpected type, expected: 'array of length 3', received: 'array of length 2'\n    --> compiler-test:4:12\n     |\n   4 |     return [[0u8; 3]; 2]; // The correct 3x2 nested array is `[0u8; 2]; 3]`\n     |            ^^^^^^^^^^^^^"
+  - "Error [EASG0373026]: unexpected type, expected: 'array of length 3', received: 'array of length 2'\n    --> compiler-test:8:12\n     |\n   8 |     return [[0u8; 3]; 2]; // The correct 3x2 nested array is `[0u8; 2]; 3]`\n     |            ^^^^^^^^^^^^^"
diff --git a/tests/expectations/compiler/compiler/function/return_array_tuple_pass.leo.out b/tests/expectations/compiler/compiler/function/return_array_tuple_pass.leo.out
index 8123254983..216d5750ed 100644
--- a/tests/expectations/compiler/compiler/function/return_array_tuple_pass.leo.out
+++ b/tests/expectations/compiler/compiler/function/return_array_tuple_pass.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 3c4dacd555f9a91ffe40ddc302bb764ef757462cfad20f6461707b8bf6005196
-    canonicalized_ast: 5913a06c38457b98f8aac60740450faf1ebc25760ccb8d6cb86edefd0c217cc6
-    type_inferenced_ast: 697c8ad6d1d6ecff77818d3ee92733cd9210c2d151ec8b15093e54ef21cd3b64
+    initial_ast: 87c05b8e49bc6fa247952bcc038a06ff57433eae39b343ef5d4a215c4a8720cd
+    canonicalized_ast: 1e37a309be63409e394e8641b0f12ab0a77d985f8c3cb4a78a547f5f2214d764
+    type_inferenced_ast: c3894acaebbc4ba1a9673950a86940adf243949531a33f1f87c93f857fe8e2e6
diff --git a/tests/expectations/compiler/compiler/function/return_tuple.leo.out b/tests/expectations/compiler/compiler/function/return_tuple.leo.out
index 984cb65bbc..28a7e0a7c7 100644
--- a/tests/expectations/compiler/compiler/function/return_tuple.leo.out
+++ b/tests/expectations/compiler/compiler/function/return_tuple.leo.out
@@ -19,6 +19,6 @@ outputs:
             r1:
               type: u32
               value: "103"
-    initial_ast: 05733c81aa57b7c0c2f89d6ab74b31df49d78414ad354a707ae3474e54fd7951
-    canonicalized_ast: 05733c81aa57b7c0c2f89d6ab74b31df49d78414ad354a707ae3474e54fd7951
-    type_inferenced_ast: 81ba2fb5f7c788306b516c750361f7984a1a04ef35d72a47ed8ea0c3acf3cb7f
+    initial_ast: 6adacc7e6e54c2bf9ff93d2dd94154ad1aebdebc25948197624f7e3da8da644a
+    canonicalized_ast: 6adacc7e6e54c2bf9ff93d2dd94154ad1aebdebc25948197624f7e3da8da644a
+    type_inferenced_ast: 5ecf97ffaf5b92b1d001c15796343c24ba5c211524ceddf68e485f52888ad061
diff --git a/tests/expectations/compiler/compiler/function/return_tuple_conditional.leo.out b/tests/expectations/compiler/compiler/function/return_tuple_conditional.leo.out
index 30f2a3f58a..ba614df245 100644
--- a/tests/expectations/compiler/compiler/function/return_tuple_conditional.leo.out
+++ b/tests/expectations/compiler/compiler/function/return_tuple_conditional.leo.out
@@ -19,6 +19,6 @@ outputs:
             b:
               type: u32
               value: "1"
-    initial_ast: 91fd89c2d91693622b5305b302c762d139bca3ff839dc5352be5ab694300ad8b
-    canonicalized_ast: 91fd89c2d91693622b5305b302c762d139bca3ff839dc5352be5ab694300ad8b
-    type_inferenced_ast: bfefba5d47f28d8939c2f296d1a52559fbcefc88d75cedde390233f4d4db1e98
+    initial_ast: 691abc31b96aa708d5dfc49f166de70a1263af6e98fab3630f4bf6f0fdbbeddd
+    canonicalized_ast: 691abc31b96aa708d5dfc49f166de70a1263af6e98fab3630f4bf6f0fdbbeddd
+    type_inferenced_ast: ce44d39729ba9dde5df8f6530a771e57d68cd30bf5ae87df52937dac1419b699
diff --git a/tests/expectations/compiler/compiler/function/scope_fail.leo.out b/tests/expectations/compiler/compiler/function/scope_fail.leo.out
index 1d2cfacf9e..ac0a07eb82 100644
--- a/tests/expectations/compiler/compiler/function/scope_fail.leo.out
+++ b/tests/expectations/compiler/compiler/function/scope_fail.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EASG0373028]: failed to resolve variable reference 'myGlobal'\n    --> compiler-test:5:12\n     |\n   5 |     return myGlobal;\n     |            ^^^^^^^^"
+  - "Error [EASG0373028]: failed to resolve variable reference 'myGlobal'\n    --> compiler-test:8:12\n     |\n   8 |     return myGlobal;\n     |            ^^^^^^^^"
diff --git a/tests/expectations/compiler/compiler/function/undefined.leo.out b/tests/expectations/compiler/compiler/function/undefined.leo.out
index d21aace1cd..917e64572f 100644
--- a/tests/expectations/compiler/compiler/function/undefined.leo.out
+++ b/tests/expectations/compiler/compiler/function/undefined.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EASG0373024]: failed to resolve function: 'my_function'\n    --> compiler-test:5:5\n     |\n   5 |     my_function();\n     |     ^^^^^^^^^^^"
+  - "Error [EASG0373024]: failed to resolve function: 'my_function'\n    --> compiler-test:8:5\n     |\n   8 |     my_function();\n     |     ^^^^^^^^^^^"
diff --git a/tests/expectations/compiler/compiler/function/value_unchanged.leo.out b/tests/expectations/compiler/compiler/function/value_unchanged.leo.out
index ca20b3c22e..43e20f9e2b 100644
--- a/tests/expectations/compiler/compiler/function/value_unchanged.leo.out
+++ b/tests/expectations/compiler/compiler/function/value_unchanged.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: d3d54367b0fcc1b5a01185aec3cfe669941bd0a1b6f4218a73a1928f9dea5dbc
-    canonicalized_ast: eb82bb09e23368391dca2472a6838bb7f9d704a9bb1ca53169550fafb79b6eed
-    type_inferenced_ast: eeae07f387addad134aca399c105f020006f79fa64e4d1395abd2e27d42e0ae8
+    initial_ast: 47da12002f4df479a8a4ce868b1b788a380dcbd3bd077092dca047dd07d3c799
+    canonicalized_ast: 317af4eb5703a760434fbc85fd7f3d1665852056e6bf84c5e2d4f37c5fcffe05
+    type_inferenced_ast: 3371e92996ba9d3c0da813089c6cbcd8744e8225e61d82e63a0ce08e572cb9ef
diff --git a/tests/expectations/compiler/compiler/global_consts/global_const_types.leo.out b/tests/expectations/compiler/compiler/global_consts/global_const_types.leo.out
index c5b40f6b38..1ff7b293ea 100644
--- a/tests/expectations/compiler/compiler/global_consts/global_const_types.leo.out
+++ b/tests/expectations/compiler/compiler/global_consts/global_const_types.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "false"
-    initial_ast: d8d093539faee853421ce529aec6b222a651c494ca9f2a6eb4faafc443bbc02d
-    canonicalized_ast: 0556a49c8e1ef663c4428d9c5c315dcfa0721a000d0d482bc10f9c164ef1a4de
-    type_inferenced_ast: bb15e2202bb322be9f823823c780b5771854cebc311f107d51a88d0e601fa41e
+    initial_ast: 7018768aafaddf21981f29b16938f287729289e9631662103511dce2bebe3620
+    canonicalized_ast: 7979e60f787f248415a3568adbd44d0d0374aa4d7ac7f9e43ef5ebdb2860090b
+    type_inferenced_ast: 5d63edae3092bd7c970b40bede0868fa6565e1ca643db32ead24a98119a515af
diff --git a/tests/expectations/compiler/compiler/global_consts/modify_global_const.leo.out b/tests/expectations/compiler/compiler/global_consts/modify_global_const.leo.out
index 1f854bf2fd..153a32a1e6 100644
--- a/tests/expectations/compiler/compiler/global_consts/modify_global_const.leo.out
+++ b/tests/expectations/compiler/compiler/global_consts/modify_global_const.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EASG0373033]: illegal assignment to immutable variable 'basic'\n    --> compiler-test:7:5\n     |\n   7 |     basic = 2u32;\n     |     ^^^^^^^^^^^^"
+  - "Error [EASG0373033]: illegal assignment to immutable variable 'basic'\n    --> compiler-test:10:5\n     |\n  10 |     basic = 2u32;\n     |     ^^^^^^^^^^^^"
diff --git a/tests/expectations/compiler/compiler/import_dependency/tests/import_dependency_folder.leo.out b/tests/expectations/compiler/compiler/import_dependency/tests/import_dependency_folder.leo.out
index afd08250f6..c81e8ad055 100644
--- a/tests/expectations/compiler/compiler/import_dependency/tests/import_dependency_folder.leo.out
+++ b/tests/expectations/compiler/compiler/import_dependency/tests/import_dependency_folder.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 3f1b8c03ff4676240e6a1deaf46094a95f87b0c5375b7af09b9fd796ee9d7639
-    canonicalized_ast: d677dff4951f6b48675b4b38c3725b21914619c5af9494510f0ea9fdb50bec74
-    type_inferenced_ast: e053cf66b0a4b1ed0208c18d45566d8cd6277bbcb56f3547a28ef095deb25153
+    initial_ast: 4eca487bfb9c06bda7d6522b8d97c47de700598aa3fc3360007548567c08486f
+    canonicalized_ast: bfa405a3e97fd837d706573a69843073b2030ca4e9708630efd502f2bf3c38d8
+    type_inferenced_ast: 42ebce416eda84d4d3757daecf9c62e3ede08c60d830de771f8fe89ed6171f5f
diff --git a/tests/expectations/compiler/compiler/import_local/import_all.leo.out b/tests/expectations/compiler/compiler/import_local/import_all.leo.out
index 3b261da032..92d96cd812 100644
--- a/tests/expectations/compiler/compiler/import_local/import_all.leo.out
+++ b/tests/expectations/compiler/compiler/import_local/import_all.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: b01c46ace6ae994f48ca0042be1a1ec06bf844211f5a29a30594f74fdd6ccb90
-    canonicalized_ast: b01c46ace6ae994f48ca0042be1a1ec06bf844211f5a29a30594f74fdd6ccb90
-    type_inferenced_ast: 0b46b4b8fe6e9a397d8e9a64761f0f7c84f50a4be2f4ac3f08770183f27b6565
+    initial_ast: c964615ab5a83fb24e610fc3ca9cdf3e309a1d63dac852b32ff8098a64b1f71e
+    canonicalized_ast: c964615ab5a83fb24e610fc3ca9cdf3e309a1d63dac852b32ff8098a64b1f71e
+    type_inferenced_ast: a2b6d9cd336cce8267a89f4240a8a88b6ae5ae269d6db50198cbe74f21fb8d76
diff --git a/tests/expectations/compiler/compiler/import_local/import_as.leo.out b/tests/expectations/compiler/compiler/import_local/import_as.leo.out
index 66be5fc42c..47b28fd20e 100644
--- a/tests/expectations/compiler/compiler/import_local/import_as.leo.out
+++ b/tests/expectations/compiler/compiler/import_local/import_as.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 09ae5023ca083bbf3e4cd4634d83b4cb5d5b4ad44b51c6f849273540b74c05bf
-    canonicalized_ast: d12f6315280c12a7052e08f635d41e8d81d89c98ae6f760fbc3885da42224c4a
-    type_inferenced_ast: cd79fce9b7c1325a1d992159466c1dfba53a123f383aefa34940ceb2593fa483
+    initial_ast: 3ddac0677c1a92fa434a9d631c3bf421f7fd756a3e929cd6914fdad6c9645a29
+    canonicalized_ast: 9d59b30c3c721de5572f16b16ec8578863baabff979a36e857649cf7bc431e0c
+    type_inferenced_ast: c09d6e55082b5fdea8450b9353c6e07079a0661ccddf5518f44cb9945c73d574
diff --git a/tests/expectations/compiler/compiler/import_local/import_dir.leo.out b/tests/expectations/compiler/compiler/import_local/import_dir.leo.out
index 9b6756ecd2..7d4d9dfbc6 100644
--- a/tests/expectations/compiler/compiler/import_local/import_dir.leo.out
+++ b/tests/expectations/compiler/compiler/import_local/import_dir.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 326263da73e6edfe8788d5d6db70ee879999bf0339690fdbb3d3c27508966125
-    canonicalized_ast: b81f83d7d31ec610e10e52f89a21e268664cf95cc6fb08bf2153403dc9c2f37f
-    type_inferenced_ast: 69402330a4fb2015c1ba2990104d3c8c43e05bc5d701c79587066092d3aabfa1
+    initial_ast: baff27c1644cbb6509ebc21caa6cdaa24ffe04cf2c445b7856d99a3687cdde5b
+    canonicalized_ast: 7b8d9d9b4c5f12fc29c964f6a8514cd3b20823d7a7fcfaa64183bc9b596d76bb
+    type_inferenced_ast: 44d285b8709edcf03654f7f9c8bb4ceca10b30b092550223554c7ed95b33340a
diff --git a/tests/expectations/compiler/compiler/import_local/import_files.leo.out b/tests/expectations/compiler/compiler/import_local/import_files.leo.out
index 6859d46ba1..5672afdbfa 100644
--- a/tests/expectations/compiler/compiler/import_local/import_files.leo.out
+++ b/tests/expectations/compiler/compiler/import_local/import_files.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 1e48fe05ca987660d68c6166f45097631ac3a900da03ed1ff66a9f5410f7b817
-    canonicalized_ast: 567ae9a9f0641d4805d14ce57cbe7beb3fc33115e11187b1087d34c14f86b270
-    type_inferenced_ast: 3a934ed3696b799ce020a7d51db12af1039ea94608bf909804664521828348e3
+    initial_ast: 11e10aee5e58c54a87834c14acbe16b859941b4b321be68ce0724c80e5cfc1ca
+    canonicalized_ast: 6e8b7c1f56fe82f7b0b9a4bf07fec10b1c54699ef6fee4860861dbbc38aadf5b
+    type_inferenced_ast: 719f994ce14eff214f0431b2290e115f954d57375bdd46d9795cd601f97eb4b1
diff --git a/tests/expectations/compiler/compiler/import_local/import_many.leo.out b/tests/expectations/compiler/compiler/import_local/import_many.leo.out
index 3ca9429193..fba033c63f 100644
--- a/tests/expectations/compiler/compiler/import_local/import_many.leo.out
+++ b/tests/expectations/compiler/compiler/import_local/import_many.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 64f447a80a88cb665651c9d4a8d6c195d4f9529c0157d6c2f3c6557062b9361b
-    canonicalized_ast: 64f447a80a88cb665651c9d4a8d6c195d4f9529c0157d6c2f3c6557062b9361b
-    type_inferenced_ast: a31ce23735af584c7c21b27ba0b3e27cea01dbdb50efb87f690fdd5e0fa94547
+    initial_ast: b41e38aa28a92752d51cad0e49e366132789f8d2c63ef82391cb2a7c2a637611
+    canonicalized_ast: b41e38aa28a92752d51cad0e49e366132789f8d2c63ef82391cb2a7c2a637611
+    type_inferenced_ast: cb3843932a7497e67ffb242186197ec1d185e4cc5b128139e0e8f1eb64fbb5db
diff --git a/tests/expectations/compiler/compiler/import_local/import_weird_names.leo.out b/tests/expectations/compiler/compiler/import_local/import_weird_names.leo.out
index ac8ce750b5..722700240c 100644
--- a/tests/expectations/compiler/compiler/import_local/import_weird_names.leo.out
+++ b/tests/expectations/compiler/compiler/import_local/import_weird_names.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: e58bc13bf652921c07e471122832498fa2b5fc317976fab07e34e9bb62e6ddca
-    canonicalized_ast: e58bc13bf652921c07e471122832498fa2b5fc317976fab07e34e9bb62e6ddca
-    type_inferenced_ast: 4e807d6d0dc3435ca3d6a1ab34b7d9f819664837cf32b5b26a81b027bbc05d71
+    initial_ast: e399c252f24e66fb326a9341b8a2d1990352bbc286ff7201c771b62c387ff1c6
+    canonicalized_ast: e399c252f24e66fb326a9341b8a2d1990352bbc286ff7201c771b62c387ff1c6
+    type_inferenced_ast: 8d6e80fe017744af76c240af6edb165219130ef42f4289f44982e8aa0dcbc565
diff --git a/tests/expectations/compiler/compiler/import_local/import_weird_names_nested.leo.out b/tests/expectations/compiler/compiler/import_local/import_weird_names_nested.leo.out
index 6598931551..5d60c3413b 100644
--- a/tests/expectations/compiler/compiler/import_local/import_weird_names_nested.leo.out
+++ b/tests/expectations/compiler/compiler/import_local/import_weird_names_nested.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: e1b0fc42c16ba92201081238a603e1a1c9a464882a274613cc8f99465d80334e
-    canonicalized_ast: e1b0fc42c16ba92201081238a603e1a1c9a464882a274613cc8f99465d80334e
-    type_inferenced_ast: 0f876207fdc179cc01db6d4b65350454dc0be5e20f6de2356eb53e0ff0e8ee97
+    initial_ast: 8c02d0ad0ddafa5ef6a38d54dab5ca38561259810af3345f6599b7d0330ef1f1
+    canonicalized_ast: 8c02d0ad0ddafa5ef6a38d54dab5ca38561259810af3345f6599b7d0330ef1f1
+    type_inferenced_ast: 5e18701cbe0122c9476b2cf050447b2fa7fb75bf50d8ef754936822aa5ea0b92
diff --git a/tests/expectations/compiler/compiler/input_files/program_input/const_input_non_const.leo.out b/tests/expectations/compiler/compiler/input_files/program_input/const_input_non_const.leo.out
index a93d0799e0..3d2070279b 100644
--- a/tests/expectations/compiler/compiler/input_files/program_input/const_input_non_const.leo.out
+++ b/tests/expectations/compiler/compiler/input_files/program_input/const_input_non_const.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [ECMP0376029]: Expected input variable `a` to be non-constant. Move input variable `a` to [main] section of input file\n    --> compiler-test:3:15\n     |\n   3 | function main(a: u32) {\n     |               ^"
+  - "Error [ECMP0376029]: Expected input variable `a` to be non-constant. Move input variable `a` to [main] section of input file\n    --> compiler-test:7:15\n     |\n   7 | function main(a: u32) {\n     |               ^"
diff --git a/tests/expectations/compiler/compiler/input_files/program_input/const_var_in_both_sections_fail.leo.out b/tests/expectations/compiler/compiler/input_files/program_input/const_var_in_both_sections_fail.leo.out
index fff9ee336c..4e5ddbe5cf 100644
--- a/tests/expectations/compiler/compiler/input_files/program_input/const_var_in_both_sections_fail.leo.out
+++ b/tests/expectations/compiler/compiler/input_files/program_input/const_var_in_both_sections_fail.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [ECMP0376035]: Input variable a declared twice\n    --> compiler-test:3:21\n     |\n   3 | function main(const a: u32) {\n     |                     ^"
+  - "Error [ECMP0376035]: Input variable a declared twice\n    --> compiler-test:7:21\n     |\n   7 | function main(const a: u32) {\n     |                     ^"
diff --git a/tests/expectations/compiler/compiler/input_files/program_input/main.leo.out b/tests/expectations/compiler/compiler/input_files/program_input/main.leo.out
index 3bc9bbd98a..b6bda7d947 100644
--- a/tests/expectations/compiler/compiler/input_files/program_input/main.leo.out
+++ b/tests/expectations/compiler/compiler/input_files/program_input/main.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: fd5d65f5f25616d2b3ebb6ee863f8f5099544e19448534131299fca6dc090387
-    canonicalized_ast: fd5d65f5f25616d2b3ebb6ee863f8f5099544e19448534131299fca6dc090387
-    type_inferenced_ast: 20cc52c351fcacc3321fd3b56a79d81824e475e2c4bf9c63451e39d2545b7c05
+    initial_ast: 0a55533f115737bf11c8a57a2ca41b9da68151f31699f16de8646939e0d557a3
+    canonicalized_ast: 0a55533f115737bf11c8a57a2ca41b9da68151f31699f16de8646939e0d557a3
+    type_inferenced_ast: 0f257802179d493c5b518c3c995a11a07f3e2c2171c623c6bede429272a3b5c4
diff --git a/tests/expectations/compiler/compiler/input_files/program_input/main_array.leo.out b/tests/expectations/compiler/compiler/input_files/program_input/main_array.leo.out
index a3522c3118..70c6051f37 100644
--- a/tests/expectations/compiler/compiler/input_files/program_input/main_array.leo.out
+++ b/tests/expectations/compiler/compiler/input_files/program_input/main_array.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 75de104d23e3eda322cf8335ea2b72ca32c26fe79b9c7b8946f1b957a5a58b5d
-    canonicalized_ast: 75de104d23e3eda322cf8335ea2b72ca32c26fe79b9c7b8946f1b957a5a58b5d
-    type_inferenced_ast: 86e9c692a93d08c3d6ff7ffb82d885e6df78fb6c477c1efc6627881b5db02402
+    initial_ast: 7660b97b0c95ab3793a2bbd223d7811e6f2c8ef7719a0356bf9d229de289b95b
+    canonicalized_ast: 7660b97b0c95ab3793a2bbd223d7811e6f2c8ef7719a0356bf9d229de289b95b
+    type_inferenced_ast: 5ea936316b419edabcd7ae5888b7bd40daf6f239f13aad74213ba2aecd67a6ca
diff --git a/tests/expectations/compiler/compiler/input_files/program_input/main_array_fail.leo.out b/tests/expectations/compiler/compiler/input_files/program_input/main_array_fail.leo.out
index 97ab65d88b..fd7e6beeaa 100644
--- a/tests/expectations/compiler/compiler/input_files/program_input/main_array_fail.leo.out
+++ b/tests/expectations/compiler/compiler/input_files/program_input/main_array_fail.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [ECMP0376031]: Input array dimensions mismatch expected 1, found array dimensions 2\n    --> compiler-test:3:15\n     |\n   3 | function main(x: [i16; 2]) {\n     |               ^"
+  - "Error [ECMP0376031]: Input array dimensions mismatch expected 1, found array dimensions 2\n    --> compiler-test:7:15\n     |\n   7 | function main(x: [i16; 2]) {\n     |               ^"
diff --git a/tests/expectations/compiler/compiler/input_files/program_input/main_char.leo.out b/tests/expectations/compiler/compiler/input_files/program_input/main_char.leo.out
index 5e72920d14..16254f0629 100644
--- a/tests/expectations/compiler/compiler/input_files/program_input/main_char.leo.out
+++ b/tests/expectations/compiler/compiler/input_files/program_input/main_char.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 79d9c8c5681e8eda47e4cc625e555cdc25de8b46f359db004ec2b5408d740f84
-    canonicalized_ast: 79d9c8c5681e8eda47e4cc625e555cdc25de8b46f359db004ec2b5408d740f84
-    type_inferenced_ast: 6a25166a63b0ef30ed2beb723ce9bca0b848da95ab633889409fd797f18a8fef
+    initial_ast: dc5eb8b1ee57a71c7d9ea273dd350da17599290269323bda04cd27b8522d052e
+    canonicalized_ast: dc5eb8b1ee57a71c7d9ea273dd350da17599290269323bda04cd27b8522d052e
+    type_inferenced_ast: 221576d747bb42759a0d508cdb40e3a1d4b9cab43c54c1cd8ce837317a9afb14
diff --git a/tests/expectations/compiler/compiler/input_files/program_input/main_field.leo.out b/tests/expectations/compiler/compiler/input_files/program_input/main_field.leo.out
index 82f0893667..b96bcfb1cf 100644
--- a/tests/expectations/compiler/compiler/input_files/program_input/main_field.leo.out
+++ b/tests/expectations/compiler/compiler/input_files/program_input/main_field.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "false"
-    initial_ast: f1c4e2b8a27e2575293486977b41988a4fdc9195c40ac70b703cd6b34c52e526
-    canonicalized_ast: f1c4e2b8a27e2575293486977b41988a4fdc9195c40ac70b703cd6b34c52e526
-    type_inferenced_ast: 38bf188ec70371f03856ec64b1df460cd3217a1565040f143aff30f1c3740c70
+    initial_ast: eeeb459aeff6f05dfb1827fee04d429c80787aeaeaf552ce4ede43fbfdfffc16
+    canonicalized_ast: eeeb459aeff6f05dfb1827fee04d429c80787aeaeaf552ce4ede43fbfdfffc16
+    type_inferenced_ast: 25e7d19219eb73b5cb151ba7bec29df8441ab98004e6acac41ca41e409a974d3
diff --git a/tests/expectations/compiler/compiler/input_files/program_input/main_group.leo.out b/tests/expectations/compiler/compiler/input_files/program_input/main_group.leo.out
index 942216f150..1a13491444 100644
--- a/tests/expectations/compiler/compiler/input_files/program_input/main_group.leo.out
+++ b/tests/expectations/compiler/compiler/input_files/program_input/main_group.leo.out
@@ -13,6 +13,6 @@ outputs:
       - input_file: input/main_group.in
         output:
           registers: {}
-    initial_ast: 734254f32edba7e044d3d9f73dd222a0dd967707d51f4a6fdc3c89af9bc79f6c
-    canonicalized_ast: 8e37317e62d5c398c84aa4470c96a2bef33e63b5bb1a0e469a4cf1a49c565a74
-    type_inferenced_ast: 6f5a6a68f766ee45ea2f4b3e16a6f85ac13fe60fbe3a27cea90e5da7bd7982c4
+    initial_ast: 3c49e41350f2fc0d991e5640b38f44d01ed912b61297f4488473f5d32b15a235
+    canonicalized_ast: 2aefac112b5938562a342307ad05ab1e01d399c583e020c248c0110d54af07ec
+    type_inferenced_ast: aeadbc17742baa1cb4264cf6cb16da7201e9a37da1bf5a2f3e905c388af14c07
diff --git a/tests/expectations/compiler/compiler/input_files/program_input/main_multi_dimension_array.leo.out b/tests/expectations/compiler/compiler/input_files/program_input/main_multi_dimension_array.leo.out
index 32b62ddcee..8e3220ba64 100644
--- a/tests/expectations/compiler/compiler/input_files/program_input/main_multi_dimension_array.leo.out
+++ b/tests/expectations/compiler/compiler/input_files/program_input/main_multi_dimension_array.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: da5236e9a81e2048dacfd3004db8a370a342ca2fb966b3d8ba6535ba4d3fae17
-    canonicalized_ast: f65c8486c62ea1df95bb7ef70577388da94d200ceba32ce15620e5498ce245e9
-    type_inferenced_ast: dca62cb02813f4047d5f69c1b70d945902dc99044c980f74e7789611dc6968b1
+    initial_ast: bb41bebc8fd12e0cda4b9ec1c110e17bc1ae5887cc0957f5228aadf4c5795643
+    canonicalized_ast: 25cedc4989704519826b9b29c5877cceff5ea9f3b6f1091ce5e3b93c6e6352fb
+    type_inferenced_ast: 6bb4e338ee5f664e9475a0cc588bb4763acfa5607748cda9525800c1f8c79c76
diff --git a/tests/expectations/compiler/compiler/input_files/program_input/main_multiple.leo.out b/tests/expectations/compiler/compiler/input_files/program_input/main_multiple.leo.out
index 6d17836eeb..774a0ef042 100644
--- a/tests/expectations/compiler/compiler/input_files/program_input/main_multiple.leo.out
+++ b/tests/expectations/compiler/compiler/input_files/program_input/main_multiple.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: aae17ba5bd2ce376b5c440df42be442b0731feb499fa37b133b89f364a8790bf
-    canonicalized_ast: aae17ba5bd2ce376b5c440df42be442b0731feb499fa37b133b89f364a8790bf
-    type_inferenced_ast: 5b110c3aa3e0d65942f7a7fdbdccfc745aa810ea7d71137358f220d2bfecb0b7
+    initial_ast: 2b19e5ee3f1817c6779b7a3784a46e580806b924ca970f926846d1894154e897
+    canonicalized_ast: 2b19e5ee3f1817c6779b7a3784a46e580806b924ca970f926846d1894154e897
+    type_inferenced_ast: 4c55cdc62a42903f7c83e0db58f34742e2f3d5cf1e6f143a4f90a5ca63525bc7
diff --git a/tests/expectations/compiler/compiler/input_files/program_input/main_string.leo.out b/tests/expectations/compiler/compiler/input_files/program_input/main_string.leo.out
index 9f50a60077..fadcf8e6f1 100644
--- a/tests/expectations/compiler/compiler/input_files/program_input/main_string.leo.out
+++ b/tests/expectations/compiler/compiler/input_files/program_input/main_string.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: febb53aab48ab8b14c5254dbabd4962986633cd1d8e835cb2cd37273eb679f19
-    canonicalized_ast: 87a760c60ea690797600988e8bb9e3f767aea097d226e1c4975f96103c2de8b6
-    type_inferenced_ast: 43c510a75ca27431f2f85be85e1cc7a92cd4c6da43cd38e74bb3d3fd1fa525b5
+    initial_ast: d5c8bf83523849ea7fbafbade3c37b1a2e14ac90de807eb17a8cf70424ef0e05
+    canonicalized_ast: 921daed61f62d230dd2be8865bf9e9593e323d43be2fcbdebf97d46f10552dee
+    type_inferenced_ast: 6c10ab299b0143ab1c73e0d1c59f607053bc5b2c867cc31ca4f2d27912031138
diff --git a/tests/expectations/compiler/compiler/input_files/program_input/main_tuple.leo.out b/tests/expectations/compiler/compiler/input_files/program_input/main_tuple.leo.out
index 1a5835c8e8..4916c661ec 100644
--- a/tests/expectations/compiler/compiler/input_files/program_input/main_tuple.leo.out
+++ b/tests/expectations/compiler/compiler/input_files/program_input/main_tuple.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: f7d08c7f104e732a04c7a71522a04d8a781afd3b67b28db8978a41d34c7ae472
-    canonicalized_ast: f7d08c7f104e732a04c7a71522a04d8a781afd3b67b28db8978a41d34c7ae472
-    type_inferenced_ast: 358265a83714b484456d92d5ccc15e4259e94bdd28072914628c5ac9773adfd8
+    initial_ast: b78cc1fa344089c071a6b07d83f46144d0004c011e1eccfc73f023eb9e46e8e2
+    canonicalized_ast: b78cc1fa344089c071a6b07d83f46144d0004c011e1eccfc73f023eb9e46e8e2
+    type_inferenced_ast: a27388726a7ca579acc3188f1f1bc82db2188edc6bf78950e127b921125d0bd4
diff --git a/tests/expectations/compiler/compiler/input_files/program_input/main_tuple_fail.leo.out b/tests/expectations/compiler/compiler/input_files/program_input/main_tuple_fail.leo.out
index 2699fc0238..a7886de7dc 100644
--- a/tests/expectations/compiler/compiler/input_files/program_input/main_tuple_fail.leo.out
+++ b/tests/expectations/compiler/compiler/input_files/program_input/main_tuple_fail.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [ECMP0376032]: Input tuple size mismatch expected 3, found tuple with length 2\n    --> compiler-test:3:15\n     |\n   3 | function main(x: (u8, bool, u8)) {\n     |               ^"
+  - "Error [ECMP0376032]: Input tuple size mismatch expected 3, found tuple with length 2\n    --> compiler-test:7:15\n     |\n   7 | function main(x: (u8, bool, u8)) {\n     |               ^"
diff --git a/tests/expectations/compiler/compiler/input_files/program_input/non_const_input_const.leo.out b/tests/expectations/compiler/compiler/input_files/program_input/non_const_input_const.leo.out
index 7c208e40ac..9e8fc61102 100644
--- a/tests/expectations/compiler/compiler/input_files/program_input/non_const_input_const.leo.out
+++ b/tests/expectations/compiler/compiler/input_files/program_input/non_const_input_const.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EASG0373025]: failed to resolve type for variable definition 'unknown'\n    --> compiler-test:4:17\n     |\n   4 |     let b = a * 2;\n     |                 ^"
+  - "Error [EASG0373025]: failed to resolve type for variable definition 'unknown'\n    --> compiler-test:8:17\n     |\n   8 |     let b = a * 2;\n     |                 ^"
diff --git a/tests/expectations/compiler/compiler/input_files/program_input/var_in_both_sections_fail.leo.out b/tests/expectations/compiler/compiler/input_files/program_input/var_in_both_sections_fail.leo.out
index 29564d375c..912de7a8ca 100644
--- a/tests/expectations/compiler/compiler/input_files/program_input/var_in_both_sections_fail.leo.out
+++ b/tests/expectations/compiler/compiler/input_files/program_input/var_in_both_sections_fail.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [ECMP0376035]: Input variable a declared twice\n    --> compiler-test:3:15\n     |\n   3 | function main(a: u32) {\n     |               ^"
+  - "Error [ECMP0376035]: Input variable a declared twice\n    --> compiler-test:7:15\n     |\n   7 | function main(a: u32) {\n     |               ^"
diff --git a/tests/expectations/compiler/compiler/input_files/program_input_and_program_state/basic.leo.out b/tests/expectations/compiler/compiler/input_files/program_input_and_program_state/basic.leo.out
index 8bcc498211..32c7e230ec 100644
--- a/tests/expectations/compiler/compiler/input_files/program_input_and_program_state/basic.leo.out
+++ b/tests/expectations/compiler/compiler/input_files/program_input_and_program_state/basic.leo.out
@@ -16,6 +16,6 @@ outputs:
             b:
               type: bool
               value: "true"
-    initial_ast: 2e0d03e2ad668ec5149102d0f9de870d0b3d263fb5c460471db913b5c15e153b
-    canonicalized_ast: 2e0d03e2ad668ec5149102d0f9de870d0b3d263fb5c460471db913b5c15e153b
-    type_inferenced_ast: ab37500c6660ca13113fe642160046179b9713d848ab712cd1c57b6e82ac7916
+    initial_ast: df7c442415f6c7d7d19051475fa9f98a9d020cb9e35dd221d04bd90e379f26fe
+    canonicalized_ast: df7c442415f6c7d7d19051475fa9f98a9d020cb9e35dd221d04bd90e379f26fe
+    type_inferenced_ast: ed31ecbfde5dbc79c5badf242784415450eac7ede7dc3e7d488c28ed708f7502
diff --git a/tests/expectations/compiler/compiler/input_files/program_input_and_program_state/token_withdraw.leo.out b/tests/expectations/compiler/compiler/input_files/program_input_and_program_state/token_withdraw.leo.out
index 96eda6bbd7..bacc0b23df 100644
--- a/tests/expectations/compiler/compiler/input_files/program_input_and_program_state/token_withdraw.leo.out
+++ b/tests/expectations/compiler/compiler/input_files/program_input_and_program_state/token_withdraw.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 7c42b985a3e0013f38398639442535e6f40af6f379d9af65387e707cd97fb146
-    canonicalized_ast: 7c42b985a3e0013f38398639442535e6f40af6f379d9af65387e707cd97fb146
-    type_inferenced_ast: aeb12c856d7aa61002723056fc228fa4d342076b7c2bac597269f426a29a4cb2
+    initial_ast: 2ffbaf12ce77a175001e1ac0cefbbde67008dc6dd39182052efdc01449d7dd08
+    canonicalized_ast: 2ffbaf12ce77a175001e1ac0cefbbde67008dc6dd39182052efdc01449d7dd08
+    type_inferenced_ast: 81a52ba6d293ce7b18149b84985668aef5c0dae09ab41b95a244e57e907227f7
diff --git a/tests/expectations/compiler/compiler/input_files/program_input_constants/main.leo.out b/tests/expectations/compiler/compiler/input_files/program_input_constants/main.leo.out
index d7047044c2..d2e9c50a96 100644
--- a/tests/expectations/compiler/compiler/input_files/program_input_constants/main.leo.out
+++ b/tests/expectations/compiler/compiler/input_files/program_input_constants/main.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: e007051c65717fe114d8886204b8c097d81c38144ab4afc1ab1bc382e5773dd8
-    canonicalized_ast: e007051c65717fe114d8886204b8c097d81c38144ab4afc1ab1bc382e5773dd8
-    type_inferenced_ast: a22c5c90adcd19441b5fef47a637f1dc1b1f849a31a1c8adcbe377897dc292ca
+    initial_ast: 8777717912d65280bb36460d397e66d5adb048ee6589a8871e37f817fe1c65bb
+    canonicalized_ast: 8777717912d65280bb36460d397e66d5adb048ee6589a8871e37f817fe1c65bb
+    type_inferenced_ast: fa40518173a52fc7bc62fb5651519cc6a31ab1bcc7f60b463749c776359ebfb5
diff --git a/tests/expectations/compiler/compiler/input_files/program_input_constants/main_array.leo.out b/tests/expectations/compiler/compiler/input_files/program_input_constants/main_array.leo.out
index 33588fcfe7..0d57eb88d2 100644
--- a/tests/expectations/compiler/compiler/input_files/program_input_constants/main_array.leo.out
+++ b/tests/expectations/compiler/compiler/input_files/program_input_constants/main_array.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 9957e99bb4cb4b2b9b4c8a49435f05773cdae1bdaf20ea6b98aa1e77b804d94c
-    canonicalized_ast: 9957e99bb4cb4b2b9b4c8a49435f05773cdae1bdaf20ea6b98aa1e77b804d94c
-    type_inferenced_ast: 3a1dcb5ea333c1dfc1b1ceb5516c59a449cd882d22a7439833c1d3a0a3eca3f3
+    initial_ast: 87651005fb2a5cac0c819a36444e7f56b7c450e3c656e29a502538ece29da1ab
+    canonicalized_ast: 87651005fb2a5cac0c819a36444e7f56b7c450e3c656e29a502538ece29da1ab
+    type_inferenced_ast: b81612a74e7227781c02d88aee670a18f56fb0b374223cb042dccd24683f6594
diff --git a/tests/expectations/compiler/compiler/input_files/program_input_constants/main_array_fail.leo.out b/tests/expectations/compiler/compiler/input_files/program_input_constants/main_array_fail.leo.out
index 2b6757d01d..68cf385a0d 100644
--- a/tests/expectations/compiler/compiler/input_files/program_input_constants/main_array_fail.leo.out
+++ b/tests/expectations/compiler/compiler/input_files/program_input_constants/main_array_fail.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [ECMP0376031]: Input array dimensions mismatch expected 2, found array dimensions 1\n    --> compiler-test:3:21\n     |\n   3 | function main(const x: [i16; 2]) {\n     |                     ^"
+  - "Error [ECMP0376031]: Input array dimensions mismatch expected 2, found array dimensions 1\n    --> compiler-test:7:21\n     |\n   7 | function main(const x: [i16; 2]) {\n     |                     ^"
diff --git a/tests/expectations/compiler/compiler/input_files/program_input_constants/main_char.leo.out b/tests/expectations/compiler/compiler/input_files/program_input_constants/main_char.leo.out
index b6a5b28c2e..124b0cedc9 100644
--- a/tests/expectations/compiler/compiler/input_files/program_input_constants/main_char.leo.out
+++ b/tests/expectations/compiler/compiler/input_files/program_input_constants/main_char.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: a1518e5bbc6ee7140232bb483f4dd6ec53455aff8aa8c517c5e27921ebeab3af
-    canonicalized_ast: a1518e5bbc6ee7140232bb483f4dd6ec53455aff8aa8c517c5e27921ebeab3af
-    type_inferenced_ast: 0940493f8d297c71d9286c980ce74405a10115412a16c6a5247c03280747e76f
+    initial_ast: 7e13054c8db960c85b422168373f04242bb1243b8c521aae9d2ecd54e29fa3e9
+    canonicalized_ast: 7e13054c8db960c85b422168373f04242bb1243b8c521aae9d2ecd54e29fa3e9
+    type_inferenced_ast: 51b7b128428be1ca08fa6b0ef57ff31658749b67411fed83349f5db24b0ca6d2
diff --git a/tests/expectations/compiler/compiler/input_files/program_input_constants/main_field.leo.out b/tests/expectations/compiler/compiler/input_files/program_input_constants/main_field.leo.out
index f3dfc7b125..d1a84fc473 100644
--- a/tests/expectations/compiler/compiler/input_files/program_input_constants/main_field.leo.out
+++ b/tests/expectations/compiler/compiler/input_files/program_input_constants/main_field.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "false"
-    initial_ast: 8c41518bf856943776335f7134085d5ec579fcd3f074c684bf15a088d5706cc5
-    canonicalized_ast: 8c41518bf856943776335f7134085d5ec579fcd3f074c684bf15a088d5706cc5
-    type_inferenced_ast: 0e64948c43c40dc90e3256093e0d5ee21d03593c38331febf90d6ef3ac381b7a
+    initial_ast: c3e90d8abb506333ae83f530b202d9df9ae0a47b8901296d0dd76100418a9ed5
+    canonicalized_ast: c3e90d8abb506333ae83f530b202d9df9ae0a47b8901296d0dd76100418a9ed5
+    type_inferenced_ast: bfde4a61e01fa38cd9cb18eb5ece7ac227fa88904cfa71cf7c9629a9359abc66
diff --git a/tests/expectations/compiler/compiler/input_files/program_input_constants/main_group.leo.out b/tests/expectations/compiler/compiler/input_files/program_input_constants/main_group.leo.out
index 033fa39be3..bf5178ef3b 100644
--- a/tests/expectations/compiler/compiler/input_files/program_input_constants/main_group.leo.out
+++ b/tests/expectations/compiler/compiler/input_files/program_input_constants/main_group.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: d23e3cc53865b5079111a5f568576fcc760b7ab3d97261b7d8c6c26a1dbc3da3
-    canonicalized_ast: d23e3cc53865b5079111a5f568576fcc760b7ab3d97261b7d8c6c26a1dbc3da3
-    type_inferenced_ast: dbfabbf984c9ff0741ed1d00ff5ef3a2e3408ccc16270ec835a5781f206edc7b
+    initial_ast: 65bcd6822298b8605673d0f234c3ae1a12e540b26216ef5a2ad351996990072d
+    canonicalized_ast: 65bcd6822298b8605673d0f234c3ae1a12e540b26216ef5a2ad351996990072d
+    type_inferenced_ast: 2783a85825efee0cb1edc7f5589e4bcd92e52652e1047d2c81be1dc8571186d1
diff --git a/tests/expectations/compiler/compiler/input_files/program_input_constants/main_multi_dimension_array.leo.out b/tests/expectations/compiler/compiler/input_files/program_input_constants/main_multi_dimension_array.leo.out
index 3fb727c90a..03aee640d0 100644
--- a/tests/expectations/compiler/compiler/input_files/program_input_constants/main_multi_dimension_array.leo.out
+++ b/tests/expectations/compiler/compiler/input_files/program_input_constants/main_multi_dimension_array.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: fc34aa149a013b9dc5b89b37e19a9ab4b8c721bfb0194332b18491354005c757
-    canonicalized_ast: 70e54f09c930683fdf01d942fbf818de72f73fe17de4bc06c428bb3166fca7b6
-    type_inferenced_ast: 8eb214fdbd3319530abbbbf834c99fd5339513d6be7aed84490fae01b5e9ca47
+    initial_ast: c40f807a5f529db112d279bc95d267821dbbca4ef0af79a751400b06795f15d4
+    canonicalized_ast: 07bca21d5d0a8a4b42e0ca614a709c5e705f9bfd17803192667fedacb55d279b
+    type_inferenced_ast: 32e5286072ce08714612943224988dc9f4d7b3078cfb83687e1c57fa28d2a8cf
diff --git a/tests/expectations/compiler/compiler/input_files/program_input_constants/main_multiple.leo.out b/tests/expectations/compiler/compiler/input_files/program_input_constants/main_multiple.leo.out
index 3d3e03bbdb..994826f703 100644
--- a/tests/expectations/compiler/compiler/input_files/program_input_constants/main_multiple.leo.out
+++ b/tests/expectations/compiler/compiler/input_files/program_input_constants/main_multiple.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 6ca86b141b3b3ca7236fa991bf26c91e9451208080803c05878229721adece7e
-    canonicalized_ast: 6ca86b141b3b3ca7236fa991bf26c91e9451208080803c05878229721adece7e
-    type_inferenced_ast: 466038c7c7bc66b05eb0e58ffff56a491e754aa315b4b75779012236ff1f1c1c
+    initial_ast: 47dc0af04c30519e96a5a97e289bbc13245af6bb69b306c4f3bcd6c4706ed86d
+    canonicalized_ast: 47dc0af04c30519e96a5a97e289bbc13245af6bb69b306c4f3bcd6c4706ed86d
+    type_inferenced_ast: 6026f403b95b2c3acb44510fc599ee816670458cf25131eed99581681d861b18
diff --git a/tests/expectations/compiler/compiler/input_files/program_input_constants/main_string.leo.out b/tests/expectations/compiler/compiler/input_files/program_input_constants/main_string.leo.out
index a442df980a..6de5796dcf 100644
--- a/tests/expectations/compiler/compiler/input_files/program_input_constants/main_string.leo.out
+++ b/tests/expectations/compiler/compiler/input_files/program_input_constants/main_string.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 613d2bc2c09f5bc83f69f1a412e95d0131111bc74b60b9ed7d1fa8bb2006120c
-    canonicalized_ast: a6601205f9b1deb01c7029664cc1074a5c4497be5e4702fa66886f7791b20d94
-    type_inferenced_ast: bc5f71c3a2a6918c75cb361514d4bdaecbb54f294ba20ec16ccecd20b582fbd5
+    initial_ast: 965c79ed67946fb0da810322622e5121efa749e562f1937bc4f63cabffa0200a
+    canonicalized_ast: ea7a24d35afca19ad790602d656a69ca6ee793661e3ecacbd7a3816bccbadda6
+    type_inferenced_ast: a214d6ad6fc1a3287f7a9e01d829aff4380df5c20a2b8f81665ff727aba6320a
diff --git a/tests/expectations/compiler/compiler/input_files/program_input_constants/main_tuple.leo.out b/tests/expectations/compiler/compiler/input_files/program_input_constants/main_tuple.leo.out
index 424015348d..afaf86c9b3 100644
--- a/tests/expectations/compiler/compiler/input_files/program_input_constants/main_tuple.leo.out
+++ b/tests/expectations/compiler/compiler/input_files/program_input_constants/main_tuple.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: fae106810af4f4f1778934609b37de40b91e8f813b66b745c50343e3ff862dde
-    canonicalized_ast: fae106810af4f4f1778934609b37de40b91e8f813b66b745c50343e3ff862dde
-    type_inferenced_ast: 8ec29af283c7f3e23ee77643cc0fd7b7e8fe07639870b87ecd952ca187e4fc20
+    initial_ast: c72fd672526c4a0ab841e525916082df387292fd38cfe597f147b575fa266861
+    canonicalized_ast: c72fd672526c4a0ab841e525916082df387292fd38cfe597f147b575fa266861
+    type_inferenced_ast: c2077bdc5a6f9ccc77c3df28070ec705e3ef708832b22fff5d27296e113d1b38
diff --git a/tests/expectations/compiler/compiler/input_files/program_input_constants/main_tuple_fail.leo.out b/tests/expectations/compiler/compiler/input_files/program_input_constants/main_tuple_fail.leo.out
index 6ab90fa4b5..6309e4899f 100644
--- a/tests/expectations/compiler/compiler/input_files/program_input_constants/main_tuple_fail.leo.out
+++ b/tests/expectations/compiler/compiler/input_files/program_input_constants/main_tuple_fail.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [ECMP0376032]: Input tuple size mismatch expected 3, found tuple with length 2\n    --> compiler-test:3:21\n     |\n   3 | function main(const x: (u8, bool, u8)) {\n     |                     ^"
+  - "Error [ECMP0376032]: Input tuple size mismatch expected 3, found tuple with length 2\n    --> compiler-test:7:21\n     |\n   7 | function main(const x: (u8, bool, u8)) {\n     |                     ^"
diff --git a/tests/expectations/compiler/compiler/input_files/program_registers/registers_array.leo.out b/tests/expectations/compiler/compiler/input_files/program_registers/registers_array.leo.out
index 56cb3f6df3..0a97e089e7 100644
--- a/tests/expectations/compiler/compiler/input_files/program_registers/registers_array.leo.out
+++ b/tests/expectations/compiler/compiler/input_files/program_registers/registers_array.leo.out
@@ -16,6 +16,6 @@ outputs:
             r2:
               type: "[[u8; 4]; 2]"
               value: "\"[0, 0, 0, 0][0, 0, 0, 0]\""
-    initial_ast: fc0375f232a4a8d600789df4c17c872438ae3e918c7a617364085c62b9873c8e
-    canonicalized_ast: fc0375f232a4a8d600789df4c17c872438ae3e918c7a617364085c62b9873c8e
-    type_inferenced_ast: 8566dcec6a7bb0a0105c25331486c7a69d03bf12734f62b9136b3179d7f22432
+    initial_ast: a719da506f5e2a1a0a63f77ab0f6a3416e9cd9a51adeb8dae8f1f7448dfee66e
+    canonicalized_ast: a719da506f5e2a1a0a63f77ab0f6a3416e9cd9a51adeb8dae8f1f7448dfee66e
+    type_inferenced_ast: 5e56e524ed1cc2a33e52b5ab49bad5074ad559e9b542e584c3e0f862e7798530
diff --git a/tests/expectations/compiler/compiler/input_files/program_registers/registers_fail.leo.out b/tests/expectations/compiler/compiler/input_files/program_registers/registers_fail.leo.out
index 3fd558ebfb..ba75ae4e84 100644
--- a/tests/expectations/compiler/compiler/input_files/program_registers/registers_fail.leo.out
+++ b/tests/expectations/compiler/compiler/input_files/program_registers/registers_fail.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [ECMP0376037]: Mismatched types. Expected register output type `u8`, found type `bool`.\n    --> compiler-test:3:1\n     |\n   3 | function main() -> bool {\n   4 |      ...\n   5 | }\n     | ^"
+  - "Error [ECMP0376037]: Mismatched types. Expected register output type `u8`, found type `bool`.\n    --> compiler-test:7:1\n     |\n   7 | function main() -> bool {\n   8 |      ...\n   9 | }\n     | ^"
diff --git a/tests/expectations/compiler/compiler/input_files/program_registers/registers_pass.leo.out b/tests/expectations/compiler/compiler/input_files/program_registers/registers_pass.leo.out
index f6ec6ba7c5..4a350dbb44 100644
--- a/tests/expectations/compiler/compiler/input_files/program_registers/registers_pass.leo.out
+++ b/tests/expectations/compiler/compiler/input_files/program_registers/registers_pass.leo.out
@@ -16,6 +16,6 @@ outputs:
             r:
               type: u8
               value: "101"
-    initial_ast: cf6a76290b73851a3ed589650d1a25ffbb75e663f510dfe3274b66600678bc64
-    canonicalized_ast: cf6a76290b73851a3ed589650d1a25ffbb75e663f510dfe3274b66600678bc64
-    type_inferenced_ast: ce87463df0f9dee5d06d1d872340e8f40ca5cab1bc5a9dbb4e422165714798d4
+    initial_ast: e5d710bec14d86efa378ec397be2401158d97eaa4f04767255cea2179c246775
+    canonicalized_ast: e5d710bec14d86efa378ec397be2401158d97eaa4f04767255cea2179c246775
+    type_inferenced_ast: d824bf08eedeea3482f0061ce6cc29f6fc85536e6a27009726b1b3df95391547
diff --git a/tests/expectations/compiler/compiler/input_files/program_state/access_all.leo.out b/tests/expectations/compiler/compiler/input_files/program_state/access_all.leo.out
index 3c62376b0f..e4ce126448 100644
--- a/tests/expectations/compiler/compiler/input_files/program_state/access_all.leo.out
+++ b/tests/expectations/compiler/compiler/input_files/program_state/access_all.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 9cca50f35319c4b4e776c170a2936cb7e0a82c2d458bd725a282f1eaa3f01391
-    canonicalized_ast: 9cca50f35319c4b4e776c170a2936cb7e0a82c2d458bd725a282f1eaa3f01391
-    type_inferenced_ast: d75b58e775d20e72834683792cbf09339bb9f07ce05501d0331026cc0fe859cf
+    initial_ast: b66ad09fab000335b660097bce814eea26f707a49dbb15a26f648a5becbc3f6d
+    canonicalized_ast: b66ad09fab000335b660097bce814eea26f707a49dbb15a26f648a5becbc3f6d
+    type_inferenced_ast: 55414101da2c23cdb5cfb1fa3e519238a3abe64727690afd587100176e333787
diff --git a/tests/expectations/compiler/compiler/input_files/program_state/access_state.leo.out b/tests/expectations/compiler/compiler/input_files/program_state/access_state.leo.out
index 56a1a0a81d..d91ceb7e07 100644
--- a/tests/expectations/compiler/compiler/input_files/program_state/access_state.leo.out
+++ b/tests/expectations/compiler/compiler/input_files/program_state/access_state.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 21381595616fc58e28df26f9c89b4cddcd8219703cd877523c55c80617288e07
-    canonicalized_ast: 21381595616fc58e28df26f9c89b4cddcd8219703cd877523c55c80617288e07
-    type_inferenced_ast: 981b4059bbf5feaa39719dfd802585fca3ee841c3e78792eb7b68470a015a41a
+    initial_ast: e0985b348d3a486ff7e36c45211a1a84a9480eaf12b302f2b45502fa608f0bd5
+    canonicalized_ast: e0985b348d3a486ff7e36c45211a1a84a9480eaf12b302f2b45502fa608f0bd5
+    type_inferenced_ast: c05b395ce931cb2ddfad9607c2a50718d9465ae6c7e833eeb591f5cacbcab58d
diff --git a/tests/expectations/compiler/compiler/input_files/program_state/basic.leo.out b/tests/expectations/compiler/compiler/input_files/program_state/basic.leo.out
index 2cef53b2e9..4c08319a41 100644
--- a/tests/expectations/compiler/compiler/input_files/program_state/basic.leo.out
+++ b/tests/expectations/compiler/compiler/input_files/program_state/basic.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 4f9380a273ae5ba7862fd6b8f8be1a46cf6595c6f89d7538760239e7b99dc3d0
-    canonicalized_ast: 4f9380a273ae5ba7862fd6b8f8be1a46cf6595c6f89d7538760239e7b99dc3d0
-    type_inferenced_ast: 92e14566897c6c2d06f9044837878814b75995beed268edf3f36b4691819bc7c
+    initial_ast: ea1ce523cce402f14e02561b87f48c8f1872288c08696678adea7bd5ab3abf20
+    canonicalized_ast: ea1ce523cce402f14e02561b87f48c8f1872288c08696678adea7bd5ab3abf20
+    type_inferenced_ast: f0675c82f2691b0362080b3a934334693ddff021330d64fcb58abe3f7ef27220
diff --git a/tests/expectations/compiler/compiler/integers/i128/add.leo.out b/tests/expectations/compiler/compiler/integers/i128/add.leo.out
index c1d7276af8..68ab1179f8 100644
--- a/tests/expectations/compiler/compiler/integers/i128/add.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/add.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: c473f0dfff63bc3a34b3da6eba52325b9eb84899d5adabfddab819f13f3d5c12
-    canonicalized_ast: c473f0dfff63bc3a34b3da6eba52325b9eb84899d5adabfddab819f13f3d5c12
-    type_inferenced_ast: 9aacff57a9dc5e20202d0caf861d3b221291e9b24b55dae3d6af7cae0d462523
+    initial_ast: 72ea44d782e7a61a3a9f6c33ce4eecb9a4eb4038ea04031da31ef2fb62e7eb12
+    canonicalized_ast: 72ea44d782e7a61a3a9f6c33ce4eecb9a4eb4038ea04031da31ef2fb62e7eb12
+    type_inferenced_ast: 6aaef02cd254cdc55317d77f2597a44215d02159dad8b8ba0228b7d8f24436d3
diff --git a/tests/expectations/compiler/compiler/integers/i128/console_assert.leo.out b/tests/expectations/compiler/compiler/integers/i128/console_assert.leo.out
index f003bd352f..f082234837 100644
--- a/tests/expectations/compiler/compiler/integers/i128/console_assert.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/console_assert.leo.out
@@ -13,6 +13,6 @@ outputs:
       - input_file: i128.in
         output:
           registers: {}
-    initial_ast: 9179994f97bb644f2398fb05b40a3a953f07131cde0835661ddf13c02b9a79ff
-    canonicalized_ast: 84d32c3262b3ae07914ddfc44ff21be8e1ba8750e8a36dca109d615db2393f85
-    type_inferenced_ast: e0a51a2a919c8fbd7225bac172d55a1f03592b4355b7f7894a3b7ad2816f36bf
+    initial_ast: 9f9969273f191e9e00446450df808738ef2e4a57944fb17df97182f79670b3fb
+    canonicalized_ast: 93dcf4f5c97ad55d9e542497b405413c75634677f09c2ec4923f4f1aec67e625
+    type_inferenced_ast: 0500af7a5731c7a2ac691ea577a7dee6653b906b03ae81a959fa2ea7023e48c0
diff --git a/tests/expectations/compiler/compiler/integers/i128/div.leo.out b/tests/expectations/compiler/compiler/integers/i128/div.leo.out
index ae5b136f59..48d95c550c 100644
--- a/tests/expectations/compiler/compiler/integers/i128/div.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/div.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: ccff1bd7ccdd4deb2856d537f9662b07c2b095f5ee46f7161c2b6a51b9ebb85b
-    canonicalized_ast: ccff1bd7ccdd4deb2856d537f9662b07c2b095f5ee46f7161c2b6a51b9ebb85b
-    type_inferenced_ast: 9e2e24001539561dbe1dbecfa55b0c7b8d92f8c85de213a144d0c5fcd505204a
+    initial_ast: 02beb529b6fc1c1b432ebb67c77f1f3a54b6c97412e052df71d3a451abf1df76
+    canonicalized_ast: 02beb529b6fc1c1b432ebb67c77f1f3a54b6c97412e052df71d3a451abf1df76
+    type_inferenced_ast: 1222366de796ab5ed6f83dc46d15ebe9deca35f87cff91dbc91af42e787aa033
diff --git a/tests/expectations/compiler/compiler/integers/i128/eq.leo.out b/tests/expectations/compiler/compiler/integers/i128/eq.leo.out
index 392d47b56f..c4be0edefd 100644
--- a/tests/expectations/compiler/compiler/integers/i128/eq.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/eq.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 193c20aaf2312cc8408d2c9e38af8db7cfc77765a2c0f550f75fe36bf893ddb6
-    canonicalized_ast: 193c20aaf2312cc8408d2c9e38af8db7cfc77765a2c0f550f75fe36bf893ddb6
-    type_inferenced_ast: 4a6b35a5d378b03e2c4f342d8fee17b06ae117a8c2c67e3e694da0ca82fceefe
+    initial_ast: d14aee2dffa6f4005f5abc7a1d48572782b3b952cee3878f1b60ccf91e3e23d8
+    canonicalized_ast: d14aee2dffa6f4005f5abc7a1d48572782b3b952cee3878f1b60ccf91e3e23d8
+    type_inferenced_ast: 0dcc636d326f7910c869ce7af0cc3dddd1e635ee3c45c061955196c6527553b0
diff --git a/tests/expectations/compiler/compiler/integers/i128/ge.leo.out b/tests/expectations/compiler/compiler/integers/i128/ge.leo.out
index 8dd73b9917..2747ab1589 100644
--- a/tests/expectations/compiler/compiler/integers/i128/ge.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/ge.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 41a3c24f3843caa402b24c4efadfbdd439613a0dadacc2c4c4fbb14eecdd3012
-    canonicalized_ast: 41a3c24f3843caa402b24c4efadfbdd439613a0dadacc2c4c4fbb14eecdd3012
-    type_inferenced_ast: 080a3cda9504d930a392811175a4d3960667e2eb6c3a1ed0ba0ef784adbe74ca
+    initial_ast: a7ea55e56dd6d4de2bc7a56f39aecc5764566ee32ff10dc4e53a0c75fdf19800
+    canonicalized_ast: a7ea55e56dd6d4de2bc7a56f39aecc5764566ee32ff10dc4e53a0c75fdf19800
+    type_inferenced_ast: a29a6974cc1fbc1156111fed1f38bbf510b890c08dc07766590d48e99137b5c9
diff --git a/tests/expectations/compiler/compiler/integers/i128/gt.leo.out b/tests/expectations/compiler/compiler/integers/i128/gt.leo.out
index 671fb45330..ad16044eb1 100644
--- a/tests/expectations/compiler/compiler/integers/i128/gt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/gt.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 8fde7a555355f0cb3109c38e6708590f0cf23440c95f498d9ff1b63ef8ac7fbb
-    canonicalized_ast: 8fde7a555355f0cb3109c38e6708590f0cf23440c95f498d9ff1b63ef8ac7fbb
-    type_inferenced_ast: 4ed1fc29250d7175f812cfd956ea7641676f9216e8d66ba22f2fe2b8fceaafaa
+    initial_ast: aef508cafdc1b4ac89407b784c191ef15699e4fa377938b3b29c8f23d9f655ee
+    canonicalized_ast: aef508cafdc1b4ac89407b784c191ef15699e4fa377938b3b29c8f23d9f655ee
+    type_inferenced_ast: f62624e892a004d7c44f54d6f7bd7270c7bb3f29ec9aa73721d27f23212dc5d0
diff --git a/tests/expectations/compiler/compiler/integers/i128/le.leo.out b/tests/expectations/compiler/compiler/integers/i128/le.leo.out
index cf0cf15ae4..66baeb6219 100644
--- a/tests/expectations/compiler/compiler/integers/i128/le.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/le.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 78d701153a1bd0e37caffd3623672bbc15eef30013f0d6945622e3c773b0e40b
-    canonicalized_ast: 78d701153a1bd0e37caffd3623672bbc15eef30013f0d6945622e3c773b0e40b
-    type_inferenced_ast: bcc72ba644e3e085e4fb7ec5ad81cad31c8a3e52ca695c508a5a974084557fa5
+    initial_ast: 88bed6ed246be5d7da8ec9e8b27423d440d6bb8f5919e08aff0dc6e119ca642a
+    canonicalized_ast: 88bed6ed246be5d7da8ec9e8b27423d440d6bb8f5919e08aff0dc6e119ca642a
+    type_inferenced_ast: 899a4e3914734b834e05741650d7aeabd25135a5d8d5a9b32b0297f697108af5
diff --git a/tests/expectations/compiler/compiler/integers/i128/lt.leo.out b/tests/expectations/compiler/compiler/integers/i128/lt.leo.out
index c7e449d401..e83cc8634f 100644
--- a/tests/expectations/compiler/compiler/integers/i128/lt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/lt.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: a525dab584b9e4cf919db4362ae18124ecb4b75870aa1f221764a8a16f0eed77
-    canonicalized_ast: a525dab584b9e4cf919db4362ae18124ecb4b75870aa1f221764a8a16f0eed77
-    type_inferenced_ast: 462717ffba89b46c65e2452dadc959f14fcebb49b78c60172f223c1c4bb0ebe8
+    initial_ast: dfe28f9006b41e1cb1e7ab15c2ae21adf70fc56f914124e8cb6f7ed517735156
+    canonicalized_ast: dfe28f9006b41e1cb1e7ab15c2ae21adf70fc56f914124e8cb6f7ed517735156
+    type_inferenced_ast: b010bc84fcd159d9d176bdc3b19d511cecc6bc2c84f3a4a765b70c999271ff65
diff --git a/tests/expectations/compiler/compiler/integers/i128/max.leo.out b/tests/expectations/compiler/compiler/integers/i128/max.leo.out
index cdd1782c75..d4088158f0 100644
--- a/tests/expectations/compiler/compiler/integers/i128/max.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/max.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 8b2ac26a6a27f74b2f7a9f7523972083a5caad1fd95597cfb15ac21d58bc32e9
-    canonicalized_ast: 8b2ac26a6a27f74b2f7a9f7523972083a5caad1fd95597cfb15ac21d58bc32e9
-    type_inferenced_ast: 7f01c95106c222834c49509fdc88b7cf3b9d74cf2ff4923f0000968535859fa1
+    initial_ast: c812f6aabfc409d622328348243db2a569486f032621797722bb90b0171c6d78
+    canonicalized_ast: c812f6aabfc409d622328348243db2a569486f032621797722bb90b0171c6d78
+    type_inferenced_ast: 2d1c60c1c8bfabb0fb8b171688d7b4d6630535f6b7ddbabb4cf6f981916f7e2d
diff --git a/tests/expectations/compiler/compiler/integers/i128/max_fail.leo.out b/tests/expectations/compiler/compiler/integers/i128/max_fail.leo.out
index d3bcb58a4e..78130ba33d 100644
--- a/tests/expectations/compiler/compiler/integers/i128/max_fail.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/max_fail.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EASG0373031]: failed to parse int value '170141183460469231731687303715884105728'\n    --> compiler-test:4:21\n     |\n   4 |     const a: i128 = 170141183460469231731687303715884105728;\n     |                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^"
+  - "Error [EASG0373031]: failed to parse int value '170141183460469231731687303715884105728'\n    --> compiler-test:7:21\n     |\n   7 |     const a: i128 = 170141183460469231731687303715884105728;\n     |                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^"
diff --git a/tests/expectations/compiler/compiler/integers/i128/min.leo.out b/tests/expectations/compiler/compiler/integers/i128/min.leo.out
index 007e2a219d..a5998fb9ca 100644
--- a/tests/expectations/compiler/compiler/integers/i128/min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/min.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: ca4b9ce444b0d445a84d26e4711d25c9f8670b8cae8ce0c456680b9ddd49663a
-    canonicalized_ast: ca4b9ce444b0d445a84d26e4711d25c9f8670b8cae8ce0c456680b9ddd49663a
-    type_inferenced_ast: 122e02aff2e30b825b64251f34dd01ef81429e5cf7807e18b5f33adc9709e67e
+    initial_ast: 6bb38b627aeee61e0e976a12562716640a3a375c440ad72a1359e11f77665356
+    canonicalized_ast: 6bb38b627aeee61e0e976a12562716640a3a375c440ad72a1359e11f77665356
+    type_inferenced_ast: 9820e133de962995b5e50be106933ffd60c69a46db43c29966fbb002b95f95db
diff --git a/tests/expectations/compiler/compiler/integers/i128/min_fail.leo.out b/tests/expectations/compiler/compiler/integers/i128/min_fail.leo.out
index 55f057ca89..4ee6ba8240 100644
--- a/tests/expectations/compiler/compiler/integers/i128/min_fail.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/min_fail.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EASG0373031]: failed to parse int value '-170141183460469231731687303715884105729'\n    --> compiler-test:4:21\n     |\n   4 |     const a: i128 = -170141183460469231731687303715884105729;\n     |                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^"
+  - "Error [EASG0373031]: failed to parse int value '-170141183460469231731687303715884105729'\n    --> compiler-test:7:21\n     |\n   7 |     const a: i128 = -170141183460469231731687303715884105729;\n     |                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^"
diff --git a/tests/expectations/compiler/compiler/integers/i128/mul.leo.out b/tests/expectations/compiler/compiler/integers/i128/mul.leo.out
index ed9d73e5d7..4104858ba3 100644
--- a/tests/expectations/compiler/compiler/integers/i128/mul.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/mul.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 228b473e19bbba4b71e7d157b704e89d6ef8aa446663844077719db104d1569b
-    canonicalized_ast: 228b473e19bbba4b71e7d157b704e89d6ef8aa446663844077719db104d1569b
-    type_inferenced_ast: 06a3d13f280995c019cb81a4e5de4457815a45c6f507d27911bda75ffd2e0f98
+    initial_ast: 8bc6d8343a9b60d64c394b861b36cd68aecadf5e62174b05b2ee74b6b7849e4f
+    canonicalized_ast: 8bc6d8343a9b60d64c394b861b36cd68aecadf5e62174b05b2ee74b6b7849e4f
+    type_inferenced_ast: 34b4bb48563bb307d6758eaef0bd347490765232d89225d45a5685a0ba78e6a8
diff --git a/tests/expectations/compiler/compiler/integers/i128/ne.leo.out b/tests/expectations/compiler/compiler/integers/i128/ne.leo.out
index 2dbbe9130f..cfce4234f5 100644
--- a/tests/expectations/compiler/compiler/integers/i128/ne.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/ne.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 0c0a73b6892c05a8e28baeb86e1d18d28af3b602f7e6de4adba4ae28335ca509
-    canonicalized_ast: 0c0a73b6892c05a8e28baeb86e1d18d28af3b602f7e6de4adba4ae28335ca509
-    type_inferenced_ast: b2a1e5f4428e37b0c5ae52cc63ed3f4c0908885c6732d4f353825b816fa6136c
+    initial_ast: 5946f1024acebf871678f38a7c08af18b3184500cad663848454b1564461ece1
+    canonicalized_ast: 5946f1024acebf871678f38a7c08af18b3184500cad663848454b1564461ece1
+    type_inferenced_ast: 2fc678de0fbaab2a5989d1dfa28901db697a21addfbcabde88e549d3ed99f876
diff --git a/tests/expectations/compiler/compiler/integers/i128/negate.leo.out b/tests/expectations/compiler/compiler/integers/i128/negate.leo.out
index 6d4fa039ec..4aafd6f1f7 100644
--- a/tests/expectations/compiler/compiler/integers/i128/negate.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/negate.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: d059629756c072e44c3ca938339712f85b2b69fb0649051bf76d1908e4b2eade
-    canonicalized_ast: d059629756c072e44c3ca938339712f85b2b69fb0649051bf76d1908e4b2eade
-    type_inferenced_ast: 9b3f2561a65416b13d6409492bfc989bae6bc67976faba9825fb02f1451a4c17
+    initial_ast: b1855ab288324f6671ad59b4cf9682e61109e3799f62e26cbaab7003721b9b12
+    canonicalized_ast: b1855ab288324f6671ad59b4cf9682e61109e3799f62e26cbaab7003721b9b12
+    type_inferenced_ast: 49f3f82fdc10a3d9313508a3446a3b52893aff2a1eaa93686a2833d8b4d59600
diff --git a/tests/expectations/compiler/compiler/integers/i128/negate_min.leo.out b/tests/expectations/compiler/compiler/integers/i128/negate_min.leo.out
index ab4f777fed..62022d943b 100644
--- a/tests/expectations/compiler/compiler/integers/i128/negate_min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/negate_min.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: a0009b59b8ff05ebb3309395250a94e675663417730aceed483ce2338880d8fd
-    canonicalized_ast: a0009b59b8ff05ebb3309395250a94e675663417730aceed483ce2338880d8fd
-    type_inferenced_ast: 5140944155158eba88db7a3c6614dac1b50ba37a30d906b10d6c86729dc1c923
+    initial_ast: e0018cc92513ad5a21e2f9e8df54da2e7c543c52f232787a2ca895566f0f7ea4
+    canonicalized_ast: e0018cc92513ad5a21e2f9e8df54da2e7c543c52f232787a2ca895566f0f7ea4
+    type_inferenced_ast: 2d613a78d4484431644c016ee354018ad19cda6d34393c2c53d5e69115b08a93
diff --git a/tests/expectations/compiler/compiler/integers/i128/negate_zero.leo.out b/tests/expectations/compiler/compiler/integers/i128/negate_zero.leo.out
index 26d7c1642a..b32a9d21df 100644
--- a/tests/expectations/compiler/compiler/integers/i128/negate_zero.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/negate_zero.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: c9e977ef13cd2c8e6b6c3e50ce14888865d51e858e6fa8660076015986692978
-    canonicalized_ast: c9e977ef13cd2c8e6b6c3e50ce14888865d51e858e6fa8660076015986692978
-    type_inferenced_ast: b59d18c7f15c7b4cdadd36feb0c4da91ff5d72d362be4e8c69039bbcd6d262d0
+    initial_ast: 829d24e96894da3d3ca50f396bc02c6ccedbcbfdee783ec1c7fc5083314e864e
+    canonicalized_ast: 829d24e96894da3d3ca50f396bc02c6ccedbcbfdee783ec1c7fc5083314e864e
+    type_inferenced_ast: 2a2c7c175586d7cdba934affb3801880998bdbcfecdc61702554a1f4478bb6f3
diff --git a/tests/expectations/compiler/compiler/integers/i128/no_space_between_literal.leo.out b/tests/expectations/compiler/compiler/integers/i128/no_space_between_literal.leo.out
index 58e069fbb0..3a2415073f 100644
--- a/tests/expectations/compiler/compiler/integers/i128/no_space_between_literal.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/no_space_between_literal.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EPAR0370004]: Unexpected white space between terms 1 and i128\n    --> compiler-test:4:15\n     |\n   4 |     const i = 1 i128;\n     |               ^"
+  - "Error [EPAR0370004]: Unexpected white space between terms 1 and i128\n    --> compiler-test:7:15\n     |\n   7 |     const i = 1 i128;\n     |               ^"
diff --git a/tests/expectations/compiler/compiler/integers/i128/sub.leo.out b/tests/expectations/compiler/compiler/integers/i128/sub.leo.out
index f95190326a..69c6be41e4 100644
--- a/tests/expectations/compiler/compiler/integers/i128/sub.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/sub.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 94fc493ab84b819b8c12f68a7c4d01e9adfd7eaa1cc533bafcbcce10b547cddb
-    canonicalized_ast: 94fc493ab84b819b8c12f68a7c4d01e9adfd7eaa1cc533bafcbcce10b547cddb
-    type_inferenced_ast: 6238710e4e6696f1020a31763f3edaa17be46f9ba4fd55bd72497e5c4bfe1cd7
+    initial_ast: 8b4f556b5ebea211b24c6fd62585db4befc634cad822c6d9aa87cb31c77efb18
+    canonicalized_ast: 8b4f556b5ebea211b24c6fd62585db4befc634cad822c6d9aa87cb31c77efb18
+    type_inferenced_ast: 398f78fd4c09da1bdf7b88395cbc87a82815993287984fb55149bccbdc53d6b3
diff --git a/tests/expectations/compiler/compiler/integers/i128/ternary.leo.out b/tests/expectations/compiler/compiler/integers/i128/ternary.leo.out
index 76111474a5..721eb5ccc9 100644
--- a/tests/expectations/compiler/compiler/integers/i128/ternary.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/ternary.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: eee17d124eb8d460f62417c1af0bbbe424cc14a6751250c6f606df1b28d191d3
-    canonicalized_ast: eee17d124eb8d460f62417c1af0bbbe424cc14a6751250c6f606df1b28d191d3
-    type_inferenced_ast: c37cd2aa068f66eb9debcda671ad096b852639b3d074f11deced4d2e93dba370
+    initial_ast: 9910732d0da35a60a774a847a8926e66efb5901f6bee2e713cb2fe83269a827d
+    canonicalized_ast: 9910732d0da35a60a774a847a8926e66efb5901f6bee2e713cb2fe83269a827d
+    type_inferenced_ast: 7c0055e7c5b18ce392f11d44a67e64c6b600f045804a5a251026459119e012ea
diff --git a/tests/expectations/compiler/compiler/integers/i16/add.leo.out b/tests/expectations/compiler/compiler/integers/i16/add.leo.out
index 6f0ee352a9..b30fb60515 100644
--- a/tests/expectations/compiler/compiler/integers/i16/add.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/add.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 4fd0a999f8398beef7f71c3315355df0bd1124f66a6fda726db6830442a9069f
-    canonicalized_ast: 4fd0a999f8398beef7f71c3315355df0bd1124f66a6fda726db6830442a9069f
-    type_inferenced_ast: d7a93d56836cb99a113174804450f53e19096901e14b4ec31acbfab389df7eed
+    initial_ast: fee518396f959218f08573405435769129ee7f4796011f71db5c85db5c54833e
+    canonicalized_ast: fee518396f959218f08573405435769129ee7f4796011f71db5c85db5c54833e
+    type_inferenced_ast: 646a9ce19aae98bcb2f49b3a50210b30556a55746ffe7509860ea8bcf6008fab
diff --git a/tests/expectations/compiler/compiler/integers/i16/console_assert.leo.out b/tests/expectations/compiler/compiler/integers/i16/console_assert.leo.out
index 95d01494f5..e36772434f 100644
--- a/tests/expectations/compiler/compiler/integers/i16/console_assert.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/console_assert.leo.out
@@ -13,6 +13,6 @@ outputs:
       - input_file: i16.in
         output:
           registers: {}
-    initial_ast: b2877669171aea3b2c3f020ba997de1fe6c5a64328f041620a502fad992f820f
-    canonicalized_ast: 33d960627a5a40386fcf1fc1edd259379bca4517a77155440f5417919e69c6b3
-    type_inferenced_ast: e03a6ef7557c36c6c2a57306d1d4ff1d6f7c5d1955d938af2a64ed5a37cc257d
+    initial_ast: 3c976e47aa0435e0c532adab2b0cb6b1721f5c156c35e64546d1d569f46d33ad
+    canonicalized_ast: b855cbd5ab1bde196a79c36cc358ecf20420496fd1bb1387c8acb2093f3389a8
+    type_inferenced_ast: 85795bd380af62e25dbfb5a20073cf34b8c11d9429c39abe5fd706543d235a2e
diff --git a/tests/expectations/compiler/compiler/integers/i16/div.leo.out b/tests/expectations/compiler/compiler/integers/i16/div.leo.out
index 388f0f87f1..62c1f29a16 100644
--- a/tests/expectations/compiler/compiler/integers/i16/div.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/div.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: d50e609d7e88ef14c86c8a72cdff0c92106ed4580a06faf3705c789141181782
-    canonicalized_ast: d50e609d7e88ef14c86c8a72cdff0c92106ed4580a06faf3705c789141181782
-    type_inferenced_ast: 78f3ab4058104f17d002e8baedea424719e8ef6f99666e68042b89326cbb4916
+    initial_ast: 007626c3753672325ed449f866e25886c95b1d3b9e889c0925348bb8c2d41a32
+    canonicalized_ast: 007626c3753672325ed449f866e25886c95b1d3b9e889c0925348bb8c2d41a32
+    type_inferenced_ast: 6cfdb8351ca7f737a10c49b5bc57e4980ac45ae97c6ba6bbcf8bb25f00cacb00
diff --git a/tests/expectations/compiler/compiler/integers/i16/eq.leo.out b/tests/expectations/compiler/compiler/integers/i16/eq.leo.out
index 29e49a0c30..1113690f38 100644
--- a/tests/expectations/compiler/compiler/integers/i16/eq.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/eq.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 9a4e11bacd644fd08dd1bce9b88fde724b357dfc1ec5f8d123f8c0479de36e71
-    canonicalized_ast: 9a4e11bacd644fd08dd1bce9b88fde724b357dfc1ec5f8d123f8c0479de36e71
-    type_inferenced_ast: 56798e8bcbbda12ea8540466cf8e25051000cb66c8bb15bae72c106ec8a8e0e5
+    initial_ast: 47aef3ff759e15c1efbb77ed06fdb9c9aa0c605e1bb69874e25588a48053d5f3
+    canonicalized_ast: 47aef3ff759e15c1efbb77ed06fdb9c9aa0c605e1bb69874e25588a48053d5f3
+    type_inferenced_ast: 51e6623997149950ecfef1495c31b86a0001e51dd15199f51759d7fedf4122e3
diff --git a/tests/expectations/compiler/compiler/integers/i16/ge.leo.out b/tests/expectations/compiler/compiler/integers/i16/ge.leo.out
index 36c60c60ac..8f5fa92158 100644
--- a/tests/expectations/compiler/compiler/integers/i16/ge.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/ge.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 57a7f4ea91f1b8168f64c44bbc972451f1b928f0b24a3fe2ae54d140db200e11
-    canonicalized_ast: 57a7f4ea91f1b8168f64c44bbc972451f1b928f0b24a3fe2ae54d140db200e11
-    type_inferenced_ast: c36a49da5d76dfd83be7fae709163ca9055a7561f1e4c0dd0ea45cacb50ff5fc
+    initial_ast: afe9a9dc36075fb340f9dc597a02c7aeb9957d8f530cac9fef03d64b69ca5491
+    canonicalized_ast: afe9a9dc36075fb340f9dc597a02c7aeb9957d8f530cac9fef03d64b69ca5491
+    type_inferenced_ast: fc2e936520edb0c045bfb35db244aee3102e6554f4c9130594734c51a1cd4e7b
diff --git a/tests/expectations/compiler/compiler/integers/i16/gt.leo.out b/tests/expectations/compiler/compiler/integers/i16/gt.leo.out
index 7b4e62e28c..7a70740970 100644
--- a/tests/expectations/compiler/compiler/integers/i16/gt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/gt.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: d04f1a60245b6bbb02ed550a9f1a7d39d6ed52a8b096fa19196992f79f1118f8
-    canonicalized_ast: d04f1a60245b6bbb02ed550a9f1a7d39d6ed52a8b096fa19196992f79f1118f8
-    type_inferenced_ast: c1e6bf995eebfaf0c4615af2657876836001e793d5eee5701dac65374a98a452
+    initial_ast: 42647f85c77045b9b234ffe7013988d978bb7b8806aac022ac38be17729fe13a
+    canonicalized_ast: 42647f85c77045b9b234ffe7013988d978bb7b8806aac022ac38be17729fe13a
+    type_inferenced_ast: 65d7ee504a51bb6f0b76172bb5109fa491e0ae5f2e7698b3adc2abd79c05cf19
diff --git a/tests/expectations/compiler/compiler/integers/i16/le.leo.out b/tests/expectations/compiler/compiler/integers/i16/le.leo.out
index 7ab8abb8d1..40b86484f6 100644
--- a/tests/expectations/compiler/compiler/integers/i16/le.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/le.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 1791b30d366c1380e67e6526ce5c33a532937d2315b9c73c18066200dfe9f3d2
-    canonicalized_ast: 1791b30d366c1380e67e6526ce5c33a532937d2315b9c73c18066200dfe9f3d2
-    type_inferenced_ast: 52fbb77cfe63d3736526f72032c784fc9d854e6b7ab20e3951ea9a7171dd3265
+    initial_ast: b0e91a999561ffa4adfae94c3da66c3218dcbd4f6063188bfb3a39d4908b2af1
+    canonicalized_ast: b0e91a999561ffa4adfae94c3da66c3218dcbd4f6063188bfb3a39d4908b2af1
+    type_inferenced_ast: 94946e4b19c124ca9dc81c04ebdb540952f2bcce57d43ed15932296b6ae9578d
diff --git a/tests/expectations/compiler/compiler/integers/i16/lt.leo.out b/tests/expectations/compiler/compiler/integers/i16/lt.leo.out
index d3dc3fdd7c..9adde9969c 100644
--- a/tests/expectations/compiler/compiler/integers/i16/lt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/lt.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: ddb410ad0b9d0a078744b5ff1f8bdb7991f46f2dde53e754b69b163e4ab60d27
-    canonicalized_ast: ddb410ad0b9d0a078744b5ff1f8bdb7991f46f2dde53e754b69b163e4ab60d27
-    type_inferenced_ast: b560aa7679b75616a300f942a2d863e58715227703b6d7c17bbd11ab02840944
+    initial_ast: 38576e75c519f7b42240388605bda2aa338ef785d44b3b2bd68e25697e7700bf
+    canonicalized_ast: 38576e75c519f7b42240388605bda2aa338ef785d44b3b2bd68e25697e7700bf
+    type_inferenced_ast: 5d6cc76f452876171cdffd39d731fd3b9d9dbcf3df8c1dc0d4e57de07b090f44
diff --git a/tests/expectations/compiler/compiler/integers/i16/max.leo.out b/tests/expectations/compiler/compiler/integers/i16/max.leo.out
index 529dfe111e..4e96137e5a 100644
--- a/tests/expectations/compiler/compiler/integers/i16/max.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/max.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: f156257ed496945bb2c1c3453c6abadb8cf83ee3db1943932fd381eb63d7172d
-    canonicalized_ast: f156257ed496945bb2c1c3453c6abadb8cf83ee3db1943932fd381eb63d7172d
-    type_inferenced_ast: b398428451e40f14d765e57cefd7b500df7eb14b84589545ef772b4d08bca9cc
+    initial_ast: a490d50c89240eb8411bdf69950dd3c348e599b1f6ecf8ce95d5398773dd3862
+    canonicalized_ast: a490d50c89240eb8411bdf69950dd3c348e599b1f6ecf8ce95d5398773dd3862
+    type_inferenced_ast: 0d0e9a690c26b541d8d703f03606faf656f5b3b6eb25c4614f895310d0c4d7b8
diff --git a/tests/expectations/compiler/compiler/integers/i16/max_fail.leo.out b/tests/expectations/compiler/compiler/integers/i16/max_fail.leo.out
index 243ee127a8..7d317c5dec 100644
--- a/tests/expectations/compiler/compiler/integers/i16/max_fail.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/max_fail.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EASG0373031]: failed to parse int value '32768'\n    --> compiler-test:4:20\n     |\n   4 |     const a: i16 = 32768;\n     |                    ^^^^^"
+  - "Error [EASG0373031]: failed to parse int value '32768'\n    --> compiler-test:7:20\n     |\n   7 |     const a: i16 = 32768;\n     |                    ^^^^^"
diff --git a/tests/expectations/compiler/compiler/integers/i16/min.leo.out b/tests/expectations/compiler/compiler/integers/i16/min.leo.out
index b5baabb2c8..aed7d19ee5 100644
--- a/tests/expectations/compiler/compiler/integers/i16/min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/min.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: b5cd4df2823d12fa01257069c35fb1385cba00c646822bc0fd9fa660d1edc085
-    canonicalized_ast: b5cd4df2823d12fa01257069c35fb1385cba00c646822bc0fd9fa660d1edc085
-    type_inferenced_ast: 6d3fcd70910f98e8980782b2d87ac394debd331dc54167df5cc8f58ea1f4477d
+    initial_ast: c930e3954eab4bd4a2b5e16b54a506265e0f70a5421a185ad77e9a10c2a63973
+    canonicalized_ast: c930e3954eab4bd4a2b5e16b54a506265e0f70a5421a185ad77e9a10c2a63973
+    type_inferenced_ast: e8df54b01d4e3875d1e23f88ee149005027df93ca3cc064791c7801c32070ff6
diff --git a/tests/expectations/compiler/compiler/integers/i16/min_fail.leo.out b/tests/expectations/compiler/compiler/integers/i16/min_fail.leo.out
index 00fcc69d5c..b6cc3a9178 100644
--- a/tests/expectations/compiler/compiler/integers/i16/min_fail.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/min_fail.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EASG0373031]: failed to parse int value '-32769'\n    --> compiler-test:4:20\n     |\n   4 |     const a: i16 = -32769;\n     |                    ^^^^^^"
+  - "Error [EASG0373031]: failed to parse int value '-32769'\n    --> compiler-test:7:20\n     |\n   7 |     const a: i16 = -32769;\n     |                    ^^^^^^"
diff --git a/tests/expectations/compiler/compiler/integers/i16/mul.leo.out b/tests/expectations/compiler/compiler/integers/i16/mul.leo.out
index 213c7903ac..206e6d9c3b 100644
--- a/tests/expectations/compiler/compiler/integers/i16/mul.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/mul.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 8ada3ff469df0290e1dbb7f3fa12d094710cd68249fb6083c27eaea7f95a1cbb
-    canonicalized_ast: 8ada3ff469df0290e1dbb7f3fa12d094710cd68249fb6083c27eaea7f95a1cbb
-    type_inferenced_ast: 83c7e2a44566f7829e05668d44f940c045e3174db2729508d711b7eb8f848753
+    initial_ast: 888142bd70c55c3a2725bd6a0e6aef58ce65835df91406c25c12caf4ee3016dc
+    canonicalized_ast: 888142bd70c55c3a2725bd6a0e6aef58ce65835df91406c25c12caf4ee3016dc
+    type_inferenced_ast: f729e279eae01a837b12d3e6ebe89a5449a97d77ed0dbf514533240c1b5b9580
diff --git a/tests/expectations/compiler/compiler/integers/i16/ne.leo.out b/tests/expectations/compiler/compiler/integers/i16/ne.leo.out
index 86e717f877..08e1e72a2d 100644
--- a/tests/expectations/compiler/compiler/integers/i16/ne.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/ne.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 6fdf2386103f6bf3d5f551149b5f565f60ceb5181caca425668127be3e945884
-    canonicalized_ast: 6fdf2386103f6bf3d5f551149b5f565f60ceb5181caca425668127be3e945884
-    type_inferenced_ast: 4c373148bcec4f7d483cc9c560eb079746765c00a5e51c303449a9181696fae0
+    initial_ast: 7792dc7e904b0f62b9c7e81139cb455b2800bc761ba1b71f381774ed805c26ae
+    canonicalized_ast: 7792dc7e904b0f62b9c7e81139cb455b2800bc761ba1b71f381774ed805c26ae
+    type_inferenced_ast: 9cc0ba1175def4e5b3ab18f17c98aaaebc173a0ea6aa25a609334cd124064a58
diff --git a/tests/expectations/compiler/compiler/integers/i16/negate.leo.out b/tests/expectations/compiler/compiler/integers/i16/negate.leo.out
index 4129d6126a..083794d2b1 100644
--- a/tests/expectations/compiler/compiler/integers/i16/negate.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/negate.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 78b70e6ae55381a259898d0ffbc671c24841583e81b57e2f354bc1de69060818
-    canonicalized_ast: 78b70e6ae55381a259898d0ffbc671c24841583e81b57e2f354bc1de69060818
-    type_inferenced_ast: d38e16eaab8936e730c5aed27b7bcdee553374dc14879e2007137e529aea1a71
+    initial_ast: 0d24590cceced33443aec32a290658b3e8a2360e7bc58e4baf0f56eb1ea1c92a
+    canonicalized_ast: 0d24590cceced33443aec32a290658b3e8a2360e7bc58e4baf0f56eb1ea1c92a
+    type_inferenced_ast: a65880d035882667d8d3db24356265f5d9c8bccc10420b8e4e71f0ccecbedba4
diff --git a/tests/expectations/compiler/compiler/integers/i16/negate_min.leo.out b/tests/expectations/compiler/compiler/integers/i16/negate_min.leo.out
index 67eb91d545..5ee9ea295a 100644
--- a/tests/expectations/compiler/compiler/integers/i16/negate_min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/negate_min.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 4a65eba57cd4644e8470ab20438d6777573f513b1f5d922cd99d4114eac64c8c
-    canonicalized_ast: 4a65eba57cd4644e8470ab20438d6777573f513b1f5d922cd99d4114eac64c8c
-    type_inferenced_ast: bc8a7a7ea6867eadfdc5fe662239f591b6d2d2dfc46af9021376338294eeccea
+    initial_ast: fae1b70fc460c8a42498350086b464e69982f70512c5cdab6255d8cc7c9d40d1
+    canonicalized_ast: fae1b70fc460c8a42498350086b464e69982f70512c5cdab6255d8cc7c9d40d1
+    type_inferenced_ast: da686a61850d55db217fe1ed1416a5ee92bbc368720e701bb0d7223e7d2c4ba4
diff --git a/tests/expectations/compiler/compiler/integers/i16/negate_zero.leo.out b/tests/expectations/compiler/compiler/integers/i16/negate_zero.leo.out
index 9b9a95d776..d3fb03e6ab 100644
--- a/tests/expectations/compiler/compiler/integers/i16/negate_zero.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/negate_zero.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 59f05a78cd18913660f463f5ee7bc407f5a3893fb36049fabf385b7ad0b826d3
-    canonicalized_ast: 59f05a78cd18913660f463f5ee7bc407f5a3893fb36049fabf385b7ad0b826d3
-    type_inferenced_ast: 0d90246cadbc95713dc45b0d09330d532cc9e6fd206b4c9426876f8ba25f2bd2
+    initial_ast: b69c95f909d537978db872852a11584b1ff7e713daddecbdb96ad20fd278ea04
+    canonicalized_ast: b69c95f909d537978db872852a11584b1ff7e713daddecbdb96ad20fd278ea04
+    type_inferenced_ast: c7de55f9ce321d497f3523a2743069dda5177b496edb19298d046358597b2036
diff --git a/tests/expectations/compiler/compiler/integers/i16/no_space_between_literal.leo.out b/tests/expectations/compiler/compiler/integers/i16/no_space_between_literal.leo.out
index 8484337bd0..78b5cbf5c8 100644
--- a/tests/expectations/compiler/compiler/integers/i16/no_space_between_literal.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/no_space_between_literal.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EPAR0370004]: Unexpected white space between terms 1 and i16\n    --> compiler-test:4:15\n     |\n   4 |     const i = 1 i16;\n     |               ^"
+  - "Error [EPAR0370004]: Unexpected white space between terms 1 and i16\n    --> compiler-test:7:15\n     |\n   7 |     const i = 1 i16;\n     |               ^"
diff --git a/tests/expectations/compiler/compiler/integers/i16/sub.leo.out b/tests/expectations/compiler/compiler/integers/i16/sub.leo.out
index 51a8b60107..674cf0cfca 100644
--- a/tests/expectations/compiler/compiler/integers/i16/sub.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/sub.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 385d1b0ffca199ec557e28fc9b51b40414c458b01ab549f67772f45064da727f
-    canonicalized_ast: 385d1b0ffca199ec557e28fc9b51b40414c458b01ab549f67772f45064da727f
-    type_inferenced_ast: af05a924222674c6d50fec716217083cd675424c6e04840ece1d1c2f39fd5345
+    initial_ast: 14161acdd62d966661b4bda71153c37ec3498fdfb8a772f17b34db9ac2e841a0
+    canonicalized_ast: 14161acdd62d966661b4bda71153c37ec3498fdfb8a772f17b34db9ac2e841a0
+    type_inferenced_ast: 4965519bc1bff81c266bce1daa43a62233e4a2030c9de4c83fb91580587415e2
diff --git a/tests/expectations/compiler/compiler/integers/i16/ternary.leo.out b/tests/expectations/compiler/compiler/integers/i16/ternary.leo.out
index d943b090db..955b955f80 100644
--- a/tests/expectations/compiler/compiler/integers/i16/ternary.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/ternary.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: b77183d532a218611aff8db0203b9a043a2e8f5acacf5e03b79a27c75d566d26
-    canonicalized_ast: b77183d532a218611aff8db0203b9a043a2e8f5acacf5e03b79a27c75d566d26
-    type_inferenced_ast: 88c4cd08d33755f4990b5dacd9884730499781a128ebc01b616e3b93897476c4
+    initial_ast: 3f06085755e89e4ec3df613df86eeee64aafaac95440ab79820654ec7d73b6a8
+    canonicalized_ast: 3f06085755e89e4ec3df613df86eeee64aafaac95440ab79820654ec7d73b6a8
+    type_inferenced_ast: 937388c256103fbd05d4137343dc6bbe56e611a04ae58f12362f0b75d6169b9a
diff --git a/tests/expectations/compiler/compiler/integers/i32/add.leo.out b/tests/expectations/compiler/compiler/integers/i32/add.leo.out
index ebaa4dc882..71f1f15e27 100644
--- a/tests/expectations/compiler/compiler/integers/i32/add.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/add.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: e867242ead014273d3c7f6829e55851b9e2b01883b55499dfdce94b45c9ebb7d
-    canonicalized_ast: e867242ead014273d3c7f6829e55851b9e2b01883b55499dfdce94b45c9ebb7d
-    type_inferenced_ast: 3575a9b8ffa5f5ec96c86dab2230e3333d6525b38789b0b1b8cbc44df3d9c190
+    initial_ast: a4e539ab8606d68fd7e523743d7ca00d656fb669312ba0442199f0e4f4acaff0
+    canonicalized_ast: a4e539ab8606d68fd7e523743d7ca00d656fb669312ba0442199f0e4f4acaff0
+    type_inferenced_ast: 4ff553875397225d910f7b044b7e0a341ff111fb0fbc853c64942436d9e30a44
diff --git a/tests/expectations/compiler/compiler/integers/i32/console_assert.leo.out b/tests/expectations/compiler/compiler/integers/i32/console_assert.leo.out
index 095005acde..b3957e3542 100644
--- a/tests/expectations/compiler/compiler/integers/i32/console_assert.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/console_assert.leo.out
@@ -13,6 +13,6 @@ outputs:
       - input_file: i32.in
         output:
           registers: {}
-    initial_ast: c2a72c4ab80cce9d171a487cfaf2a930a4ee9191298786335af894d483e58857
-    canonicalized_ast: 4cea550893a8ccb47451f8c54a8f568c2ca29c8a73a4d4a6e6c3fe69ea081e20
-    type_inferenced_ast: c7c946c493772f30c641a53a56a410c9a17af557b24fa6411af7162b8cf49394
+    initial_ast: 24a949bf5f7704daebbf32d1e73c6678cfec0f7105109f0c46600b0b7f1811c8
+    canonicalized_ast: a8d46fa6ea5786b315940767b62c1471331dff9880df8011148b20642ce0179e
+    type_inferenced_ast: 814b4fb1ca1eebbf1664f1569924350aa8823815c6b7e1d835d405f3da5e0d26
diff --git a/tests/expectations/compiler/compiler/integers/i32/div.leo.out b/tests/expectations/compiler/compiler/integers/i32/div.leo.out
index c1bad5b24c..9df5e3950e 100644
--- a/tests/expectations/compiler/compiler/integers/i32/div.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/div.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: aeb8257825486463ebfd0b8f24c68960cbe1d214841e28233f9971c61fa869cb
-    canonicalized_ast: aeb8257825486463ebfd0b8f24c68960cbe1d214841e28233f9971c61fa869cb
-    type_inferenced_ast: 68e6a4be72ecc4d11831756e72591474765077951f919f7bc511fa37fd40ac24
+    initial_ast: d58a4c88698deb390ddb9bf3ec8483b8c687208f751a467114647ca2b37dd806
+    canonicalized_ast: d58a4c88698deb390ddb9bf3ec8483b8c687208f751a467114647ca2b37dd806
+    type_inferenced_ast: 728a8dd4d3b4ee867a12c61d88038ea36ef652c04a3ee22a4052b74ae6ee6c81
diff --git a/tests/expectations/compiler/compiler/integers/i32/eq.leo.out b/tests/expectations/compiler/compiler/integers/i32/eq.leo.out
index abbda763bb..1099cdd147 100644
--- a/tests/expectations/compiler/compiler/integers/i32/eq.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/eq.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 2398622edbbd3f627a9d39f056c359fb00ca8d4ff393ac784ab809ebbe2dbc87
-    canonicalized_ast: 2398622edbbd3f627a9d39f056c359fb00ca8d4ff393ac784ab809ebbe2dbc87
-    type_inferenced_ast: 6492773ea5bdcbcdfb0b846a8e5446cefe7a1417033a07c0207308c7870c5753
+    initial_ast: 3042be5b6d43c57172f26f56c41a25bc81d0e8e1dc14aa1358fd21757acd8691
+    canonicalized_ast: 3042be5b6d43c57172f26f56c41a25bc81d0e8e1dc14aa1358fd21757acd8691
+    type_inferenced_ast: 6f569cf2686707205fe51c5f87929c320078ba66a834d393710bf44843a6498a
diff --git a/tests/expectations/compiler/compiler/integers/i32/ge.leo.out b/tests/expectations/compiler/compiler/integers/i32/ge.leo.out
index 759df606c9..f2e9586734 100644
--- a/tests/expectations/compiler/compiler/integers/i32/ge.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/ge.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: d48fecdcedb16ee73c9206b370c525c1e76fed03e8465eb3a139deef81d74c1e
-    canonicalized_ast: d48fecdcedb16ee73c9206b370c525c1e76fed03e8465eb3a139deef81d74c1e
-    type_inferenced_ast: 0542e9c4cae0e395a5b0bfc0b190064a4f8cbf1ea1d87be62943a8b8f4ef1503
+    initial_ast: 3246b6d851e980be2ef4992a7daf3a9d212b020cc72c7169e435ffc03e7f107b
+    canonicalized_ast: 3246b6d851e980be2ef4992a7daf3a9d212b020cc72c7169e435ffc03e7f107b
+    type_inferenced_ast: 84f90570ba138cc2f417c7111fbbc0b6f0bb4f8f8ce8275a21a34f91e610589e
diff --git a/tests/expectations/compiler/compiler/integers/i32/gt.leo.out b/tests/expectations/compiler/compiler/integers/i32/gt.leo.out
index 618d4d6b96..60ed1e87f8 100644
--- a/tests/expectations/compiler/compiler/integers/i32/gt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/gt.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 2400dfd1d48a4543a52a23ddb2f8da736d42dbfbd6a7d9831b7751e4cb278125
-    canonicalized_ast: 2400dfd1d48a4543a52a23ddb2f8da736d42dbfbd6a7d9831b7751e4cb278125
-    type_inferenced_ast: 5e5227aff1ba94756a53585d4f6f0749216ae54e2e33fa30f268fe774025933d
+    initial_ast: 12408e40fa7be48e4e0fa1a415277ad934aa9e512a5b10c3007b9c456f53fb8b
+    canonicalized_ast: 12408e40fa7be48e4e0fa1a415277ad934aa9e512a5b10c3007b9c456f53fb8b
+    type_inferenced_ast: 752e6c6cac0a5d48119e5aa7dd03298844a471cd0f2445f44e802a6da48acd66
diff --git a/tests/expectations/compiler/compiler/integers/i32/le.leo.out b/tests/expectations/compiler/compiler/integers/i32/le.leo.out
index 42b1744479..1a7d48fe40 100644
--- a/tests/expectations/compiler/compiler/integers/i32/le.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/le.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 79661a6c772991cbf0784607b942ddb356b8af566e3faa5cf1f8865edaeed36e
-    canonicalized_ast: 79661a6c772991cbf0784607b942ddb356b8af566e3faa5cf1f8865edaeed36e
-    type_inferenced_ast: c4c7a350f77be14beb28f65218146d4cb9dc1e93b43d14cbd5c2b177b21ed4d6
+    initial_ast: f09bda21e0755bfcf0509095349ff879db0a3e713b39b3b2a273dd554ba400ed
+    canonicalized_ast: f09bda21e0755bfcf0509095349ff879db0a3e713b39b3b2a273dd554ba400ed
+    type_inferenced_ast: 871063c94f5a41f97c887114853db4c5bb8348c99eaa86e6fcb9b729d665a371
diff --git a/tests/expectations/compiler/compiler/integers/i32/lt.leo.out b/tests/expectations/compiler/compiler/integers/i32/lt.leo.out
index 880956d247..db8399c216 100644
--- a/tests/expectations/compiler/compiler/integers/i32/lt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/lt.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 6b82c3a9c3cea936a71ba9e75aac084cbfebe9ebb69483dd40e4ed8996705699
-    canonicalized_ast: 6b82c3a9c3cea936a71ba9e75aac084cbfebe9ebb69483dd40e4ed8996705699
-    type_inferenced_ast: e27449f028c9e2fd55193bc63ed828fbb4b570847d4c3abf6332d80150963474
+    initial_ast: 6f0455a048d581bdbd83fc9001eadfe255c3f0dce9e82547f7ccb755bdd88278
+    canonicalized_ast: 6f0455a048d581bdbd83fc9001eadfe255c3f0dce9e82547f7ccb755bdd88278
+    type_inferenced_ast: 8a5932dbb09c452a8c27dd29823c436015043a6b24dac8a8a25ddc30fadb22ca
diff --git a/tests/expectations/compiler/compiler/integers/i32/max.leo.out b/tests/expectations/compiler/compiler/integers/i32/max.leo.out
index 357397ce29..01aa1b2e25 100644
--- a/tests/expectations/compiler/compiler/integers/i32/max.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/max.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 7781647f89d8ee15673130bce176dc295ae269680f6b8283dc40e188233a6522
-    canonicalized_ast: 7781647f89d8ee15673130bce176dc295ae269680f6b8283dc40e188233a6522
-    type_inferenced_ast: 3b4c83cf724723beece52d8beca13295a41b94b07c9fe6ded1b1ce06ee58d525
+    initial_ast: 8a5f5f812b76933fd57927dd1719d0ed57928863a71c144e7b9c286d56345300
+    canonicalized_ast: 8a5f5f812b76933fd57927dd1719d0ed57928863a71c144e7b9c286d56345300
+    type_inferenced_ast: 02011fbccf5118e36bd4b0c9d69cdc55aaa8ec8ffa862ef0053aa3238c050d20
diff --git a/tests/expectations/compiler/compiler/integers/i32/max_fail.leo.out b/tests/expectations/compiler/compiler/integers/i32/max_fail.leo.out
index 3781b7b1a9..5957973f70 100644
--- a/tests/expectations/compiler/compiler/integers/i32/max_fail.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/max_fail.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EASG0373031]: failed to parse int value '2147483648'\n    --> compiler-test:4:20\n     |\n   4 |     const a: i32 = 2147483648;\n     |                    ^^^^^^^^^^"
+  - "Error [EASG0373031]: failed to parse int value '2147483648'\n    --> compiler-test:7:20\n     |\n   7 |     const a: i32 = 2147483648;\n     |                    ^^^^^^^^^^"
diff --git a/tests/expectations/compiler/compiler/integers/i32/min.leo.out b/tests/expectations/compiler/compiler/integers/i32/min.leo.out
index 1907b6427e..9a2a56206a 100644
--- a/tests/expectations/compiler/compiler/integers/i32/min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/min.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 7a10c1da523c0929e30db9ffda38a23978a8ec6114db4c5745f6acd766c8b861
-    canonicalized_ast: 7a10c1da523c0929e30db9ffda38a23978a8ec6114db4c5745f6acd766c8b861
-    type_inferenced_ast: 33d60b91125897d8efb05c8df8df7f2eb6f10f9f74a69f7b954933916f3e2937
+    initial_ast: c1c939d0854d99b9faf6e1406f792700a5775cada5b36a8ed5da2b933333b486
+    canonicalized_ast: c1c939d0854d99b9faf6e1406f792700a5775cada5b36a8ed5da2b933333b486
+    type_inferenced_ast: 182553578d3f706cb84f831775a7ae31f4b17d7f3264a9cf8c2ce6eea7a74ea7
diff --git a/tests/expectations/compiler/compiler/integers/i32/min_fail.leo.out b/tests/expectations/compiler/compiler/integers/i32/min_fail.leo.out
index 45d45fc6e5..53c3288af8 100644
--- a/tests/expectations/compiler/compiler/integers/i32/min_fail.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/min_fail.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EASG0373031]: failed to parse int value '-2147483649'\n    --> compiler-test:4:20\n     |\n   4 |     const a: i32 = -2147483649;\n     |                    ^^^^^^^^^^^"
+  - "Error [EASG0373031]: failed to parse int value '-2147483649'\n    --> compiler-test:7:20\n     |\n   7 |     const a: i32 = -2147483649;\n     |                    ^^^^^^^^^^^"
diff --git a/tests/expectations/compiler/compiler/integers/i32/mul.leo.out b/tests/expectations/compiler/compiler/integers/i32/mul.leo.out
index f592780112..0dea5dc678 100644
--- a/tests/expectations/compiler/compiler/integers/i32/mul.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/mul.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 685076ff4cb6847b0c44552796371d14bc6a0edc1d1cb78c98c84134345bb7ac
-    canonicalized_ast: 685076ff4cb6847b0c44552796371d14bc6a0edc1d1cb78c98c84134345bb7ac
-    type_inferenced_ast: e064f9845933cccaccc411d9837ffa1e36d158cac25dc9529ab940532211add3
+    initial_ast: cbaf34f1a438302350068e59704a245849afc6ae4121609c5692969550609763
+    canonicalized_ast: cbaf34f1a438302350068e59704a245849afc6ae4121609c5692969550609763
+    type_inferenced_ast: 54d0bde759bae67dc49aa7136a1332a56084ad2602cd9223f9d5e48b78128cd5
diff --git a/tests/expectations/compiler/compiler/integers/i32/ne.leo.out b/tests/expectations/compiler/compiler/integers/i32/ne.leo.out
index e6a4a8d212..9eeb680ed5 100644
--- a/tests/expectations/compiler/compiler/integers/i32/ne.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/ne.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: b01fb5830de1334b20c40a846a0f5097059e1f23f7e03a93344b01a85daf45c0
-    canonicalized_ast: b01fb5830de1334b20c40a846a0f5097059e1f23f7e03a93344b01a85daf45c0
-    type_inferenced_ast: 9dee212732866b561e7543608592425fd8a70ae2d7e286cb56037bff66eb2714
+    initial_ast: 6273dbdf0058cb9d17c93bf02b9e4c5b30daf8b61fe4a1eb64eb0a9cff2f0b65
+    canonicalized_ast: 6273dbdf0058cb9d17c93bf02b9e4c5b30daf8b61fe4a1eb64eb0a9cff2f0b65
+    type_inferenced_ast: 96d62da6aab3d9d3fb64716975fe1644ee5e93936f7bc3a35f599bb8234b0eda
diff --git a/tests/expectations/compiler/compiler/integers/i32/negate.leo.out b/tests/expectations/compiler/compiler/integers/i32/negate.leo.out
index 52194d22a7..a05a994df4 100644
--- a/tests/expectations/compiler/compiler/integers/i32/negate.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/negate.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 6d1ee39de9724740815e6ae902cc6d554c68b25d52c46e8a083891edd44d5115
-    canonicalized_ast: 6d1ee39de9724740815e6ae902cc6d554c68b25d52c46e8a083891edd44d5115
-    type_inferenced_ast: d79fcaaf02bff685eab7de7678089cbcf5a2094cc2e93572f666439aeaad48ab
+    initial_ast: 4066f9b73c8e512dc5f154b7ce258f39ca4c49d51f878f8fcab50d2caf6bdf1f
+    canonicalized_ast: 4066f9b73c8e512dc5f154b7ce258f39ca4c49d51f878f8fcab50d2caf6bdf1f
+    type_inferenced_ast: 3a64234c42e08cf2903bdf49456a2a0e887308ddfb0b7a827b8af1759ca12ac2
diff --git a/tests/expectations/compiler/compiler/integers/i32/negate_min.leo.out b/tests/expectations/compiler/compiler/integers/i32/negate_min.leo.out
index a5095f76da..3f11e7c455 100644
--- a/tests/expectations/compiler/compiler/integers/i32/negate_min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/negate_min.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 405c4feb62723fd057a5c48607083f5f4b1759d00ff8cdc5f98c94d32fa9e85e
-    canonicalized_ast: 405c4feb62723fd057a5c48607083f5f4b1759d00ff8cdc5f98c94d32fa9e85e
-    type_inferenced_ast: 6afa590ff464ad10a01dfb115a6975cafde1ee3a69c03a97e1226512bf8679ed
+    initial_ast: c082df72a59f68a6c750cc40ac2a9ed824b9046ec4ed296d945429ce5a8bd236
+    canonicalized_ast: c082df72a59f68a6c750cc40ac2a9ed824b9046ec4ed296d945429ce5a8bd236
+    type_inferenced_ast: 926854acd8679dcc3573dcf0a018292f92f917416ae48792c17141fe3488cb15
diff --git a/tests/expectations/compiler/compiler/integers/i32/negate_zero.leo.out b/tests/expectations/compiler/compiler/integers/i32/negate_zero.leo.out
index 393e6d292d..e57ab49157 100644
--- a/tests/expectations/compiler/compiler/integers/i32/negate_zero.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/negate_zero.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 3c96a559318d5e876326f4ceef8db9b0f90330206b0be63cc1fcd33963b8db3a
-    canonicalized_ast: 3c96a559318d5e876326f4ceef8db9b0f90330206b0be63cc1fcd33963b8db3a
-    type_inferenced_ast: e33caf2a6323f9e4926a29ebe4f566a1a4959afc48eaf50d80be3be8c3e18373
+    initial_ast: 2c6a4120e8df7d304c54dc56a7f838abe286da79d4f2e75c7bd74974bc1fdcf6
+    canonicalized_ast: 2c6a4120e8df7d304c54dc56a7f838abe286da79d4f2e75c7bd74974bc1fdcf6
+    type_inferenced_ast: 0a6d5f0610bd92b89cf8852c1fdeaa99672b5ace49b4225e083eb2baf4d4bcbd
diff --git a/tests/expectations/compiler/compiler/integers/i32/no_space_between_literal.leo.out b/tests/expectations/compiler/compiler/integers/i32/no_space_between_literal.leo.out
index 8bf423a222..bc8f17aab6 100644
--- a/tests/expectations/compiler/compiler/integers/i32/no_space_between_literal.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/no_space_between_literal.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EPAR0370004]: Unexpected white space between terms 1 and i32\n    --> compiler-test:4:15\n     |\n   4 |     const i = 1 i32;\n     |               ^"
+  - "Error [EPAR0370004]: Unexpected white space between terms 1 and i32\n    --> compiler-test:7:15\n     |\n   7 |     const i = 1 i32;\n     |               ^"
diff --git a/tests/expectations/compiler/compiler/integers/i32/sub.leo.out b/tests/expectations/compiler/compiler/integers/i32/sub.leo.out
index 439b852dab..01074ac2e4 100644
--- a/tests/expectations/compiler/compiler/integers/i32/sub.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/sub.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: b8bc1c1d83f538c7f2627dda8c7a274586cab99dcc8c819fca0f1985a39c9a0e
-    canonicalized_ast: b8bc1c1d83f538c7f2627dda8c7a274586cab99dcc8c819fca0f1985a39c9a0e
-    type_inferenced_ast: 0462f78b7aedf61b4f79b2cd3b8c61bc58782d79496188f4ad00bcb5026a6eaf
+    initial_ast: 104c650cefcb169f9851c2c717c7429241ba60a1c213afa5736fc3ab60d28ea2
+    canonicalized_ast: 104c650cefcb169f9851c2c717c7429241ba60a1c213afa5736fc3ab60d28ea2
+    type_inferenced_ast: 70597c992f342eaa1b6139fe97610bd74db461b887a3623bcee3ddf58e7319d3
diff --git a/tests/expectations/compiler/compiler/integers/i32/ternary.leo.out b/tests/expectations/compiler/compiler/integers/i32/ternary.leo.out
index 483edb8ccf..693880ff18 100644
--- a/tests/expectations/compiler/compiler/integers/i32/ternary.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/ternary.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: a3f58f20e2b332bf45444ee4b14b9c5e3680bb64301595bd9da7cc615aea117b
-    canonicalized_ast: a3f58f20e2b332bf45444ee4b14b9c5e3680bb64301595bd9da7cc615aea117b
-    type_inferenced_ast: b60128ddfb24ca1130e67082e31ffab0802b4b9ffd164cacc730390349237ee1
+    initial_ast: 7d091cc3480ad156115f39a4d6a70ee6bfc096e491986a5d6703e5edff8689ec
+    canonicalized_ast: 7d091cc3480ad156115f39a4d6a70ee6bfc096e491986a5d6703e5edff8689ec
+    type_inferenced_ast: fe1fb6b168e50d4be7ff3e14cd36c8a53281c329937c08561ef0f6944c32c7e9
diff --git a/tests/expectations/compiler/compiler/integers/i64/add.leo.out b/tests/expectations/compiler/compiler/integers/i64/add.leo.out
index 1c6882b2ad..36afc854de 100644
--- a/tests/expectations/compiler/compiler/integers/i64/add.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/add.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 043a24e3e8b53b5f647e12862256dc3bd2219d02cc51d746e4c9e85a57d152d7
-    canonicalized_ast: 043a24e3e8b53b5f647e12862256dc3bd2219d02cc51d746e4c9e85a57d152d7
-    type_inferenced_ast: b8e4f7de1c4065b327f08317bb9adef204cd09e9fe2cf0ee0875fa9f80e0334a
+    initial_ast: b7bc530dc210b9f36876e3a6ae93b6bcfb51bac0113cd7f3c8b864ce4a0a96c5
+    canonicalized_ast: b7bc530dc210b9f36876e3a6ae93b6bcfb51bac0113cd7f3c8b864ce4a0a96c5
+    type_inferenced_ast: 10718a415460a8c3925b163a3100670f56e175fcb8137cff83270426e829c843
diff --git a/tests/expectations/compiler/compiler/integers/i64/console_assert.leo.out b/tests/expectations/compiler/compiler/integers/i64/console_assert.leo.out
index f63fef5b87..8cb0676abe 100644
--- a/tests/expectations/compiler/compiler/integers/i64/console_assert.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/console_assert.leo.out
@@ -13,6 +13,6 @@ outputs:
       - input_file: i64.in
         output:
           registers: {}
-    initial_ast: 28b6e3766452fc6f1ee10ae35662ede0a0f5c4d1b9ac2c619a17a6bc649f963a
-    canonicalized_ast: be257d374b10905b8737b8910364057fed4c9ec7e1bb80430b8e09b484d2089f
-    type_inferenced_ast: 2cbe65a1aa234a9157553e9bc2838c6115f080108cdd4b30a3a467d183e0f5ef
+    initial_ast: f51dd5a56a9e0cfe10876e3f26c530bda1716de69059baa3676ce2197ca4ed65
+    canonicalized_ast: a57956ada653295123a33b2a58ae439630c654732944300e8c0bd8d464812fc1
+    type_inferenced_ast: 9dc8b2a2ac346448881bfc9d88af50e594576b0a9ec0333c1af758ac08bd0b2a
diff --git a/tests/expectations/compiler/compiler/integers/i64/div.leo.out b/tests/expectations/compiler/compiler/integers/i64/div.leo.out
index 2e038dbea8..d5db2a3e5c 100644
--- a/tests/expectations/compiler/compiler/integers/i64/div.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/div.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: b90fd305c5208bf3eaebfda1df40384bbcdc840104f9b235caa01529deb7c05c
-    canonicalized_ast: b90fd305c5208bf3eaebfda1df40384bbcdc840104f9b235caa01529deb7c05c
-    type_inferenced_ast: f4061210d2c0607e84ff49b75e28cb3181dda81da611701d0ad9879860d973b6
+    initial_ast: 69bb35d1f823ee57a2713074ab94479e70099b0366663dc0a54ee39bf592ae02
+    canonicalized_ast: 69bb35d1f823ee57a2713074ab94479e70099b0366663dc0a54ee39bf592ae02
+    type_inferenced_ast: dfb0ce5cdd40c5ec5f0097eaee2458e4263de66475d4f62ad9892e3f0876d51b
diff --git a/tests/expectations/compiler/compiler/integers/i64/eq.leo.out b/tests/expectations/compiler/compiler/integers/i64/eq.leo.out
index bf5e107e7c..3306ce54f1 100644
--- a/tests/expectations/compiler/compiler/integers/i64/eq.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/eq.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 00666c43ec1897cd0758ef4c5fc5ac25dce6330abdd10da33c5546a9c05de888
-    canonicalized_ast: 00666c43ec1897cd0758ef4c5fc5ac25dce6330abdd10da33c5546a9c05de888
-    type_inferenced_ast: 58ebc8997dec1f429496dcf539b93ce08b4ddbd85b83f741153bd0bd6631db2c
+    initial_ast: 624479c50e11a8b023e76fde0a2dff619fbd0572585b3896c060dccfbdcbbbb5
+    canonicalized_ast: 624479c50e11a8b023e76fde0a2dff619fbd0572585b3896c060dccfbdcbbbb5
+    type_inferenced_ast: 584203c0b5147d2589768f1109e18fdd3101ca58d45e86ef1a131a5cba6315fe
diff --git a/tests/expectations/compiler/compiler/integers/i64/ge.leo.out b/tests/expectations/compiler/compiler/integers/i64/ge.leo.out
index 99893272b7..bfa53cfea6 100644
--- a/tests/expectations/compiler/compiler/integers/i64/ge.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/ge.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: f0ce8ad04c21417acd9b86eadabee54c3e63e1d902607883596e849aeffa51f9
-    canonicalized_ast: f0ce8ad04c21417acd9b86eadabee54c3e63e1d902607883596e849aeffa51f9
-    type_inferenced_ast: e38e74a0510712dda0b0e50b205a5ab31132dcb0e8622d215d1b3a1f7370844b
+    initial_ast: 11589a19700d1dc63bf501f0e53e14c66c172027e3953210088820d1a5775a3a
+    canonicalized_ast: 11589a19700d1dc63bf501f0e53e14c66c172027e3953210088820d1a5775a3a
+    type_inferenced_ast: 06852400be38572479fb1369b3ae21b7885df6cbc6fa7330b9e06db6551cc18b
diff --git a/tests/expectations/compiler/compiler/integers/i64/gt.leo.out b/tests/expectations/compiler/compiler/integers/i64/gt.leo.out
index fb0e09f293..5d7de16825 100644
--- a/tests/expectations/compiler/compiler/integers/i64/gt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/gt.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 8bb288b0ec5e1330ccf9fef1a26a872295a79bf128fd566e3c14cdc4dbfc0bc4
-    canonicalized_ast: 8bb288b0ec5e1330ccf9fef1a26a872295a79bf128fd566e3c14cdc4dbfc0bc4
-    type_inferenced_ast: 96fdeedf1a1af69369792208228d4df5f3f2bfa98e33a026d658278470071bc9
+    initial_ast: 88ce8d73ae789fbd2ff4ccde3c805412caf461b8b589a9a323ede3db35b14e02
+    canonicalized_ast: 88ce8d73ae789fbd2ff4ccde3c805412caf461b8b589a9a323ede3db35b14e02
+    type_inferenced_ast: 87b9fcacd9f2e748761a671ee6f43f5a321ea409f644a4450cc31ecd9587cdb4
diff --git a/tests/expectations/compiler/compiler/integers/i64/le.leo.out b/tests/expectations/compiler/compiler/integers/i64/le.leo.out
index 9b6cef7e16..fba909798a 100644
--- a/tests/expectations/compiler/compiler/integers/i64/le.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/le.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 1f2b2def4134a9c6b6e4c1d2763c75ec517926fe8842e500b337da8e91e8d118
-    canonicalized_ast: 1f2b2def4134a9c6b6e4c1d2763c75ec517926fe8842e500b337da8e91e8d118
-    type_inferenced_ast: 26bf92382ad5c5dfbe5ad3b80fd3223398727da3cb1c46e5651fb09ce28370bf
+    initial_ast: fcf7e380186616199c5e4b78b060f1255442f641b9f9477efae7d119132f51c3
+    canonicalized_ast: fcf7e380186616199c5e4b78b060f1255442f641b9f9477efae7d119132f51c3
+    type_inferenced_ast: 676f45da19328742c880b701fa20d8e710948807bd53abdced48a30885feaa99
diff --git a/tests/expectations/compiler/compiler/integers/i64/lt.leo.out b/tests/expectations/compiler/compiler/integers/i64/lt.leo.out
index db0628ead8..109e24e72d 100644
--- a/tests/expectations/compiler/compiler/integers/i64/lt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/lt.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 7a72ead766ad1d8c40478170a0fb368b02a2f717030340d34c52a9ab078d106b
-    canonicalized_ast: 7a72ead766ad1d8c40478170a0fb368b02a2f717030340d34c52a9ab078d106b
-    type_inferenced_ast: 4e277d241e9083c6d49f07a0f7b923eeda50b3868953dbecd2d5e9ecccf873fb
+    initial_ast: 16994db7a0c5d45ce01c3a9025e81bcfb15982049ee11c526a714b0931d09402
+    canonicalized_ast: 16994db7a0c5d45ce01c3a9025e81bcfb15982049ee11c526a714b0931d09402
+    type_inferenced_ast: 6764f43c9f4447dfe7faa2cd04727c794f2173c0523745a70a5e42b820724c21
diff --git a/tests/expectations/compiler/compiler/integers/i64/max.leo.out b/tests/expectations/compiler/compiler/integers/i64/max.leo.out
index 3df49b0549..17917ff12e 100644
--- a/tests/expectations/compiler/compiler/integers/i64/max.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/max.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: d9658434c1b68f4d19bb9e68696f2f8abd4669f5f199a526161dff7d01f3603d
-    canonicalized_ast: d9658434c1b68f4d19bb9e68696f2f8abd4669f5f199a526161dff7d01f3603d
-    type_inferenced_ast: 3be7d4fac8f7d61e044038ae0b93599b6293bb108f39244c3a60ea25426b0014
+    initial_ast: 846ca704219a360664d9d9650b82993dc5b98515e0a2e39a5f0f30152b2fa879
+    canonicalized_ast: 846ca704219a360664d9d9650b82993dc5b98515e0a2e39a5f0f30152b2fa879
+    type_inferenced_ast: 78814d9c4436b351939a2a9cd9437e1b4aceb6e5d38cd997590c8e4a96be937d
diff --git a/tests/expectations/compiler/compiler/integers/i64/max_fail.leo.out b/tests/expectations/compiler/compiler/integers/i64/max_fail.leo.out
index 70acb90ad2..c2074d5403 100644
--- a/tests/expectations/compiler/compiler/integers/i64/max_fail.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/max_fail.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EASG0373031]: failed to parse int value '9223372036854775808'\n    --> compiler-test:4:20\n     |\n   4 |     const a: i64 = 9223372036854775808;\n     |                    ^^^^^^^^^^^^^^^^^^^"
+  - "Error [EASG0373031]: failed to parse int value '9223372036854775808'\n    --> compiler-test:7:20\n     |\n   7 |     const a: i64 = 9223372036854775808;\n     |                    ^^^^^^^^^^^^^^^^^^^"
diff --git a/tests/expectations/compiler/compiler/integers/i64/min.leo.out b/tests/expectations/compiler/compiler/integers/i64/min.leo.out
index 0ee662b3c0..6d2227b0bf 100644
--- a/tests/expectations/compiler/compiler/integers/i64/min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/min.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 95db7e46acbe1f4ef5a0050a2920f642b8ca12b5583126c0d41ad70dd527eab7
-    canonicalized_ast: 95db7e46acbe1f4ef5a0050a2920f642b8ca12b5583126c0d41ad70dd527eab7
-    type_inferenced_ast: 0a8aa38462d6c8388a5f90de48118bf4639276aaee62982befff0fc2c315a6e5
+    initial_ast: 7f211b8780d47a65b1da47df1ff2065282c382d0392c5a15e3cee5fff9df60c3
+    canonicalized_ast: 7f211b8780d47a65b1da47df1ff2065282c382d0392c5a15e3cee5fff9df60c3
+    type_inferenced_ast: df5c6c95e536ec2b4810e2f433c6312fef63020a9e384cdea23815bda72fb08d
diff --git a/tests/expectations/compiler/compiler/integers/i64/min_fail.leo.out b/tests/expectations/compiler/compiler/integers/i64/min_fail.leo.out
index d40e357854..d93a4d5f75 100644
--- a/tests/expectations/compiler/compiler/integers/i64/min_fail.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/min_fail.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EASG0373031]: failed to parse int value '-9223372036854775809'\n    --> compiler-test:4:20\n     |\n   4 |     const a: i64 = -9223372036854775809;\n     |                    ^^^^^^^^^^^^^^^^^^^^"
+  - "Error [EASG0373031]: failed to parse int value '-9223372036854775809'\n    --> compiler-test:7:20\n     |\n   7 |     const a: i64 = -9223372036854775809;\n     |                    ^^^^^^^^^^^^^^^^^^^^"
diff --git a/tests/expectations/compiler/compiler/integers/i64/mul.leo.out b/tests/expectations/compiler/compiler/integers/i64/mul.leo.out
index 93d2f34237..552e4df0eb 100644
--- a/tests/expectations/compiler/compiler/integers/i64/mul.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/mul.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 08ed84d4fdd3cc1e18811bfd7e4ebd6470b77db0320156190fcc1633ea75d185
-    canonicalized_ast: 08ed84d4fdd3cc1e18811bfd7e4ebd6470b77db0320156190fcc1633ea75d185
-    type_inferenced_ast: 3745fc6450f24bd989409077819614e9188f9a0f7af9e8cdd0d6eed11bebca9f
+    initial_ast: 90ad736a14938d473618d28cdac6e24ab2fe7966b4d45356faddd2d71a4b36c9
+    canonicalized_ast: 90ad736a14938d473618d28cdac6e24ab2fe7966b4d45356faddd2d71a4b36c9
+    type_inferenced_ast: 6bcc8b0956054b6368a2156d4cc992b93607202ba4b9b6e5e5c45aa9cc0c283c
diff --git a/tests/expectations/compiler/compiler/integers/i64/ne.leo.out b/tests/expectations/compiler/compiler/integers/i64/ne.leo.out
index d5b477955a..1065895572 100644
--- a/tests/expectations/compiler/compiler/integers/i64/ne.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/ne.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: c1e15e7bf0b3a581f1740c3bc13a7f3b65018efee79a0fd2df8a9083ffe3fd8b
-    canonicalized_ast: c1e15e7bf0b3a581f1740c3bc13a7f3b65018efee79a0fd2df8a9083ffe3fd8b
-    type_inferenced_ast: 004a04b4a76998b0dbb3746af430587608229db3d7c6caec82f705abfdbf8d7f
+    initial_ast: 266183c91b509f362683544c2dc70ec4b2cc0aeebe9797cd67b268c9321ccdf6
+    canonicalized_ast: 266183c91b509f362683544c2dc70ec4b2cc0aeebe9797cd67b268c9321ccdf6
+    type_inferenced_ast: 15ff75268e367b53ca8a571cda77e94a52819ffc414f114539e2b3b19377a69b
diff --git a/tests/expectations/compiler/compiler/integers/i64/negate.leo.out b/tests/expectations/compiler/compiler/integers/i64/negate.leo.out
index 9ddbf30cfa..352a3ae1fd 100644
--- a/tests/expectations/compiler/compiler/integers/i64/negate.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/negate.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 4c2f1403554f27f5e437477dc86db86bc7888d0faa60983ce66a451ec08c5c6f
-    canonicalized_ast: 4c2f1403554f27f5e437477dc86db86bc7888d0faa60983ce66a451ec08c5c6f
-    type_inferenced_ast: a043ffc8fb3f8505916b04e51fbdb753ede14f012e838b267fa3f35c70b61fc4
+    initial_ast: f7341281645a6ff040e087f6fc0a66fddc352bf9b6e01ae15564b571228c02fb
+    canonicalized_ast: f7341281645a6ff040e087f6fc0a66fddc352bf9b6e01ae15564b571228c02fb
+    type_inferenced_ast: b297e7e58b437b4ca36cf4be5d5e453dc566d3537380e5e094a5e18dfe45b449
diff --git a/tests/expectations/compiler/compiler/integers/i64/negate_min.leo.out b/tests/expectations/compiler/compiler/integers/i64/negate_min.leo.out
index a17009a849..b0266004aa 100644
--- a/tests/expectations/compiler/compiler/integers/i64/negate_min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/negate_min.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 49b9ce4d8db36da75cc9d1c219de09544211bb798ed732cf4e7ab3c3020bef46
-    canonicalized_ast: 49b9ce4d8db36da75cc9d1c219de09544211bb798ed732cf4e7ab3c3020bef46
-    type_inferenced_ast: 9b99d299dc2cf83b1f7d42b65f1c608cf2d8b643998519f86279c52ce753c9aa
+    initial_ast: 03b427e2fc9f62f3e150e4749fa0dae8b4129cf1d9fcfbc5c95a179928045d8b
+    canonicalized_ast: 03b427e2fc9f62f3e150e4749fa0dae8b4129cf1d9fcfbc5c95a179928045d8b
+    type_inferenced_ast: d4cec59a16406b26ddc87e7c787bb03e2282565627b08cd291568c4b94449917
diff --git a/tests/expectations/compiler/compiler/integers/i64/negate_zero.leo.out b/tests/expectations/compiler/compiler/integers/i64/negate_zero.leo.out
index ccf10ad146..af90618093 100644
--- a/tests/expectations/compiler/compiler/integers/i64/negate_zero.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/negate_zero.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 080706861414ec2965a7d5cb3a9d09e8870fdf18ab9521f31b6f50f868b18d71
-    canonicalized_ast: 080706861414ec2965a7d5cb3a9d09e8870fdf18ab9521f31b6f50f868b18d71
-    type_inferenced_ast: 0fbe33071492a89813a64102acb80b8e55c2f5cc6710fe9a7b43fd514429d7cc
+    initial_ast: 98a6444aff81fa91da12b459ed3f0476e28f00dc56b1cae6ca63d8c426e08768
+    canonicalized_ast: 98a6444aff81fa91da12b459ed3f0476e28f00dc56b1cae6ca63d8c426e08768
+    type_inferenced_ast: cb755e9cf54b8506b0591dd872ad903039cbdeb09812a58ee1053d435ad766fa
diff --git a/tests/expectations/compiler/compiler/integers/i64/no_space_between_literal.leo.out b/tests/expectations/compiler/compiler/integers/i64/no_space_between_literal.leo.out
index c5d6f40e8c..5c4ddc6582 100644
--- a/tests/expectations/compiler/compiler/integers/i64/no_space_between_literal.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/no_space_between_literal.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EPAR0370004]: Unexpected white space between terms 1 and i64\n    --> compiler-test:4:15\n     |\n   4 |     const i = 1 i64;\n     |               ^"
+  - "Error [EPAR0370004]: Unexpected white space between terms 1 and i64\n    --> compiler-test:7:15\n     |\n   7 |     const i = 1 i64;\n     |               ^"
diff --git a/tests/expectations/compiler/compiler/integers/i64/sub.leo.out b/tests/expectations/compiler/compiler/integers/i64/sub.leo.out
index a2d9a8de4c..2df5c76850 100644
--- a/tests/expectations/compiler/compiler/integers/i64/sub.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/sub.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 5570bb473f58cc6a5ddb788adf577cae71d57672bf185873faf1f1609472e4a2
-    canonicalized_ast: 5570bb473f58cc6a5ddb788adf577cae71d57672bf185873faf1f1609472e4a2
-    type_inferenced_ast: cb4a8e39015b686e3784c3e52ae2720168888b4d099136efb3459a0cbb49ebf1
+    initial_ast: d2c3f4bdd95c935cbe9d07e0a45d65a0dcf6bdd03f3f56b5ed1b59b9fc66036a
+    canonicalized_ast: d2c3f4bdd95c935cbe9d07e0a45d65a0dcf6bdd03f3f56b5ed1b59b9fc66036a
+    type_inferenced_ast: 3cd49d1aee8fdb955621b50bfecd0f5cdf1a730b81fd2f1d77d0c2b2f6846f9b
diff --git a/tests/expectations/compiler/compiler/integers/i64/ternary.leo.out b/tests/expectations/compiler/compiler/integers/i64/ternary.leo.out
index 1e0c828501..0995cb4223 100644
--- a/tests/expectations/compiler/compiler/integers/i64/ternary.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/ternary.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: ccb0e39c6789d3484f5511d3dfa2797deb2bc06d72d741f6782c8926a1de9c85
-    canonicalized_ast: ccb0e39c6789d3484f5511d3dfa2797deb2bc06d72d741f6782c8926a1de9c85
-    type_inferenced_ast: 80dae2513fecac5b28781bb03dea1f5e84325d8b7e09d89eb6415a2c55ef0544
+    initial_ast: 2a289c81fee1f0e50622710383dc58724895615125d0b99bddf6d0dd46e83eab
+    canonicalized_ast: 2a289c81fee1f0e50622710383dc58724895615125d0b99bddf6d0dd46e83eab
+    type_inferenced_ast: ea4fc54314b0ad2cbba47ca9361bf2e0ec388e95b5edd9af9a39065e6286996f
diff --git a/tests/expectations/compiler/compiler/integers/i8/add.leo.out b/tests/expectations/compiler/compiler/integers/i8/add.leo.out
index 294e8ba6d7..eebd8e2d0e 100644
--- a/tests/expectations/compiler/compiler/integers/i8/add.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/add.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 0345f356aa7f85a3f9ed679c405d7821e3f8e33cc0c2e384f6f363249d9ed1a7
-    canonicalized_ast: 0345f356aa7f85a3f9ed679c405d7821e3f8e33cc0c2e384f6f363249d9ed1a7
-    type_inferenced_ast: a26548a04ecbf21ebec0bbc0e82b6f4c90ed64fe8dd77f93262a92a9117d4308
+    initial_ast: c6728845f8f4bb0abef2fe442c55b320f6bed8d390db824af9a47a045b6966f1
+    canonicalized_ast: c6728845f8f4bb0abef2fe442c55b320f6bed8d390db824af9a47a045b6966f1
+    type_inferenced_ast: 41b5e6007c9d4c61796388b43aea0b9b0ff6b5a90137d4019de6b74bccfd346b
diff --git a/tests/expectations/compiler/compiler/integers/i8/console_assert.leo.out b/tests/expectations/compiler/compiler/integers/i8/console_assert.leo.out
index 01a72303c7..b9daacc264 100644
--- a/tests/expectations/compiler/compiler/integers/i8/console_assert.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/console_assert.leo.out
@@ -13,6 +13,6 @@ outputs:
       - input_file: i8.in
         output:
           registers: {}
-    initial_ast: 4d01f64027709ac40a2582307fdd9420e8b20bfd2cdb26d134b740e00e1f2d1a
-    canonicalized_ast: f01b1c5294c1f84e31961e0a55595f8bc3fcb213b979c47ff714d4999d157d47
-    type_inferenced_ast: 220a44664b251324980f86daba0146c3cb9bd42d315447a9348e3b7c25a2ee92
+    initial_ast: 779a9a06fcd13b1554a5aff5b15fa618cff6c30c6b7f0ec3c3bb364486e380ea
+    canonicalized_ast: baa2b2441420940bb0de5601893f0119b75e99e7ac2a79ef9d97a1fa49320ee9
+    type_inferenced_ast: 873470bfe04bf27542e1af849876d92f48a09ec68d50f22771a5c26b80ec3cb2
diff --git a/tests/expectations/compiler/compiler/integers/i8/div.leo.out b/tests/expectations/compiler/compiler/integers/i8/div.leo.out
index 45817a7d12..08612eeb43 100644
--- a/tests/expectations/compiler/compiler/integers/i8/div.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/div.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: f045abe3e527251101929855c56f8e0ecac819cd98761f001f6361717518734d
-    canonicalized_ast: f045abe3e527251101929855c56f8e0ecac819cd98761f001f6361717518734d
-    type_inferenced_ast: 1d2512703b9c82f65115ef34db4272f744007eee3a45412267de55b88b8843ad
+    initial_ast: 5ada12f71e14c8db5a73af227616e9462cdfd1b587e377424c97efdc90c8f4b3
+    canonicalized_ast: 5ada12f71e14c8db5a73af227616e9462cdfd1b587e377424c97efdc90c8f4b3
+    type_inferenced_ast: 4d5a36d67ee0b97c82d6f6165d7c90638c6ba4ce72820e1fc0a707adf5b8bb09
diff --git a/tests/expectations/compiler/compiler/integers/i8/eq.leo.out b/tests/expectations/compiler/compiler/integers/i8/eq.leo.out
index 02704bad5e..2c3d16a768 100644
--- a/tests/expectations/compiler/compiler/integers/i8/eq.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/eq.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: ff86399699f200f582d18157f4be094385b35b074b4e0a53db3a42903aa14865
-    canonicalized_ast: ff86399699f200f582d18157f4be094385b35b074b4e0a53db3a42903aa14865
-    type_inferenced_ast: 44a3ca635d4bee4bb390aaf0cd557bc7877df42eba9d2250a7a68b938ff30a7d
+    initial_ast: 8e6f7e392556d64680271e5e3a15bd2a51ae13d5892348138db803250b7cfc80
+    canonicalized_ast: 8e6f7e392556d64680271e5e3a15bd2a51ae13d5892348138db803250b7cfc80
+    type_inferenced_ast: 010503fdf8f68e5fe81a77d2e24e63215653c24639452eae57e9c4ed886721c5
diff --git a/tests/expectations/compiler/compiler/integers/i8/ge.leo.out b/tests/expectations/compiler/compiler/integers/i8/ge.leo.out
index 96123ae89c..d3879c7029 100644
--- a/tests/expectations/compiler/compiler/integers/i8/ge.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/ge.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 22a0abfda74c125e32189496642194c191e2cd635324e218eb1d7a35266fef73
-    canonicalized_ast: 22a0abfda74c125e32189496642194c191e2cd635324e218eb1d7a35266fef73
-    type_inferenced_ast: 520d467a0676f3e7853c564f20c75493320d87f0858cc91ffa2ac432bb2cfa59
+    initial_ast: 348a6d74ae98c753f3bde7861c3c0a378b8840c362f768eb39a54198cd6a677e
+    canonicalized_ast: 348a6d74ae98c753f3bde7861c3c0a378b8840c362f768eb39a54198cd6a677e
+    type_inferenced_ast: 797e72ebc88e31bf378f0f0b0d937b4d447b82d420aea67d43bdd6fef0754e8b
diff --git a/tests/expectations/compiler/compiler/integers/i8/gt.leo.out b/tests/expectations/compiler/compiler/integers/i8/gt.leo.out
index 8da60e8cbe..74450c6bd4 100644
--- a/tests/expectations/compiler/compiler/integers/i8/gt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/gt.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 13935de7dc4809be1f09d9c2cc29b7f7123a90314d57f65be88eb606048d1dfa
-    canonicalized_ast: 13935de7dc4809be1f09d9c2cc29b7f7123a90314d57f65be88eb606048d1dfa
-    type_inferenced_ast: 45861e982dcab54a21b4d6042593a6d1b59f4307bc5214e3449d25ce573a0698
+    initial_ast: eb7bb3d0bb6b66f5271b94fcf5bf1764c5a6a147683ecd196cdfd50ce5bc9b6c
+    canonicalized_ast: eb7bb3d0bb6b66f5271b94fcf5bf1764c5a6a147683ecd196cdfd50ce5bc9b6c
+    type_inferenced_ast: 1649c4711dc152dffe238ba9b2fba11e99bf21bfb7643b605ad17103c6a1d968
diff --git a/tests/expectations/compiler/compiler/integers/i8/le.leo.out b/tests/expectations/compiler/compiler/integers/i8/le.leo.out
index 5acd05f876..f7bd6441cd 100644
--- a/tests/expectations/compiler/compiler/integers/i8/le.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/le.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 9e0661c28ed13a8f8d98c47be3ac659c42a9a1051e137bf47cf9ba5d454a553d
-    canonicalized_ast: 9e0661c28ed13a8f8d98c47be3ac659c42a9a1051e137bf47cf9ba5d454a553d
-    type_inferenced_ast: 4c9a74a84f87ccf73f441b5a8e369037b4656e6951fe27866ec7a10d486571e4
+    initial_ast: 93301c84f262245e1008bb8a7e23823c9a46a24bd7a1a990204c11dd095cf377
+    canonicalized_ast: 93301c84f262245e1008bb8a7e23823c9a46a24bd7a1a990204c11dd095cf377
+    type_inferenced_ast: bd117b8c35bd0fca3b28f36172f414a1eb3e5c2a0b02e94c93d83d95c592ebf9
diff --git a/tests/expectations/compiler/compiler/integers/i8/lt.leo.out b/tests/expectations/compiler/compiler/integers/i8/lt.leo.out
index cd08676f9b..2a3ba8ca2e 100644
--- a/tests/expectations/compiler/compiler/integers/i8/lt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/lt.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 0436a1435096db772c51a2914abe88d5134df442371a113ecee51027fa6a8041
-    canonicalized_ast: 0436a1435096db772c51a2914abe88d5134df442371a113ecee51027fa6a8041
-    type_inferenced_ast: c609d452b7b36ac987ad8dd5893d3a82f75c74f4f8e72b3d5c03c343057150df
+    initial_ast: 88f30049fff590ddae1abce0226a0d920185aa6b7a92622c68fae9a1b560ba8e
+    canonicalized_ast: 88f30049fff590ddae1abce0226a0d920185aa6b7a92622c68fae9a1b560ba8e
+    type_inferenced_ast: 3920fc3d6563ca1e307daaa15dd4e834c01b5d78a50b9e10558309956355f4ea
diff --git a/tests/expectations/compiler/compiler/integers/i8/max.leo.out b/tests/expectations/compiler/compiler/integers/i8/max.leo.out
index b3ad88b9a8..eace437723 100644
--- a/tests/expectations/compiler/compiler/integers/i8/max.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/max.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 2540c69850521a04ce3f38303681df3331c89bc47322658d68d3605ff0c19253
-    canonicalized_ast: 2540c69850521a04ce3f38303681df3331c89bc47322658d68d3605ff0c19253
-    type_inferenced_ast: 1bf81474ffebc0bbc04a09366353dc6120baf4b68bfafa2c9c56ba9a3091801a
+    initial_ast: 176831e36fc7e5b7f5f273de5906b74de3cb0c77fa29e02bef135afcc48f3732
+    canonicalized_ast: 176831e36fc7e5b7f5f273de5906b74de3cb0c77fa29e02bef135afcc48f3732
+    type_inferenced_ast: 2bc576d7c013bbf0c13a7c24a2dc7e168d40b3197c0db971e698fb52caa36a5c
diff --git a/tests/expectations/compiler/compiler/integers/i8/max_fail.leo.out b/tests/expectations/compiler/compiler/integers/i8/max_fail.leo.out
index 59e58793b3..cea3a12908 100644
--- a/tests/expectations/compiler/compiler/integers/i8/max_fail.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/max_fail.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EASG0373031]: failed to parse int value '128'\n    --> compiler-test:4:19\n     |\n   4 |     const a: i8 = 128;\n     |                   ^^^"
+  - "Error [EASG0373031]: failed to parse int value '128'\n    --> compiler-test:7:19\n     |\n   7 |     const a: i8 = 128;\n     |                   ^^^"
diff --git a/tests/expectations/compiler/compiler/integers/i8/min.leo.out b/tests/expectations/compiler/compiler/integers/i8/min.leo.out
index d489352194..07afd3aaa8 100644
--- a/tests/expectations/compiler/compiler/integers/i8/min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/min.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 848bcd581f4f7b58b7eeccd1b9df9a8c37f66afe79681cdd7945c6b22603e1b9
-    canonicalized_ast: 848bcd581f4f7b58b7eeccd1b9df9a8c37f66afe79681cdd7945c6b22603e1b9
-    type_inferenced_ast: 1b18368ab78736280c3778888c21f08eee137611fb104ab5baee58a2843f7c35
+    initial_ast: 984c45161cd54c4cca305996fc7d23759624a80d947845a3ae7d1ae7f14af1d4
+    canonicalized_ast: 984c45161cd54c4cca305996fc7d23759624a80d947845a3ae7d1ae7f14af1d4
+    type_inferenced_ast: 7afab15500f2236d239e341c7157ac802b8a80d152f574fb75810e230aa83a68
diff --git a/tests/expectations/compiler/compiler/integers/i8/min_fail.leo.out b/tests/expectations/compiler/compiler/integers/i8/min_fail.leo.out
index 849c2b97bc..c084471381 100644
--- a/tests/expectations/compiler/compiler/integers/i8/min_fail.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/min_fail.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EASG0373031]: failed to parse int value '-129'\n    --> compiler-test:4:19\n     |\n   4 |     const a: i8 = -129;\n     |                   ^^^^"
+  - "Error [EASG0373031]: failed to parse int value '-129'\n    --> compiler-test:7:19\n     |\n   7 |     const a: i8 = -129;\n     |                   ^^^^"
diff --git a/tests/expectations/compiler/compiler/integers/i8/mul.leo.out b/tests/expectations/compiler/compiler/integers/i8/mul.leo.out
index 010598c77d..e422a61b03 100644
--- a/tests/expectations/compiler/compiler/integers/i8/mul.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/mul.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: f3888a0d49212fcfa415eed868ffd2a1101a406739ac71dab681be85c695ea86
-    canonicalized_ast: f3888a0d49212fcfa415eed868ffd2a1101a406739ac71dab681be85c695ea86
-    type_inferenced_ast: 00f94b33b1d62bf8519729caaea90f61b6c6ba5f3d0cbb8af4502fc52b334dc1
+    initial_ast: 047cd8f22c4cd2a9da6c0af3c7ff10d5436c775ba07344fd52b6410bead3cd48
+    canonicalized_ast: 047cd8f22c4cd2a9da6c0af3c7ff10d5436c775ba07344fd52b6410bead3cd48
+    type_inferenced_ast: 06567fa742885a90f44ffad894dd7c0ece66061829e677c9f739cbda50d5b102
diff --git a/tests/expectations/compiler/compiler/integers/i8/ne.leo.out b/tests/expectations/compiler/compiler/integers/i8/ne.leo.out
index ee78c1ce50..4789ad868c 100644
--- a/tests/expectations/compiler/compiler/integers/i8/ne.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/ne.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 67a54d8e773b571783cd1f1a7adf30c1eb91cf371435e0c3ee8c1d036da7ff00
-    canonicalized_ast: 67a54d8e773b571783cd1f1a7adf30c1eb91cf371435e0c3ee8c1d036da7ff00
-    type_inferenced_ast: 93c7565072976d98e8084210cedd004dedc66dfc405eb2836ce9c014d851a232
+    initial_ast: 065a6153af15ef77ead6584c6e03ff11b2fd7f76e25c6839b095c48792cd90e0
+    canonicalized_ast: 065a6153af15ef77ead6584c6e03ff11b2fd7f76e25c6839b095c48792cd90e0
+    type_inferenced_ast: 3dd977d1db8939ebbe770f7020f7e482f017a171c0b3e88bc68a59226694228e
diff --git a/tests/expectations/compiler/compiler/integers/i8/negate.leo.out b/tests/expectations/compiler/compiler/integers/i8/negate.leo.out
index 7205e418ae..a03717f27d 100644
--- a/tests/expectations/compiler/compiler/integers/i8/negate.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/negate.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 8c288dff00a92efd14f4da90c3f49acb793ba083a4d2c209f00bb66237cfae86
-    canonicalized_ast: 8c288dff00a92efd14f4da90c3f49acb793ba083a4d2c209f00bb66237cfae86
-    type_inferenced_ast: 52153c3e1725d62fc6392a640ecbc35e37f977c17685ee556b3b5a26c0435b8a
+    initial_ast: 90f0377cc07ebb6ca1992edae851b60be147e871e38814dd07e24e4375e4da14
+    canonicalized_ast: 90f0377cc07ebb6ca1992edae851b60be147e871e38814dd07e24e4375e4da14
+    type_inferenced_ast: 410731e40486b54fc583db850161a9df51f5a097755b38fda5c8d5ba2efb69cf
diff --git a/tests/expectations/compiler/compiler/integers/i8/negate_min.leo.out b/tests/expectations/compiler/compiler/integers/i8/negate_min.leo.out
index cc8f46e1c2..3e274aab7a 100644
--- a/tests/expectations/compiler/compiler/integers/i8/negate_min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/negate_min.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [ECMP0376083]: integer operation failed due to the signed integer error `Integer overflow`\n    --> compiler-test:5:15\n     |\n   5 |     const b = -a;\n     |               ^^"
+  - "Error [ECMP0376083]: integer operation failed due to the signed integer error `Integer overflow`\n    --> compiler-test:8:15\n     |\n   8 |     const b = -a;\n     |               ^^"
diff --git a/tests/expectations/compiler/compiler/integers/i8/negate_zero.leo.out b/tests/expectations/compiler/compiler/integers/i8/negate_zero.leo.out
index 7e7a3b3695..6bbdfa96c4 100644
--- a/tests/expectations/compiler/compiler/integers/i8/negate_zero.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/negate_zero.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: f8995a120800a95ddaf61dfe7e4f31d5140b655d4a5b9e6a616c83b65092fe61
-    canonicalized_ast: f8995a120800a95ddaf61dfe7e4f31d5140b655d4a5b9e6a616c83b65092fe61
-    type_inferenced_ast: bc9ba5ac09deede1a1960236a1f20c0954c0fb4e06c2b54905d9b5f2cf877adf
+    initial_ast: 8742661f2672cb34911eb13884bcdf8e73804da248646708e389e7e3686fd10a
+    canonicalized_ast: 8742661f2672cb34911eb13884bcdf8e73804da248646708e389e7e3686fd10a
+    type_inferenced_ast: 4fee11acbf15391108fb018bb1e66a1e19cceef97a8a2d50776915f5eba74376
diff --git a/tests/expectations/compiler/compiler/integers/i8/no_space_between_literal.leo.out b/tests/expectations/compiler/compiler/integers/i8/no_space_between_literal.leo.out
index 5a8f095af1..ca905e77c4 100644
--- a/tests/expectations/compiler/compiler/integers/i8/no_space_between_literal.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/no_space_between_literal.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EPAR0370004]: Unexpected white space between terms 1 and i8\n    --> compiler-test:4:15\n     |\n   4 |     const i = 1 i8;\n     |               ^"
+  - "Error [EPAR0370004]: Unexpected white space between terms 1 and i8\n    --> compiler-test:7:15\n     |\n   7 |     const i = 1 i8;\n     |               ^"
diff --git a/tests/expectations/compiler/compiler/integers/i8/sub.leo.out b/tests/expectations/compiler/compiler/integers/i8/sub.leo.out
index d79a4f0422..846a8ef923 100644
--- a/tests/expectations/compiler/compiler/integers/i8/sub.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/sub.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 6ff82e799e64834c43399e51589e5b110a8ab179a1a7cf3a4210ae780515df54
-    canonicalized_ast: 6ff82e799e64834c43399e51589e5b110a8ab179a1a7cf3a4210ae780515df54
-    type_inferenced_ast: ec57c434abe046a57b5ae80b94f7118ee25ed52ce54e61f5210dba094591c17e
+    initial_ast: dab6a2c8a9312513424c10447fca136120c95f425446296cf7b6d0b615fa6f2a
+    canonicalized_ast: dab6a2c8a9312513424c10447fca136120c95f425446296cf7b6d0b615fa6f2a
+    type_inferenced_ast: 3318f7163f47f38eff24e0777efd5431320358fb8fd0c966ee5319795bab4bcc
diff --git a/tests/expectations/compiler/compiler/integers/i8/ternary.leo.out b/tests/expectations/compiler/compiler/integers/i8/ternary.leo.out
index 3915ad46e9..1022eddb93 100644
--- a/tests/expectations/compiler/compiler/integers/i8/ternary.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/ternary.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 256d3ed102c8a18d29515bbaea00dd9d1deb16d12474c5d75aa76f64cf7d691d
-    canonicalized_ast: 256d3ed102c8a18d29515bbaea00dd9d1deb16d12474c5d75aa76f64cf7d691d
-    type_inferenced_ast: fb3d90dac9be745eeb2ac5eb29f9ea91994cc074d3720d54cbc4f6d9bea8a26e
+    initial_ast: 18a62130bcaecc0b89959bae83bb40c197e1fe36284c7ac4e1559e5e84035153
+    canonicalized_ast: 18a62130bcaecc0b89959bae83bb40c197e1fe36284c7ac4e1559e5e84035153
+    type_inferenced_ast: f409abba62cde098c2e5aaf22184996a46116e9f001345965f4ac505a10e4145
diff --git a/tests/expectations/compiler/compiler/integers/u128/add.leo.out b/tests/expectations/compiler/compiler/integers/u128/add.leo.out
index a2dbfa3408..3bdc610253 100644
--- a/tests/expectations/compiler/compiler/integers/u128/add.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/add.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: bc7eadb66a46463e9516afcdad00914bd3f17efe7bd100f839839c54e52d13a4
-    canonicalized_ast: bc7eadb66a46463e9516afcdad00914bd3f17efe7bd100f839839c54e52d13a4
-    type_inferenced_ast: b6f70ec62b9f4048cf7ca2990eb893dc940c6d3917718c13fb1a3df0eaf3543d
+    initial_ast: 08ec2d53d40dd04efae6aa46cc24a3b9c3ccd5db88df309706a6b799d9d56bd1
+    canonicalized_ast: 08ec2d53d40dd04efae6aa46cc24a3b9c3ccd5db88df309706a6b799d9d56bd1
+    type_inferenced_ast: 0d7d2a2cb38dd5127fc9a3a8f88f2a6c6bb87a5f935c0543d1c7570ee341ef3b
diff --git a/tests/expectations/compiler/compiler/integers/u128/console_assert.leo.out b/tests/expectations/compiler/compiler/integers/u128/console_assert.leo.out
index d5cd5e0a3d..41a01c26da 100644
--- a/tests/expectations/compiler/compiler/integers/u128/console_assert.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/console_assert.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 8e4d20b04881c26b369dc2a68ed15ed06d1b54d5459543cdb689f806bd1aa1d9
-    canonicalized_ast: 8e4d20b04881c26b369dc2a68ed15ed06d1b54d5459543cdb689f806bd1aa1d9
-    type_inferenced_ast: 9531660b5018c2f43a3d1ba0a40e029df6a50898ea3c74e469b1ab5634313df8
+    initial_ast: 448fb8dbca9be2809065519373297b7c97a944c21ce8736c22088822dc4ea152
+    canonicalized_ast: 448fb8dbca9be2809065519373297b7c97a944c21ce8736c22088822dc4ea152
+    type_inferenced_ast: 7308615b310fefb06801911ea5d12d7ad7eeb7139f3f69316aac021bfe431428
diff --git a/tests/expectations/compiler/compiler/integers/u128/div.leo.out b/tests/expectations/compiler/compiler/integers/u128/div.leo.out
index 3014858d27..ffd302bbe6 100644
--- a/tests/expectations/compiler/compiler/integers/u128/div.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/div.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 2e06804b600a35de30eaaf59f33a28872576b91a5f09f1203893f02f1277b08a
-    canonicalized_ast: 2e06804b600a35de30eaaf59f33a28872576b91a5f09f1203893f02f1277b08a
-    type_inferenced_ast: 695abf8d7f279e561b4a89ca764c94ee730bdf8f653414664d7d664eb59fe830
+    initial_ast: 85673ca5d99c5240440ff7f1df2a1cd48f93f67417784530a669574cf25c91df
+    canonicalized_ast: 85673ca5d99c5240440ff7f1df2a1cd48f93f67417784530a669574cf25c91df
+    type_inferenced_ast: 4b514eb89a6143f93e11a1f1da33ad9f7e3fa5c77edf1a939ec1b1187b49fbd2
diff --git a/tests/expectations/compiler/compiler/integers/u128/eq.leo.out b/tests/expectations/compiler/compiler/integers/u128/eq.leo.out
index bd0f5a7899..7edcd34e98 100644
--- a/tests/expectations/compiler/compiler/integers/u128/eq.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/eq.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: c7b25869dfb1c128c5ff8f0f484e3b6de1a7dc5381b2f8807c943d0c92603669
-    canonicalized_ast: c7b25869dfb1c128c5ff8f0f484e3b6de1a7dc5381b2f8807c943d0c92603669
-    type_inferenced_ast: f6bafa99d7e108411b4e71edb2a981e0f9e730707a9ac2e2fce87100fb35ebf8
+    initial_ast: e3fb5def2b51368631fc18c5c3c3ef1f3f6e8c2fbc66a43b414b63a38da86ded
+    canonicalized_ast: e3fb5def2b51368631fc18c5c3c3ef1f3f6e8c2fbc66a43b414b63a38da86ded
+    type_inferenced_ast: 9c284703e65f44fdf9e6e82fee3a6132bb3c9ab5db8bda61f10952f5331d4dc7
diff --git a/tests/expectations/compiler/compiler/integers/u128/ge.leo.out b/tests/expectations/compiler/compiler/integers/u128/ge.leo.out
index 7c3a463282..487c34913d 100644
--- a/tests/expectations/compiler/compiler/integers/u128/ge.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/ge.leo.out
@@ -28,6 +28,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: bec3606816632c3ec6b912dedb2d10149380b68d6159792c603b866698175b2a
-    canonicalized_ast: bec3606816632c3ec6b912dedb2d10149380b68d6159792c603b866698175b2a
-    type_inferenced_ast: 440e113b6ebcf6ecbe2db5caa41e8f8b23538db7e0e7112ecc86629c0e9c7eab
+    initial_ast: 4235ed8df85a4cec17dda7a5f996ad3f7f3f10fbcb738d6c92fa7b6bd65e5c9f
+    canonicalized_ast: 4235ed8df85a4cec17dda7a5f996ad3f7f3f10fbcb738d6c92fa7b6bd65e5c9f
+    type_inferenced_ast: 970a18795a3c7965cabcc7231f243a9877d9b7148aa985f28df76edac6f0b3fc
diff --git a/tests/expectations/compiler/compiler/integers/u128/gt.leo.out b/tests/expectations/compiler/compiler/integers/u128/gt.leo.out
index 6afc52a0ea..09e6f50044 100644
--- a/tests/expectations/compiler/compiler/integers/u128/gt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/gt.leo.out
@@ -16,6 +16,6 @@ outputs:
       - input_file: u128_f.in
         output:
           registers: {}
-    initial_ast: 61af6f965b2525b4ce424fdea87e53ca1e8e1b037bf5b50fc63d5d3ddf1ed877
-    canonicalized_ast: 5d9465b3594defa551a4573815c23600809c968ead6289253fd6e7de88f4f532
-    type_inferenced_ast: 57bd5776b3700331bee92e3bfafbe17fccf3a3acb13b943e2dda42a0600cd817
+    initial_ast: 9a4fcdb4b28b0aa2ed8fa93e38f8d2946969f41a26de54090d87bb92f1f282e4
+    canonicalized_ast: d138c41a28e9d6cffb567dc16c663599ef3580bad24baff88e50cdbdd9bfb2da
+    type_inferenced_ast: 5e9a3dcf157460e9dccabc4d12933ed11f9f7f21f33454b5d4c1facfa48e75eb
diff --git a/tests/expectations/compiler/compiler/integers/u128/input.leo.out b/tests/expectations/compiler/compiler/integers/u128/input.leo.out
index e903add2ae..bac40f60bb 100644
--- a/tests/expectations/compiler/compiler/integers/u128/input.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/input.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 9b6300874e2e40af3eeb288a3b0e2c96d77ed7b7819ebe4bdea4cf536d6e0f37
-    canonicalized_ast: 9b6300874e2e40af3eeb288a3b0e2c96d77ed7b7819ebe4bdea4cf536d6e0f37
-    type_inferenced_ast: 98799a27c60065022928365b4cf62115242d8071f5cc6a5ba2535c6edbae2c3a
+    initial_ast: 35fcde66db4218c9822c65e6afa314bbfc56a41409d32e513d116d4fc750f247
+    canonicalized_ast: 35fcde66db4218c9822c65e6afa314bbfc56a41409d32e513d116d4fc750f247
+    type_inferenced_ast: 2e7ca29a53393ce6d4a95215f21d39a9b250bfc318a5fc7a8d60e40b836512cf
diff --git a/tests/expectations/compiler/compiler/integers/u128/le.leo.out b/tests/expectations/compiler/compiler/integers/u128/le.leo.out
index e5b917c83c..d4b9dd463c 100644
--- a/tests/expectations/compiler/compiler/integers/u128/le.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/le.leo.out
@@ -28,6 +28,6 @@ outputs:
             r0:
               type: bool
               value: "false"
-    initial_ast: e71204309379c09b99849308c8fe2bcd4aca2b6d8795e6af2be608c6744ad8bb
-    canonicalized_ast: e71204309379c09b99849308c8fe2bcd4aca2b6d8795e6af2be608c6744ad8bb
-    type_inferenced_ast: 30318da869e64a0db90a17fd031d553fc5534922202f9c118989e9b3ebd53a60
+    initial_ast: 020b33fdbab39ef29dca80c03068b7acd36979a785d1105c2d69aed27dd45711
+    canonicalized_ast: 020b33fdbab39ef29dca80c03068b7acd36979a785d1105c2d69aed27dd45711
+    type_inferenced_ast: f68a37b07b200bbffabbbcdcb66ad65654186eefd8fb6db9c2a98e3fda97217f
diff --git a/tests/expectations/compiler/compiler/integers/u128/lt.leo.out b/tests/expectations/compiler/compiler/integers/u128/lt.leo.out
index f1997649e0..2e597b7e30 100644
--- a/tests/expectations/compiler/compiler/integers/u128/lt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/lt.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "false"
-    initial_ast: 7db17e7a9cebbd8b889a36531da1af576816e9f679c23cedece8b0209c79001b
-    canonicalized_ast: 7db17e7a9cebbd8b889a36531da1af576816e9f679c23cedece8b0209c79001b
-    type_inferenced_ast: 291efe204cc4fedaf6b15248be5b9c621eb8f62e8b2033e206c0af3894c9c488
+    initial_ast: 8a060bb22f90eb6236e286034867a1e065cb41811797bba8ce46399ba334f160
+    canonicalized_ast: 8a060bb22f90eb6236e286034867a1e065cb41811797bba8ce46399ba334f160
+    type_inferenced_ast: 44992f5b75c09eaca3af64c0131adeb1a8df7a69319e8526b25bdb50deb25216
diff --git a/tests/expectations/compiler/compiler/integers/u128/max.leo.out b/tests/expectations/compiler/compiler/integers/u128/max.leo.out
index 5293a8d37b..10b4f40609 100644
--- a/tests/expectations/compiler/compiler/integers/u128/max.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/max.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 01d2d7a3271585174c439fd0b9e23be0f81139f44853fcae1c894f575a4d6d15
-    canonicalized_ast: 01d2d7a3271585174c439fd0b9e23be0f81139f44853fcae1c894f575a4d6d15
-    type_inferenced_ast: fc8cdcdf563aa94a281b4430dae898510666cc7dd39b60faba6d29039b971522
+    initial_ast: bfed5530bd30e033341f165cc85c25c1f11cc95249deb5904440dc075eb64eb5
+    canonicalized_ast: bfed5530bd30e033341f165cc85c25c1f11cc95249deb5904440dc075eb64eb5
+    type_inferenced_ast: e127e89bd53e745a703cff0530db67ec94f8fdf3c2855c67f5da171366ca2e9f
diff --git a/tests/expectations/compiler/compiler/integers/u128/max_fail.leo.out b/tests/expectations/compiler/compiler/integers/u128/max_fail.leo.out
index 0e63762f44..e7e4c13d75 100644
--- a/tests/expectations/compiler/compiler/integers/u128/max_fail.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/max_fail.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EASG0373031]: failed to parse int value '340282366920938463463374607431768211456'\n    --> compiler-test:4:21\n     |\n   4 |     const a: u128 = 340282366920938463463374607431768211456;\n     |                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^"
+  - "Error [EASG0373031]: failed to parse int value '340282366920938463463374607431768211456'\n    --> compiler-test:7:21\n     |\n   7 |     const a: u128 = 340282366920938463463374607431768211456;\n     |                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^"
diff --git a/tests/expectations/compiler/compiler/integers/u128/min.leo.out b/tests/expectations/compiler/compiler/integers/u128/min.leo.out
index 2c78c8f42c..d885aace1d 100644
--- a/tests/expectations/compiler/compiler/integers/u128/min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/min.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: da001a51242f61b13d47e7ffc39908bf62ad3f7a48aebe2d0988d36c55216b00
-    canonicalized_ast: da001a51242f61b13d47e7ffc39908bf62ad3f7a48aebe2d0988d36c55216b00
-    type_inferenced_ast: cd24eeefb2a9af2bd3b320ed579b4c24e5b98a7fcef5ccf50b6a5406202676a7
+    initial_ast: eb585d8d23c69275d90ba94df7d80e59089c6c9eaa57b0a08bd1cff34d357690
+    canonicalized_ast: eb585d8d23c69275d90ba94df7d80e59089c6c9eaa57b0a08bd1cff34d357690
+    type_inferenced_ast: 2a1aab5aa1d7a0f1f6aa7c7ad5bfe91a0a0f4d514bf539ffb8f900a1115fa52d
diff --git a/tests/expectations/compiler/compiler/integers/u128/min_fail.leo.out b/tests/expectations/compiler/compiler/integers/u128/min_fail.leo.out
index db0cdb2474..d8027b7c38 100644
--- a/tests/expectations/compiler/compiler/integers/u128/min_fail.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/min_fail.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EASG0373031]: failed to parse int value '-1'\n    --> compiler-test:4:21\n     |\n   4 |     const a: u128 = -1;\n     |                     ^^"
+  - "Error [EASG0373031]: failed to parse int value '-1'\n    --> compiler-test:7:21\n     |\n   7 |     const a: u128 = -1;\n     |                     ^^"
diff --git a/tests/expectations/compiler/compiler/integers/u128/mul.leo.out b/tests/expectations/compiler/compiler/integers/u128/mul.leo.out
index abeb69d5eb..a2229bad80 100644
--- a/tests/expectations/compiler/compiler/integers/u128/mul.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/mul.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "false"
-    initial_ast: 1687f3a384ae14199fe9e97c2be6601457bb6a343cd35f8830ce0930a574f185
-    canonicalized_ast: 1687f3a384ae14199fe9e97c2be6601457bb6a343cd35f8830ce0930a574f185
-    type_inferenced_ast: bb06537b55adf805c601edaecc8d28e564fb366bb0e7274ba4c7b8198cd7d35e
+    initial_ast: d08555a8bf52539222540bfc1bb965a250aee2638e514e2845d88a120a1c22cf
+    canonicalized_ast: d08555a8bf52539222540bfc1bb965a250aee2638e514e2845d88a120a1c22cf
+    type_inferenced_ast: 85a23470d3c337a3390cf727d5df6950c0646c21d9dd65f9834cb4ddef252f9d
diff --git a/tests/expectations/compiler/compiler/integers/u128/ne.leo.out b/tests/expectations/compiler/compiler/integers/u128/ne.leo.out
index ccde2780fe..96cae5d586 100644
--- a/tests/expectations/compiler/compiler/integers/u128/ne.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/ne.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: ad54acce2fc40331a9b47e756375a8b56ba391c5f9ad6d46c5931d532bfba5a8
-    canonicalized_ast: ad54acce2fc40331a9b47e756375a8b56ba391c5f9ad6d46c5931d532bfba5a8
-    type_inferenced_ast: 136a6ca5ef187b479084e29e2a081146865f03b39a1e9c01cbf90644e20a0c8c
+    initial_ast: f6f5bf43f6e1055448b98e2820581301c75c064894e2f2046c0367f1053f6acc
+    canonicalized_ast: f6f5bf43f6e1055448b98e2820581301c75c064894e2f2046c0367f1053f6acc
+    type_inferenced_ast: 49cd7a92cef9a18338975975515b1c7853a5426fdebce058effe0ae2bda36185
diff --git a/tests/expectations/compiler/compiler/integers/u128/negative_input_fail.leo.out b/tests/expectations/compiler/compiler/integers/u128/negative_input_fail.leo.out
index e5b8fb94a9..0f84c437cd 100644
--- a/tests/expectations/compiler/compiler/integers/u128/negative_input_fail.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/negative_input_fail.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [ECMP0376089]: failed to parse `-2` as expected integer type\n    --> compiler-test:3:15\n     |\n   3 | function main(a: u128) {}\n     |               ^"
+  - "Error [ECMP0376089]: failed to parse `-2` as expected integer type\n    --> compiler-test:10:15\n     |\n  10 | function main(a: u128) {}\n     |               ^"
diff --git a/tests/expectations/compiler/compiler/integers/u128/no_space_between_literal.leo.out b/tests/expectations/compiler/compiler/integers/u128/no_space_between_literal.leo.out
index b53dbf17a5..8754634ecc 100644
--- a/tests/expectations/compiler/compiler/integers/u128/no_space_between_literal.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/no_space_between_literal.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EPAR0370004]: Unexpected white space between terms 1 and u128\n    --> compiler-test:4:15\n     |\n   4 |     const i = 1 u128;\n     |               ^"
+  - "Error [EPAR0370004]: Unexpected white space between terms 1 and u128\n    --> compiler-test:7:15\n     |\n   7 |     const i = 1 u128;\n     |               ^"
diff --git a/tests/expectations/compiler/compiler/integers/u128/sub.leo.out b/tests/expectations/compiler/compiler/integers/u128/sub.leo.out
index 4dfc46516a..9ec1eec471 100644
--- a/tests/expectations/compiler/compiler/integers/u128/sub.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/sub.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: e76614a31a739252199317d02de4090bf38d89406e145239076c13f65af3d3bd
-    canonicalized_ast: e76614a31a739252199317d02de4090bf38d89406e145239076c13f65af3d3bd
-    type_inferenced_ast: 3ed54255089ab10b26df5429b5109d90b27fa6306b84e26018eca7659efe35c4
+    initial_ast: 57006477828a48513f5e8bc5b429935d58edf68b378b8e2de9a1c2532aaa2e9c
+    canonicalized_ast: 57006477828a48513f5e8bc5b429935d58edf68b378b8e2de9a1c2532aaa2e9c
+    type_inferenced_ast: bb92aae0e79cde69b27c05909c6494b45837e1a7cbf7ebf67b51fc2dc836ab43
diff --git a/tests/expectations/compiler/compiler/integers/u128/ternary.leo.out b/tests/expectations/compiler/compiler/integers/u128/ternary.leo.out
index 2e3d53d6ba..9de652d954 100644
--- a/tests/expectations/compiler/compiler/integers/u128/ternary.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/ternary.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 8e008c8133e8646f2fb89938541e8af8709de4e692c44cf7f8bea367f6225733
-    canonicalized_ast: 8e008c8133e8646f2fb89938541e8af8709de4e692c44cf7f8bea367f6225733
-    type_inferenced_ast: 124baed45ba7d5e053acf041a444d70348f15c01f4a374fa6bb42290d0bd1012
+    initial_ast: d1b1dd0d4ff229d24dc82f126deb478780a0c24efde459f82e4c3715518e438b
+    canonicalized_ast: d1b1dd0d4ff229d24dc82f126deb478780a0c24efde459f82e4c3715518e438b
+    type_inferenced_ast: 600c5a118d3bba2a49652254b175439b95d1e14d67e7e7f5e47cb7a7086a869d
diff --git a/tests/expectations/compiler/compiler/integers/u16/add.leo.out b/tests/expectations/compiler/compiler/integers/u16/add.leo.out
index c8cb53965c..f07933801d 100644
--- a/tests/expectations/compiler/compiler/integers/u16/add.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/add.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: e8e48cba56241044305c14a0d8e871b1be2495d271ba2a0f7ea3435dd75ad7b0
-    canonicalized_ast: e8e48cba56241044305c14a0d8e871b1be2495d271ba2a0f7ea3435dd75ad7b0
-    type_inferenced_ast: b004dc4f07683a68734b50e5a3ffb9ddb286be4f568cf78ac8d4fba71a910b48
+    initial_ast: a5f9617089e1c998722a483db2426b483d0c03a51eb49ce516f9aeec60f49958
+    canonicalized_ast: a5f9617089e1c998722a483db2426b483d0c03a51eb49ce516f9aeec60f49958
+    type_inferenced_ast: 7cd99ef7db2f5280bf0efe5780c632f1fd58d4d84a2fef15ed4c3b36b821d2b7
diff --git a/tests/expectations/compiler/compiler/integers/u16/console_assert.leo.out b/tests/expectations/compiler/compiler/integers/u16/console_assert.leo.out
index f188189f86..3eb57ba8a1 100644
--- a/tests/expectations/compiler/compiler/integers/u16/console_assert.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/console_assert.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: a2bb9e2530828f0a8eb3e85b167e5041bdafe32da9b96e2b1eab20eb40b241bb
-    canonicalized_ast: a2bb9e2530828f0a8eb3e85b167e5041bdafe32da9b96e2b1eab20eb40b241bb
-    type_inferenced_ast: 075f11e9cbf0068748b01f5d0bfc405810af20119dbbd9093a1b2bd22203bd6d
+    initial_ast: 150f376e713af251e101b66bfed7248114df93305fca85549349430b5ab16b0b
+    canonicalized_ast: 150f376e713af251e101b66bfed7248114df93305fca85549349430b5ab16b0b
+    type_inferenced_ast: f7afb936573682ac330a6bbdd49db2055f4701bb4103a460386f53fdb14dd64d
diff --git a/tests/expectations/compiler/compiler/integers/u16/div.leo.out b/tests/expectations/compiler/compiler/integers/u16/div.leo.out
index 9484be103c..8585830262 100644
--- a/tests/expectations/compiler/compiler/integers/u16/div.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/div.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: fba1d259e91ced687201093a13bdb2a64a8619de11181dae8e678bafb266ab26
-    canonicalized_ast: fba1d259e91ced687201093a13bdb2a64a8619de11181dae8e678bafb266ab26
-    type_inferenced_ast: 6040d336454b607e2cb7d74b7acf7dec241b6cad880f8380f521d8f8528fa898
+    initial_ast: aff108b3f7bfd92c2b1f02e38745142c79353ed4a7bf11508dd5c081bb75ad0b
+    canonicalized_ast: aff108b3f7bfd92c2b1f02e38745142c79353ed4a7bf11508dd5c081bb75ad0b
+    type_inferenced_ast: 67558330488f16b0481b58ec6e8b337f461b9d62cb7ead73daf76d851fa14e47
diff --git a/tests/expectations/compiler/compiler/integers/u16/eq.leo.out b/tests/expectations/compiler/compiler/integers/u16/eq.leo.out
index 8dc08afd48..e4c069a4f1 100644
--- a/tests/expectations/compiler/compiler/integers/u16/eq.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/eq.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 7211ca407cddb5609fa674f2f1fb9b46c271f4ba84313a0e9b36cc577d8177f8
-    canonicalized_ast: 7211ca407cddb5609fa674f2f1fb9b46c271f4ba84313a0e9b36cc577d8177f8
-    type_inferenced_ast: 7a147bb829943a07cc27567a68da910bb308aae325566a2325e0c2705ff99f4f
+    initial_ast: 8262511981ea75a69db6cd120999435481e54d3dd0f28bf4ad745e61538b79fc
+    canonicalized_ast: 8262511981ea75a69db6cd120999435481e54d3dd0f28bf4ad745e61538b79fc
+    type_inferenced_ast: be971c04c082f4ad6a5fcc1d79a53cec72d7c210c9369f3dc645b9d9540df04a
diff --git a/tests/expectations/compiler/compiler/integers/u16/ge.leo.out b/tests/expectations/compiler/compiler/integers/u16/ge.leo.out
index bbdf8c36c5..15eb5b925e 100644
--- a/tests/expectations/compiler/compiler/integers/u16/ge.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/ge.leo.out
@@ -28,6 +28,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 4277f9a10e6d860833a3a8913496647e8dae5c4c9a7f245aa90751c87eb86005
-    canonicalized_ast: 4277f9a10e6d860833a3a8913496647e8dae5c4c9a7f245aa90751c87eb86005
-    type_inferenced_ast: 4b164a7ae7660d5faffaabc481a6f15534971f72bed26ef32e180d4c2b5751c1
+    initial_ast: 25427e26f71edf24172f184c347d284ad2696d4242d1b13a3d3c7c62ac9c83e2
+    canonicalized_ast: 25427e26f71edf24172f184c347d284ad2696d4242d1b13a3d3c7c62ac9c83e2
+    type_inferenced_ast: b949bb6ce574efd327b73cdae27ab43eafa04012a4b78a537d2d83e70acbf5bd
diff --git a/tests/expectations/compiler/compiler/integers/u16/gt.leo.out b/tests/expectations/compiler/compiler/integers/u16/gt.leo.out
index c64d0300c3..7df81716f1 100644
--- a/tests/expectations/compiler/compiler/integers/u16/gt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/gt.leo.out
@@ -16,6 +16,6 @@ outputs:
       - input_file: u16_f.in
         output:
           registers: {}
-    initial_ast: 715529d38ecc6658e030e3cc9e4d102ab5639ba4fcd04d5d89f71d2fdce0c0bd
-    canonicalized_ast: 9ba94d2edcb9a646caf0c03096a519dda36756a621e1248a564c79e6643e50ef
-    type_inferenced_ast: a5ad7e6424b4e8e936757d419b7cefdae68a6fa0dcff9133bf74cfe65133142d
+    initial_ast: 5ff787c0414eeeffad39b07f5284717b12bd4a854113a43767be58f85970a393
+    canonicalized_ast: f96ec77e7e3e2f893eccd96f032657353d7614eae2f800eaf0f7a57c513e0d04
+    type_inferenced_ast: cef35327ed3d3cc009778221bc4f8018b8e2248023be2b50b294820146cdaf6c
diff --git a/tests/expectations/compiler/compiler/integers/u16/input.leo.out b/tests/expectations/compiler/compiler/integers/u16/input.leo.out
index 98333bc834..1d7e40a3ea 100644
--- a/tests/expectations/compiler/compiler/integers/u16/input.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/input.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 03ec5058648376b68253f8e1a2b62d5d00af93669195be90da09193f7cf249b8
-    canonicalized_ast: 03ec5058648376b68253f8e1a2b62d5d00af93669195be90da09193f7cf249b8
-    type_inferenced_ast: ca7657b4ec4e3df526a37c3168d74a76e043530e56f56491ff73a95590d6e608
+    initial_ast: 7b76a0f54f0df96c8e263732335f1f65a54923ed125f132e18f8c6a00fe06d2d
+    canonicalized_ast: 7b76a0f54f0df96c8e263732335f1f65a54923ed125f132e18f8c6a00fe06d2d
+    type_inferenced_ast: cb438d6d1cfc6e4ebd2981c2331691c57ae4a70c94a7ef0eeed34f9fdf737116
diff --git a/tests/expectations/compiler/compiler/integers/u16/le.leo.out b/tests/expectations/compiler/compiler/integers/u16/le.leo.out
index 4c0864f655..cf8d1e731a 100644
--- a/tests/expectations/compiler/compiler/integers/u16/le.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/le.leo.out
@@ -28,6 +28,6 @@ outputs:
             r0:
               type: bool
               value: "false"
-    initial_ast: 718c99fee53e9add1aafaf1692140151e05f6bbda2c91f28dff583591c25f885
-    canonicalized_ast: 718c99fee53e9add1aafaf1692140151e05f6bbda2c91f28dff583591c25f885
-    type_inferenced_ast: 9139f4ac9593bdc96d477f02270ca3e57949ce1503fe1db9113b45103c81fa5f
+    initial_ast: 0b079186914ff8f6c44812155f999759893ad09f2c26d85600c2e4b9e6136641
+    canonicalized_ast: 0b079186914ff8f6c44812155f999759893ad09f2c26d85600c2e4b9e6136641
+    type_inferenced_ast: 2e52b296992e39132327c7a632ab48b6eb09e82d93c397c73e359f1046a52cbb
diff --git a/tests/expectations/compiler/compiler/integers/u16/lt.leo.out b/tests/expectations/compiler/compiler/integers/u16/lt.leo.out
index 7a6db1753f..2acd9fdd48 100644
--- a/tests/expectations/compiler/compiler/integers/u16/lt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/lt.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "false"
-    initial_ast: 3f4455e62c862742538a8ea67eb3cdc88492aa7616a1691cad42e670fca20fc3
-    canonicalized_ast: 3f4455e62c862742538a8ea67eb3cdc88492aa7616a1691cad42e670fca20fc3
-    type_inferenced_ast: 3efe28c45a9fc97592c7d4ec7c36a6ca0cbb54be2dccc923e68021fbfbeedb1e
+    initial_ast: 2a58ddf15abe14333cb6feab30bcb61781ac7e83ee53edbd953228a99877a3f3
+    canonicalized_ast: 2a58ddf15abe14333cb6feab30bcb61781ac7e83ee53edbd953228a99877a3f3
+    type_inferenced_ast: 5b82000aca9a02dd5925ace4edb28cb4f7ea8764d9563929a941f90a0d79ecd6
diff --git a/tests/expectations/compiler/compiler/integers/u16/max.leo.out b/tests/expectations/compiler/compiler/integers/u16/max.leo.out
index 6a24e327b0..b5088ecdcf 100644
--- a/tests/expectations/compiler/compiler/integers/u16/max.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/max.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 48357892c03a4ed6bfc71fbee106bef0c57939aa3f90d0b902e26133373d90d0
-    canonicalized_ast: 48357892c03a4ed6bfc71fbee106bef0c57939aa3f90d0b902e26133373d90d0
-    type_inferenced_ast: 6d33448fcb77a5789544c32ef26bdf9cb5dc357dea9e99c6444e137644e837ff
+    initial_ast: 035717221b95435bf4ea8c4f55047f35edf161383cb46c99db4279a901de3e90
+    canonicalized_ast: 035717221b95435bf4ea8c4f55047f35edf161383cb46c99db4279a901de3e90
+    type_inferenced_ast: 53da99e9eb83a0cd693e36b66bdc9965c8cba37bc73b17a3482f63d94159c392
diff --git a/tests/expectations/compiler/compiler/integers/u16/max_fail.leo.out b/tests/expectations/compiler/compiler/integers/u16/max_fail.leo.out
index b249cb3754..d2f4432c59 100644
--- a/tests/expectations/compiler/compiler/integers/u16/max_fail.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/max_fail.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EASG0373031]: failed to parse int value '65536'\n    --> compiler-test:4:20\n     |\n   4 |     const a: u16 = 65536;\n     |                    ^^^^^"
+  - "Error [EASG0373031]: failed to parse int value '65536'\n    --> compiler-test:7:20\n     |\n   7 |     const a: u16 = 65536;\n     |                    ^^^^^"
diff --git a/tests/expectations/compiler/compiler/integers/u16/min.leo.out b/tests/expectations/compiler/compiler/integers/u16/min.leo.out
index 988ad9e314..b88fbd5930 100644
--- a/tests/expectations/compiler/compiler/integers/u16/min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/min.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 7400309603e4020cc0652a55937fd70bdf280ba8f7ae1fb9150b0da6c5024040
-    canonicalized_ast: 7400309603e4020cc0652a55937fd70bdf280ba8f7ae1fb9150b0da6c5024040
-    type_inferenced_ast: 6c842e1f5b09f2d65ebddc1ff0a32656184920b9e408cda403f801b43dceec1a
+    initial_ast: 8a5b701e895328329a3d302cb58f3d3a6619756520360a2fab5a765117786d16
+    canonicalized_ast: 8a5b701e895328329a3d302cb58f3d3a6619756520360a2fab5a765117786d16
+    type_inferenced_ast: b13d5a393fc78792d4e773abfaeaa11aed6df62961c42ac4f32d6954070ea9de
diff --git a/tests/expectations/compiler/compiler/integers/u16/min_fail.leo.out b/tests/expectations/compiler/compiler/integers/u16/min_fail.leo.out
index 7f1c33ece7..c4809504af 100644
--- a/tests/expectations/compiler/compiler/integers/u16/min_fail.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/min_fail.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EASG0373031]: failed to parse int value '-1'\n    --> compiler-test:4:20\n     |\n   4 |     const a: u16 = -1;\n     |                    ^^"
+  - "Error [EASG0373031]: failed to parse int value '-1'\n    --> compiler-test:7:20\n     |\n   7 |     const a: u16 = -1;\n     |                    ^^"
diff --git a/tests/expectations/compiler/compiler/integers/u16/mul.leo.out b/tests/expectations/compiler/compiler/integers/u16/mul.leo.out
index a95b30f04e..c571d94424 100644
--- a/tests/expectations/compiler/compiler/integers/u16/mul.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/mul.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "false"
-    initial_ast: c2e0b9bb222645fdaea216b5238168b32a41f7a84cf5ab438b566fb8a5de8a07
-    canonicalized_ast: c2e0b9bb222645fdaea216b5238168b32a41f7a84cf5ab438b566fb8a5de8a07
-    type_inferenced_ast: ed2bfbd8422254e12d01329641853001fef94e8de97bd71dba95d0f7c05763c8
+    initial_ast: a34ba256bc40339bb26e9d21635abe3fced124ca10a0e4671d57a6218f125876
+    canonicalized_ast: a34ba256bc40339bb26e9d21635abe3fced124ca10a0e4671d57a6218f125876
+    type_inferenced_ast: 051d15a14b2dce4b77129cd663333cc10d4f3c89e5d856d23e327964476b509a
diff --git a/tests/expectations/compiler/compiler/integers/u16/ne.leo.out b/tests/expectations/compiler/compiler/integers/u16/ne.leo.out
index 78866a8993..b18949615f 100644
--- a/tests/expectations/compiler/compiler/integers/u16/ne.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/ne.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: ce9bcbfa9b4a9445b5df9fd95765c97572fc9c0c8ec07619711bceb84685e972
-    canonicalized_ast: ce9bcbfa9b4a9445b5df9fd95765c97572fc9c0c8ec07619711bceb84685e972
-    type_inferenced_ast: 1bf0be499a5225eed5505672c01840fada9784d29430a9cbebbb2beb931cdf90
+    initial_ast: eaa70eb27156bf5c4529d11892cae3cb49fed039f121a802779e679a72c0766c
+    canonicalized_ast: eaa70eb27156bf5c4529d11892cae3cb49fed039f121a802779e679a72c0766c
+    type_inferenced_ast: 23a0dcda28688ced38b4891ad204df34da7070807b8fd61f31b35637681758fe
diff --git a/tests/expectations/compiler/compiler/integers/u16/negative_input_fail.leo.out b/tests/expectations/compiler/compiler/integers/u16/negative_input_fail.leo.out
index 55d679debc..52bc262b49 100644
--- a/tests/expectations/compiler/compiler/integers/u16/negative_input_fail.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/negative_input_fail.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [ECMP0376089]: failed to parse `-2` as expected integer type\n    --> compiler-test:3:15\n     |\n   3 | function main(a: u16) {}\n     |               ^"
+  - "Error [ECMP0376089]: failed to parse `-2` as expected integer type\n    --> compiler-test:10:15\n     |\n  10 | function main(a: u16) {}\n     |               ^"
diff --git a/tests/expectations/compiler/compiler/integers/u16/no_space_between_literal.leo.out b/tests/expectations/compiler/compiler/integers/u16/no_space_between_literal.leo.out
index 852084492c..a3cc531160 100644
--- a/tests/expectations/compiler/compiler/integers/u16/no_space_between_literal.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/no_space_between_literal.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EPAR0370004]: Unexpected white space between terms 1 and u16\n    --> compiler-test:4:15\n     |\n   4 |     const i = 1 u16;\n     |               ^"
+  - "Error [EPAR0370004]: Unexpected white space between terms 1 and u16\n    --> compiler-test:7:15\n     |\n   7 |     const i = 1 u16;\n     |               ^"
diff --git a/tests/expectations/compiler/compiler/integers/u16/sub.leo.out b/tests/expectations/compiler/compiler/integers/u16/sub.leo.out
index a0137217f5..d5c6bcfcc7 100644
--- a/tests/expectations/compiler/compiler/integers/u16/sub.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/sub.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: b67a2e773d463a9a22023e35db7533c2eb7d3114d945389869ab9652858ef86b
-    canonicalized_ast: b67a2e773d463a9a22023e35db7533c2eb7d3114d945389869ab9652858ef86b
-    type_inferenced_ast: 3b23e1f8b696bc24776da8bc0255aa12ea92d30853ab4fd65cd1ef6a9b2a4eae
+    initial_ast: 9774900b2fca203e01f8f202938ec5b53b0331e6841f1ce749d66ed303ad6665
+    canonicalized_ast: 9774900b2fca203e01f8f202938ec5b53b0331e6841f1ce749d66ed303ad6665
+    type_inferenced_ast: 105fd25a4d12e771186610dbb65d0548e8d0c5a012e111964c5fcb973e3a6b19
diff --git a/tests/expectations/compiler/compiler/integers/u16/ternary.leo.out b/tests/expectations/compiler/compiler/integers/u16/ternary.leo.out
index 7541604642..c959db8217 100644
--- a/tests/expectations/compiler/compiler/integers/u16/ternary.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/ternary.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: e441bec546c1972253e0ebf895c44a50f708139e5dbf89416cc05dabf4f4a6c4
-    canonicalized_ast: e441bec546c1972253e0ebf895c44a50f708139e5dbf89416cc05dabf4f4a6c4
-    type_inferenced_ast: ba45b5d07a22a70e60b431c4b1f592c4e363a1b6dab1e1c08729781eeafc6f17
+    initial_ast: fd02f6e5e2322fc6c4730ec79e6d5f8ceacfc55ae801eaa4d001c522338592c9
+    canonicalized_ast: fd02f6e5e2322fc6c4730ec79e6d5f8ceacfc55ae801eaa4d001c522338592c9
+    type_inferenced_ast: eae143952eca90a3c3cecd4651cc83fe8c3fd1f93dd65249e2382e8d40a71f8a
diff --git a/tests/expectations/compiler/compiler/integers/u32/add.leo.out b/tests/expectations/compiler/compiler/integers/u32/add.leo.out
index a070a8fb31..d9d22bb33a 100644
--- a/tests/expectations/compiler/compiler/integers/u32/add.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/add.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: f10819ad044f53a8a3b671d0591b6e3a8f555080687525e06adc95188a80f71e
-    canonicalized_ast: f10819ad044f53a8a3b671d0591b6e3a8f555080687525e06adc95188a80f71e
-    type_inferenced_ast: 9cec0b625c5a8c2de17452989238aa20db015ae707d4a3042974b50381360224
+    initial_ast: cebacf7fb435f6e02f13216c2da6ac916e8fe4134891aa5007a7454618b5e28a
+    canonicalized_ast: cebacf7fb435f6e02f13216c2da6ac916e8fe4134891aa5007a7454618b5e28a
+    type_inferenced_ast: c77bef84d811f3c937a283e6eb62cbf542ad31ea7cbb9d04a646853ef3ad47c0
diff --git a/tests/expectations/compiler/compiler/integers/u32/console_assert.leo.out b/tests/expectations/compiler/compiler/integers/u32/console_assert.leo.out
index 42e33e1842..bf71501e81 100644
--- a/tests/expectations/compiler/compiler/integers/u32/console_assert.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/console_assert.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 3d1a9a1636ee03ed67340d77be57cbfe6f90937af1a244eaf060d102ddab7e51
-    canonicalized_ast: 3d1a9a1636ee03ed67340d77be57cbfe6f90937af1a244eaf060d102ddab7e51
-    type_inferenced_ast: 484e7e0cff2392a2d43275369e22167a6d2cf5a0370961001cf99316c7873907
+    initial_ast: 43bddf3aa2011e63abb8da03ad4fa8711514e6f23fc478430b42dce43a0c7cac
+    canonicalized_ast: 43bddf3aa2011e63abb8da03ad4fa8711514e6f23fc478430b42dce43a0c7cac
+    type_inferenced_ast: d8abc30a3985f8ef0386a0a38e03201b827b8032075548bd143dffd32e63fafc
diff --git a/tests/expectations/compiler/compiler/integers/u32/div.leo.out b/tests/expectations/compiler/compiler/integers/u32/div.leo.out
index 88e64d268b..817a2ac73c 100644
--- a/tests/expectations/compiler/compiler/integers/u32/div.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/div.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 798cc70fe6a9278982e9a909162a64607c18320d67f2b69c986f12013c747015
-    canonicalized_ast: 798cc70fe6a9278982e9a909162a64607c18320d67f2b69c986f12013c747015
-    type_inferenced_ast: 39db1d36fd3893d40b5ab07a9e9cfa68a7cfe740d125ea86761f315cd49af950
+    initial_ast: 3d6bef178e203b0e2aa0391e1f8a9d02e816441ef255a57b8c57ce390800c656
+    canonicalized_ast: 3d6bef178e203b0e2aa0391e1f8a9d02e816441ef255a57b8c57ce390800c656
+    type_inferenced_ast: a95c7981aaa7b56849ac83f5461766b1755bfcfd3ed369250d2ac60ab75f8761
diff --git a/tests/expectations/compiler/compiler/integers/u32/eq.leo.out b/tests/expectations/compiler/compiler/integers/u32/eq.leo.out
index 557e311e1b..2ec7def5cc 100644
--- a/tests/expectations/compiler/compiler/integers/u32/eq.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/eq.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: ecd942a96ad98756ca2fa708167e33843806613ba636818e23d0991c165fb131
-    canonicalized_ast: ecd942a96ad98756ca2fa708167e33843806613ba636818e23d0991c165fb131
-    type_inferenced_ast: d654592bf733d63af723b43c0a08e5b93d8cd6e73ad25f1ec4ba1d44ce79e8c6
+    initial_ast: 8526c9fdb80a1ba90520292fb1e1a76aa5a6f25fd58ac26e5c7e208a678c95a2
+    canonicalized_ast: 8526c9fdb80a1ba90520292fb1e1a76aa5a6f25fd58ac26e5c7e208a678c95a2
+    type_inferenced_ast: 88c91f85a6ebb7293f66b5e2f06ed0ca79d013cb1fcb646c532c68d411ec5808
diff --git a/tests/expectations/compiler/compiler/integers/u32/ge.leo.out b/tests/expectations/compiler/compiler/integers/u32/ge.leo.out
index 2dae0372fb..8756babf3c 100644
--- a/tests/expectations/compiler/compiler/integers/u32/ge.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/ge.leo.out
@@ -28,6 +28,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: e6b610505dd516b2b145961540e2426d0e75c8b1f81b837cbda77f99edb4cbc4
-    canonicalized_ast: e6b610505dd516b2b145961540e2426d0e75c8b1f81b837cbda77f99edb4cbc4
-    type_inferenced_ast: a92ae1efacdcf3737670c23301dcb3fd45ccb65bf07327587f3bcb891544df17
+    initial_ast: 2b70556ecc4af1d417bd22b805af346826f22ba851714a04f853980498e38077
+    canonicalized_ast: 2b70556ecc4af1d417bd22b805af346826f22ba851714a04f853980498e38077
+    type_inferenced_ast: 487f77c3932e304856abe3136310d9395dd9f5777d909e18c1a9565eb76ea04c
diff --git a/tests/expectations/compiler/compiler/integers/u32/gt.leo.out b/tests/expectations/compiler/compiler/integers/u32/gt.leo.out
index 4debf3e335..968d1fece2 100644
--- a/tests/expectations/compiler/compiler/integers/u32/gt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/gt.leo.out
@@ -16,6 +16,6 @@ outputs:
       - input_file: u32_f.in
         output:
           registers: {}
-    initial_ast: 7ff355da2848c6f06892c90a93e1f12095a329dd9fe935ea5c8e1b009b21fa13
-    canonicalized_ast: 31547c73b8283e8dc9007834657c9c8de55a0fe50f94d984e93569b9453bc9e7
-    type_inferenced_ast: 55d7111ec36845c585d6280723e495df997c058fdf4067c923df944f4903a76a
+    initial_ast: 65982c31ed8bf2d48e47ea191d2bbe8889dd4ea3bb50f04ff6a9d482c4ef5e6b
+    canonicalized_ast: 205427ba08c292fa74ac3a0fc83264fb7303ed7b760d35838daa998cf6381003
+    type_inferenced_ast: 39296bef29e81689d701d3a18b7c5b83a8ec0b84706c3beeb842c8a43ccb70d9
diff --git a/tests/expectations/compiler/compiler/integers/u32/input.leo.out b/tests/expectations/compiler/compiler/integers/u32/input.leo.out
index 053af4bb9f..d7f301a734 100644
--- a/tests/expectations/compiler/compiler/integers/u32/input.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/input.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 090c66945914ad5529e831599c526737da325f6a8a2850ca5b77e2b7e773765e
-    canonicalized_ast: 090c66945914ad5529e831599c526737da325f6a8a2850ca5b77e2b7e773765e
-    type_inferenced_ast: 8ce7db653b5ec60f5defef5c12bc6786c6177cef85f847a3420254803d1334ef
+    initial_ast: 74e13a675e5734e7ce8e33f891292027f20b1fd9f46c77629424c58f76d3a669
+    canonicalized_ast: 74e13a675e5734e7ce8e33f891292027f20b1fd9f46c77629424c58f76d3a669
+    type_inferenced_ast: 282896f03f64417f37b2fe4677b719138cff3f56c38bd11051b4f085b14988d4
diff --git a/tests/expectations/compiler/compiler/integers/u32/le.leo.out b/tests/expectations/compiler/compiler/integers/u32/le.leo.out
index 48d355f00e..5efda5604b 100644
--- a/tests/expectations/compiler/compiler/integers/u32/le.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/le.leo.out
@@ -28,6 +28,6 @@ outputs:
             r0:
               type: bool
               value: "false"
-    initial_ast: fa56d415b885a524625c80c4ecb8b5248b7c0e9fc97e635940621bc35edd644c
-    canonicalized_ast: fa56d415b885a524625c80c4ecb8b5248b7c0e9fc97e635940621bc35edd644c
-    type_inferenced_ast: d7858764eaf0c79969bed850e695949547e7f728478f24f04cf7a129b8aae23c
+    initial_ast: 7a254546bee2a322e6600812db41d71c5e46574ff0179834cb41b6e4c1493648
+    canonicalized_ast: 7a254546bee2a322e6600812db41d71c5e46574ff0179834cb41b6e4c1493648
+    type_inferenced_ast: db733e2d365e8f614bbc9017bb13e013f9031d2adbb31c8e29d135ee6293058d
diff --git a/tests/expectations/compiler/compiler/integers/u32/lt.leo.out b/tests/expectations/compiler/compiler/integers/u32/lt.leo.out
index bccd5c9570..f2eb304395 100644
--- a/tests/expectations/compiler/compiler/integers/u32/lt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/lt.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "false"
-    initial_ast: ddeff838aaf5674520256362240e9d5429ddf81c3fef3e0fabd649355ee835b4
-    canonicalized_ast: ddeff838aaf5674520256362240e9d5429ddf81c3fef3e0fabd649355ee835b4
-    type_inferenced_ast: 8c346798879aa2297adb5345d00f7f397e06f9470c9d0bf6ac7400045689adb7
+    initial_ast: d5bcdd73598496403befaa6011deab69f8f2711841d7b2bdc9dfefe7e8d28431
+    canonicalized_ast: d5bcdd73598496403befaa6011deab69f8f2711841d7b2bdc9dfefe7e8d28431
+    type_inferenced_ast: 9313f85527b24370f1911b06f321a45cfa01fc765e9aef693357fe690120fb4f
diff --git a/tests/expectations/compiler/compiler/integers/u32/max.leo.out b/tests/expectations/compiler/compiler/integers/u32/max.leo.out
index f476068aa3..32743bcca5 100644
--- a/tests/expectations/compiler/compiler/integers/u32/max.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/max.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: aeb0761c396b19a2d4067ecfc8a7291e8391935c7573d02fa78cba8950573321
-    canonicalized_ast: aeb0761c396b19a2d4067ecfc8a7291e8391935c7573d02fa78cba8950573321
-    type_inferenced_ast: 899d5481e2f648e246c22e0118919721aa3289e307558695083e1a1d81178bc1
+    initial_ast: 7ab75ba1847c1e81f58f69ef88b3755e073552a5041e6d24318f2e8152dfd8d2
+    canonicalized_ast: 7ab75ba1847c1e81f58f69ef88b3755e073552a5041e6d24318f2e8152dfd8d2
+    type_inferenced_ast: c727350fd903f042ad10fb8215aef432e58cdf5c71ee3312411e6294f0a16813
diff --git a/tests/expectations/compiler/compiler/integers/u32/max_fail.leo.out b/tests/expectations/compiler/compiler/integers/u32/max_fail.leo.out
index 9846c671e1..e68633748f 100644
--- a/tests/expectations/compiler/compiler/integers/u32/max_fail.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/max_fail.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EASG0373031]: failed to parse int value '4294967296'\n    --> compiler-test:4:20\n     |\n   4 |     const a: u32 = 4294967296;\n     |                    ^^^^^^^^^^"
+  - "Error [EASG0373031]: failed to parse int value '4294967296'\n    --> compiler-test:7:20\n     |\n   7 |     const a: u32 = 4294967296;\n     |                    ^^^^^^^^^^"
diff --git a/tests/expectations/compiler/compiler/integers/u32/min.leo.out b/tests/expectations/compiler/compiler/integers/u32/min.leo.out
index cafb7cf89e..a72f2c56cb 100644
--- a/tests/expectations/compiler/compiler/integers/u32/min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/min.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 9c2ffa0ce38d27afc091a6f70b06ac873bd8d8a1ac729581f1e8dded22bbc21e
-    canonicalized_ast: 9c2ffa0ce38d27afc091a6f70b06ac873bd8d8a1ac729581f1e8dded22bbc21e
-    type_inferenced_ast: a744410c84202b558cd1047c21fcc9d9a9a264dccc4320ffdd14c0794ac01fb7
+    initial_ast: dba5bc5f01be8648f2f6305366dcf3cc6d967861bf3ba7fb03a14430935eeba6
+    canonicalized_ast: dba5bc5f01be8648f2f6305366dcf3cc6d967861bf3ba7fb03a14430935eeba6
+    type_inferenced_ast: 87502d00758627739fc4e5e202a56976baefa7b33e438bc83c1926bfa944cd65
diff --git a/tests/expectations/compiler/compiler/integers/u32/min_fail.leo.out b/tests/expectations/compiler/compiler/integers/u32/min_fail.leo.out
index 28202851e3..4cf75f49da 100644
--- a/tests/expectations/compiler/compiler/integers/u32/min_fail.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/min_fail.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EASG0373031]: failed to parse int value '-1'\n    --> compiler-test:4:20\n     |\n   4 |     const a: u32 = -1;\n     |                    ^^"
+  - "Error [EASG0373031]: failed to parse int value '-1'\n    --> compiler-test:7:20\n     |\n   7 |     const a: u32 = -1;\n     |                    ^^"
diff --git a/tests/expectations/compiler/compiler/integers/u32/mul.leo.out b/tests/expectations/compiler/compiler/integers/u32/mul.leo.out
index a652fb8dac..19ad67ed2e 100644
--- a/tests/expectations/compiler/compiler/integers/u32/mul.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/mul.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "false"
-    initial_ast: e30fe6132ab7cc5d0c379a8efa1b5d2cc11804aab0dc1f1e418669177b14a221
-    canonicalized_ast: e30fe6132ab7cc5d0c379a8efa1b5d2cc11804aab0dc1f1e418669177b14a221
-    type_inferenced_ast: 66befce06d14b7d2177435336a1b1a8cf8188ca87de6179d73d8fa50460a287b
+    initial_ast: 3512d08a943173d11ea355e1e06833c0e9ccb4afbe8e08f6bf555438e0da68d1
+    canonicalized_ast: 3512d08a943173d11ea355e1e06833c0e9ccb4afbe8e08f6bf555438e0da68d1
+    type_inferenced_ast: c8db28d939581828dbe608ab513d32986c19901e41d295186fe2545d920b6801
diff --git a/tests/expectations/compiler/compiler/integers/u32/ne.leo.out b/tests/expectations/compiler/compiler/integers/u32/ne.leo.out
index 43629c277b..affd26f1c7 100644
--- a/tests/expectations/compiler/compiler/integers/u32/ne.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/ne.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 44c8fedb883b67bedc8f0d89acd32fd9d89adff22c297e6e916c23f73ba2f658
-    canonicalized_ast: 44c8fedb883b67bedc8f0d89acd32fd9d89adff22c297e6e916c23f73ba2f658
-    type_inferenced_ast: 79c741c6750d6b62567323c5d03683afc13fe873bed95fbccd0a1afff0e05b77
+    initial_ast: a97830bd05384f4a22caee031ab57c04db3bb68029ae69674c5f92a9441d1968
+    canonicalized_ast: a97830bd05384f4a22caee031ab57c04db3bb68029ae69674c5f92a9441d1968
+    type_inferenced_ast: 937a8a23aa5e98ddab535e00e2baccfdbaf2067abdbc6f822ef34fbbeb9a5f53
diff --git a/tests/expectations/compiler/compiler/integers/u32/negative_input_fail.leo.out b/tests/expectations/compiler/compiler/integers/u32/negative_input_fail.leo.out
index 122639ac74..449467810f 100644
--- a/tests/expectations/compiler/compiler/integers/u32/negative_input_fail.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/negative_input_fail.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [ECMP0376089]: failed to parse `-2` as expected integer type\n    --> compiler-test:3:15\n     |\n   3 | function main(a: u32) {}\n     |               ^"
+  - "Error [ECMP0376089]: failed to parse `-2` as expected integer type\n    --> compiler-test:10:15\n     |\n  10 | function main(a: u32) {}\n     |               ^"
diff --git a/tests/expectations/compiler/compiler/integers/u32/no_space_between_literal.leo.out b/tests/expectations/compiler/compiler/integers/u32/no_space_between_literal.leo.out
index 4974811270..9aabafe15c 100644
--- a/tests/expectations/compiler/compiler/integers/u32/no_space_between_literal.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/no_space_between_literal.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EPAR0370004]: Unexpected white space between terms 1 and u32\n    --> compiler-test:4:15\n     |\n   4 |     const i = 1 u32;\n     |               ^"
+  - "Error [EPAR0370004]: Unexpected white space between terms 1 and u32\n    --> compiler-test:7:15\n     |\n   7 |     const i = 1 u32;\n     |               ^"
diff --git a/tests/expectations/compiler/compiler/integers/u32/sub.leo.out b/tests/expectations/compiler/compiler/integers/u32/sub.leo.out
index 98c34dec75..866b7373b3 100644
--- a/tests/expectations/compiler/compiler/integers/u32/sub.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/sub.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 9363bcdbcf89167438f75e5b5ae11f8e5968c4272dacecdb85d67d6627b38577
-    canonicalized_ast: 9363bcdbcf89167438f75e5b5ae11f8e5968c4272dacecdb85d67d6627b38577
-    type_inferenced_ast: edcb1c406e76f79ebf13bb46ce327e7cb9b0b8e86b1bc3affeaf69d574da9f06
+    initial_ast: 5be19cd08745237049cd2cee91965caca4bbe29e321d8c378519d5f4d5b4f1ff
+    canonicalized_ast: 5be19cd08745237049cd2cee91965caca4bbe29e321d8c378519d5f4d5b4f1ff
+    type_inferenced_ast: 0c95496834839c0f10c413a63b34d59158d33b32d0aac8b3193deb3b83faef23
diff --git a/tests/expectations/compiler/compiler/integers/u32/ternary.leo.out b/tests/expectations/compiler/compiler/integers/u32/ternary.leo.out
index 5623951925..10a2f27d15 100644
--- a/tests/expectations/compiler/compiler/integers/u32/ternary.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/ternary.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: f9ef32ac860724ac62be23d9a9059a2b65cd19decda7e133e478951c9b2d220f
-    canonicalized_ast: f9ef32ac860724ac62be23d9a9059a2b65cd19decda7e133e478951c9b2d220f
-    type_inferenced_ast: 3ca5c353bf2c9b669e16c01055e96643b3ce99bd9cbb6932d97c2d4560d9f518
+    initial_ast: 83fb7c3f1d3a414fd238bf958f8540bda191b4e2d5c22497a61553749e15efbf
+    canonicalized_ast: 83fb7c3f1d3a414fd238bf958f8540bda191b4e2d5c22497a61553749e15efbf
+    type_inferenced_ast: 3d1c8ec5f584cd9416dc4eb2e825cf7c0d13a44e758f8d94271d05430c47addb
diff --git a/tests/expectations/compiler/compiler/integers/u64/add.leo.out b/tests/expectations/compiler/compiler/integers/u64/add.leo.out
index 226962df02..1eef353297 100644
--- a/tests/expectations/compiler/compiler/integers/u64/add.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/add.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 8ed9caa46664d975d35eb60f780cc2d3544924d0458b5cd2005262f42cb92120
-    canonicalized_ast: 8ed9caa46664d975d35eb60f780cc2d3544924d0458b5cd2005262f42cb92120
-    type_inferenced_ast: 1c5761507087bc2a5357df29e0a19f9ed1c5aeb4c72ccd314456d46a02704d3d
+    initial_ast: 7b36faf3d6c09ea42b5b4be816d71739b063f35d9406cc834f7bc319940c69ee
+    canonicalized_ast: 7b36faf3d6c09ea42b5b4be816d71739b063f35d9406cc834f7bc319940c69ee
+    type_inferenced_ast: 30ad12d7c2cdd49d4b11af4ee702548c8fe8118c35aecffbaf2b18ec928904f7
diff --git a/tests/expectations/compiler/compiler/integers/u64/console_assert.leo.out b/tests/expectations/compiler/compiler/integers/u64/console_assert.leo.out
index 99fc709a17..f0912be9d3 100644
--- a/tests/expectations/compiler/compiler/integers/u64/console_assert.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/console_assert.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: daf304ae1131ed48f9ca749a7499f095d934bc2ad94cbefe314d0f86fdb4300c
-    canonicalized_ast: daf304ae1131ed48f9ca749a7499f095d934bc2ad94cbefe314d0f86fdb4300c
-    type_inferenced_ast: ce627c98acedf9702277dd9bd4d288afe7802a6a4ee5acac4b1f44ee24065800
+    initial_ast: d899184d43258157a678ec700ee464dbcb95f0b796aac47a4580fefe2b605cbe
+    canonicalized_ast: d899184d43258157a678ec700ee464dbcb95f0b796aac47a4580fefe2b605cbe
+    type_inferenced_ast: 45b5be1fa228749a5b07884969572801b6bbd1fc374a339b5c10d4e5266f32d8
diff --git a/tests/expectations/compiler/compiler/integers/u64/div.leo.out b/tests/expectations/compiler/compiler/integers/u64/div.leo.out
index f6f571b6cd..ba78e11446 100644
--- a/tests/expectations/compiler/compiler/integers/u64/div.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/div.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: eb289b91dade0e281729f77e79d0ab874871c55e6691545fb71d335710564ea3
-    canonicalized_ast: eb289b91dade0e281729f77e79d0ab874871c55e6691545fb71d335710564ea3
-    type_inferenced_ast: 59b56c3679803203430078cb0b7f8cb43cc687fb10255186493dd94336f93fcd
+    initial_ast: 7e67658fde65719598388d43a069cae481fce77abeaf768653765d6c7566acce
+    canonicalized_ast: 7e67658fde65719598388d43a069cae481fce77abeaf768653765d6c7566acce
+    type_inferenced_ast: a48cc58751b98e0534ab1120a7d337025536ce7c2d38797fc16b49769cbdf362
diff --git a/tests/expectations/compiler/compiler/integers/u64/eq.leo.out b/tests/expectations/compiler/compiler/integers/u64/eq.leo.out
index 888715eae6..de74c35cb8 100644
--- a/tests/expectations/compiler/compiler/integers/u64/eq.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/eq.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 53edaeebce5575703624feee65798bfd25e4df0797a91d16108dc4843f1be02b
-    canonicalized_ast: 53edaeebce5575703624feee65798bfd25e4df0797a91d16108dc4843f1be02b
-    type_inferenced_ast: 79b5ea87295fa54684abace26c0557d87f3966ec08b887cff117bd7c35cb2754
+    initial_ast: 59066e48f1970e9868aec01d7843e692f5e112129399499f43bacd63b4902469
+    canonicalized_ast: 59066e48f1970e9868aec01d7843e692f5e112129399499f43bacd63b4902469
+    type_inferenced_ast: 6d2d9a1045e82e9c41acd88510c65dd5d8ad20d8dd023368b057f8fc4746b602
diff --git a/tests/expectations/compiler/compiler/integers/u64/ge.leo.out b/tests/expectations/compiler/compiler/integers/u64/ge.leo.out
index 8bbf4fec1f..664398fbf0 100644
--- a/tests/expectations/compiler/compiler/integers/u64/ge.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/ge.leo.out
@@ -28,6 +28,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 1754afabf1a32941b5b59c8c3e6fd6299067d6cec13d9a0e9e2a4bebb48113e7
-    canonicalized_ast: 1754afabf1a32941b5b59c8c3e6fd6299067d6cec13d9a0e9e2a4bebb48113e7
-    type_inferenced_ast: a2c0598451ec27d8297cd1348eb7b459d021e8a0a57111cef5afbb27952995b2
+    initial_ast: 67195e062ceaf65c60fc8b43f72e857af8dd2fa6418f9fbeada1f69b1d0a3664
+    canonicalized_ast: 67195e062ceaf65c60fc8b43f72e857af8dd2fa6418f9fbeada1f69b1d0a3664
+    type_inferenced_ast: d0636084627432601a62a7e5d21764d7e63a6ad704457f5ad26f769768d4203f
diff --git a/tests/expectations/compiler/compiler/integers/u64/gt.leo.out b/tests/expectations/compiler/compiler/integers/u64/gt.leo.out
index 8088a00842..6d8be5585e 100644
--- a/tests/expectations/compiler/compiler/integers/u64/gt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/gt.leo.out
@@ -16,6 +16,6 @@ outputs:
       - input_file: u64_f.in
         output:
           registers: {}
-    initial_ast: 384354a0bccb67829fa7f3fd0e4dc1a1366678284e840d65e0c595828d0544ae
-    canonicalized_ast: 88e2646b980419e191f5423ee2fe73c863135c460cd36540f152c04a6d5a3a84
-    type_inferenced_ast: c1fbef1103029da2f839684e2d8472adafa83b3d666953d37dd24f1a964f05a9
+    initial_ast: feb5d25625349c0e5d6524254d04c5dfb5f29a94b40e32026aed91623620a60f
+    canonicalized_ast: f293529e9f5debb4dfe59aa122e0490afb3bed14455270bbba949bcd571ecb39
+    type_inferenced_ast: 740537a80c70441ca3dc97c1b821df64991217396f7ad40cdca7ebd57953c209
diff --git a/tests/expectations/compiler/compiler/integers/u64/input.leo.out b/tests/expectations/compiler/compiler/integers/u64/input.leo.out
index 37fafee1b5..d2f8aae27c 100644
--- a/tests/expectations/compiler/compiler/integers/u64/input.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/input.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: c99357fe991d4e17756a7efcc2770a693dc53e47a3fcfcdb44c2996b844c8cb2
-    canonicalized_ast: c99357fe991d4e17756a7efcc2770a693dc53e47a3fcfcdb44c2996b844c8cb2
-    type_inferenced_ast: f5bf4f3724634571b2b4f5f15402c0da5665983bf35d0e0724fb246e48fb8606
+    initial_ast: 10ebb286f479a4c7d764e484b930fefa969ebb89af505ecfb6819d18c345d73e
+    canonicalized_ast: 10ebb286f479a4c7d764e484b930fefa969ebb89af505ecfb6819d18c345d73e
+    type_inferenced_ast: 515986a0d1520efd935730ba7b102f0f26b8f8211859d1168954c6feb8d69969
diff --git a/tests/expectations/compiler/compiler/integers/u64/le.leo.out b/tests/expectations/compiler/compiler/integers/u64/le.leo.out
index bdbb9e034c..9de89cb654 100644
--- a/tests/expectations/compiler/compiler/integers/u64/le.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/le.leo.out
@@ -28,6 +28,6 @@ outputs:
             r0:
               type: bool
               value: "false"
-    initial_ast: c2d16b3c14420d013ff5b1531c0a4e461053fd5e507f0031f428ae1b7ff213f5
-    canonicalized_ast: c2d16b3c14420d013ff5b1531c0a4e461053fd5e507f0031f428ae1b7ff213f5
-    type_inferenced_ast: 586cb64af9fadad9c01a4ea8b17655a8ef39a8362770a27d7ea280b030c49063
+    initial_ast: 9e64d41f4ed08b5f3bf327ce7e123cbac9f25c78499a6382aaf2a546a7bf3392
+    canonicalized_ast: 9e64d41f4ed08b5f3bf327ce7e123cbac9f25c78499a6382aaf2a546a7bf3392
+    type_inferenced_ast: 45e80cbc7f4d71fc7c399cc3f7f4998293451ad30c874ec1dfd210da4c9f2491
diff --git a/tests/expectations/compiler/compiler/integers/u64/lt.leo.out b/tests/expectations/compiler/compiler/integers/u64/lt.leo.out
index 716f94923c..6e464ca01d 100644
--- a/tests/expectations/compiler/compiler/integers/u64/lt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/lt.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "false"
-    initial_ast: d77a1d0ca39da7cd1b08d4f7ee064cd1592edd78fca87fbe633a92e8013c7010
-    canonicalized_ast: d77a1d0ca39da7cd1b08d4f7ee064cd1592edd78fca87fbe633a92e8013c7010
-    type_inferenced_ast: 5710ebb9c5ef7bf328a4f9a272a311bce64192f423097a707f08e55ae98915bc
+    initial_ast: df23fe51ded2dfc9711e13a6d8d65d0f249edf211ffdbfd072410e17a5f5aa5f
+    canonicalized_ast: df23fe51ded2dfc9711e13a6d8d65d0f249edf211ffdbfd072410e17a5f5aa5f
+    type_inferenced_ast: b1154ad4e75e67c833bd439c61d1a882534e84420d377cf41ded52e8bc12dc83
diff --git a/tests/expectations/compiler/compiler/integers/u64/max.leo.out b/tests/expectations/compiler/compiler/integers/u64/max.leo.out
index 329bfca76c..2a19227c87 100644
--- a/tests/expectations/compiler/compiler/integers/u64/max.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/max.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 450969fc4516c60af9708bdee8269cd5c69c28e2e3cc6169a73d13b992ba21bc
-    canonicalized_ast: 450969fc4516c60af9708bdee8269cd5c69c28e2e3cc6169a73d13b992ba21bc
-    type_inferenced_ast: 2e352f853185b84705dcc4b42090bee3d7c9a8f4cf637fd0513c7f0091a5cd33
+    initial_ast: 5e5ee24d0d0e6451a84a8e095d78e650233af781d15d3dc6666839f28707d0de
+    canonicalized_ast: 5e5ee24d0d0e6451a84a8e095d78e650233af781d15d3dc6666839f28707d0de
+    type_inferenced_ast: b8e9fc4a26ce08955dd610b3276cbdf4589ae262eb60d5144ada4a3188301778
diff --git a/tests/expectations/compiler/compiler/integers/u64/max_fail.leo.out b/tests/expectations/compiler/compiler/integers/u64/max_fail.leo.out
index 4636c42cf2..b3aebee785 100644
--- a/tests/expectations/compiler/compiler/integers/u64/max_fail.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/max_fail.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EASG0373031]: failed to parse int value '18446744073709551616'\n    --> compiler-test:4:20\n     |\n   4 |     const a: u64 = 18446744073709551616;\n     |                    ^^^^^^^^^^^^^^^^^^^^"
+  - "Error [EASG0373031]: failed to parse int value '18446744073709551616'\n    --> compiler-test:7:20\n     |\n   7 |     const a: u64 = 18446744073709551616;\n     |                    ^^^^^^^^^^^^^^^^^^^^"
diff --git a/tests/expectations/compiler/compiler/integers/u64/min.leo.out b/tests/expectations/compiler/compiler/integers/u64/min.leo.out
index 30843ae5e3..719bb494c4 100644
--- a/tests/expectations/compiler/compiler/integers/u64/min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/min.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: d7b255884235b2a8e507621b310294d3ebbf875fecc7c5322df3251cab6ded9c
-    canonicalized_ast: d7b255884235b2a8e507621b310294d3ebbf875fecc7c5322df3251cab6ded9c
-    type_inferenced_ast: 6933f229d9a8b5d464f20d8efa88354d82fb51e868db11ad37c32f12dc328540
+    initial_ast: 45a5c36f882e6473a1ffce19bf2bf803d5761d054d96f85d8ba2a6f318a42068
+    canonicalized_ast: 45a5c36f882e6473a1ffce19bf2bf803d5761d054d96f85d8ba2a6f318a42068
+    type_inferenced_ast: 024d12ea4df5faaa12131a526affcad789328484c06c652291afa5794f5b150d
diff --git a/tests/expectations/compiler/compiler/integers/u64/min_fail.leo.out b/tests/expectations/compiler/compiler/integers/u64/min_fail.leo.out
index a33bae4611..098013e35b 100644
--- a/tests/expectations/compiler/compiler/integers/u64/min_fail.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/min_fail.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EASG0373031]: failed to parse int value '-1'\n    --> compiler-test:4:20\n     |\n   4 |     const a: u64 = -1;\n     |                    ^^"
+  - "Error [EASG0373031]: failed to parse int value '-1'\n    --> compiler-test:7:20\n     |\n   7 |     const a: u64 = -1;\n     |                    ^^"
diff --git a/tests/expectations/compiler/compiler/integers/u64/mul.leo.out b/tests/expectations/compiler/compiler/integers/u64/mul.leo.out
index 79538fd5ac..6aca6229c3 100644
--- a/tests/expectations/compiler/compiler/integers/u64/mul.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/mul.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "false"
-    initial_ast: 036bcdf2738560a69431e37b7635bfcf562ca871a4bd13362b77a4e1e90cc0fd
-    canonicalized_ast: 036bcdf2738560a69431e37b7635bfcf562ca871a4bd13362b77a4e1e90cc0fd
-    type_inferenced_ast: 59d590d7091eb0c740a60de9895b98b9d70bd775f2fd00d9fe25beb3f39b0a8f
+    initial_ast: 37df5972a88d058a8f24dafe2ac5eec6bc222e853fe6feb38d103d9d71672711
+    canonicalized_ast: 37df5972a88d058a8f24dafe2ac5eec6bc222e853fe6feb38d103d9d71672711
+    type_inferenced_ast: b711a195689a9cf41fa6c49679e890a7eab3e4717da31f115b46cbacd121304c
diff --git a/tests/expectations/compiler/compiler/integers/u64/ne.leo.out b/tests/expectations/compiler/compiler/integers/u64/ne.leo.out
index 8799e20d99..6083bf06bf 100644
--- a/tests/expectations/compiler/compiler/integers/u64/ne.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/ne.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 434048732d4e8ecf3ef871e262ab4349bca9184130868fc6f81bdb2f9f279eff
-    canonicalized_ast: 434048732d4e8ecf3ef871e262ab4349bca9184130868fc6f81bdb2f9f279eff
-    type_inferenced_ast: 0891a175cee05291ce0160ea7bd4d9a89e05bc8ad11aeb6854d5686ddc68b8c0
+    initial_ast: c9c07ed2dbca3639dac7734ba66a59a2f6532891464d63e37260de608cdd8111
+    canonicalized_ast: c9c07ed2dbca3639dac7734ba66a59a2f6532891464d63e37260de608cdd8111
+    type_inferenced_ast: 5fb2dd4b19bdc93312b4dcc70bf26ca4c0f908a2f05a21e79a2cdf5cb581e06d
diff --git a/tests/expectations/compiler/compiler/integers/u64/negative_input_fail.leo.out b/tests/expectations/compiler/compiler/integers/u64/negative_input_fail.leo.out
index b160ff699c..67b1a4889a 100644
--- a/tests/expectations/compiler/compiler/integers/u64/negative_input_fail.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/negative_input_fail.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [ECMP0376089]: failed to parse `-2` as expected integer type\n    --> compiler-test:3:15\n     |\n   3 | function main(a: u64) {}\n     |               ^"
+  - "Error [ECMP0376089]: failed to parse `-2` as expected integer type\n    --> compiler-test:10:15\n     |\n  10 | function main(a: u64) {}\n     |               ^"
diff --git a/tests/expectations/compiler/compiler/integers/u64/no_space_between_literal.leo.out b/tests/expectations/compiler/compiler/integers/u64/no_space_between_literal.leo.out
index 69aa25a324..1c15f0d92d 100644
--- a/tests/expectations/compiler/compiler/integers/u64/no_space_between_literal.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/no_space_between_literal.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EPAR0370004]: Unexpected white space between terms 1 and u64\n    --> compiler-test:4:15\n     |\n   4 |     const i = 1 u64;\n     |               ^"
+  - "Error [EPAR0370004]: Unexpected white space between terms 1 and u64\n    --> compiler-test:7:15\n     |\n   7 |     const i = 1 u64;\n     |               ^"
diff --git a/tests/expectations/compiler/compiler/integers/u64/sub.leo.out b/tests/expectations/compiler/compiler/integers/u64/sub.leo.out
index 697bec4ddc..d23f96dbff 100644
--- a/tests/expectations/compiler/compiler/integers/u64/sub.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/sub.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: e3d9d7e0777882927c0d62f969a00971eac702cc120a7228d495770b0508c8e2
-    canonicalized_ast: e3d9d7e0777882927c0d62f969a00971eac702cc120a7228d495770b0508c8e2
-    type_inferenced_ast: 1e073af4c2e020522743b359f27e62b2cdfef990ef3efde2e45eca72d1458694
+    initial_ast: 3630d31fb4a5ebd368fe717442a944fdbca7595e89c4c3c025c73fe915cc6281
+    canonicalized_ast: 3630d31fb4a5ebd368fe717442a944fdbca7595e89c4c3c025c73fe915cc6281
+    type_inferenced_ast: a88cf9201b850e4d00484dab6841d725a9d126ff0e070ca2b353d53e2a15903c
diff --git a/tests/expectations/compiler/compiler/integers/u64/ternary.leo.out b/tests/expectations/compiler/compiler/integers/u64/ternary.leo.out
index 8e564366c0..a9b0ea128c 100644
--- a/tests/expectations/compiler/compiler/integers/u64/ternary.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/ternary.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 0f1eb365e0b6533a4f9e6ebd6915a66945409beeab6b534e9aa4ebfd7429bf98
-    canonicalized_ast: 0f1eb365e0b6533a4f9e6ebd6915a66945409beeab6b534e9aa4ebfd7429bf98
-    type_inferenced_ast: 0726efa0b131dc2baa5662ced11c1a1da0424496b853cb7a44f8f30682a9b9b8
+    initial_ast: 0508176faab0b399cadf504f79de9c774084952e9ee7b40a822023169d704460
+    canonicalized_ast: 0508176faab0b399cadf504f79de9c774084952e9ee7b40a822023169d704460
+    type_inferenced_ast: b52092581e04dd01a167a9b01e157917de3f5c0306a0035197a20b4586627554
diff --git a/tests/expectations/compiler/compiler/integers/u8/add.leo.out b/tests/expectations/compiler/compiler/integers/u8/add.leo.out
index 5bb2bdc182..e9c5ea0c25 100644
--- a/tests/expectations/compiler/compiler/integers/u8/add.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/add.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: ac6f907e0bde03b050a6a400ec75c9ba36c8ef71e7229b74f6584ca8d2b91947
-    canonicalized_ast: ac6f907e0bde03b050a6a400ec75c9ba36c8ef71e7229b74f6584ca8d2b91947
-    type_inferenced_ast: dbbc25669e47bc45b3de20bbfb30b2b0a08558a0cfd738a5cadc8ac7b439a822
+    initial_ast: 54b4a1bb0527665cfb8469d88c5290442ae67fd1ad37f2802f75a25d75870e31
+    canonicalized_ast: 54b4a1bb0527665cfb8469d88c5290442ae67fd1ad37f2802f75a25d75870e31
+    type_inferenced_ast: 55300818f0f7aeec02b6ba815875665b4ae2d14c155ce384be44da5e8f08877e
diff --git a/tests/expectations/compiler/compiler/integers/u8/console_assert.leo.out b/tests/expectations/compiler/compiler/integers/u8/console_assert.leo.out
index 63e75d5d83..ea50cc62f9 100644
--- a/tests/expectations/compiler/compiler/integers/u8/console_assert.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/console_assert.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 0d844d1f940b60507bf4756f3ec5d3ee7927c1b35f8625e6973da1c1cb7fc599
-    canonicalized_ast: 0d844d1f940b60507bf4756f3ec5d3ee7927c1b35f8625e6973da1c1cb7fc599
-    type_inferenced_ast: 6f643a6f222e06eb2f588ccecff5fe1dd4b037a9ac5ff340056dfd33093ae7a7
+    initial_ast: de997e8affd99428557c7e6e8b5ac591b90b5e38be9fec11d486bf9995bee7ec
+    canonicalized_ast: de997e8affd99428557c7e6e8b5ac591b90b5e38be9fec11d486bf9995bee7ec
+    type_inferenced_ast: 4727f31e10d2b1fe2a2dfe4869a04052dd82b3fc4e6b777a1a7a5d444b3706c7
diff --git a/tests/expectations/compiler/compiler/integers/u8/div.leo.out b/tests/expectations/compiler/compiler/integers/u8/div.leo.out
index 7b8f66a81b..7ca4d06f85 100644
--- a/tests/expectations/compiler/compiler/integers/u8/div.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/div.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: b89d99a49767212fe042121c854f22669329d9c73b08894fe49e54b1d5364d20
-    canonicalized_ast: b89d99a49767212fe042121c854f22669329d9c73b08894fe49e54b1d5364d20
-    type_inferenced_ast: 51638eb70f7dddd16f8b12b97cd047b1c01161111e001aac2b578b697e15e375
+    initial_ast: bcb0e8382ee430b94d33d448d9355daca81ba3c999cf8e98abbaed5be2c53197
+    canonicalized_ast: bcb0e8382ee430b94d33d448d9355daca81ba3c999cf8e98abbaed5be2c53197
+    type_inferenced_ast: 4625ae3533931d489964849b4a6d8055b555da5e8eeabe2d5a13c1ecdeecc6ce
diff --git a/tests/expectations/compiler/compiler/integers/u8/eq.leo.out b/tests/expectations/compiler/compiler/integers/u8/eq.leo.out
index 727b23fe74..22b0e10393 100644
--- a/tests/expectations/compiler/compiler/integers/u8/eq.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/eq.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: e5f1208c5eeddea9529cb7d94abd8402deea7fb99403d30b993d20455c486005
-    canonicalized_ast: e5f1208c5eeddea9529cb7d94abd8402deea7fb99403d30b993d20455c486005
-    type_inferenced_ast: 4262889173a452f869821a1c5156b16df25938323a1029b9ac16b2d851f590ab
+    initial_ast: 248756771050ea8d0ff873b435387cec570b5e23c0b399f8dd3a950d1b18eb32
+    canonicalized_ast: 248756771050ea8d0ff873b435387cec570b5e23c0b399f8dd3a950d1b18eb32
+    type_inferenced_ast: 3e84bc03659daeb44268e4100dff505dac486fde4f471444b1b2240e06cfe15c
diff --git a/tests/expectations/compiler/compiler/integers/u8/ge.leo.out b/tests/expectations/compiler/compiler/integers/u8/ge.leo.out
index f788e88307..fdd9735882 100644
--- a/tests/expectations/compiler/compiler/integers/u8/ge.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/ge.leo.out
@@ -28,6 +28,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: e112fdcf1e2d652ade77b4a66808e252bf380f9e0db3d4766828ea062fc4653f
-    canonicalized_ast: e112fdcf1e2d652ade77b4a66808e252bf380f9e0db3d4766828ea062fc4653f
-    type_inferenced_ast: 96f3e51cdf1f213854d70c733044bb1157391380fa4614e3ad604ce588ee2cfc
+    initial_ast: b4e20e7588763aec08cb3d040f53db8ed4cbdedb2ae62ca5c613e1eb559dff2c
+    canonicalized_ast: b4e20e7588763aec08cb3d040f53db8ed4cbdedb2ae62ca5c613e1eb559dff2c
+    type_inferenced_ast: bd405a26aaef13c1f6e6c5971f3ca8474c341c60baea1cb6e8f77bdb987fd992
diff --git a/tests/expectations/compiler/compiler/integers/u8/gt.leo.out b/tests/expectations/compiler/compiler/integers/u8/gt.leo.out
index 2d889a0bb7..a4d90d0803 100644
--- a/tests/expectations/compiler/compiler/integers/u8/gt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/gt.leo.out
@@ -16,6 +16,6 @@ outputs:
       - input_file: u8_f.in
         output:
           registers: {}
-    initial_ast: 367bd7c0e5be94e791a9d837ffd38b75346a717b6819180ac3f9de72252d27d5
-    canonicalized_ast: 6d52d5232ccd2c88404b6fa137aecb9d40b02c6330995f1060e5f27f5b8ca224
-    type_inferenced_ast: bdf5ecebb6a1522b6f2b94a2aab91550473604de2db6dc8d32ec19c2ab6ca590
+    initial_ast: 0cec58fb374f2bd941a6bc1726eb846a33ecc9693e1a18b3c94e3327f6542dee
+    canonicalized_ast: 31c78bd8d6128e6418d25d8c4aa4850ca254cd5bb45e7257250cb3e19dac8743
+    type_inferenced_ast: 21afd48960023e262d7b76c51628db4a362a42f3645cb13ed49054f90bdfd92e
diff --git a/tests/expectations/compiler/compiler/integers/u8/input.leo.out b/tests/expectations/compiler/compiler/integers/u8/input.leo.out
index a11b91c799..020fa00cfc 100644
--- a/tests/expectations/compiler/compiler/integers/u8/input.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/input.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 531f048a2b98e742368e050951fecd924e86bddc2434861a71727e9f56ef79cd
-    canonicalized_ast: 531f048a2b98e742368e050951fecd924e86bddc2434861a71727e9f56ef79cd
-    type_inferenced_ast: 2cd1ea5a7a527232d6b433796b486672bdd1eb9f29bedd492ddd88bc118bfac6
+    initial_ast: be77fe2416806e729785b5c74127224b4d3df45da71e2c6d445d86077ab06fc1
+    canonicalized_ast: be77fe2416806e729785b5c74127224b4d3df45da71e2c6d445d86077ab06fc1
+    type_inferenced_ast: 05044f2abdada9354e0e66e9fc3c09fe3f1b890a74a8f2dfde6afa7f9126361a
diff --git a/tests/expectations/compiler/compiler/integers/u8/le.leo.out b/tests/expectations/compiler/compiler/integers/u8/le.leo.out
index c330c95df0..990c5e0f6f 100644
--- a/tests/expectations/compiler/compiler/integers/u8/le.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/le.leo.out
@@ -28,6 +28,6 @@ outputs:
             r0:
               type: bool
               value: "false"
-    initial_ast: 90d394dcd275a98675d2dd533d85387205c32197f34dac27bf926eadf260c3a4
-    canonicalized_ast: 90d394dcd275a98675d2dd533d85387205c32197f34dac27bf926eadf260c3a4
-    type_inferenced_ast: 9ecdb7705455bb31f65809c1eb79f31d2b68f17e6aea5d1c4d6038c730e4f6a2
+    initial_ast: 5224b7995d71f4785a7b3418a4fca9ae3f58f8852ff690f7576855e77480f1ca
+    canonicalized_ast: 5224b7995d71f4785a7b3418a4fca9ae3f58f8852ff690f7576855e77480f1ca
+    type_inferenced_ast: 34352c09924a1fa43ee5ef7dcaa10bdf2cc2610b9af318159198b1174705fb42
diff --git a/tests/expectations/compiler/compiler/integers/u8/lt.leo.out b/tests/expectations/compiler/compiler/integers/u8/lt.leo.out
index a3a0faa275..66cf34c514 100644
--- a/tests/expectations/compiler/compiler/integers/u8/lt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/lt.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "false"
-    initial_ast: 61afedce9bcf1d0018a083b81bc3355cb161e9a92ed7519e52d027b83c2c0930
-    canonicalized_ast: 61afedce9bcf1d0018a083b81bc3355cb161e9a92ed7519e52d027b83c2c0930
-    type_inferenced_ast: 5f3d7fa99b36f82a7660a7ba7b6331c8eb2b805b1a46ea04c5b74ff1c32b6b93
+    initial_ast: c93644792d036fbd7a5e6c2492054a58d0d03a8cc92151e72fae79782ebb7f28
+    canonicalized_ast: c93644792d036fbd7a5e6c2492054a58d0d03a8cc92151e72fae79782ebb7f28
+    type_inferenced_ast: 7823d84601d0f178c6cf14cc7563149fd55a09e74fe78cf302210cf1d94bc846
diff --git a/tests/expectations/compiler/compiler/integers/u8/max.leo.out b/tests/expectations/compiler/compiler/integers/u8/max.leo.out
index 6149ce792d..3c07a7ce1c 100644
--- a/tests/expectations/compiler/compiler/integers/u8/max.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/max.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 6342b402bd6699b8bc7b7ae840c4d3812f8ee1f8b59913ab66353d54e5972893
-    canonicalized_ast: 6342b402bd6699b8bc7b7ae840c4d3812f8ee1f8b59913ab66353d54e5972893
-    type_inferenced_ast: e9db0cb3f6a2537b42553b4b998c746fb8eb65f8ad1af2e2dfb0ee60243f1418
+    initial_ast: 623640fa01831aae94f390be4aea82d2849bbe40daf13eaf8d14d6a7e2066af5
+    canonicalized_ast: 623640fa01831aae94f390be4aea82d2849bbe40daf13eaf8d14d6a7e2066af5
+    type_inferenced_ast: e87f3aedb39ae550529807e7a1b4aae01e6532bb7ac538cff77a70f013359445
diff --git a/tests/expectations/compiler/compiler/integers/u8/max_fail.leo.out b/tests/expectations/compiler/compiler/integers/u8/max_fail.leo.out
index 1764ec3502..8e2bf37551 100644
--- a/tests/expectations/compiler/compiler/integers/u8/max_fail.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/max_fail.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EASG0373031]: failed to parse int value '256'\n    --> compiler-test:4:19\n     |\n   4 |     const a: u8 = 256;\n     |                   ^^^"
+  - "Error [EASG0373031]: failed to parse int value '256'\n    --> compiler-test:7:19\n     |\n   7 |     const a: u8 = 256;\n     |                   ^^^"
diff --git a/tests/expectations/compiler/compiler/integers/u8/min.leo.out b/tests/expectations/compiler/compiler/integers/u8/min.leo.out
index de61365e09..2ff58e18af 100644
--- a/tests/expectations/compiler/compiler/integers/u8/min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/min.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: ab129b038cecc6772d826b2cf0ee5ed5379cff8550d245602e599ac25a894d86
-    canonicalized_ast: ab129b038cecc6772d826b2cf0ee5ed5379cff8550d245602e599ac25a894d86
-    type_inferenced_ast: b7bc9ee14a8d2e35faa657e8fb739494b6e76f04bffbb91072185049d51d1ecf
+    initial_ast: 95a995ee9404d203a0d94ce750cb4bac395f41ce177cfd87f699b68271669f62
+    canonicalized_ast: 95a995ee9404d203a0d94ce750cb4bac395f41ce177cfd87f699b68271669f62
+    type_inferenced_ast: 712b18943148483f8a61a77b44a623e58ed1875fe1185c663ebb59926543ea50
diff --git a/tests/expectations/compiler/compiler/integers/u8/min_fail.leo.out b/tests/expectations/compiler/compiler/integers/u8/min_fail.leo.out
index c2e3b45913..bf737ca32b 100644
--- a/tests/expectations/compiler/compiler/integers/u8/min_fail.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/min_fail.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EASG0373031]: failed to parse int value '-1'\n    --> compiler-test:4:19\n     |\n   4 |     const a: u8 = -1;\n     |                   ^^"
+  - "Error [EASG0373031]: failed to parse int value '-1'\n    --> compiler-test:7:19\n     |\n   7 |     const a: u8 = -1;\n     |                   ^^"
diff --git a/tests/expectations/compiler/compiler/integers/u8/mul.leo.out b/tests/expectations/compiler/compiler/integers/u8/mul.leo.out
index acbba34889..bf3bf77c59 100644
--- a/tests/expectations/compiler/compiler/integers/u8/mul.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/mul.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "false"
-    initial_ast: 4ddfc75bb5e02c95e9a0063a7252f710a762826edbf18a6e66f856a1952225aa
-    canonicalized_ast: 4ddfc75bb5e02c95e9a0063a7252f710a762826edbf18a6e66f856a1952225aa
-    type_inferenced_ast: fb7db5e925bdfd5819e60f9e62d550e212956bf9848e5c4396ffda535b73fd48
+    initial_ast: 520c1cf3fc676c217e9035313ea632ffa45d1d87f09d5c40d8ac2cc0f34d6431
+    canonicalized_ast: 520c1cf3fc676c217e9035313ea632ffa45d1d87f09d5c40d8ac2cc0f34d6431
+    type_inferenced_ast: 78969b4d50ea0a1d213c4089718a6a66d96387e52b2cd3c01521c0723ea882d3
diff --git a/tests/expectations/compiler/compiler/integers/u8/ne.leo.out b/tests/expectations/compiler/compiler/integers/u8/ne.leo.out
index 84570433b9..34a069e01d 100644
--- a/tests/expectations/compiler/compiler/integers/u8/ne.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/ne.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: cac942dae68f28bb032dee1b20345d38c4c1b948b1d9c77e02af98f2b17d3296
-    canonicalized_ast: cac942dae68f28bb032dee1b20345d38c4c1b948b1d9c77e02af98f2b17d3296
-    type_inferenced_ast: 9bd574d7862a1d10bdd1ca1096381d1fc2f1070433f189e48c8bfef3587da83f
+    initial_ast: 887a767547a522abad528cd3055d8ce6bb46f35e88b0ff6131c5f0d097d0b960
+    canonicalized_ast: 887a767547a522abad528cd3055d8ce6bb46f35e88b0ff6131c5f0d097d0b960
+    type_inferenced_ast: 8e8eee4e8638f7419c70b0b60b378d45db2c50910fb6bfcbdb33de486b10e603
diff --git a/tests/expectations/compiler/compiler/integers/u8/negative_input_fail.leo.out b/tests/expectations/compiler/compiler/integers/u8/negative_input_fail.leo.out
index f4d484c12b..2c60194564 100644
--- a/tests/expectations/compiler/compiler/integers/u8/negative_input_fail.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/negative_input_fail.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [ECMP0376089]: failed to parse `-2` as expected integer type\n    --> compiler-test:3:15\n     |\n   3 | function main(a: u8) {}\n     |               ^"
+  - "Error [ECMP0376089]: failed to parse `-2` as expected integer type\n    --> compiler-test:10:15\n     |\n  10 | function main(a: u8) {}\n     |               ^"
diff --git a/tests/expectations/compiler/compiler/integers/u8/no_space_between_literal.leo.out b/tests/expectations/compiler/compiler/integers/u8/no_space_between_literal.leo.out
index 4f1333e8cc..82e71d4881 100644
--- a/tests/expectations/compiler/compiler/integers/u8/no_space_between_literal.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/no_space_between_literal.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EPAR0370004]: Unexpected white space between terms 1 and u8\n    --> compiler-test:4:15\n     |\n   4 |     const i = 1 u8;\n     |               ^"
+  - "Error [EPAR0370004]: Unexpected white space between terms 1 and u8\n    --> compiler-test:7:15\n     |\n   7 |     const i = 1 u8;\n     |               ^"
diff --git a/tests/expectations/compiler/compiler/integers/u8/sub.leo.out b/tests/expectations/compiler/compiler/integers/u8/sub.leo.out
index 50ff8321c7..c81f2a0008 100644
--- a/tests/expectations/compiler/compiler/integers/u8/sub.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/sub.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 37f312fca99e18c20fc3b915d5e9691183e9c8a26facea674c94d18439f76419
-    canonicalized_ast: 37f312fca99e18c20fc3b915d5e9691183e9c8a26facea674c94d18439f76419
-    type_inferenced_ast: 184d52c1e60496d84b8ea7c99d47c4d61c54462ec876eb1ad9087d921e4bf4c2
+    initial_ast: c61627054beb343abd57e12d6c388805af1898dc3108b787d4fae14c89c8a658
+    canonicalized_ast: c61627054beb343abd57e12d6c388805af1898dc3108b787d4fae14c89c8a658
+    type_inferenced_ast: 70e3aef2e2c9764918f8108db5f8ee6fe7e33fee61043ecd59f871ec6519bec9
diff --git a/tests/expectations/compiler/compiler/integers/u8/ternary.leo.out b/tests/expectations/compiler/compiler/integers/u8/ternary.leo.out
index 0556332f0b..a337a868de 100644
--- a/tests/expectations/compiler/compiler/integers/u8/ternary.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/ternary.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 12081a6268bceeb4d14340427a7d8786dee79834e8d0639530bda36405519f89
-    canonicalized_ast: 12081a6268bceeb4d14340427a7d8786dee79834e8d0639530bda36405519f89
-    type_inferenced_ast: 1dc21f41bccb8261f4d52ed0ea64b3dbea0a51b685afddb46692ccb3abd0aaef
+    initial_ast: b1f4c2df00cc5305abc21ebe1e72400c8de36e4a18dfbdef8fe83c8bb7693e86
+    canonicalized_ast: b1f4c2df00cc5305abc21ebe1e72400c8de36e4a18dfbdef8fe83c8bb7693e86
+    type_inferenced_ast: 6f8bf43750c78a7fbf3dbadd5b6874129a41fba85184ff73d0249d7273d021fc
diff --git a/tests/expectations/compiler/compiler/mutability/array_dyn_mut.leo.out b/tests/expectations/compiler/compiler/mutability/array_dyn_mut.leo.out
index 0b62259bc4..408a98656a 100644
--- a/tests/expectations/compiler/compiler/mutability/array_dyn_mut.leo.out
+++ b/tests/expectations/compiler/compiler/mutability/array_dyn_mut.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: "[u32; 3]"
               value: "\"150\""
-    initial_ast: 1b9dd4d93877ba82b0f45fa9512946bbf07683c6ab239d93c4a9a18530cc1eb7
-    canonicalized_ast: 7b38858ddb99fd0e62727f508609aa05e68c7daf27429db5f2e0c59f137543ec
-    type_inferenced_ast: c492d1e3ec39f64c403105c5da177e6593c97ba93e71d187b040a095b1916f47
+    initial_ast: e6f744dc48cb7233c4164a40a06fee68fd031e57e6e6bf473e515db1244fffd3
+    canonicalized_ast: 3dae6f05298b9782e4f29ff3ce59c6f8e39b0f1b3d246d0e857da63ba954da45
+    type_inferenced_ast: 5e7cd1290de0869b90e9eb16290f12d585c0ec8c392b342113e6c9ce5e5859a0
diff --git a/tests/expectations/compiler/compiler/mutability/array_dyn_mut_indirect.leo.out b/tests/expectations/compiler/compiler/mutability/array_dyn_mut_indirect.leo.out
index e583f33d7e..1cdf544a93 100644
--- a/tests/expectations/compiler/compiler/mutability/array_dyn_mut_indirect.leo.out
+++ b/tests/expectations/compiler/compiler/mutability/array_dyn_mut_indirect.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: "[(u32, u32); 3]"
               value: "\"(1, 1)(2, 2)(0, 1)\""
-    initial_ast: 1c99d10e887a1d5127c01ea8e30b83e1ff063074c995dbfe4be8600af27e46be
-    canonicalized_ast: 1c99d10e887a1d5127c01ea8e30b83e1ff063074c995dbfe4be8600af27e46be
-    type_inferenced_ast: f78c73953ee24462f3f623cad8661e2a892901193ffedd93f030c49a7225cfe7
+    initial_ast: af23c4358c8ed651b817102ac1f81b3d32180f1efd01d2a6a1b6296856c5b2e5
+    canonicalized_ast: af23c4358c8ed651b817102ac1f81b3d32180f1efd01d2a6a1b6296856c5b2e5
+    type_inferenced_ast: 4b2d08dde4841680c46847c663775c17c61d976f2a38088d16b57a71e4b2696b
diff --git a/tests/expectations/compiler/compiler/mutability/array_fail.leo.out b/tests/expectations/compiler/compiler/mutability/array_fail.leo.out
index ca06a5b485..38c648888b 100644
--- a/tests/expectations/compiler/compiler/mutability/array_fail.leo.out
+++ b/tests/expectations/compiler/compiler/mutability/array_fail.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EASG0373033]: illegal assignment to immutable variable 'a'\n    --> compiler-test:5:5\n     |\n   5 |     a[0] = 0;\n     |     ^^^^^^^^"
+  - "Error [EASG0373033]: illegal assignment to immutable variable 'a'\n    --> compiler-test:8:5\n     |\n   8 |     a[0] = 0;\n     |     ^^^^^^^^"
diff --git a/tests/expectations/compiler/compiler/mutability/array_mut.leo.out b/tests/expectations/compiler/compiler/mutability/array_mut.leo.out
index 540a93fedf..6f2c2737af 100644
--- a/tests/expectations/compiler/compiler/mutability/array_mut.leo.out
+++ b/tests/expectations/compiler/compiler/mutability/array_mut.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: d1d84eaa70d3a5bc85b399d5cd16f62d78566638c9840e85c0eaed2c6a7218ac
-    canonicalized_ast: d1d84eaa70d3a5bc85b399d5cd16f62d78566638c9840e85c0eaed2c6a7218ac
-    type_inferenced_ast: 0c2bda504db5b7d1d4868ad20a3c70fa0e86dd1ec90c514c7a67161997495970
+    initial_ast: e7d3f1593f3ac9ad7d42ad79e566ab2ab6ba276c1511484e5d62a3475c891266
+    canonicalized_ast: e7d3f1593f3ac9ad7d42ad79e566ab2ab6ba276c1511484e5d62a3475c891266
+    type_inferenced_ast: b34fd4337fe36e48bbd35f36a1805295073e710ced766b07bd4f2ecf56fc20ec
diff --git a/tests/expectations/compiler/compiler/mutability/array_splice_mut.leo.out b/tests/expectations/compiler/compiler/mutability/array_splice_mut.leo.out
index b0bf42402a..f2f33cae6d 100644
--- a/tests/expectations/compiler/compiler/mutability/array_splice_mut.leo.out
+++ b/tests/expectations/compiler/compiler/mutability/array_splice_mut.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 319d0e6e9e914b85e84803c5ac0c0bee32e5238e89fdcf2e7ac28c88b3386f3c
-    canonicalized_ast: 319d0e6e9e914b85e84803c5ac0c0bee32e5238e89fdcf2e7ac28c88b3386f3c
-    type_inferenced_ast: afce2509e7ecc4c7edb35a0d7536fd425171d9b0477c5f7ad731f7bba716c310
+    initial_ast: 8d689152a40c1381eb82d133e5250fd07600ce7fdb76602c23272406f10d2453
+    canonicalized_ast: 8d689152a40c1381eb82d133e5250fd07600ce7fdb76602c23272406f10d2453
+    type_inferenced_ast: 83815153f045c4086ac700986f0abf1e4100ef66448819a089e1d4617d92a802
diff --git a/tests/expectations/compiler/compiler/mutability/array_tuple_mut.leo.out b/tests/expectations/compiler/compiler/mutability/array_tuple_mut.leo.out
index 4ad3154498..28e9093213 100644
--- a/tests/expectations/compiler/compiler/mutability/array_tuple_mut.leo.out
+++ b/tests/expectations/compiler/compiler/mutability/array_tuple_mut.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: c34cb6ced1870107558689bad9fcf1a6ec465b0db85c2b6f10ddcecf9d5cae25
-    canonicalized_ast: c34cb6ced1870107558689bad9fcf1a6ec465b0db85c2b6f10ddcecf9d5cae25
-    type_inferenced_ast: 984811782861d636221d6b3ee89f13e8489d0b4ff8ec2f4a01feb5c940ebb8a7
+    initial_ast: 1fc8eafae15267050c6d1b696945817291b03993abcab3f2da89a6c6a725f95c
+    canonicalized_ast: 1fc8eafae15267050c6d1b696945817291b03993abcab3f2da89a6c6a725f95c
+    type_inferenced_ast: 759309f6b2e8e67125f5afa766fd4881dc48197d14d95fabc6968378113ac9ac
diff --git a/tests/expectations/compiler/compiler/mutability/circuit_fail.leo.out b/tests/expectations/compiler/compiler/mutability/circuit_fail.leo.out
index 0d6020a433..dff294a0ff 100644
--- a/tests/expectations/compiler/compiler/mutability/circuit_fail.leo.out
+++ b/tests/expectations/compiler/compiler/mutability/circuit_fail.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EASG0373033]: illegal assignment to immutable variable 'a'\n    --> compiler-test:10:5\n     |\n  10 |     a.x = 0;\n     |     ^^^^^^^"
+  - "Error [EASG0373033]: illegal assignment to immutable variable 'a'\n    --> compiler-test:13:5\n     |\n  13 |     a.x = 0;\n     |     ^^^^^^^"
diff --git a/tests/expectations/compiler/compiler/mutability/circuit_function_const.leo.out b/tests/expectations/compiler/compiler/mutability/circuit_function_const.leo.out
index 91f1479abc..f166335a98 100644
--- a/tests/expectations/compiler/compiler/mutability/circuit_function_const.leo.out
+++ b/tests/expectations/compiler/compiler/mutability/circuit_function_const.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EASG0373010]: cannot call mutable member function 'foo' of circuit 'Foo' from immutable context\n    --> compiler-test:15:5\n     |\n  15 |     a.foo();\n     |     ^^^^^"
+  - "Error [EASG0373010]: cannot call mutable member function 'foo' of circuit 'Foo' from immutable context\n    --> compiler-test:19:5\n     |\n  19 |     a.foo();\n     |     ^^^^^"
diff --git a/tests/expectations/compiler/compiler/mutability/circuit_function_mut.leo.out b/tests/expectations/compiler/compiler/mutability/circuit_function_mut.leo.out
index a0dc3d36ae..7861478610 100644
--- a/tests/expectations/compiler/compiler/mutability/circuit_function_mut.leo.out
+++ b/tests/expectations/compiler/compiler/mutability/circuit_function_mut.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: f98b76f43ddfdf48c6ae59d240f8cc5435af4af4d858b42a215b6c7cdc62cbe0
-    canonicalized_ast: 9322ad9c85e77f9491596f2edf8fbe28e1843e79467a26c700adc1674362cc81
-    type_inferenced_ast: f1ca7540ea64649a3b8fa23be49593b001eb6b46be162701481d2bad4b2fea09
+    initial_ast: 398bd1788aeb623edd3d449d19c4c943ffdef26690eefa751f3f79bcae738392
+    canonicalized_ast: 6c493bc8d9710fc02fa7d84fb5465b00ad74bb55d4514e56c96965be41165a1a
+    type_inferenced_ast: 3ec7bf20544ba8287894b510128b0768fd579cffc8be485e9498d167a18647b5
diff --git a/tests/expectations/compiler/compiler/mutability/circuit_static_function_mut_fail.leo.out b/tests/expectations/compiler/compiler/mutability/circuit_static_function_mut_fail.leo.out
index c173994d24..3845cdbf80 100644
--- a/tests/expectations/compiler/compiler/mutability/circuit_static_function_mut_fail.leo.out
+++ b/tests/expectations/compiler/compiler/mutability/circuit_static_function_mut_fail.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EASG0373006]: extra circuit member 'x' for initialization of circuit 'Foo' is not allowed\n    --> compiler-test:8:19\n     |\n   8 |     let a = Foo { x: 1 };\n     |                   ^"
+  - "Error [EASG0373006]: extra circuit member 'x' for initialization of circuit 'Foo' is not allowed\n    --> compiler-test:11:19\n     |\n  11 |     let a = Foo { x: 1 };\n     |                   ^"
diff --git a/tests/expectations/compiler/compiler/mutability/circuit_variable_mut.leo.out b/tests/expectations/compiler/compiler/mutability/circuit_variable_mut.leo.out
index e8d582d714..7e4febb885 100644
--- a/tests/expectations/compiler/compiler/mutability/circuit_variable_mut.leo.out
+++ b/tests/expectations/compiler/compiler/mutability/circuit_variable_mut.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 1341a7e36aa9a9d76d032b4245ac4cecf8c62938cd921be44fc13a736cd21daf
-    canonicalized_ast: 1341a7e36aa9a9d76d032b4245ac4cecf8c62938cd921be44fc13a736cd21daf
-    type_inferenced_ast: 3e10385fa57b142f27bf8b9d9141ca83fece80755ac4643743f9db3824817750
+    initial_ast: c0533192aeb7922b3fbf0dd1cbd2324b2c3e5853bd0f5c92329fcdb4a7321d5c
+    canonicalized_ast: c0533192aeb7922b3fbf0dd1cbd2324b2c3e5853bd0f5c92329fcdb4a7321d5c
+    type_inferenced_ast: a0bb140106680b93cf913c3886dbce311700c492c6cd27445a3fb9722802d11a
diff --git a/tests/expectations/compiler/compiler/mutability/cond_mut.leo.out b/tests/expectations/compiler/compiler/mutability/cond_mut.leo.out
index 2c8c19daca..3ab160760c 100644
--- a/tests/expectations/compiler/compiler/mutability/cond_mut.leo.out
+++ b/tests/expectations/compiler/compiler/mutability/cond_mut.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 1f9ad1f3e19f31a5e7195eb91ec9617e07d5eaf146fd1654eb4a5188f0268cbd
-    canonicalized_ast: 5ff794b8a47377190bb0a834df5c858bee7b6136204677e71db99b395a158d41
-    type_inferenced_ast: 1555a60ba172865b0689ca934416a7840a678950f800a33825cb455fa101627c
+    initial_ast: 1ffe2195c6a4e790373c92d7a97fc08fb14875d466f93ca6f231845a4465e320
+    canonicalized_ast: 4e016159643968385aeead36034a13a2d669a69b099809ee301ad7a1dd4b1309
+    type_inferenced_ast: 5267818125672a8f0912d5e54fc0cf313a6e06399ae429e697ca92b51a84c09f
diff --git a/tests/expectations/compiler/compiler/mutability/const.leo.out b/tests/expectations/compiler/compiler/mutability/const.leo.out
index c6ba953ccb..f4fa3518f8 100644
--- a/tests/expectations/compiler/compiler/mutability/const.leo.out
+++ b/tests/expectations/compiler/compiler/mutability/const.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EASG0373033]: illegal assignment to immutable variable 'a'\n    --> compiler-test:6:5\n     |\n   6 |     a = 0;\n     |     ^^^^^"
+  - "Error [EASG0373033]: illegal assignment to immutable variable 'a'\n    --> compiler-test:9:5\n     |\n   9 |     a = 0;\n     |     ^^^^^"
diff --git a/tests/expectations/compiler/compiler/mutability/function_input.leo.out b/tests/expectations/compiler/compiler/mutability/function_input.leo.out
index 3c28b515fc..98f83fe796 100644
--- a/tests/expectations/compiler/compiler/mutability/function_input.leo.out
+++ b/tests/expectations/compiler/compiler/mutability/function_input.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EASG0373028]: failed to resolve variable reference 'a'\n    --> compiler-test:5:5\n     |\n   5 |     a = false;\n     |     ^"
+  - "Error [EASG0373028]: failed to resolve variable reference 'a'\n    --> compiler-test:9:5\n     |\n   9 |     a = false;\n     |     ^"
diff --git a/tests/expectations/compiler/compiler/mutability/function_input_mut.leo.out b/tests/expectations/compiler/compiler/mutability/function_input_mut.leo.out
index c397be906c..02fa011232 100644
--- a/tests/expectations/compiler/compiler/mutability/function_input_mut.leo.out
+++ b/tests/expectations/compiler/compiler/mutability/function_input_mut.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 198667d742dfeb7ff2e5a4aff4effeb9290682574faa7c4aa16ea9ea1f63975a
-    canonicalized_ast: 198667d742dfeb7ff2e5a4aff4effeb9290682574faa7c4aa16ea9ea1f63975a
-    type_inferenced_ast: 27b6e28e2f604e34e860b2c380efeed816b5c5009acc4072deb006d3efcd005f
+    initial_ast: 8f3c9b88691670567db8530f3ac2b5f2876ec4f441035574e0fe2bf3873f7f9d
+    canonicalized_ast: 8f3c9b88691670567db8530f3ac2b5f2876ec4f441035574e0fe2bf3873f7f9d
+    type_inferenced_ast: e4d0eac4223773cae4a751ca5cf2f8be0173000ec87535960a90a2e3163c8ce6
diff --git a/tests/expectations/compiler/compiler/mutability/let_fail.leo.out b/tests/expectations/compiler/compiler/mutability/let_fail.leo.out
index c6ba953ccb..f4fa3518f8 100644
--- a/tests/expectations/compiler/compiler/mutability/let_fail.leo.out
+++ b/tests/expectations/compiler/compiler/mutability/let_fail.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EASG0373033]: illegal assignment to immutable variable 'a'\n    --> compiler-test:6:5\n     |\n   6 |     a = 0;\n     |     ^^^^^"
+  - "Error [EASG0373033]: illegal assignment to immutable variable 'a'\n    --> compiler-test:9:5\n     |\n   9 |     a = 0;\n     |     ^^^^^"
diff --git a/tests/expectations/compiler/compiler/mutability/let_mut.leo.out b/tests/expectations/compiler/compiler/mutability/let_mut.leo.out
index 8861d55252..e31e0c041d 100644
--- a/tests/expectations/compiler/compiler/mutability/let_mut.leo.out
+++ b/tests/expectations/compiler/compiler/mutability/let_mut.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: fe19b0b255803d40b89cc69970126c016c9978a529472be4bfdb71af6bf74128
-    canonicalized_ast: fe19b0b255803d40b89cc69970126c016c9978a529472be4bfdb71af6bf74128
-    type_inferenced_ast: fc8cc3c7fbad2d163ad8f78a4c4deeebbc062df3b26a4388fd8550ad51ac0ece
+    initial_ast: f85352d4fd98376fa2b52d471611948075793428bfac5a613007b7f8dcf5713b
+    canonicalized_ast: f85352d4fd98376fa2b52d471611948075793428bfac5a613007b7f8dcf5713b
+    type_inferenced_ast: 2e28c3ef81d14f432e8ed4a764ce3360c227e151808d5d62afc8b481f89d3d58
diff --git a/tests/expectations/compiler/compiler/mutability/let_mut_nested.leo.out b/tests/expectations/compiler/compiler/mutability/let_mut_nested.leo.out
index 7d3f3d7992..749df3b26f 100644
--- a/tests/expectations/compiler/compiler/mutability/let_mut_nested.leo.out
+++ b/tests/expectations/compiler/compiler/mutability/let_mut_nested.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 372f591679b8d314412a010f32be0082aa999c7016e761499da8317c12b13750
-    canonicalized_ast: 372f591679b8d314412a010f32be0082aa999c7016e761499da8317c12b13750
-    type_inferenced_ast: 8409be43d93bebe4ba303fc14b55ef95f987f8723051ddc963febebaeeb75e79
+    initial_ast: f94f635434efaba42c11f21d9b886e5747855feef8d5eeb89e0b97570cccfe33
+    canonicalized_ast: f94f635434efaba42c11f21d9b886e5747855feef8d5eeb89e0b97570cccfe33
+    type_inferenced_ast: da57055228fd99d4b9f9b4a86b89427232c8b387597bf4453b7aad0ebd8d1151
diff --git a/tests/expectations/compiler/compiler/mutability/swap.leo.out b/tests/expectations/compiler/compiler/mutability/swap.leo.out
index 289ab26c8a..a83ee93b59 100644
--- a/tests/expectations/compiler/compiler/mutability/swap.leo.out
+++ b/tests/expectations/compiler/compiler/mutability/swap.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "false"
-    initial_ast: d242fc681e75003adf2e36aecbca50f8c338f8b40b4cf53342857cc672c753a2
-    canonicalized_ast: d242fc681e75003adf2e36aecbca50f8c338f8b40b4cf53342857cc672c753a2
-    type_inferenced_ast: 21e2566f3ed62dc1bd39cb3b9a7b37bb84c5a621bbb5ee77c4af08412e321e94
+    initial_ast: 10a4bc7b038b320a1da169255e46fc420323802f3d4812e3118427a723eedfa3
+    canonicalized_ast: 10a4bc7b038b320a1da169255e46fc420323802f3d4812e3118427a723eedfa3
+    type_inferenced_ast: 05c7c8be943f2dc6a93c6172291d9c4697fa4e50c07849ce169c9b1931f7744a
diff --git a/tests/expectations/compiler/compiler/statements/all_loops.leo.out b/tests/expectations/compiler/compiler/statements/all_loops.leo.out
index b2a11d740c..cfd949f762 100644
--- a/tests/expectations/compiler/compiler/statements/all_loops.leo.out
+++ b/tests/expectations/compiler/compiler/statements/all_loops.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 16484d1177234086a3e8a1c32d2b82e0f1b8d3d93a659aba714d6cd5479bbe8b
-    canonicalized_ast: da9bcca9fe3e363b62bec3be7f446dd416f72a18aeb91e83c30d2314d67b1881
-    type_inferenced_ast: 6d31a33082f9dd2e9a54dcbb90bca315ac328cd93d7979d48b696ba39f6e6f38
+    initial_ast: a0fa924a26518984b6762df31bd45881812d04cbbc75f482c0e04b2d25b6124d
+    canonicalized_ast: 25f475193ec574bb9b034cc0daefcb05136714da077b309c5b4eeee848cdc6d8
+    type_inferenced_ast: 04c7217c6055ff857e8c549e66051c7ac4799c3269a2aa28422c9be431ad0618
diff --git a/tests/expectations/compiler/compiler/statements/assign_ternary.leo.out b/tests/expectations/compiler/compiler/statements/assign_ternary.leo.out
index 9a641be8e0..8d479b561b 100644
--- a/tests/expectations/compiler/compiler/statements/assign_ternary.leo.out
+++ b/tests/expectations/compiler/compiler/statements/assign_ternary.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EASG0373026]: unexpected type, expected: 'u32', received: 'bool'\n    --> compiler-test:4:23\n     |\n   4 |     let x = true ? x: true;\n     |                       ^^^^"
+  - "Error [EASG0373026]: unexpected type, expected: 'u32', received: 'bool'\n    --> compiler-test:8:23\n     |\n   8 |     let x = true ? x: true;\n     |                       ^^^^"
diff --git a/tests/expectations/compiler/compiler/statements/block.leo.out b/tests/expectations/compiler/compiler/statements/block.leo.out
index 3d0900fcc5..1465009e1a 100644
--- a/tests/expectations/compiler/compiler/statements/block.leo.out
+++ b/tests/expectations/compiler/compiler/statements/block.leo.out
@@ -16,6 +16,6 @@ outputs:
             a:
               type: bool
               value: "true"
-    initial_ast: 0126e151faacae24bc508e67a5c8d1d78024fed8da226238ad6436851e5b025e
-    canonicalized_ast: 34e85a0c78e50ee4718fa07458bbdb433399f71833479af414cdb7e7f6b482c2
-    type_inferenced_ast: f92fcf546c8559c31db54cf6b19b17f955e568132a12280f7c3804f57fb339d4
+    initial_ast: 44940bf77a362f0c3cbf3bb305c2581e1b4d57b7b8569fdb7ba900ab86d32d68
+    canonicalized_ast: 46dd4637b71b07ce7d7d72bdeb54159a937c782cff4fe1170755f03bf8169493
+    type_inferenced_ast: fc47d07053a24d8b11204b0a99f73eb55f248b59d0c96e1cf42334c23faa602a
diff --git a/tests/expectations/compiler/compiler/statements/chain.leo.out b/tests/expectations/compiler/compiler/statements/chain.leo.out
index a16e4872ea..2bb19cfe3a 100644
--- a/tests/expectations/compiler/compiler/statements/chain.leo.out
+++ b/tests/expectations/compiler/compiler/statements/chain.leo.out
@@ -28,6 +28,6 @@ outputs:
             a:
               type: bool
               value: "false"
-    initial_ast: 07fb0d55368685050d065a7b7cc7e19e7fa119754bbf10a4aab46580ae74c51a
-    canonicalized_ast: 07fb0d55368685050d065a7b7cc7e19e7fa119754bbf10a4aab46580ae74c51a
-    type_inferenced_ast: eaa4797908d50053ba52f7ead813fe071aeacf4a24d1b57ed77188f58c3f5348
+    initial_ast: b2c730c5cbd6c861b3734d0c56f810d358380dcb16494e3f5b015daed1cd0854
+    canonicalized_ast: b2c730c5cbd6c861b3734d0c56f810d358380dcb16494e3f5b015daed1cd0854
+    type_inferenced_ast: 899e93afaa531ceb06e6da2d9f2417996147505e6d32dbe3dad8fd621478e6a3
diff --git a/tests/expectations/compiler/compiler/statements/compound_assignment.leo.out b/tests/expectations/compiler/compiler/statements/compound_assignment.leo.out
index 5d973b2ebf..13bc2ab6ef 100644
--- a/tests/expectations/compiler/compiler/statements/compound_assignment.leo.out
+++ b/tests/expectations/compiler/compiler/statements/compound_assignment.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 39a18b43d3d5a65507b9a4bc6558efe27509fa16006de6a98a47c67b6085667c
-    canonicalized_ast: 25c0175f87357fe5a14e48159c69eb636bfd6836706203d0a30dfbd0ccf9fff3
-    type_inferenced_ast: ef74c4307c4124ce11ed81e98e0cc555a306c94505d7e40025e66655dac155a8
+    initial_ast: d60dba81c3681fbf8ccfcf465ba9922558a0eaa19ee21f39d64c124b60f30a0f
+    canonicalized_ast: 6ae47ae39cd699ee278e43d4dbbb64796d273f4543fed02955c200c7bf309db1
+    type_inferenced_ast: 32d7265f9204114e0209159ea879f677882cee5e44d0128406a14335c1bd0bf1
diff --git a/tests/expectations/compiler/compiler/statements/duplicate_variable.leo.out b/tests/expectations/compiler/compiler/statements/duplicate_variable.leo.out
index 349d819abb..2f7a859e2a 100644
--- a/tests/expectations/compiler/compiler/statements/duplicate_variable.leo.out
+++ b/tests/expectations/compiler/compiler/statements/duplicate_variable.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EASG0373017]: a variable named \"x\" already exists in this scope\n    --> compiler-test:5:3\n     |\n   5 |   let x = true;\n     |   ^^^^^^^^^^^^"
+  - "Error [EASG0373017]: a variable named \"x\" already exists in this scope\n    --> compiler-test:9:3\n     |\n   9 |   let x = true;\n     |   ^^^^^^^^^^^^"
diff --git a/tests/expectations/compiler/compiler/statements/for_loop.leo.out b/tests/expectations/compiler/compiler/statements/for_loop.leo.out
index 55dd2ce7ba..364ddc89f6 100644
--- a/tests/expectations/compiler/compiler/statements/for_loop.leo.out
+++ b/tests/expectations/compiler/compiler/statements/for_loop.leo.out
@@ -16,6 +16,6 @@ outputs:
             a:
               type: bool
               value: "true"
-    initial_ast: 15072d280d783640c9810be541201c6f71708687ffe7242503ec03012cf9ab67
-    canonicalized_ast: 26d817bfd0168ac3aa31b7f197cf8f9273ca4c94b25b9df5a7112c228047cc7b
-    type_inferenced_ast: 1f5484f5993b7993ac6f10aaef884fbf502ae0efeabf5c9044c38bc7a4dc3011
+    initial_ast: 57afde975b9ce4eb106e433c02325ac3f46096b50efa54ada5385c0dec2f60a2
+    canonicalized_ast: dcc8630c810912ef04e9ef77891f891a6d9cbbcc543fed9f095b2e7130df114a
+    type_inferenced_ast: a49da5b8877c0253cbb774845df799efa8146551f2aaaac4159e2a7d019172df
diff --git a/tests/expectations/compiler/compiler/statements/iteration_basic.leo.out b/tests/expectations/compiler/compiler/statements/iteration_basic.leo.out
index 8958ce64ff..a249d3e561 100644
--- a/tests/expectations/compiler/compiler/statements/iteration_basic.leo.out
+++ b/tests/expectations/compiler/compiler/statements/iteration_basic.leo.out
@@ -16,6 +16,6 @@ outputs:
             a:
               type: bool
               value: "true"
-    initial_ast: 7352861b3e7107ec349b2fd905e95fd78bdc79829ecec90eafa2c3bfa36e0716
-    canonicalized_ast: bcb00069768d5ce3902d0ee802aa8b1f23132619ca627b5aadc01200565870c1
-    type_inferenced_ast: 35cc981849af0cb83ed968b6dd466efbf7c7733cf9fed2e9a0880e2771640ce1
+    initial_ast: 8f3ccc5d7ae06113d94a42ab5d6d3eb644162122b4cf8fb938170624b72d496d
+    canonicalized_ast: e1b773489cc7696ef107dade6564cf3d23b86fec3abcd96e6e86a0fa0da4d56a
+    type_inferenced_ast: d795073df2516f017289b54aab058588d299b15ec131f45cc0f6d64705d07010
diff --git a/tests/expectations/compiler/compiler/statements/iteration_variable.leo.out b/tests/expectations/compiler/compiler/statements/iteration_variable.leo.out
index 811d97f278..684fbb9ad8 100644
--- a/tests/expectations/compiler/compiler/statements/iteration_variable.leo.out
+++ b/tests/expectations/compiler/compiler/statements/iteration_variable.leo.out
@@ -16,6 +16,6 @@ outputs:
             a:
               type: bool
               value: "true"
-    initial_ast: 4c020866d910371924bfa7f24761e022b658ac7f38ff6348fc837fb026b43b22
-    canonicalized_ast: dfc10c9e46558ebf7654a49fb87a61bae5fa3d5f8384b4e144761518a762f0d1
-    type_inferenced_ast: 3aef844b36c18ec04f9f6cacf679182b752a720ac038b71569791e7e12e5eca5
+    initial_ast: 25d3c3d751cf3b4b03b4a592a2c43aea4a1d9154ba6db0e7f052acb27be6a78a
+    canonicalized_ast: 77f6b67e260a2ccb58838086d87975390d223b87da31b0cf4caf870a951c6e8c
+    type_inferenced_ast: 6dcdea7ab3ab530e69da1ed678e814844986b73f5e0ca341feee395a3e45f574
diff --git a/tests/expectations/compiler/compiler/statements/multiple_returns.leo.out b/tests/expectations/compiler/compiler/statements/multiple_returns.leo.out
index 8ed2ee0809..b45f17258c 100644
--- a/tests/expectations/compiler/compiler/statements/multiple_returns.leo.out
+++ b/tests/expectations/compiler/compiler/statements/multiple_returns.leo.out
@@ -22,6 +22,6 @@ outputs:
             a:
               type: bool
               value: "false"
-    initial_ast: 3e1bc14f1bc7e4b083bde21cfd0e833333142bfbcf247b60e77d0ffb8a159e98
-    canonicalized_ast: 3e1bc14f1bc7e4b083bde21cfd0e833333142bfbcf247b60e77d0ffb8a159e98
-    type_inferenced_ast: 927f1640868f0a50f30ac3a9604dc99f9ec5e7906884007cfea7a10333bb06d8
+    initial_ast: 5e5e31108319e6e596cebad9d7c3b053140271d99f08a3a6c64446e5d65e3edd
+    canonicalized_ast: 5e5e31108319e6e596cebad9d7c3b053140271d99f08a3a6c64446e5d65e3edd
+    type_inferenced_ast: 653aca65a3422d04fef8e42bc648a7f4fb8b822b5fd97f04be1d3651be585685
diff --git a/tests/expectations/compiler/compiler/statements/mutate.leo.out b/tests/expectations/compiler/compiler/statements/mutate.leo.out
index 030ff12ccd..ce7dafad1f 100644
--- a/tests/expectations/compiler/compiler/statements/mutate.leo.out
+++ b/tests/expectations/compiler/compiler/statements/mutate.leo.out
@@ -22,6 +22,6 @@ outputs:
             a:
               type: bool
               value: "true"
-    initial_ast: 2ac096dbb8840a8a71cb14365272088509094ffae32f1bcd44618a5fa9abc35e
-    canonicalized_ast: 2ac096dbb8840a8a71cb14365272088509094ffae32f1bcd44618a5fa9abc35e
-    type_inferenced_ast: cb7037b631e1a9994a7dc347bf834804acd1e28e5f4ace536aef36ae41695e20
+    initial_ast: 103f35b4dcc1752141e68be65fd4b1e6596a377b7eff89d16e0f572a30078d08
+    canonicalized_ast: 103f35b4dcc1752141e68be65fd4b1e6596a377b7eff89d16e0f572a30078d08
+    type_inferenced_ast: 4e00ef9253b0c74d8ee8daacd7627f89c662010fcbf9039c2df43689e83118e5
diff --git a/tests/expectations/compiler/compiler/statements/nested_mutate.leo.out b/tests/expectations/compiler/compiler/statements/nested_mutate.leo.out
index ebb4ab1cce..677501526d 100644
--- a/tests/expectations/compiler/compiler/statements/nested_mutate.leo.out
+++ b/tests/expectations/compiler/compiler/statements/nested_mutate.leo.out
@@ -28,6 +28,6 @@ outputs:
             a:
               type: bool
               value: "false"
-    initial_ast: 45eb01ab83d086d7e6a07c03e47b01d6e0d07f668e3b76138283a64b1e0c5760
-    canonicalized_ast: 6c426c224bd59f40be37e044750db2de10527168924a85aae9c90bb6d8fd7c5f
-    type_inferenced_ast: 7510f5f6eba668e63befb0b9f4119e28382caac699d0da21587a62fe4746b6c9
+    initial_ast: 97b0e1dd83c1c9ae4067c43e38728377d791e9917d63060a76e7b5003b472600
+    canonicalized_ast: 220c9e2d0645e19bcf71a3e50ebdb7dae632410c6064cb1bb4ffca5e18801fc2
+    type_inferenced_ast: 8bb73bff50ec5a6389d2d54b68ed6b0aa732bb1980c0bda6fb357fec3f74f8e9
diff --git a/tests/expectations/compiler/compiler/statements/reverse_loops.leo.out b/tests/expectations/compiler/compiler/statements/reverse_loops.leo.out
index fe35d557f9..2356380c83 100644
--- a/tests/expectations/compiler/compiler/statements/reverse_loops.leo.out
+++ b/tests/expectations/compiler/compiler/statements/reverse_loops.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 6bbf937830bb2dfbd2f308f47ca8ff50a405aed0cec27aca4de4f83ed1ee8186
-    canonicalized_ast: 0ba1c0416d295b92a9747cbf7f9d263c9b45b269bce23a0ab4afd932219b7950
-    type_inferenced_ast: f00d268715b94de26102bc7d54b7238fec08fc7c4a01a713e1162b9d52e097e3
+    initial_ast: d10f5e1839a7600a09d774017644aa09c9af9c7ac84fe27b730b22a17e4a8649
+    canonicalized_ast: c7afa275f203a3e997622c23166536eab769c580cfe1102999a1db8d1078fe9c
+    type_inferenced_ast: 5930c103bf1e97a2bb74d1e10eccf8ae06a7d7961e28c8ddcfc7e07cf03fd0c3
diff --git a/tests/expectations/compiler/compiler/statements/reverse_one.leo.out b/tests/expectations/compiler/compiler/statements/reverse_one.leo.out
index 7517a30218..adeb703c7b 100644
--- a/tests/expectations/compiler/compiler/statements/reverse_one.leo.out
+++ b/tests/expectations/compiler/compiler/statements/reverse_one.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: fef6eef9955869631e3cc48ce5127e519a8f3483a440d243e12ff241f0f24b67
-    canonicalized_ast: 88939f0afb3e09a85f48ae2022c97128a260bd4eee667dc26e32f48d8b3253e5
-    type_inferenced_ast: c10090137663610771d6e8144806b5899f23a881dd810432559848bf3e48bc82
+    initial_ast: 8b0815aa5e4cecbd72b1ddffec5fbf00e4a10bf42a72926200e80d0e5a41830c
+    canonicalized_ast: a83bbfe7df2292696b1be9e4d7463abd396b9f8b74adcf2a53c8dda2ddc482de
+    type_inferenced_ast: 52d7288789e7424e15a650d7b058711a553aee9cb278271330741afea92951a3
diff --git a/tests/expectations/compiler/compiler/statements/ternary_explicit_and_implicit.leo.out b/tests/expectations/compiler/compiler/statements/ternary_explicit_and_implicit.leo.out
index 2486b2233d..e7a65b065d 100644
--- a/tests/expectations/compiler/compiler/statements/ternary_explicit_and_implicit.leo.out
+++ b/tests/expectations/compiler/compiler/statements/ternary_explicit_and_implicit.leo.out
@@ -16,6 +16,6 @@ outputs:
             a:
               type: u8
               value: "3"
-    initial_ast: 29b5d6188c9fe56eaee3024a900b92e4bd9445364551b85e924fe9a392bac35d
-    canonicalized_ast: 29b5d6188c9fe56eaee3024a900b92e4bd9445364551b85e924fe9a392bac35d
-    type_inferenced_ast: 02edde30e615a1ac3e87818daa6fca7e4d7c0c0c0a1a9d9159a0a4190c11ec8a
+    initial_ast: d44bd631cdf5dd12bc9aefcbfc3912b71287ada1010b45b6b736b5804d50297e
+    canonicalized_ast: d44bd631cdf5dd12bc9aefcbfc3912b71287ada1010b45b6b736b5804d50297e
+    type_inferenced_ast: 7b34620c828fcca253bb32b6b7b994ccacf27a85f83f05b4f824258b6293c86f
diff --git a/tests/expectations/compiler/compiler/statements/ternary_non_const_fail.leo.out b/tests/expectations/compiler/compiler/statements/ternary_non_const_fail.leo.out
index 0deb81474b..669cad4738 100644
--- a/tests/expectations/compiler/compiler/statements/ternary_non_const_fail.leo.out
+++ b/tests/expectations/compiler/compiler/statements/ternary_non_const_fail.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EASG0373015]: failed to create const variable(s) 'y' with non constant values.\n    --> compiler-test:5:5\n     |\n   5 |     const y = x > 2u8? 1u8 : 2u8;\n     |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^"
+  - "Error [EASG0373015]: failed to create const variable(s) 'y' with non constant values.\n    --> compiler-test:8:5\n     |\n   8 |     const y = x > 2u8? 1u8 : 2u8;\n     |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^"
diff --git a/tests/expectations/compiler/compiler/string/circuit.leo.out b/tests/expectations/compiler/compiler/string/circuit.leo.out
index b047ba8a7f..8b64b93f9a 100644
--- a/tests/expectations/compiler/compiler/string/circuit.leo.out
+++ b/tests/expectations/compiler/compiler/string/circuit.leo.out
@@ -16,6 +16,6 @@ outputs:
             out:
               type: "[char; 13]"
               value: "\"Hello, World!\""
-    initial_ast: 70c3f622477262389299233a81c02174f0af3c99eb9aea42c2be73f191f44673
-    canonicalized_ast: e8a3e9c427681a58127b088b0053cbc2f80c859a7081636fceb59dd0cc6cfee7
-    type_inferenced_ast: db96adeedf84f21908b53bd7db4c4941396afc5fe592012109069186fa066b1a
+    initial_ast: 1f57ea6bb8ae6a18913979b5900af81ca2a6da64636453ce4a66e51e844d396e
+    canonicalized_ast: 281c6b54ba1f56659cd21e520f04684492432a78cd53e97639dccdda91dc90bb
+    type_inferenced_ast: e00a1d527e279c2724e7cb16553f8d981188cbad8c32ff303d5bba1632b4ca14
diff --git a/tests/expectations/compiler/compiler/string/equality.leo.out b/tests/expectations/compiler/compiler/string/equality.leo.out
index 75e85e5ed4..fbf89563ca 100644
--- a/tests/expectations/compiler/compiler/string/equality.leo.out
+++ b/tests/expectations/compiler/compiler/string/equality.leo.out
@@ -22,6 +22,6 @@ outputs:
             out:
               type: bool
               value: "false"
-    initial_ast: cb656e2f6fdbf4250957c867db059168afb7240fb085f8a850a0f0d7857a80e9
-    canonicalized_ast: 7b67543fdb551982c7da1eb3f89ef5c68a4c85de9c6e01259df61532c763e236
-    type_inferenced_ast: 4b4fe877cfe562d1c86b0936025390241a26cf21956d2a00cab1c04e0c5ea73b
+    initial_ast: 3bb2af7150961cdd9b582ea550c74aa80e13f77a038e84fa34d5e6e73a612cdb
+    canonicalized_ast: 07e04a9120c2830e540649fda67df8f2fb928c0533530f64085283c1e7c2c1ef
+    type_inferenced_ast: 48e2a0a34c9627c1298701fdeec61219b7934b43b66c8866fa7a002be8ae83f5
diff --git a/tests/expectations/compiler/compiler/string/replace.leo.out b/tests/expectations/compiler/compiler/string/replace.leo.out
index 34c380ca0e..80ce05c4f7 100644
--- a/tests/expectations/compiler/compiler/string/replace.leo.out
+++ b/tests/expectations/compiler/compiler/string/replace.leo.out
@@ -22,6 +22,6 @@ outputs:
             out:
               type: bool
               value: "true"
-    initial_ast: c0e04242e6a567cdfb4df87912d8c7ab31a19883c3cf0d953b29a767304adba9
-    canonicalized_ast: 98bfa17b9e22ad3a06ff41acd60be67b8f34597d89d38abb3b122b22a38f52d8
-    type_inferenced_ast: 6598fc525d9b2fed0db8c741ce90820196d1514d6cc739b957f4f133c46592f4
+    initial_ast: 58c845ad71a1499b3bb74ca40c2c5f35e1b6323b7afb3e8c6d3acf2e2ef8c2bb
+    canonicalized_ast: 10729c21113dbc9dd52544fb85f341208252dabd656dcaac3b9843fdbe866da0
+    type_inferenced_ast: 662a849d7b92e849c634805ef0b9fe33491cdaeae033420d89d84ce3fdee5d07
diff --git a/tests/expectations/compiler/compiler/string/string_transformation.leo.out b/tests/expectations/compiler/compiler/string/string_transformation.leo.out
index e504e3b6bb..13393d26ef 100644
--- a/tests/expectations/compiler/compiler/string/string_transformation.leo.out
+++ b/tests/expectations/compiler/compiler/string/string_transformation.leo.out
@@ -16,6 +16,6 @@ outputs:
             out:
               type: bool
               value: "true"
-    initial_ast: 09f60770cc5c2d3765eaaaff677e6b0241693db4fb2355859a8787fc837e3b6d
-    canonicalized_ast: 38b83b23c154e103c0a8564a1845ff75bf270519a87a2d36db659ba616adea38
-    type_inferenced_ast: 8090cc48aa49d2a70270c3d2aa8614830a73be2369a1ad91fe57d83aeb7afbb8
+    initial_ast: 1440f9d0d01cd97ecb528e2a33074ca33ce1eaf0e5e15fd50fe47a385ebcae97
+    canonicalized_ast: 3613de50009e8019f3af0806fa9a8abc9494020072044d91ea370e249975a4e8
+    type_inferenced_ast: 3ec48ab3d00ec19815cec361a9fcf7fd3aa6f091be2020886c5136e2ca31d7f2
diff --git a/tests/expectations/compiler/compiler/tuples/access.leo.out b/tests/expectations/compiler/compiler/tuples/access.leo.out
index a8a592cf15..275d38009d 100644
--- a/tests/expectations/compiler/compiler/tuples/access.leo.out
+++ b/tests/expectations/compiler/compiler/tuples/access.leo.out
@@ -19,6 +19,6 @@ outputs:
             c:
               type: bool
               value: "false"
-    initial_ast: 26ccb648c843da2de819fa0451bb2aff8e187d2cda920aaccf43e1d2d7f0e95b
-    canonicalized_ast: 26ccb648c843da2de819fa0451bb2aff8e187d2cda920aaccf43e1d2d7f0e95b
-    type_inferenced_ast: 7bba16bcec82e82bce1892a9401b2a7c7529f20d25a32c77d727251e2844869d
+    initial_ast: 8626965e39619cb1dcf7bf90edb34fe30201142cd5c6b93cdaaba81047e602df
+    canonicalized_ast: 8626965e39619cb1dcf7bf90edb34fe30201142cd5c6b93cdaaba81047e602df
+    type_inferenced_ast: 7728a3775f9dfb08aef6f2659d1e0baee3e0485e96d0b5e09feba5921190038a
diff --git a/tests/expectations/compiler/compiler/tuples/basic.leo.out b/tests/expectations/compiler/compiler/tuples/basic.leo.out
index e0bad6c1f6..29c9d8474b 100644
--- a/tests/expectations/compiler/compiler/tuples/basic.leo.out
+++ b/tests/expectations/compiler/compiler/tuples/basic.leo.out
@@ -19,6 +19,6 @@ outputs:
             c:
               type: bool
               value: "false"
-    initial_ast: b8ecc455d0eb34031adea3dd2f74dc4eaeecd0a47fb3143db786c672015383ca
-    canonicalized_ast: b8ecc455d0eb34031adea3dd2f74dc4eaeecd0a47fb3143db786c672015383ca
-    type_inferenced_ast: 77ece65393296b71964354ac6915049d5f40d5a22288c3c47bb3889e17cca692
+    initial_ast: b838b89e019912999db43db49e27188b96cc47548ac64381bd76bba55bf3407e
+    canonicalized_ast: b838b89e019912999db43db49e27188b96cc47548ac64381bd76bba55bf3407e
+    type_inferenced_ast: 2cb91f24c5f407616d3f7245f7e251d25dbbf95433a9310c561a6fc998ccdde1
diff --git a/tests/expectations/compiler/compiler/tuples/dependent.leo.out b/tests/expectations/compiler/compiler/tuples/dependent.leo.out
index 2663bf4676..7f99a47aba 100644
--- a/tests/expectations/compiler/compiler/tuples/dependent.leo.out
+++ b/tests/expectations/compiler/compiler/tuples/dependent.leo.out
@@ -19,6 +19,6 @@ outputs:
             c:
               type: bool
               value: "false"
-    initial_ast: a2a6a6b41de694d8203c33d3f90fc2c1526b604fb57ee4883b993e446b81e648
-    canonicalized_ast: a2a6a6b41de694d8203c33d3f90fc2c1526b604fb57ee4883b993e446b81e648
-    type_inferenced_ast: 2a1ef0e8fa141193320610df76dc78e6fb3db99f9db8f4ffa8221a90f90f7f40
+    initial_ast: dc6d6115bf557ea6c2c4c110ac52f9f644854bfd1fe095283c60dcaca8340528
+    canonicalized_ast: dc6d6115bf557ea6c2c4c110ac52f9f644854bfd1fe095283c60dcaca8340528
+    type_inferenced_ast: 3596cbdfe6e3015c427123a29e637bf21c5868585b20d989d923238b76d8b296
diff --git a/tests/expectations/compiler/compiler/tuples/destructured.leo.out b/tests/expectations/compiler/compiler/tuples/destructured.leo.out
index 1363798751..ded18a73b6 100644
--- a/tests/expectations/compiler/compiler/tuples/destructured.leo.out
+++ b/tests/expectations/compiler/compiler/tuples/destructured.leo.out
@@ -19,6 +19,6 @@ outputs:
             c:
               type: bool
               value: "true"
-    initial_ast: 98996bc72276bc5cbf211e7559997e8e73a85fce60afd49aa88aee17d1634973
-    canonicalized_ast: 98996bc72276bc5cbf211e7559997e8e73a85fce60afd49aa88aee17d1634973
-    type_inferenced_ast: 664df8d84cc5ff6bcd4300df23227871ec938459b991d86384fdd1f15b3a89ca
+    initial_ast: 7c44c2a6e0bc0447277ca4cb6a7749acdb837d2ed97cdc87d72feb5cef532154
+    canonicalized_ast: 7c44c2a6e0bc0447277ca4cb6a7749acdb837d2ed97cdc87d72feb5cef532154
+    type_inferenced_ast: c248a808974790ee2bce3356773e486a04226cd86d63a12abbdc66feec7949e9
diff --git a/tests/expectations/compiler/compiler/tuples/nested_access.leo.out b/tests/expectations/compiler/compiler/tuples/nested_access.leo.out
index c4af57aaf4..e1c6f1ba10 100644
--- a/tests/expectations/compiler/compiler/tuples/nested_access.leo.out
+++ b/tests/expectations/compiler/compiler/tuples/nested_access.leo.out
@@ -19,6 +19,6 @@ outputs:
             c:
               type: bool
               value: "false"
-    initial_ast: ef3718fc909a28703e2487661aafb3fc24a858428d79d2ab7bb3743a162ed6a1
-    canonicalized_ast: ef3718fc909a28703e2487661aafb3fc24a858428d79d2ab7bb3743a162ed6a1
-    type_inferenced_ast: 14e0a6cf8847f1a292a5b22db1173b6c5181e5d49d8f6046d072620a0e94ff07
+    initial_ast: 181dc320fb2e7e4740a4a7d5333c31ecc031cc55bef8729567f175783ea23e3d
+    canonicalized_ast: 181dc320fb2e7e4740a4a7d5333c31ecc031cc55bef8729567f175783ea23e3d
+    type_inferenced_ast: dcd75da756a94d9819f6849e2efabacd05f4eb3c62981a0160c35e3a9a1c6508