From 8711bb9c44a54c59f4b9b1b39e6c8d1f7893d6c9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 27 Aug 2021 10:19:43 +0000
Subject: [PATCH 01/23] Bump serde_yaml from 0.8.19 to 0.8.20

Bumps [serde_yaml](https://github.com/dtolnay/serde-yaml) from 0.8.19 to 0.8.20.
- [Release notes](https://github.com/dtolnay/serde-yaml/releases)
- [Commits](https://github.com/dtolnay/serde-yaml/compare/0.8.19...0.8.20)

---
updated-dependencies:
- dependency-name: serde_yaml
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 701dc9d718..870b1f4194 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2414,9 +2414,9 @@ dependencies = [
 
 [[package]]
 name = "serde_yaml"
-version = "0.8.19"
+version = "0.8.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6375dbd828ed6964c3748e4ef6d18e7a175d408ffe184bca01698d0c73f915a9"
+checksum = "ad104641f3c958dab30eb3010e834c2622d1f3f4c530fef1dee20ad9485f3c09"
 dependencies = [
  "dtoa",
  "indexmap",

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 02/23] 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

From cedf2004ba247ee1cdd34b38ee492d26928c1055 Mon Sep 17 00:00:00 2001
From: gluaxspeed <jonathan.t.pavlik@gmail.com>
Date: Fri, 27 Aug 2021 07:29:40 -0700
Subject: [PATCH 03/23] reduce code bloat

---
 compiler/src/test.rs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/compiler/src/test.rs b/compiler/src/test.rs
index 2763442dbf..0dd0e8437b 100644
--- a/compiler/src/test.rs
+++ b/compiler/src/test.rs
@@ -57,9 +57,9 @@ fn new_compiler(path: PathBuf, theorem_options: Option<AstSnapshotOptions>) -> E
     )
 }
 
-fn hash_file(path: &std::path::Path) -> String {
+fn hash_file(path: &str) -> String {
     use sha2::{Digest, Sha256};
-    let mut file = std::fs::File::open(&path).unwrap();
+    let mut file = std::fs::File::open(&Path::new(path)).unwrap();
     let mut hasher = Sha256::new();
     std::io::copy(&mut file, &mut hasher).unwrap();
     let hash = hasher.finalize();
@@ -211,9 +211,9 @@ impl Namespace for CompileNamespace {
             });
         }
 
-        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"));
+        let initial_ast: String = hash_file("/tmp/output/initial_ast.json");
+        let canonicalized_ast: String = hash_file("/tmp/output/canonicalization_ast.json");
+        let type_inferenced_ast = hash_file("/tmp/output/type_inferenced_ast.json");
 
         /* 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.");

From 538dfe2709ab575583e02b40ad19b723735b06b4 Mon Sep 17 00:00:00 2001
From: gluaxspeed <jonathan.t.pavlik@gmail.com>
Date: Fri, 27 Aug 2021 07:30:37 -0700
Subject: [PATCH 04/23] re-enable compiler test cleanup

---
 compiler/src/test.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/compiler/src/test.rs b/compiler/src/test.rs
index 0dd0e8437b..583624b851 100644
--- a/compiler/src/test.rs
+++ b/compiler/src/test.rs
@@ -215,9 +215,9 @@ impl Namespace for CompileNamespace {
         let canonicalized_ast: String = hash_file("/tmp/output/canonicalization_ast.json");
         let type_inferenced_ast = hash_file("/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(),

From 6a44e51da9404b5f88d8b1c0851ca9c2c28e41bf Mon Sep 17 00:00:00 2001
From: gluaxspeed <jonathan.t.pavlik@gmail.com>
Date: Fri, 27 Aug 2021 07:57:25 -0700
Subject: [PATCH 05/23] revert runner change, just make tgc remove the header
 lines as well

---
 compiler/src/test.rs                              | 15 ++++++++-------
 test-framework/src/bin/tgc.rs                     |  2 ++
 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 +-
 .../compiler/array/array_size_zero_fail.leo.out   |  2 +-
 .../compiler/array/complex_access.leo.out         |  6 +++---
 .../compiler/array/equal_initializer.leo.out      |  6 +++---
 .../compiler/array/equal_initializer_2.leo.out    |  6 +++---
 .../compiler/array/input_nested_3x2.leo.out       |  6 +++---
 .../compiler/array/input_nested_3x2_fail.leo.out  |  2 +-
 .../compiler/array/input_tuple_3x2.leo.out        |  6 +++---
 .../compiler/array/multi_fail_initializer.leo.out |  2 +-
 .../compiler/array/multi_fail_inline.leo.out      |  2 +-
 .../compiler/array/multi_initializer.leo.out      |  6 +++---
 .../compiler/array/multi_initializer_fail.leo.out |  2 +-
 .../compiler/compiler/array/nested.leo.out        |  6 +++---
 .../compiler/array/nested_3x2_value.leo.out       |  6 +++---
 .../compiler/array/nested_3x2_value_fail.leo.out  |  2 +-
 .../compiler/compiler/array/registers.leo.out     |  6 +++---
 .../compiler/compiler/array/slice.leo.out         |  6 +++---
 .../compiler/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 +++---
 .../compiler/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 +++---
 .../array/type_nested_value_nested_3x2.leo.out    |  6 +++---
 .../type_nested_value_nested_3x2_fail.leo.out     |  2 +-
 .../array/type_nested_value_nested_4x3x2.leo.out  |  6 +++---
 .../type_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 +-
 .../array/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 +-
 .../array/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 +++---
 .../array/type_tuple_value_tuple_3x2_fail.leo.out |  2 +-
 .../array/type_tuple_value_tuple_4x3x2.leo.out    |  6 +++---
 .../type_tuple_value_tuple_4x3x2_fail.leo.out     |  2 +-
 .../compiler/array/variable_slice_fail.leo.out    |  2 +-
 .../compiler/compiler/boolean/and.leo.out         |  6 +++---
 .../compiler/compiler/boolean/conditional.leo.out |  6 +++---
 .../compiler/compiler/boolean/equal.leo.out       |  6 +++---
 .../compiler/compiler/boolean/not_equal.leo.out   |  6 +++---
 .../compiler/compiler/boolean/or.leo.out          |  6 +++---
 .../compiler/compiler/char/circuit.leo.out        |  6 +++---
 .../compiler/compiler/char/invalid_char.leo.out   |  2 +-
 .../compiler/compiler/char/neq.leo.out            |  6 +++---
 .../compiler/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 +-
 .../compiler/circuits/const_self_variable.leo.out |  6 +++---
 .../circuits/const_self_variable_fail.leo.out     |  2 +-
 ...define_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 +-
 .../compiler/circuits/inline_member_fail.leo.out  |  2 +-
 .../compiler/circuits/inline_member_pass.leo.out  |  6 +++---
 .../compiler/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 +++---
 .../circuits/member_variable_and_function.leo.out |  6 +++---
 .../circuits/member_variable_fail.leo.out         |  2 +-
 .../compiler/circuits/mut_function_fail.leo.out   |  2 +-
 .../circuits/mut_self_function_fail.leo.out       |  2 +-
 .../mut_self_static_function_fail.leo.out         |  2 +-
 .../compiler/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 +++---
 .../compiler/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/compiler/circuits/self_fail.leo.out  |  2 +-
 .../compiler/circuits/self_member.leo.out         |  6 +++---
 .../compiler/circuits/self_member_invalid.leo.out |  2 +-
 .../circuits/self_member_undefined.leo.out        |  2 +-
 .../compiler/compiler/console/assert.leo.out      |  6 +++---
 .../compiler/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/compiler/console/log_fail.leo.out    |  2 +-
 .../compiler/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 +-
 .../console/log_parameter_fail_unknown.leo.out    |  2 +-
 .../compiler/console/log_parameter_many.leo.out   |  6 +++---
 .../compiler/core/core_circuit_invalid.leo.out    |  2 +-
 .../compiler/definition/out_of_order.leo.out      |  6 +++---
 .../definition/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 +++---
 .../compiler/function/conditional_return.leo.out  |  6 +++---
 .../function/duplicate_definition_fail.leo.out    |  2 +-
 .../compiler/compiler/function/empty.leo.out      |  6 +++---
 .../compiler/compiler/function/iteration.leo.out  |  6 +++---
 .../compiler/function/iteration_repeated.leo.out  |  6 +++---
 .../compiler/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/compiler/function/newlines.leo.out   |  6 +++---
 .../compiler/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/compiler/function/scope_fail.leo.out |  2 +-
 .../compiler/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 +++---
 .../compiler/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 +++---
 .../program_input/const_input_non_const.leo.out   |  2 +-
 .../const_var_in_both_sections_fail.leo.out       |  2 +-
 .../input_files/program_input/main.leo.out        |  6 +++---
 .../input_files/program_input/main_array.leo.out  |  6 +++---
 .../program_input/main_array_fail.leo.out         |  2 +-
 .../input_files/program_input/main_char.leo.out   |  6 +++---
 .../input_files/program_input/main_field.leo.out  |  6 +++---
 .../input_files/program_input/main_group.leo.out  |  6 +++---
 .../main_multi_dimension_array.leo.out            |  6 +++---
 .../program_input/main_multiple.leo.out           |  6 +++---
 .../input_files/program_input/main_string.leo.out |  6 +++---
 .../input_files/program_input/main_tuple.leo.out  |  6 +++---
 .../program_input/main_tuple_fail.leo.out         |  2 +-
 .../program_input/non_const_input_const.leo.out   |  2 +-
 .../var_in_both_sections_fail.leo.out             |  2 +-
 .../program_input_and_program_state/basic.leo.out |  6 +++---
 .../token_withdraw.leo.out                        |  6 +++---
 .../program_input_constants/main.leo.out          |  6 +++---
 .../program_input_constants/main_array.leo.out    |  6 +++---
 .../main_array_fail.leo.out                       |  2 +-
 .../program_input_constants/main_char.leo.out     |  6 +++---
 .../program_input_constants/main_field.leo.out    |  6 +++---
 .../program_input_constants/main_group.leo.out    |  6 +++---
 .../main_multi_dimension_array.leo.out            |  6 +++---
 .../program_input_constants/main_multiple.leo.out |  6 +++---
 .../program_input_constants/main_string.leo.out   |  6 +++---
 .../program_input_constants/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 +++---
 .../input_files/program_state/access_all.leo.out  |  6 +++---
 .../program_state/access_state.leo.out            |  6 +++---
 .../input_files/program_state/basic.leo.out       |  6 +++---
 .../compiler/compiler/integers/i128/add.leo.out   |  6 +++---
 .../compiler/integers/i128/console_assert.leo.out |  6 +++---
 .../compiler/compiler/integers/i128/div.leo.out   |  6 +++---
 .../compiler/compiler/integers/i128/eq.leo.out    |  6 +++---
 .../compiler/compiler/integers/i128/ge.leo.out    |  6 +++---
 .../compiler/compiler/integers/i128/gt.leo.out    |  6 +++---
 .../compiler/compiler/integers/i128/le.leo.out    |  6 +++---
 .../compiler/compiler/integers/i128/lt.leo.out    |  6 +++---
 .../compiler/compiler/integers/i128/max.leo.out   |  6 +++---
 .../compiler/integers/i128/max_fail.leo.out       |  2 +-
 .../compiler/compiler/integers/i128/min.leo.out   |  6 +++---
 .../compiler/integers/i128/min_fail.leo.out       |  2 +-
 .../compiler/compiler/integers/i128/mul.leo.out   |  6 +++---
 .../compiler/compiler/integers/i128/ne.leo.out    |  6 +++---
 .../compiler/integers/i128/negate.leo.out         |  6 +++---
 .../compiler/integers/i128/negate_min.leo.out     |  6 +++---
 .../compiler/integers/i128/negate_zero.leo.out    |  6 +++---
 .../i128/no_space_between_literal.leo.out         |  2 +-
 .../compiler/compiler/integers/i128/sub.leo.out   |  6 +++---
 .../compiler/integers/i128/ternary.leo.out        |  6 +++---
 .../compiler/compiler/integers/i16/add.leo.out    |  6 +++---
 .../compiler/integers/i16/console_assert.leo.out  |  6 +++---
 .../compiler/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/compiler/integers/i16/max.leo.out    |  6 +++---
 .../compiler/integers/i16/max_fail.leo.out        |  2 +-
 .../compiler/compiler/integers/i16/min.leo.out    |  6 +++---
 .../compiler/integers/i16/min_fail.leo.out        |  2 +-
 .../compiler/compiler/integers/i16/mul.leo.out    |  6 +++---
 .../compiler/compiler/integers/i16/ne.leo.out     |  6 +++---
 .../compiler/compiler/integers/i16/negate.leo.out |  6 +++---
 .../compiler/integers/i16/negate_min.leo.out      |  6 +++---
 .../compiler/integers/i16/negate_zero.leo.out     |  6 +++---
 .../integers/i16/no_space_between_literal.leo.out |  2 +-
 .../compiler/compiler/integers/i16/sub.leo.out    |  6 +++---
 .../compiler/integers/i16/ternary.leo.out         |  6 +++---
 .../compiler/compiler/integers/i32/add.leo.out    |  6 +++---
 .../compiler/integers/i32/console_assert.leo.out  |  6 +++---
 .../compiler/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/compiler/integers/i32/max.leo.out    |  6 +++---
 .../compiler/integers/i32/max_fail.leo.out        |  2 +-
 .../compiler/compiler/integers/i32/min.leo.out    |  6 +++---
 .../compiler/integers/i32/min_fail.leo.out        |  2 +-
 .../compiler/compiler/integers/i32/mul.leo.out    |  6 +++---
 .../compiler/compiler/integers/i32/ne.leo.out     |  6 +++---
 .../compiler/compiler/integers/i32/negate.leo.out |  6 +++---
 .../compiler/integers/i32/negate_min.leo.out      |  6 +++---
 .../compiler/integers/i32/negate_zero.leo.out     |  6 +++---
 .../integers/i32/no_space_between_literal.leo.out |  2 +-
 .../compiler/compiler/integers/i32/sub.leo.out    |  6 +++---
 .../compiler/integers/i32/ternary.leo.out         |  6 +++---
 .../compiler/compiler/integers/i64/add.leo.out    |  6 +++---
 .../compiler/integers/i64/console_assert.leo.out  |  6 +++---
 .../compiler/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/compiler/integers/i64/max.leo.out    |  6 +++---
 .../compiler/integers/i64/max_fail.leo.out        |  2 +-
 .../compiler/compiler/integers/i64/min.leo.out    |  6 +++---
 .../compiler/integers/i64/min_fail.leo.out        |  2 +-
 .../compiler/compiler/integers/i64/mul.leo.out    |  6 +++---
 .../compiler/compiler/integers/i64/ne.leo.out     |  6 +++---
 .../compiler/compiler/integers/i64/negate.leo.out |  6 +++---
 .../compiler/integers/i64/negate_min.leo.out      |  6 +++---
 .../compiler/integers/i64/negate_zero.leo.out     |  6 +++---
 .../integers/i64/no_space_between_literal.leo.out |  2 +-
 .../compiler/compiler/integers/i64/sub.leo.out    |  6 +++---
 .../compiler/integers/i64/ternary.leo.out         |  6 +++---
 .../compiler/compiler/integers/i8/add.leo.out     |  6 +++---
 .../compiler/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/compiler/integers/i8/negate.leo.out  |  6 +++---
 .../compiler/integers/i8/negate_min.leo.out       |  2 +-
 .../compiler/integers/i8/negate_zero.leo.out      |  6 +++---
 .../integers/i8/no_space_between_literal.leo.out  |  2 +-
 .../compiler/compiler/integers/i8/sub.leo.out     |  6 +++---
 .../compiler/compiler/integers/i8/ternary.leo.out |  6 +++---
 .../compiler/compiler/integers/u128/add.leo.out   |  6 +++---
 .../compiler/integers/u128/console_assert.leo.out |  6 +++---
 .../compiler/compiler/integers/u128/div.leo.out   |  6 +++---
 .../compiler/compiler/integers/u128/eq.leo.out    |  6 +++---
 .../compiler/compiler/integers/u128/ge.leo.out    |  6 +++---
 .../compiler/compiler/integers/u128/gt.leo.out    |  6 +++---
 .../compiler/compiler/integers/u128/input.leo.out |  6 +++---
 .../compiler/compiler/integers/u128/le.leo.out    |  6 +++---
 .../compiler/compiler/integers/u128/lt.leo.out    |  6 +++---
 .../compiler/compiler/integers/u128/max.leo.out   |  6 +++---
 .../compiler/integers/u128/max_fail.leo.out       |  2 +-
 .../compiler/compiler/integers/u128/min.leo.out   |  6 +++---
 .../compiler/integers/u128/min_fail.leo.out       |  2 +-
 .../compiler/compiler/integers/u128/mul.leo.out   |  6 +++---
 .../compiler/compiler/integers/u128/ne.leo.out    |  6 +++---
 .../integers/u128/negative_input_fail.leo.out     |  2 +-
 .../u128/no_space_between_literal.leo.out         |  2 +-
 .../compiler/compiler/integers/u128/sub.leo.out   |  6 +++---
 .../compiler/integers/u128/ternary.leo.out        |  6 +++---
 .../compiler/compiler/integers/u16/add.leo.out    |  6 +++---
 .../compiler/integers/u16/console_assert.leo.out  |  6 +++---
 .../compiler/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/compiler/integers/u16/input.leo.out  |  6 +++---
 .../compiler/compiler/integers/u16/le.leo.out     |  6 +++---
 .../compiler/compiler/integers/u16/lt.leo.out     |  6 +++---
 .../compiler/compiler/integers/u16/max.leo.out    |  6 +++---
 .../compiler/integers/u16/max_fail.leo.out        |  2 +-
 .../compiler/compiler/integers/u16/min.leo.out    |  6 +++---
 .../compiler/integers/u16/min_fail.leo.out        |  2 +-
 .../compiler/compiler/integers/u16/mul.leo.out    |  6 +++---
 .../compiler/compiler/integers/u16/ne.leo.out     |  6 +++---
 .../integers/u16/negative_input_fail.leo.out      |  2 +-
 .../integers/u16/no_space_between_literal.leo.out |  2 +-
 .../compiler/compiler/integers/u16/sub.leo.out    |  6 +++---
 .../compiler/integers/u16/ternary.leo.out         |  6 +++---
 .../compiler/compiler/integers/u32/add.leo.out    |  6 +++---
 .../compiler/integers/u32/console_assert.leo.out  |  6 +++---
 .../compiler/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/compiler/integers/u32/input.leo.out  |  6 +++---
 .../compiler/compiler/integers/u32/le.leo.out     |  6 +++---
 .../compiler/compiler/integers/u32/lt.leo.out     |  6 +++---
 .../compiler/compiler/integers/u32/max.leo.out    |  6 +++---
 .../compiler/integers/u32/max_fail.leo.out        |  2 +-
 .../compiler/compiler/integers/u32/min.leo.out    |  6 +++---
 .../compiler/integers/u32/min_fail.leo.out        |  2 +-
 .../compiler/compiler/integers/u32/mul.leo.out    |  6 +++---
 .../compiler/compiler/integers/u32/ne.leo.out     |  6 +++---
 .../integers/u32/negative_input_fail.leo.out      |  2 +-
 .../integers/u32/no_space_between_literal.leo.out |  2 +-
 .../compiler/compiler/integers/u32/sub.leo.out    |  6 +++---
 .../compiler/integers/u32/ternary.leo.out         |  6 +++---
 .../compiler/compiler/integers/u64/add.leo.out    |  6 +++---
 .../compiler/integers/u64/console_assert.leo.out  |  6 +++---
 .../compiler/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/compiler/integers/u64/input.leo.out  |  6 +++---
 .../compiler/compiler/integers/u64/le.leo.out     |  6 +++---
 .../compiler/compiler/integers/u64/lt.leo.out     |  6 +++---
 .../compiler/compiler/integers/u64/max.leo.out    |  6 +++---
 .../compiler/integers/u64/max_fail.leo.out        |  2 +-
 .../compiler/compiler/integers/u64/min.leo.out    |  6 +++---
 .../compiler/integers/u64/min_fail.leo.out        |  2 +-
 .../compiler/compiler/integers/u64/mul.leo.out    |  6 +++---
 .../compiler/compiler/integers/u64/ne.leo.out     |  6 +++---
 .../integers/u64/negative_input_fail.leo.out      |  2 +-
 .../integers/u64/no_space_between_literal.leo.out |  2 +-
 .../compiler/compiler/integers/u64/sub.leo.out    |  6 +++---
 .../compiler/integers/u64/ternary.leo.out         |  6 +++---
 .../compiler/compiler/integers/u8/add.leo.out     |  6 +++---
 .../compiler/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/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 +-
 .../integers/u8/no_space_between_literal.leo.out  |  2 +-
 .../compiler/compiler/integers/u8/sub.leo.out     |  6 +++---
 .../compiler/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 +++---
 .../compiler/mutability/array_splice_mut.leo.out  |  6 +++---
 .../compiler/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/compiler/mutability/cond_mut.leo.out |  6 +++---
 .../compiler/compiler/mutability/const.leo.out    |  2 +-
 .../compiler/mutability/function_input.leo.out    |  2 +-
 .../mutability/function_input_mut.leo.out         |  6 +++---
 .../compiler/compiler/mutability/let_fail.leo.out |  2 +-
 .../compiler/compiler/mutability/let_mut.leo.out  |  6 +++---
 .../compiler/mutability/let_mut_nested.leo.out    |  6 +++---
 .../compiler/compiler/mutability/swap.leo.out     |  6 +++---
 .../compiler/statements/all_loops.leo.out         |  6 +++---
 .../compiler/statements/assign_ternary.leo.out    |  2 +-
 .../compiler/compiler/statements/block.leo.out    |  6 +++---
 .../compiler/compiler/statements/chain.leo.out    |  6 +++---
 .../statements/compound_assignment.leo.out        |  6 +++---
 .../statements/duplicate_variable.leo.out         |  2 +-
 .../compiler/compiler/statements/for_loop.leo.out |  6 +++---
 .../compiler/statements/iteration_basic.leo.out   |  6 +++---
 .../statements/iteration_variable.leo.out         |  6 +++---
 .../compiler/statements/multiple_returns.leo.out  |  6 +++---
 .../compiler/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 +++---
 .../compiler/string/string_transformation.leo.out |  6 +++---
 .../compiler/compiler/tuples/access.leo.out       |  6 +++---
 .../compiler/compiler/tuples/basic.leo.out        |  6 +++---
 .../compiler/compiler/tuples/dependent.leo.out    |  6 +++---
 .../compiler/compiler/tuples/destructured.leo.out |  6 +++---
 .../compiler/tuples/nested_access.leo.out         |  6 +++---
 428 files changed, 1074 insertions(+), 1068 deletions(-)

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

From 1efd891a3f68a1e7cf18fb465857a247702f728b Mon Sep 17 00:00:00 2001
From: gluaxspeed <jonathan.t.pavlik@gmail.com>
Date: Fri, 27 Aug 2021 09:54:22 -0700
Subject: [PATCH 06/23] regen tests

---
 tests/expectations/compiler/compiler/address/branch.leo.out     | 2 +-
 tests/expectations/compiler/compiler/address/equal.leo.out      | 2 +-
 tests/expectations/compiler/compiler/address/index.leo.out      | 2 +-
 tests/expectations/compiler/compiler/address/ternary.leo.out    | 2 +-
 tests/expectations/compiler/compiler/aliases/arith.leo.out      | 2 +-
 tests/expectations/compiler/compiler/aliases/basic.leo.out      | 2 +-
 tests/expectations/compiler/compiler/aliases/circuit.leo.out    | 2 +-
 tests/expectations/compiler/compiler/aliases/fn_return.leo.out  | 2 +-
 .../compiler/compiler/aliases/shadowing_arg.leo.out             | 2 +-
 .../compiler/compiler/aliases/shadowing_var_allowed.leo.out     | 2 +-
 .../expectations/compiler/compiler/array/complex_access.leo.out | 2 +-
 .../compiler/compiler/array/equal_initializer.leo.out           | 2 +-
 .../compiler/compiler/array/equal_initializer_2.leo.out         | 2 +-
 .../compiler/compiler/array/input_nested_3x2.leo.out            | 2 +-
 .../compiler/compiler/array/input_tuple_3x2.leo.out             | 2 +-
 .../compiler/compiler/array/multi_initializer.leo.out           | 2 +-
 tests/expectations/compiler/compiler/array/nested.leo.out       | 2 +-
 .../compiler/compiler/array/nested_3x2_value.leo.out            | 2 +-
 tests/expectations/compiler/compiler/array/registers.leo.out    | 2 +-
 tests/expectations/compiler/compiler/array/slice.leo.out        | 2 +-
 tests/expectations/compiler/compiler/array/slice_lower.leo.out  | 2 +-
 tests/expectations/compiler/compiler/array/spread.leo.out       | 2 +-
 .../compiler/compiler/array/ternary_in_array.leo.out            | 2 +-
 .../compiler/compiler/array/tuple_3x2_value.leo.out             | 2 +-
 .../expectations/compiler/compiler/array/type_input_3x2.leo.out | 2 +-
 .../compiler/compiler/array/type_input_4x3x2.leo.out            | 2 +-
 .../compiler/array/type_nested_value_nested_3x2.leo.out         | 2 +-
 .../compiler/array/type_nested_value_nested_4x3x2.leo.out       | 2 +-
 .../compiler/compiler/array/type_nested_value_tuple_3x2.leo.out | 2 +-
 .../compiler/array/type_nested_value_tuple_4x3x2.leo.out        | 2 +-
 .../compiler/compiler/array/type_tuple_value_nested_3x2.leo.out | 2 +-
 .../compiler/array/type_tuple_value_nested_4x3x2.leo.out        | 2 +-
 .../compiler/compiler/array/type_tuple_value_tuple_3x2.leo.out  | 2 +-
 .../compiler/array/type_tuple_value_tuple_4x3x2.leo.out         | 2 +-
 tests/expectations/compiler/compiler/boolean/and.leo.out        | 2 +-
 .../expectations/compiler/compiler/boolean/conditional.leo.out  | 2 +-
 tests/expectations/compiler/compiler/boolean/equal.leo.out      | 2 +-
 tests/expectations/compiler/compiler/boolean/not_equal.leo.out  | 2 +-
 tests/expectations/compiler/compiler/boolean/or.leo.out         | 2 +-
 tests/expectations/compiler/compiler/char/circuit.leo.out       | 2 +-
 tests/expectations/compiler/compiler/char/neq.leo.out           | 2 +-
 tests/expectations/compiler/compiler/char/nonprinting.leo.out   | 2 +-
 tests/expectations/compiler/compiler/char/out.leo.out           | 2 +-
 .../compiler/circuits/big_self_in_circuit_replacement.leo.out   | 2 +-
 .../compiler/compiler/circuits/const_self_variable.leo.out      | 2 +-
 .../circuits/define_circuit_inside_circuit_function.leo.out     | 2 +-
 .../compiler/compiler/circuits/duplicate_name_context.leo.out   | 2 +-
 tests/expectations/compiler/compiler/circuits/inline.leo.out    | 2 +-
 .../compiler/compiler/circuits/inline_member_pass.leo.out       | 2 +-
 .../compiler/compiler/circuits/member_function.leo.out          | 2 +-
 .../compiler/compiler/circuits/member_function_nested.leo.out   | 2 +-
 .../compiler/compiler/circuits/member_static_function.leo.out   | 2 +-
 .../compiler/circuits/member_static_function_nested.leo.out     | 2 +-
 .../compiler/compiler/circuits/member_variable.leo.out          | 2 +-
 .../compiler/circuits/member_variable_and_function.leo.out      | 2 +-
 .../compiler/compiler/circuits/mut_self_variable.leo.out        | 2 +-
 .../compiler/compiler/circuits/mut_self_variable_branch.leo.out | 2 +-
 .../compiler/circuits/mut_self_variable_conditional.leo.out     | 2 +-
 .../compiler/compiler/circuits/mut_variable.leo.out             | 2 +-
 .../compiler/circuits/mutable_call_immutable_context.leo.out    | 2 +-
 .../compiler/compiler/circuits/pedersen_mock.leo.out            | 2 +-
 .../compiler/compiler/circuits/return_self_type_array.leo.out   | 2 +-
 .../compiler/compiler/circuits/return_self_type_tuple.leo.out   | 2 +-
 .../expectations/compiler/compiler/circuits/self_member.leo.out | 2 +-
 tests/expectations/compiler/compiler/console/assert.leo.out     | 2 +-
 .../compiler/compiler/console/conditional_assert.leo.out        | 2 +-
 tests/expectations/compiler/compiler/console/error.leo.out      | 2 +-
 tests/expectations/compiler/compiler/console/log.leo.out        | 2 +-
 .../compiler/compiler/console/log_conditional.leo.out           | 2 +-
 tests/expectations/compiler/compiler/console/log_input.leo.out  | 2 +-
 .../compiler/compiler/console/log_parameter.leo.out             | 2 +-
 .../compiler/compiler/console/log_parameter_many.leo.out        | 2 +-
 .../compiler/compiler/definition/out_of_order.leo.out           | 2 +-
 .../compiler/definition/out_of_order_with_import.leo.out        | 2 +-
 tests/expectations/compiler/compiler/field/add.leo.out          | 2 +-
 tests/expectations/compiler/compiler/field/div.leo.out          | 2 +-
 tests/expectations/compiler/compiler/field/eq.leo.out           | 2 +-
 tests/expectations/compiler/compiler/field/field.leo.out        | 2 +-
 tests/expectations/compiler/compiler/field/mul.leo.out          | 2 +-
 tests/expectations/compiler/compiler/field/negate.leo.out       | 2 +-
 .../expectations/compiler/compiler/function/array_input.leo.out | 2 +-
 .../compiler/compiler/function/array_params_direct_call.leo.out | 2 +-
 .../compiler/compiler/function/conditional_return.leo.out       | 2 +-
 tests/expectations/compiler/compiler/function/empty.leo.out     | 2 +-
 tests/expectations/compiler/compiler/function/iteration.leo.out | 2 +-
 .../compiler/compiler/function/iteration_repeated.leo.out       | 2 +-
 .../compiler/compiler/function/multiple_returns.leo.out         | 2 +-
 .../compiler/compiler/function/multiple_returns_main.leo.out    | 2 +-
 tests/expectations/compiler/compiler/function/newlines.leo.out  | 2 +-
 tests/expectations/compiler/compiler/function/repeated.leo.out  | 2 +-
 tests/expectations/compiler/compiler/function/return.leo.out    | 2 +-
 .../compiler/compiler/function/return_array_nested_pass.leo.out | 2 +-
 .../compiler/compiler/function/return_array_tuple_pass.leo.out  | 2 +-
 .../compiler/compiler/function/return_tuple.leo.out             | 2 +-
 .../compiler/compiler/function/return_tuple_conditional.leo.out | 2 +-
 .../compiler/compiler/function/value_unchanged.leo.out          | 2 +-
 .../compiler/compiler/global_consts/global_const_types.leo.out  | 2 +-
 .../import_dependency/tests/import_dependency_folder.leo.out    | 2 +-
 .../compiler/compiler/import_local/import_all.leo.out           | 2 +-
 .../compiler/compiler/import_local/import_as.leo.out            | 2 +-
 .../compiler/compiler/import_local/import_dir.leo.out           | 2 +-
 .../compiler/compiler/import_local/import_files.leo.out         | 2 +-
 .../compiler/compiler/import_local/import_many.leo.out          | 2 +-
 .../compiler/compiler/import_local/import_weird_names.leo.out   | 2 +-
 .../compiler/import_local/import_weird_names_nested.leo.out     | 2 +-
 .../compiler/compiler/input_files/program_input/main.leo.out    | 2 +-
 .../compiler/input_files/program_input/main_array.leo.out       | 2 +-
 .../compiler/input_files/program_input/main_char.leo.out        | 2 +-
 .../compiler/input_files/program_input/main_field.leo.out       | 2 +-
 .../compiler/input_files/program_input/main_group.leo.out       | 2 +-
 .../program_input/main_multi_dimension_array.leo.out            | 2 +-
 .../compiler/input_files/program_input/main_multiple.leo.out    | 2 +-
 .../compiler/input_files/program_input/main_string.leo.out      | 2 +-
 .../compiler/input_files/program_input/main_tuple.leo.out       | 2 +-
 .../input_files/program_input_and_program_state/basic.leo.out   | 2 +-
 .../program_input_and_program_state/token_withdraw.leo.out      | 2 +-
 .../compiler/input_files/program_input_constants/main.leo.out   | 2 +-
 .../input_files/program_input_constants/main_array.leo.out      | 2 +-
 .../input_files/program_input_constants/main_char.leo.out       | 2 +-
 .../input_files/program_input_constants/main_field.leo.out      | 2 +-
 .../input_files/program_input_constants/main_group.leo.out      | 2 +-
 .../program_input_constants/main_multi_dimension_array.leo.out  | 2 +-
 .../input_files/program_input_constants/main_multiple.leo.out   | 2 +-
 .../input_files/program_input_constants/main_string.leo.out     | 2 +-
 .../input_files/program_input_constants/main_tuple.leo.out      | 2 +-
 .../input_files/program_registers/registers_array.leo.out       | 2 +-
 .../input_files/program_registers/registers_pass.leo.out        | 2 +-
 .../compiler/input_files/program_state/access_all.leo.out       | 2 +-
 .../compiler/input_files/program_state/access_state.leo.out     | 2 +-
 .../compiler/compiler/input_files/program_state/basic.leo.out   | 2 +-
 tests/expectations/compiler/compiler/integers/i128/add.leo.out  | 2 +-
 .../compiler/compiler/integers/i128/console_assert.leo.out      | 2 +-
 tests/expectations/compiler/compiler/integers/i128/div.leo.out  | 2 +-
 tests/expectations/compiler/compiler/integers/i128/eq.leo.out   | 2 +-
 tests/expectations/compiler/compiler/integers/i128/ge.leo.out   | 2 +-
 tests/expectations/compiler/compiler/integers/i128/gt.leo.out   | 2 +-
 tests/expectations/compiler/compiler/integers/i128/le.leo.out   | 2 +-
 tests/expectations/compiler/compiler/integers/i128/lt.leo.out   | 2 +-
 tests/expectations/compiler/compiler/integers/i128/max.leo.out  | 2 +-
 tests/expectations/compiler/compiler/integers/i128/min.leo.out  | 2 +-
 tests/expectations/compiler/compiler/integers/i128/mul.leo.out  | 2 +-
 tests/expectations/compiler/compiler/integers/i128/ne.leo.out   | 2 +-
 .../expectations/compiler/compiler/integers/i128/negate.leo.out | 2 +-
 .../compiler/compiler/integers/i128/negate_min.leo.out          | 2 +-
 .../compiler/compiler/integers/i128/negate_zero.leo.out         | 2 +-
 tests/expectations/compiler/compiler/integers/i128/sub.leo.out  | 2 +-
 .../compiler/compiler/integers/i128/ternary.leo.out             | 2 +-
 tests/expectations/compiler/compiler/integers/i16/add.leo.out   | 2 +-
 .../compiler/compiler/integers/i16/console_assert.leo.out       | 2 +-
 tests/expectations/compiler/compiler/integers/i16/div.leo.out   | 2 +-
 tests/expectations/compiler/compiler/integers/i16/eq.leo.out    | 2 +-
 tests/expectations/compiler/compiler/integers/i16/ge.leo.out    | 2 +-
 tests/expectations/compiler/compiler/integers/i16/gt.leo.out    | 2 +-
 tests/expectations/compiler/compiler/integers/i16/le.leo.out    | 2 +-
 tests/expectations/compiler/compiler/integers/i16/lt.leo.out    | 2 +-
 tests/expectations/compiler/compiler/integers/i16/max.leo.out   | 2 +-
 tests/expectations/compiler/compiler/integers/i16/min.leo.out   | 2 +-
 tests/expectations/compiler/compiler/integers/i16/mul.leo.out   | 2 +-
 tests/expectations/compiler/compiler/integers/i16/ne.leo.out    | 2 +-
 .../expectations/compiler/compiler/integers/i16/negate.leo.out  | 2 +-
 .../compiler/compiler/integers/i16/negate_min.leo.out           | 2 +-
 .../compiler/compiler/integers/i16/negate_zero.leo.out          | 2 +-
 tests/expectations/compiler/compiler/integers/i16/sub.leo.out   | 2 +-
 .../expectations/compiler/compiler/integers/i16/ternary.leo.out | 2 +-
 tests/expectations/compiler/compiler/integers/i32/add.leo.out   | 2 +-
 .../compiler/compiler/integers/i32/console_assert.leo.out       | 2 +-
 tests/expectations/compiler/compiler/integers/i32/div.leo.out   | 2 +-
 tests/expectations/compiler/compiler/integers/i32/eq.leo.out    | 2 +-
 tests/expectations/compiler/compiler/integers/i32/ge.leo.out    | 2 +-
 tests/expectations/compiler/compiler/integers/i32/gt.leo.out    | 2 +-
 tests/expectations/compiler/compiler/integers/i32/le.leo.out    | 2 +-
 tests/expectations/compiler/compiler/integers/i32/lt.leo.out    | 2 +-
 tests/expectations/compiler/compiler/integers/i32/max.leo.out   | 2 +-
 tests/expectations/compiler/compiler/integers/i32/min.leo.out   | 2 +-
 tests/expectations/compiler/compiler/integers/i32/mul.leo.out   | 2 +-
 tests/expectations/compiler/compiler/integers/i32/ne.leo.out    | 2 +-
 .../expectations/compiler/compiler/integers/i32/negate.leo.out  | 2 +-
 .../compiler/compiler/integers/i32/negate_min.leo.out           | 2 +-
 .../compiler/compiler/integers/i32/negate_zero.leo.out          | 2 +-
 tests/expectations/compiler/compiler/integers/i32/sub.leo.out   | 2 +-
 .../expectations/compiler/compiler/integers/i32/ternary.leo.out | 2 +-
 tests/expectations/compiler/compiler/integers/i64/add.leo.out   | 2 +-
 .../compiler/compiler/integers/i64/console_assert.leo.out       | 2 +-
 tests/expectations/compiler/compiler/integers/i64/div.leo.out   | 2 +-
 tests/expectations/compiler/compiler/integers/i64/eq.leo.out    | 2 +-
 tests/expectations/compiler/compiler/integers/i64/ge.leo.out    | 2 +-
 tests/expectations/compiler/compiler/integers/i64/gt.leo.out    | 2 +-
 tests/expectations/compiler/compiler/integers/i64/le.leo.out    | 2 +-
 tests/expectations/compiler/compiler/integers/i64/lt.leo.out    | 2 +-
 tests/expectations/compiler/compiler/integers/i64/max.leo.out   | 2 +-
 tests/expectations/compiler/compiler/integers/i64/min.leo.out   | 2 +-
 tests/expectations/compiler/compiler/integers/i64/mul.leo.out   | 2 +-
 tests/expectations/compiler/compiler/integers/i64/ne.leo.out    | 2 +-
 .../expectations/compiler/compiler/integers/i64/negate.leo.out  | 2 +-
 .../compiler/compiler/integers/i64/negate_min.leo.out           | 2 +-
 .../compiler/compiler/integers/i64/negate_zero.leo.out          | 2 +-
 tests/expectations/compiler/compiler/integers/i64/sub.leo.out   | 2 +-
 .../expectations/compiler/compiler/integers/i64/ternary.leo.out | 2 +-
 tests/expectations/compiler/compiler/integers/i8/add.leo.out    | 2 +-
 .../compiler/compiler/integers/i8/console_assert.leo.out        | 2 +-
 tests/expectations/compiler/compiler/integers/i8/div.leo.out    | 2 +-
 tests/expectations/compiler/compiler/integers/i8/eq.leo.out     | 2 +-
 tests/expectations/compiler/compiler/integers/i8/ge.leo.out     | 2 +-
 tests/expectations/compiler/compiler/integers/i8/gt.leo.out     | 2 +-
 tests/expectations/compiler/compiler/integers/i8/le.leo.out     | 2 +-
 tests/expectations/compiler/compiler/integers/i8/lt.leo.out     | 2 +-
 tests/expectations/compiler/compiler/integers/i8/max.leo.out    | 2 +-
 tests/expectations/compiler/compiler/integers/i8/min.leo.out    | 2 +-
 tests/expectations/compiler/compiler/integers/i8/mul.leo.out    | 2 +-
 tests/expectations/compiler/compiler/integers/i8/ne.leo.out     | 2 +-
 tests/expectations/compiler/compiler/integers/i8/negate.leo.out | 2 +-
 .../compiler/compiler/integers/i8/negate_zero.leo.out           | 2 +-
 tests/expectations/compiler/compiler/integers/i8/sub.leo.out    | 2 +-
 .../expectations/compiler/compiler/integers/i8/ternary.leo.out  | 2 +-
 tests/expectations/compiler/compiler/integers/u128/add.leo.out  | 2 +-
 .../compiler/compiler/integers/u128/console_assert.leo.out      | 2 +-
 tests/expectations/compiler/compiler/integers/u128/div.leo.out  | 2 +-
 tests/expectations/compiler/compiler/integers/u128/eq.leo.out   | 2 +-
 tests/expectations/compiler/compiler/integers/u128/ge.leo.out   | 2 +-
 tests/expectations/compiler/compiler/integers/u128/gt.leo.out   | 2 +-
 .../expectations/compiler/compiler/integers/u128/input.leo.out  | 2 +-
 tests/expectations/compiler/compiler/integers/u128/le.leo.out   | 2 +-
 tests/expectations/compiler/compiler/integers/u128/lt.leo.out   | 2 +-
 tests/expectations/compiler/compiler/integers/u128/max.leo.out  | 2 +-
 tests/expectations/compiler/compiler/integers/u128/min.leo.out  | 2 +-
 tests/expectations/compiler/compiler/integers/u128/mul.leo.out  | 2 +-
 tests/expectations/compiler/compiler/integers/u128/ne.leo.out   | 2 +-
 tests/expectations/compiler/compiler/integers/u128/sub.leo.out  | 2 +-
 .../compiler/compiler/integers/u128/ternary.leo.out             | 2 +-
 tests/expectations/compiler/compiler/integers/u16/add.leo.out   | 2 +-
 .../compiler/compiler/integers/u16/console_assert.leo.out       | 2 +-
 tests/expectations/compiler/compiler/integers/u16/div.leo.out   | 2 +-
 tests/expectations/compiler/compiler/integers/u16/eq.leo.out    | 2 +-
 tests/expectations/compiler/compiler/integers/u16/ge.leo.out    | 2 +-
 tests/expectations/compiler/compiler/integers/u16/gt.leo.out    | 2 +-
 tests/expectations/compiler/compiler/integers/u16/input.leo.out | 2 +-
 tests/expectations/compiler/compiler/integers/u16/le.leo.out    | 2 +-
 tests/expectations/compiler/compiler/integers/u16/lt.leo.out    | 2 +-
 tests/expectations/compiler/compiler/integers/u16/max.leo.out   | 2 +-
 tests/expectations/compiler/compiler/integers/u16/min.leo.out   | 2 +-
 tests/expectations/compiler/compiler/integers/u16/mul.leo.out   | 2 +-
 tests/expectations/compiler/compiler/integers/u16/ne.leo.out    | 2 +-
 tests/expectations/compiler/compiler/integers/u16/sub.leo.out   | 2 +-
 .../expectations/compiler/compiler/integers/u16/ternary.leo.out | 2 +-
 tests/expectations/compiler/compiler/integers/u32/add.leo.out   | 2 +-
 .../compiler/compiler/integers/u32/console_assert.leo.out       | 2 +-
 tests/expectations/compiler/compiler/integers/u32/div.leo.out   | 2 +-
 tests/expectations/compiler/compiler/integers/u32/eq.leo.out    | 2 +-
 tests/expectations/compiler/compiler/integers/u32/ge.leo.out    | 2 +-
 tests/expectations/compiler/compiler/integers/u32/gt.leo.out    | 2 +-
 tests/expectations/compiler/compiler/integers/u32/input.leo.out | 2 +-
 tests/expectations/compiler/compiler/integers/u32/le.leo.out    | 2 +-
 tests/expectations/compiler/compiler/integers/u32/lt.leo.out    | 2 +-
 tests/expectations/compiler/compiler/integers/u32/max.leo.out   | 2 +-
 tests/expectations/compiler/compiler/integers/u32/min.leo.out   | 2 +-
 tests/expectations/compiler/compiler/integers/u32/mul.leo.out   | 2 +-
 tests/expectations/compiler/compiler/integers/u32/ne.leo.out    | 2 +-
 tests/expectations/compiler/compiler/integers/u32/sub.leo.out   | 2 +-
 .../expectations/compiler/compiler/integers/u32/ternary.leo.out | 2 +-
 tests/expectations/compiler/compiler/integers/u64/add.leo.out   | 2 +-
 .../compiler/compiler/integers/u64/console_assert.leo.out       | 2 +-
 tests/expectations/compiler/compiler/integers/u64/div.leo.out   | 2 +-
 tests/expectations/compiler/compiler/integers/u64/eq.leo.out    | 2 +-
 tests/expectations/compiler/compiler/integers/u64/ge.leo.out    | 2 +-
 tests/expectations/compiler/compiler/integers/u64/gt.leo.out    | 2 +-
 tests/expectations/compiler/compiler/integers/u64/input.leo.out | 2 +-
 tests/expectations/compiler/compiler/integers/u64/le.leo.out    | 2 +-
 tests/expectations/compiler/compiler/integers/u64/lt.leo.out    | 2 +-
 tests/expectations/compiler/compiler/integers/u64/max.leo.out   | 2 +-
 tests/expectations/compiler/compiler/integers/u64/min.leo.out   | 2 +-
 tests/expectations/compiler/compiler/integers/u64/mul.leo.out   | 2 +-
 tests/expectations/compiler/compiler/integers/u64/ne.leo.out    | 2 +-
 tests/expectations/compiler/compiler/integers/u64/sub.leo.out   | 2 +-
 .../expectations/compiler/compiler/integers/u64/ternary.leo.out | 2 +-
 tests/expectations/compiler/compiler/integers/u8/add.leo.out    | 2 +-
 .../compiler/compiler/integers/u8/console_assert.leo.out        | 2 +-
 tests/expectations/compiler/compiler/integers/u8/div.leo.out    | 2 +-
 tests/expectations/compiler/compiler/integers/u8/eq.leo.out     | 2 +-
 tests/expectations/compiler/compiler/integers/u8/ge.leo.out     | 2 +-
 tests/expectations/compiler/compiler/integers/u8/gt.leo.out     | 2 +-
 tests/expectations/compiler/compiler/integers/u8/input.leo.out  | 2 +-
 tests/expectations/compiler/compiler/integers/u8/le.leo.out     | 2 +-
 tests/expectations/compiler/compiler/integers/u8/lt.leo.out     | 2 +-
 tests/expectations/compiler/compiler/integers/u8/max.leo.out    | 2 +-
 tests/expectations/compiler/compiler/integers/u8/min.leo.out    | 2 +-
 tests/expectations/compiler/compiler/integers/u8/mul.leo.out    | 2 +-
 tests/expectations/compiler/compiler/integers/u8/ne.leo.out     | 2 +-
 tests/expectations/compiler/compiler/integers/u8/sub.leo.out    | 2 +-
 .../expectations/compiler/compiler/integers/u8/ternary.leo.out  | 2 +-
 .../compiler/compiler/mutability/array_dyn_mut.leo.out          | 2 +-
 .../compiler/compiler/mutability/array_dyn_mut_indirect.leo.out | 2 +-
 .../expectations/compiler/compiler/mutability/array_mut.leo.out | 2 +-
 .../compiler/compiler/mutability/array_splice_mut.leo.out       | 2 +-
 .../compiler/compiler/mutability/array_tuple_mut.leo.out        | 2 +-
 .../compiler/compiler/mutability/circuit_function_mut.leo.out   | 2 +-
 .../compiler/compiler/mutability/circuit_variable_mut.leo.out   | 2 +-
 .../expectations/compiler/compiler/mutability/cond_mut.leo.out  | 2 +-
 .../compiler/compiler/mutability/function_input_mut.leo.out     | 2 +-
 tests/expectations/compiler/compiler/mutability/let_mut.leo.out | 2 +-
 .../compiler/compiler/mutability/let_mut_nested.leo.out         | 2 +-
 tests/expectations/compiler/compiler/mutability/swap.leo.out    | 2 +-
 .../expectations/compiler/compiler/statements/all_loops.leo.out | 2 +-
 tests/expectations/compiler/compiler/statements/block.leo.out   | 2 +-
 tests/expectations/compiler/compiler/statements/chain.leo.out   | 2 +-
 .../compiler/compiler/statements/compound_assignment.leo.out    | 2 +-
 .../expectations/compiler/compiler/statements/for_loop.leo.out  | 2 +-
 .../compiler/compiler/statements/iteration_basic.leo.out        | 2 +-
 .../compiler/compiler/statements/iteration_variable.leo.out     | 2 +-
 .../compiler/compiler/statements/multiple_returns.leo.out       | 2 +-
 tests/expectations/compiler/compiler/statements/mutate.leo.out  | 2 +-
 .../compiler/compiler/statements/nested_mutate.leo.out          | 2 +-
 .../compiler/compiler/statements/reverse_loops.leo.out          | 2 +-
 .../compiler/compiler/statements/reverse_one.leo.out            | 2 +-
 .../compiler/statements/ternary_explicit_and_implicit.leo.out   | 2 +-
 tests/expectations/compiler/compiler/string/circuit.leo.out     | 2 +-
 tests/expectations/compiler/compiler/string/equality.leo.out    | 2 +-
 tests/expectations/compiler/compiler/string/replace.leo.out     | 2 +-
 .../compiler/compiler/string/string_transformation.leo.out      | 2 +-
 tests/expectations/compiler/compiler/tuples/access.leo.out      | 2 +-
 tests/expectations/compiler/compiler/tuples/basic.leo.out       | 2 +-
 tests/expectations/compiler/compiler/tuples/dependent.leo.out   | 2 +-
 .../expectations/compiler/compiler/tuples/destructured.leo.out  | 2 +-
 .../expectations/compiler/compiler/tuples/nested_access.leo.out | 2 +-
 323 files changed, 323 insertions(+), 323 deletions(-)

diff --git a/tests/expectations/compiler/compiler/address/branch.leo.out b/tests/expectations/compiler/compiler/address/branch.leo.out
index f56c617467..39b1bdba4b 100644
--- a/tests/expectations/compiler/compiler/address/branch.leo.out
+++ b/tests/expectations/compiler/compiler/address/branch.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 32dcc6719d7d1214782cd1ffe02f067eec8adbf1f3820546e539887d4f1334c8
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 32dcc6719d7d1214782cd1ffe02f067eec8adbf1f3820546e539887d4f1334c8
     canonicalized_ast: 32dcc6719d7d1214782cd1ffe02f067eec8adbf1f3820546e539887d4f1334c8
     type_inferenced_ast: 996f46f1dba11bdde037a8e033ca97870871eb89d4e3e402b59f99fcc0c35323
diff --git a/tests/expectations/compiler/compiler/address/equal.leo.out b/tests/expectations/compiler/compiler/address/equal.leo.out
index 1fd2649333..72f8327413 100644
--- a/tests/expectations/compiler/compiler/address/equal.leo.out
+++ b/tests/expectations/compiler/compiler/address/equal.leo.out
@@ -23,6 +23,6 @@ outputs:
               type: bool
               value: "false"
     initial_ast: d9d5346dff8f825d58daabb3a4fe2fcd1471a3fb3c80e46e5583c4f6cdb12b2b
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: d9d5346dff8f825d58daabb3a4fe2fcd1471a3fb3c80e46e5583c4f6cdb12b2b
     canonicalized_ast: d9d5346dff8f825d58daabb3a4fe2fcd1471a3fb3c80e46e5583c4f6cdb12b2b
     type_inferenced_ast: 32a303da117b08aebfb74f7454cd80dfe28b07fd464a61b6d6a3ce23d451f135
diff --git a/tests/expectations/compiler/compiler/address/index.leo.out b/tests/expectations/compiler/compiler/address/index.leo.out
index a3ca4d71b2..67a9431af8 100644
--- a/tests/expectations/compiler/compiler/address/index.leo.out
+++ b/tests/expectations/compiler/compiler/address/index.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 9961e21337ff8eed0a27fff91fc442c2530a1bfaf80da6d497a93a371896b1f8
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 9961e21337ff8eed0a27fff91fc442c2530a1bfaf80da6d497a93a371896b1f8
     canonicalized_ast: 9961e21337ff8eed0a27fff91fc442c2530a1bfaf80da6d497a93a371896b1f8
     type_inferenced_ast: cc47000b2cf462f5cb891467cc99f2d21c44ced2198e988dc3de59f166aa1603
diff --git a/tests/expectations/compiler/compiler/address/ternary.leo.out b/tests/expectations/compiler/compiler/address/ternary.leo.out
index 4b11eef6bd..55dabfd5e7 100644
--- a/tests/expectations/compiler/compiler/address/ternary.leo.out
+++ b/tests/expectations/compiler/compiler/address/ternary.leo.out
@@ -23,6 +23,6 @@ outputs:
               type: bool
               value: "false"
     initial_ast: 6f8e7a94ccb702790204360959a2673abf6b53027fccaaa9feed8a4e41ee05c1
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 6f8e7a94ccb702790204360959a2673abf6b53027fccaaa9feed8a4e41ee05c1
     canonicalized_ast: 6f8e7a94ccb702790204360959a2673abf6b53027fccaaa9feed8a4e41ee05c1
     type_inferenced_ast: 91e597663c88fbfd0c6ff787d109f5a71d5357c44d5306f7149714cda86475ae
diff --git a/tests/expectations/compiler/compiler/aliases/arith.leo.out b/tests/expectations/compiler/compiler/aliases/arith.leo.out
index 7b528a6d2d..afd5ac5a6e 100644
--- a/tests/expectations/compiler/compiler/aliases/arith.leo.out
+++ b/tests/expectations/compiler/compiler/aliases/arith.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: a4a3b4b30742544a6dae3d76794504173c1cc64f217bd3feda033ce51512a670
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: a4a3b4b30742544a6dae3d76794504173c1cc64f217bd3feda033ce51512a670
     canonicalized_ast: a4a3b4b30742544a6dae3d76794504173c1cc64f217bd3feda033ce51512a670
     type_inferenced_ast: 508686ddeb2f8fad60d9ad58639b5a761e6c5f5b61e105803eb8a98d8065a2ad
diff --git a/tests/expectations/compiler/compiler/aliases/basic.leo.out b/tests/expectations/compiler/compiler/aliases/basic.leo.out
index 526fd7f145..246cf547ed 100644
--- a/tests/expectations/compiler/compiler/aliases/basic.leo.out
+++ b/tests/expectations/compiler/compiler/aliases/basic.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: d83b33119db295fa2ed7795c8e17d4073cabba5e90e9438cd53f3a9a77585f19
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: d83b33119db295fa2ed7795c8e17d4073cabba5e90e9438cd53f3a9a77585f19
     canonicalized_ast: d83b33119db295fa2ed7795c8e17d4073cabba5e90e9438cd53f3a9a77585f19
     type_inferenced_ast: 77be8ec74bc15f2a45e8bf29e7973bc0c721008fe5508dcc6d02b91aae3d84ee
diff --git a/tests/expectations/compiler/compiler/aliases/circuit.leo.out b/tests/expectations/compiler/compiler/aliases/circuit.leo.out
index 0d7b202af1..579ebcce07 100644
--- a/tests/expectations/compiler/compiler/aliases/circuit.leo.out
+++ b/tests/expectations/compiler/compiler/aliases/circuit.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: d9b0b6772317f0e2d1042dba26c19b4eb71a7e902c643cbeb0a4f62630f0f1bc
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: d9b0b6772317f0e2d1042dba26c19b4eb71a7e902c643cbeb0a4f62630f0f1bc
     canonicalized_ast: d9b0b6772317f0e2d1042dba26c19b4eb71a7e902c643cbeb0a4f62630f0f1bc
     type_inferenced_ast: e384fbed9e161b04c6c9e85f45788e5047385f289ef89d20fdacee00a8fb3e5c
diff --git a/tests/expectations/compiler/compiler/aliases/fn_return.leo.out b/tests/expectations/compiler/compiler/aliases/fn_return.leo.out
index a7e4db9c31..80aeb65553 100644
--- a/tests/expectations/compiler/compiler/aliases/fn_return.leo.out
+++ b/tests/expectations/compiler/compiler/aliases/fn_return.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 7feac3e33e75789d3b532a7cc857f324cd7abed380d578791803b3162edcfdec
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 7feac3e33e75789d3b532a7cc857f324cd7abed380d578791803b3162edcfdec
     canonicalized_ast: 7feac3e33e75789d3b532a7cc857f324cd7abed380d578791803b3162edcfdec
     type_inferenced_ast: bc54ad21e90ab297b40ff570dfc379cbca61fdc9e20bd6899f4b964f726954b0
diff --git a/tests/expectations/compiler/compiler/aliases/shadowing_arg.leo.out b/tests/expectations/compiler/compiler/aliases/shadowing_arg.leo.out
index 0e40da3829..e9b87ef19d 100644
--- a/tests/expectations/compiler/compiler/aliases/shadowing_arg.leo.out
+++ b/tests/expectations/compiler/compiler/aliases/shadowing_arg.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 671704ed30a8c68ebffe2a58ff4799f626badf975d2d0dded3b06f5264e5c0db
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 671704ed30a8c68ebffe2a58ff4799f626badf975d2d0dded3b06f5264e5c0db
     canonicalized_ast: 671704ed30a8c68ebffe2a58ff4799f626badf975d2d0dded3b06f5264e5c0db
     type_inferenced_ast: eb525f7c227207a1037b96838d2f0cf597968c14117b3fae30564f3cd5a3a27b
diff --git a/tests/expectations/compiler/compiler/aliases/shadowing_var_allowed.leo.out b/tests/expectations/compiler/compiler/aliases/shadowing_var_allowed.leo.out
index b79b64d791..c1d479dd9b 100644
--- a/tests/expectations/compiler/compiler/aliases/shadowing_var_allowed.leo.out
+++ b/tests/expectations/compiler/compiler/aliases/shadowing_var_allowed.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: cd2e85ff29ee11d30e73dbba0a612223a8a26dff125069ad7ac05697fd4c9829
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: cd2e85ff29ee11d30e73dbba0a612223a8a26dff125069ad7ac05697fd4c9829
     canonicalized_ast: cd2e85ff29ee11d30e73dbba0a612223a8a26dff125069ad7ac05697fd4c9829
     type_inferenced_ast: 1e73226b2cbbd5c7a36ffe70b778e0e544976d2e09a1f0ba3f2b486d1b604d58
diff --git a/tests/expectations/compiler/compiler/array/complex_access.leo.out b/tests/expectations/compiler/compiler/array/complex_access.leo.out
index 0867907b48..841bf13445 100644
--- a/tests/expectations/compiler/compiler/array/complex_access.leo.out
+++ b/tests/expectations/compiler/compiler/array/complex_access.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 843884ddf198fe566cea0f8e84a2902f720d6211c9d8bad98299eea4da846870
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 843884ddf198fe566cea0f8e84a2902f720d6211c9d8bad98299eea4da846870
     canonicalized_ast: c30721e60523bc31af9a9bf342d9b89bf92a26e3886394cc0c1a574560715bdf
     type_inferenced_ast: c37f209961a9acff1d942af1e4a9a332123676f2bc581ca94604314f9d738a1e
diff --git a/tests/expectations/compiler/compiler/array/equal_initializer.leo.out b/tests/expectations/compiler/compiler/array/equal_initializer.leo.out
index 6a6b7f8e56..300b2e071b 100644
--- a/tests/expectations/compiler/compiler/array/equal_initializer.leo.out
+++ b/tests/expectations/compiler/compiler/array/equal_initializer.leo.out
@@ -23,6 +23,6 @@ outputs:
               type: bool
               value: "false"
     initial_ast: aa24022f240400d709b97a44c143ce481109bb0a66926aa5c97cf2e2d06dea2a
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: aa24022f240400d709b97a44c143ce481109bb0a66926aa5c97cf2e2d06dea2a
     canonicalized_ast: ace5006c27d2e3784fb73d52adc641f6285a041452ba0d23de5983c5eede1139
     type_inferenced_ast: 611bc2fab64e417c9cfad3c59ca333561b8167a6fc7be957d972d96125e040ba
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 b56dbd2be2..bb5e60688e 100644
--- a/tests/expectations/compiler/compiler/array/equal_initializer_2.leo.out
+++ b/tests/expectations/compiler/compiler/array/equal_initializer_2.leo.out
@@ -23,6 +23,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 307b6817fa2a5005462686901129e97bf75c00bf14568fafbe1de2c8afc1804d
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 307b6817fa2a5005462686901129e97bf75c00bf14568fafbe1de2c8afc1804d
     canonicalized_ast: cbaa304ba210d8155762701d8e6a2ddca3eaffb008a813ed7a60db1fb0043f10
     type_inferenced_ast: 47e371ce112ac17fd65bfd100d24829e8c4819e1f96cc715b8c6245f01d608bb
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 4f818cb01b..3445cbb64c 100644
--- a/tests/expectations/compiler/compiler/array/input_nested_3x2.leo.out
+++ b/tests/expectations/compiler/compiler/array/input_nested_3x2.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 6d5be1a3d383ecafa89b5327d3a4b9bce9a459f6c0241cb01f408566ec4a1cc4
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 6d5be1a3d383ecafa89b5327d3a4b9bce9a459f6c0241cb01f408566ec4a1cc4
     canonicalized_ast: eb64230be87deb03ac7f076961a82194a15afd964aa6966a10314b38def69684
     type_inferenced_ast: e7985a24db781a3e42c9b2a67d1e8febc78fc2ad4e388a90207d00eb89734ffd
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 bc8bce53de..399ef15a56 100644
--- a/tests/expectations/compiler/compiler/array/input_tuple_3x2.leo.out
+++ b/tests/expectations/compiler/compiler/array/input_tuple_3x2.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: aa24022f240400d709b97a44c143ce481109bb0a66926aa5c97cf2e2d06dea2a
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: aa24022f240400d709b97a44c143ce481109bb0a66926aa5c97cf2e2d06dea2a
     canonicalized_ast: ace5006c27d2e3784fb73d52adc641f6285a041452ba0d23de5983c5eede1139
     type_inferenced_ast: 611bc2fab64e417c9cfad3c59ca333561b8167a6fc7be957d972d96125e040ba
diff --git a/tests/expectations/compiler/compiler/array/multi_initializer.leo.out b/tests/expectations/compiler/compiler/array/multi_initializer.leo.out
index 1652a74797..a41e6d561f 100644
--- a/tests/expectations/compiler/compiler/array/multi_initializer.leo.out
+++ b/tests/expectations/compiler/compiler/array/multi_initializer.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 0724c81ae70c56ff047b5d28ef949b72c4b581ce0bb443957064efa1636a3cab
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 0724c81ae70c56ff047b5d28ef949b72c4b581ce0bb443957064efa1636a3cab
     canonicalized_ast: ed0b7200a455978fed9b1df0c9e3ab9bf4815d79048f28f4205c69b420ee02df
     type_inferenced_ast: 1e5c78e15d8c9328190e95ccbc2e4e105d9ce430b98704a12472e2c3cc870526
diff --git a/tests/expectations/compiler/compiler/array/nested.leo.out b/tests/expectations/compiler/compiler/array/nested.leo.out
index 42a68dce14..f0661b99e1 100644
--- a/tests/expectations/compiler/compiler/array/nested.leo.out
+++ b/tests/expectations/compiler/compiler/array/nested.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 60d0b81c9f3631aca3c9607df74cfb8e4dbc0d387836398dea86f016fa4210fd
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 60d0b81c9f3631aca3c9607df74cfb8e4dbc0d387836398dea86f016fa4210fd
     canonicalized_ast: 6570de0e96b21780ed7793a860948b2c6ff7a92da7ce7f3dd7775ff30d70656f
     type_inferenced_ast: ace51ab56a61b988bd2c3f65431e87234a96fa92554d36d4e83d7235832506f6
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 0a71e3d6df..18f3110b60 100644
--- a/tests/expectations/compiler/compiler/array/nested_3x2_value.leo.out
+++ b/tests/expectations/compiler/compiler/array/nested_3x2_value.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 754eca05d485d80c4b710db30efc66f91c0eafdc02c2707f854238863b6c6c02
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 754eca05d485d80c4b710db30efc66f91c0eafdc02c2707f854238863b6c6c02
     canonicalized_ast: e5554c42dc9a45ab57ea5ac28996969640fb6f8da1ad8db805f65f5d555c8cf4
     type_inferenced_ast: aa30bccd05b7386ffb8a7df7cad89ec39117c6b5fc51a9e68624064832b4f225
diff --git a/tests/expectations/compiler/compiler/array/registers.leo.out b/tests/expectations/compiler/compiler/array/registers.leo.out
index 7adbe7d9a5..96a5800d2b 100644
--- a/tests/expectations/compiler/compiler/array/registers.leo.out
+++ b/tests/expectations/compiler/compiler/array/registers.leo.out
@@ -23,6 +23,6 @@ outputs:
               type: "[u8; 3]"
               value: "\"123\""
     initial_ast: 4e74124bc410534941ef9b79ffb64656d14e145b5a79fbd14419c1aef2f0ef69
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 4e74124bc410534941ef9b79ffb64656d14e145b5a79fbd14419c1aef2f0ef69
     canonicalized_ast: 4e74124bc410534941ef9b79ffb64656d14e145b5a79fbd14419c1aef2f0ef69
     type_inferenced_ast: f5cb6326028b3cf9187889be6ac5ed5bd095a570d45ae63c7285a09366fc6803
diff --git a/tests/expectations/compiler/compiler/array/slice.leo.out b/tests/expectations/compiler/compiler/array/slice.leo.out
index a290961208..48d49f7866 100644
--- a/tests/expectations/compiler/compiler/array/slice.leo.out
+++ b/tests/expectations/compiler/compiler/array/slice.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 0e4761ba1228f0a490b51ff2c31df33f623a08d32f62833d64859ca103689f4a
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 0e4761ba1228f0a490b51ff2c31df33f623a08d32f62833d64859ca103689f4a
     canonicalized_ast: 0e4761ba1228f0a490b51ff2c31df33f623a08d32f62833d64859ca103689f4a
     type_inferenced_ast: 1494bb64c16ec2dc03bfb2e37b89f93e02a70860ced1ce0b42b5ee5ead31b0d5
diff --git a/tests/expectations/compiler/compiler/array/slice_lower.leo.out b/tests/expectations/compiler/compiler/array/slice_lower.leo.out
index 0ef59459b5..15e2bd02c2 100644
--- a/tests/expectations/compiler/compiler/array/slice_lower.leo.out
+++ b/tests/expectations/compiler/compiler/array/slice_lower.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 1bf9b30e052d9ecc042a0b20bbc195a98d463ab206963469b9199de462b8be15
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 1bf9b30e052d9ecc042a0b20bbc195a98d463ab206963469b9199de462b8be15
     canonicalized_ast: 1bf9b30e052d9ecc042a0b20bbc195a98d463ab206963469b9199de462b8be15
     type_inferenced_ast: 6d2531af8ed5b04b23039d0b508cf388135a0fc6e1dc0de3befb4d49ce360fbc
diff --git a/tests/expectations/compiler/compiler/array/spread.leo.out b/tests/expectations/compiler/compiler/array/spread.leo.out
index e861a3b6fd..5914e93782 100644
--- a/tests/expectations/compiler/compiler/array/spread.leo.out
+++ b/tests/expectations/compiler/compiler/array/spread.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 140097342b7a16fae8542da5d13eb9c2cb4e1b743fa226e345d815f62d0781bb
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 140097342b7a16fae8542da5d13eb9c2cb4e1b743fa226e345d815f62d0781bb
     canonicalized_ast: 140097342b7a16fae8542da5d13eb9c2cb4e1b743fa226e345d815f62d0781bb
     type_inferenced_ast: a2442e72c5010224894e46a1c6f245356c0d86428ce617eb31faaf57806ca2df
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 261857b709..94a0008165 100644
--- a/tests/expectations/compiler/compiler/array/ternary_in_array.leo.out
+++ b/tests/expectations/compiler/compiler/array/ternary_in_array.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 002cb467a5c1357617b45f955944bb4a79ab465dc13f3eb5eb8db4c158b8c745
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 002cb467a5c1357617b45f955944bb4a79ab465dc13f3eb5eb8db4c158b8c745
     canonicalized_ast: 002cb467a5c1357617b45f955944bb4a79ab465dc13f3eb5eb8db4c158b8c745
     type_inferenced_ast: 323fc99ac247b37bb395eb08691d451a3b6b563a15bb94b5af6a0193ccc0bd34
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 0fe9693375..b3c16f0157 100644
--- a/tests/expectations/compiler/compiler/array/tuple_3x2_value.leo.out
+++ b/tests/expectations/compiler/compiler/array/tuple_3x2_value.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 97fd9b78f7912a7627e2b2f5615ae35e39304af6122fab85f9b49fcf6a85d8f2
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 97fd9b78f7912a7627e2b2f5615ae35e39304af6122fab85f9b49fcf6a85d8f2
     canonicalized_ast: cf8a8faae5f2847199324cbef87583e9af1249c03891ae31f3ce0093879326d5
     type_inferenced_ast: 731117b4aa8260da475471088df325cb540d84c536ce60f3488e01a4428e84ae
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 a3627c2d0c..c4b141e5cf 100644
--- a/tests/expectations/compiler/compiler/array/type_input_3x2.leo.out
+++ b/tests/expectations/compiler/compiler/array/type_input_3x2.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 9f2080fab6a85294afa2423cd79482fb3d944c4afab7363e66a4086a120ad34d
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 9f2080fab6a85294afa2423cd79482fb3d944c4afab7363e66a4086a120ad34d
     canonicalized_ast: 9f2080fab6a85294afa2423cd79482fb3d944c4afab7363e66a4086a120ad34d
     type_inferenced_ast: f8c6b9a9ac418220c87bbd1a99a5eb15817cfa289d822624f2d3cc41e10718b4
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 8df142913e..44117e0d63 100644
--- a/tests/expectations/compiler/compiler/array/type_input_4x3x2.leo.out
+++ b/tests/expectations/compiler/compiler/array/type_input_4x3x2.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: f61370b311806223d351c6dd611a178362cf8ad6de976d7b0ed709b51fadbecb
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: f61370b311806223d351c6dd611a178362cf8ad6de976d7b0ed709b51fadbecb
     canonicalized_ast: f61370b311806223d351c6dd611a178362cf8ad6de976d7b0ed709b51fadbecb
     type_inferenced_ast: 54531d6afced0deaa59c93b9270768a5e89ea8ea1df34365eb4e440bdf725904
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 910557f05f..8c26312c64 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
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 6bacdd1d42bfa807910c0455c68213007d5ca8f15ee1f3c743d946bfbbff79b7
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 6bacdd1d42bfa807910c0455c68213007d5ca8f15ee1f3c743d946bfbbff79b7
     canonicalized_ast: 6bacdd1d42bfa807910c0455c68213007d5ca8f15ee1f3c743d946bfbbff79b7
     type_inferenced_ast: 1b2a08879a8d42fafc9eecc12b89f0f36719e02205ee48bf6075475e71942132
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 1d0b9a0e95..45f267cf6d 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
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: c3c30cd2e66f21abef8c49e0ac3d49ed3b607097815c354b14ea9e44d41c0a69
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: c3c30cd2e66f21abef8c49e0ac3d49ed3b607097815c354b14ea9e44d41c0a69
     canonicalized_ast: c3c30cd2e66f21abef8c49e0ac3d49ed3b607097815c354b14ea9e44d41c0a69
     type_inferenced_ast: 557825e28344c8313d9961f9551eabe9c32ee85c524b9b9a6b0fc202c22fa9f3
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 88bcd81242..8a7be41081 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
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 6c062f01a78d515f780a4c13de65d466edda274a2cb519af47a319ed165db0fa
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 6c062f01a78d515f780a4c13de65d466edda274a2cb519af47a319ed165db0fa
     canonicalized_ast: 382e9b8b4a635b0be6f62409a20bbdc10d37d08c17658414d1ddef8e6eb00749
     type_inferenced_ast: 13d8af6038fbc63ae76be51f23e43152ab473b895d206160716008da87da3416
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 89a4ada5a2..ab9861224d 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
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 228ba794b578de8828d761676c15059c51455aff96b02ef3cfafbef53c35454b
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 228ba794b578de8828d761676c15059c51455aff96b02ef3cfafbef53c35454b
     canonicalized_ast: 7869bd9531ba014bc2515e13bcafdfed2f9566e7008c1e015d43bb749d8d1d4a
     type_inferenced_ast: 84b8976993f08b1b46fef6012018ad050eed6df1e34ae83fc0b57799a1acb395
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 ab798d8fae..fc80de0f79 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
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 0ea5856bbe7ad96107544e2b12c7ca54c279c4cd1c8b9610083430600ffa86f9
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 0ea5856bbe7ad96107544e2b12c7ca54c279c4cd1c8b9610083430600ffa86f9
     canonicalized_ast: 0083c78a81a6ec44627ca89fe949a5301ccaa54ead7104b9a2a3fbd979cf9a2c
     type_inferenced_ast: a8b44ce543535e16db5d93df805dc5693d3a1140798cb336d573986de8dfdbca
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 417703ab6c..d3e94231c4 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
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: db7e9050580f794aa657700225126e8033c0241240874f6e35df0507469be247
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: db7e9050580f794aa657700225126e8033c0241240874f6e35df0507469be247
     canonicalized_ast: 55304d82a024ad2418e156ad661224040904775f070995bf1b828d1264c3487f
     type_inferenced_ast: db99dd94ad4ef9de46304df000494eeda3e8b51835c46e6a3988ee87f91457fa
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 77de96dca9..41f758d3c4 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
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 2730f954bc76f81d29b02a15f8025d75ca963234716112745b806789bb8eb297
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 2730f954bc76f81d29b02a15f8025d75ca963234716112745b806789bb8eb297
     canonicalized_ast: 4e07d5e399fa0f60ab84796ecc6195b2a8da0b3a9e725152465512e98f0ca753
     type_inferenced_ast: ea0f726ce456c52c62b73aae38afb74b160ae527480d05f3254c0fdaefdad58e
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 dcef6e591d..5586e09832 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
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 445b35e7d287dc14a77b2c1c4c77d9b7b4fbd6e7c31f6f35c91a446eeca29775
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 445b35e7d287dc14a77b2c1c4c77d9b7b4fbd6e7c31f6f35c91a446eeca29775
     canonicalized_ast: 48590d7afce08e9e0cd4a45048faa360c18109098b5a9074dfc21b252a47d3e8
     type_inferenced_ast: 0cc5d17973908631180a791f151bdc42aa3e8394b3fbc7607f717bc61baaf904
diff --git a/tests/expectations/compiler/compiler/boolean/and.leo.out b/tests/expectations/compiler/compiler/boolean/and.leo.out
index f563b3c070..3c726a7331 100644
--- a/tests/expectations/compiler/compiler/boolean/and.leo.out
+++ b/tests/expectations/compiler/compiler/boolean/and.leo.out
@@ -35,6 +35,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 2f7c3b9c806a873b6445200eb78a8e0e546ffe64c90fe2133355dd37a342b11b
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 2f7c3b9c806a873b6445200eb78a8e0e546ffe64c90fe2133355dd37a342b11b
     canonicalized_ast: 2f7c3b9c806a873b6445200eb78a8e0e546ffe64c90fe2133355dd37a342b11b
     type_inferenced_ast: 87b86a66fc6e60502be0b0fb7cf677d5128390aec53f6893827a1bf02fca8370
diff --git a/tests/expectations/compiler/compiler/boolean/conditional.leo.out b/tests/expectations/compiler/compiler/boolean/conditional.leo.out
index d6c4a09614..51f3b463d5 100644
--- a/tests/expectations/compiler/compiler/boolean/conditional.leo.out
+++ b/tests/expectations/compiler/compiler/boolean/conditional.leo.out
@@ -35,6 +35,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 5316ba00882aa3f9b538d349ed7141c4ee7c77ec01f6af9911b2652b6cd3e659
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 5316ba00882aa3f9b538d349ed7141c4ee7c77ec01f6af9911b2652b6cd3e659
     canonicalized_ast: 5316ba00882aa3f9b538d349ed7141c4ee7c77ec01f6af9911b2652b6cd3e659
     type_inferenced_ast: 7933d0a8f47892e42c3c670bc6433e8d820042a7396e10b6a63d22bd5b740f96
diff --git a/tests/expectations/compiler/compiler/boolean/equal.leo.out b/tests/expectations/compiler/compiler/boolean/equal.leo.out
index 799c33a8d2..4f3e535ca9 100644
--- a/tests/expectations/compiler/compiler/boolean/equal.leo.out
+++ b/tests/expectations/compiler/compiler/boolean/equal.leo.out
@@ -35,6 +35,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 08f026e24cab51634a7a2a6f1f3b082eace1d4be649cd9ff7c244194891d7d78
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 08f026e24cab51634a7a2a6f1f3b082eace1d4be649cd9ff7c244194891d7d78
     canonicalized_ast: 08f026e24cab51634a7a2a6f1f3b082eace1d4be649cd9ff7c244194891d7d78
     type_inferenced_ast: 2112e9f631a77bb16ba1561bbe1028a415413f23fd32d21bfe086e071938c845
diff --git a/tests/expectations/compiler/compiler/boolean/not_equal.leo.out b/tests/expectations/compiler/compiler/boolean/not_equal.leo.out
index af1f81c21f..d31cdae376 100644
--- a/tests/expectations/compiler/compiler/boolean/not_equal.leo.out
+++ b/tests/expectations/compiler/compiler/boolean/not_equal.leo.out
@@ -35,6 +35,6 @@ outputs:
               type: bool
               value: "false"
     initial_ast: 094effa7fe12695679a571f560e1d3e8c299cde8de280f9309010c85f48bab95
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 094effa7fe12695679a571f560e1d3e8c299cde8de280f9309010c85f48bab95
     canonicalized_ast: 094effa7fe12695679a571f560e1d3e8c299cde8de280f9309010c85f48bab95
     type_inferenced_ast: ab25cb7bf7d8fe3ec64be183550ba8d6acfaf17464cf70ec45c6497fc065ac29
diff --git a/tests/expectations/compiler/compiler/boolean/or.leo.out b/tests/expectations/compiler/compiler/boolean/or.leo.out
index 88d93b085e..de8536a60d 100644
--- a/tests/expectations/compiler/compiler/boolean/or.leo.out
+++ b/tests/expectations/compiler/compiler/boolean/or.leo.out
@@ -35,6 +35,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: e2facdce5f7cdbed4a3215cc258e54418aac4f4b846349b35e1da67b577b76c9
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: e2facdce5f7cdbed4a3215cc258e54418aac4f4b846349b35e1da67b577b76c9
     canonicalized_ast: e2facdce5f7cdbed4a3215cc258e54418aac4f4b846349b35e1da67b577b76c9
     type_inferenced_ast: fb43dcb50c9822e2d4e4f35e9cc73f0893e508161296be5666cd90c4f7a971bc
diff --git a/tests/expectations/compiler/compiler/char/circuit.leo.out b/tests/expectations/compiler/compiler/char/circuit.leo.out
index 53eaa32d79..0a4821256d 100644
--- a/tests/expectations/compiler/compiler/char/circuit.leo.out
+++ b/tests/expectations/compiler/compiler/char/circuit.leo.out
@@ -101,6 +101,6 @@ outputs:
               type: char
               value: "'\\u{1f62d}'"
     initial_ast: 0c2aeb5b47fc21f5aded4e3aebcdf55eb98c10c6b51a2a6dcb98490a96da0c97
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 0c2aeb5b47fc21f5aded4e3aebcdf55eb98c10c6b51a2a6dcb98490a96da0c97
     canonicalized_ast: 0c2aeb5b47fc21f5aded4e3aebcdf55eb98c10c6b51a2a6dcb98490a96da0c97
     type_inferenced_ast: 84977d828c2988392d85d4156d34d168a3265aca3c3516b3ddb974d3d9eee2dc
diff --git a/tests/expectations/compiler/compiler/char/neq.leo.out b/tests/expectations/compiler/compiler/char/neq.leo.out
index 9a95adc00b..70b851fbc6 100644
--- a/tests/expectations/compiler/compiler/char/neq.leo.out
+++ b/tests/expectations/compiler/compiler/char/neq.leo.out
@@ -101,6 +101,6 @@ outputs:
               type: char
               value: "'a'"
     initial_ast: ac56e34b2a2cb282d36133df39d80947dfdfc56b5655b3ba9f408ba529c8f505
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: ac56e34b2a2cb282d36133df39d80947dfdfc56b5655b3ba9f408ba529c8f505
     canonicalized_ast: ac56e34b2a2cb282d36133df39d80947dfdfc56b5655b3ba9f408ba529c8f505
     type_inferenced_ast: 2eecf906226893c46f526a72f272a3f11eb34ada7cc4cd573439ebfed44ba170
diff --git a/tests/expectations/compiler/compiler/char/nonprinting.leo.out b/tests/expectations/compiler/compiler/char/nonprinting.leo.out
index e43f77c3a7..2743086dc3 100644
--- a/tests/expectations/compiler/compiler/char/nonprinting.leo.out
+++ b/tests/expectations/compiler/compiler/char/nonprinting.leo.out
@@ -20,6 +20,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: da8550065db88bba8f0a982612194f6122ec97025c4af5d3007d3a4d42519cb9
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: da8550065db88bba8f0a982612194f6122ec97025c4af5d3007d3a4d42519cb9
     canonicalized_ast: da8550065db88bba8f0a982612194f6122ec97025c4af5d3007d3a4d42519cb9
     type_inferenced_ast: b3ea99e7660209825c5bb1abcba8c1835cf96b79c8707e616513122ab10ac0d5
diff --git a/tests/expectations/compiler/compiler/char/out.leo.out b/tests/expectations/compiler/compiler/char/out.leo.out
index e5a9770fdf..e61799dc7c 100644
--- a/tests/expectations/compiler/compiler/char/out.leo.out
+++ b/tests/expectations/compiler/compiler/char/out.leo.out
@@ -101,6 +101,6 @@ outputs:
               type: char
               value: "'\\u{1f62d}'"
     initial_ast: 6e1cf86d47e056682c6e51dcf0390eb34505b60d50de60970a688f237525bedf
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 6e1cf86d47e056682c6e51dcf0390eb34505b60d50de60970a688f237525bedf
     canonicalized_ast: 6e1cf86d47e056682c6e51dcf0390eb34505b60d50de60970a688f237525bedf
     type_inferenced_ast: feb16e72f13a884e3303b336f7f20ff8ff4066a8f9861860e28b9c6901215b76
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 41954f71b0..0fc5a81aef 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
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 58f66e3a45b1752bb5dbb454adbbe6136394a7a87bc7b812d154aec1d5eac816
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 58f66e3a45b1752bb5dbb454adbbe6136394a7a87bc7b812d154aec1d5eac816
     canonicalized_ast: f7359bbb8cecd0923c0aa7dd7fd6b01cb2c64e45f1e777709fb14d4e6ba0ee5a
     type_inferenced_ast: f3a0378b8b60f66ca164be498224592907216262a54a92d878e52f0a85f53389
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 459f2f7ec2..43b8d36554 100644
--- a/tests/expectations/compiler/compiler/circuits/const_self_variable.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/const_self_variable.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 50c0f7261d879373f4e01ec3d140a2067ca4e78622c8340e8312d717f6effb05
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 50c0f7261d879373f4e01ec3d140a2067ca4e78622c8340e8312d717f6effb05
     canonicalized_ast: 50c0f7261d879373f4e01ec3d140a2067ca4e78622c8340e8312d717f6effb05
     type_inferenced_ast: 161edd5d1900f2902bd8cc972308ce7fb0afe7c6cf64ab7cfe952c3f1b3189c0
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 dc86bda731..4a4ff1f5fd 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
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: bfd7751e8ea64c6d41af36d968f194a18a5411ac71932a67766f40448ce755f5
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: bfd7751e8ea64c6d41af36d968f194a18a5411ac71932a67766f40448ce755f5
     canonicalized_ast: bfd7751e8ea64c6d41af36d968f194a18a5411ac71932a67766f40448ce755f5
     type_inferenced_ast: 910b51f962861da6011f214a5379bc9296034e3fecda347b17c7db97df833a25
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 c26d0c25ac..3e8bc37c51 100644
--- a/tests/expectations/compiler/compiler/circuits/duplicate_name_context.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/duplicate_name_context.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: d8a66347f480161a2215c92d2cf6ded2d0b49fd76b7eb0036d4fa33de371925a
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: d8a66347f480161a2215c92d2cf6ded2d0b49fd76b7eb0036d4fa33de371925a
     canonicalized_ast: d8a66347f480161a2215c92d2cf6ded2d0b49fd76b7eb0036d4fa33de371925a
     type_inferenced_ast: d5bb87130d78bb39fa948ce868999184f90c78ada176cf08c49051517de3351c
diff --git a/tests/expectations/compiler/compiler/circuits/inline.leo.out b/tests/expectations/compiler/compiler/circuits/inline.leo.out
index 79d1bfb382..dff5b84d3e 100644
--- a/tests/expectations/compiler/compiler/circuits/inline.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/inline.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: u32
               value: "100"
     initial_ast: c40a1d60f872fdb03ab7379a3abf43439a100b8f1546b76ffeac60c8739e0d68
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: c40a1d60f872fdb03ab7379a3abf43439a100b8f1546b76ffeac60c8739e0d68
     canonicalized_ast: c40a1d60f872fdb03ab7379a3abf43439a100b8f1546b76ffeac60c8739e0d68
     type_inferenced_ast: 3d56ffd95d1b84970e24f10a48f52053717876f062db72d8be93f413f7b2c9a3
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 69db417c70..486a6ec9b8 100644
--- a/tests/expectations/compiler/compiler/circuits/inline_member_pass.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/inline_member_pass.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: cf642f2f983cd8bcd6cbca2d2920f5234d79375601c1da3c06f97b6185a5629d
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: cf642f2f983cd8bcd6cbca2d2920f5234d79375601c1da3c06f97b6185a5629d
     canonicalized_ast: f99560385252ad2965e39b19402e7c56db402458206187eeb54adc26effd9bb5
     type_inferenced_ast: c7c5cd5ed24fd3967f19a5ad895aeb7778b3dfadc7965c3f5bc1d44c61448083
diff --git a/tests/expectations/compiler/compiler/circuits/member_function.leo.out b/tests/expectations/compiler/compiler/circuits/member_function.leo.out
index e95d6e997b..48b1947e43 100644
--- a/tests/expectations/compiler/compiler/circuits/member_function.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/member_function.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 5273a592b167cfe040b2bca7337521084d7a6640651bca584545e9eeb2e4fa88
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 5273a592b167cfe040b2bca7337521084d7a6640651bca584545e9eeb2e4fa88
     canonicalized_ast: 5273a592b167cfe040b2bca7337521084d7a6640651bca584545e9eeb2e4fa88
     type_inferenced_ast: 6d1bef6ecbba4533266f9478b06e52acc56f04850e99a658abffe39e7e463cdf
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 55f0b9b4c4..5428da7f87 100644
--- a/tests/expectations/compiler/compiler/circuits/member_function_nested.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/member_function_nested.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 241f1a42877b012b2e2062cefbd83523a5c719557cb422cf1fbd7efb0f7b1796
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 241f1a42877b012b2e2062cefbd83523a5c719557cb422cf1fbd7efb0f7b1796
     canonicalized_ast: 241f1a42877b012b2e2062cefbd83523a5c719557cb422cf1fbd7efb0f7b1796
     type_inferenced_ast: 2982ee6fda2fcbd00f64d2c0c75ccacf58ab05961f85e9a64cc0ddec12bb5209
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 d892e17df6..867b688fa2 100644
--- a/tests/expectations/compiler/compiler/circuits/member_static_function.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/member_static_function.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 11dfbfa2561534a1c965d8f8862b23ed56be50986903c139b763f88a1ba3ad8d
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 11dfbfa2561534a1c965d8f8862b23ed56be50986903c139b763f88a1ba3ad8d
     canonicalized_ast: 11dfbfa2561534a1c965d8f8862b23ed56be50986903c139b763f88a1ba3ad8d
     type_inferenced_ast: 6aab6f0cf6a9237ec02b5ce3f4ad8f24c8faa8ec5ccbc7f3af1023d0269dceea
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 c75512c077..a10fb07f86 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
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 42f603efbf7ee8ca53394266f33fbf09110420c822385179d656861e8ceb4a32
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 42f603efbf7ee8ca53394266f33fbf09110420c822385179d656861e8ceb4a32
     canonicalized_ast: 92d91209d7675fc14ae1fd44c28d1384f1c56c5852654b4dac46dd123340d9c0
     type_inferenced_ast: 0527005fb0925ac29af65bb0c12c39991d466c20def41ce7e4a2ded51ae233fc
diff --git a/tests/expectations/compiler/compiler/circuits/member_variable.leo.out b/tests/expectations/compiler/compiler/circuits/member_variable.leo.out
index 1b1e89b4d0..01852c344d 100644
--- a/tests/expectations/compiler/compiler/circuits/member_variable.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/member_variable.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: cf41b78f9435c6555014db8aeebe662556f4f8547ee0f3a204d6f522fcf72644
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: cf41b78f9435c6555014db8aeebe662556f4f8547ee0f3a204d6f522fcf72644
     canonicalized_ast: cf41b78f9435c6555014db8aeebe662556f4f8547ee0f3a204d6f522fcf72644
     type_inferenced_ast: d947fa6d8fa1b34cc9822ade386062dbd6ebc2cb5987479d4263bcfa554586cd
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 05efb5c92b..dafeae69a8 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
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 622baae85ab7776fc38cff17465e8e0dbcdb98f4ba74e734ca494b696cea8ccd
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 622baae85ab7776fc38cff17465e8e0dbcdb98f4ba74e734ca494b696cea8ccd
     canonicalized_ast: 622baae85ab7776fc38cff17465e8e0dbcdb98f4ba74e734ca494b696cea8ccd
     type_inferenced_ast: c604cecb0efbae6b8ea3d69909c5decbb06d6a2e95ff67661f5936ef8fd951a5
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 c02fa37f2f..15d4737f53 100644
--- a/tests/expectations/compiler/compiler/circuits/mut_self_variable.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/mut_self_variable.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: ba91ea172a2f753bf4a338f29fff05c358d4dc0cb1c2ef461d492ee4fe2a1114
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: ba91ea172a2f753bf4a338f29fff05c358d4dc0cb1c2ef461d492ee4fe2a1114
     canonicalized_ast: 8d1beaecc785aa79a5a6bec47cf10426b9d3d87ccc15c359f12c7d3ee2a95561
     type_inferenced_ast: 520a83004a666274e62958b6e2025d11ed5e24d888b6bc0ded6d01ee9a3bc634
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 267af77cd2..075d930428 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
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: fe7ca41c29d33107a4316b9c6788898217129937cbf1de0f2ea7566a360245f0
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: fe7ca41c29d33107a4316b9c6788898217129937cbf1de0f2ea7566a360245f0
     canonicalized_ast: d2b30a9485e7166a0efde9d179432e481a4d40540e1b3eeec043b84d993e66df
     type_inferenced_ast: 2c666d0e878095617bc562aa74de4fe069401b4a80ba8dba28a47a789f517ab5
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 61f679b913..1f3edc74a6 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
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 659e5fcdd16752c6e3504f821a5afd6f0756bd6b8641f127ba049c2a4c83a088
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 659e5fcdd16752c6e3504f821a5afd6f0756bd6b8641f127ba049c2a4c83a088
     canonicalized_ast: 8cf6113b757cfeee53554c67dd3f380f0f417032b8835259bf30076b19349f61
     type_inferenced_ast: d4106eb006385de5bf2a56a1ebaa25a65b048f77dda6fb9585c86a9260073585
diff --git a/tests/expectations/compiler/compiler/circuits/mut_variable.leo.out b/tests/expectations/compiler/compiler/circuits/mut_variable.leo.out
index 65de33a26e..2d1473ebfd 100644
--- a/tests/expectations/compiler/compiler/circuits/mut_variable.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/mut_variable.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 8c4a98dec3d2e9e826e3419c91a251e821861a146325b025c52ff15b5edefe1c
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 8c4a98dec3d2e9e826e3419c91a251e821861a146325b025c52ff15b5edefe1c
     canonicalized_ast: 8c4a98dec3d2e9e826e3419c91a251e821861a146325b025c52ff15b5edefe1c
     type_inferenced_ast: 2497671092bacab8cb5d75177298a700100bfa8412a48a7115d178e5d9816a6b
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 16c11effaa..3e206e0757 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
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 1f7de14429213b2b3b564d664c33e9cea134e1a157b861a1cf0ea1abc90b32f6
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 1f7de14429213b2b3b564d664c33e9cea134e1a157b861a1cf0ea1abc90b32f6
     canonicalized_ast: 94752f37ca7553267f341d2f96e657eb2fe6b5e403a4d3fb7d66d1662b81eb00
     type_inferenced_ast: e675411217f3465fdc23bab3c2f50c2264452d198ab3dd2e8059e546e54312a4
diff --git a/tests/expectations/compiler/compiler/circuits/pedersen_mock.leo.out b/tests/expectations/compiler/compiler/circuits/pedersen_mock.leo.out
index 0de421fa6d..ba7f2afaa3 100644
--- a/tests/expectations/compiler/compiler/circuits/pedersen_mock.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/pedersen_mock.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: c341e62f8a3940ddc9527bcd01c814f8d496a1f02ca903b080b6228d155af02b
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: c341e62f8a3940ddc9527bcd01c814f8d496a1f02ca903b080b6228d155af02b
     canonicalized_ast: 60cd9f24460e06522814151af817c9d394c779477091aab2c77c77dfe228b611
     type_inferenced_ast: 876f075ed034c8914b9f74f46f07bd6c2ed3e7d7f1ffb15e756da10e9ec9abf8
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 96a27fda30..e10652f432 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
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 5da09287f1d3a5e4ab57f8da2c8094df25c3b35614791e2f6e84a77b609f29b0
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 5da09287f1d3a5e4ab57f8da2c8094df25c3b35614791e2f6e84a77b609f29b0
     canonicalized_ast: de5114bff3425e0c67e9e70e3a0d02bdf2d6c3ed9108dac43a00b79d4db9b3d2
     type_inferenced_ast: 9a6f5ee1784a1af0a04736e1b3bc886107bbddc5d45bbabd59812d083acacdea
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 75889a45aa..ac229cd771 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
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 1dce719e850f6ca6a091fea163d5d6bb069bcdafeeed0a10fb332ba8837e6e5c
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 1dce719e850f6ca6a091fea163d5d6bb069bcdafeeed0a10fb332ba8837e6e5c
     canonicalized_ast: 3bd96f7e9530f426db4a2e12d5a93a5ebcafedbcb7b4549d08ad387fa15918d9
     type_inferenced_ast: 6bbb246f57aa199b9ef31b61b6e858004617455efe22393892bf0c22f552d69a
diff --git a/tests/expectations/compiler/compiler/circuits/self_member.leo.out b/tests/expectations/compiler/compiler/circuits/self_member.leo.out
index b5fba149a6..40907b9500 100644
--- a/tests/expectations/compiler/compiler/circuits/self_member.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/self_member.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: c2f6d0da67de691b14cffbdbe20eba613f2ea274c45aba4347045da2446b6af6
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: c2f6d0da67de691b14cffbdbe20eba613f2ea274c45aba4347045da2446b6af6
     canonicalized_ast: c2f6d0da67de691b14cffbdbe20eba613f2ea274c45aba4347045da2446b6af6
     type_inferenced_ast: 3bf3d109f59519ecbfd601c36a8cb89cfb36e1ace395e361860023b8f93fc220
diff --git a/tests/expectations/compiler/compiler/console/assert.leo.out b/tests/expectations/compiler/compiler/console/assert.leo.out
index 6addc9e4cb..7a1aa047e9 100644
--- a/tests/expectations/compiler/compiler/console/assert.leo.out
+++ b/tests/expectations/compiler/compiler/console/assert.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: bd23695040d06dbd59426b363ea66da8c9344aad064615d1b5beb6326933acbc
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: bd23695040d06dbd59426b363ea66da8c9344aad064615d1b5beb6326933acbc
     canonicalized_ast: bd23695040d06dbd59426b363ea66da8c9344aad064615d1b5beb6326933acbc
     type_inferenced_ast: 198e2817e4d6d454d7e1d1eba8226757d7f044b20e6dd4f6962530b177c469c5
diff --git a/tests/expectations/compiler/compiler/console/conditional_assert.leo.out b/tests/expectations/compiler/compiler/console/conditional_assert.leo.out
index d45cbd33ca..1fb87c4c58 100644
--- a/tests/expectations/compiler/compiler/console/conditional_assert.leo.out
+++ b/tests/expectations/compiler/compiler/console/conditional_assert.leo.out
@@ -17,6 +17,6 @@ outputs:
         output:
           registers: {}
     initial_ast: a7b374e2c0a97af2160b5f6faeadb17a12e8908c1a7b3d251194e6867fd98f07
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: a7b374e2c0a97af2160b5f6faeadb17a12e8908c1a7b3d251194e6867fd98f07
     canonicalized_ast: ebd1a1f28fafd6fc55c13f4c362ae9a13dee4717e41d99c23fd0d32c5fcdc526
     type_inferenced_ast: eb15aba7bdb3c3a2f776af8cb80f52f44d6d6ab60e5ee3c032ab4ec8a90a2436
diff --git a/tests/expectations/compiler/compiler/console/error.leo.out b/tests/expectations/compiler/compiler/console/error.leo.out
index cec1912da0..da322715ae 100644
--- a/tests/expectations/compiler/compiler/console/error.leo.out
+++ b/tests/expectations/compiler/compiler/console/error.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 2496cb4a0f1486bbacccee48e3b8b93999916e585e238a5c7d63c34235d15a36
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 2496cb4a0f1486bbacccee48e3b8b93999916e585e238a5c7d63c34235d15a36
     canonicalized_ast: 2496cb4a0f1486bbacccee48e3b8b93999916e585e238a5c7d63c34235d15a36
     type_inferenced_ast: aa056968c0d635d56e2ad011db4df7fec65b62eb7b0ca8ec5c75ca8fca0f33eb
diff --git a/tests/expectations/compiler/compiler/console/log.leo.out b/tests/expectations/compiler/compiler/console/log.leo.out
index a1dafc5455..6cf52c9b4d 100644
--- a/tests/expectations/compiler/compiler/console/log.leo.out
+++ b/tests/expectations/compiler/compiler/console/log.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 8421d5ef70b41b773b771cb1991a5120a556d13127fb1c6cf7bbd6328150c7d5
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 8421d5ef70b41b773b771cb1991a5120a556d13127fb1c6cf7bbd6328150c7d5
     canonicalized_ast: 8421d5ef70b41b773b771cb1991a5120a556d13127fb1c6cf7bbd6328150c7d5
     type_inferenced_ast: 34e28d45203ffd3ec760af7baf8db09cfb14584107951fc5803122c0fc13f0e2
diff --git a/tests/expectations/compiler/compiler/console/log_conditional.leo.out b/tests/expectations/compiler/compiler/console/log_conditional.leo.out
index f19a922cf7..d2c91fd30b 100644
--- a/tests/expectations/compiler/compiler/console/log_conditional.leo.out
+++ b/tests/expectations/compiler/compiler/console/log_conditional.leo.out
@@ -23,6 +23,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 389c0d4a68bf27db627b83d460a2947a2321a76fc73e727806a9fe8c7f63fe88
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 389c0d4a68bf27db627b83d460a2947a2321a76fc73e727806a9fe8c7f63fe88
     canonicalized_ast: 389c0d4a68bf27db627b83d460a2947a2321a76fc73e727806a9fe8c7f63fe88
     type_inferenced_ast: d5fe9155615c6ca70430e6b33661214f14844a61d5064ad56d388fea147abfd7
diff --git a/tests/expectations/compiler/compiler/console/log_input.leo.out b/tests/expectations/compiler/compiler/console/log_input.leo.out
index 44f4fff787..f185bd153a 100644
--- a/tests/expectations/compiler/compiler/console/log_input.leo.out
+++ b/tests/expectations/compiler/compiler/console/log_input.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: de5d7719988638c095aba736ca2e09c2037be42e22c3b29bc2c07705e7bfd6ee
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: de5d7719988638c095aba736ca2e09c2037be42e22c3b29bc2c07705e7bfd6ee
     canonicalized_ast: de5d7719988638c095aba736ca2e09c2037be42e22c3b29bc2c07705e7bfd6ee
     type_inferenced_ast: 8e6fed7036467ea6116184b59b25589393393308a1c1fe963dc0ac4a9e76481a
diff --git a/tests/expectations/compiler/compiler/console/log_parameter.leo.out b/tests/expectations/compiler/compiler/console/log_parameter.leo.out
index a3d9f2cf2e..3d65eacddb 100644
--- a/tests/expectations/compiler/compiler/console/log_parameter.leo.out
+++ b/tests/expectations/compiler/compiler/console/log_parameter.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 97523a5fea528d3defe4ddc2fa7b0a8af6b4ea8a364893c62c467f759cb4ee3f
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 97523a5fea528d3defe4ddc2fa7b0a8af6b4ea8a364893c62c467f759cb4ee3f
     canonicalized_ast: 97523a5fea528d3defe4ddc2fa7b0a8af6b4ea8a364893c62c467f759cb4ee3f
     type_inferenced_ast: 613f187637adb705d9b61d73f3dd074de1443bc619326e2fd51fa8f722579f82
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 5bc16930dd..e294fa474c 100644
--- a/tests/expectations/compiler/compiler/console/log_parameter_many.leo.out
+++ b/tests/expectations/compiler/compiler/console/log_parameter_many.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: af681f8f7631db769ad1f0b9822b86407fb04871adb16e1069b83ee85b6cda3e
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: af681f8f7631db769ad1f0b9822b86407fb04871adb16e1069b83ee85b6cda3e
     canonicalized_ast: af681f8f7631db769ad1f0b9822b86407fb04871adb16e1069b83ee85b6cda3e
     type_inferenced_ast: c9824cee4e17d7cdb31526d24ed5aea45f719596b8dad46f4aec822fbff92e50
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 4f8849dbea..ea0de75b49 100644
--- a/tests/expectations/compiler/compiler/definition/out_of_order.leo.out
+++ b/tests/expectations/compiler/compiler/definition/out_of_order.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 2b8f9e74a55ef80fa57c803636de64003b225c4cc4b826d0feba3be380ec0b32
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 2b8f9e74a55ef80fa57c803636de64003b225c4cc4b826d0feba3be380ec0b32
     canonicalized_ast: 56bb9f0f648dde5fd777de5bba07c44218022d1b91410b6b111bf49fb119588d
     type_inferenced_ast: ef607716cf7d424af7888a58b121cf8c43a173424d06b04d8530f0db96dd2c31
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 48e8b02766..e0d71173c8 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
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 53fcf08b3818e474a00c1cb70aca58d29bb956611ffdd069a242ef2633af6c50
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 80581d0ec6076d59b9fbaff32b646df1120b6ca28cdfe69482cbec641e7e3a1a
     canonicalized_ast: 57c3de1d28c5b809c265e221ad26d3970445174a2edf2b0f22995e4eb6ffd807
     type_inferenced_ast: ca53699361b6d4aa80b2f733df6f39bd1a279d68336c2c6cbf196897a26b5e2a
diff --git a/tests/expectations/compiler/compiler/field/add.leo.out b/tests/expectations/compiler/compiler/field/add.leo.out
index 29aad98df9..2238b1d873 100644
--- a/tests/expectations/compiler/compiler/field/add.leo.out
+++ b/tests/expectations/compiler/compiler/field/add.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: dc99169bc40dff6491c84f2b70dc970fb74d8bcb139ce23ab2b0da5bff720430
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: dc99169bc40dff6491c84f2b70dc970fb74d8bcb139ce23ab2b0da5bff720430
     canonicalized_ast: dc99169bc40dff6491c84f2b70dc970fb74d8bcb139ce23ab2b0da5bff720430
     type_inferenced_ast: 50e3aacddace87d41cc0c5ec8b9819a5c40ca1c9c3574ea883b85b8fd77c1cc3
diff --git a/tests/expectations/compiler/compiler/field/div.leo.out b/tests/expectations/compiler/compiler/field/div.leo.out
index bd65440bff..b39950d9e7 100644
--- a/tests/expectations/compiler/compiler/field/div.leo.out
+++ b/tests/expectations/compiler/compiler/field/div.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 4f93fba73bf22c15fd88cd83958c1d096f5fcdfbe1c95e871f14cd672e4790e8
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 4f93fba73bf22c15fd88cd83958c1d096f5fcdfbe1c95e871f14cd672e4790e8
     canonicalized_ast: 4f93fba73bf22c15fd88cd83958c1d096f5fcdfbe1c95e871f14cd672e4790e8
     type_inferenced_ast: 9b23dc524ac18ebeb198dde3e95d00cf452183cbfe0652c232a7ae0b29d4f34e
diff --git a/tests/expectations/compiler/compiler/field/eq.leo.out b/tests/expectations/compiler/compiler/field/eq.leo.out
index c26f23e403..19bf013d51 100644
--- a/tests/expectations/compiler/compiler/field/eq.leo.out
+++ b/tests/expectations/compiler/compiler/field/eq.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 279038173ca3a2bbeaefe14da8c79f4da2a885f59626a7ebc05a512f38a96e79
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 279038173ca3a2bbeaefe14da8c79f4da2a885f59626a7ebc05a512f38a96e79
     canonicalized_ast: 279038173ca3a2bbeaefe14da8c79f4da2a885f59626a7ebc05a512f38a96e79
     type_inferenced_ast: 0c67233c225770430cb57c611f70eeb248a7892884b140aa4e141c9a46bb48b8
diff --git a/tests/expectations/compiler/compiler/field/field.leo.out b/tests/expectations/compiler/compiler/field/field.leo.out
index a6f819a59c..3c66b486b6 100644
--- a/tests/expectations/compiler/compiler/field/field.leo.out
+++ b/tests/expectations/compiler/compiler/field/field.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: ab26194ed8eb600aca9329f95d1d34f567f8f23a7f3abf1bd374d68fedf835ab
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: ab26194ed8eb600aca9329f95d1d34f567f8f23a7f3abf1bd374d68fedf835ab
     canonicalized_ast: ab26194ed8eb600aca9329f95d1d34f567f8f23a7f3abf1bd374d68fedf835ab
     type_inferenced_ast: a129961f338ed15ef697362226422a48534480c0985c5023ea5183e9150cba07
diff --git a/tests/expectations/compiler/compiler/field/mul.leo.out b/tests/expectations/compiler/compiler/field/mul.leo.out
index 8435a4f124..ca464c6b39 100644
--- a/tests/expectations/compiler/compiler/field/mul.leo.out
+++ b/tests/expectations/compiler/compiler/field/mul.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "false"
     initial_ast: 8d0d2d5203583fe24eb60eb496dcdc3a83066ad82a8b5e92d35ab6b803e029ea
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 8d0d2d5203583fe24eb60eb496dcdc3a83066ad82a8b5e92d35ab6b803e029ea
     canonicalized_ast: 8d0d2d5203583fe24eb60eb496dcdc3a83066ad82a8b5e92d35ab6b803e029ea
     type_inferenced_ast: 09780678c1e754f760bf08f1aecc706c058ffa6b73885dd5440f40e6354ac926
diff --git a/tests/expectations/compiler/compiler/field/negate.leo.out b/tests/expectations/compiler/compiler/field/negate.leo.out
index 73b3375f44..542372e6d8 100644
--- a/tests/expectations/compiler/compiler/field/negate.leo.out
+++ b/tests/expectations/compiler/compiler/field/negate.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: cbae2cc36e7902468336fe1356e7de41a43288ebfd6b024251086b9d8a32cec5
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: cbae2cc36e7902468336fe1356e7de41a43288ebfd6b024251086b9d8a32cec5
     canonicalized_ast: cbae2cc36e7902468336fe1356e7de41a43288ebfd6b024251086b9d8a32cec5
     type_inferenced_ast: bd4b2bb9ce68719f78756803cbcde2f7dc0aa09f1f2612fa909bd2df39816dfb
diff --git a/tests/expectations/compiler/compiler/function/array_input.leo.out b/tests/expectations/compiler/compiler/function/array_input.leo.out
index 298662390d..397414838c 100644
--- a/tests/expectations/compiler/compiler/function/array_input.leo.out
+++ b/tests/expectations/compiler/compiler/function/array_input.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: e53134e16501c1dc8fcc1fa68e513aa486d6b4ee2c3ce762da4b45b8f06029d1
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: e53134e16501c1dc8fcc1fa68e513aa486d6b4ee2c3ce762da4b45b8f06029d1
     canonicalized_ast: 9024b75cbe9df679b3b0473589f2a1698bfc340d125c9bd76562d9e92548b945
     type_inferenced_ast: 5c1f49685a0e099ecd11607a35c6e67c97d5dec8551c153cd5789e07006b1318
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 8445c2656a..c391a82254 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
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 8541fbc5a256e744d4939e6e221565a0bada891ed6269eceb3a84b288bdeadcc
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 8541fbc5a256e744d4939e6e221565a0bada891ed6269eceb3a84b288bdeadcc
     canonicalized_ast: b43be48e63718566c98d68fb855f0de85845855b9eb80f7929205db537bc1da2
     type_inferenced_ast: 558ac6d5261ca88b84d1a26447cf01b6e250fecc219441e0b4cb82d31c2e4dcc
diff --git a/tests/expectations/compiler/compiler/function/conditional_return.leo.out b/tests/expectations/compiler/compiler/function/conditional_return.leo.out
index ecb08e82ea..268f73fc7a 100644
--- a/tests/expectations/compiler/compiler/function/conditional_return.leo.out
+++ b/tests/expectations/compiler/compiler/function/conditional_return.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: u32
               value: "4"
     initial_ast: cf2d49dcd581c923b4ccfeb9c155de0e836fb8725c3c3af7abc5e6334231ba2f
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: cf2d49dcd581c923b4ccfeb9c155de0e836fb8725c3c3af7abc5e6334231ba2f
     canonicalized_ast: cf2d49dcd581c923b4ccfeb9c155de0e836fb8725c3c3af7abc5e6334231ba2f
     type_inferenced_ast: 085d3126391766edfb8cd9b92bff04cb67175fea26de3ff127392f4aab681cf8
diff --git a/tests/expectations/compiler/compiler/function/empty.leo.out b/tests/expectations/compiler/compiler/function/empty.leo.out
index 6b15eec505..0cf4e77f14 100644
--- a/tests/expectations/compiler/compiler/function/empty.leo.out
+++ b/tests/expectations/compiler/compiler/function/empty.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: cab7d9499f0129277addc5a322ee12374593a292749c88220555b8ec73a0855a
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: cab7d9499f0129277addc5a322ee12374593a292749c88220555b8ec73a0855a
     canonicalized_ast: e95711f5d76b04852f206614b42e6e38cc83b307d617e4eaaca8ade4c65e1c7b
     type_inferenced_ast: fede77484a950576c3362c642eb3225e51c7a1ad0998950eb77cdd66630f92de
diff --git a/tests/expectations/compiler/compiler/function/iteration.leo.out b/tests/expectations/compiler/compiler/function/iteration.leo.out
index f61ddfeb50..07abe01cec 100644
--- a/tests/expectations/compiler/compiler/function/iteration.leo.out
+++ b/tests/expectations/compiler/compiler/function/iteration.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: a608123169470d0c7e940599945a527f8516b010c900464bc649db94167ee6e0
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: a608123169470d0c7e940599945a527f8516b010c900464bc649db94167ee6e0
     canonicalized_ast: 721cf0941964bdfd4835cb367fa7c472ad612ad214686ce4ca7f264faf43b0fd
     type_inferenced_ast: ff52c35a361f5669d3f9ba5ec58b740c190bb3737a8e2e0485d41f8ace63a7d4
diff --git a/tests/expectations/compiler/compiler/function/iteration_repeated.leo.out b/tests/expectations/compiler/compiler/function/iteration_repeated.leo.out
index 3704be439e..6050614409 100644
--- a/tests/expectations/compiler/compiler/function/iteration_repeated.leo.out
+++ b/tests/expectations/compiler/compiler/function/iteration_repeated.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 45b332b088617597f7367003f3cf7c6bf00a69a490f2c64eed1e622eb099d2b6
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 45b332b088617597f7367003f3cf7c6bf00a69a490f2c64eed1e622eb099d2b6
     canonicalized_ast: 71c61b47872ad3a5e9724e6d7bcb315eb06f00234bcbb2ab801861f9561bc9ff
     type_inferenced_ast: 038d42871e44b9d120c49d4465ebf2551af030799827c08363c0a032f3ba712e
diff --git a/tests/expectations/compiler/compiler/function/multiple_returns.leo.out b/tests/expectations/compiler/compiler/function/multiple_returns.leo.out
index 9039a2abca..24c8f41281 100644
--- a/tests/expectations/compiler/compiler/function/multiple_returns.leo.out
+++ b/tests/expectations/compiler/compiler/function/multiple_returns.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: c43d366baa8a13cae723e98783ec3afc4efd25da0e9c075b2719af866c142c31
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: c43d366baa8a13cae723e98783ec3afc4efd25da0e9c075b2719af866c142c31
     canonicalized_ast: c43d366baa8a13cae723e98783ec3afc4efd25da0e9c075b2719af866c142c31
     type_inferenced_ast: cd99ea6925a98417f259aa058291494bb866060239e6c36715960f75f1497c2a
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 29a1760d7c..48df2bb219 100644
--- a/tests/expectations/compiler/compiler/function/multiple_returns_main.leo.out
+++ b/tests/expectations/compiler/compiler/function/multiple_returns_main.leo.out
@@ -20,6 +20,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: f8b2853c4b5db8f5e8402455ceae54d8ae421c4b950d15fc88fe9f9c9a9701b8
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: f8b2853c4b5db8f5e8402455ceae54d8ae421c4b950d15fc88fe9f9c9a9701b8
     canonicalized_ast: f8b2853c4b5db8f5e8402455ceae54d8ae421c4b950d15fc88fe9f9c9a9701b8
     type_inferenced_ast: 8a3cbc4e3f51c432179167c22247efecc49afe8990c5b2e5a1eb757d0f5adad9
diff --git a/tests/expectations/compiler/compiler/function/newlines.leo.out b/tests/expectations/compiler/compiler/function/newlines.leo.out
index ee1310c76e..f786c38c0d 100644
--- a/tests/expectations/compiler/compiler/function/newlines.leo.out
+++ b/tests/expectations/compiler/compiler/function/newlines.leo.out
@@ -20,6 +20,6 @@ outputs:
               type: u32
               value: "0"
     initial_ast: 659826ae1cff74192eca6a5936459d0ec78b73a389516602b4d04cf6b80b1004
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 659826ae1cff74192eca6a5936459d0ec78b73a389516602b4d04cf6b80b1004
     canonicalized_ast: 659826ae1cff74192eca6a5936459d0ec78b73a389516602b4d04cf6b80b1004
     type_inferenced_ast: 9b105138d6298e591c2882c5162f18c4f0dc223ab4128e09ce35b44ad14d2269
diff --git a/tests/expectations/compiler/compiler/function/repeated.leo.out b/tests/expectations/compiler/compiler/function/repeated.leo.out
index 08a173b659..194613e53c 100644
--- a/tests/expectations/compiler/compiler/function/repeated.leo.out
+++ b/tests/expectations/compiler/compiler/function/repeated.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 46f6995392feecd25891b21595f4c575527c5d589d2fe9da94c6ac4bf8e9e7ea
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 46f6995392feecd25891b21595f4c575527c5d589d2fe9da94c6ac4bf8e9e7ea
     canonicalized_ast: 46f6995392feecd25891b21595f4c575527c5d589d2fe9da94c6ac4bf8e9e7ea
     type_inferenced_ast: 06a0c346db5203f1f3db18eff7c5cf26f6f82aba1ff8b5696bdce5df09dd1b28
diff --git a/tests/expectations/compiler/compiler/function/return.leo.out b/tests/expectations/compiler/compiler/function/return.leo.out
index cbad5c05d1..5a31d2fb98 100644
--- a/tests/expectations/compiler/compiler/function/return.leo.out
+++ b/tests/expectations/compiler/compiler/function/return.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: e90708076fd49dc98d0de821c59d48efbf93b106e50fb43c10583a29b2c34336
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: e90708076fd49dc98d0de821c59d48efbf93b106e50fb43c10583a29b2c34336
     canonicalized_ast: e90708076fd49dc98d0de821c59d48efbf93b106e50fb43c10583a29b2c34336
     type_inferenced_ast: de9f76b0880df3267d0031ecf46d21907a338ef64455ffac3aaf3ef6111148f6
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 a47683787e..046e409de6 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
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: e6ef0c39821512fd98748cd7d9da04102fff12d3f9332aeb815b36870a3ff0c5
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: e6ef0c39821512fd98748cd7d9da04102fff12d3f9332aeb815b36870a3ff0c5
     canonicalized_ast: ed7a3f6a24fa1a3a9e7b4cc8c97ce09440fb9d46123a4e310e44afb58a1a1de6
     type_inferenced_ast: a0aa0fb8a603954c8370d3520394910163acb807ec344d14b6a26f14f2912262
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 1d2b00ca48..b11f8bf73b 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
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: eb9e4ceedbd5812235005bd1f6b113fb8558b59f87acb3df796ff08b15ec14ca
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: eb9e4ceedbd5812235005bd1f6b113fb8558b59f87acb3df796ff08b15ec14ca
     canonicalized_ast: 9d46523fc611325b41481c2084e8eb9215573cc46d69b8aa5082bc9489bd9f44
     type_inferenced_ast: 0f025d6f74e4ca27c52316acd2efcb4cc4158d1ba9ea6f79a46f4e417b918173
diff --git a/tests/expectations/compiler/compiler/function/return_tuple.leo.out b/tests/expectations/compiler/compiler/function/return_tuple.leo.out
index 7c9d629efa..7d3dd37c72 100644
--- a/tests/expectations/compiler/compiler/function/return_tuple.leo.out
+++ b/tests/expectations/compiler/compiler/function/return_tuple.leo.out
@@ -20,6 +20,6 @@ outputs:
               type: u32
               value: "103"
     initial_ast: 3818078d8b7b34d11b38a9e53d326543a357f4db169acc32a52e2b08a8126602
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 3818078d8b7b34d11b38a9e53d326543a357f4db169acc32a52e2b08a8126602
     canonicalized_ast: 3818078d8b7b34d11b38a9e53d326543a357f4db169acc32a52e2b08a8126602
     type_inferenced_ast: 3eb5fbe370ce358e9d00865a230bb5eb6f2cfdb85f30408a164da43dfe16277d
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 931f6aa29e..0d26ed29e9 100644
--- a/tests/expectations/compiler/compiler/function/return_tuple_conditional.leo.out
+++ b/tests/expectations/compiler/compiler/function/return_tuple_conditional.leo.out
@@ -20,6 +20,6 @@ outputs:
               type: u32
               value: "1"
     initial_ast: 6fc23eeb1a55273b0089acff714d6eb2952c3380c262d8e577c123659e501553
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 6fc23eeb1a55273b0089acff714d6eb2952c3380c262d8e577c123659e501553
     canonicalized_ast: 6fc23eeb1a55273b0089acff714d6eb2952c3380c262d8e577c123659e501553
     type_inferenced_ast: 43750961183eda5acb2302e5a9d9daf2809ee2f34d6ed53ec6494c867d0788a8
diff --git a/tests/expectations/compiler/compiler/function/value_unchanged.leo.out b/tests/expectations/compiler/compiler/function/value_unchanged.leo.out
index d1f97bfc17..91e5ab153c 100644
--- a/tests/expectations/compiler/compiler/function/value_unchanged.leo.out
+++ b/tests/expectations/compiler/compiler/function/value_unchanged.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: d70652e4acf04c7036a90f79e5bd61b60d37c2198fcccff97a9033f5bf3c9a1b
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: d70652e4acf04c7036a90f79e5bd61b60d37c2198fcccff97a9033f5bf3c9a1b
     canonicalized_ast: ca06a00411c276665b7f9cab072e87bb6c4225406aa58703ace0c9db33c4535d
     type_inferenced_ast: 830057c5a032606c73f38792b8efcc8bd99f7e167482875715cd3db538bcd8f1
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 e866588634..1f8e049ff5 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
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "false"
     initial_ast: b4e5073c07791c4726b69f3e60ec66ccebefb7a3811f4a3576fc4042f8c80114
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: b4e5073c07791c4726b69f3e60ec66ccebefb7a3811f4a3576fc4042f8c80114
     canonicalized_ast: 03a4e0ffc6deea9c6500a9d91eb683a780e8f5961801bea1aab26c14e4543325
     type_inferenced_ast: 66d0a55ff2ab6931d5806dcbb2ff23f9dbc41a883f19a45af8a41d3be84e136d
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 1a58d1da3a..7e534a8e9f 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
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 879c62f85e5eb066be85524e22d73775a649468ee2d42ff96451abefc1529b28
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: d9bba4501a505c68c5256e0f8177a490126f99945c3f53c42471b466ec0e6377
     canonicalized_ast: cec8aa804ed735a7cf6504445621c5d5fdc214366e665aaf1e8b3d6e5ee1ff75
     type_inferenced_ast: 909a8409502b79921a81e425ca9e748a69411ac5ad0c809249b9b82d635a8533
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 05184b21f3..9e299f3691 100644
--- a/tests/expectations/compiler/compiler/import_local/import_all.leo.out
+++ b/tests/expectations/compiler/compiler/import_local/import_all.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 6e689aa459b9ea2fa0c18c9dc0f2512db9d430f5c7101cb3104a275711d60210
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: c4260b58a631ee77b0492ba1354182b2c95d260dcf01a62e2a0797eb5f268478
     canonicalized_ast: 7e2eaf52ce5c79242b44357609ab667df411190bf7a11228d240c314f0ce0502
     type_inferenced_ast: be897b5b17a946c2595afcc8a802df5fa4e013ba3acb4159a0123d7cf1941544
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 a6bee19652..c31d7c3d2f 100644
--- a/tests/expectations/compiler/compiler/import_local/import_as.leo.out
+++ b/tests/expectations/compiler/compiler/import_local/import_as.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 411dd9625db7686b2cdc3546042b29bc1e51d023b14b0b8397c22bb4db825a77
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 3dfd262969fe1c4bd78e4deb971f29b5afa64b540ef60c0a892399ba9f9d20be
     canonicalized_ast: e7d378e3ff24b63d8a6ec0e2ae1c30148ed9f2028eb80bcf224d55efa3303fd1
     type_inferenced_ast: d98bff9e38944b9423e8bf2b463d081920d079db600cc8eec3a4d6ba96716745
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 27866e582e..c672b24d18 100644
--- a/tests/expectations/compiler/compiler/import_local/import_dir.leo.out
+++ b/tests/expectations/compiler/compiler/import_local/import_dir.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 105b64dc1443f190ae9034a4b1f0a7c4fbbb104482aed9b7b843c19d16b3aaa0
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: e7a789c2f6fb7b5c5fdbb5760cd9700ff256985c860df18e7f30dc5df4d392cf
     canonicalized_ast: f62ac8e2461d1ba60ecb95399945f0a22999bbac751c56927f505f75138b90c2
     type_inferenced_ast: 3cb02077dd4fffa806a72c61dacca999d404821c3301ea52d2854d86fa65c20a
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 8915dded99..81bd6d66e8 100644
--- a/tests/expectations/compiler/compiler/import_local/import_files.leo.out
+++ b/tests/expectations/compiler/compiler/import_local/import_files.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 17ec836ed9b5f45fbf2b55fc9f7ae5c75d59902113f3e099141b3acbcf9ccb11
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: ad65dc58d894dad3f8ff60db45610e89f7b7a9ca8bad1bba405d4fbe9b29f240
     canonicalized_ast: 9164f55bdd309c60e5d7cd5842aeb10227fb61884639c7661811b1be9cb134fe
     type_inferenced_ast: 741f2ae43a36b8775a733aaaf736ae7df67ec0b8e57bb94425710760b8459d31
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 3ae3d13872..551b30394a 100644
--- a/tests/expectations/compiler/compiler/import_local/import_many.leo.out
+++ b/tests/expectations/compiler/compiler/import_local/import_many.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: ae6826642faa492e34507695dbd11e5b44c319aecb0b1e78b29ce03ae446d907
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: e08b138c63ede9de6e090e6b7fbcfbbc27a1ae49b032a6cffcafaa8f76410839
     canonicalized_ast: e08b138c63ede9de6e090e6b7fbcfbbc27a1ae49b032a6cffcafaa8f76410839
     type_inferenced_ast: b311680f4429cc16661f774b0547936be148a3dd9f478013adefe575629b88fa
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 874b622628..8932b70d43 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
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 41aa6d44d33c491b1f66bb2e3d8a6882b43822b211e3e2ac8add332be00535fb
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 1e06d16faa2b57dfac9628bdb7d288a24b8cdaeed152b0bb1c1bbcfdbd54dd72
     canonicalized_ast: 1e06d16faa2b57dfac9628bdb7d288a24b8cdaeed152b0bb1c1bbcfdbd54dd72
     type_inferenced_ast: 27a376c64ada78a53a328326b0a5592bf683dc036cf1a3f5a15621405678a427
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 c55d0fbf8a..acb4a60b7e 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
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: bb86f336b58de89c79741628133e6aa997f3f49a6f066b8c054261e91e3f18a8
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 1fe862bf85cf0c88ce3c52066118d544f367984dbe97665b2719281de15c449c
     canonicalized_ast: 1fe862bf85cf0c88ce3c52066118d544f367984dbe97665b2719281de15c449c
     type_inferenced_ast: d8f6f5bde53232553d1ff891e7f78823645d9a8984139d06409cb2ccde562e76
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 f630f946e0..718b98b089 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
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: e729490bdc66ccc317a772b7ccc583a24a5de9dddf0c9d5b1f3eef8623e6a569
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: e729490bdc66ccc317a772b7ccc583a24a5de9dddf0c9d5b1f3eef8623e6a569
     canonicalized_ast: e729490bdc66ccc317a772b7ccc583a24a5de9dddf0c9d5b1f3eef8623e6a569
     type_inferenced_ast: 05f1d5a501376bbcbfac394be538319ab70e516dd9d3b2d7261f840c5c9e5d8d
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 acf6304ead..870a57e321 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
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: ded49ef329b1c709191a4f6d85c43787e7091b82eb5813f618bf377e7c27a47c
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: ded49ef329b1c709191a4f6d85c43787e7091b82eb5813f618bf377e7c27a47c
     canonicalized_ast: ded49ef329b1c709191a4f6d85c43787e7091b82eb5813f618bf377e7c27a47c
     type_inferenced_ast: 5f12b94ae74deaac2dcc82ae1ee611bd1d1e837a2211722a11cc904790aa4d60
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 07575a500e..79d5ab3f9b 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
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 28776a06ced3fbb9476dd3abdca0d6d5444c621c26b6883f07d03f2d437677b7
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 28776a06ced3fbb9476dd3abdca0d6d5444c621c26b6883f07d03f2d437677b7
     canonicalized_ast: 28776a06ced3fbb9476dd3abdca0d6d5444c621c26b6883f07d03f2d437677b7
     type_inferenced_ast: 2bca0f0f14ac8d4eb281b8ce8d612c15a4209b765b68140b5a4b7efefdec5eea
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 af740893b3..0dbd0e966a 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
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "false"
     initial_ast: d5808d80af60a541768c6ac9f7ce7371cee9654d6f102c1fa4d9be22169d7fae
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: d5808d80af60a541768c6ac9f7ce7371cee9654d6f102c1fa4d9be22169d7fae
     canonicalized_ast: d5808d80af60a541768c6ac9f7ce7371cee9654d6f102c1fa4d9be22169d7fae
     type_inferenced_ast: 84667daeb71be0318df27b0172d186013b8eaae16a75a3676d7f4a6366ef9dbc
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 32e23c5ab4..a87a815581 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
@@ -14,6 +14,6 @@ outputs:
         output:
           registers: {}
     initial_ast: 731684bc8e22a3bbde7816d4f9ddc4db9561244b81caff4ef23e90ab5949ef60
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 731684bc8e22a3bbde7816d4f9ddc4db9561244b81caff4ef23e90ab5949ef60
     canonicalized_ast: d4b3e34c002f7dd2bfb3b12b5028d44a84113e9c9a2d22d7576763cd59c7521b
     type_inferenced_ast: 326c07a3eae5f211848b943adcb05103121e0b241967bfd4a545ff6f6566f699
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 35b25acbe1..0f10b6a61a 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
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: f74b907c08c1bfd4d2afc9df5589bc2aed1923db5e858c5cc6046f5aed735cf2
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: f74b907c08c1bfd4d2afc9df5589bc2aed1923db5e858c5cc6046f5aed735cf2
     canonicalized_ast: f80f2c0fd5fa415c5ca0b8295d918a884ae8590f5f9760947ca5a0513f531f73
     type_inferenced_ast: a866c7acc69cab458f8b6fe729b35cfd4fc66d578155382d130b24e2e092df8b
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 f8f792986e..1f690616a0 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
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 094effa7fe12695679a571f560e1d3e8c299cde8de280f9309010c85f48bab95
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 094effa7fe12695679a571f560e1d3e8c299cde8de280f9309010c85f48bab95
     canonicalized_ast: 094effa7fe12695679a571f560e1d3e8c299cde8de280f9309010c85f48bab95
     type_inferenced_ast: ab25cb7bf7d8fe3ec64be183550ba8d6acfaf17464cf70ec45c6497fc065ac29
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 0b3535aab0..0c516a8133 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
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: a2b01e8b8d8311d8a890b0e008689dc890b104d2b6fcfc82a16e1e45975ea68b
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: a2b01e8b8d8311d8a890b0e008689dc890b104d2b6fcfc82a16e1e45975ea68b
     canonicalized_ast: 8774633846aa1d61e6534c0e930777ba9452aa7368116928ba1188501d30a495
     type_inferenced_ast: be4ce222d81884b156c4fd0567755685283f7502ab192fcfaf562f0b0737a2e0
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 bf646d18ab..9c084bd2f6 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
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 01b9440246bf141fbdc27ab27f53d1b4f42415fb70a2f4d838d0a3a542fe7133
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 01b9440246bf141fbdc27ab27f53d1b4f42415fb70a2f4d838d0a3a542fe7133
     canonicalized_ast: 01b9440246bf141fbdc27ab27f53d1b4f42415fb70a2f4d838d0a3a542fe7133
     type_inferenced_ast: 2c84fc650ddadfb9a335688f4490156e05a5c5ea1b3ac935d8d5f2f2d3cd8c58
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 804afe444d..49969669f4 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
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: dc7f40a1cfc4daa659784bf538f1273145b430875116ef1aad7fd778dcb5f736
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: dc7f40a1cfc4daa659784bf538f1273145b430875116ef1aad7fd778dcb5f736
     canonicalized_ast: dc7f40a1cfc4daa659784bf538f1273145b430875116ef1aad7fd778dcb5f736
     type_inferenced_ast: f86a95c627e69d54fd6f1f651eda77cfc1ac1fab33b1ef8bbe5bf511a8c4beb7
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 cd95710df6..b284218dd5 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
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 6b051c3f9ce82efb30d3ba89764cc9c2607a126cb0cede72ad55ecda6c9d996d
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 6b051c3f9ce82efb30d3ba89764cc9c2607a126cb0cede72ad55ecda6c9d996d
     canonicalized_ast: 6b051c3f9ce82efb30d3ba89764cc9c2607a126cb0cede72ad55ecda6c9d996d
     type_inferenced_ast: 3c04200d560739b0d551204b65e56abc11f26843b99aa0361362f61f0d6a3328
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 7713a1c18b..4794c19048 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
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 815bdfe9a6fb4bb4795686872a62882c0a953e7a5313ef7da066b11770fcb089
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 815bdfe9a6fb4bb4795686872a62882c0a953e7a5313ef7da066b11770fcb089
     canonicalized_ast: 815bdfe9a6fb4bb4795686872a62882c0a953e7a5313ef7da066b11770fcb089
     type_inferenced_ast: 437a14fea047eb893748b86f8a5cedb18ae7960ea92a5075b5a215125cc27863
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 ab471f7938..6f82dd1cdb 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
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 48d4334146fe85c3bf1cdd75bcf4bf5026e50bb04b624ddbe1fc9d0eb3e510a3
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 48d4334146fe85c3bf1cdd75bcf4bf5026e50bb04b624ddbe1fc9d0eb3e510a3
     canonicalized_ast: 48d4334146fe85c3bf1cdd75bcf4bf5026e50bb04b624ddbe1fc9d0eb3e510a3
     type_inferenced_ast: 90903b46ecc931e02742ad4caa7dce04f5efe18cad4260d1c9de5c29cf378a93
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 bc7d9b5c14..1432cad627 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
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 54251e3a72e7c6743344cb585df6b89aef0d5b965aa13d090e89044209bf647a
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 54251e3a72e7c6743344cb585df6b89aef0d5b965aa13d090e89044209bf647a
     canonicalized_ast: 54251e3a72e7c6743344cb585df6b89aef0d5b965aa13d090e89044209bf647a
     type_inferenced_ast: b3a96fc8bbfda13b19f509c3ed5bed3908ca929219581c8d7b56bb7f81590770
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 c833b09910..f47c13cea4 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
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "false"
     initial_ast: 24edf3e347b161cb68d4dd19a0a56b457ee1f1668a29ad637ff22eaa0cbb384e
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 24edf3e347b161cb68d4dd19a0a56b457ee1f1668a29ad637ff22eaa0cbb384e
     canonicalized_ast: 24edf3e347b161cb68d4dd19a0a56b457ee1f1668a29ad637ff22eaa0cbb384e
     type_inferenced_ast: 85af373372ad915f6633a0099e914ddc05e70f7d5fd92ad25be47c3627c68149
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 5dc3112f9b..21cd56b63c 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
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: d6802e04fa242223923742fc9e82345b67b73138d867608c62c55999a356691d
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: d6802e04fa242223923742fc9e82345b67b73138d867608c62c55999a356691d
     canonicalized_ast: d6802e04fa242223923742fc9e82345b67b73138d867608c62c55999a356691d
     type_inferenced_ast: 0c53a395040f8aea133164e05ad0496f712ebd082228a635b4d181c9f4508127
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 db6ef6d252..4952ae0921 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
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 473f66e852f694cee2d87935eee5fe7306ee404b935515ad400a06872b124e5b
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 473f66e852f694cee2d87935eee5fe7306ee404b935515ad400a06872b124e5b
     canonicalized_ast: 13943d9f8f5fb1fc9e5f9f025d3a09bc59db16494c5c225b7e4b8a7a53893c51
     type_inferenced_ast: 95eb1672ac750fbac9e1fe689a8516c00f83108e156ddda9d6cd69003d50a222
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 2a3795a54e..8a3f5633c2 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
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 0fe6762404e0aeb23e1adaec3a6ab638b06843ecea823306f364cf1aedd4fd07
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 0fe6762404e0aeb23e1adaec3a6ab638b06843ecea823306f364cf1aedd4fd07
     canonicalized_ast: 0fe6762404e0aeb23e1adaec3a6ab638b06843ecea823306f364cf1aedd4fd07
     type_inferenced_ast: 94ed42f51b4f47128964754310daf696a8bcd47e3e94e23d3e90bc2132dc9682
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 eaf3674cdf..9b1ad3623e 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
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 4eee03b645a71b2cbe735305679051d2292f219f5db6ffc2bbb539188c6b377a
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 4eee03b645a71b2cbe735305679051d2292f219f5db6ffc2bbb539188c6b377a
     canonicalized_ast: 8f1fdffc6178e5375519646b43359d4e067a897c2ca2e360b67dbfc5523103d3
     type_inferenced_ast: d177e4046f5c7fde3ad62e66677db285279075784874f9961dec6a445d65278d
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 e686476d3a..63b0e047a4 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
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 2c4ba5703d0e1adf9d8ba82a2369531fe720fddce8da06eedb189c2a78f12b01
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 2c4ba5703d0e1adf9d8ba82a2369531fe720fddce8da06eedb189c2a78f12b01
     canonicalized_ast: 2c4ba5703d0e1adf9d8ba82a2369531fe720fddce8da06eedb189c2a78f12b01
     type_inferenced_ast: a75332a525dafba95c50a29eac05374ebf52b6ae7717966d15dec81ce1bd8623
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 3303a3e0d6..b6092883b1 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
@@ -17,6 +17,6 @@ outputs:
               type: "[[u8; 4]; 2]"
               value: "\"[0, 0, 0, 0][0, 0, 0, 0]\""
     initial_ast: 010d0b94b6ddb74416025e35b34ce1c7feb5a768d8bf0f733c530f49b00f70c4
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 010d0b94b6ddb74416025e35b34ce1c7feb5a768d8bf0f733c530f49b00f70c4
     canonicalized_ast: 010d0b94b6ddb74416025e35b34ce1c7feb5a768d8bf0f733c530f49b00f70c4
     type_inferenced_ast: ab23cd03d09ac3221aa71d2bc7e5c6fe13fa3f9eb4293a3ae25cb739cb608bd9
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 8fb201cc5d..d6fc879e40 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
@@ -17,6 +17,6 @@ outputs:
               type: u8
               value: "101"
     initial_ast: f47238f679ee2b220452140330e99f2a6cf063be523ed8e4ce0e9d56cf806128
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: f47238f679ee2b220452140330e99f2a6cf063be523ed8e4ce0e9d56cf806128
     canonicalized_ast: f47238f679ee2b220452140330e99f2a6cf063be523ed8e4ce0e9d56cf806128
     type_inferenced_ast: 6c62586bdcd983ee1ac3ae22b88577a5c2f0c5e5e5ed711f86c12f434917fd5f
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 f12b458cf1..36e4948b29 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
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 6fce132965ff40126f6175d2abe5b8598004e90cdb29c4707f7c63dbe1093474
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 6fce132965ff40126f6175d2abe5b8598004e90cdb29c4707f7c63dbe1093474
     canonicalized_ast: 6fce132965ff40126f6175d2abe5b8598004e90cdb29c4707f7c63dbe1093474
     type_inferenced_ast: 75cff35e24806b8a66431668c319a96e95f5106a8fe513eb53abb264beab4390
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 915a379ccb..9ee8ceab48 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
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: a155141331da2d7bdaa11ae738d6ca2e1d62d875c872b8b8213184d989cc8baa
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: a155141331da2d7bdaa11ae738d6ca2e1d62d875c872b8b8213184d989cc8baa
     canonicalized_ast: a155141331da2d7bdaa11ae738d6ca2e1d62d875c872b8b8213184d989cc8baa
     type_inferenced_ast: b4969327ce0ee30ab1526ce3b2479a7bf6efa38cb9616477f854cd28b1faf61a
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 2ddb97f00c..1faa7ef6dd 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
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 0c90e79ea8f0f5b227c498d43b8f308afb6438185fe33531617ac04b301941ce
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 0c90e79ea8f0f5b227c498d43b8f308afb6438185fe33531617ac04b301941ce
     canonicalized_ast: 0c90e79ea8f0f5b227c498d43b8f308afb6438185fe33531617ac04b301941ce
     type_inferenced_ast: 8a53562f4f66ec6d9ad612558abfe45fa08c5b37943f7a46226ea7909fcf85e0
diff --git a/tests/expectations/compiler/compiler/integers/i128/add.leo.out b/tests/expectations/compiler/compiler/integers/i128/add.leo.out
index d089c59462..c636d50366 100644
--- a/tests/expectations/compiler/compiler/integers/i128/add.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/add.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 642f93bdca1804ff63c7d74a395836b4fae13013a8a208bd8a36647a0a51a9c4
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 642f93bdca1804ff63c7d74a395836b4fae13013a8a208bd8a36647a0a51a9c4
     canonicalized_ast: 642f93bdca1804ff63c7d74a395836b4fae13013a8a208bd8a36647a0a51a9c4
     type_inferenced_ast: e72578824d94283a0c95b48e47d756370f3ac29b54e82648870b8f09e592665f
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 6e48f42c8b..277e2de091 100644
--- a/tests/expectations/compiler/compiler/integers/i128/console_assert.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/console_assert.leo.out
@@ -14,6 +14,6 @@ outputs:
         output:
           registers: {}
     initial_ast: 941047af9fff3f74b6e522fe98c16108e9e9b7ec4514cff470af18a68316f614
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 941047af9fff3f74b6e522fe98c16108e9e9b7ec4514cff470af18a68316f614
     canonicalized_ast: ca55154cc08f628f72fd7c45e107ebf849f38c077dfe08e80082db1feee4b4ed
     type_inferenced_ast: 9396147f96ed2ce2ec5b359b65ebe55d824888fb3c778b83486a4cd3b61e0785
diff --git a/tests/expectations/compiler/compiler/integers/i128/div.leo.out b/tests/expectations/compiler/compiler/integers/i128/div.leo.out
index 288f142341..5ff4b0fdf7 100644
--- a/tests/expectations/compiler/compiler/integers/i128/div.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/div.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 9b5ecfc8daa3ee55e1e24a6f6e19f5a6f5c4725efabf7074bc22657f7ad89b26
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 9b5ecfc8daa3ee55e1e24a6f6e19f5a6f5c4725efabf7074bc22657f7ad89b26
     canonicalized_ast: 9b5ecfc8daa3ee55e1e24a6f6e19f5a6f5c4725efabf7074bc22657f7ad89b26
     type_inferenced_ast: be5f66a85fa7ae6cd81164c6da438e2e146558c9b429993d83d4177b8b5c4469
diff --git a/tests/expectations/compiler/compiler/integers/i128/eq.leo.out b/tests/expectations/compiler/compiler/integers/i128/eq.leo.out
index cccb9d81cd..3db655c771 100644
--- a/tests/expectations/compiler/compiler/integers/i128/eq.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/eq.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 4aab7c6dbe39e04833f6a043508421d22d62b87fa931fa8940ce8af5c876cbe1
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 4aab7c6dbe39e04833f6a043508421d22d62b87fa931fa8940ce8af5c876cbe1
     canonicalized_ast: 4aab7c6dbe39e04833f6a043508421d22d62b87fa931fa8940ce8af5c876cbe1
     type_inferenced_ast: b4067b1b34a4f7984160a017456f026691c60f150c59c9e4817ea740c338abb7
diff --git a/tests/expectations/compiler/compiler/integers/i128/ge.leo.out b/tests/expectations/compiler/compiler/integers/i128/ge.leo.out
index 5583b83c3d..ecf7c64027 100644
--- a/tests/expectations/compiler/compiler/integers/i128/ge.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/ge.leo.out
@@ -23,6 +23,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: baa6a3685d6b0fce00d68e12fae11a15f8e939d1cdb6fc2742ee57f778b7da7c
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: baa6a3685d6b0fce00d68e12fae11a15f8e939d1cdb6fc2742ee57f778b7da7c
     canonicalized_ast: baa6a3685d6b0fce00d68e12fae11a15f8e939d1cdb6fc2742ee57f778b7da7c
     type_inferenced_ast: 406d1f28168a11a6e8404a14d80b20bdd5067823dc00b83c60d1ccf217db17f8
diff --git a/tests/expectations/compiler/compiler/integers/i128/gt.leo.out b/tests/expectations/compiler/compiler/integers/i128/gt.leo.out
index 4cec3d7079..e3f4e3d9bf 100644
--- a/tests/expectations/compiler/compiler/integers/i128/gt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/gt.leo.out
@@ -23,6 +23,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: e2b90c71500bfbdd6d581f1f66d974507922f946f48175b82768c804ca2892f5
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: e2b90c71500bfbdd6d581f1f66d974507922f946f48175b82768c804ca2892f5
     canonicalized_ast: e2b90c71500bfbdd6d581f1f66d974507922f946f48175b82768c804ca2892f5
     type_inferenced_ast: 1752aa11aea71f4a459400f14558caf6a523bad2885bc11f8449cc25af81715c
diff --git a/tests/expectations/compiler/compiler/integers/i128/le.leo.out b/tests/expectations/compiler/compiler/integers/i128/le.leo.out
index 24fda9ffb0..c80c011dda 100644
--- a/tests/expectations/compiler/compiler/integers/i128/le.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/le.leo.out
@@ -23,6 +23,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 8753b11c3aca4b8feb1be18420840b4c9de9ddcb07d089ed2f5f4c384afc204a
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 8753b11c3aca4b8feb1be18420840b4c9de9ddcb07d089ed2f5f4c384afc204a
     canonicalized_ast: 8753b11c3aca4b8feb1be18420840b4c9de9ddcb07d089ed2f5f4c384afc204a
     type_inferenced_ast: 79b296585b1e4ce4b1e9b3e29180ebfa06f7892d553d31a1f148e952f46ce768
diff --git a/tests/expectations/compiler/compiler/integers/i128/lt.leo.out b/tests/expectations/compiler/compiler/integers/i128/lt.leo.out
index ec681ed5a2..43e665808f 100644
--- a/tests/expectations/compiler/compiler/integers/i128/lt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/lt.leo.out
@@ -23,6 +23,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: ff20432be7beb83e5e5b022eef93d6ea0ef262fb834ce0eef5633c1db97abe03
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: ff20432be7beb83e5e5b022eef93d6ea0ef262fb834ce0eef5633c1db97abe03
     canonicalized_ast: ff20432be7beb83e5e5b022eef93d6ea0ef262fb834ce0eef5633c1db97abe03
     type_inferenced_ast: 5a43f0e27448024f978e71e784a16071cccbe7d8bf666ce7c42653e593244249
diff --git a/tests/expectations/compiler/compiler/integers/i128/max.leo.out b/tests/expectations/compiler/compiler/integers/i128/max.leo.out
index 90c42222a6..c77d9b0f0c 100644
--- a/tests/expectations/compiler/compiler/integers/i128/max.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/max.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 48a298fe2f4f2855ad2f9e089cfbc6749ee6f8f95f81ca9a97360f331aaae1fb
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 48a298fe2f4f2855ad2f9e089cfbc6749ee6f8f95f81ca9a97360f331aaae1fb
     canonicalized_ast: 48a298fe2f4f2855ad2f9e089cfbc6749ee6f8f95f81ca9a97360f331aaae1fb
     type_inferenced_ast: 5f10c4f16a11b966282e2484c7f243a794f2c1a2377be993b694080434791ff6
diff --git a/tests/expectations/compiler/compiler/integers/i128/min.leo.out b/tests/expectations/compiler/compiler/integers/i128/min.leo.out
index ec7a357354..f1a1a00980 100644
--- a/tests/expectations/compiler/compiler/integers/i128/min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/min.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 7607f334bcc8676c2276fc9c0950437719631f6d7221e1f3288a4f144096fa0d
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 7607f334bcc8676c2276fc9c0950437719631f6d7221e1f3288a4f144096fa0d
     canonicalized_ast: 7607f334bcc8676c2276fc9c0950437719631f6d7221e1f3288a4f144096fa0d
     type_inferenced_ast: 2d21167fca05fd5c84ab023d5fb99d8bf84f733797d01dbdf5cfb924d0aa0a26
diff --git a/tests/expectations/compiler/compiler/integers/i128/mul.leo.out b/tests/expectations/compiler/compiler/integers/i128/mul.leo.out
index 47bffa80c7..7a8b72f486 100644
--- a/tests/expectations/compiler/compiler/integers/i128/mul.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/mul.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 16a27b027b669640d3c23c1eca2db5ea3286bf3623baf9038cb28c4937e88c34
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 16a27b027b669640d3c23c1eca2db5ea3286bf3623baf9038cb28c4937e88c34
     canonicalized_ast: 16a27b027b669640d3c23c1eca2db5ea3286bf3623baf9038cb28c4937e88c34
     type_inferenced_ast: ab943eb3fb77eff83662d400ce152c5a27588bbecb72bba0c2f06146fc1e671b
diff --git a/tests/expectations/compiler/compiler/integers/i128/ne.leo.out b/tests/expectations/compiler/compiler/integers/i128/ne.leo.out
index 785bb9f887..08df752694 100644
--- a/tests/expectations/compiler/compiler/integers/i128/ne.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/ne.leo.out
@@ -23,6 +23,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 6438b7751a9bfbc114ec061c946ab917fe196c321b6382a803e263fc131e94cf
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 6438b7751a9bfbc114ec061c946ab917fe196c321b6382a803e263fc131e94cf
     canonicalized_ast: 6438b7751a9bfbc114ec061c946ab917fe196c321b6382a803e263fc131e94cf
     type_inferenced_ast: f956cebfdaffc93e04d75ec4017db28671a9ca95b46d7e46f0fe7c03921c8fcc
diff --git a/tests/expectations/compiler/compiler/integers/i128/negate.leo.out b/tests/expectations/compiler/compiler/integers/i128/negate.leo.out
index a714a10bdf..d24af05f3a 100644
--- a/tests/expectations/compiler/compiler/integers/i128/negate.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/negate.leo.out
@@ -23,6 +23,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: f20c4c3491707834724e32b0bd9116e203db8e8e03bc77f14d958fff910ea7a8
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: f20c4c3491707834724e32b0bd9116e203db8e8e03bc77f14d958fff910ea7a8
     canonicalized_ast: f20c4c3491707834724e32b0bd9116e203db8e8e03bc77f14d958fff910ea7a8
     type_inferenced_ast: 06e7d8be76d296f884f35880eb91b74b438316b04f1e189ac265ee76692da63f
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 9086894b37..9e893a8160 100644
--- a/tests/expectations/compiler/compiler/integers/i128/negate_min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/negate_min.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 910fc83d7c92963a426e05d43b855610cddcd68f7ca007dc83a6dae90fc12be2
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 910fc83d7c92963a426e05d43b855610cddcd68f7ca007dc83a6dae90fc12be2
     canonicalized_ast: 910fc83d7c92963a426e05d43b855610cddcd68f7ca007dc83a6dae90fc12be2
     type_inferenced_ast: f27e5afe0c4bf455ca2b3cc989d8659066d2f9c817741cb0d1b7e66a756dc04f
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 2d93500a2c..1c085131e8 100644
--- a/tests/expectations/compiler/compiler/integers/i128/negate_zero.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/negate_zero.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 68dd2506b7582cec89325afd649b76057840759d535cedca3e4cde98efeb0877
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 68dd2506b7582cec89325afd649b76057840759d535cedca3e4cde98efeb0877
     canonicalized_ast: 68dd2506b7582cec89325afd649b76057840759d535cedca3e4cde98efeb0877
     type_inferenced_ast: 67b08390d952e54e77e5704a13dfcedd83f4eba2f031d8d369c5c580722e02f0
diff --git a/tests/expectations/compiler/compiler/integers/i128/sub.leo.out b/tests/expectations/compiler/compiler/integers/i128/sub.leo.out
index 9f58ef342b..b32c214970 100644
--- a/tests/expectations/compiler/compiler/integers/i128/sub.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/sub.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: bc09a92a140e879b4fe0a16156a776015e48283e90b6f1af3ab2647a9ca044ce
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: bc09a92a140e879b4fe0a16156a776015e48283e90b6f1af3ab2647a9ca044ce
     canonicalized_ast: bc09a92a140e879b4fe0a16156a776015e48283e90b6f1af3ab2647a9ca044ce
     type_inferenced_ast: f9b47c27d64d9bd058c7341a828c51c31fcb4bc2bdb34bd8169d53a768559859
diff --git a/tests/expectations/compiler/compiler/integers/i128/ternary.leo.out b/tests/expectations/compiler/compiler/integers/i128/ternary.leo.out
index 9a48b7af40..716a3d3807 100644
--- a/tests/expectations/compiler/compiler/integers/i128/ternary.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/ternary.leo.out
@@ -23,6 +23,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 59f299e993a6a2a19cfca109677cc4d5a72db425ace34b4b55d3b8b7cb54fdfe
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 59f299e993a6a2a19cfca109677cc4d5a72db425ace34b4b55d3b8b7cb54fdfe
     canonicalized_ast: 59f299e993a6a2a19cfca109677cc4d5a72db425ace34b4b55d3b8b7cb54fdfe
     type_inferenced_ast: c83d950f8244fef52d7b25a588457ad771da0f73440f4d2523ac747623cf7a3a
diff --git a/tests/expectations/compiler/compiler/integers/i16/add.leo.out b/tests/expectations/compiler/compiler/integers/i16/add.leo.out
index a424b551e6..abdfe2f639 100644
--- a/tests/expectations/compiler/compiler/integers/i16/add.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/add.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: a67c4ea1ac24f9da48cc18159bda3779585be4d0ff2ef7b2e36111c8e30a7095
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: a67c4ea1ac24f9da48cc18159bda3779585be4d0ff2ef7b2e36111c8e30a7095
     canonicalized_ast: a67c4ea1ac24f9da48cc18159bda3779585be4d0ff2ef7b2e36111c8e30a7095
     type_inferenced_ast: 7d10fe70a4c3ad44ce07ae4fab3d1082d3f238757d318694f536e5b2e963c76a
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 8620d982ba..822c334963 100644
--- a/tests/expectations/compiler/compiler/integers/i16/console_assert.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/console_assert.leo.out
@@ -14,6 +14,6 @@ outputs:
         output:
           registers: {}
     initial_ast: f68bd73d5f657b880c76f678c5d8b6903aebd0701415977f5dd35009b383daaf
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: f68bd73d5f657b880c76f678c5d8b6903aebd0701415977f5dd35009b383daaf
     canonicalized_ast: a1a4fada7b1c3d4e82ac1065a720c6b11fdffd4a1cf270128432e04cee150cbb
     type_inferenced_ast: 18633259cef0bf8b6f58b4fdddeff2e0f212f4bfd9a3a9d2e7c8b328117ee679
diff --git a/tests/expectations/compiler/compiler/integers/i16/div.leo.out b/tests/expectations/compiler/compiler/integers/i16/div.leo.out
index 5e8eaf4625..66143f881a 100644
--- a/tests/expectations/compiler/compiler/integers/i16/div.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/div.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: a0694975f2bd295505d998da6b165707f8231c8df9f046fccde58cc8f42da438
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: a0694975f2bd295505d998da6b165707f8231c8df9f046fccde58cc8f42da438
     canonicalized_ast: a0694975f2bd295505d998da6b165707f8231c8df9f046fccde58cc8f42da438
     type_inferenced_ast: 66bbe4a003338adcacbf310ee8b26cb128175b0125523981d2378088760a321d
diff --git a/tests/expectations/compiler/compiler/integers/i16/eq.leo.out b/tests/expectations/compiler/compiler/integers/i16/eq.leo.out
index 81f7971d06..109d08d761 100644
--- a/tests/expectations/compiler/compiler/integers/i16/eq.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/eq.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: b961658930719fa317e5762c0f759cccf808d0c25e4036efdc24efd3dd917145
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: b961658930719fa317e5762c0f759cccf808d0c25e4036efdc24efd3dd917145
     canonicalized_ast: b961658930719fa317e5762c0f759cccf808d0c25e4036efdc24efd3dd917145
     type_inferenced_ast: 6e404e9ce612711f1170f49704f440a1698f61a5d830eeea3460025bd9883f29
diff --git a/tests/expectations/compiler/compiler/integers/i16/ge.leo.out b/tests/expectations/compiler/compiler/integers/i16/ge.leo.out
index ad9f7cf6b7..35249b2b08 100644
--- a/tests/expectations/compiler/compiler/integers/i16/ge.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/ge.leo.out
@@ -23,6 +23,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: af26d10d2f2a9d2c506829aec8c88fb34ae2ef681ffc4d3b8ec4b284bfdf3d9c
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: af26d10d2f2a9d2c506829aec8c88fb34ae2ef681ffc4d3b8ec4b284bfdf3d9c
     canonicalized_ast: af26d10d2f2a9d2c506829aec8c88fb34ae2ef681ffc4d3b8ec4b284bfdf3d9c
     type_inferenced_ast: 54cb6e5e03539e745b67bcfcd2d8175571e58747a26184d61991fd243e026efe
diff --git a/tests/expectations/compiler/compiler/integers/i16/gt.leo.out b/tests/expectations/compiler/compiler/integers/i16/gt.leo.out
index 593e16bee8..7a4d515135 100644
--- a/tests/expectations/compiler/compiler/integers/i16/gt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/gt.leo.out
@@ -23,6 +23,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 062d3eb6035e1677c45329522cbd26b8a9b5bc6d501510db6d48a47e262253e6
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 062d3eb6035e1677c45329522cbd26b8a9b5bc6d501510db6d48a47e262253e6
     canonicalized_ast: 062d3eb6035e1677c45329522cbd26b8a9b5bc6d501510db6d48a47e262253e6
     type_inferenced_ast: 2f160dd1d274d6efc5359b8643d33846d32e78ab5c541ed5f5c58fb42c9ea245
diff --git a/tests/expectations/compiler/compiler/integers/i16/le.leo.out b/tests/expectations/compiler/compiler/integers/i16/le.leo.out
index 36d8ac2bf3..bee4bdc77f 100644
--- a/tests/expectations/compiler/compiler/integers/i16/le.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/le.leo.out
@@ -23,6 +23,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 6680714854c32707931c35b568b4ca58e6fb30fb6d6af7dd88752712a5932295
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 6680714854c32707931c35b568b4ca58e6fb30fb6d6af7dd88752712a5932295
     canonicalized_ast: 6680714854c32707931c35b568b4ca58e6fb30fb6d6af7dd88752712a5932295
     type_inferenced_ast: 9933127e345e202a0e2876dd14a3443a3a104f9faae4a6428e10268f7793b66d
diff --git a/tests/expectations/compiler/compiler/integers/i16/lt.leo.out b/tests/expectations/compiler/compiler/integers/i16/lt.leo.out
index c405bfa4fa..bdbcfa8b12 100644
--- a/tests/expectations/compiler/compiler/integers/i16/lt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/lt.leo.out
@@ -23,6 +23,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 763c352848bf7747e761659811842656e84bb2e5e8b31cea06ded7f6b6b79f90
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 763c352848bf7747e761659811842656e84bb2e5e8b31cea06ded7f6b6b79f90
     canonicalized_ast: 763c352848bf7747e761659811842656e84bb2e5e8b31cea06ded7f6b6b79f90
     type_inferenced_ast: e4f72776d8aea450005835d7e69ef1f46e0b13c18673b97709546d49216064af
diff --git a/tests/expectations/compiler/compiler/integers/i16/max.leo.out b/tests/expectations/compiler/compiler/integers/i16/max.leo.out
index d00ab1ace7..b8375ba80f 100644
--- a/tests/expectations/compiler/compiler/integers/i16/max.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/max.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 3683f5647eb1ba2d1999c80f2eb629a3ed5a7114e888b0282066556a2df7877b
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 3683f5647eb1ba2d1999c80f2eb629a3ed5a7114e888b0282066556a2df7877b
     canonicalized_ast: 3683f5647eb1ba2d1999c80f2eb629a3ed5a7114e888b0282066556a2df7877b
     type_inferenced_ast: 0d239b14f356b7fc5b65558b1a74ac63af72e7f599d2af7d9f78bfca7d0dec06
diff --git a/tests/expectations/compiler/compiler/integers/i16/min.leo.out b/tests/expectations/compiler/compiler/integers/i16/min.leo.out
index 30cefcef65..6fe7c31078 100644
--- a/tests/expectations/compiler/compiler/integers/i16/min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/min.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: ff4a8d9a961ad3cb815e5c7fd71f32c2071b802fcec05e4768fced1f66c52d35
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: ff4a8d9a961ad3cb815e5c7fd71f32c2071b802fcec05e4768fced1f66c52d35
     canonicalized_ast: ff4a8d9a961ad3cb815e5c7fd71f32c2071b802fcec05e4768fced1f66c52d35
     type_inferenced_ast: 27745e526e1e647526bd04fac6cf28e6c190a4d6aca2e0f235d7eff8ec1d00c3
diff --git a/tests/expectations/compiler/compiler/integers/i16/mul.leo.out b/tests/expectations/compiler/compiler/integers/i16/mul.leo.out
index 3564e53058..e02846dff2 100644
--- a/tests/expectations/compiler/compiler/integers/i16/mul.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/mul.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: e2ea9bad702ec0c03da96d6de6e49e19600c7c59a984b1f6293456a6422a44ee
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: e2ea9bad702ec0c03da96d6de6e49e19600c7c59a984b1f6293456a6422a44ee
     canonicalized_ast: e2ea9bad702ec0c03da96d6de6e49e19600c7c59a984b1f6293456a6422a44ee
     type_inferenced_ast: 529c3f87ac0b87c521d21958a8fa03f1bd4a77a047ed0815935c33a35780dcb2
diff --git a/tests/expectations/compiler/compiler/integers/i16/ne.leo.out b/tests/expectations/compiler/compiler/integers/i16/ne.leo.out
index 3d1e502913..8239a63289 100644
--- a/tests/expectations/compiler/compiler/integers/i16/ne.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/ne.leo.out
@@ -23,6 +23,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: c7ab4b48ebe504d361335859297d54229144960db82dde7a6d7124821dc5bdaf
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: c7ab4b48ebe504d361335859297d54229144960db82dde7a6d7124821dc5bdaf
     canonicalized_ast: c7ab4b48ebe504d361335859297d54229144960db82dde7a6d7124821dc5bdaf
     type_inferenced_ast: fba12a2f71c2ae3dba292b834566ba9d3495f888e21fb07109b15be597f2b6bf
diff --git a/tests/expectations/compiler/compiler/integers/i16/negate.leo.out b/tests/expectations/compiler/compiler/integers/i16/negate.leo.out
index a9d7ac3abb..d0ec10d082 100644
--- a/tests/expectations/compiler/compiler/integers/i16/negate.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/negate.leo.out
@@ -23,6 +23,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: ecbc2a7d13b6a8d1bf35f53a9d80c4aab380495ec93663410c390e5d6d4f602e
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: ecbc2a7d13b6a8d1bf35f53a9d80c4aab380495ec93663410c390e5d6d4f602e
     canonicalized_ast: ecbc2a7d13b6a8d1bf35f53a9d80c4aab380495ec93663410c390e5d6d4f602e
     type_inferenced_ast: 106f4bc60cc6c007d1418e2571c3183f4372988be97c319574e965d2a08d9f3d
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 0c14cb6b7e..cb03f28c62 100644
--- a/tests/expectations/compiler/compiler/integers/i16/negate_min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/negate_min.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: a8449e15a25ff4327992829605e38edc70f958d0e3af40e3244b687b6a7a524f
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: a8449e15a25ff4327992829605e38edc70f958d0e3af40e3244b687b6a7a524f
     canonicalized_ast: a8449e15a25ff4327992829605e38edc70f958d0e3af40e3244b687b6a7a524f
     type_inferenced_ast: 90abf0bc2284b1bee472bcc256040c4dafd0e98c8938b9912778ed9c31d3f8ec
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 a1de35da5d..bc9c8258fe 100644
--- a/tests/expectations/compiler/compiler/integers/i16/negate_zero.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/negate_zero.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: d0091da13c0406b347d3c276e90831cdd65da70e601ff244bd9c861c2c30af31
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: d0091da13c0406b347d3c276e90831cdd65da70e601ff244bd9c861c2c30af31
     canonicalized_ast: d0091da13c0406b347d3c276e90831cdd65da70e601ff244bd9c861c2c30af31
     type_inferenced_ast: bf3619f3735b49c2daa579800f40de768515f8367c7b934567ae1e79eb8d9228
diff --git a/tests/expectations/compiler/compiler/integers/i16/sub.leo.out b/tests/expectations/compiler/compiler/integers/i16/sub.leo.out
index 59b48edb56..468b2421a7 100644
--- a/tests/expectations/compiler/compiler/integers/i16/sub.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/sub.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 29b5330610e95c16d51f5296a10729b570a50e19862685ad5d3209e458e42c79
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 29b5330610e95c16d51f5296a10729b570a50e19862685ad5d3209e458e42c79
     canonicalized_ast: 29b5330610e95c16d51f5296a10729b570a50e19862685ad5d3209e458e42c79
     type_inferenced_ast: b50322c970ad5e34639834c22770e359a2a3fe6434064ef3687e03889af3f02b
diff --git a/tests/expectations/compiler/compiler/integers/i16/ternary.leo.out b/tests/expectations/compiler/compiler/integers/i16/ternary.leo.out
index 00dabc1194..9781a6c474 100644
--- a/tests/expectations/compiler/compiler/integers/i16/ternary.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/ternary.leo.out
@@ -23,6 +23,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 331af238c9ee45bd3b604155405f8ab4061ff16416387249364f83432f7f8b5a
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 331af238c9ee45bd3b604155405f8ab4061ff16416387249364f83432f7f8b5a
     canonicalized_ast: 331af238c9ee45bd3b604155405f8ab4061ff16416387249364f83432f7f8b5a
     type_inferenced_ast: 50a018ce4b160bd86e9fbdfe9db17bcfd055e4800f06c55551eed3100d3f64e6
diff --git a/tests/expectations/compiler/compiler/integers/i32/add.leo.out b/tests/expectations/compiler/compiler/integers/i32/add.leo.out
index a93427fb67..68fc4a45f6 100644
--- a/tests/expectations/compiler/compiler/integers/i32/add.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/add.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 39635af165ae775232853b12ac07b0a21f39382ae3e146001e1a05b7c60849c3
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 39635af165ae775232853b12ac07b0a21f39382ae3e146001e1a05b7c60849c3
     canonicalized_ast: 39635af165ae775232853b12ac07b0a21f39382ae3e146001e1a05b7c60849c3
     type_inferenced_ast: 8da17349b8496481730002123096f5c09debd25133db8045665aa2ae405efe1a
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 52d0459d95..4f1f835132 100644
--- a/tests/expectations/compiler/compiler/integers/i32/console_assert.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/console_assert.leo.out
@@ -14,6 +14,6 @@ outputs:
         output:
           registers: {}
     initial_ast: 6ba5c49aaa9ed5abf49a7f538392cb18905e6805b7d3780e5d6391adb7df6631
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 6ba5c49aaa9ed5abf49a7f538392cb18905e6805b7d3780e5d6391adb7df6631
     canonicalized_ast: 35877250663e7d44c5e01e64cd99d5e1b8fa84da4d00667bade1fd9a517f3803
     type_inferenced_ast: 2c72c8cf340cc122fb5a081c8dd6eaa22ac2c79511e98fd5f23f4b8b1dac3526
diff --git a/tests/expectations/compiler/compiler/integers/i32/div.leo.out b/tests/expectations/compiler/compiler/integers/i32/div.leo.out
index f93c03e873..40804c7cb0 100644
--- a/tests/expectations/compiler/compiler/integers/i32/div.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/div.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 3917fa03634f3abb0d497bfae7ba98c15dd93f867e3e1bf724bab8fc724ce8cf
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 3917fa03634f3abb0d497bfae7ba98c15dd93f867e3e1bf724bab8fc724ce8cf
     canonicalized_ast: 3917fa03634f3abb0d497bfae7ba98c15dd93f867e3e1bf724bab8fc724ce8cf
     type_inferenced_ast: 1f460bec4ed9e4478b7ef9df14773eb92ad310d790cae429a0caadbc7f750d2e
diff --git a/tests/expectations/compiler/compiler/integers/i32/eq.leo.out b/tests/expectations/compiler/compiler/integers/i32/eq.leo.out
index e6446e61ef..690a556f61 100644
--- a/tests/expectations/compiler/compiler/integers/i32/eq.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/eq.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 180d1048dd64c67ea367750630057b9c5302a89a81144d0148ea1dfafada8b4c
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 180d1048dd64c67ea367750630057b9c5302a89a81144d0148ea1dfafada8b4c
     canonicalized_ast: 180d1048dd64c67ea367750630057b9c5302a89a81144d0148ea1dfafada8b4c
     type_inferenced_ast: f2f2254b22bc172f1859835e478e9456b3fdbc497f5a48483fc87969d6bf6144
diff --git a/tests/expectations/compiler/compiler/integers/i32/ge.leo.out b/tests/expectations/compiler/compiler/integers/i32/ge.leo.out
index fc2c3643e7..f55b8e9939 100644
--- a/tests/expectations/compiler/compiler/integers/i32/ge.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/ge.leo.out
@@ -23,6 +23,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 6401f6c0567fe73628faf73dc3cd71635bbba9b997c918d182f6fdf2dda68b82
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 6401f6c0567fe73628faf73dc3cd71635bbba9b997c918d182f6fdf2dda68b82
     canonicalized_ast: 6401f6c0567fe73628faf73dc3cd71635bbba9b997c918d182f6fdf2dda68b82
     type_inferenced_ast: 9e105f38de69dddfd99b143f279f063950e305321a343dea0bf10924af6f7c2b
diff --git a/tests/expectations/compiler/compiler/integers/i32/gt.leo.out b/tests/expectations/compiler/compiler/integers/i32/gt.leo.out
index 5ed205a2da..4ec0e63ed9 100644
--- a/tests/expectations/compiler/compiler/integers/i32/gt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/gt.leo.out
@@ -23,6 +23,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: f82734600ac57a9a5bd1ef4c2439cc5bbea882cd2ed81646ce6abd7915abc344
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: f82734600ac57a9a5bd1ef4c2439cc5bbea882cd2ed81646ce6abd7915abc344
     canonicalized_ast: f82734600ac57a9a5bd1ef4c2439cc5bbea882cd2ed81646ce6abd7915abc344
     type_inferenced_ast: 67d4dfb5c34b3e9aa457c7897d28cf85a2366bf987279f50eb44ad5cfe617ffa
diff --git a/tests/expectations/compiler/compiler/integers/i32/le.leo.out b/tests/expectations/compiler/compiler/integers/i32/le.leo.out
index a10bb4a6e7..c420c4c1f0 100644
--- a/tests/expectations/compiler/compiler/integers/i32/le.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/le.leo.out
@@ -23,6 +23,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 51baf4d7be19032fb911d8f5e7fb250ccf3e9e272644c013699be201cf44d00a
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 51baf4d7be19032fb911d8f5e7fb250ccf3e9e272644c013699be201cf44d00a
     canonicalized_ast: 51baf4d7be19032fb911d8f5e7fb250ccf3e9e272644c013699be201cf44d00a
     type_inferenced_ast: 0427991a5b5ca595f7a0d5fb0d842ecc18433533366ae437fcbdaff134150481
diff --git a/tests/expectations/compiler/compiler/integers/i32/lt.leo.out b/tests/expectations/compiler/compiler/integers/i32/lt.leo.out
index c2c77584b8..c656ee7282 100644
--- a/tests/expectations/compiler/compiler/integers/i32/lt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/lt.leo.out
@@ -23,6 +23,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: e464cb5a70dcb5bf51ab5ccffa10b54ea29f0e68775593f05bb0d585144487a8
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: e464cb5a70dcb5bf51ab5ccffa10b54ea29f0e68775593f05bb0d585144487a8
     canonicalized_ast: e464cb5a70dcb5bf51ab5ccffa10b54ea29f0e68775593f05bb0d585144487a8
     type_inferenced_ast: 486d0d877dbc748210bc6a82d40a132709d83a44d5e4de255e9c40dd3bf6cedd
diff --git a/tests/expectations/compiler/compiler/integers/i32/max.leo.out b/tests/expectations/compiler/compiler/integers/i32/max.leo.out
index 574099734c..48b7243612 100644
--- a/tests/expectations/compiler/compiler/integers/i32/max.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/max.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 2596ba582e34d7147902c469c3544d438d8ba64aeecd103938a1eb8e3536f360
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 2596ba582e34d7147902c469c3544d438d8ba64aeecd103938a1eb8e3536f360
     canonicalized_ast: 2596ba582e34d7147902c469c3544d438d8ba64aeecd103938a1eb8e3536f360
     type_inferenced_ast: aa0a685388d2f3aed81db5c35ead63975e8ad4df5803390f1976795ad544430f
diff --git a/tests/expectations/compiler/compiler/integers/i32/min.leo.out b/tests/expectations/compiler/compiler/integers/i32/min.leo.out
index 347d06f36b..0f8d4cf6b8 100644
--- a/tests/expectations/compiler/compiler/integers/i32/min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/min.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: e08bac68e7d8ebb03c3fc1538c525de5e2caeaed750b548f4756abf12d6d38a5
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: e08bac68e7d8ebb03c3fc1538c525de5e2caeaed750b548f4756abf12d6d38a5
     canonicalized_ast: e08bac68e7d8ebb03c3fc1538c525de5e2caeaed750b548f4756abf12d6d38a5
     type_inferenced_ast: f529d963cc870de92960d5c2eb5ec8ceeae22256f0164399867b996a14be14aa
diff --git a/tests/expectations/compiler/compiler/integers/i32/mul.leo.out b/tests/expectations/compiler/compiler/integers/i32/mul.leo.out
index 00ae700c67..4c3c4bc942 100644
--- a/tests/expectations/compiler/compiler/integers/i32/mul.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/mul.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 3fc63e8ecf481c6f4224c0206b16af942eb407b151f1fc21d8774cbf84ccc5d6
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 3fc63e8ecf481c6f4224c0206b16af942eb407b151f1fc21d8774cbf84ccc5d6
     canonicalized_ast: 3fc63e8ecf481c6f4224c0206b16af942eb407b151f1fc21d8774cbf84ccc5d6
     type_inferenced_ast: 89f3c749fb559365b2ea0d804cb9146d923993a6c2c2dd9a3942057d7ff343d4
diff --git a/tests/expectations/compiler/compiler/integers/i32/ne.leo.out b/tests/expectations/compiler/compiler/integers/i32/ne.leo.out
index f650fe2a59..db5011ded1 100644
--- a/tests/expectations/compiler/compiler/integers/i32/ne.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/ne.leo.out
@@ -23,6 +23,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 79492afcb10499d002f2b1f6c60bd7e656817f7c638068ad4bb7b3f5087537c7
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 79492afcb10499d002f2b1f6c60bd7e656817f7c638068ad4bb7b3f5087537c7
     canonicalized_ast: 79492afcb10499d002f2b1f6c60bd7e656817f7c638068ad4bb7b3f5087537c7
     type_inferenced_ast: 2f324fbbfefac3d5fd095be4ca42fd83c711ae407e9631b0814f543331662dcf
diff --git a/tests/expectations/compiler/compiler/integers/i32/negate.leo.out b/tests/expectations/compiler/compiler/integers/i32/negate.leo.out
index 1c98ad197e..51672f6983 100644
--- a/tests/expectations/compiler/compiler/integers/i32/negate.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/negate.leo.out
@@ -23,6 +23,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: c895e4172b4155a740dfe2aebfc4ded6f694b017d0eb1b7700b42e4498ecf151
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: c895e4172b4155a740dfe2aebfc4ded6f694b017d0eb1b7700b42e4498ecf151
     canonicalized_ast: c895e4172b4155a740dfe2aebfc4ded6f694b017d0eb1b7700b42e4498ecf151
     type_inferenced_ast: 47858526755f4292e5e423544d3ed6b4c664b08566f1a3f066433a8e21f4480a
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 bf63dee88f..0ac80cea4c 100644
--- a/tests/expectations/compiler/compiler/integers/i32/negate_min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/negate_min.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: bcbd4fdb79ebffa456407355e6d4f71d039014dd03cee2466850f90c1c1c17e2
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: bcbd4fdb79ebffa456407355e6d4f71d039014dd03cee2466850f90c1c1c17e2
     canonicalized_ast: bcbd4fdb79ebffa456407355e6d4f71d039014dd03cee2466850f90c1c1c17e2
     type_inferenced_ast: d2bc0ba76d451989365a4f3c40cffde6abc17865a43b2816d89bd884e8b0bdff
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 12420f66e7..f37306e8cb 100644
--- a/tests/expectations/compiler/compiler/integers/i32/negate_zero.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/negate_zero.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: b1ec676bc801b40fa773668c988ce9da33fec783743e214269a777ad122cda49
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: b1ec676bc801b40fa773668c988ce9da33fec783743e214269a777ad122cda49
     canonicalized_ast: b1ec676bc801b40fa773668c988ce9da33fec783743e214269a777ad122cda49
     type_inferenced_ast: 97b5d8261ddffbfff0316e3bf97df502a9b1c75e79b2e94d0b8f8f8c565699de
diff --git a/tests/expectations/compiler/compiler/integers/i32/sub.leo.out b/tests/expectations/compiler/compiler/integers/i32/sub.leo.out
index 779dff23d3..113536fbea 100644
--- a/tests/expectations/compiler/compiler/integers/i32/sub.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/sub.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: d3776192bdb897e3ffdfe76557ba210babd9fd36945d47133552271858ff5c35
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: d3776192bdb897e3ffdfe76557ba210babd9fd36945d47133552271858ff5c35
     canonicalized_ast: d3776192bdb897e3ffdfe76557ba210babd9fd36945d47133552271858ff5c35
     type_inferenced_ast: 36e7d5a21e55cd5d61ea6644e8d5c84a0640972921fbdcfd6e27886caf6b5216
diff --git a/tests/expectations/compiler/compiler/integers/i32/ternary.leo.out b/tests/expectations/compiler/compiler/integers/i32/ternary.leo.out
index 12c7b0e2c6..4960310094 100644
--- a/tests/expectations/compiler/compiler/integers/i32/ternary.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/ternary.leo.out
@@ -23,6 +23,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 04e630cdddd76554c0049b08a3ed7a6a2c824a7dc929796e3fc713c6d11f70be
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 04e630cdddd76554c0049b08a3ed7a6a2c824a7dc929796e3fc713c6d11f70be
     canonicalized_ast: 04e630cdddd76554c0049b08a3ed7a6a2c824a7dc929796e3fc713c6d11f70be
     type_inferenced_ast: 0655b17c3f9cc5c7500c8c7edfef4effa43668f096da5338b2c44ae316b0a5e1
diff --git a/tests/expectations/compiler/compiler/integers/i64/add.leo.out b/tests/expectations/compiler/compiler/integers/i64/add.leo.out
index e06ac9f8d7..c7c89b8c83 100644
--- a/tests/expectations/compiler/compiler/integers/i64/add.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/add.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 8e59e1adb08d85f3d13a4e0501c7299d8258d13dd979c0a971d5f2ce75f631a6
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 8e59e1adb08d85f3d13a4e0501c7299d8258d13dd979c0a971d5f2ce75f631a6
     canonicalized_ast: 8e59e1adb08d85f3d13a4e0501c7299d8258d13dd979c0a971d5f2ce75f631a6
     type_inferenced_ast: 3a117cd702a7f13a7cbafd2c05c301d87562a0c6a971486c0cb07391f732c02d
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 bf9efd83be..325e819d35 100644
--- a/tests/expectations/compiler/compiler/integers/i64/console_assert.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/console_assert.leo.out
@@ -14,6 +14,6 @@ outputs:
         output:
           registers: {}
     initial_ast: 9389a270a24424ceb480768d8d0811101f2f92c7fc7447efe29686fd30d075e8
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 9389a270a24424ceb480768d8d0811101f2f92c7fc7447efe29686fd30d075e8
     canonicalized_ast: f44f1275eb6295af14fcc1773894b0694bb8657cb7b472b16cc1e5d846ca6a6c
     type_inferenced_ast: 546c1d880e97e95d1b91a1e6b73fc9cf240c734921ebe534e2a7af6cb224f477
diff --git a/tests/expectations/compiler/compiler/integers/i64/div.leo.out b/tests/expectations/compiler/compiler/integers/i64/div.leo.out
index d7d6632b84..90ff4e41f0 100644
--- a/tests/expectations/compiler/compiler/integers/i64/div.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/div.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 6fee781a23a251aafaea1000be3025d52bdeceb3b95aa746cdcc9560834227e3
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 6fee781a23a251aafaea1000be3025d52bdeceb3b95aa746cdcc9560834227e3
     canonicalized_ast: 6fee781a23a251aafaea1000be3025d52bdeceb3b95aa746cdcc9560834227e3
     type_inferenced_ast: 4e93f3e08a4f65b47fe98c337cc6b1b3cf1be2cef22ab55d3bfd7491e8776a17
diff --git a/tests/expectations/compiler/compiler/integers/i64/eq.leo.out b/tests/expectations/compiler/compiler/integers/i64/eq.leo.out
index dd81a204f1..0a6b595adc 100644
--- a/tests/expectations/compiler/compiler/integers/i64/eq.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/eq.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: bdde37443fd01021b4b7928e9d28c94146ff2f6804200387638b5912729c6acb
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: bdde37443fd01021b4b7928e9d28c94146ff2f6804200387638b5912729c6acb
     canonicalized_ast: bdde37443fd01021b4b7928e9d28c94146ff2f6804200387638b5912729c6acb
     type_inferenced_ast: 20102db693d9c531d240a5926a64f5720c0e30bb5e15ba8ec55a9ccb5dc5a7e1
diff --git a/tests/expectations/compiler/compiler/integers/i64/ge.leo.out b/tests/expectations/compiler/compiler/integers/i64/ge.leo.out
index 2068b45260..171923e14a 100644
--- a/tests/expectations/compiler/compiler/integers/i64/ge.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/ge.leo.out
@@ -23,6 +23,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 5c1016b42105d692df8c5a799884607097e1f0e4e971f54f12f722a8b6767b85
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 5c1016b42105d692df8c5a799884607097e1f0e4e971f54f12f722a8b6767b85
     canonicalized_ast: 5c1016b42105d692df8c5a799884607097e1f0e4e971f54f12f722a8b6767b85
     type_inferenced_ast: 93f78d3f8250f873ffd7c7e677b4821bb727ec7018dc371c1ad383ba7496a830
diff --git a/tests/expectations/compiler/compiler/integers/i64/gt.leo.out b/tests/expectations/compiler/compiler/integers/i64/gt.leo.out
index 721a8b3906..24f40ebe9b 100644
--- a/tests/expectations/compiler/compiler/integers/i64/gt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/gt.leo.out
@@ -23,6 +23,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: a0404ddcc589b6006a5186d8ed29c981c7b0be8e8ff56c40eb9affee5fe2f2b0
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: a0404ddcc589b6006a5186d8ed29c981c7b0be8e8ff56c40eb9affee5fe2f2b0
     canonicalized_ast: a0404ddcc589b6006a5186d8ed29c981c7b0be8e8ff56c40eb9affee5fe2f2b0
     type_inferenced_ast: 42efeba3e4bb618fcd85360650196171a2e786149c92c5fc9bc5ee3559af3e62
diff --git a/tests/expectations/compiler/compiler/integers/i64/le.leo.out b/tests/expectations/compiler/compiler/integers/i64/le.leo.out
index dcc936c3c8..f5635d7292 100644
--- a/tests/expectations/compiler/compiler/integers/i64/le.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/le.leo.out
@@ -23,6 +23,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 78dbfbb72aaf373d3503564f96a35cd03525c6e39a756c17be39ff732ffd5cf9
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 78dbfbb72aaf373d3503564f96a35cd03525c6e39a756c17be39ff732ffd5cf9
     canonicalized_ast: 78dbfbb72aaf373d3503564f96a35cd03525c6e39a756c17be39ff732ffd5cf9
     type_inferenced_ast: dd127a982da4220d309a73347d52abb8175d73c45156384aae81e32c99451511
diff --git a/tests/expectations/compiler/compiler/integers/i64/lt.leo.out b/tests/expectations/compiler/compiler/integers/i64/lt.leo.out
index 963247e4d8..780f8e3d13 100644
--- a/tests/expectations/compiler/compiler/integers/i64/lt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/lt.leo.out
@@ -23,6 +23,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: db923fdd10ce89e66c72f1db5f8e95e3016dd8513ee687250b21b7aa5ce4daec
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: db923fdd10ce89e66c72f1db5f8e95e3016dd8513ee687250b21b7aa5ce4daec
     canonicalized_ast: db923fdd10ce89e66c72f1db5f8e95e3016dd8513ee687250b21b7aa5ce4daec
     type_inferenced_ast: eaa70c92e2390a74eec47bee46b954cdcc2fca0f441545902759a13b81d3cfe0
diff --git a/tests/expectations/compiler/compiler/integers/i64/max.leo.out b/tests/expectations/compiler/compiler/integers/i64/max.leo.out
index 8edaab7d68..2302a3b102 100644
--- a/tests/expectations/compiler/compiler/integers/i64/max.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/max.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 0703335d2e00880f1443d9c5b5e7b5f5a81ef393a45e6cdfdd4880f090895c52
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 0703335d2e00880f1443d9c5b5e7b5f5a81ef393a45e6cdfdd4880f090895c52
     canonicalized_ast: 0703335d2e00880f1443d9c5b5e7b5f5a81ef393a45e6cdfdd4880f090895c52
     type_inferenced_ast: b5afbedc3b27ae8576a74efae219f1fe5381f93ef957934e31821f26c950d36f
diff --git a/tests/expectations/compiler/compiler/integers/i64/min.leo.out b/tests/expectations/compiler/compiler/integers/i64/min.leo.out
index e9f9e14706..4b13c2c9e7 100644
--- a/tests/expectations/compiler/compiler/integers/i64/min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/min.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 5724b0d2d9d2977ddc189b58e5cba10201d51f3c38cc57e77f0d5c53c98656cb
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 5724b0d2d9d2977ddc189b58e5cba10201d51f3c38cc57e77f0d5c53c98656cb
     canonicalized_ast: 5724b0d2d9d2977ddc189b58e5cba10201d51f3c38cc57e77f0d5c53c98656cb
     type_inferenced_ast: 2495a438e9e13500365e60ebc5dae138a9ac1608e0ccef13a65bbbeb411646c1
diff --git a/tests/expectations/compiler/compiler/integers/i64/mul.leo.out b/tests/expectations/compiler/compiler/integers/i64/mul.leo.out
index 4e47a8bb54..ee4b5ef6ce 100644
--- a/tests/expectations/compiler/compiler/integers/i64/mul.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/mul.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 7d81fb85fdaf9767a4248d83f81f48e91be6e2ce749a4a02f9fe85494154eda8
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 7d81fb85fdaf9767a4248d83f81f48e91be6e2ce749a4a02f9fe85494154eda8
     canonicalized_ast: 7d81fb85fdaf9767a4248d83f81f48e91be6e2ce749a4a02f9fe85494154eda8
     type_inferenced_ast: 54a87debd3d8471ba6f1afef722be088ac023304fb2c27a2ef39699bf16fe81d
diff --git a/tests/expectations/compiler/compiler/integers/i64/ne.leo.out b/tests/expectations/compiler/compiler/integers/i64/ne.leo.out
index 7c514ced6e..43899bcc08 100644
--- a/tests/expectations/compiler/compiler/integers/i64/ne.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/ne.leo.out
@@ -23,6 +23,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: cb56faba44a5f54ab7fc9021e0903b7cdd70d56bbcf97fcfdaf355475a4a2011
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: cb56faba44a5f54ab7fc9021e0903b7cdd70d56bbcf97fcfdaf355475a4a2011
     canonicalized_ast: cb56faba44a5f54ab7fc9021e0903b7cdd70d56bbcf97fcfdaf355475a4a2011
     type_inferenced_ast: ef1112d9d7f63b6addabad7a4cfbb672ef167272ea603b11a92b8b39e468fbb9
diff --git a/tests/expectations/compiler/compiler/integers/i64/negate.leo.out b/tests/expectations/compiler/compiler/integers/i64/negate.leo.out
index ca9c668cfb..b36a02f1d4 100644
--- a/tests/expectations/compiler/compiler/integers/i64/negate.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/negate.leo.out
@@ -23,6 +23,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 4ace760ee44ede5868a0ea11f96f47c596da9772ab3b821be5879782747bb64d
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 4ace760ee44ede5868a0ea11f96f47c596da9772ab3b821be5879782747bb64d
     canonicalized_ast: 4ace760ee44ede5868a0ea11f96f47c596da9772ab3b821be5879782747bb64d
     type_inferenced_ast: eb5b6e6f6f1c91ef1489e0d686e0ea142762777b4991ee12f235ff73a91742eb
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 d2c7e9a49f..a9ef61f2b6 100644
--- a/tests/expectations/compiler/compiler/integers/i64/negate_min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/negate_min.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 96d8371bf9102e40d6c297ad0e042d91b9bab58212d3ace9fa0811d3be54eec5
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 96d8371bf9102e40d6c297ad0e042d91b9bab58212d3ace9fa0811d3be54eec5
     canonicalized_ast: 96d8371bf9102e40d6c297ad0e042d91b9bab58212d3ace9fa0811d3be54eec5
     type_inferenced_ast: 1b6005dedf0bdb85dc9d50b0435bdfa1b9d34d75f516a2383890882ad3bf3b08
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 ccf44faca8..680da0f38f 100644
--- a/tests/expectations/compiler/compiler/integers/i64/negate_zero.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/negate_zero.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: d5df39c563c640844bfd7a3fd95b53c107f66a8ce0adb7154084aad9cc42a623
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: d5df39c563c640844bfd7a3fd95b53c107f66a8ce0adb7154084aad9cc42a623
     canonicalized_ast: d5df39c563c640844bfd7a3fd95b53c107f66a8ce0adb7154084aad9cc42a623
     type_inferenced_ast: 928fe3ff4063f147fe708ef5301279b7434b5f1708f1f59a9d14f28001aaad7d
diff --git a/tests/expectations/compiler/compiler/integers/i64/sub.leo.out b/tests/expectations/compiler/compiler/integers/i64/sub.leo.out
index 0ccbc5ad07..f5f50da10e 100644
--- a/tests/expectations/compiler/compiler/integers/i64/sub.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/sub.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 0918267d4d883608bdb8b1c178450077f0931539dc573d3829e37f24176a88f5
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 0918267d4d883608bdb8b1c178450077f0931539dc573d3829e37f24176a88f5
     canonicalized_ast: 0918267d4d883608bdb8b1c178450077f0931539dc573d3829e37f24176a88f5
     type_inferenced_ast: f2d7b1656ffb683dbb9ec39f37938cc188186aa708fef560b75523f0863886b8
diff --git a/tests/expectations/compiler/compiler/integers/i64/ternary.leo.out b/tests/expectations/compiler/compiler/integers/i64/ternary.leo.out
index da512401f1..837cc91d60 100644
--- a/tests/expectations/compiler/compiler/integers/i64/ternary.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/ternary.leo.out
@@ -23,6 +23,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: f60c769d564a5a76451d1b347c300f1ff5c0030b412ba5d84559fdd67fe6bb79
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: f60c769d564a5a76451d1b347c300f1ff5c0030b412ba5d84559fdd67fe6bb79
     canonicalized_ast: f60c769d564a5a76451d1b347c300f1ff5c0030b412ba5d84559fdd67fe6bb79
     type_inferenced_ast: d28a4ada3a3c80b09dc1f8be54035ad7a162b5c2cf8f1b7c2eba78f02387d879
diff --git a/tests/expectations/compiler/compiler/integers/i8/add.leo.out b/tests/expectations/compiler/compiler/integers/i8/add.leo.out
index a68bcfa3b7..bb7943cee0 100644
--- a/tests/expectations/compiler/compiler/integers/i8/add.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/add.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 7507e4dd7081d148a851507da3d728d435ef2919517e01732a06014e32769efd
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 7507e4dd7081d148a851507da3d728d435ef2919517e01732a06014e32769efd
     canonicalized_ast: 7507e4dd7081d148a851507da3d728d435ef2919517e01732a06014e32769efd
     type_inferenced_ast: ce071846a448bd392dbcb7a285c65f235daf29f9b398a8445948e6a261aa8b13
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 08d4dbe899..f273dc87f6 100644
--- a/tests/expectations/compiler/compiler/integers/i8/console_assert.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/console_assert.leo.out
@@ -14,6 +14,6 @@ outputs:
         output:
           registers: {}
     initial_ast: 17b1eb126e8cb1e246f071e8ad20a25eee7a8abd80e3681e525439292221632c
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 17b1eb126e8cb1e246f071e8ad20a25eee7a8abd80e3681e525439292221632c
     canonicalized_ast: 6db2d0a6b45f27e9e9b8c840e91d602b11922ab7781c5d98634c80ebad314766
     type_inferenced_ast: b2c9bddf865c2f5682da9a10df552b6d6170ca2dcf45839470a745a1fce2ecda
diff --git a/tests/expectations/compiler/compiler/integers/i8/div.leo.out b/tests/expectations/compiler/compiler/integers/i8/div.leo.out
index e2b6fa396e..50f03674fa 100644
--- a/tests/expectations/compiler/compiler/integers/i8/div.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/div.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 832849cc580efd35a4f63217783eb380f94620f893f13a64769a01a30f4c1434
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 832849cc580efd35a4f63217783eb380f94620f893f13a64769a01a30f4c1434
     canonicalized_ast: 832849cc580efd35a4f63217783eb380f94620f893f13a64769a01a30f4c1434
     type_inferenced_ast: a0af076a419008b086212d675a91408ce30ffe05ff21ab32c1968f20b04f29d7
diff --git a/tests/expectations/compiler/compiler/integers/i8/eq.leo.out b/tests/expectations/compiler/compiler/integers/i8/eq.leo.out
index 1ac8207b95..9161c8b17a 100644
--- a/tests/expectations/compiler/compiler/integers/i8/eq.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/eq.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 00e6ec9c3cffe65504b49e598aee8b7c8c59823f9c1c8954d659c00704f6e12e
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 00e6ec9c3cffe65504b49e598aee8b7c8c59823f9c1c8954d659c00704f6e12e
     canonicalized_ast: 00e6ec9c3cffe65504b49e598aee8b7c8c59823f9c1c8954d659c00704f6e12e
     type_inferenced_ast: 8d64e2540f69eb74fe27f35f221c854a71b5fdfcc1364a54c45ce742bbec9a20
diff --git a/tests/expectations/compiler/compiler/integers/i8/ge.leo.out b/tests/expectations/compiler/compiler/integers/i8/ge.leo.out
index f2af87fd35..1d340dcd00 100644
--- a/tests/expectations/compiler/compiler/integers/i8/ge.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/ge.leo.out
@@ -23,6 +23,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 1e21bb732ec541ff7a980ab309747c26b105354577ff211f1dd7712f059232f5
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 1e21bb732ec541ff7a980ab309747c26b105354577ff211f1dd7712f059232f5
     canonicalized_ast: 1e21bb732ec541ff7a980ab309747c26b105354577ff211f1dd7712f059232f5
     type_inferenced_ast: 9cd5f4bc30be5e47771f86af4a03f7731a408abca3451e8edbd1791f20c7b54e
diff --git a/tests/expectations/compiler/compiler/integers/i8/gt.leo.out b/tests/expectations/compiler/compiler/integers/i8/gt.leo.out
index 4e72919222..b18fcf2599 100644
--- a/tests/expectations/compiler/compiler/integers/i8/gt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/gt.leo.out
@@ -23,6 +23,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 7108a8fe50fbe2b7386ef743b0627f75a4c282821f10e76713672f94830d2cbb
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 7108a8fe50fbe2b7386ef743b0627f75a4c282821f10e76713672f94830d2cbb
     canonicalized_ast: 7108a8fe50fbe2b7386ef743b0627f75a4c282821f10e76713672f94830d2cbb
     type_inferenced_ast: 7a23bf5cda0089bdb57387dd291bf63a93f77f83748f0d8f90ebf6c32e458c95
diff --git a/tests/expectations/compiler/compiler/integers/i8/le.leo.out b/tests/expectations/compiler/compiler/integers/i8/le.leo.out
index 36ad868507..966c759f5d 100644
--- a/tests/expectations/compiler/compiler/integers/i8/le.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/le.leo.out
@@ -23,6 +23,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 40f8e855fce1d652c99ceb24edaacbe328ae159382b1ce13170c63669f4301e3
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 40f8e855fce1d652c99ceb24edaacbe328ae159382b1ce13170c63669f4301e3
     canonicalized_ast: 40f8e855fce1d652c99ceb24edaacbe328ae159382b1ce13170c63669f4301e3
     type_inferenced_ast: 66d57cbb8408f594263277a42765cc12fcdc97db2fbc322191df5a39ab2f7040
diff --git a/tests/expectations/compiler/compiler/integers/i8/lt.leo.out b/tests/expectations/compiler/compiler/integers/i8/lt.leo.out
index 857816de59..fdd7e21c80 100644
--- a/tests/expectations/compiler/compiler/integers/i8/lt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/lt.leo.out
@@ -23,6 +23,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: df68f7c978cd30eff24891875fe147f6e24ce56b328d7207814ddeb5ada6bf13
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: df68f7c978cd30eff24891875fe147f6e24ce56b328d7207814ddeb5ada6bf13
     canonicalized_ast: df68f7c978cd30eff24891875fe147f6e24ce56b328d7207814ddeb5ada6bf13
     type_inferenced_ast: 23714958eb385969480b522715c5c0c5007bdad644282aab21e07b1aab965d30
diff --git a/tests/expectations/compiler/compiler/integers/i8/max.leo.out b/tests/expectations/compiler/compiler/integers/i8/max.leo.out
index 7669fdda12..901d82a33c 100644
--- a/tests/expectations/compiler/compiler/integers/i8/max.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/max.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: af42ac6f8eb44ea7890e558b2d50b67db5ab53e74022c6426aa7a63edfdf43ec
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: af42ac6f8eb44ea7890e558b2d50b67db5ab53e74022c6426aa7a63edfdf43ec
     canonicalized_ast: af42ac6f8eb44ea7890e558b2d50b67db5ab53e74022c6426aa7a63edfdf43ec
     type_inferenced_ast: 715450b67c109631ecef7e45c8ecaae33433daec07148953c070b97b856dbf2d
diff --git a/tests/expectations/compiler/compiler/integers/i8/min.leo.out b/tests/expectations/compiler/compiler/integers/i8/min.leo.out
index 74c7e16eca..94ed4491b4 100644
--- a/tests/expectations/compiler/compiler/integers/i8/min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/min.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 42725429d83957372ca63c97764550141db3f8851616a33460e68ad212df74ce
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 42725429d83957372ca63c97764550141db3f8851616a33460e68ad212df74ce
     canonicalized_ast: 42725429d83957372ca63c97764550141db3f8851616a33460e68ad212df74ce
     type_inferenced_ast: 4e4799716883d22d1e491cf20f30104174d54c64176130dcc0fb6519a08b936d
diff --git a/tests/expectations/compiler/compiler/integers/i8/mul.leo.out b/tests/expectations/compiler/compiler/integers/i8/mul.leo.out
index 9a210eb2c8..4c0d20d093 100644
--- a/tests/expectations/compiler/compiler/integers/i8/mul.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/mul.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: c7ea692c1c4c5b5adf571bbaf8350017c123dc7de9a130d1d3c6d92065f76b30
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: c7ea692c1c4c5b5adf571bbaf8350017c123dc7de9a130d1d3c6d92065f76b30
     canonicalized_ast: c7ea692c1c4c5b5adf571bbaf8350017c123dc7de9a130d1d3c6d92065f76b30
     type_inferenced_ast: 9324477964c91456cad1ef2d1531eeeb0a8a67d85b7cf4a0e5e59bd86beb2a86
diff --git a/tests/expectations/compiler/compiler/integers/i8/ne.leo.out b/tests/expectations/compiler/compiler/integers/i8/ne.leo.out
index 1279e9f151..ca9eafb5c2 100644
--- a/tests/expectations/compiler/compiler/integers/i8/ne.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/ne.leo.out
@@ -23,6 +23,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 727d71a97c85ff472274e9c77d09017023aa4a01ae55f5ef4cd1f34d493e10f0
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 727d71a97c85ff472274e9c77d09017023aa4a01ae55f5ef4cd1f34d493e10f0
     canonicalized_ast: 727d71a97c85ff472274e9c77d09017023aa4a01ae55f5ef4cd1f34d493e10f0
     type_inferenced_ast: a620d767d5f718c1bd7adb7acadc46b8fa4870d05d4b7f131ac717e3b4b825f6
diff --git a/tests/expectations/compiler/compiler/integers/i8/negate.leo.out b/tests/expectations/compiler/compiler/integers/i8/negate.leo.out
index 653507bf68..f8ba9ade14 100644
--- a/tests/expectations/compiler/compiler/integers/i8/negate.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/negate.leo.out
@@ -23,6 +23,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 048dee046e9726b86bc863821709b9b1b9a5f54afdce25a6bd46bd5fbb6307a2
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 048dee046e9726b86bc863821709b9b1b9a5f54afdce25a6bd46bd5fbb6307a2
     canonicalized_ast: 048dee046e9726b86bc863821709b9b1b9a5f54afdce25a6bd46bd5fbb6307a2
     type_inferenced_ast: 75838a90ef9995dc6562f4a017a4bb4fcbd455a6d1a9401db836e5844c22aea3
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 1d8958a38f..c9aca1e50a 100644
--- a/tests/expectations/compiler/compiler/integers/i8/negate_zero.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/negate_zero.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: f4eb2af96d56786f773843ae4a471cc27884a1d2427c4995b4303635d2341a3a
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: f4eb2af96d56786f773843ae4a471cc27884a1d2427c4995b4303635d2341a3a
     canonicalized_ast: f4eb2af96d56786f773843ae4a471cc27884a1d2427c4995b4303635d2341a3a
     type_inferenced_ast: 55a75c5ff5da70a4312ac3cdc1579f754ad578570160cafd05c67c1049344b3a
diff --git a/tests/expectations/compiler/compiler/integers/i8/sub.leo.out b/tests/expectations/compiler/compiler/integers/i8/sub.leo.out
index b63cd356a1..44189647b2 100644
--- a/tests/expectations/compiler/compiler/integers/i8/sub.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/sub.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 2c5edc8449cb6cce29bb2a02b8e3c346ab6cfd7df9cae0a00ee243999586e1a3
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 2c5edc8449cb6cce29bb2a02b8e3c346ab6cfd7df9cae0a00ee243999586e1a3
     canonicalized_ast: 2c5edc8449cb6cce29bb2a02b8e3c346ab6cfd7df9cae0a00ee243999586e1a3
     type_inferenced_ast: c39c0bb54e8aad9f3b59c59d2437bfcb776d26dde9c8382bae06caf1902d92ae
diff --git a/tests/expectations/compiler/compiler/integers/i8/ternary.leo.out b/tests/expectations/compiler/compiler/integers/i8/ternary.leo.out
index 430e88d2ed..41fd97e1fa 100644
--- a/tests/expectations/compiler/compiler/integers/i8/ternary.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/ternary.leo.out
@@ -23,6 +23,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 5b3ece3765ccc07057987288af24aa37205ddf5fc38146057f6a2f042d52e2ff
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 5b3ece3765ccc07057987288af24aa37205ddf5fc38146057f6a2f042d52e2ff
     canonicalized_ast: 5b3ece3765ccc07057987288af24aa37205ddf5fc38146057f6a2f042d52e2ff
     type_inferenced_ast: ed6896d5e12795fbf9705edb4ff13a68fff3d920aa01cb40b73c25b9c6e36663
diff --git a/tests/expectations/compiler/compiler/integers/u128/add.leo.out b/tests/expectations/compiler/compiler/integers/u128/add.leo.out
index 1ba184e583..8c558529ab 100644
--- a/tests/expectations/compiler/compiler/integers/u128/add.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/add.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: ba86672003228d42172ddb6064b6c18793cd2b10368476457a5765d72da968bb
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: ba86672003228d42172ddb6064b6c18793cd2b10368476457a5765d72da968bb
     canonicalized_ast: ba86672003228d42172ddb6064b6c18793cd2b10368476457a5765d72da968bb
     type_inferenced_ast: 90f8e8d95d0489fe8412b8b011c96cc3297fed62522f35dda922ffe5bc8e5eb7
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 0addc9131a..2c938e0941 100644
--- a/tests/expectations/compiler/compiler/integers/u128/console_assert.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/console_assert.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: ad919602ee4b538d6500101020bef0d5eab3f0737c717eeb26a4eb223b20ec2e
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: ad919602ee4b538d6500101020bef0d5eab3f0737c717eeb26a4eb223b20ec2e
     canonicalized_ast: ad919602ee4b538d6500101020bef0d5eab3f0737c717eeb26a4eb223b20ec2e
     type_inferenced_ast: 7ddb15730afe53d6cfd7831572139ec4d846fa9f02bdae1955352b002c4bb2eb
diff --git a/tests/expectations/compiler/compiler/integers/u128/div.leo.out b/tests/expectations/compiler/compiler/integers/u128/div.leo.out
index 3bbb26156d..a628da7ba8 100644
--- a/tests/expectations/compiler/compiler/integers/u128/div.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/div.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 2f1e3590db8fd98beb8eec3b15e51932dc50f6acccca4d89a04d9e4e45719a93
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 2f1e3590db8fd98beb8eec3b15e51932dc50f6acccca4d89a04d9e4e45719a93
     canonicalized_ast: 2f1e3590db8fd98beb8eec3b15e51932dc50f6acccca4d89a04d9e4e45719a93
     type_inferenced_ast: f7edc6e2efd7b862eafc38618b8d86ec92e270fbab2cf2f568b8f2e5feecc28a
diff --git a/tests/expectations/compiler/compiler/integers/u128/eq.leo.out b/tests/expectations/compiler/compiler/integers/u128/eq.leo.out
index 1b9acb03b9..fb7f3e8e90 100644
--- a/tests/expectations/compiler/compiler/integers/u128/eq.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/eq.leo.out
@@ -23,6 +23,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: be16e6c68a47140cb65dfd6fa6ae2084799092b353a4d7bbbbe6ea3cba689c48
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: be16e6c68a47140cb65dfd6fa6ae2084799092b353a4d7bbbbe6ea3cba689c48
     canonicalized_ast: be16e6c68a47140cb65dfd6fa6ae2084799092b353a4d7bbbbe6ea3cba689c48
     type_inferenced_ast: 70dabec56f6de97872802c0b63e48dc68b921c7bba5e526ee16f443973c1c35d
diff --git a/tests/expectations/compiler/compiler/integers/u128/ge.leo.out b/tests/expectations/compiler/compiler/integers/u128/ge.leo.out
index b8941ed079..e76870ad68 100644
--- a/tests/expectations/compiler/compiler/integers/u128/ge.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/ge.leo.out
@@ -29,6 +29,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: caca64001b0311d16373bfa5ce2f040cf054551675f664bd93f68b8a381ccc0b
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: caca64001b0311d16373bfa5ce2f040cf054551675f664bd93f68b8a381ccc0b
     canonicalized_ast: caca64001b0311d16373bfa5ce2f040cf054551675f664bd93f68b8a381ccc0b
     type_inferenced_ast: ad84a0f1e55ece76d7989d24b048f59e40af35918495fb0c7d9a023b810645d0
diff --git a/tests/expectations/compiler/compiler/integers/u128/gt.leo.out b/tests/expectations/compiler/compiler/integers/u128/gt.leo.out
index 4e6cc37a8a..9219d787db 100644
--- a/tests/expectations/compiler/compiler/integers/u128/gt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/gt.leo.out
@@ -17,6 +17,6 @@ outputs:
         output:
           registers: {}
     initial_ast: 820ed988d142189cd95bfc559ded7f9de3a1327338e47844a7a2200d79af56a9
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 820ed988d142189cd95bfc559ded7f9de3a1327338e47844a7a2200d79af56a9
     canonicalized_ast: 3392a949832c1db83f1280df3ca8c03a4fbc0645a31325a055b63c9e44d50cdd
     type_inferenced_ast: 5561d2a1ae0ff0c81d9cf1f4b9daf4ab75897efb06e87e8904492919f0d9f7f2
diff --git a/tests/expectations/compiler/compiler/integers/u128/input.leo.out b/tests/expectations/compiler/compiler/integers/u128/input.leo.out
index a13a670676..2cf493020d 100644
--- a/tests/expectations/compiler/compiler/integers/u128/input.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/input.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 725037d892c3a0d37394849bb896f53665de6bfb21ecbf07ca498c58a50febac
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 725037d892c3a0d37394849bb896f53665de6bfb21ecbf07ca498c58a50febac
     canonicalized_ast: 725037d892c3a0d37394849bb896f53665de6bfb21ecbf07ca498c58a50febac
     type_inferenced_ast: 792c1e73125395e09c23e92e715b83a86bbcc337f5bca3a6a7a4ae6719e85143
diff --git a/tests/expectations/compiler/compiler/integers/u128/le.leo.out b/tests/expectations/compiler/compiler/integers/u128/le.leo.out
index 2b92a12d7d..42c486ba6e 100644
--- a/tests/expectations/compiler/compiler/integers/u128/le.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/le.leo.out
@@ -29,6 +29,6 @@ outputs:
               type: bool
               value: "false"
     initial_ast: a2c1fd53a31ef6621356b270a00943ccdae328cd449fafa6c9e23d59ba32be17
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: a2c1fd53a31ef6621356b270a00943ccdae328cd449fafa6c9e23d59ba32be17
     canonicalized_ast: a2c1fd53a31ef6621356b270a00943ccdae328cd449fafa6c9e23d59ba32be17
     type_inferenced_ast: bf6dab074ed66340481a8690067e8272bd202f9d6eeb4c53102a4114051e5117
diff --git a/tests/expectations/compiler/compiler/integers/u128/lt.leo.out b/tests/expectations/compiler/compiler/integers/u128/lt.leo.out
index a9b4c878c7..f6780a1416 100644
--- a/tests/expectations/compiler/compiler/integers/u128/lt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/lt.leo.out
@@ -23,6 +23,6 @@ outputs:
               type: bool
               value: "false"
     initial_ast: 5c1e4693b718191aa0f3071ec02509a38ff2a8017ce0641ff0142f2bfa7da96a
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 5c1e4693b718191aa0f3071ec02509a38ff2a8017ce0641ff0142f2bfa7da96a
     canonicalized_ast: 5c1e4693b718191aa0f3071ec02509a38ff2a8017ce0641ff0142f2bfa7da96a
     type_inferenced_ast: 6453c5fa284e2b06dbe031d7411f2d59388c75d4f3f18d2b48c4df5f91c7d870
diff --git a/tests/expectations/compiler/compiler/integers/u128/max.leo.out b/tests/expectations/compiler/compiler/integers/u128/max.leo.out
index bda5208c93..0380abce37 100644
--- a/tests/expectations/compiler/compiler/integers/u128/max.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/max.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: c0f6616cbef7676909cabcc405f75fefd1807abdacbe00d81069f7ba074372d5
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: c0f6616cbef7676909cabcc405f75fefd1807abdacbe00d81069f7ba074372d5
     canonicalized_ast: c0f6616cbef7676909cabcc405f75fefd1807abdacbe00d81069f7ba074372d5
     type_inferenced_ast: 6d956778ffaa3453c3af36f0d8b84fc62aff73c71f5a685421b2a310fc036121
diff --git a/tests/expectations/compiler/compiler/integers/u128/min.leo.out b/tests/expectations/compiler/compiler/integers/u128/min.leo.out
index a435d8c641..ec563dd1bb 100644
--- a/tests/expectations/compiler/compiler/integers/u128/min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/min.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 9151781352023ac8d55f9c28b1c00ebd782f0ebdc9fc0d431eacc82abdc895c1
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 9151781352023ac8d55f9c28b1c00ebd782f0ebdc9fc0d431eacc82abdc895c1
     canonicalized_ast: 9151781352023ac8d55f9c28b1c00ebd782f0ebdc9fc0d431eacc82abdc895c1
     type_inferenced_ast: 037701324af5adc4f453a37faef5c91eee6aabd37e3aa3c612203c41e4602b66
diff --git a/tests/expectations/compiler/compiler/integers/u128/mul.leo.out b/tests/expectations/compiler/compiler/integers/u128/mul.leo.out
index 60b9e031b3..d063a3ddf7 100644
--- a/tests/expectations/compiler/compiler/integers/u128/mul.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/mul.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "false"
     initial_ast: 9bacdd7f562607e16f88a6cc64a6093fd09e678f8a09d485edb6e1e9cffb90e4
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 9bacdd7f562607e16f88a6cc64a6093fd09e678f8a09d485edb6e1e9cffb90e4
     canonicalized_ast: 9bacdd7f562607e16f88a6cc64a6093fd09e678f8a09d485edb6e1e9cffb90e4
     type_inferenced_ast: 2fb1d8964dccf7acfc38e37cf41d859c30e19b052470ed54923b944fe8ec9b15
diff --git a/tests/expectations/compiler/compiler/integers/u128/ne.leo.out b/tests/expectations/compiler/compiler/integers/u128/ne.leo.out
index 1e584921d1..507b010140 100644
--- a/tests/expectations/compiler/compiler/integers/u128/ne.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/ne.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 6796d9b74beb8daf62ccd75c5a5bcb5942d00742e35e558dcd49e4accf571458
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 6796d9b74beb8daf62ccd75c5a5bcb5942d00742e35e558dcd49e4accf571458
     canonicalized_ast: 6796d9b74beb8daf62ccd75c5a5bcb5942d00742e35e558dcd49e4accf571458
     type_inferenced_ast: 1a122fec3c383117b7241a98a77518aa07fc495bf5724a721439e3d2c561b770
diff --git a/tests/expectations/compiler/compiler/integers/u128/sub.leo.out b/tests/expectations/compiler/compiler/integers/u128/sub.leo.out
index 353ff74353..e120fc8c02 100644
--- a/tests/expectations/compiler/compiler/integers/u128/sub.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/sub.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 22b1398c07fa127567d547dec76a9db42d17dfbfd3c381fd9b597e6d54ebe520
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 22b1398c07fa127567d547dec76a9db42d17dfbfd3c381fd9b597e6d54ebe520
     canonicalized_ast: 22b1398c07fa127567d547dec76a9db42d17dfbfd3c381fd9b597e6d54ebe520
     type_inferenced_ast: 9378705614f9bb993d720e7ab3b9ad2bb6f9566c355ad8e6efdc35ed804ed1f9
diff --git a/tests/expectations/compiler/compiler/integers/u128/ternary.leo.out b/tests/expectations/compiler/compiler/integers/u128/ternary.leo.out
index 39179597ee..b82d2a83e7 100644
--- a/tests/expectations/compiler/compiler/integers/u128/ternary.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/ternary.leo.out
@@ -23,6 +23,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: d8edd41c3446a777f3d2b0b033cee9135477ebee6a559854906789ac31db6a9a
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: d8edd41c3446a777f3d2b0b033cee9135477ebee6a559854906789ac31db6a9a
     canonicalized_ast: d8edd41c3446a777f3d2b0b033cee9135477ebee6a559854906789ac31db6a9a
     type_inferenced_ast: 0a750c50386c174281af10df1a1ab346b11fa42554a4378fa03b4846afd960b6
diff --git a/tests/expectations/compiler/compiler/integers/u16/add.leo.out b/tests/expectations/compiler/compiler/integers/u16/add.leo.out
index 46e245433f..31bc564fcf 100644
--- a/tests/expectations/compiler/compiler/integers/u16/add.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/add.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: eb6419bbaed4c761e2c76e927f773367006508a4721ea1c70cd633fe47976545
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: eb6419bbaed4c761e2c76e927f773367006508a4721ea1c70cd633fe47976545
     canonicalized_ast: eb6419bbaed4c761e2c76e927f773367006508a4721ea1c70cd633fe47976545
     type_inferenced_ast: 4da352adef1ef9a4d872afa8c0a563d66058c4b5f2c7ae6e1d6e76f9d0e6f828
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 e12c47aad2..11f505cb32 100644
--- a/tests/expectations/compiler/compiler/integers/u16/console_assert.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/console_assert.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: d530ffa650127824ba18491674144411e798de3f154c8cf6a2a7972739df7512
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: d530ffa650127824ba18491674144411e798de3f154c8cf6a2a7972739df7512
     canonicalized_ast: d530ffa650127824ba18491674144411e798de3f154c8cf6a2a7972739df7512
     type_inferenced_ast: d5482fa8b8ade8232890a04bc9d29c9bf9f02a4dc9d49cfbe5595836a0fdabfc
diff --git a/tests/expectations/compiler/compiler/integers/u16/div.leo.out b/tests/expectations/compiler/compiler/integers/u16/div.leo.out
index 98949a549d..3fc719f817 100644
--- a/tests/expectations/compiler/compiler/integers/u16/div.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/div.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 41193e8e4d4bb9d346c56a0a2630ccc9c46003d3a72a215945c74af3aede4606
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 41193e8e4d4bb9d346c56a0a2630ccc9c46003d3a72a215945c74af3aede4606
     canonicalized_ast: 41193e8e4d4bb9d346c56a0a2630ccc9c46003d3a72a215945c74af3aede4606
     type_inferenced_ast: 9aa867a159c530813bd8a1805fb093a208edcaf48466be37b18c311cc3590782
diff --git a/tests/expectations/compiler/compiler/integers/u16/eq.leo.out b/tests/expectations/compiler/compiler/integers/u16/eq.leo.out
index 3fa86b92d9..4e75571070 100644
--- a/tests/expectations/compiler/compiler/integers/u16/eq.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/eq.leo.out
@@ -23,6 +23,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: b45f803365a72727350696859672c162fa18a9b2b97b3c155a03cb1bf74f9e68
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: b45f803365a72727350696859672c162fa18a9b2b97b3c155a03cb1bf74f9e68
     canonicalized_ast: b45f803365a72727350696859672c162fa18a9b2b97b3c155a03cb1bf74f9e68
     type_inferenced_ast: d34a794b0695b41198003b21773b5abd4b4aa044de22a346301158aabb005d8e
diff --git a/tests/expectations/compiler/compiler/integers/u16/ge.leo.out b/tests/expectations/compiler/compiler/integers/u16/ge.leo.out
index 5c761ff047..a72469e83e 100644
--- a/tests/expectations/compiler/compiler/integers/u16/ge.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/ge.leo.out
@@ -29,6 +29,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 05e8b0ca21ae27026fec7897079a23f522be4ecca74009c42a7d820dbf3b37dc
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 05e8b0ca21ae27026fec7897079a23f522be4ecca74009c42a7d820dbf3b37dc
     canonicalized_ast: 05e8b0ca21ae27026fec7897079a23f522be4ecca74009c42a7d820dbf3b37dc
     type_inferenced_ast: f79fa9920321f18c258cdbe99fcd37b7de5ebd943bdf1a6091954c9c8501c4c0
diff --git a/tests/expectations/compiler/compiler/integers/u16/gt.leo.out b/tests/expectations/compiler/compiler/integers/u16/gt.leo.out
index 43356b0e2b..3effd84987 100644
--- a/tests/expectations/compiler/compiler/integers/u16/gt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/gt.leo.out
@@ -17,6 +17,6 @@ outputs:
         output:
           registers: {}
     initial_ast: 07aa194712e885c67e73bd8ce425b09aa0b11a0597fd28e2b6b861c2890a7dbf
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 07aa194712e885c67e73bd8ce425b09aa0b11a0597fd28e2b6b861c2890a7dbf
     canonicalized_ast: 585b9eb84b4794b44a491f3a20919aa03b1defb10b34ff0c1ccaf16943c95498
     type_inferenced_ast: f58d2c30292c5b7066145cc1f9f103c347c69bcfd103f68a11870d436d93034c
diff --git a/tests/expectations/compiler/compiler/integers/u16/input.leo.out b/tests/expectations/compiler/compiler/integers/u16/input.leo.out
index bf7b6a6b25..bb56c37ebc 100644
--- a/tests/expectations/compiler/compiler/integers/u16/input.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/input.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: ce84d1a90125776ce0b144842cfdc4722338fc48bddbf027a6684704f02e71c5
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: ce84d1a90125776ce0b144842cfdc4722338fc48bddbf027a6684704f02e71c5
     canonicalized_ast: ce84d1a90125776ce0b144842cfdc4722338fc48bddbf027a6684704f02e71c5
     type_inferenced_ast: 4f28676ebd5a0be24690d37c2625b5f5080a5ae41368bff213d41b96377d9ee0
diff --git a/tests/expectations/compiler/compiler/integers/u16/le.leo.out b/tests/expectations/compiler/compiler/integers/u16/le.leo.out
index 17e023e8b4..765ed6181f 100644
--- a/tests/expectations/compiler/compiler/integers/u16/le.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/le.leo.out
@@ -29,6 +29,6 @@ outputs:
               type: bool
               value: "false"
     initial_ast: 4cec9681367670442f9db73b42d312321bff0f30aeec0160b5c25c3e2dd33829
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 4cec9681367670442f9db73b42d312321bff0f30aeec0160b5c25c3e2dd33829
     canonicalized_ast: 4cec9681367670442f9db73b42d312321bff0f30aeec0160b5c25c3e2dd33829
     type_inferenced_ast: 7cd703e68f80f112a3d93757cb906045e316616c15f781773028a4d1b4793551
diff --git a/tests/expectations/compiler/compiler/integers/u16/lt.leo.out b/tests/expectations/compiler/compiler/integers/u16/lt.leo.out
index 18726e715a..851f22fa65 100644
--- a/tests/expectations/compiler/compiler/integers/u16/lt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/lt.leo.out
@@ -23,6 +23,6 @@ outputs:
               type: bool
               value: "false"
     initial_ast: 68a12590c757f5286e98808d5a22bb707166828f74d4b89716553328b57867f3
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 68a12590c757f5286e98808d5a22bb707166828f74d4b89716553328b57867f3
     canonicalized_ast: 68a12590c757f5286e98808d5a22bb707166828f74d4b89716553328b57867f3
     type_inferenced_ast: d1c19b097acf638840cadcbc81cc6e51fc750c2c49b84bcf36abc467d36e51f4
diff --git a/tests/expectations/compiler/compiler/integers/u16/max.leo.out b/tests/expectations/compiler/compiler/integers/u16/max.leo.out
index 9c87398b24..f9c3c2d5b2 100644
--- a/tests/expectations/compiler/compiler/integers/u16/max.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/max.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 6a13120d649e7db047df9453464a4a88965409a39257b56ad8466f397ab61217
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 6a13120d649e7db047df9453464a4a88965409a39257b56ad8466f397ab61217
     canonicalized_ast: 6a13120d649e7db047df9453464a4a88965409a39257b56ad8466f397ab61217
     type_inferenced_ast: a08685b22ab2a58652759e3657a8246bd65e23d18fe895a0987e3567926eddc2
diff --git a/tests/expectations/compiler/compiler/integers/u16/min.leo.out b/tests/expectations/compiler/compiler/integers/u16/min.leo.out
index c045f90026..a5a6aadb9d 100644
--- a/tests/expectations/compiler/compiler/integers/u16/min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/min.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 10bca9f23d35f0a354948dafb069860d71618205c9e0efb483c465c5794ee83a
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 10bca9f23d35f0a354948dafb069860d71618205c9e0efb483c465c5794ee83a
     canonicalized_ast: 10bca9f23d35f0a354948dafb069860d71618205c9e0efb483c465c5794ee83a
     type_inferenced_ast: b7673715a9b643f97ea30652defed51f23f6ba79ae9ef39c81d25fd7d3bb815e
diff --git a/tests/expectations/compiler/compiler/integers/u16/mul.leo.out b/tests/expectations/compiler/compiler/integers/u16/mul.leo.out
index 8d14a3eb49..b84d167f1d 100644
--- a/tests/expectations/compiler/compiler/integers/u16/mul.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/mul.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "false"
     initial_ast: 9b02c262401b83f83f76f3dd22aceaa0bdb1bdd196faf68bdd71e4105bd3b143
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 9b02c262401b83f83f76f3dd22aceaa0bdb1bdd196faf68bdd71e4105bd3b143
     canonicalized_ast: 9b02c262401b83f83f76f3dd22aceaa0bdb1bdd196faf68bdd71e4105bd3b143
     type_inferenced_ast: b5b3e21e917355dbbb35d62ee33a1f565b592dee2c62e4a56eb7521ea168c7d7
diff --git a/tests/expectations/compiler/compiler/integers/u16/ne.leo.out b/tests/expectations/compiler/compiler/integers/u16/ne.leo.out
index 352260336c..978b1e07e8 100644
--- a/tests/expectations/compiler/compiler/integers/u16/ne.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/ne.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 30ee8bc862393f3ffec75051160d88c703e24711dc4a742369fd824485792a44
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 30ee8bc862393f3ffec75051160d88c703e24711dc4a742369fd824485792a44
     canonicalized_ast: 30ee8bc862393f3ffec75051160d88c703e24711dc4a742369fd824485792a44
     type_inferenced_ast: e0f90d2b1c766550e9d7fe202705709a93771f8fce9debf3c119d0f1bf2ff19e
diff --git a/tests/expectations/compiler/compiler/integers/u16/sub.leo.out b/tests/expectations/compiler/compiler/integers/u16/sub.leo.out
index b5da4eb110..c330ad2612 100644
--- a/tests/expectations/compiler/compiler/integers/u16/sub.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/sub.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 63558d4f64eb9c248b6391254bc279f1ae53c08602a35e86b73d8876ae5cbff7
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 63558d4f64eb9c248b6391254bc279f1ae53c08602a35e86b73d8876ae5cbff7
     canonicalized_ast: 63558d4f64eb9c248b6391254bc279f1ae53c08602a35e86b73d8876ae5cbff7
     type_inferenced_ast: f272cb2627650262ddfa289e945abddb91525bb8899c8d4d7853d9e5a398aa56
diff --git a/tests/expectations/compiler/compiler/integers/u16/ternary.leo.out b/tests/expectations/compiler/compiler/integers/u16/ternary.leo.out
index ea05dab19a..31197445ef 100644
--- a/tests/expectations/compiler/compiler/integers/u16/ternary.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/ternary.leo.out
@@ -23,6 +23,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: a5453842c01ff883e970a8acbc0c0164e21ab8ee9667e7d198fd02b44e4cdf56
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: a5453842c01ff883e970a8acbc0c0164e21ab8ee9667e7d198fd02b44e4cdf56
     canonicalized_ast: a5453842c01ff883e970a8acbc0c0164e21ab8ee9667e7d198fd02b44e4cdf56
     type_inferenced_ast: 486a1e2a5f9e3eb3704f6ea039a832bfdad7a436464140933e978cee5dd42466
diff --git a/tests/expectations/compiler/compiler/integers/u32/add.leo.out b/tests/expectations/compiler/compiler/integers/u32/add.leo.out
index 83c6a693aa..e4810ab1e5 100644
--- a/tests/expectations/compiler/compiler/integers/u32/add.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/add.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 3ca20068a4f2cc3ce017686240c82a7320f94700e9068448d7bbcaa6c8d11afd
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 3ca20068a4f2cc3ce017686240c82a7320f94700e9068448d7bbcaa6c8d11afd
     canonicalized_ast: 3ca20068a4f2cc3ce017686240c82a7320f94700e9068448d7bbcaa6c8d11afd
     type_inferenced_ast: 6f31cebf6905062ec9c55324ee499173987eb04820414eeda3a6696a9a4df4e5
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 1b7dd984af..3990b9d39e 100644
--- a/tests/expectations/compiler/compiler/integers/u32/console_assert.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/console_assert.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 00f676e0063c85f5caa851dd5e1e9061cbdf79c85da857d6e5d89d42cda9651b
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 00f676e0063c85f5caa851dd5e1e9061cbdf79c85da857d6e5d89d42cda9651b
     canonicalized_ast: 00f676e0063c85f5caa851dd5e1e9061cbdf79c85da857d6e5d89d42cda9651b
     type_inferenced_ast: 20a848a26a90c695b25384daf05ebc98716ec0951992087dfc4370e15920b805
diff --git a/tests/expectations/compiler/compiler/integers/u32/div.leo.out b/tests/expectations/compiler/compiler/integers/u32/div.leo.out
index 35a39bf554..ec1450b695 100644
--- a/tests/expectations/compiler/compiler/integers/u32/div.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/div.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 3edfc10e7ea7c05f9f42f2f22b673431820a526c5c6bd0729d98c48ba3c8e8aa
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 3edfc10e7ea7c05f9f42f2f22b673431820a526c5c6bd0729d98c48ba3c8e8aa
     canonicalized_ast: 3edfc10e7ea7c05f9f42f2f22b673431820a526c5c6bd0729d98c48ba3c8e8aa
     type_inferenced_ast: 90e585dbd2a3e0d8d2d9bec6aeb443d2d3276826e18f3ce39e7cc0b4b9edad8a
diff --git a/tests/expectations/compiler/compiler/integers/u32/eq.leo.out b/tests/expectations/compiler/compiler/integers/u32/eq.leo.out
index 31fb0b87ec..34082bd47f 100644
--- a/tests/expectations/compiler/compiler/integers/u32/eq.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/eq.leo.out
@@ -23,6 +23,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 0064b1991c2086b76844f10afc932e912382ca46ce87a491fa698112c647da7b
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 0064b1991c2086b76844f10afc932e912382ca46ce87a491fa698112c647da7b
     canonicalized_ast: 0064b1991c2086b76844f10afc932e912382ca46ce87a491fa698112c647da7b
     type_inferenced_ast: e3aa9184fea93463cfc41a487e3cc59a9dd21846d201926424bf94eb0bd1ec04
diff --git a/tests/expectations/compiler/compiler/integers/u32/ge.leo.out b/tests/expectations/compiler/compiler/integers/u32/ge.leo.out
index 3ea8fb65aa..6a162f8cfe 100644
--- a/tests/expectations/compiler/compiler/integers/u32/ge.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/ge.leo.out
@@ -29,6 +29,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 5cf54eb75aca0534ecdcebdfcd29487598ac2bfbff4ccd94e1f8372cc66647f2
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 5cf54eb75aca0534ecdcebdfcd29487598ac2bfbff4ccd94e1f8372cc66647f2
     canonicalized_ast: 5cf54eb75aca0534ecdcebdfcd29487598ac2bfbff4ccd94e1f8372cc66647f2
     type_inferenced_ast: fb2ff53ccf82f2b41a3c9db523623d42b49beca8a2cf2ed50743bd17c748a75c
diff --git a/tests/expectations/compiler/compiler/integers/u32/gt.leo.out b/tests/expectations/compiler/compiler/integers/u32/gt.leo.out
index 69c53d1b2e..5c1b7b51ca 100644
--- a/tests/expectations/compiler/compiler/integers/u32/gt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/gt.leo.out
@@ -17,6 +17,6 @@ outputs:
         output:
           registers: {}
     initial_ast: ce24730aad7178331b88c496a8acbb95da355169193369d49801fc9eac092371
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: ce24730aad7178331b88c496a8acbb95da355169193369d49801fc9eac092371
     canonicalized_ast: 21cd67ad1094e56f7cbcc6bc839d9b20c25e8d15e2017d64c4672da2233385e4
     type_inferenced_ast: 532bef95e9c6d5432f89a08f207e25e30b61b862f7a1fd225603cb89f0b203b5
diff --git a/tests/expectations/compiler/compiler/integers/u32/input.leo.out b/tests/expectations/compiler/compiler/integers/u32/input.leo.out
index 84fa6e1492..f2190b9b36 100644
--- a/tests/expectations/compiler/compiler/integers/u32/input.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/input.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: b6d84a8bb303dcb914251907999a4c4747f2f1ba76547f9b6bf42cf964b8c173
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: b6d84a8bb303dcb914251907999a4c4747f2f1ba76547f9b6bf42cf964b8c173
     canonicalized_ast: b6d84a8bb303dcb914251907999a4c4747f2f1ba76547f9b6bf42cf964b8c173
     type_inferenced_ast: 20de2c6d503d1dd20412d2f689fc34a0965994743221604b2e83dfb62ea1b76c
diff --git a/tests/expectations/compiler/compiler/integers/u32/le.leo.out b/tests/expectations/compiler/compiler/integers/u32/le.leo.out
index 0e97a9faeb..d54beb1abb 100644
--- a/tests/expectations/compiler/compiler/integers/u32/le.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/le.leo.out
@@ -29,6 +29,6 @@ outputs:
               type: bool
               value: "false"
     initial_ast: 609c549354bf45d203924554785e66eaa4506fc72cab880da747d87be55fb687
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 609c549354bf45d203924554785e66eaa4506fc72cab880da747d87be55fb687
     canonicalized_ast: 609c549354bf45d203924554785e66eaa4506fc72cab880da747d87be55fb687
     type_inferenced_ast: deba08692c955e042da5d13a1209eb8fc84398362e51d95c8866b18332034706
diff --git a/tests/expectations/compiler/compiler/integers/u32/lt.leo.out b/tests/expectations/compiler/compiler/integers/u32/lt.leo.out
index 9cb4ae1be3..14201458e4 100644
--- a/tests/expectations/compiler/compiler/integers/u32/lt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/lt.leo.out
@@ -23,6 +23,6 @@ outputs:
               type: bool
               value: "false"
     initial_ast: 62a00f0678c643a199718696e42d0acb438f78f1cf5c6dbcd4ecb45b7a8a7100
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 62a00f0678c643a199718696e42d0acb438f78f1cf5c6dbcd4ecb45b7a8a7100
     canonicalized_ast: 62a00f0678c643a199718696e42d0acb438f78f1cf5c6dbcd4ecb45b7a8a7100
     type_inferenced_ast: eb21e43b5fb6fd7fe7b7fe35af69df697aa5fc8ca94325a0b6f957c55828b46e
diff --git a/tests/expectations/compiler/compiler/integers/u32/max.leo.out b/tests/expectations/compiler/compiler/integers/u32/max.leo.out
index bfdc63385f..6894c507e7 100644
--- a/tests/expectations/compiler/compiler/integers/u32/max.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/max.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: e39345598cb3fb70a83082c7996f36d8c30ba9414fe7f6b9cc982bba85ec0a6a
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: e39345598cb3fb70a83082c7996f36d8c30ba9414fe7f6b9cc982bba85ec0a6a
     canonicalized_ast: e39345598cb3fb70a83082c7996f36d8c30ba9414fe7f6b9cc982bba85ec0a6a
     type_inferenced_ast: bca1eb2f17887930dfabe774271b8455b15536e4f835deb9961e1668ad405c3c
diff --git a/tests/expectations/compiler/compiler/integers/u32/min.leo.out b/tests/expectations/compiler/compiler/integers/u32/min.leo.out
index f92c855f16..ced1a702ef 100644
--- a/tests/expectations/compiler/compiler/integers/u32/min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/min.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 9ca4ca8404f1fc0d16a652b741f3e57d3483d8cdb05304a58f6b1ee3580886c1
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 9ca4ca8404f1fc0d16a652b741f3e57d3483d8cdb05304a58f6b1ee3580886c1
     canonicalized_ast: 9ca4ca8404f1fc0d16a652b741f3e57d3483d8cdb05304a58f6b1ee3580886c1
     type_inferenced_ast: 156bc2c711d9666d42cff2bb99582ff06ad6a13a49ee529a59242e729d71f7dc
diff --git a/tests/expectations/compiler/compiler/integers/u32/mul.leo.out b/tests/expectations/compiler/compiler/integers/u32/mul.leo.out
index 1cfe08eddf..cf8fdc3da5 100644
--- a/tests/expectations/compiler/compiler/integers/u32/mul.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/mul.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "false"
     initial_ast: 64377d0d7fdebe1312a8b11a1e0e45b2664cbf51042de5ffddfd56a1b2c49c35
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 64377d0d7fdebe1312a8b11a1e0e45b2664cbf51042de5ffddfd56a1b2c49c35
     canonicalized_ast: 64377d0d7fdebe1312a8b11a1e0e45b2664cbf51042de5ffddfd56a1b2c49c35
     type_inferenced_ast: 4e218b33b3b57390e30f068e49f5ed008626b4ebb22615fdd29929bf36ec2ed0
diff --git a/tests/expectations/compiler/compiler/integers/u32/ne.leo.out b/tests/expectations/compiler/compiler/integers/u32/ne.leo.out
index b65c5ede8a..730c529f30 100644
--- a/tests/expectations/compiler/compiler/integers/u32/ne.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/ne.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 0857646d1f6fdb13fc94c7fea7f0d91fcb1fdccb4841661a170b00c3091f5691
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 0857646d1f6fdb13fc94c7fea7f0d91fcb1fdccb4841661a170b00c3091f5691
     canonicalized_ast: 0857646d1f6fdb13fc94c7fea7f0d91fcb1fdccb4841661a170b00c3091f5691
     type_inferenced_ast: 85905a294e0eea013e6f7c4fe93858e935258f5001d1bb6aa082325ec90df1fe
diff --git a/tests/expectations/compiler/compiler/integers/u32/sub.leo.out b/tests/expectations/compiler/compiler/integers/u32/sub.leo.out
index f9c23f21f2..9a4a91c185 100644
--- a/tests/expectations/compiler/compiler/integers/u32/sub.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/sub.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 5ad8be6dc638e835e2f7b4e9dd26f9ae282dbe59d9853db13ce09f38d3e43b1f
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 5ad8be6dc638e835e2f7b4e9dd26f9ae282dbe59d9853db13ce09f38d3e43b1f
     canonicalized_ast: 5ad8be6dc638e835e2f7b4e9dd26f9ae282dbe59d9853db13ce09f38d3e43b1f
     type_inferenced_ast: e7b074bd40b37ada9a90999b35fdbcd56886e2f98949a4093ba8c495661a75d1
diff --git a/tests/expectations/compiler/compiler/integers/u32/ternary.leo.out b/tests/expectations/compiler/compiler/integers/u32/ternary.leo.out
index f0705ec064..b22494cd5e 100644
--- a/tests/expectations/compiler/compiler/integers/u32/ternary.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/ternary.leo.out
@@ -23,6 +23,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: c5b7d8bd3863f44039ab510def2034acb99362b39a5428e6fc117483353f4afe
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: c5b7d8bd3863f44039ab510def2034acb99362b39a5428e6fc117483353f4afe
     canonicalized_ast: c5b7d8bd3863f44039ab510def2034acb99362b39a5428e6fc117483353f4afe
     type_inferenced_ast: dc3eaf97d5cb489ebffb01f14ba974027562ca17f438301c26167aa3471ddc52
diff --git a/tests/expectations/compiler/compiler/integers/u64/add.leo.out b/tests/expectations/compiler/compiler/integers/u64/add.leo.out
index d80683cd8c..788d42dcc1 100644
--- a/tests/expectations/compiler/compiler/integers/u64/add.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/add.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 0ef0459ce0ac2ba8a9c2272d6c4f67f7dd9cd7d36c557c65339d2ef8d2c5b187
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 0ef0459ce0ac2ba8a9c2272d6c4f67f7dd9cd7d36c557c65339d2ef8d2c5b187
     canonicalized_ast: 0ef0459ce0ac2ba8a9c2272d6c4f67f7dd9cd7d36c557c65339d2ef8d2c5b187
     type_inferenced_ast: 248f3c601e2a40da8679d72f7b7316b939d60cf137c4b51cbb45fa17f7707f6e
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 80565441b5..dc696c5d5e 100644
--- a/tests/expectations/compiler/compiler/integers/u64/console_assert.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/console_assert.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: d2f3122d85fa05ee19f871887e18aa6efabad907605cea1f15450ef959b2879a
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: d2f3122d85fa05ee19f871887e18aa6efabad907605cea1f15450ef959b2879a
     canonicalized_ast: d2f3122d85fa05ee19f871887e18aa6efabad907605cea1f15450ef959b2879a
     type_inferenced_ast: f815e8620acc120dd2d65879e28cb0454628ce35522a1c2ff767fa01035bdf58
diff --git a/tests/expectations/compiler/compiler/integers/u64/div.leo.out b/tests/expectations/compiler/compiler/integers/u64/div.leo.out
index 68cf09fc15..001652407f 100644
--- a/tests/expectations/compiler/compiler/integers/u64/div.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/div.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 2fdc5cbc880c5460481529ab25107dd0aca1981e62799cbc2b2493aa09118a48
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 2fdc5cbc880c5460481529ab25107dd0aca1981e62799cbc2b2493aa09118a48
     canonicalized_ast: 2fdc5cbc880c5460481529ab25107dd0aca1981e62799cbc2b2493aa09118a48
     type_inferenced_ast: 961438f46e01229747be641eee9975d6368894da0e8a6b34339bd6268dd8afa6
diff --git a/tests/expectations/compiler/compiler/integers/u64/eq.leo.out b/tests/expectations/compiler/compiler/integers/u64/eq.leo.out
index d181e4a698..769418bc71 100644
--- a/tests/expectations/compiler/compiler/integers/u64/eq.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/eq.leo.out
@@ -23,6 +23,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: ad4f42340cbf53046e609f62504385802398d608ada37e91f60134edf598ba59
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: ad4f42340cbf53046e609f62504385802398d608ada37e91f60134edf598ba59
     canonicalized_ast: ad4f42340cbf53046e609f62504385802398d608ada37e91f60134edf598ba59
     type_inferenced_ast: 4cf9af4071478957995abe43c2e193df18a860eaa82449a0952b732ec7be9a9c
diff --git a/tests/expectations/compiler/compiler/integers/u64/ge.leo.out b/tests/expectations/compiler/compiler/integers/u64/ge.leo.out
index 4bcbe887bd..085d10a1f8 100644
--- a/tests/expectations/compiler/compiler/integers/u64/ge.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/ge.leo.out
@@ -29,6 +29,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 98a856a767ee58ea53ec7a6f489d6db69a9e828b76e7b8b26c0222b89b4be3d3
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 98a856a767ee58ea53ec7a6f489d6db69a9e828b76e7b8b26c0222b89b4be3d3
     canonicalized_ast: 98a856a767ee58ea53ec7a6f489d6db69a9e828b76e7b8b26c0222b89b4be3d3
     type_inferenced_ast: 2d3be362efd6a4a97dc1b06eff92c06facd649dab585f3ad681d5ce49e4e37cf
diff --git a/tests/expectations/compiler/compiler/integers/u64/gt.leo.out b/tests/expectations/compiler/compiler/integers/u64/gt.leo.out
index 6f11a70cc8..ceb14c1bab 100644
--- a/tests/expectations/compiler/compiler/integers/u64/gt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/gt.leo.out
@@ -17,6 +17,6 @@ outputs:
         output:
           registers: {}
     initial_ast: c667f170b175a4c3991b2df81c0605d3980cab1ae01ae4c66c71f3a311d711c2
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: c667f170b175a4c3991b2df81c0605d3980cab1ae01ae4c66c71f3a311d711c2
     canonicalized_ast: 173da56c6c9a8cd27a1181d9fe1197db4168f4f25129dbd02ef474e5c77c110f
     type_inferenced_ast: 4618a65899c633510140b465505d8f767d890f40bc24535513f73d04e187a884
diff --git a/tests/expectations/compiler/compiler/integers/u64/input.leo.out b/tests/expectations/compiler/compiler/integers/u64/input.leo.out
index 3905661d57..ba72baf0a0 100644
--- a/tests/expectations/compiler/compiler/integers/u64/input.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/input.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 2f1b1bd0b33a99d4962b01003146df394ef6b0ba913080a4a905ad393ae5ad44
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 2f1b1bd0b33a99d4962b01003146df394ef6b0ba913080a4a905ad393ae5ad44
     canonicalized_ast: 2f1b1bd0b33a99d4962b01003146df394ef6b0ba913080a4a905ad393ae5ad44
     type_inferenced_ast: 4b97d8527b94d514fa342714f89595dd6384f95d21ead2b6f52ca4141e54b2b4
diff --git a/tests/expectations/compiler/compiler/integers/u64/le.leo.out b/tests/expectations/compiler/compiler/integers/u64/le.leo.out
index fbc3d16f2d..4404e32632 100644
--- a/tests/expectations/compiler/compiler/integers/u64/le.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/le.leo.out
@@ -29,6 +29,6 @@ outputs:
               type: bool
               value: "false"
     initial_ast: 254f1e1190e4badc566cf6325a2204b54c3862730fd1927f940bed7fc59661ef
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 254f1e1190e4badc566cf6325a2204b54c3862730fd1927f940bed7fc59661ef
     canonicalized_ast: 254f1e1190e4badc566cf6325a2204b54c3862730fd1927f940bed7fc59661ef
     type_inferenced_ast: d0f1f32a7cfddb8fdeb6d3c8d1dc671e360e6da220cc027d96ba9af05a89c9ee
diff --git a/tests/expectations/compiler/compiler/integers/u64/lt.leo.out b/tests/expectations/compiler/compiler/integers/u64/lt.leo.out
index 1260c6a9a0..e5858787e1 100644
--- a/tests/expectations/compiler/compiler/integers/u64/lt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/lt.leo.out
@@ -23,6 +23,6 @@ outputs:
               type: bool
               value: "false"
     initial_ast: 78e1412b1d5489da7cc5748403694f48facede592b307e53b8ff81c88706aaba
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 78e1412b1d5489da7cc5748403694f48facede592b307e53b8ff81c88706aaba
     canonicalized_ast: 78e1412b1d5489da7cc5748403694f48facede592b307e53b8ff81c88706aaba
     type_inferenced_ast: de8ae920138c080d121776efa9920dc1b51108aaf7e18e75c61fcd4436bfdbdb
diff --git a/tests/expectations/compiler/compiler/integers/u64/max.leo.out b/tests/expectations/compiler/compiler/integers/u64/max.leo.out
index b1e41c048b..2740bb1a85 100644
--- a/tests/expectations/compiler/compiler/integers/u64/max.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/max.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: b683fad49d2ee3cf8e2c08db1994d40178fd8620ed5b2a1aa84a222a2db4d466
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: b683fad49d2ee3cf8e2c08db1994d40178fd8620ed5b2a1aa84a222a2db4d466
     canonicalized_ast: b683fad49d2ee3cf8e2c08db1994d40178fd8620ed5b2a1aa84a222a2db4d466
     type_inferenced_ast: 58e6327fa6d926a54bf437c8b3368b1bb2a62c9f86c372139b0952de56b94d78
diff --git a/tests/expectations/compiler/compiler/integers/u64/min.leo.out b/tests/expectations/compiler/compiler/integers/u64/min.leo.out
index 1b497ffc8a..8668160ca6 100644
--- a/tests/expectations/compiler/compiler/integers/u64/min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/min.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 2ab7dc6aeaa06191668ce218bf971a797d818d82d57e5c5238571ac7d51b3e1a
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 2ab7dc6aeaa06191668ce218bf971a797d818d82d57e5c5238571ac7d51b3e1a
     canonicalized_ast: 2ab7dc6aeaa06191668ce218bf971a797d818d82d57e5c5238571ac7d51b3e1a
     type_inferenced_ast: 9b04ce3a661bfcbc23b9066b315b48ca4cc51c10364dc3f2aa6196efd1633056
diff --git a/tests/expectations/compiler/compiler/integers/u64/mul.leo.out b/tests/expectations/compiler/compiler/integers/u64/mul.leo.out
index d6b5834e6e..ea52e75d85 100644
--- a/tests/expectations/compiler/compiler/integers/u64/mul.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/mul.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "false"
     initial_ast: 234cebde72559d83c7ca897456c95a46345a67de7fd6b82aa9fb3a0ce5cd9d6d
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 234cebde72559d83c7ca897456c95a46345a67de7fd6b82aa9fb3a0ce5cd9d6d
     canonicalized_ast: 234cebde72559d83c7ca897456c95a46345a67de7fd6b82aa9fb3a0ce5cd9d6d
     type_inferenced_ast: 41a3dae72352f43712f3cc0cb507ab92031b48cfdb7fcb06f959b6060758d17b
diff --git a/tests/expectations/compiler/compiler/integers/u64/ne.leo.out b/tests/expectations/compiler/compiler/integers/u64/ne.leo.out
index 8deb8441c3..28e0fa8284 100644
--- a/tests/expectations/compiler/compiler/integers/u64/ne.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/ne.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: d4062e73e7e24af37d9e4d1770d18e008d47f5df0dbc2de56a1089496e53ea1b
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: d4062e73e7e24af37d9e4d1770d18e008d47f5df0dbc2de56a1089496e53ea1b
     canonicalized_ast: d4062e73e7e24af37d9e4d1770d18e008d47f5df0dbc2de56a1089496e53ea1b
     type_inferenced_ast: 0b9394287626c1cbe2240d34740fc8cd3202690de88d4dae3b1062ed519415e9
diff --git a/tests/expectations/compiler/compiler/integers/u64/sub.leo.out b/tests/expectations/compiler/compiler/integers/u64/sub.leo.out
index b1c026f66d..2d4c78d409 100644
--- a/tests/expectations/compiler/compiler/integers/u64/sub.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/sub.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 9776d9311c67fd4c0a402d7b62623d78090a7c548e25841d2629d503bfe185ff
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 9776d9311c67fd4c0a402d7b62623d78090a7c548e25841d2629d503bfe185ff
     canonicalized_ast: 9776d9311c67fd4c0a402d7b62623d78090a7c548e25841d2629d503bfe185ff
     type_inferenced_ast: 0ca6841975de33f74979b293de56ac993cdaa92fedfe1932bec2ffaf847d43fc
diff --git a/tests/expectations/compiler/compiler/integers/u64/ternary.leo.out b/tests/expectations/compiler/compiler/integers/u64/ternary.leo.out
index ed020616de..41f8fede4f 100644
--- a/tests/expectations/compiler/compiler/integers/u64/ternary.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/ternary.leo.out
@@ -23,6 +23,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 3295b9a5f343261562befdfbf3a7ee33326d6316a1101c00c909cc79747f5bb4
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 3295b9a5f343261562befdfbf3a7ee33326d6316a1101c00c909cc79747f5bb4
     canonicalized_ast: 3295b9a5f343261562befdfbf3a7ee33326d6316a1101c00c909cc79747f5bb4
     type_inferenced_ast: a17c197c6672681826a04859b8fbe7e007401aa62fa8feed14ebefc81f958793
diff --git a/tests/expectations/compiler/compiler/integers/u8/add.leo.out b/tests/expectations/compiler/compiler/integers/u8/add.leo.out
index 85e6b490b5..6ca74c3a29 100644
--- a/tests/expectations/compiler/compiler/integers/u8/add.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/add.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 9dea438cfe465dadf7fdeed3bbddd7e382f583f3f6ba99e9402fede4ba47a442
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 9dea438cfe465dadf7fdeed3bbddd7e382f583f3f6ba99e9402fede4ba47a442
     canonicalized_ast: 9dea438cfe465dadf7fdeed3bbddd7e382f583f3f6ba99e9402fede4ba47a442
     type_inferenced_ast: 6a607b10a9897d5b69b303c7f1640af33ddaae750077e18a29e0c6c24dfb581d
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 015036080b..e40fc7da91 100644
--- a/tests/expectations/compiler/compiler/integers/u8/console_assert.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/console_assert.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 836bd0b470cd210052613fd9b13c5e420cc52b5da5f05a1dbbbdabbda9e35d5e
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 836bd0b470cd210052613fd9b13c5e420cc52b5da5f05a1dbbbdabbda9e35d5e
     canonicalized_ast: 836bd0b470cd210052613fd9b13c5e420cc52b5da5f05a1dbbbdabbda9e35d5e
     type_inferenced_ast: 65e7b6fd34672f4f4d0f09df9e2d1d3a3d6c2c632128eb8f8a2c6f0c95d28a3b
diff --git a/tests/expectations/compiler/compiler/integers/u8/div.leo.out b/tests/expectations/compiler/compiler/integers/u8/div.leo.out
index d67c6b8612..07d963bfdf 100644
--- a/tests/expectations/compiler/compiler/integers/u8/div.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/div.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 5e159a778450deb8e7a193f93700d4f70f356b414c4acf927d31117d6f4c6246
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 5e159a778450deb8e7a193f93700d4f70f356b414c4acf927d31117d6f4c6246
     canonicalized_ast: 5e159a778450deb8e7a193f93700d4f70f356b414c4acf927d31117d6f4c6246
     type_inferenced_ast: 1b9a06f4b0a525f5e8a678fed6eedfd9227fa5d416c578711a4b61b37ebefbc5
diff --git a/tests/expectations/compiler/compiler/integers/u8/eq.leo.out b/tests/expectations/compiler/compiler/integers/u8/eq.leo.out
index c0cfcdaf53..60854938a0 100644
--- a/tests/expectations/compiler/compiler/integers/u8/eq.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/eq.leo.out
@@ -23,6 +23,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: e3e4dc868de4fdf770bb339ab8e7dfb54e4d0786c58f892d1bca34a28403ed1f
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: e3e4dc868de4fdf770bb339ab8e7dfb54e4d0786c58f892d1bca34a28403ed1f
     canonicalized_ast: e3e4dc868de4fdf770bb339ab8e7dfb54e4d0786c58f892d1bca34a28403ed1f
     type_inferenced_ast: 3e57ddf8d981040924b7eb460f3627fe35eee8dfe7a54c7cbf4a48f609e408cb
diff --git a/tests/expectations/compiler/compiler/integers/u8/ge.leo.out b/tests/expectations/compiler/compiler/integers/u8/ge.leo.out
index 78a534d243..b65b35b985 100644
--- a/tests/expectations/compiler/compiler/integers/u8/ge.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/ge.leo.out
@@ -29,6 +29,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 6695ac31b2462e549a79a622e8cb11eae73c20503e727b9f50fbab4c572c785d
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 6695ac31b2462e549a79a622e8cb11eae73c20503e727b9f50fbab4c572c785d
     canonicalized_ast: 6695ac31b2462e549a79a622e8cb11eae73c20503e727b9f50fbab4c572c785d
     type_inferenced_ast: 5f6c660c11b7fc64e7947923a77f30cddb93ab223f59cb322a29876b04f7c9a8
diff --git a/tests/expectations/compiler/compiler/integers/u8/gt.leo.out b/tests/expectations/compiler/compiler/integers/u8/gt.leo.out
index eb94465116..fac5211983 100644
--- a/tests/expectations/compiler/compiler/integers/u8/gt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/gt.leo.out
@@ -17,6 +17,6 @@ outputs:
         output:
           registers: {}
     initial_ast: 4a99a7af4e976c85ed87114d8a267a1d047b17f60fda4030e793fd5f66cf2c53
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 4a99a7af4e976c85ed87114d8a267a1d047b17f60fda4030e793fd5f66cf2c53
     canonicalized_ast: 5df377575d61a53ae6c1cd898ef1ab739660a9716eaeebee9c8a767c8d05ec60
     type_inferenced_ast: e69731b76d3e389f51f854eac84befd1d7e1c61180ca46a150f07b2aa768f2d8
diff --git a/tests/expectations/compiler/compiler/integers/u8/input.leo.out b/tests/expectations/compiler/compiler/integers/u8/input.leo.out
index e28420b268..0747f5d164 100644
--- a/tests/expectations/compiler/compiler/integers/u8/input.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/input.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 35b67dd962ab49f7cda88997fbd0028a30d591229b5a7e9ad8d062b1b31d4565
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 35b67dd962ab49f7cda88997fbd0028a30d591229b5a7e9ad8d062b1b31d4565
     canonicalized_ast: 35b67dd962ab49f7cda88997fbd0028a30d591229b5a7e9ad8d062b1b31d4565
     type_inferenced_ast: e8966ad1d14fd288b6dbda6b1de78f01048e73d231122e997f11c08b5b6c404d
diff --git a/tests/expectations/compiler/compiler/integers/u8/le.leo.out b/tests/expectations/compiler/compiler/integers/u8/le.leo.out
index 5855604996..e93f6fb6dd 100644
--- a/tests/expectations/compiler/compiler/integers/u8/le.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/le.leo.out
@@ -29,6 +29,6 @@ outputs:
               type: bool
               value: "false"
     initial_ast: 72590f8b2a5ac7c0a4e663ce39009c0032ee66011f7fa1d5d61b34bd313e0e86
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 72590f8b2a5ac7c0a4e663ce39009c0032ee66011f7fa1d5d61b34bd313e0e86
     canonicalized_ast: 72590f8b2a5ac7c0a4e663ce39009c0032ee66011f7fa1d5d61b34bd313e0e86
     type_inferenced_ast: eda186febeb1927b5f0427f36ecaf1f6fc6c5201d8d0ddbf7399a31b0a181c0b
diff --git a/tests/expectations/compiler/compiler/integers/u8/lt.leo.out b/tests/expectations/compiler/compiler/integers/u8/lt.leo.out
index 277939cd6e..82ef830edf 100644
--- a/tests/expectations/compiler/compiler/integers/u8/lt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/lt.leo.out
@@ -23,6 +23,6 @@ outputs:
               type: bool
               value: "false"
     initial_ast: 57691c69dc440d8028e25c3e4487c52a89c5b23ff2976faa8dac057b29170945
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 57691c69dc440d8028e25c3e4487c52a89c5b23ff2976faa8dac057b29170945
     canonicalized_ast: 57691c69dc440d8028e25c3e4487c52a89c5b23ff2976faa8dac057b29170945
     type_inferenced_ast: eced084868377db05c2cde7dc441f0d657610891ceec6df4445debef18ee1804
diff --git a/tests/expectations/compiler/compiler/integers/u8/max.leo.out b/tests/expectations/compiler/compiler/integers/u8/max.leo.out
index a20822a05f..5265fe397a 100644
--- a/tests/expectations/compiler/compiler/integers/u8/max.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/max.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 1e5b1da2899876d937c9ecdf22665be02e309b6ec9fd6fa7473ffebb48a9e19b
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 1e5b1da2899876d937c9ecdf22665be02e309b6ec9fd6fa7473ffebb48a9e19b
     canonicalized_ast: 1e5b1da2899876d937c9ecdf22665be02e309b6ec9fd6fa7473ffebb48a9e19b
     type_inferenced_ast: 042f053591ca529430101b4412ca9de1d0ea595d332b5ee73ea9aae0774fff7e
diff --git a/tests/expectations/compiler/compiler/integers/u8/min.leo.out b/tests/expectations/compiler/compiler/integers/u8/min.leo.out
index ddda15e596..850285bf40 100644
--- a/tests/expectations/compiler/compiler/integers/u8/min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/min.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 0ad4671e3a0aaf948a2ccafb0030bd29f77ebe358d8bc309e24a76691adbc15d
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 0ad4671e3a0aaf948a2ccafb0030bd29f77ebe358d8bc309e24a76691adbc15d
     canonicalized_ast: 0ad4671e3a0aaf948a2ccafb0030bd29f77ebe358d8bc309e24a76691adbc15d
     type_inferenced_ast: dcf3b29842bb4b58aec3edc927f4df1373b82497624fd480af3b2c995f973a1e
diff --git a/tests/expectations/compiler/compiler/integers/u8/mul.leo.out b/tests/expectations/compiler/compiler/integers/u8/mul.leo.out
index ea23f82705..96ad005f3f 100644
--- a/tests/expectations/compiler/compiler/integers/u8/mul.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/mul.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "false"
     initial_ast: 8db1872b44d014eca2e66c5de1be6ae902623a1548ca53b6146de18dced3d409
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 8db1872b44d014eca2e66c5de1be6ae902623a1548ca53b6146de18dced3d409
     canonicalized_ast: 8db1872b44d014eca2e66c5de1be6ae902623a1548ca53b6146de18dced3d409
     type_inferenced_ast: c838cd4e5527762edc4fc43355c05b68085c39fd5a338f68caafc0160c68a574
diff --git a/tests/expectations/compiler/compiler/integers/u8/ne.leo.out b/tests/expectations/compiler/compiler/integers/u8/ne.leo.out
index 797fc4fd66..cda424ec4f 100644
--- a/tests/expectations/compiler/compiler/integers/u8/ne.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/ne.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: f74da59a77c90926a1d926b1c35fd5a18e44de0f8cb6aba39fa176d431f4f965
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: f74da59a77c90926a1d926b1c35fd5a18e44de0f8cb6aba39fa176d431f4f965
     canonicalized_ast: f74da59a77c90926a1d926b1c35fd5a18e44de0f8cb6aba39fa176d431f4f965
     type_inferenced_ast: 474128f7bfe69e7ea64a76c57e729dc85520425fc36ef88c123aebdc670176a3
diff --git a/tests/expectations/compiler/compiler/integers/u8/sub.leo.out b/tests/expectations/compiler/compiler/integers/u8/sub.leo.out
index 4da689ba28..65468f7374 100644
--- a/tests/expectations/compiler/compiler/integers/u8/sub.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/sub.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 4ad8780e5c0a3128317266059864223beac927b6d00745353114baaf5261fbca
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 4ad8780e5c0a3128317266059864223beac927b6d00745353114baaf5261fbca
     canonicalized_ast: 4ad8780e5c0a3128317266059864223beac927b6d00745353114baaf5261fbca
     type_inferenced_ast: c26b34ca605ac96edbd443f0f4015493d509054c3e7b749fc9ee31ef1800d6c8
diff --git a/tests/expectations/compiler/compiler/integers/u8/ternary.leo.out b/tests/expectations/compiler/compiler/integers/u8/ternary.leo.out
index ab91601d2b..99d682ebbc 100644
--- a/tests/expectations/compiler/compiler/integers/u8/ternary.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/ternary.leo.out
@@ -23,6 +23,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 74e87cd14415c4e1c4d2d89bbe56ee8ca5fc988df4cc894381b4a087fa409095
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 74e87cd14415c4e1c4d2d89bbe56ee8ca5fc988df4cc894381b4a087fa409095
     canonicalized_ast: 74e87cd14415c4e1c4d2d89bbe56ee8ca5fc988df4cc894381b4a087fa409095
     type_inferenced_ast: f5ae3a29090e07ccd418d3ab78fd24161fe26cc6a365ff71861f4d6ad5e8a0b4
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 3c2df11872..01784c8694 100644
--- a/tests/expectations/compiler/compiler/mutability/array_dyn_mut.leo.out
+++ b/tests/expectations/compiler/compiler/mutability/array_dyn_mut.leo.out
@@ -23,6 +23,6 @@ outputs:
               type: "[u32; 3]"
               value: "\"150\""
     initial_ast: b56c67d410c98a75c5f742d382e223355d214484d198ccaefe65296421c6854b
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: b56c67d410c98a75c5f742d382e223355d214484d198ccaefe65296421c6854b
     canonicalized_ast: 7217fa688744caee18ab779ab9c43deac2d70a8d0b989873fe720d3f46a5e366
     type_inferenced_ast: 6d673f91cd5c98cd1ae69777a317cf2b2ee50fd291996c8ae70d036705e76062
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 9b06b4d0ea..79439395c7 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
@@ -23,6 +23,6 @@ outputs:
               type: "[(u32, u32); 3]"
               value: "\"(1, 1)(2, 2)(0, 1)\""
     initial_ast: 7ca87cb79f11b6342bc6db56d6b051c68bcedb798ba9eb88992dcfe0873ce139
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 7ca87cb79f11b6342bc6db56d6b051c68bcedb798ba9eb88992dcfe0873ce139
     canonicalized_ast: 7ca87cb79f11b6342bc6db56d6b051c68bcedb798ba9eb88992dcfe0873ce139
     type_inferenced_ast: 26f6c295a4ab2515eadf95855c66e3fa29d158a43765baa87895fea42bb379d1
diff --git a/tests/expectations/compiler/compiler/mutability/array_mut.leo.out b/tests/expectations/compiler/compiler/mutability/array_mut.leo.out
index 7e5f9decf8..4f64a7778a 100644
--- a/tests/expectations/compiler/compiler/mutability/array_mut.leo.out
+++ b/tests/expectations/compiler/compiler/mutability/array_mut.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 3ba284ff6893de7ffb6f90092f7c39cefd51c61022e827842fc7d4be7ed72dcd
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 3ba284ff6893de7ffb6f90092f7c39cefd51c61022e827842fc7d4be7ed72dcd
     canonicalized_ast: 3ba284ff6893de7ffb6f90092f7c39cefd51c61022e827842fc7d4be7ed72dcd
     type_inferenced_ast: 75acbd9ccfb46be0f54046274dc1c200ad7b244bc8e98789d5d7e80fd2d15518
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 2ff6381cf3..b876f414f1 100644
--- a/tests/expectations/compiler/compiler/mutability/array_splice_mut.leo.out
+++ b/tests/expectations/compiler/compiler/mutability/array_splice_mut.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 7d636b2e99784c858ee66e66497caaf184f7a9fa9340d0dd1d6618e6e4b6592e
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 7d636b2e99784c858ee66e66497caaf184f7a9fa9340d0dd1d6618e6e4b6592e
     canonicalized_ast: 7d636b2e99784c858ee66e66497caaf184f7a9fa9340d0dd1d6618e6e4b6592e
     type_inferenced_ast: 796ceba3c23358c37039eb3484c761a7a5d605ad09877ba006090928be814458
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 9e4986464e..82e3d7f297 100644
--- a/tests/expectations/compiler/compiler/mutability/array_tuple_mut.leo.out
+++ b/tests/expectations/compiler/compiler/mutability/array_tuple_mut.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 2a6e7d5838f323e53cb753dc3bae3a6e379ef0deeb0172c1c7df231cd700a5b6
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 2a6e7d5838f323e53cb753dc3bae3a6e379ef0deeb0172c1c7df231cd700a5b6
     canonicalized_ast: 2a6e7d5838f323e53cb753dc3bae3a6e379ef0deeb0172c1c7df231cd700a5b6
     type_inferenced_ast: d5eafbcdb2a34278a296ff9b217aa63f8baab298450533f42ace506d0df031d6
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 0f2ecb42c6..42baf76272 100644
--- a/tests/expectations/compiler/compiler/mutability/circuit_function_mut.leo.out
+++ b/tests/expectations/compiler/compiler/mutability/circuit_function_mut.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 71448f3f5387cd67a8d8c0b974fa93cf81cdfb72ae0d8f9499c9c5e478a0d15b
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 71448f3f5387cd67a8d8c0b974fa93cf81cdfb72ae0d8f9499c9c5e478a0d15b
     canonicalized_ast: 16d4030e454d8c83d2073afaaa7e8fa1eb40d36026909144db29d311ab005f46
     type_inferenced_ast: a446d016451281bab9b21f8a86250b4a3fd8a9b6f917e855e5dae816362c8925
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 837619ffd9..643f7e5a5d 100644
--- a/tests/expectations/compiler/compiler/mutability/circuit_variable_mut.leo.out
+++ b/tests/expectations/compiler/compiler/mutability/circuit_variable_mut.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 83da7a1bf2887678937835ac77b33a0e21dd3b04d5739146f16a559b8dc3c6ab
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 83da7a1bf2887678937835ac77b33a0e21dd3b04d5739146f16a559b8dc3c6ab
     canonicalized_ast: 83da7a1bf2887678937835ac77b33a0e21dd3b04d5739146f16a559b8dc3c6ab
     type_inferenced_ast: bd7710479d2a5bb2da060358fc13379dc1d7e334ead42519315bce0cd0db30c0
diff --git a/tests/expectations/compiler/compiler/mutability/cond_mut.leo.out b/tests/expectations/compiler/compiler/mutability/cond_mut.leo.out
index 8221523cbe..f3092ce949 100644
--- a/tests/expectations/compiler/compiler/mutability/cond_mut.leo.out
+++ b/tests/expectations/compiler/compiler/mutability/cond_mut.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 384eb00d7e551705537f37e10e28eb35f88175f77351c6add02de4b896630ca6
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 384eb00d7e551705537f37e10e28eb35f88175f77351c6add02de4b896630ca6
     canonicalized_ast: 40b13bb543186c6f032ca6fca8144acbfa5cfcc4e691ed1f79c5120be2db8809
     type_inferenced_ast: 49d93167578fd99537e1895963545e6e95f2c55162f42f2bb9ee8b4d014152ee
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 e2ae92d873..6ffeaf479f 100644
--- a/tests/expectations/compiler/compiler/mutability/function_input_mut.leo.out
+++ b/tests/expectations/compiler/compiler/mutability/function_input_mut.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 77803f27d711c6b4c7f51dd846bb82dee64dadc3627e9cedcc0c125a734c5b7c
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 77803f27d711c6b4c7f51dd846bb82dee64dadc3627e9cedcc0c125a734c5b7c
     canonicalized_ast: 77803f27d711c6b4c7f51dd846bb82dee64dadc3627e9cedcc0c125a734c5b7c
     type_inferenced_ast: 9cc5c0db46856226084812857f8982677ed5688259a4deb0d189c9b92eba1756
diff --git a/tests/expectations/compiler/compiler/mutability/let_mut.leo.out b/tests/expectations/compiler/compiler/mutability/let_mut.leo.out
index d1544a64d5..303c236de1 100644
--- a/tests/expectations/compiler/compiler/mutability/let_mut.leo.out
+++ b/tests/expectations/compiler/compiler/mutability/let_mut.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 561fab3e5b172eb73713783c43b079b77ab5ce1ee799526bd9c3dee51c6e15d8
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 561fab3e5b172eb73713783c43b079b77ab5ce1ee799526bd9c3dee51c6e15d8
     canonicalized_ast: 561fab3e5b172eb73713783c43b079b77ab5ce1ee799526bd9c3dee51c6e15d8
     type_inferenced_ast: 3715f38b2b0a49f93133616eb252d1067ef1abec8d0895cf9c7de588fcf9e6d8
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 8eae188fa6..a0711af408 100644
--- a/tests/expectations/compiler/compiler/mutability/let_mut_nested.leo.out
+++ b/tests/expectations/compiler/compiler/mutability/let_mut_nested.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 4de7e4f24434d5a611566054ce5e1cff1edf0e9a76fa77ab5b121bd412eceb91
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 4de7e4f24434d5a611566054ce5e1cff1edf0e9a76fa77ab5b121bd412eceb91
     canonicalized_ast: 4de7e4f24434d5a611566054ce5e1cff1edf0e9a76fa77ab5b121bd412eceb91
     type_inferenced_ast: 65d3153d31e7f29f65b4896eddab3fc8bb78ff919921e77a05d51b50180320d6
diff --git a/tests/expectations/compiler/compiler/mutability/swap.leo.out b/tests/expectations/compiler/compiler/mutability/swap.leo.out
index a12e828043..6a67168d5f 100644
--- a/tests/expectations/compiler/compiler/mutability/swap.leo.out
+++ b/tests/expectations/compiler/compiler/mutability/swap.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "false"
     initial_ast: abe0177ae796b70cfdd8c6d30fcd5a9d713e3d16fccfdf63853ea6f0a8a9df54
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: abe0177ae796b70cfdd8c6d30fcd5a9d713e3d16fccfdf63853ea6f0a8a9df54
     canonicalized_ast: abe0177ae796b70cfdd8c6d30fcd5a9d713e3d16fccfdf63853ea6f0a8a9df54
     type_inferenced_ast: 43109986d2643a72bb5300c298952755f692cdd10e7071fb40b2b006412606d9
diff --git a/tests/expectations/compiler/compiler/statements/all_loops.leo.out b/tests/expectations/compiler/compiler/statements/all_loops.leo.out
index 2945c32460..9876a424fc 100644
--- a/tests/expectations/compiler/compiler/statements/all_loops.leo.out
+++ b/tests/expectations/compiler/compiler/statements/all_loops.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: d94b77f7891ca44d554f59cc07370505a1dec9cc1a5133674faf8797bddcfb4b
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: d94b77f7891ca44d554f59cc07370505a1dec9cc1a5133674faf8797bddcfb4b
     canonicalized_ast: 10fb59963f44b2261fc0dd0aca8a57bf3c6c6252d9da82717fd13fbb57760ad3
     type_inferenced_ast: 833d4e649f0e3cebfddcaccd9abde073ea29a9262a93fa233e0a5dcada33b46a
diff --git a/tests/expectations/compiler/compiler/statements/block.leo.out b/tests/expectations/compiler/compiler/statements/block.leo.out
index 24dbf7e3ee..e6d2d81ac5 100644
--- a/tests/expectations/compiler/compiler/statements/block.leo.out
+++ b/tests/expectations/compiler/compiler/statements/block.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: e83bec8b595276da8d5fee23a1aae15ca08ce2f369c3a47cfb5732b90b020e1f
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: e83bec8b595276da8d5fee23a1aae15ca08ce2f369c3a47cfb5732b90b020e1f
     canonicalized_ast: d84f3bd449f9a10b2bf8de7e284c1764dee5650840a82e38518906448f7f0457
     type_inferenced_ast: 10d48e474c04c96d7754f41070ec3a406a2a3ef3ee6938185953ff52eaba5c87
diff --git a/tests/expectations/compiler/compiler/statements/chain.leo.out b/tests/expectations/compiler/compiler/statements/chain.leo.out
index 3a0d7d5e3b..602b31525c 100644
--- a/tests/expectations/compiler/compiler/statements/chain.leo.out
+++ b/tests/expectations/compiler/compiler/statements/chain.leo.out
@@ -29,6 +29,6 @@ outputs:
               type: bool
               value: "false"
     initial_ast: 51f43c865b5082a79df9bba465629cc4d9cc9f3a472e35d0301ae1dc6ef37039
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 51f43c865b5082a79df9bba465629cc4d9cc9f3a472e35d0301ae1dc6ef37039
     canonicalized_ast: 51f43c865b5082a79df9bba465629cc4d9cc9f3a472e35d0301ae1dc6ef37039
     type_inferenced_ast: 6198dfeacc891f4e22635060fa58a476fcae08cb6cfa74b6e8d80c07adc6c36d
diff --git a/tests/expectations/compiler/compiler/statements/compound_assignment.leo.out b/tests/expectations/compiler/compiler/statements/compound_assignment.leo.out
index 1de21e0b2a..200e0e0e5c 100644
--- a/tests/expectations/compiler/compiler/statements/compound_assignment.leo.out
+++ b/tests/expectations/compiler/compiler/statements/compound_assignment.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 108be85422345d78a93d2e36e633c3a15a1465e7c868f65e2925a47e0b5f691a
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 108be85422345d78a93d2e36e633c3a15a1465e7c868f65e2925a47e0b5f691a
     canonicalized_ast: d986fa603a5031dbd5034507d05df038fe99f60f603f7ca4b2d2c8ac2b409e7a
     type_inferenced_ast: c95a6049c552c5b018f423fc1999b433cf94429c6edc32e2b55d326b78e36812
diff --git a/tests/expectations/compiler/compiler/statements/for_loop.leo.out b/tests/expectations/compiler/compiler/statements/for_loop.leo.out
index c07ed9c9e5..57be45f90b 100644
--- a/tests/expectations/compiler/compiler/statements/for_loop.leo.out
+++ b/tests/expectations/compiler/compiler/statements/for_loop.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: a8e737bf2fcc5b5096dae768b52c04d56891a4eedd47640a0e1aea5fa4b5da1a
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: a8e737bf2fcc5b5096dae768b52c04d56891a4eedd47640a0e1aea5fa4b5da1a
     canonicalized_ast: cb2eb0272a5a1730cebeaab7a63578ae0f366615af0687a83772fdcbab8b4a93
     type_inferenced_ast: 4d4e9f8fa02ed1c33893ee0f05737a8fc22062039bf2c6a69c8a95c09ba3c6d4
diff --git a/tests/expectations/compiler/compiler/statements/iteration_basic.leo.out b/tests/expectations/compiler/compiler/statements/iteration_basic.leo.out
index da8cfe98b1..c5e803d5c2 100644
--- a/tests/expectations/compiler/compiler/statements/iteration_basic.leo.out
+++ b/tests/expectations/compiler/compiler/statements/iteration_basic.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 416faf733ca084378ca66e5900ab7ffdbb057312e358d6652d6260eff3670fc6
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 416faf733ca084378ca66e5900ab7ffdbb057312e358d6652d6260eff3670fc6
     canonicalized_ast: 2ec69f397b7c48bc222d812fe4afae7ea375048ceb798e17063f08ea9ccdd040
     type_inferenced_ast: 8062f011312fc76f0f1d73a628292f38deb179974e1edd18af52ee7084279ab2
diff --git a/tests/expectations/compiler/compiler/statements/iteration_variable.leo.out b/tests/expectations/compiler/compiler/statements/iteration_variable.leo.out
index 0e49db2578..502d9d29f0 100644
--- a/tests/expectations/compiler/compiler/statements/iteration_variable.leo.out
+++ b/tests/expectations/compiler/compiler/statements/iteration_variable.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 038e16c427982d50e1f29bfb1ef4b9b5809592d431a167809641d2816255fe70
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 038e16c427982d50e1f29bfb1ef4b9b5809592d431a167809641d2816255fe70
     canonicalized_ast: 1d600ee2250660418ea73d55518937eac92695b6441fc2656de4568c4e7bed8c
     type_inferenced_ast: 4f070f1df9bc5c1c7a5b4932b3348504b0a0b07df862e6ca027ee272208a5f79
diff --git a/tests/expectations/compiler/compiler/statements/multiple_returns.leo.out b/tests/expectations/compiler/compiler/statements/multiple_returns.leo.out
index 78ddbb4cb4..aa199caf4a 100644
--- a/tests/expectations/compiler/compiler/statements/multiple_returns.leo.out
+++ b/tests/expectations/compiler/compiler/statements/multiple_returns.leo.out
@@ -23,6 +23,6 @@ outputs:
               type: bool
               value: "false"
     initial_ast: f842a0668ac2fa61ee1f4c693c5159b1395527ee355e8d1d54da9e1ed63ac3ca
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: f842a0668ac2fa61ee1f4c693c5159b1395527ee355e8d1d54da9e1ed63ac3ca
     canonicalized_ast: f842a0668ac2fa61ee1f4c693c5159b1395527ee355e8d1d54da9e1ed63ac3ca
     type_inferenced_ast: 5adf5966c1fdb8a72af941b5b706d7a24b732441b7f56fb3de1319035ade46ec
diff --git a/tests/expectations/compiler/compiler/statements/mutate.leo.out b/tests/expectations/compiler/compiler/statements/mutate.leo.out
index 80c04ca5e8..88e5c52e5d 100644
--- a/tests/expectations/compiler/compiler/statements/mutate.leo.out
+++ b/tests/expectations/compiler/compiler/statements/mutate.leo.out
@@ -23,6 +23,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 1939d0c4720ac464347a680666fee91d1db59acfd36c8e7f6ea1255b4787b39b
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 1939d0c4720ac464347a680666fee91d1db59acfd36c8e7f6ea1255b4787b39b
     canonicalized_ast: 1939d0c4720ac464347a680666fee91d1db59acfd36c8e7f6ea1255b4787b39b
     type_inferenced_ast: 662b43067b1ddf0db1b7f5d71a07eb84ff79074c187398d4367b8694f066726b
diff --git a/tests/expectations/compiler/compiler/statements/nested_mutate.leo.out b/tests/expectations/compiler/compiler/statements/nested_mutate.leo.out
index a6c3488d10..22e2fa0227 100644
--- a/tests/expectations/compiler/compiler/statements/nested_mutate.leo.out
+++ b/tests/expectations/compiler/compiler/statements/nested_mutate.leo.out
@@ -29,6 +29,6 @@ outputs:
               type: bool
               value: "false"
     initial_ast: ebf32d52f9b74643177b087221c52f994e439347407c948643b7261e107007ed
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: ebf32d52f9b74643177b087221c52f994e439347407c948643b7261e107007ed
     canonicalized_ast: 2a2f30c10bc808923ae1f7fedc3debd765be612cfa1d100a853d0a2dfb65f58b
     type_inferenced_ast: 628f6316908cc79ef0740fdd8baf179e9e969d19d82786f51e78a4d11bd6dab8
diff --git a/tests/expectations/compiler/compiler/statements/reverse_loops.leo.out b/tests/expectations/compiler/compiler/statements/reverse_loops.leo.out
index 7573816f10..44d14de590 100644
--- a/tests/expectations/compiler/compiler/statements/reverse_loops.leo.out
+++ b/tests/expectations/compiler/compiler/statements/reverse_loops.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: f64afadac31c349e9c03da12d924241f36316181323adf5bd8d64b01198747f6
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: f64afadac31c349e9c03da12d924241f36316181323adf5bd8d64b01198747f6
     canonicalized_ast: feee8d1b761c72c684f8b6a7cb985357fa8897cbc229e69302df68655669a77e
     type_inferenced_ast: c8d365cde5e39faabbea291d537590c08423e4dd281327d67f3a6994a5492e53
diff --git a/tests/expectations/compiler/compiler/statements/reverse_one.leo.out b/tests/expectations/compiler/compiler/statements/reverse_one.leo.out
index 97ada33b56..a95ee39d2c 100644
--- a/tests/expectations/compiler/compiler/statements/reverse_one.leo.out
+++ b/tests/expectations/compiler/compiler/statements/reverse_one.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: e999f088de99a6223d147bd686fac839d98f2d6ba2a9abb38b6d234f8c90231d
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: e999f088de99a6223d147bd686fac839d98f2d6ba2a9abb38b6d234f8c90231d
     canonicalized_ast: bb02f855d59f2f551f3248cca61b12a53c28977f0ec41cf9bed9d1434c88b9ab
     type_inferenced_ast: 1be9b8e6dc45ea9bd2bfd6888d1538563b532e57f180a8cbbf0dd6036ee2bf56
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 cce79fb616..285509211b 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
@@ -17,6 +17,6 @@ outputs:
               type: u8
               value: "3"
     initial_ast: 8eb489d084203ff568db699a97d68cb7be586b99269cd3caa5ed075735a89430
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 8eb489d084203ff568db699a97d68cb7be586b99269cd3caa5ed075735a89430
     canonicalized_ast: 8eb489d084203ff568db699a97d68cb7be586b99269cd3caa5ed075735a89430
     type_inferenced_ast: 9599e37cdf0cbd702e3ee2e025996cd72d6df4c173ce591f713b685dc19d4d0f
diff --git a/tests/expectations/compiler/compiler/string/circuit.leo.out b/tests/expectations/compiler/compiler/string/circuit.leo.out
index 60780dbebd..20aad44ee7 100644
--- a/tests/expectations/compiler/compiler/string/circuit.leo.out
+++ b/tests/expectations/compiler/compiler/string/circuit.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: "[char; 13]"
               value: "\"Hello, World!\""
     initial_ast: 3aa0745060289c1a1af4e66265f8a92a89caff1731dc70d8c6a59798152f1a38
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 3aa0745060289c1a1af4e66265f8a92a89caff1731dc70d8c6a59798152f1a38
     canonicalized_ast: a1acfd3169b8f72975cd7cc9ef2059cd8fb1ed5ea0a7f51911d3365b52375e36
     type_inferenced_ast: 55d57669ceeb95e039cb000e3673f7590c2bd69bb67786057977d158ab77dbdb
diff --git a/tests/expectations/compiler/compiler/string/equality.leo.out b/tests/expectations/compiler/compiler/string/equality.leo.out
index d8ee6d3359..ab5b54b3ff 100644
--- a/tests/expectations/compiler/compiler/string/equality.leo.out
+++ b/tests/expectations/compiler/compiler/string/equality.leo.out
@@ -23,6 +23,6 @@ outputs:
               type: bool
               value: "false"
     initial_ast: 18cc23be73fed22f06b3bfdb93c1b92688131d4bbeb0d68ed8dc691c97f0c415
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 18cc23be73fed22f06b3bfdb93c1b92688131d4bbeb0d68ed8dc691c97f0c415
     canonicalized_ast: 63331696106397640ace1c15d354979b8a05f25dd650465954cd1fd72124bae6
     type_inferenced_ast: 83e3cba193c50f19049cdf4296d75187cfd9d6d9fa5276fd328c2e3acf0936e2
diff --git a/tests/expectations/compiler/compiler/string/replace.leo.out b/tests/expectations/compiler/compiler/string/replace.leo.out
index 9c710acc74..3fb95cb985 100644
--- a/tests/expectations/compiler/compiler/string/replace.leo.out
+++ b/tests/expectations/compiler/compiler/string/replace.leo.out
@@ -23,6 +23,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: f3c204e48bcf159d84b551a7af01a54b49a9cd6b0ba35ab8c3e68d50caf215e6
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: f3c204e48bcf159d84b551a7af01a54b49a9cd6b0ba35ab8c3e68d50caf215e6
     canonicalized_ast: 91c83cb469e2c9d1b4f6835dd2d503d330c9cfdc7ee4693490cced2835caa4e7
     type_inferenced_ast: d7f4ab6acb5c9569c42367d28c8af286c07147cb68a6ec31146b844ec257d2ac
diff --git a/tests/expectations/compiler/compiler/string/string_transformation.leo.out b/tests/expectations/compiler/compiler/string/string_transformation.leo.out
index f292010c41..b8352f44e2 100644
--- a/tests/expectations/compiler/compiler/string/string_transformation.leo.out
+++ b/tests/expectations/compiler/compiler/string/string_transformation.leo.out
@@ -17,6 +17,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: cb6caa7598139ad4bdf20a4ace3eb443f83932c91606214227c192684efa2c33
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: cb6caa7598139ad4bdf20a4ace3eb443f83932c91606214227c192684efa2c33
     canonicalized_ast: ef8938160ef517c3856d42b1c651877de6baaa791409cd92ea0552b8c82b228a
     type_inferenced_ast: 313f5120e880583f9cced569d3afcfe7b893a8b9c58f521680037df4202e6d8c
diff --git a/tests/expectations/compiler/compiler/tuples/access.leo.out b/tests/expectations/compiler/compiler/tuples/access.leo.out
index 3882f86ab6..7611a6cff7 100644
--- a/tests/expectations/compiler/compiler/tuples/access.leo.out
+++ b/tests/expectations/compiler/compiler/tuples/access.leo.out
@@ -20,6 +20,6 @@ outputs:
               type: bool
               value: "false"
     initial_ast: 1398434e8180a7aba868bc9caa21b5d226a4c8216e0086a6f48d6c503e41c263
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 1398434e8180a7aba868bc9caa21b5d226a4c8216e0086a6f48d6c503e41c263
     canonicalized_ast: 1398434e8180a7aba868bc9caa21b5d226a4c8216e0086a6f48d6c503e41c263
     type_inferenced_ast: fed99174e3afb30da68a430b96242d63b45bb1ce58028d5c7352cc64dcbd98b7
diff --git a/tests/expectations/compiler/compiler/tuples/basic.leo.out b/tests/expectations/compiler/compiler/tuples/basic.leo.out
index 46d789befd..3841846e9d 100644
--- a/tests/expectations/compiler/compiler/tuples/basic.leo.out
+++ b/tests/expectations/compiler/compiler/tuples/basic.leo.out
@@ -20,6 +20,6 @@ outputs:
               type: bool
               value: "false"
     initial_ast: 51cc6c9ff08fa4320783cf8b6683f784a6325a0e371c7d93049c30eb9d04cf72
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 51cc6c9ff08fa4320783cf8b6683f784a6325a0e371c7d93049c30eb9d04cf72
     canonicalized_ast: 51cc6c9ff08fa4320783cf8b6683f784a6325a0e371c7d93049c30eb9d04cf72
     type_inferenced_ast: a1e55a4a926b0d9c8d0f611136c7f9ba8ed5c6156a85d1d04adc9faaadf1a611
diff --git a/tests/expectations/compiler/compiler/tuples/dependent.leo.out b/tests/expectations/compiler/compiler/tuples/dependent.leo.out
index aef74f1381..8b49eeab86 100644
--- a/tests/expectations/compiler/compiler/tuples/dependent.leo.out
+++ b/tests/expectations/compiler/compiler/tuples/dependent.leo.out
@@ -20,6 +20,6 @@ outputs:
               type: bool
               value: "false"
     initial_ast: 6692e9d94d784dd3cd11dbf48ac13b0b54f61d83ba0d85bf038e9bf84590851f
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 6692e9d94d784dd3cd11dbf48ac13b0b54f61d83ba0d85bf038e9bf84590851f
     canonicalized_ast: 6692e9d94d784dd3cd11dbf48ac13b0b54f61d83ba0d85bf038e9bf84590851f
     type_inferenced_ast: 0d8c2b2b77762cfb957d5d6247366317b8fbe4ac7cb985df1b4d3511accf13b8
diff --git a/tests/expectations/compiler/compiler/tuples/destructured.leo.out b/tests/expectations/compiler/compiler/tuples/destructured.leo.out
index 7a82a15cee..774c7fdf01 100644
--- a/tests/expectations/compiler/compiler/tuples/destructured.leo.out
+++ b/tests/expectations/compiler/compiler/tuples/destructured.leo.out
@@ -20,6 +20,6 @@ outputs:
               type: bool
               value: "true"
     initial_ast: 531df9191a6ee867da7a9c5aa5120a9ab93eec5d4d29bdc78aa965fce0f52c8d
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: 531df9191a6ee867da7a9c5aa5120a9ab93eec5d4d29bdc78aa965fce0f52c8d
     canonicalized_ast: 531df9191a6ee867da7a9c5aa5120a9ab93eec5d4d29bdc78aa965fce0f52c8d
     type_inferenced_ast: b841d6651b93193e0bbd24df8b667bd16066ee77481dd3b8b0187c37968ca1c1
diff --git a/tests/expectations/compiler/compiler/tuples/nested_access.leo.out b/tests/expectations/compiler/compiler/tuples/nested_access.leo.out
index 7262f4e27e..f88364c476 100644
--- a/tests/expectations/compiler/compiler/tuples/nested_access.leo.out
+++ b/tests/expectations/compiler/compiler/tuples/nested_access.leo.out
@@ -20,6 +20,6 @@ outputs:
               type: bool
               value: "false"
     initial_ast: fbd413171641a048b40bf3141ee1ae3218a205e4679721ce61e0e114bb2e340b
-    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    imports_resolved_ast: fbd413171641a048b40bf3141ee1ae3218a205e4679721ce61e0e114bb2e340b
     canonicalized_ast: fbd413171641a048b40bf3141ee1ae3218a205e4679721ce61e0e114bb2e340b
     type_inferenced_ast: 8dcc217ea727817113ac27684c71b3b8914a9f621952b8555d5fc4843a79967f

From cdde46e2f334f1405eb7eeedd6ffd4776bbe67c1 Mon Sep 17 00:00:00 2001
From: Alessandro Coglio <coglio@kestrel.edu>
Date: Fri, 27 Aug 2021 10:31:02 -0700
Subject: [PATCH 07/23] [ABNF] Remove keywords 'true' and 'false' again.

These were removed in a previous commit, because they are already classified as
(boolean) literals, but they were accidentally re-introduced, presumably due to
the type alias RFC referencing the previous version of the keyword grammar rule.
---
 grammar/abnf-grammar.txt | 2 --
 1 file changed, 2 deletions(-)

diff --git a/grammar/abnf-grammar.txt b/grammar/abnf-grammar.txt
index 69002e3909..3786d3906a 100644
--- a/grammar/abnf-grammar.txt
+++ b/grammar/abnf-grammar.txt
@@ -395,7 +395,6 @@ keyword = %s"address"
         / %s"console"
         / %s"const"
         / %s"else"
-        / %s"false"
         / %s"field"
         / %s"for"
         / %s"function"
@@ -416,7 +415,6 @@ keyword = %s"address"
         / %s"self"
         / %s"static"
         / %s"string"
-        / %s"true"
         / %s"type"
         / %s"u8"
         / %s"u16"

From f984a47b879724390daddd76dacf799112e5640a Mon Sep 17 00:00:00 2001
From: Alessandro Coglio <coglio@kestrel.edu>
Date: Fri, 27 Aug 2021 11:19:50 -0700
Subject: [PATCH 08/23] [ABNF] Re-generate markdown.

---
 grammar/README.md | Bin 113024 -> 54641 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/grammar/README.md b/grammar/README.md
index 9aaae0c147175347234074e6a62aa8e55b06070d..7ed850b0348cdc6ec04a38dd0a9f9fe64e898209 100644
GIT binary patch
literal 54641
zcmcJ2`Ewk{vF7jdSM<Y%o&X91@X*Oa??JR^@r9OBkWgs7l)}@PX#j1`0Z-2mglzxs
z`+b>pW>*hE$*ZslpzF%Y%F3&<vYxK4Zr1I^<)+$ydQjcJd+)39{k!+?RVVXiRlU0D
zHqD}|o-e0IqtnZ_tIpebQ{m@Tz1~!-^J;V1RNtfKygggj>zktys%2kT`F!0pRku3d
zT-WR7VRf_GR?~V}t(#ffZPxACc7r}QRlS@Yuh!LKHEYjrM)<H@&YHChv1!%-!;San
z7e7^hZkEluo>xC^&*ts4`o5hu%dV+vK*lfKWizYJZbk&}8ApHRMz5Z&&}+SESIfhy
zX;Hqe-ZtwFe^(Fu0Is*gYPBBi*Bb)7u2xrUbO0!Cs(B57e7o|T<J4wVyOc>>uC5yV
zf(|ja>vle`&YEi5HRs#;;Rr~metv%X-48#VRwpn1QvH1L^5w~k)4x1I&CTTsrOn$$
z`)L<f^A__1HrMrXa|5tP|NGmQPrpO`lW(4X|NQhXfV_J4{Pe}QuU=Kpet21(R6m})
zJbnK3r|(Z*RzLpq^2Z-ueS1{B0%CxH(GG;3%Yv+%YSwJ(cHUvKf5Gx~fM`CeF6*}q
zmT}s&ZvjtTO+ic^iNl?a>iKGUA@dTvr1VogKd+Xn&0*C6w#S#7%~kjC`1tzz`siZ0
zJzA|Vj<MWa>hAb!z%m-U|M2Vc<z~H_ZKqtO@SVk^Nl&`d)e`eqc38&h<eL}Is{NDg
z#iChm0RK1j^v$*#zo@a=&sOWjL3OdN7mFHee@-Gl8nMR3niN!lUZg$u!g}?#ouLCI
z3t4S9p3nw<_Z_*aGW_cNyq&h7;aPLuE?a`_ao61d%6D#95HU%ntIk%N%j$BwsF&k)
zQ_t!%Y(?yuYEe%w+hr3z9*v$y`tlnU^W9!eSBn;y7lhZ#i*0?u<vVZI&2rjEvqgPV
z)$?xUNOM+gR@H^<HSAIJ)p0{M-3Bw*U`sFXan&w2nCH&`26Q5gw;hMs5bJK{BkoMc
zGipE#vco^^6w?QZE$Vsun`}ytffU5U(e-6Jy{xWvgc&x%e09YU+{QY2`u%-U(rVo-
zWHp-gh=>WzuI89NX5x5*h5h+bU~8w_dA&a5I6~Oinj~t4Z+^r5-kx*gIXr+Wgaq6a
zJK+_cWG}F5w`WJd_;Ed*-`9UOU`5A^8ccP4e70J>>5kt3m+NMJT%Rq^A7Ntv^Q3%C
z2BTa7*+8@JlDojwKWb*%<Ev(MHE)imtBZNNI)2-2HqE^+kFI9t2P4jvi<PYb(1q`Q
zLRk2#b<=_Ldx*y-nXVfwxYD8E5-s0imB2b34<m@4tUGkk0X1DUZPwgh-~`JK%pG)f
z!xh0yHYhebw!fXSeXCo0H1hilYluDGtd|W)Z-WJ{*RzKsqU+_er`2coAAD-DwLYJY
zA!IhIwXlwMdA>TvH&&HNvE3J+-u>*B?O0WI3Fumg14!wvnkmGUtXSN(|MTjH7l+k%
zr>8$2$`-}W#aeoxi3gcfJ(~e#t0g#l%PmO0!2OI>uDZEMWs!#1Cu9#D*VS^VY9DOu
z0DHuVi3{w<3vAz;6}lq3Yu;_fB7r@fV)W-rtW6Crc3z?N#~k-!-i#r`r*D8=a9|}0
zvi~LfSc7qZIu8|YOdfF8T{8wN1vdusf*@Gd3x3v>ClKg;-he9C-C;Fru_N%46P(qM
z&*-Z;x;UyP#L^foJ8+|kluw@j`1W()2ISdIj@<e$r}OPhFtiI;&>E;7^``4q1a=ta
z@#U&>a^*GF{lQmXe*WtrM4-rv>cP?dqx)Y^4oBNg`DzDl-fgf+x)n4X$7qyOW5S$T
zonnRz@RGU_WlBAtudad9^;x^2Rs@b&z~5>Kp0cbrTk0{(?cxl0q5_jt7GyP84a^%9
zw5Z;;^~2GAdr+NWIo3BoE2t0Lld4K}*}SXW-(Vtt-wH)}EPr%%@8}->clX}i$ze75
zXm;=D0sg}89Axs*yCZ%$nScjTB5_QmY1ff3W<QPU^}WOD!C`gp?yrvk&Mn}9qH+<J
z{G)dd?v5XPHE{!x{BA1B43G<?pa(u1bM*SJ%fJ4rTEnMbR*#=l_?tgI`=Z*XG=KH<
z`Ew<+0|5$935iAm)hbjumluI9KI-;P&h{cG<ZDF$s@I=?c36G&C8kW2?YD2;0O=km
z57F+`7(y25Z(C5+#Qm*!?$95mUqp1hfT}c-kv|8$>TiGnzkT(^Va0D;K>Z8f-EIjq
zM9S^9?M8^YYaq7++jkfP;rz60r>j|0O)qOO0Pfeopp=r)rrD^50-15%z5_i@mUkA|
zFV|pf4gPRDcY&Yy+mbb)@RaF!%cD_?J#<C^bU0#rY_57c2ZUg9cXd`1beDbx1E;10
zGXwfr1#*Wb+@STnJD+~{?f?1H^FPOBTrEMrD+q5Wa}!sHHJ{vhfNIZAW5w+i>uoM+
zB}}wT*%Z6|;pyqONnLh|ffrCTs)?2XRVR*g1q+IwQGIr{Zm?UqbAhQPFs0ni4xbNP
zV$G9(f^tM$2-}?;PY7_=K)_QN*K;fw@C^<OSY8%ZN|YJEHElp|Q_KL0O!c?zyG?zy
zBI^dj_9|AfDn>-dqV+lfLA7p0#6j=8;O>PaL8ohI!NN3Z$c=_tHTtH$6vtj~=aCKE
z+5h>~kJWMY^yT-@D*Sp7SH<rJHTpc?8LiH!U7*Xe8xnGZX)iAhtKXXSDlE*Vg)jlS
z)wm<Gtg8unpRk57EBwtNC!h|}w|3_$9gSZ7eM=G!Qx&Bwn=frO3Te)D;S59YV7J1r
z_a5#+D_(DYoltAXwr-(00U2Dj$=y5m_I-r|;I%J`Cl4P!$yfY|thfjtY^_Wj3-f-W
zB+*i9Bi6yfp~cUjye70EIw5Itwe3)>z0I=j@@*w6$@Qux-#kC9o>Y5x_pn%d_x2{E
z{=7n!9IM(?TVb-NWUj%uQN?c4HS=?E6Nn)I*i@&YrVYNqN{}(jAgVtVv4D;Ym3bxb
za8#dTO9=RGEMlpH!2yDt3Pnk$TxF_+G(YU9o`Jz|5Hl%-psOJL?yKMoK7#>Z4(K-t
za~A3+_%d^B3#ut_0#N3t<RBl$hH_*H*l7Du6ThmlbNA(kZn(?Uy8VsT?7RYZ@1OzB
zu`{Y>Ig>rPKZSRoRRa$y22_@m*rn=u)6Ce8*nyow%IPpfvw$>!g)WRZ?Gtm!4DMH(
zHLUIJx`|r5Gqq)U-Z*dyq3-1C6-L;ejSsvss_IM)Me&_jgT9p*y{gBZ0V9{IYiRna
z(-47CREfM1V~6BIR=#=z4NV1z+wMXJQ1qt3Vkva5?Rwoc@3>BM5TQ?K@NkF`QScsZ
z#3=?koc)bjB=~Rjv75%n!V^CZ<Kl0iiObwUNrv+Pb;W`JUGwYz)Ng@;o=JW<0tH}J
zG#sW4?Zd$9MNRC$hHiqXj=t2+@Ew5*l2ysDDlRY!ha@QApgSxFR{jd`aP6_H!K^@S
zqy{)q_N8UJ*{U&sVp{ydU%^wM+^QsG512O$XRzFA0U6%nZy2B*%ml|3y@~;fhgnOL
z5Y~=(2>>-`PvR0cjT3Byv{_PZ=|-R+*p;evC)?o=UdKrBZb3i**ie_C>ACWC&cP6u
z8cUHuWR!8fn##&xd^QzX504x8IoJmXz|s8C=sS*qy{3MdnoNs0Tmm(!$_8Tdi?qCM
zoB8bKa0DwKl9p|`0)8uq>jEMat4al93TFg#9ib%k_q21-eVjoAHb7&mXWxOPtM%p<
zWC>pY(LEDG16!n7gQB&Ha;FRkLG~5aoIKIV99F=t)eX2wSMTZ)Rv;D`c8huliFCMU
zu7Mv&RwxD7h~8mB$E6A=adypCm@0s+mS98_j_?wY8;@i-Xz9}p*|Jx3bSOyhWpxfM
z^^jiF&CM0L1|fBwfu8}p;$Q?!sDin}DTtATn7R9)LxO2yQ-e~SO!8a@BwkNR&ovBk
z(K5ux1rvH*kF}CIt=1IlDs3@)bu@|Mi|GJ^YS0sW&pzm^6WS;)*}R1|L9Qtaf}NT6
zuNpOQq*(Hrho>93$?L^gd$EOJKOD73%@J`476{IaN!P#>xkv*qVcEzyBx9m1gtGDu
zm<7~Sbe#i<dNJDz#|$hOM5G=8^-e|y5Z6;ITcX>eRpg%VB2lJTv>T;^XmIERCa}6>
zQ_8rwR{=gxCybE#0Yp{90aX1Ml+Y-yoby<G#PDB|_}~I`mTv~UqA-erk*wu4xUZ2U
zoEsc^qK||2qSAd1MNvV~?Scad`15DPH2U%^+iOQo1#*5L%;{Mo2o6bN9XN$5If`A#
z=E-C-a_m<;MsJ(3CqHnrC!@;!hmXSX;e1XixZ-2a!3$mN-Pt2S|IWt8gN+HegCA<E
zc#{&q637Q<7l1Fd-}_{5cv8Dtj(4?mV4sRCRo!mWz<siXqmDj%(t?L4u6{N7#2L%u
zi8`8TgRB!`VQVLSRG7M@Nc*_s`Z$JVNd-;@loNt%R2Jn(OFDsoUf~3S^iB(ya`GG;
zQN*y5S<t=QIb63{t!8vUNlj;a!w`htv-B)~bOPqNrUL4F6s#P&CSH;9YyGbJq`Il@
zRKE%3;ww)Dg?T`PJC&~PeC?|GWCZ);m(e?r@f|K3|ESPI6?@=($%4{mS?y1xcIfBE
z4}I25Ysh^FD}%0N2LU|xEk-gR4NDuVP!68AYv7DZZu|}*D8lGkj?J*&iS4ezHpa@4
z!`5dops~$QcmhBX^r2Y%B;w#bSQI>Z<PD*tgvSK^_|^B2p+8`;h#j8#-U5LRFTWFm
zfxCllUet2l^;85hb&gONIDg4v5kE^}XRBvh_q1?ctS@a4(R;CbzJ=owN6ytXR*go2
z(^y1*@V@S_N4-rWB*5N8qm;iWPN1<skby#6r)raX6F?59NT#G8`rE4sX-J$nVCKO*
znb6t~BPCT53x?F@j01K=wVoRlqkGARy$=PPhv{%p3V&+3LqN0P>~aZ%0G@ezvAvq0
z$Nynwkalp^aB4uAfE^teidcLFv-GOwWz*uMM0^Bx?rcql;yHpiWyVm7B^2O^Q}s4b
z)Zm=*-yMGky~=;ba2r4YY)mD`%E`WInJGvZ53{0LM~(DNyToY?CZWC{H!P;db%4&K
zisr@?3%YbjQ{osc@Ga^-bp@hVc)wdZVWjjift^utzu*zUey(l8G@$;gKsBmg<E#||
zrE8!JLv4@~TC~G-U`=pFkWu>a5Pm=qGXgH;5LonWInaXktBubZ0ug-kUG=s*0&fP7
z^MGIiY7ELbaXVE@jz+Giztcv}VZ1;{31%D!jAN`<P>~&tI0~eniHlBsUzSApC_*b>
zqRHVbxhB-_rn-iyq`SfsugYVqrm5ZvdKOwL=xMr7fg>jy+qbmA09It?QG$BW3o?Q3
z2q@giv5rlp-jgbH^z}_55a3R`TI1v<`)EiN^a{t>f9z4ge}6q_D!qD+s-Huuu0>mf
zY@usOkP3R+YT%1QI-%w=LDF9dQoUWaZZ2@t3WH1Kmcy_Zb~=X?IS_QULXv!i`;2x8
znTSj}DI&WQtDxV?4ERVa2nZ0_B+9y0SK`AK<AtIH%(MXk2HR8k8AcE?udz!Q(4i(A
zq7hmW*257P5*%I^YDo@E3w^MEx7+%#g3ARBLe{}dk$S%HIWk6^jFXdqscKbk87Q;B
zYSB^vo6SX_H;R;oJ;WHtZ85lKG%N?&Q&V>^O;#0*1UNl$KJC^{DASlo-#gdapEcUW
z%1DR_i5T&rUkD)JAq@4G=#TUMo#>Z49EFo6wbnuv9yK}klUmO11k?k{14BfPtrpc?
zPUPO*XZX*ffLsiYBuX8TvfRz$bQBt%1Slp!Gd)EO;|6jfN1TgT^$p5-<ckF&Ld5|h
zrg1jW&^3fKm=ip!fPj8SEM|%j?}hX>Dh9xUiuX#LxDUyK!0)*}jExAK*?Z<8H94)E
zpE=*k=md*RUnF)VE7_Sb!b<i;@C+1u`zg4|v?h08Tj+jOM+^c<4&Z}hz!xbC$0HOt
zK|dGaI6<54W^uNHH(LC!JZvEh(py?Gf`?hfxY*PaEprQnt&5q}*lCQH@CSS{#R%;>
z_5MyCKYjW2<L{q+J#jq7_`NYmJmU#&@Au9}YC0zeya(8=G93&2vbko>iOM|qU#REr
zw(Mnj{i$1N?LbzLaJq0@VIRl1(_<pMMT8n%Uo_gl7rT~Tr--=BZH{5;In*+V%Yra<
z>Il9dJb)yypk|O7V&(Nz85oygpq)V|l}{)>Bz{l{yg4GtAs_-Fid?|Cc%N-JNd3m}
zo<F$OZ+K1sR4@jFECQ-2n2j7Gk$XX9kwe&@PM?jxJb1_uQ*5F&c(Hh{YcK?@pQ5Zk
zK8{&m1R(^GuOgLa_&Dd=LLYIFnyc*vJZ_AUlke)Rrw{>B#l_sS^ZZzVN}`*9rN;;}
zfqwa9FCb>`>&M6S*R)$1G&Ty~p;CPG?(SF_C3J^J*heMwsl^L-7fpAsf#V#&MQ*us
zs5BHHz!1-z#;^<wAbFuc^Ob<{_`6d9H<=8nVa)R<(?|F&%}=yBHn+kY;P87KA&=z1
zrV~>tUHwVB0<SP#2{Sew=wTbtdH=4qd-bDjH(MdjxEcR_3raA}(;^xC{(b3X&khZ(
zcc2T^x3zce;tT2G<Dtb9Q&gRy(B_8M@>FDw(?O`#(iR{W@}w8YiOyikLE+Nm<lumi
z2PsK{mT7XX&HVjm0sQXx{#Q_Afy!?TX+kxF*3Sc~I|ebngYjxT?huA`IWRyd?~Qc-
zTNx8kM!FsPnzf)48zg~(GdwPU5{Q!H8R9BHwyU}WR59|+_^Cko?JghzXZoLP>IgFh
zAHk*&EI^)8B7r|cc;6602kUy|-qU4#F#hZt`R%hm-4<>G^d2Gpr2uY9_3s0Bu&xL9
za|QRyKMd~23Ao>bZ;5w?@yX6b>a_&O8F)vj2FkvMewrP?Lr&^>CE1?X<q&pxm8!*g
z#*7YG=vS%UlC(@^k7y4y11#x_Vo0EztBLCcr?!ke3eb=$eP|&R8bD*6jJx#<XCr#;
z!b`}*k@qq=8J_V6)sE~Q(XUviuv4&99u<zI7runrN;!Y#N&my@udl=RU-$nP#45HZ
z9Zbs&96(OU92{1!P5-v8DL(k?BUtX==Qv{s#d?wG@X+?;pi#7k;n0i}CD8ydScwHd
zj0&J*Xfr;>gYp(Qar&mgKwiyGEiWZ5Trakw`^*{wfGwAgiW!Iz`jPPe%roYV9a@{%
zA)*cAR}+<RH2Oh}le771`i7(%1Q#h<kUTlQQym>0Rd?d~1|$%Q5e@;#w49As=d!><
z&5zj}@l}A-dF1K8Q+<!N9tO}86!gWvWn}T(Ph?D|J~J2zPHRdkcP@Y^9GE^EoShvA
z0e6p_AvasWLx2_P<On6W_wBHV)uJVc-NunOyavRv`G?<QAUg$I{YcP_AtVEuk`otM
zfv#P&2o=C?5d9yb`c|<eDOI|@4N1DMphsCK>?>I)kYR#<|J9IWp@t==LKTu;HkNIZ
z6)GtPr7$ZqQ_0FOp}k|AWFi7!Lo&(=%{+>AEL6ox2D)M$17)!ep&bHtERk-agB3L#
zIuN}wb*t(6%65kSI~S-3Wdez9`@Z^vecr00+n_lC?lu@tstc*?4d6D>%iyQ|{cDu<
z<1rm|+amsML#D|*ZiULEKG&oNiS49U;orKF1@>STuTVqQ3vmW_2wRZ<1-*ShlD<bW
zidOIq!<$t0fp5QQZsgd{J6O|;Yr@2DpxVf(XR!LAK&n@^)kyom!CYTvn(iy6hN}uV
za|S(hktAVS;j8_C%Vl#@hlZW~)UKz9_p@K&pvF;5;j69L%sX2Rm%!#T(-Z>Te%UVN
z+Ku@vXISQ2`=$MG?{oX*!F~JX^H1%Ud-r=Co!dGR<!3)Gdmpa077@6%VrngVb)2gr
z@Df?LR|tJJEg21MKQUNu+WW|BEaoHP;p~cR?Yy@=1a5l>-1ZQ-6$HwGlBiVTRi#>_
zI*L2J-52i>6eGR%mFgJVD;#Rbg&Zw3RBnq&?(aUmH~vhWKquq>t1K^U773ae?#~uW
zf1lqQf1&-=V;6K1`xB52R0=BE_P{$vj3J_S5&#TKwk<68wB=-;woBW_mIr0rS&Mc(
z;P7+{67Pvk5izcZ5$Sy~y`DE<T<U2{e%miyTG#nlIx!f`%48Ab>KA0*qw4PXE3>F8
zLRai3DG9x(Pweja3)4$7v0`7na`c$P33*=cL3!FclYgi3?@az}<X>!2*$cr6&Dz^_
z%L;YTP7sJ4q=5Lkp{Xs$&Eg8j&EC4^8KK)sht<C8<siFDDLE24#0xPBSG?II0_V@x
zwtBIf-h4<!I-hGVwI0IsfH}pZ07P5w3UZBo$XTuH2!0$HQpcO%mdolM;?ev`sGN7A
zb8&V<3NT`d(hGJId=}`4XJCGOf8?_x(l({Jh&)4Zu>h;;_V1m2|J!kYq5ry99R#i{
zy4WM}N^*_?Q}h8L$^l}v0jhk+2|seqFf|Q1=)jf^^s6HPoS;qL@PdZK@i>>P1eiE)
z>w+N#T_foUaNL(h6*(7^4=&P6crL<M>hGi|&$v9B7K7B17cN4nVF_Op&R;R>h*|KD
z9C|q`veYGUiD^lZT+&5#7#R~IW?9oBF07x!I9X!*%`UcCX2b>VS9^$?xJUYUZ(~a(
z<Y4q(|1ml-!}ch~lq>DL@W)SwX+*;uCwFm;u&3#wVLV|<XgIur{MI<2{FqVB+QoPF
z4k6=bi0g+(!bK`F94oygfkiu^QY#Ke9H27~2p0_ppfNfrg(dZDx~OP5xS#wt@4y8i
zESj=(TA~3{3NqOH@4aNoW)H^kEmmWR-;4gf*S=oFKG6M>@L@Up1OdyYbez~R;v>m@
zA#pX}4if#!3yHiUBp2N8-u)t*q#Mf+xQE~g$T5=_IxETxjR31s7~L&L9undt4A&X}
zBJSD4ytxoG4#B2`0pFZf<nn3!g$H_Up?0Gis69+is@JlWe)WKuwQ%6sg>avPNZcZw
z%@yd*Ggt@*job;dPpQS#_K|)DG*b#{aljhT+*b>l`>de-gqWQRo>P0tC7a7ZpI@!p
z`l_4>c3UKFUor@<j^T>|uwT@D8hKFUp^@+xDDdt#DDLhzDD1uzmJWDTuAbZm|E~&D
zbXdrz=y1`SU=F`oj=V6gMkSMjnWx~lVRCJlTpK3W(hBKK?lvp<jD~5xe8suZ7t4v!
z87szY<zp(-rIZrCP-dc8Su#(ooD^Bj@ix$dWtaTzc_eD^tA|4$*L8N5luj@Y8uj;>
zpq4_uxC>LbT?OB=k8O1xYL^iRyhh@<cpIDDy5ZD!t@@mJzp;x|NJ?lBG*At-NBD(=
zPUyA5<Xi<E@pg+i)-|$HE_<OH9~<R@#KQebA0?Hpk%Ku8^fhZ$tdp;qb4ujf={9Tj
zO|C4eJSLj99U`dgS-Mj#2WZNa0zyy|V;$YDIftBw;V(c!QW!lui*lK$mhNu-BK~H%
z#afHO;BS9@_GMIu-lHR)ULsf;x}hJ@g%qXQ?B@?+P*27WU7LX^n^K*!z`j>~_T_C9
zHiwQly5IgdO9?TUV)<y)G{P;{lH3b?9u)0#Y>Dttt;w?jHJISo^FcE1WJ*G}(`J;$
z;mlpnd|_wF6<Dt*iT&j8AF9d@avL7UJG@P+twN-dKV$X~ATf{RKgp}%=#2)o==XJ&
zA4W{|kqaf?tS%Z5<{I0JJ0HruDg)T5o9hPGd+tgP_wIk;Zj1Y1k!&<tEsP#+-}OgA
zZY<RcgE_$965v_GGZ;P>bijbs0mA5&gESN!E?%ZrVeD9VR?P^=v<IsSq-Au|3=Uu$
z4pvmHVtC3PV#BTm`vVHFa^n<GI=ury<@RlI;J_0irLb}AT$goco4T8}?T0nlYL=OP
zqnx!4RkOGqs>cNyn33&bpc;GFiA~$j&dThqj4j(uxt1Z7Y>9QD43QLSfIRko*~`dZ
z9B{w5c(UNdO50lS(lP^77CTe~s!+oLm6j+_RzXT@SfJ7}15_Y>Tr*+P0fQ!6Ea3d&
z#tu6(o*@-GvBl^Fg83Jm83<8_ZcKPd8KQC}*Cmcn@-FkRj&hI1I<7;USmYfpxAS>#
za~h-->j>uV+U^E6m+5ez7P?Hy&CPC*Bf-&=gk!$Hwq5%j9orS&QMJ5&I~o+1XGi@a
z_Kh5~@Y)Sy%avWmKvai3+pMq}Y*|3NZCR+omStqw#^qXUU&MuNUaZ8{Ma<jQ#Y${#
z$;URd<%Thp`MlW}<w|bvzC#FQJSj=lEj{lrG?CP`pe99v7nlH<^U2ol9i5oD4M}A)
zyP;}se%pW0Df@YEuxjsLj?J9Frs4T#QKe7)=iYiZ%Dqx0(%sO~JsN$><QQH{gq_LA
z`JfM_+I`w?hjw2{-aavkO~M}@g9MmhPRCKaYbn)*b&>;$a9#-1rCY7KlNWo9GOJ|h
zByDdOJ}onAULMG-c)1dQrt*|_ek;B8gOyfX`~4t|^%ytvBq?G~A{v|xRkQdTs>fY7
zAOvj}1J&5WP9)lXc2;I@WmMU2%C(d>PT}T|Kt#FM<4z(p&=JX4kYLR3TNsAkmxGKo
zFd$vt3_YOmm+0u7U<_muBrBdH7?9d}LBlk<hnzo3L#X|sc)G6?h=F~T7lK5MC)rA9
z(n{{#?ALf-dFC|iH!u3B`qhk^s9(W2Rr(bIJMy^cSIKv>*$&w}EX8DnBs2rBt#68j
zH1!18LuXr<`LRWgdD|c_W&IuoY?EFE8AYVg5Lh|NSl?2N9mJNiO_2y}!(t^JQI1xI
zKr}S2+xSEhDe8?y$XYrt_ZLW`JikFw%{dZs!B2#w=u`N8m~+qF;^VzKq{fmo`)~-k
z&>&ZZ@{fTIS#!Mu3P11`Vi@~4WXRda!P%dDasqmx<<g(XeU~iHMHhq&2JVi7+>VA{
zlfwb*j<@o780T+V$21+d+<Az^@CZmlnmhSJ68n8ehdVC!G1-Q{qpFFtcw<Wa;0t%U
zh9g$w-eh`exX#qa?L3TxRPK3C=Sa1RKM*>Os|f%IO2!2FPSbPI^v1_T+|HASDOdB1
z(jLb0k}|r(|F}S!-HajXgp#gV$#(${IWx98CF4<cN0B*4e0ps?PDd;WFGn_f{G+}C
z-f?f=<q7H}WL@URlmc|(yPLm<BMFR`Ecyr<z<iOilHFu?EZG^_>5`{BS-)7dLGKj9
ze}Oy*h{yTQ|CAs9{AUP!!^bC2<l}!lNk2Z8Z;!R;Yx(2rtOAlkp)HR8@h^gR@h<{L
z`TL!;8*TrI{ut|zJNo0;{e?e0mqhb@>Es~&^jbdsntp<Ui@N_xKOM@aBmLL^(4UXw
zBht#E%|re1Uun~^&hM|uH@G2?V-rj66y|S{iqBnk^M@$z&aEEQi0?YwG05+#gBU;t
zO4)L!!}suBIV+pNEU9jgCq4$rq3$?6$5#g>bT-iyJj)6-(^!!3(F6yC?@CriOvL~I
z%RgfYnPv`vt(%t$i`I}H30|<ZQ>dly5I|9^Zsx-lIu+Zmer36f6t)%IXQ!FD?5KXJ
zH54#atibn>P5^lt!51ZKhfgj56?T&y;Al0oy!sJZlddyvc7<yraTK#0Qq_VjA2}`8
zfh~8RStE9AE5#C>en@VC>s_w`BOS<mp-;zT*-8!Nd(`;5=(43oypycVSl)HP0ZbZ5
z67&bj>4V6stW;(V%nz-PJBhm5u5m+2PN{uOIird5MIRE;L+<ROcl5LtV&QGuT+6PO
z=n9_N_$-?`z9gpzK|=7t;1)g7tu~spv;?sp`o^I=M*Q_a$+7{Okdzt4Tp5r-D28B3
z-yV_dXe7GRa02dCBbl%2Z*0osNOE$|i9_n2^LBgJ{x%SUL1oBLuJ3p(=l|l#{g9Xo
zrRm`Eb(&>ioTLQX1dRGaf*;H%ZsG#6nNC_HMoc;`4QK|mNJFz5Gd$Q0l@$t8iv8HS
z$q>;jG)tA-pj7RJVHy-as;>}zP)3{@2SXB;AX5-S<&+ZTP;4pYrkIZ%LaX^`M^ahU
zKBSt+_?Oxvg%yegx<K-`b#M!SCB(-9ZJmnYKpqjeQWvHa{bZ|otf48=5;{Q~(5z(I
z$SzJ=#&wLH*qX6~^&)O;y;u@gJ5Izem|1XV<3S9mWvB8e@JQE+1h5eG7DqX9*|D_x
z*OK_dCEJken3By$9wgGN<64$#o!-VQP(fOxE6FdG47|x%=pZf94%`>pN0@Gj7V<*v
zhu>@`ikVUmNeP-)*}R}+g+1lzDT5mV+y@y*xgoK<(2_)6O7ckux3$wU)=lBCb<;Ab
zo6n+GJug-QeX94Ll*YtKr2!BU{t*>Hx`UZuHC*<pCcL);(-cC9kG}B&J~U)Wco+Rr
z3}J$BpSnRrbCA40u-9l6!wpA&7ZO>y8k%a)X&5Pu@=8!~UHx|@3cXB}AL_Zj=~Tt*
zU3FLLrdS7EMht+*1Q^Wvhwm2Sp@6FsyRy|{iLS{B6a>b*a64sjIt-~jWYm;Aqa$Is
z(0nu(v94f>GU=o=*;s%X(pY<~Loo(?4<?w5dr<va?ZJc-T!zDO7FqE5%>fQe8}Bh9
z63#*n8{8i)uuLMa@D10|C9f}Htf7(3kbV<hM3GP+D=6Whs1V(&$8WKc%O9brLhJOz
zBkd_h)d*}Qgv0_O1g5IMzXy|3OJaA`9!%I<qJ+Db*uZ&|pO;0QEmt%q0y1xIv>V$R
zz`Gb%XZa;TE^3wgU|P4({?CKLO5ZA4Rt1q~4eIcsi--7gsUqkq;trQj8F`|PnUJ6z
z$KKMdEEINKLak)f#E8@bQ&y&tZ)~$V#X5Ewij}x$<Jh)IEK$zu!Ls!tz^s?d%vMZ_
zlnR8gnioMd??F?q@%Sl2)tJRq9^d4fpSgR>8A(Y9D)xw|G2Q_tA$;)0A=fO5yiPh@
zN#136x}bByl%h8hI}u3+@qz#nY2zh<xn{~{9!soil3)=xV)zoKZ|Ae8xf>M7E6exj
zrWJB-GSTyMN%JeWGrYt=XE+&Q_Ixrv4+x_Dd1(t%!4ZdE>$0pva-QL-E2ffgKEg$-
zk88w!Ty{LF<kcl!7DSq2{)%fa!cXxI4&HA<(pL&Ka2`5*%C5tBy$i5rft2cJR2wr6
zoN3&uO2$I72W&BgkhAQthf{|gTwOUQa`h}_xzCoj6jA^iP)b>Xoy6!tNx9McXdQ4t
zjM$nMWLxgUOG>$3E?|Z9G|ln<fh9{hk8=Q<*}AWoVD8fb3o0SP;686-=aZKT$0(q`
z*Q!t_@`n6mkJQRtGQ*1;@_a>j)7GC4x?9RLBV!)l5R@9KR}+T_IOg?*Ol&&d@dBx1
z44ehvt!D1}khnNGZn%N7zRzU*QiTwDS>CXi0O%HrrX*2bx~vQfSUdo_<vJE{eyeo>
zcP|cW8y71%`nGv9)q$j`dUwB$0lvs5KPeBAb&e-OA#r!I^qx%%2lldrqPp;Q$A}6R
zGxACzPzrn%EU`P`gObM`a>Hu``+QA-F(UH3Iu6WiMrnP+Gj@$_O1alhkqll8DI^Lt
z7_NH(51hVcT6O>A3orG_J-jL0bd-;CT;FsT^d630F%6~T)|7Zop>*Cx$~x%WGA(zT
z50k@7+n{@7*??99F8*ULbu-}N^+JF470<SQgRqR);bD?we@0ME{2J1y#T2@jke@sl
z8q>xj)dFAmi^pb=__f67V@sxN&9zH1Y#R>OuR!4fD-79@p-=RcMn*=1hZF1JSS8UZ
zwX|Jk$sm$)<Ok48&gGtIc_g@?v5_?Pzj_5Q)-2ajMeBXFyr!4bGcq)w!*1M&DDrPN
zGh4}hW{o(6trSaGPc_N-&DOT%B0WS69&Tfi!8ZM=+mZS;oU{>ZG>)bZ9J@CgScaV;
z(POD9w9{5i`bsHSr^;TWb6A3gg8LPmKJq%HByY#YQL3^v8!K2;#1ch8Fv;v{6akE_
z0bU<wqdN2}SZMk+oWKxcJC2qvjF5mD0brbDo*_*gv%SM<BN^Dq@4aQ7cC;UIfuk-o
z0A+CGLmloe*LVeDpYPyIm|^Z9x$vyR;?|5-1^<))CAr7uWQIOkiVirocq74$`9i5<
z$Po-AXv7_2dX>PK{k`L0OsABi1m7+tw08#q4b~$ay)H5!&xn9S8hLIEhqDqd3Jsi<
zU250ANFQ49m%f*w)QKgNQXNCSr7DJmOI3iKxGG@#dsz0Ac^it3buEaoqzIUj2D4WV
zaR7y`P)`>y1@o5vn+VblV8K6i<Ui=kdGE~93Yb#17+IP3g%nU>R$~xlcD{oZqsS@j
zuyQYjip3R=*e{Y{EDp#>u~3|8TA>VFT0^0F>io}fyp)$Z!RT_BJ7K5%)19=?s`8$$
zMYF&=_Na__A->%y&owfdS{@+5!|dRDV8`A&k}_IkgU{L~4{JyD10iPNVQrXO;=tjI
zz|YBaq1lqLO3ZcA$e(VDV_zP(eKd0JcRr8koF<rmEiPENnbC==@8G`bs)yp~A!Mct
zF(BxtMom%hg;9s9OsC_YJHzwz0U?kk(3sIk57)zaIq-)!Iz<1115omc_y>!nC|ENo
z<M%pCx}=7ZN>xBj{&RLLQ0@I=Pzd-2x03*l`Ij3(A3?4NxJ-T>5+EVUKln__Jy`-T
z*Gl!jY`#Oyvr1;;mWLQXdX6lhJt0ZH0iKXZ7XI}6wDQ=Someaxm`$uOFq2pzA)b`%
z3^Vd*N~>6?N_7-I4LkLwU>qBf9SC~aoa2UZ@=>i``ZVR)i}2*89M55!U0rDgqhfzF
z*4;x$Z<%!)zMaAl*mS2M{-jXOX2_?_)K(0Elq62|#RcC@!Wo}GboNJEt|lx?c`=x;
z`1*4!n7lX^YTi}*G$C+*7fE=;C0k7YATrAh+#s12RmIq=*C^fP_F~tmY8qSO?IEP4
zlBXW=?wOoZ(IHM&r;i(oLfkRH#ydOQn|-*|J>N<JVyEOaN-Ezgc>xS*=aMeqbE)~b
zB@awi?t(c7@Q)&@n_Xu(Z<ZIEOUeUBGalIyWFtFxf1g|$3-`?BnnW5-zU@YM#A{Jl
zMxhv%<NupWKFb(fN9S2D2#;FffjPYMF|YCx8ViVbW#p?qp~F~be1IS8z>5#lf;eR6
zHl7Z+Y2-B!Wz1U<I7{ctE_6f+q8L?+JWcRU;!n^yy#MgkP?*u9xV}JWHXf{|q)ugq
z?|STObY{!<D`3m(L22A{k~s@3Jo)l(vohVn>~Q5M4@fEi!oGi}BwddE?oJ!;L7g8w
zJER+^4-t%jEb&xkz~~<-M-N02vHn5OC32&`JmsD|cg=*EMi2jv-bxt2QE{^TwAzYT
z7-*Whh-gybAU^hn)A!y{bA;Lol2}4f-yhG`@7G|vK4NXVevLn<S`b=wswU)UNA1_(
zsP8$UMvVlU=3RtXqT==^J}(&E&?-;KV!TZC&Tnio|DJVExc23;dcuuxwNK+^r-M?M
zpu%t_Tg+YGV+DO8gvI`c-%t#SsD;6<mM#C?6e+2uUmz!^w@wO+Kv96jgxH4{ThhHT
zQj&@2C|2>#A)XGUSb;%twU+#S?p*;KLh~AmoR+{{g$Aho2C^mZO%0oIJh*_>BcA+8
zUER4;o$;S(>7g(!-`5HUS@OF$Li+Z&S?O{mthYsPf3-dHwKe5lM>4;3bfdi5rngz+
zGQ_rJxt8uizt(Y&Q7@#a3@wRgF|xp-aLw>2DMN)I{c&U?hHAP<skl#DXV1YKj1SfW
z(#uc}p&kqHhn|ox2$9_#zUNu_uyxDRxaAUop$?+Rb}?8{7y9%P8I`a#ouY|AMu`fP
zmBoXf$bT!j(R+)F^_M5YgF9YZ?poDC4Xo!Ne8nY&uT3D##*tu*e@j2Oe>L1sZU_(7
zyZr)S84I(q?F&`%Jxbx2>{ESQS1cVqvrFcy$H+dK4;M99${2-|nTAYw=<fzicyGi<
z=LV}WhVaQS=zLg07HVL<3)A_KmBvN7KiC6qr~Sbmc#ZE5c7e-(#V&FhD-3dL>iCu~
zqv~6(`C4{jrSZ8iu{>3h^TvW-Y<)whFOESMi=FIU9%ID=)x#uFr~#5F5Xt~a6l&^)
z%R<42bnzcpj#3x-aujOV<tS81HmitGc%l9#_B$LFkOE9W&OlpUXgc2vNzSCvFm}t8
zC^MB7(uFBvN2KLIFLK$n)KQM3a%+pGaxJQ-g%NDyLKTZ+<dXhy94C#2aa^th9G9mw
zjOKxk_HdbasIMH;<qj;e%C*E)jC7bx*S0TDOY!{-Z~XD300B=L>$5_14j=u4il0z+
zssW-qUnLpTsDI^3z;SspABy9l`Z(<UuhfgMqaNJlWgw06UIy6WxLiwiL*Ng#O~kKT
z%K}<$n=;6{mZ$nmF&{p5UP%oWkK@2Neu-SUaO}ywwxqLku}AJ5%4AMyv5$0fwa`g%
zpGw#oj;0`#bU<W3;AIB*!~1bxDSbt74Nb)Y-Kzz3nYBwMn2_p+;nb_uJb_#xH*N6X
z(!+{N&C3n=ehlc4x8H#0Z}=3UdWYdt;KSL7Rm<Mu5T}0Z#N?BLMU56`(B1R<rlEmB
zPWVn)5lBuv#R6oq6ONr`I8f-1TF1!Sg`06=C1$OGRg8xBFn3f4YZKtgx|pxv?k*QW
zpG6!w@j6g}!{gPAfl|T0A%jwvmIz99^6eW3v~5fHX4`z0wpCur`l{p&k7LUn+sLtD
zhv}h<tx9Wb8<y(05&Nra8>c%jtTS87`q<j?(a*+`maSYOKV^Wykd^+-29a;r95|C^
zDl@ltlLT=23A->zi7IfaH%&C%z!E?vX)Cf5^)-|l#EZ`kMtGkMmY7^jmv}86<}qoB
zvI`z1;S5p3U|G;0eHGHnEXzzVl7pF0iR!Y=Um<44?1b3HVl|d1E>FDq7~yuQxHsb1
z!xUo^y<>|R#dOl8Nm=?e6SBpa4B}<=Ybw<L(7aBApTyHQ!Z8A$1H;CNm#46-#EU(-
zl&R4Z-jfOx;r&(^=`Jyb__AT5=N;2M!|3LKP>m;)V?~h#q%aQ@KJX1@WwatjMj`Ou
zox{2~KBQ5Rh*CzX;BeJN_C3O}p~zjnCk6q9zA--ByON(lnz}Poxl1O(IuyAi6YX!D
zQ(WbgK0TbN3^2=Cs-jDZltAfW7q6VfBbScB98k{WTH0_#2dupa+3%$Y@S`}e0mE*P
z!HVQt1lBg-H^Z0wg6_atsfuDvO8&p&ZE%`)dV>{r;sdyf%VxWbB?fPUV;PbgtOpFn
zvP2WHzG1!C8LP@mP7EzdK9%lw#$r3CSmOCA*3rw)$P2Jnp&cV(S(e%=R28;_=fbE|
z`pows$-bmAKp~<mrk4orc)pRV5FJ7abl>ZRJpGC;!K$`U#*z2}-C|(eHpl57gD<3i
zxe6R~R##0gs04VJfyT=-$&Ruht3cq%C6ctIkN!!Iss?-cC;<g9K@?sxC%Q3__Ko2(
zq1WsjPpg{6){nY3+VhMZD4ud#I}(>&qFC}C1x1d~f|8LSV^BsH>i}eheSi>;T`{Gf
zyol=7-4d(*-LG97)F=W9fW?G<eGe9}g^MHD&We@%CZO^g7aLjY^l}g=z~7y!ag`Kx
zyc9vC4?<QhRyb4iS%|#U)u?x*{dA#12NFF6{X{Mrso%TW50OL~{sd3y46#ulO~r01
z+;Yv_kX>G=<cA%Yu?Q?&yUZw30}|lqM3iDGxJr~N-z+xeBUdIe6k8>huwJBUTQ8Ql
z)c_L+MpwEhWJl{7ac~<<@ESRrVAiIuxcL)g4R1~QaIOK(FYDr#CQl{@BT;G)n}$aw
z-DmhyacxbwM}#5prjTUAMH9d=h2@JU7;((82gWQ{p$68B>%a@Z`eQf?pRkay<CDGu
zpBf%6RKa)=<q4_-$Z7HK)Y-A%33MJ8cI69IlmwotO&u5CNg|aJR7@w>&NMV9Udi>5
z0kCjr(1@~%@(`IM;c=n~%WwX69wkoKHPDxtrh;!^!X1Rj0not$y0<o<L}T);zNJy6
z&%VIMav5HD88U>ZX&)|)iuU1j=Oqj=7suujUT`Gv70subJ!=)0Os?)TH=29IMyx`#
z!exG9#(jnU4HU^;$~97P{^MV~@+%dxF;d~k)())^ZSv}&`0wI=b~4hL7iu@S(_Rx+
zm?1Nhp>CjEqAGVJC~I@g_9Q^f_dyq;5h!VqCA+jt=`C!jw8(6wv<R>$)r@86OcElT
zjufONxy+9R7Nl50UYYc5D<(w-^rXZ<o|GsO^#gFYp9_UvMwm!+7LHhAz|fiaP%;Ba
zUZ}v#nzQW%*&o#lyiWzuCBM&Cc>FtOc-q`=85`JXO3^##r(4OV*wiOcZD40V6;9sD
zPChR!B7k&JoV>WZC7cs9;?d+tCd|wbbB;C(O<qd+F_<Vf2!kp7Ct!pjVW+SGxk3mw
zLKYcI$PYZ%gGga8xQItQbb6rqJA5>B+A0j@p9N#MK*CT`HUzF1ZdyaVVoiBqxs|&w
zj?W~lGh-_eQiJ_iz|9-xBdJMq#TWKI=q3W^V}X+|VsqhsN4~vd1&i@mBHKG3-Bvch
zx#fu*IdS78+Nmccl{QEwkBi&tw186Sm*kKQlCX4g{KSbU^<l6rD}4Zw@2JOd<u16T
zj5sqO6^RX{3;3p-HRlJeJ|_Fze9ROxavvSR?k+9}8wKzBdhikcjVnq>Eau{SJ30Lk
zLUSf!HCbS0h>Sm<P+(7_<K%BG0R@3jVM?aznIB|_zoS$I1al`Y3i*_;m6AzLL{TJY
zXt{4O4uEx<gG=6(MF7ce|I&x+<%2FD@Q1i)miA%^3AF&UZBVFU_+g=j*_wqKKsnbj
zVylQ<m$faRRBl~`-h^JefrhqLzLWE@?VR({3{g6!ZD0m72+F%NxXBBFme-^|>;NYv
zh5Bj4;VbJ}k!glDy_-^WpMUYJ&wRCy@8-q3XKyB-H{A)IpM02dB-Y@e{hb_naI=Vu
zC0@(1w{TKcOt75Dg!?*`9|>c0>2z@PqEB$fV~J<rWqenOb}g9f;tDRXvlii2NPx0q
z*e)0{(QgK?MVe|~OqnEa%e?M12^Y;``nq7Zr1f!|75Vm;7m_2{MfS}ah6568JzKeE
zE-tjg4WT986=28)62#%8e|9+XS(N2uf<_ec%D|Q8=L&iKLQ_M+(t!k`Ccykg8XgAg
z1X9GEDNJ<cWAAlI8TZ6xE`nG=$^yBa>e}MqtKkJDy)3(UG(w(#v3%BB7=#mlb0k^3
zEP{K-m{#T7RTbolYoY}j#e>jv;lkcW4#I=?BnyBXDR<$nnEGxE;SUn@ZMlD$@cnL0
zkCJkYATW@$N-BdL%6w1hikjWOqh`vel4UeVD2*}5oRV(5#^o>LB}IwC<x7cbd7Q^F
z0Q!zVc?x~-7ebGPdgLLZ$-IIt1kx9$6dV>)ZqpU^ijr!X6^wkgadd@!LiJ5)dKV#L
zqhNzd<sMMtJ8+S{az4i{U9A8tFHvHLIxiX{f8T+9)$(=<>z85WrVcy-0JuvV`5kyg
ziye>-Q!p3iwp%Y+43-j5Vfz}wDbxVLKtQ^JTWD=Om4EFJQRF_*-in$93{1Bc9(^f=
z$K(AFwI6r4CCyku6~pyf;)I=TxvQ=tZU`v&J&{B_CGJFo3As$PPVlk0%QxP|<{o^2
zwYEXJMNKE^h(u0wHCI8nu*39mj;}*}%$RilQ7$QQFyu~wjR>Rj9fmXLiRR}T%`oWn
zO^sW;VvlCx%fXXe%z8veFPr$cX_&u@7e~2KeMg*yxYm4D%)N7naTrpF<JFn?#|~IC
zm0<{06#5pNiFEZzcU;5%z|4?r#V)1(qSoa8SP4khmSRi|x)e(9$SbU%?B~o{@(qcn
z(Z0M9#JrYb&kzKp`MEPW5Lq7uaG_`C@PR=t%)p(VF)oUE%y1`~2W}FCp=s69aWM|q
zl`=N}U6B}F=Q?D%S<J5PSI|wZ-}n4Fia{^lK{pa?2%IeT{n%---9Tv>H=qBTNF1um
zGNau3W`w}ZCN07|@IX(_PO{szqVv~X%C{{0f!8s4nx!{?+c}L=-$3x=GFoKckjDaw
z%CCj|!M@si@o`&qBf&Aj8NxBkymY4A-OasNV}N%J=;xqq)k(3TkxYDaz1rfn21%a@
znUqQ)_U$r`Cmhr)a=DU{Ez7b6<rxq^7D$z!ElT)}q#31ztr1HUWiGZFoH}Hagm;H|
z5qVev{XDA8OwQm#cTyZfZ~56XI|>WN#%1M5uPR)SXZ?~sK-t;Fe02u)?VF&Rr+PyZ
zeBMhm(+}7M0)B<BQrR%wrb{u5|D*&+?=z5WSK!SFmjfYXLZ(VVwXiiDT6T28rR&p<
zQC|Dd_SRPfcsdU0p#Y(6Sg0Z`3y}Ak7V5BVc}li*xfa`(P;Xn8>KKMgYBqaN2ppzZ
zLJNxN^rfU{dhABCG<+T-!-wQ6J^ALvGoD1kkcDaP1Yd_txHZJ}x}zv}iW3zDCaHsr
zq~eMw7FCrdkDtE$`tkSAzMi-&)&ALM^d@)WQvHP;RObyX?LYnS>iB1*Cs|#0I48TA
zGglw>Dn#)daV_ZEo#;^kXPR7C7&yfgczqgisR2!#XrLzHe*L&}fYQ4zHn<At0kFkf
zso$<zs7?CLpH%{2z(_W~?gr-gLXxStp=bvHPj9%3aS*xTmG5RXe==RugA4d3M;FZF
ziU%f<>!a!LCZL)d4U$zwhAiuduGk(9heL!@AORP(4%`*S2XKq?bBwFmjQ#Y)PvK&j
zpzI7Si`)u85-)`w%q4YDV9>aLe*Go)h(3sc{5x$UWI$uczY9fp2|kd~%-=F-9&u1J
z#*5J95|Z|?iIR-d6@4mTKK9y8ffFU6q-(g&Ns*rZ#4hu7p@QAWl>i|{|Ab`l$0uc^
wGLH_v3P}~2-W>6=^DSDT!=wgzFzrayA!&Z@X@cK9JQ1?I*g_fa7!2|M0OpG;8UO$Q

literal 113024
zcmd^|d$V4}mEPaKQ<d+aQHmgN#MQ=Qk4;8ku$dy*WywV*jLS!WBr6tzk-&gw{MD1J
z-+s=c)xEp-?%uD2?Id;Tobz6~SFc|8wfeIE_y2nP^!e$F)3>Kbr~9XSr{ABxJY6|m
zJH35+A^yL1dgb)$=|`vQ%d6Mo^_A0&(}UBU=yT<CGkQIa_IFO7#s4d(_f8K_pPXJg
z{m0XPINb_J_m@xa#(#QTxqSb{>2{38D4(D1#@{caCEvb(3H3p=`#4(A>f1|bhPd6%
z(C<dCI}5zW3;ZunUoVjEoPHc*d>fyA75_hp&mP8q+J3s=^<}(f+^?4T01XUj_37#5
z==CVxeHQ;|eK+8Mk=lH<w7Iji@LZtDqf4sPv;6t#gVS#U*3YBG!==^jpw5-kuVUnn
z<JJAZ4O;M@7LVgEctGDTp0s(q(CpLr?Bh#ZJo39SuI7JpHUBH8cbC~SquVjN`|<AK
z>AwVwJIhSq0<-+%^8fMW_g7A@$7l5%YV3djeW1v-1+wW3G-S(TAyH8D+xY)rY1tc5
z@-xrz9{-@s{TL~w>-P&L&=N{9fAje3X!&5_!N)Q4D?wvuemDL<2<m``q~gly!;tV>
zr(c|Y863P7EpG%b|2h7D7_WXEKfJ#cpZr6722@5u-Wco7Le~<b`yn4+#2EMEJMfj9
zBKHrY2Q-4}jQ`(G?*#O>V`PnR<MdWw^8SJi<4Zc<UEY5XZEwa8-2P?s0!yR|3~xn?
zw*&Y0mv?;noA~rs(e7sSdMVo73|vg3JImPT$?M%qoX{BL@k-3_PR#1|LhHwcR{wLf
zKqHZ8UOiZ70f&%7X(*a-e|Zm`ZpZH@(H5H}8YP#{!4?XmgJ{FOfN0Jo)Gf<|#lwO<
zjJ{tknuO$l^-p3pU&hZDF|Qwo{dhT`^7B%R@GxfiQuKHfuU}sHpPK$SK6$gC4!B)k
z{qUK8vA9?+?9x|36>D0rpW(Rgt-x_@p`j}f;S;t;`icy_6|((qyuTK&zY5Ghi+R#g
zvinx__~i75_~vn7`$4?>DzK8p!49JN_u`Y=@%pp)E6V`wL|f^+q0kapz*50sv?ehS
z&R;BT{up>7S+pxHO6q<+!`im!yER@l<fH-Gh%fsjer2;6nNJ?ZuPMKl$j2e2qUblv
zTyoCvp|nMe^l{9V&#uJpR|};c20hWB+cC%6i-$nI<d^VB&>cSFOWKy2?|T7La$VZF
zwI2p1*6)je_<2AECi;-lPm6oe;&%MCZr+Vo;D_hGb1AtR58TjDXoW9kcJz{cg=1eX
zp90IC5P8DSAtC4za>8ds8R7&p0UGj0%g+})zbtg-!{r+w&>}}?T+ay__qY#F>}!F*
zX!3nn9cDyN;vIQV;t0IA>>ZzC&;NA!tt5BtI~6-2ttB<(X}(_Yf}`+D_^18EB4Ve$
zcrp*>lXmJxSoilMQu8OWy`RN<%QO_#9Hm?Bcz7g9g1A%19ME&01Me*uS+>v?Y&x_g
zPSBjvx~D8a-;#<C7THlOLd0b+S<8lKo3^3W<;Tlh9h0mr^1XlwH;KDmx|I2s1Jh3e
z-`Bzp=PN8McKzjr?}~UI#XGe1^RRkY?LWl#d_&6zOYe_^5_cmO5WTGf_7IXI$@&-3
z2T2!g*Ld1<)FZqUeX#j22XB!m_y&gP?!9<TboX-jOmISjUOoMN%<_xqb2qH9Y!5n_
z^pw=}v_i3z<YCPxd1&N|`O7CrH}<4oe&&;<mvp|glcj`e)ISDon3Ez`^aA>cUZ!Nt
zd#r@;czh{6*bi(JS}p&kI08S%tib~-hRu?`h%Z=n=9az#{OnErpU?a|<Hve146FQa
zm?`7pkaQGn1Mf%ipZJPdGdsojkAhx5Ua+#%{W^U3+tKO=A>pr|z8|mlW$sbX?vt1+
zvWB)`Q8ISH`k=Ef$EUP2RB#p!S0cXDh(C<cUWpdZc0@xh{ha8NmPHcuICy#|a8&kY
z3kkhi|NKu82mdmn7%bK=B5J-BF*2_`C;4dU?3&)CoFvci-k-);mN@JhQG+B7=}PE$
z5$QVEA@$D6GylY{rk2UhX`Yrn=HH9Nh~N~<y%2MPQ;v6?soV>W!dZMj9-Ew5-onx0
zozpiV3)h3^vWx53uA~7HD&2wx_NKz%`6u(nViCV6?<bO!G%K>snc7Dv=C<rBR*|RI
zoRadA15qB&&M3@IwhGNhzm;n|44M*GB%f><Ob_`RaFtahN<lKv4*3(kx1?aNl&kYO
z)Fwu{7r$3d7f)pC`sJutETW-{_|_0EBFFeu;P*y+f(*&dK8`k$`J5>@;=8_zRw+?}
zbez7jfKW-f+v9*ug(S22-i*k5K93pK+0aLqR^auhB>jEN<hKjWZU*ekSg13+6jq7f
zH)D397ThbNUN}QE!3gp^#Da>`n1AYZ8JnYJ^vp;OxoV{+E&PWu4_B?6`5<3JUtce<
zh-f~JHh6qq<27W7=cJMG72_avUk2BJ^B|y*AAYuI9?}K>_`3z$a>9J2E#kerBC#Ji
z((Ow>a4lYwi-9@gg16*Xwowr*pFmZz5Of{ME5FAs-8ubh;F<QTmG0+alvjhFuU`J8
zlK9HPS!DmYfXTOTJwNws`2L&a8@0F*J>*rC!IZO2p0BYo$6MN6IeiqPGSAnSzhLm&
z%UBH>JsT>imV-w3bcGqd9^+n*zdwrkNzY0iLJj1~d5i3h;;Q+%Lbs1jzYAEui#e9{
zjqisxQmgoB{MGk<_k+_9<1->>bm~U<!?(i@y%(?3(!Eg8OBBN^f!X!tuOh3ouO%Eb
z7<+=B=~L(N>1vGpas2Jk#!=rq9pL#J5rM#U?2!3wnS<|tT(l!+0e+0|bThdhbHIu*
zlhm#M8TunTcCq@tly3R<l!RLE_9Pr%hOFFMG$-f&#-#<8T+|ei7Jn4<`Qd`8+u9$g
zkG~Za*M6v{ZL-aeW5!s_wCK=QnLU23&LV2LlRf%P%!k;AdKaFFOc^UiuBLIz*du*o
zZM!uVBg^|sqcl31<~IQwn|l$Xy%<!qHzHdm>SJWStNk?Xpp(8IS#?olZCBUvj<QE$
zRv>?TDT{blIAI)sayPyw(-t)q3%;`OQ1Y$z!f~rTIAuM{YcKC!`T}_Z)vWJ4!Qj=P
z(Dx&fdFS-sPd^I_@$-cWj8IxKD6FiFoRgeE^+95wvZpP<ML>Q15*{`8o&}&%h3y9-
z)&RPTGr~jtfLKcJMcDlpBf5V(puV#K+1N_vvW9(8^|Pei2>7LiPT43W3i`uAB3#x2
z@X1JQ${F(1deIRT_GX^(%zHt9Y>n!Owi;y=esTKuW&E<znz8dm<aqGFxfHr8y#prn
zMe>w~Dq1I^Hidp2ugShf`i3qm5*Ovj)+I^20&Bh{F2Qz^gWL|d#G9$dmY}k-H4j(w
z6y1KkNU1WPIxm4|u2D+{i5BI_ENh7^UXEF0oN{~70OY_`bgjiPTh$(jw(7Y*TC}?#
zNxT@I`or+izlz>3$M4$_Z@<4(>-FgiUHw^mPG;p=B~&isSfuy!kX=_!gehx}uKyre
z@E0neaerDkg>J63h*rw7EbVa5tB;OQsWV+%&I-vBl#I>vy=O`btcoM_62BUfczbh+
zUTv#e?jp~sS#R^%tAftg&0k_}>T%2yO9Cv<^rfJVa=(wl=l?i<;Wu;pGU5?tq3VUa
zJn;y<v8CiY(!Ps`8D9)5cCCQ`pO5MMj{}FFMlU#)-m=ttzV*oR8}Jxu#=f^Xl=aV1
z)kVNBZ3n$o_p|IXLuEqBaJQ`qQYae8K43-hBveU|#1cO=X$wQqXv?pek4QEimAPIl
zE3UWV6|wTw-~gOM*RBR9i0i;@hIg#o)^PS@w;Z<|ExCMa(HuNbTgOU{qG9O!gU}Mo
z82W;iC;iJBnd|NFD`kUOqJw;PGvJl^`}gBB+YhuEK5C4<opWW-RYU0redI}!5B1zE
zS<DCQkwId@v|pY#*jmTI`N)jd@!NX6W}6b=q1^JdMX!wS>rY9a7cO<X&vDCYO9gur
zS8%inCyQIh*p91#A*rC+AzLciF>85N`F$jY*c)zN3l8|5Ajo%85yA)lDgMJNAj4b5
zv#vr?=agN++L2}2pI!_2a1j{g%A;x~#5LQtKcTWt$xI$chG$93swS(_va&#9CdigD
z4ebozbJ?DRSz~JcKqG$3Dn76MIsb14EI5Y#5D9Cq#kxoKf#<R=mhE-T)s<yeEWy{>
z_;tL}tXS*19u%n8O4y?SR;BO7?tQaRK>VtENH_8Lb#)NgVq|#!^#T)0mX#u7)yv$F
zI%t8!@`}FLab!WX=P$KkxL(Kgb!3nhLl)|jfO75($}z_nLN$4($AP0F0O3mft(ZS$
zjX4k(m%HX<IX{gU*Y;Jh^p(@|i#JNHJRiMnU8tqo19;B*-qK}_r=ki5Z~~2kU-I~-
zbz0tkinhccs=A_)d#nG_D_IJ0O>@TM-zio?+f0EG6?1|ORvmx7-Y<Y0fVE~q9<a8`
zjy@cl<($imMO>-n3Xg@nfr<15Ye=>$Dj|X3CM`sw@u{>|JJnjGML8;MpqOJp_xBEl
zjD_K(>ayrm=A6bt`iQ)Ey@poG_^HY(PC;*wyI!8KuAR^Z%SvV@AMyFZC&?|m7KN^y
zECr>7yY<8(F`D$XoF_W!I*)2t%tVsFY9+Lked_xYX1Zl**IFanAZa1j!>&UQ<XJh2
zIkIonB)>^t_i8n(wI)bCdmU`Em}}}$@>9G16!9x|A$D7P1I2g0crq7xLuTXsLGW2C
znwCq(Lx$>F#M<hub?f0GPeg{FhR%rs%6ybHdt_@x4G%72?a0iP<w}2<pL9ceKhOg-
z+SZD1iT05Y)>-s@Mz!hXq;Jei@`KLpuRbd7m#vki*IGkXV62s8=h}-r4VFkYyo4g`
zko(d~wDd?hCkI6Po!^xCN!l5zqN?oKPhtT?Rq!kI@rxK;6?R)X-pL1ptJbU}_u4DO
zo<pqCFJjija;l&}5onrz7HjGqsTr@A8vSWN02|Yn|B9)Yi)aev9Az`ArA87?JoRNz
z14*c@hAdFdjc7&Ip1LNzz!)iEtZxHvV3m}uadV6(NzT2UqL$!@!rC{fd8NMFL#i68
z2nd;lS5&%EQY{a)9N5l-yDd1f@2pBz$zFgM0GXzaeZ7iPl-cC?@;hKs#t=}ttamwz
zQU%tU1LwWxz+6~IE9^jr7oz<!twW26%`#goH3ojGR@9pV(kP2znUeLETw${W*&JF^
zo4um&3~NG+qN;$b+5O-atL~OkMURTQ`3$L(d^vK#HfawYSX(QV<v6BZSI9J$@Y76O
z4PgB=<zCT5sd?Z)59nhIjFt4H#=wyhJVG+O`$O}fhqSib_hd<6bm`v~B{PpisvJjY
z9CY0Mo<?HNk&9YVB^}ac=~wE5r58-a1GE^qPOW8b>uih9{QJwWFmM=3;>*}850B(8
zkRV?5psb<lz2SZsz074rZ;Zfart4a=lOOIUYa#zs<`|5Tddq17>@08@qo1dFROW`K
z#@=8j<bT%lb;L$>v!qV#i_j3}L_C7eK%>o*b-a$WI%{Env|}3W_{73Ha`svRvwZiG
zC(O3YFz^xbzQjOyTR4|<R5effVvg|tV)@}!9Z}22m?qZ)UYpxd5v1pp)sNb0_Nq{!
zLwy+Q{x1itb1=CYbz$m~f1R;kK5OixJyh^-eyW-<9$S*xr{ESBj#IJ6i&-45p1!xx
z;4eMu^`{s$DQ(*G|5jKHq8&81v_R;!cHofd&@%0d^=wTotj5}2TnUZ)Ui@Z8a1pw}
zd#sf#koH<hhh^<r>#Nc0OsmX^YYpDQ<i!;xtXIgNJ739JW(KxBU-#ORgFY^JG@?SC
zF|lVT{VskC`<gyfKCaH|RENXr>l6)C#8R?fo$NsC&uJU67{pJiBM{@Wn^6&?>M-I)
zde9qzBes@3#@J!11&Y>8my{dqvOn$F&{Fbvoid3}_+I?t$zF`#KP@ts-<Lh{7Dz(I
zII0L_j>F8MaM`OK4=et?<$JB}{LAthEckix@*7@bqxCKCz>l9j{45oY#m1NbaeGYY
zl4F(_8DE`J?NbZdKrvM;lnw67YmamITju3CrS^&!tu5$5fd`7^h}0yh!~&{T_j)LQ
zMNXB=QL#hs;jm&L%NsUKF#+FYq)p{P`w2>!_NuS*w!fTo!_7VEc~;Vm#8|?4UCZ&)
z$<%QPHztXNW!K-dIL_!=E8SRzIca>>GF?mHUtX%wu60&YTEGv2F52sX4S##FpR)Xp
zy?YSW5Ra`@$?CY4M0|{g${i=vmQ;gTM;RI4<Ik}6tZ4J8y_dY^I{`uGpxA#;)m*;H
zYcXZbx~vqpJN7NrSd@MymEO(RWj!~)b4DhMC9f@8RpTmqw3p-P6rC-%EuASwY$ZJK
z%;ur84`oYG$oaB%F359}G1aTYeK^?Wb}g&4qpH)XQkv^c;KI0$2SkH)#tRNW*KG(s
zJs}^Fc`1E~PR$+U0Pm5fbMZ-<C8r|boNGR1l?52@2P9&wmV3@@Rj)G#T?5km7-wIC
zB?Botswy(Fc!$rcGvToenCp(RN{!}qdVT1Ncl;u(fGX|i8uFmsEM*;(Q$5@5fr~xf
z`oW5`f5Y<|!AcxU?2%4#46Fk(UQ$o9R(;JCL)V!9uy}r*vJ!`KCR$69l~FBA@x66M
zHL;o!TH_Jr+Wskd<&5|Hh^x24j#&GdU9Jr|%du=TTg6eeW@fyN1hU`Eu_WIxOU@kV
z^vJc{$}p6K9-4niFL;nv0z8$&A*Xkq?4eL?EKgz6?%JhP<EPCdjR6dw*Ond5J@D8n
zBnP~y9l1hXSA?+CuI+1VJiX~ru6$w9w93dC*q0XkSs&?9Mckm;trI<P5gfn;i?Uw#
zL~}FCAU-8C%^iP8EcV1Yx@C!|Wvp$T=Yr0{0ed*Zf=75p@;#m97WV$$>m{i*87o6$
z>^oWo7nKh=4wgp9w|u?K97)Pq)Fan*0kDSK_}O0FQJN?J&YaPAV?0}Xw54}HWWLOm
z$yf1r$er}RmpSm=x*E~u`jSHV31}dyWOie#i@bZ?qqJeXPV1)C3C>!<@qP_ao(=y9
zU$<HUcgy<b=h)$^r@vdOLZh*dKvbP+24c>=q{@4Xlqe2^!qyX62i7N3+K>t)6@B%7
zjoR;;2Zn+s!P`=fy_)1UK)tt6_|wZ3Mda2JRZF<^X3ZB@SAmq(cUfR*K+>n*7K*UC
z=~XGT2Fstk@Ao6KMc(AUurKr+jkeB*>pALtiC1})#arhUub4Ja7V8Z+WEX^u`anbY
zfoG7HYuB5Bq(1tawx4;Fco8R(?-HS)4ZOEq(@r%-Tv$kMJ8)~f*fFlvbAYFkMft8V
zbtP+UwmI%;ZZeaa;*LVWO?x|#d!%N~@3kd^TH4d7s3E`Cr+c|)#wN(MFhWOVv)7cC
zgw|dU*{pAIf-bbgQbSRBMXk)>;o&Nu%X?VTtk>m=53^rqoTX(Ug3o<%+^)9vlIz~}
zd&9aB*f<*?ij@bJlt6t&w$=dXRIkm-Lj5MVfK2Y4Qj_E$af<qYrP$3?$}4d@*BXu?
z)^QZr_t*dHlf-K}BPB#S%!_z~Nb;5V6`wd0`|jmWD;<vP&{OSmVJ_fa@3_jHJm%|_
zB|pWN!XsA3k+X}XCs8MUK;tp5TVXZ85KfdFF6{-Lq}*GBBx(n$tO405{gFdnOT#R^
zxkE=hu^eu3x4&~$GNK$4jfN7?8(K0Cq-P5vZOUD(;8*TQ)-0sMxm&K>Z7r)P%ozo(
zlZK&XXtXRT-^jw%6l?jmrmwjNB=maCryI){ie}-c{Htj>;vP8J5?b5VyE!Biu8SZI
zxnco@Jk}PK`+Vc1q1Jy&pX{7c^C1S&ojGvEb!J;PEI@jVcC`V_w4;=<kaMgdv%{)N
z+su8UQ>59nNbI)yAY0n64sXq++$(TVjaF-!eYJRpH7NJi9-}Z=Z&COs%Zao%<D@yK
z(zxA0SZ54`71`e5ui22LY7bjVE3voyr}y_i3qB>(GH)Rsf;(tH$)zy|!0_w9UbtR7
ziIM1eD=ZcHm~>pQ&)+|hRxm4nu3=d}M!G2dQ?7`Hc~2GdPYVz3hKQsP{~h1GCanc>
z2~V~__a<Pk6?YPOdVkt69k)e!5L_TTh03L#rgu|IwSpt5f2@tkdr0rg{@7G;PO_N2
zwzO8B#?jhEXa*-4OAXNukl7I}ThKG3HcM=JQ)#-YqId?`8T2XF!z774ZFbBG-o$M)
z@yVLDYroR&Dy3cwba`+|2ziHm7g2`1o8v2cT196_H@vtO|6hvehRP4OwZ0qi<KKto
z$y1^o*kS6-<QMeFec$+MG^re6OX6l|;7Im^pf~(Usdr^T{zDnCsjIV}<W!QD`UYA2
z5cfhc3)Q(<)dvnen2&b^I75@%BE{0;@fzoPZlV`)2vqyDh|+!%pX8d&PowhC`hu&A
zd~>hfn~S!qMu6OLG7tT4`=~<wT-X=xNhu>zRXez8*YsLrYwpQ@C>CRsx;CL5dEV`i
zbAW=1gNYN75#JeC-eS^XY+f@`OBG~#eHQNe0-M`G(EmO9?DbAc{U|W!2ip8(xnruN
zH+c1Nvkl>1FYW6dW7PIZJZ@BY$n&@KZ)voS1$3*aBkM6v`~4HYpH=wD{?6c+arYRP
zY@6e9r+UdD&h5`}2wTaX2yEQ-CG(U$8RN0lv&8DP0;{WqhHgttS#Ljv&sNV8A8sJB
z96#T|XGU|ejM~#=pNC#6OFvJqiPu~q!NRb{K-7Rg5nS1F*?4SyYnRr!FE|lHIU~*J
z-FblGP2~~k&0F1(t>^Y7dA6}+ta~H}u(+?qO+eZsf(?ExPQmY6VIo2-EjtNZRn!iq
z+UkxmzaG?l6r*vrpXloM6ZUaEmlno&cCW>)Fgau0&sF*zv_Wz?{+r&ZPZ#GAFL$JS
zn?kM4^*r}2-@GiGJ3>v}QgV=+w+p(yvy!7DRNbfhKFythn(~gjXY9VEYs;3J3m=EP
za)aeLl6xF>O>;e=gY_Tj>+3=1AB5JXME@XeRjPIPS<rr;>g-9E1=Ehnd0QY`vi5h+
zg3?<aXdCvL(r*-0eJyf}zXeJ^zf0-&7u&4t0Lo^q+qr^rgmn(7d_jALkrvf5lQ-mw
zd-WS<yIL!)>oxjL(gECkNMxX@j8dOaMM8TQSgY+-h=6H(hF?`=D<Aqn^jYU)u4!n;
zkSGCGL=sd&*fHYFS)c0+3K^xI9fLP-DU>*@smt6=q0yddqJ(oREs9QZe#918V_E07
z!l>SN;=Iv22KFP7vgS48d&>6GHPb9J64|k}jMN#zT$>hl>jQosTvryzvx9yY_eZw9
zejAmB{}h~ue#9$^3E?sIckQ@B;&Tq{U*Rsw{aK9Q?)QEnu+`cwv*P#tOWkKaZG{M#
z)ousYfO=~TstUO>S5`|h$C2b~ouZekGB)}CevaH5eJnq{UXr53Pm<BY%sIGP)b-jK
zxu|=LcvrW!JS3i@{@K!f_vSQ$w%50nqgzY<qbeLWU)3zFZ?rq`WH-y)tMogPDWpc9
zma7lzlY*9+Uxr>WrYg1M!km`*LwwSXRa?B2?~ACiaGK<$<>yMg?w|N!oDwIEiDrKq
z`V92c@1x@rqiKBK*(S=WipeSi8Ko&&)++HXe5YAl#4Fd4g_*y%rDx6B@Tg4ZT<f|z
zHCIU%=Q-rv*XIzS$hFJbIbM)lm;0n`7aw0*9gU4m)EQ9fYS>bE$IP-SObgn{Zc@t~
z%~`j}<(%<|o;f%X1!VT^Z)#aEzBL|RJ(C^7%jwx&tz@}gNDM{Hq?IWsFO49&Wak7@
z%*vQofz1=;^^BACSm}UU{8RLtzj<fR6W7>}Eot3eHZ=829xhj>Wik6Yv2HtKN#`Jq
zY}y<YThHy;jmFvT*;>vvqu=g5=F)awaqQ}1<H)>_NOaB?YrE$Rf99c$Xg3dOhL-ct
z#<ZP>Wm@ap^?bkUq20dcFspUYf4{m>e~S-sRl*g&zaGE)b9#1C(1&jwo~Qk@!^mT=
zc`zDb-Tv9icb`trQtJC7SQoel;HV_ma_x7>x9>EV=WidoXNS?6d#)H|z3=~59UN2U
zsAjaZwa(4U!)VNTNHcmm7kP}eaSl%EoNnKE@rgfhgqw8-({jIZpcp-OE6v0Nbv`?y
zcip<B>06z6+EFq4<i3si1T{0A^s1xg_v3r=jCJ-{#`)wq&>&B(w>u-0lT!WCE=qDJ
zswU1tp-LOi)!2=BT(=i5pNlbgT1fe<r@lSKI=VG|dKNC*kj+pb9kuh0hH*QxN=|4{
z`5d<<<6)-?wfx!EW4L5qWRD|=oF15M38%S9U<?x}9Jl%^X3j2W?Y0`VXMYrV=NCiB
z_hZdr1nqw8nR#QP)$6ggJBIZ}Jn3WH>eYZXgW25)Sh|0e-8bWLA5OL5d8T7%Na?s0
zdjiL;@GrT0WnW8gF0wbK3^LDM?jx!wD?s)>nQF`4Bvu7RaDCcm+>W~%$NKrzgv5L`
zCCgvMb7RJ`{8ebh_lL7&#FXWF)$-O-2UXSF>rSqjm35@tk*nHS?jBR!4B1dce&4rX
z5p-@5-v$4vJ!bE*w;4gO|M?~;^J+l<!RbbL7=BpYy%C@MkEwkMs)gY#&&6~EAu)Yp
z!Ssg}rtCug(<G)x=vPu(7>p^3{~gU{Cc+wxG>W-K{T)@0a2<^^>fc6t=jaj98PB2j
zQ|Zto?bp>AN}jhu<sPq#-`6^W*QHoPCBCBO?Dq7}CwMAa{2(BpnW`nL=I%JOULAJT
zH{~5mfR1W+81|PNRrad1H9pr1e8!r+-8VHQpEQ^{%?__0O=(Kf@)&0Qel1qzUO%w<
z;S^Tv#A|tZ48t)DVY^3Tw49jzYW&x0cJul*p4YF5D*YO-=-2k-wU24npSQ6XY36p%
zRwr+S+_J((pF02Xx*Pi&$o3xwuec?G6M$Mj>Ya$h!j;xjr(LeCbWmEHT3Bi=F*Mka
zfw4ZJoLzeqT=_)HwDYju$zP5v4SX-KEzeh|ZlRSN)^J#ZD)UTM|IvJ{|LHIJqjqhc
zw;!XAiL#W>19FWMGp^SFbB-5_jU(@UHP!@06Ea$?kye*V3nuJy)k&+O%(~1twW6oE
zL^$OM!!;Gk71Hzfr|j9ro+OT~Vy~BUxs(W2f3F2?>(9{QZH=+k{%+A=oj7yNvi(o=
z<h`)wYAa*jA;&k))j6?>lu^q`USvyfhU;2Ko{1yMS&l45*|ujRbcTwxcR!WKx9Q}*
zC}btiu!Ff)?<LQlU23vcfbWGJk-fpc<2`l8O1r#R8TPH|(sS^GOWGaG8kc0Bogi2W
zzJ-ERG}a?LjUCe&#Efoh*#URB2EHQ;Cz-z)+|9LO?Pk--6LG&M$Fhxk9LV!(mN`|q
zTFFChjPX{ldHb`c$M7@d<$6#_cf5^td8?=OdCikLH%c8JwHxXENY~MR*^{f`8S(Et
zZB+K<>Bqiuc?!9;G36(JTlQvu)?*vA-@mm>AB0V*qjq$qJawpQ2wu(ih4eH`dMqoF
zUb&V-ytE|Pxx2C%A|dAld*^8L)&*i3A}#q(FlHAyHV`|)ck<!bG|rUL7G2U@>iIn?
z@{AkNQu?2}R+(AeWRx>tRPCaZ#q<oesDstQVy}1N`W7?35&p8<7pH%W_+-yMV1?G$
z9<dVp{behz1{UaLZ&ouNwAXJW#l1eQ<lYFZ;D&02$Q&NzVZ?CkJjSCDAv^k%N9)}_
zvgKpzc&3-}>O_?^1HF@HBQkVk?Wejbg3lASJd^a5$lCV#ThDH6_3QTHANI7KNty4p
z97F@4nzW1k&P38%bmcBN<@mJ1SFUl8C!`g6L^Q*FQs^OcmvkSYBcu4%VX&-W>L&D3
z23pErpQ3$Dfidmt_M-hqft~%@ZyVaQv~Tm*nwlfMsay9n26~Yj>X|^YHtT3v8dKgj
z)k?&kRjT1@$7e?4V@mG#7iDW|&rq`NF`{JMx~1fAf`;r_ychp_R4lz=%@w}cI(xy)
zYpCXv{UtMP*HPE~&ZBub@*0AuUe5%p;1yM^M<~zJ8mm_y>d&;+P=BVCh59qEBRGN^
z)p=^nM%=Aix7;PenBi<KC3~DLX-j0HRi1sWmVMUz7;Dj9@172o+|){G$q}!M)}OW9
zynne)RJS|I&6=(wZq}_^ZoV7b)C%>wGEi!14P}p)u4$W##GBlytvwIAQ=jq5+hF(X
zW%fJH<?X(G9!oc~m)0Xk+Evr$Y5Ad;-<g8``^G2lWrzNvYOe3M+!IxQx!B-3(gR~|
zGbjG9vER17TYN1sSo1Y2D6AM$HzC$iOiqQR%tELydVf1HKX=pViN>C*F(B%~uW&<<
z?ocZ4<ZxZbt?T)TCZaKL)r#oMv^AxKrJ^=Qp@xg6U)Ms3-4u0cwTfBg9V-2EMBs!4
zf*LwkWjuHq3o)T?H5Y6}9JEC;?NNDE(r-SCYdvI5@4b7r$Ch;-)}9WgRQ)w{@U7s1
z_7;%?wweXMt(jB@b?!p<w!ss2l<nEHx*~hruI=|1U1iI1XGQ6A*87)g3#S}szk-j9
z>rROEZATZ29((<OhzuH1cW_k#$@Q&5x$dB~H);^7S^gmQa6tKW#fHyvogHm6{JHul
zy3cxr`ti43slW>5y<Wl@U9Bt6Z^XV3X4KxjvB&p%tmAy&?_ctrS%?QzC!poCsv5T0
z1eJ!C5^Jq7|65v0$7<h!d~sW|cCTr*ZmVWb)k0M|M~t@bYnZNf=)SQY&ZS4dCJQ%k
zPLG-6;X&{n?HvvBeEQb&%jaXSYhzow)WR+OR~;jOqi?5Sr6NZ|)>F@@Le%qV=^*TL
zN5nonEM%_Cr#>=Le?7dc79mgdQw8w0_;~xoI%)tuRgJ7;$tPoVIgJlC+=yhWKy>}X
zsC8*h{*(;0yi<3ZUao&>4F$^aOri0-bSr&5vvxfMtH(V(%96{QVSJlrKc{VZcHEkb
zVaTGC(o){b)YJMk7Odx&v3@OkCA8MAwDq1XOhz&HRzL4k8dG9DkI{(7A-0)W8>bzI
zI*!+l!<1AgKIXJp+QyQfJ|EE9FgRVVFwMSZHI311<v0(z_P_8cE#K3O#Ci!ky6(ry
z+jlt*)v2^Zb7R%<TB|4L^JXO1=R>xx9ii(8n<KD1{!x05a5xIjcpQ`D5f;aw&Dff4
zy)HFuY+vT!$fjJ4XJ8VqZuOC+U`6_0PQ5$)T20u3G(%5Ee5F;Jq1^VZTgNCj2dAdo
zR-ck`a~bs(q!Hz|`pr<T^%b=}A4}T^LQ)G!Yh#Yq=k`v%9pmE&f^d2+q#pVAxs%$)
zw|G%6EAKe3Z!J1Xw<FMMe0^qVgzw(HFh{YShgIY1(={Vp$u8K>G4{q|iJXU(viZuS
zY+~K!qoFab$KVOyEel)o^qfdcyQlhh)IJ;NBWrOk)+3ES7w!=)J$H<G-8y%Kd5vI%
zT31^SzvXXg2|3qm)leL}jpSxD+Ni(BnbWP&Xme0J=16u&qmBA|oFlS48uJJ&k3TQx
zqtWLfdF*)&7>zv-X(s+Ul247j$q{I^pZ;da0<xx9?#bG!y_Icd>_#8@h~E8P=4-zy
zSYkGUKZY>F$D=vvn3qQ(*8KeH^luAC*=_g6M(wnu68pmb+>L=)YoJ>0lg0C^46fs<
zCZA^o>iQ(L^1YRZ(%W1q?#%bf!#fd`Q!S!mUe`U(U3=IX@!YisD&x#vXPZ=GXU^Jr
z3{+N_p+kGBr=AmSv<soFkFEJ)`k<L@E>m)JT|pkp=3Z~fVM)U>n`d|ZUT?gA&BZN9
zGZts7@5m->^_#H-M`rhQlx}JD(~u9>3%BO*EUUzSiTW^O9Pw+&#cX|B?HJ*xwVjc^
zW4YZ(CXYe0e>`6rM);f$*|;6y>Ij=7usr@zo{w-i3a_;$UPVujkWckO3%veZ-;k<3
zS)4%oBqW(^Aa^%=O?16?iB(%pr)WPD5WKUgJo}Qnu(WI4Yudh7wZGSjoe<td!VZFR
z?9YmIVZ7OTk5&Eb(Q;q1*1YlwiTk@gz+4nL?%hgyu6xV7!D;Wd<R;;o=3@(Fi-S&k
zU+;NPo*qK(y*v+t`Q2x8blKl&H3wsV*UlV_Ho`iOK6~*1n2f3|$l4y4XROj*e_O+C
zIT($w-P5r5^<@NqzqiMjm&4I`^N>9DSXM@3jv;ugec2w3v)|ie?8(b$guT9ozpvw?
z5%zm~j6J;@jj-3Z_1ZULm#{o;>Cf!1obO#*azG%n+me%j_{lGp{S?%cJ_~P5j*Sm5
z{Vwg8F(=8iqe^>}i3L83?-&P9s@+nhKV8G|O%X(H-21UTe)-f>V3VICp^C(>gw6V1
z{PIrwOfO<TnNJS>EHJtoKg@<GgUCV}m1lTOoAoV^jFmYsrxw?cL}xrZvmnagCU<4e
zo}VaAbR&A@DaX$PlX4fkqMG`q0;(1IoSWu!^B?<+p|8JTr`#u(`;C9GKqQi4H=OZ@
zMkN)w*F!t~buLj6TzRMcXU*9|_OvT{`Xpxh)e<W~^OCRYJ)Wj4knt|GrZ>-D^>@0J
zLA;^*#Wzr%=NiM+t#iR;G*+Jr&b{Lom(OP<9xt^)?ZE)-85OA-?VuO`XfF))*Zs9O
zA1T&73fwa2`iORba!0pXF<xT1j*@jEVC(s;J`;c}m=Da3Iz`_7R_Z1ag?7^FcF3IM
zpTB<Qk@XdO;3ppB&S$h3Inl`Qu#_c@BrfXwIBTb52inIiPP50+5EzB;*E`37Y}_<r
zInG{$UACL4VwBHIr%G}4^mj{rl1TXK=|9I0yHND*-%tM@@7gF$-~RN((`nuI@0NF4
zZGTd<{7KdC&ElIkcVT?5XsH_^gokd7*K6I~>(BXS3!@VE?^PIGuim{_y?eQO$Mf!i
zvo*%G0^=8U+I>{C`|VCURgyKkKku~rF9p1ps@Lmx<@<jqTK>3tUB3IT@y*tJugB9@
zQzE$2r{7ZhJzgm6fLhiO_&bZIeH6Ayc1Km)(yx-!mOdGqBb$WI@=DeRea`1>$QH<7
z_VQ-i549_8Jf5R(PoGV;oYBTule4Wd;rgDfHQkY!-rWhkc6(WOuYG-!N8U2gYYRVA
zuVNIP^xyAM+BYE9GSaSz?_ocRHuw5En%$qlc!a(AdyI0<BZy^N_wR9f1gF=>@M_r_
zL8@CD#+H<fpl$VQqyJl><vOXTsBx|J(%x;oN4HhiBcAwXi5rN?=yyM2LZVm28sEfw
z*4>GBh)jtN_E&jIh-2L@TT8o3ZAX{uxyc9jY}t&)B<v9{vZc9N<1y-Aw>FF(-Xlo8
zKCMJB`|GP8KJ)L*PTc$RkO9^M$><&}E!Pm*_l9@tGM-i>N8I-~ejM$uJy-2B#PgJ^
z%+bK3^mB~nTd?s_@_5LoBvH>2BU0_%AlW;)qS`e5;V@%u_f8o&Ps^+)Nh{8}>G^5I
z$zD}G;<1HE-T~z}o%xh^J28r8>2Y`xD^JTTeSY3=B5KrGDL9ri$lDyb=Q3>wIkQe<
z@O%ZbF6;<g=4oV>iCIdQXWwS>HD!E^Po~4UZ6t-=I^0F1d0B>#r&&BCW$KSMlZjz7
zsRopIaZZe#3S?jAIOB-xva+_eSWvXY^>=6}D_wso&T&hSG9=gi&3)}|Aj{NUKlJ97
zrE>gs{e3+;&#&}N>u<(-{mX&Pn~NP#<Uzdo@G__0?klVPT#S7+JOp?6muHZl%?&8f
zvyO(^*_9MLGP8caa#r8fO&~L~swLsbytaC3W_$d^>-MSAV%$ch{hlK)*Y9P&xsB}z
z?sm`ChuTiplta6HQ;p&(DqG6Xyf#T2)t7QzB6Yj00hO?zW?es&O(n+qeRySTjcc<d
z1{tAw)Lgse6JmQfsQcTo6}-m=wUEo|q;iyf8<O)oB8$CVrH1AAz3jNv^`z(#EPB04
zEb{v~EP50@g3o?`VOGmxLYIwAx~;#-x#Tx9+PgL0NYA$VS%Z6+j$ros7+!CFBY3?&
z+g6~*onyA3UNe&IC~u+AC-VR8T3kI=+6tbvZM|32<@<C>+fwFnZk<+woPz2+kqpm^
zrNXSZi5*<t&*eHlktO`)b}X#Q$B}2eQ1#oZ+SXJ^X&mQ<TRlsib(>j@E$M#*m-QN^
zX<gz{x0%DJ<@*t=_Ij6?x!oL2rBofkrr%F^aC<{}+fKrjCF^Nh+osPwLGT=v1raxA
z{~61-*MDSL_WIgl)zXo;jbLx}Gu$n@j^J+fGu(ZSjG*uLZmsUyVPW#gaHZ{2<btIl
zw^T*7TnX$|^UAuntzTWMyAt`t&49=Au)K<V>oSJJo_dW9I|?*xr&hYKmg}8nM6X~6
zu2{`_E?EsB{!)~sEL_=TIj^+sYba#4SmAq@l)yXcmaskRi;ZWFDQ{!D+x97KiK#Yc
zOX^v8A22kecJufUUh}YoZ%;C0E7}>(SctaQNDJB?)~+6IBWS%ottQ<F`JmqMMbH?D
zOi!gM2C~Z9tfZPd8+|`B@rZ6U<CSU*d4fU}P3lTWo%UE5_I}Qg*c_3<UN7<WYQ!N_
z8Ms;4804M#SEKsGxA_hGUbuPqYD6tPscmyu_Z@M>?Rs1wUcw4eW2IW=wvMV=K4=AR
zeHOv}kWg2P)Dr!t_C|f)cE!~`J|}}zy$PO~N3wFNOUbsi_g8}(mPQiP!jkopgkbTK
zR~}zd(n?Va%Xl%rHq%QA9+911FUyWrpiNbzLaV`LpB|R9^on&|i+UFFgT{SS$cxTN
ztvNW7$I%>GIo+ptj}Bx1F~UNesP7+!`{NT7RHm%`b^m;VhO~eEEjD0Y|Lfi(s@JVs
z8sA(r)LEK!*l`J(=sk7z@0Lz%v?@eoeTqELHr1N4)m{YPR%5=orTDWI&BKG#_teUa
z<7M&I-^_dO8DCt=nDHL*sn^H;xHqE_yj~x}o1g7ylzB)VyU)4NIQ?F&G-s5|%JKFp
z9(yENoxl&W62wk1R-jnn%ZON22dyIJO~6^HS?`*&w=fpvE||RAS1W7VP#o3cyI6H6
zUbp8$2U+9s+6!?Ho(@|mO$TRrK&{P^{biPdK5Hh*Qiz~<PtK6Kt9^OccRu5rI=a*P
z8rXRquN^V(86-CVe`sy%KpX+ZdCH!u$UJxZ(ZUnii}&K2q=cU*vCeOVoldrBuOsoF
zqL?*Zs1PYbQ@#%_NF^GbweoTFQm@{T>1gjN9LO26Bez_2?s1BduSGlWX&|y;^^Fxm
zUj2SqtISW8*=798h}u^yzWTmK<WJF){%TIMdp|{y{vFd>QF;wK<)Y6C>k0F3eSB&L
zci*(~J@yqN2=XCoU6TLa+TG|~bff61hB~rqb?eriwbUso{dBiv&q8u+s=Q`QTjx0A
zmRgq`?LTZI*b(Fr)kpnXK9IN8XWDF=*7*tATkc<z<&y=}{t>m9+lRduJJtA%wW4k>
zu9ldtPjfkDN=*0UZ7wdtUiVKSj(E0*sbh;-i5`zNH|JJP?D@-+0q8h&F+W4yl4D<l
z@5X-Tz2m&g^CIkDTAvzCXc>hQ$$S$YmEQ6^%B<yO%4nd4PsOp851o4;Gbi4l&TC)k
zCx22e^jvgC<?a$mIA#C~R%bq5AU_VD#5crP^=XxFpPZ1`JCWd#*81lC`ZMvFGyY@#
za8CzIOH$KstdHA$rJHr!xu<*Ig{IDFz_ZgN)fndIJQ{f(Qme%`LUI*xBd^$NRvr~u
zqRsWw2^GN-nc^dmt$U#deu6Cfg0=sRy;zS!KlPM$;>NNzmQg#tqRc`1x{lR=N9dC)
zp3X6h{gy>=%uAH${J;@*IWlk@u``O+9=xwhmPXbI40wgDQGQeI-5?SN7PP^Vm3dLm
zW@Qyp&yK({nm&eMysiaSSW89!cvyCl5IcVv7K<^lh1{8>lSW{V<syd>rXR<9awkqW
z@Y(uAT<X8AJ2R((={~(VXuePlu6vzB@w3;gOS?|Cr)NHhJDC+|rr^fz8SSa#+?DcH
z$qKdys|sXSTOVKA)tfOV<#KiO?)lgCR6KO<-iDv@9ICb^=a^sOBMN{8bcPp5gtF3m
zF@MqUSJQN}G{TuYW2SuA^6ry*tPmhoeJ-r2iTpszUTdD9u6np~R%$4ZqJ8p7`KB`S
zS_WhvpqKU&b5@ddI(vUI`5JTlqcU@DkC0|SyOg&!`mZJLdUqCM&ocwXIg-}@n1^<}
zXfO7-8cGW?D#iHL0IhHw?F|h@&!hcopA2{A$965ZFDY5CorhS~<a$t#;fFlAn)&q5
z)|I?1h@<?s*Kg#jdwm?!*Oe#L=tl5*eGIRbh!Lc^wPB3-ID$Ir?{Q{$G8$_JhQ}L8
z)M%_x|2ERP6_(Fy!96L!LfUI(EI?G^e)cWzgnd;k<M!0Pp3O>fAG19>o%pGSr96rZ
zP*1qVTa4}W43xS$!>V%++ja%I-|F~kbPvu*PI`S>*=W6ANsk_kV-)Q{5H-tjEKMnW
z+9QLl9@)YfI3rrkz-VcA<B4zR%fpslr3PEC6!R*M<y+#}_F0fRed8Pnt7+YHoW9;U
z(4#(BU0WhpGAZI)pb)1LgJGqhdKnWsx+1RvH|i9ELX=OO#{MaOxXYpcH28APdX7^G
zmARA^nDSYPV5a#g@3^z%4n*L>!E?`Dtctmnm*^Zr?qujug!y9Ecm^4HjA_At#>^cs
z#M<i>`8^Ajv%bDilzBqsr?FSZVcL4J?_oarX(O)fk!!honlWAs*<_twYxuJx`uWH$
z&U2s4@9UVwXk>9_;j~t#wb-+;#+G{)k|e69OUg&CUfKh8Vf9)eAtSrq>o=lmug_5m
zV&SMxU}2t>p3cE6^|VhnG~?OtRVumOvv4D-kNP|E?Qv%WyVvI^N4KJjWBRZKMO-Us
zfQ=tpde@UPznqhj8Qm$dnS(mw!*Ph_df9W1GDmQkgLqV8dQx{xT6z##N!gOAqdeY%
zbA*yxFk0HZ9Z^iVQ@=M?qNo-kpVfUcYI7`{Ic6E*mhHSFj=G+9g*XNzHv24UgW6+6
zAL@r%9aANcogi8pR)tdgS7`r2^Mr09Ki1rcj#aC~C-kCbTJDXk7?Jhux(?i{p)jkD
z;|IM}e9iiZZY@wv)Vq~TU*!SJixp7S+f9+Y@4Y`3HA7WRnVV{`s;vTD=Uf$y``m?A
zD`?GXlBns?Bnec1nI{<qZTxMyhM;vG)jf&tU8h}Bk~ITpTdt<4N^YpR5|MFx3m2aE
z<W#wk&cKzj;yg&V;b|-?+DMdE8@%GAT7zy#(fN>)(!M#x>$%XI`ZudpTAM<Gf!wY&
z?PV6V9z9K*G7Cx8Yuy_CxgPUDSL@Rp#47)GR>rX&qqgx+n`_h=#*wkeGIZv^`N?n3
z$fvfRc+u{_S>v`%>ye$Ghh(q4?y<*%qoeP^YQ0UH?;OEx?6r?TlMa;n?e!X@T{p+|
ztqiL)y?!&Ez6Wtc^IjkGwui?EUa!wNyz1d~oJTz<efwk|c}`_<Eg4&|MzouS)6(<C
zvgWR6re06%do$e*!_H8m7G#tC5It%UpXJK3cf#U@iEvcst9Kp98{LXtzWaw8M&-M-
zVmpta_ZQ$xwI`W)fmQb!-poAGOA0snXZz_{T6oR*lfVZmKp(|L<?06eP1sSy-f+cB
z_38PH^Rl8$%uqtrDy?>+F$ysqlEw2KRfE;ZIz?gFN}?I~c<sqKz3UMl;%$l7%KgaN
zr;<@hTSInym|0nkA9Jtk%sqVTD7N;<#LC1oGnjAJd3&R>4oi$n{N>8CXQ<IsMfNTh
zM~LVFdt;Dn+G($YC64)PUx3>)wshS)9@ag$6%EVH32J&J#o5{7y&*(Jidzl2#00M1
zjj=fwkUJP8hp#LU_pnks!!5Z<bPSdFF6FVdK{e04cczxf{fx$3c6^>%_-@Py8k-78
zxAHVeyY<t%Pv$gK@NX^F#}M?NdGZRWX!mBZTXG8<-)08S*q5uDnAu^r*DKdYkSJsa
zi-C6LZX$9e?mAZsMf${!HBI+Nv0Nf&C7dHrM70ltLdslqOM!F<Zs_EKrAVW2R}fj7
zGZuZT+(+5Ab{$EVgr(%49eK=9_RHCON=6&Wttmhz@hD_B;c%ze=w`ARD2fie+hltM
zx6TfFo>N)CvD3soIHRbc*QbpTTAJ4SbUpad?pGeubOwrOT6_Kec*yYFN(^!G+}Nx!
zu)d%ZS?nRh%6yk2^<v;-<Mkl4)~2Tg$HqBE!M_w%wGZ062}0SF@~OWRcC$2N6}2Bz
zgSF3xKYMA{xF2=(S=NXZcyQZmWBf*|Z!=mwvS2eXo_$V=@A_zE6-JoWHpDp1NW=*8
z3=EGq<Htth&A{+@^ZGa%bsmz(?s=urD7`+dNBqsg`>lQEW!CGsXPy17cc-7956|SU
ziYJ|e5Xo+5#Kf{hNJL{jYIqF=Z_!2u*}Lzh$5Fuuf+K=*-u<!W{FzRR>X{v*v5!F1
z6E$Waj_u@lt|PfVVk1U4kH#AHZ}sVeMbex*=W5QJmN>_dv}S$7=R~wd1n+vM`B*8D
zmg<#POr(*z=S?|(nIDpI5)YzF%0=>2AnSNK;Y}WOdpU(cCbWlNdD?~8tUc@E^{LDN
zFQOeclDrsyKYsG+li2mbxb>={>P)KUkV%10+5cJvfu|+y<y5_yJcwMhXD`MYe*~Je
ze<WdZdRoR$Sb-5#VlSwju~{u^TND7Bk&chXetMl#%yNX*qcM-b8tXif9Da#<BRZvu
zhpLv;K9Fctv8V`3OSArC-^L0jb-QwHI4fvg9p2KgJ(=GcpNjIil7Aeg<o^iekL!Z;
z0*yEaKXl|A4Joy8_VxKV>bX`&={VBj<MbNo*l~z;^gCyvMpzu7Q>*E>mWnF7Bjjh%
zb5-;7pZiuhFQ?rce50zgZUJUh&0biZ9B=2Ecu%A8=UVC6(`Vgys&Su2hv(o(Z;x~H
zi1wllv)EjX=Uk$te@hrCVm=R}|C=;(jz=S%oP*M8<5sNQ_rJM!Ej2bjW2H+sVi564
z@6b`_h|+wb&g|{mGPYt|w3|49RV($B)gT|ma<J;jSzcKI_K&fTn)l`Yy*<re<A1LA
zo`WOJpX1hdr|o)P<X;;LJ<ag1jfJ0=`ParnPv@Mq*)v(h+>E{}%ks|YUqd&wPY(~Q
z{g!(=OBU)iKr&^o0BT2Mnf+ryuq<n>e_ZXT%^NmkMS5AdtO++=_F@Ou42TH!Y>1u&
z=DB`*b_Os9M>b^6-W;_db5O~B{e0TF9^V}vdNMBZpeKQ`rxridx8pN<GY4s;H*-+-
zJaT5c+8e@?)4a0)iF6GKouWddh*>+bo<^GcqxI=IuIC(q=6tra99!CSM4~c>J%&v_
zv3X82XQXQm(nz}Ipg8+GGV9UEM_|oKH~HS<(_c!u`=gyJ-AABFx{uKBJQ+WR)75wi
zInN>2p1_9<ANrJ;k@O>YjHK=etiL^}e|Pao+LK09^YvoAb2qGHf;qbGLEA0+z88t~
zA@zAUYrEHY^`S|+kMQZcm+s>u;3=-2cnW);`sYH_&XObCnb9y+;%fgt(xhG=Ys?Yu
zjm9|w%i|xR&uIK3uv$Mwt%7w{)hehkD&k@-T%XnF0DDw*-Q(BM!#h&*ESv4^TD$sk
zr_*@OigY%xPvNcpTJ<mQ3$3AvUh`fU`OMnv=b<mk$YkYQ-SzEvyr)gQLuU)uJqy>P
z^w^U1dX@fo&4s>=o6*T5a`)ZK@Opo~PpEP?9r<><f7v^KIW?%&Y-JR=j~!a6(#IXJ
z+`;&VfF+*2ReX|FKJ7OkL!pQEl5qM!_cfwrMEqXo123H^?cu`Sajmuce!cn(Dc@-f
zPPDRCKz6hzQSB&Wd20JOcWL*&=C16d>6Ra%YLA6+UGr#P^VcVkd8P~2M^6IDn(W^A
zl3>k{-3;f$Xtk=P+a4xJm-fmZ>!)h6Zr!&OAEl(Jpqld0-l-WgHe(jwk-eCOQ~O)$
zYt##Ra~zF0rjo~+mCVtIvv53aa$*EITe`1jr&AZ(nlOSq3#T4;MtkN)o`K}CN7iRF
z;;6sJ+0*UO7<+vUzvuDKk?>hKZ4BA&hfE0@dzfr1&!V&K?C@%BAvw#R<F~anH<l`S
zZw{OvqWX<bD0hgJ{L3f~&t-p|Ck@#}gw4@;F5*f2h4;+K3j+`DuG{cAJqVV>!>ZpC
zP21balM`L|bR>{<`*HeCs`*+Q;5;Z%Lq;U*fg_&K(+GT@#Gd!>(WWOSV~)*2+Kv?9
zBeyNJd~DC^_eLA(O|MTYw>N@@wG{MtK%B3et>HgB;(lpfi?hA4Brn>}A->VRd`izz
z?v;3+$F&gzaqGF5+0}|FTNQ%84IYxeZpHqN4RyzO8ylL3oJC!GuI)Z;en~zk8-RZL
zR(qe~)5@Fmn=^pUD(a`^N_RCM<>UQ`R#?MLB+zF)Tgi1UAc#86MT|)Q`X-xoq@fnv
z&$y;aj*aHF&$1x%A!8!SQl6~;z`|msMNJ&O4s3W=-Uq4E%fQkcsS#pHp^LIKQB_pX
zSxYi{s8EhupBQHRZx>4n_GmAhZ~HN>DwNRoew+<A$9lTHXLHw--O4b=Hg^_Msl{;N
z%g|;dQM*f#Jx)raF+L^M`wl*HlG8VDm~K4l723`2R8%|GQ2(~92=@7-GpI81J3U(N
z)7ep+DLfj%?OJcvMqz91Jzx4}A(hgXeg5B(KvRF7OOmvn-59~>^|7=Zm$T7m$05#0
z;Bly9OL!cnq_WrVxGl>ScAt3f!ENs=@3-RSf_xIgXg6mM#yNa#IY%TceO+hJj$61#
z&J`y4<cx_Gdl1>+H|i+2g-UOEULu0b{@}&6=*^iy-GonW#GNGe^}d}@&+DbH?k%CU
z?`nB3T9f5zR~491SHtr=PDCRWZQ$dxtuR$|Mvb<fi6ar{z&^~}ZC%bmv7w;1wcwI6
z+7Bw6j?f<L{nTPdCD2j#Pw<K2kq=^y;HsG`_f1-79H$JZ%v&9|dVQm$vZF8WW<?^1
z!4&;&$Dr`G^-m?_vEG-hOFu(IvmIUJoWWtFVLh8W(y(41+vyyA1SMOx+SyXB)hf7k
zUS2p4OH?oUaMXTM^)LJT`8r4tu|0fDN_-d4=Vv=3FZ0kw{GW&Pbh4#*q~yT}v$Aa~
zn|KaaDf_;Hd;NWO4U6kcnLC=WSIS7SVF_oQ?Z68xxa`=yux;vfH>?l$dnvn2KV-`Y
zoCnK_n{E+eS0V4oQ(5Q6|GEN)g|BODb#L^1-Mh@$kzAfeO~p<bY3<+k@<h-4JPqFK
zU0O={jjd?hx(MyI?Wyjc=X>Rc%Ivr$qh|-#+B~wqsrzH8WY(<6S|6TWbo8ua_TOFZ
z)<%l?y%7{fVzrl*CuV14)%s9N6W<W;`00S+CQ%ssfhApUEl^cm)-DCbJw!b9a{-y7
zzw2Y-7)pCE&=~14F-3VJ*F|LaJe`D@De}RV(bntMb$flQrxsdI`xw;m5)@<4Ggw0}
z)!*xxX=kuwK`?54XKyTW^qM~7cw`Qa^v@L#{2yn~q&0eXy?Xaz_3q{B9jCDA$-HV!
znw@1UUFXiTg`}DGt-vg;`n~7Z3g*Tc*_JsdwmUtXM<ew5w7&K2kV;OKY1O*tU5Vqx
z39_#;W3g^ugpDkrTtut7?yQ`pyd$FAXQJGqgwWoqMfRa=q4tOVG;=K360Mtv%H$7d
zvaFTt2V-jgl<t_2#n7soE#0jppUYebI9Rlq)fwzjnP+nL5-Q@Yux|Kq(Hu;P5x`aU
zr@TS0o~=#-DnG0-sq5tAPA#l5b7cO`@f7iZozHvdJ9g!L9<wNU)srgU*vWjo&+lQ(
zH}CS#*+bzkgO_^JHMuFP24!2V8%Uy{wc<BD9rq&cB>!{RCFhTp!0nlce!Wc9eQVk6
zNgkOv-oX3;=UybBRRia(wFcBHC0<$4e=y+{aN9j(+fr(neIHcM>%6FM45N(w>ej?>
zzU8m}hWqZN%dMAb*Jii+j_lu7zt#q}o^7k|*pqGb6rD<YR8v7UzusRwc*;QCtM<?>
z?Rx!2bnEr8AL`>jg4pjh!-sy)F&Fy%N?9#iNK&uuW+X3kW1^PgJ^MJKPp{7mbxKaH
zZ;l(&Xs>rkDOUA3NqTRg57PKtSi-CEDR(sCO`%_Yj?bWNtJ|%fl{gT2m!5Ct?%4hQ
znuTlVrGMkTV4{5HfF(ljX77%juchyeIFgCIzDH%l*7lf8xR<C{QhF_GwS8*&*h)gH
zH+%3$wA$-y%T=~%F+4It+q>n5v+suy+fXAX=5hRK4?+E=zMWnfd#{fpkabiE1n^m}
zid>xj@kzd%87}#!@sQLLd$t(1GbEEQqgh&PM?u>$7h@qU>QCfN1gISsidTV3r0m^m
zcjLWU)iIMGwU}z`enixp?N}#zy`&SpZ>|SD6)l28&!6ivRkq}Fda>l%9`)Pg+Mah!
zj3R;_oRReR`dF{_X)uDk-@B(*z4*Mphe^Au*7e`D?W*%Ds!3mleDW8$(@q{&$JY9T
zRxtL~a{!!S^!IxveBtn3NY0gIEs}b*{1PK5Q_Iup%3{fijOV^Z>2VLJxjyQ7de@oi
zUuvV;S8X+(f0FNid3ruD{4BIuyVA7lNAtN6pRHGVsmn8`H5bUNm=P5~C`z_pK54E#
zv6WV@tVTemi@-&^!-71BaW3LhW&ByCfVaKx%g_8&HB|xO$DU<b&*%JIFtd<kfnHqr
z*jjK!Xlq!+X+3G!w^ThF=9mgAwjSmBrG1wbRE!0G^Ui(O^{>aX0l>-fXB*ZVar?8Z
z=g-6$z4?!<RIiWi-`wm+Bg{eZn5NeVs@u6=QfkyQTedd1jpFC9AA8z4IFfwpYERmZ
z$TNA%9xQ4YdYW~MUD{yTr)?RnzhTTVw2>#@hcM#ses4?69%V)&?Dd_Is=fYWS=#F@
z3Bq>CPReK0S*(4k_O@cX)Yfq4^4onXk7u#pU-Q^&vyLM7+iHF7Y2<Ds6MN&&$i!a%
zr=#XtCR+aYya3igw-MOZ{xy7%#~xAN?OICT2>GrfE}}Z(R#q!m^;qwg*gCra9IfQk
z`7LxI=IloxTk$Bd0poK5N&Df-wFq>vcQ)zW%ZQJstg(9U^=skAs<HBM)`wLGA}R&L
z^X5!+Q?F!`T?=zzT|OOeYZVN-eYU{ydWvIo=Mk*_5c?9*k|X4(iU7T~v^4_ozK#Cu
ze&hs&pP=O&94;u!CI+WsqPrHD$)`))Zj7iY=*|YMX6e~m<ny|vPWx}@Pj0|282UqD
z&I{a*PlSPHqSjt}gEvI%>~U#1>@|-Mq78T<A>OkiI%x*l9iu8i-XE`ZBIXHf;h=LQ
zWDY6s*Bg1?is&yc=jFThfC-P7B_}`3se0u4j6SWh&hgphP7dbo`SCwzK_*jXN87mV
z<t*pTccv<PE@atY)nVtXE%mUB(1@$Fj<2VD$)DA+*U@)J@K8-h(IOE;jn9l{u!Wwt
z<Yd$RQzj!Ay_uck8P-1esArHi&O(`&=rzPGEg8oRwLH(l-HOio)v6ikm>qe<`B^w~
z($JreD`VJ0D!k%yZMQP>mv6wkt>cIE6IjTS6KzbQQB>Dj&(VJ4R@hqL;9;<;x#vu$
zpn2A-{4g~wd{JqGk3<x36xuuvi0rGtQ{oZq3GCHNyI#(3-UmI7Dwio(-=tK+>(eWD
zX4v0@C3Dsaz5FZhYgjFP^J%d1y>&zcwTWN8xunAFpaZnkjvDO)IYM36WP34&FlXnA
zrKiSy9m|$-Q@3nq2|bV?#XZ2+EQmujw>=A0%m4WnX%3Dokn+~L$Fr&g`W^*5UrD(m
zvU^U|@5R+<Yd&pJmiXY$@jGK}d;W1`S$ln4OF5T5qcP8g+q3S<&$O>ryZyGTdq2xd
zYjF|!kZ>+SKI;8Ya9}%6(HbGS8_(><`Y31n{gQ>0E0ML8akO2=)3UhU%O;DU%%{x)
zl-GP37Mo1y)5}PFJ8vcWTCWNzo7tP2c9m-d7W?HD!$(iXYv=Da^=#x(e1k_#B_OxY
zqLY=@iU{*>*J3$~F1X~z&NuPCwC(Z4`D)1*XOdTg%c7sw*04M^ci;#sPTUXv;Bpjv
zqwHue&(n>cY2{PuGDF7Okk3I~Wz3mj&CMDKEp7cCM;$ZVUgXmrUOGbd%MAI;{b`!l
zt!3qVo2K|Tw9!#QsZHAvc6#&eHL^7qEm_R>+JfJ`z>)Ex8=Bxf0`_{y%|+~&VMl&h
zLnw1p(_jwodIyx^MP{x@0!hx(gXSstO7eBqMz`om)&vjv#qTkXtyybM!nTa`*6n$p
zQpwouI!HO!Ee|x#HfErdp1o|3cGZ~Yegu4<o-n&^;kh|`W_F`0@EV4tXymQ7`q@ja
zzc+42;ksYz<yyXNjXCDkR!{Lq&+CGk+f@f@1ih$1Yov<Z$cwfjwsG{t2x~met+7mu
zvG-c=dJNv9G3zym?RM;D;W^1vP;#~S9BK5}=Sz+1Dr;O#x1(^~&r;sw_y}gNPb=Lw
zf`+alZTpFF^kx`GBe!D}e)%`#Bt0E|omfC?s@&Ye(+SC(@dJ0`S2^S7m!1^)Xm#57
zUk^xzcfL(N0<E;o?zgSIKDFhRM{ICUBF>W{NxN|v!En1)`s%ycfvQ-IEW$gnT<>EA
zL3IXKhp2d$ch@>nBpzj_G4J7hR&V;*iEBL{Ucz_mpS2}+O)4(jf&iAKR1yht#{)PM
z(LJalJ#M4=Jfaaru+}b*Vtn2XNzUimDo<F~BDQo^G(rPtL0pvaucGx4zI%0vJ{89P
zuisA^P{t)&nz!d&@LRKa{RmE7{Wuq!HDAw#WBr-2O*7tahSDRQo`GTSHA{!ln6q#^
z?yNM7#+`-ZagXq8H1-i#9)C`HM<dTcX>EGzTe0NW!LfaCOId^$m&$T`M`A1Ed~$vD
z!)N||cku+&ez4K55%hWqiu>KV%(`!!-iluDMqlO0tQn}{v%aeayL&IJHoF-ak8_AX
zQ)R#sT-Qm6H@xbR)nQ^l-Vw<tZ@q}P<?Yk2V;AI4PVWacZ${Py?DFKhDp9N-xDtjB
z@Exz))ga?Q3)Ydfe*d%6FHbjPUGl>P!%u^XU&nlOHt^epr^p;QXf4Khv`=AzdtH}s
z%^n)%S$yhnS58S~R>QeTUi*Vf7|QT1Cs`Y*KYu>3#P=p$U0))@AUYtv@S4t1ntN0t
z4E82`9^)`me7biDC_WWdjMmm8=*vnEeZcl{>|oGNfY0K;s0z0A%%BCWC0o=;8Clf7
zSmfoK_{+@~oEHA+GJ^LtixWIg{$4=QDHEOH)oujpC>KSA#v|#eo{S1Ub=+W17%ylE
z2HMv_M5lTsJ46|uXO!xx;A)}hg!@T7=iC{gQz|7Fa~}!OOy2gT)s>@sBtAs$i0!m{
zBsq}LkFCXe_M%QtC)YN?6)26TIPP{thq{3Vs;7mJe6DQ>S}7Z9E>No^{(Z1SmyQ_U
zTX>J2swT#M7No(WF-ut@k5f{&uCr1bg<tTAnmQvBzpd9NWt$AIwtb>v>UI6C<ru8i
zkdrGu;q2(X#Y?(^Y=FgHPuT-#fDOo9VpsyppK=E8P|6bnsz;|)*@D9OqPf;q%NnVx
WoL9r5g9}#a+oe|1&Z@jI<o^KYERsh6


From a42b7f35c2791bb7c297da9ae72a51c23e98e4de Mon Sep 17 00:00:00 2001
From: Alessandro Coglio <coglio@kestrel.edu>
Date: Fri, 27 Aug 2021 11:28:24 -0700
Subject: [PATCH 09/23] [RFC] Update an ABNF rule fragment.

This was referring to a previous version of the rule, and presumably it is the
reason why 'true' and 'false' were accidentally re-added to the keyword rule.
---
 docs/rfc/007-type-aliases.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/rfc/007-type-aliases.md b/docs/rfc/007-type-aliases.md
index 38aa272287..5cb84bb882 100644
--- a/docs/rfc/007-type-aliases.md
+++ b/docs/rfc/007-type-aliases.md
@@ -45,7 +45,7 @@ The ABNF grammar changes as follows:
 ```
 ; modified rule:
 keyword = ...
-        / %s"true"
+        / %s"string"
         / %s"type" ; new
         / %s"u8"
         / ...

From 48d3a445a0906bc89d53931a3b2fc11a0b05e905 Mon Sep 17 00:00:00 2001
From: gluaxspeed <jonathan.t.pavlik@gmail.com>
Date: Fri, 27 Aug 2021 21:49:17 -0700
Subject: [PATCH 10/23] type inference tgc hack

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

diff --git a/test-framework/src/bin/tgc.rs b/test-framework/src/bin/tgc.rs
index 99c277d111..d92e4a0eaf 100644
--- a/test-framework/src/bin/tgc.rs
+++ b/test-framework/src/bin/tgc.rs
@@ -111,6 +111,7 @@ fn run_with_args(opt: Opt) -> Result<(), Box<dyn Error>> {
                 .unwrap_or_else(|| PathBuf::from(path));
 
             let end_of_header = text.find("*/").expect("failed to find header block in test");
+            // Do this to match test-framework ast bc of spans
             let text = &text[end_of_header + 2..];
             // Write all files into the directory.
             let (initial, imports_resolved, canonicalized, type_inferenced) = generate_asts(cwd, text)?;
@@ -148,10 +149,13 @@ fn generate_asts(path: PathBuf, text: &str) -> Result<(String, String, String, S
     ast = leo_ast_passes::Canonicalizer::do_pass(ast.into_repr())?;
     let canonicalized = ast.to_json_string()?;
 
-    let asg = Asg::new(thread_leaked_context(), &ast)?;
+    let mut ti_ast = ast.into_repr();
+    ti_ast.name = "test".to_string(); // Do this to match test-framework ast
+
+    let asg = Asg::new(thread_leaked_context(), &ti_ast)?;
 
     let type_inferenced = TypeInferencePhase::default()
-        .phase_ast(&ast.into_repr(), &asg.clone().into_repr())
+        .phase_ast(&ti_ast, &asg.clone().into_repr())
         .expect("Failed to produce type inference ast.")
         .to_json_string()?;
 
diff --git a/tests/expectations/compiler/compiler/address/branch.leo.out b/tests/expectations/compiler/compiler/address/branch.leo.out
index 39b1bdba4b..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/address/branch.leo.out
+++ b/tests/expectations/compiler/compiler/address/branch.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1024
-      num_constraints: 1536
-      at: 5afd1d58b6826912fe5cba06b60d9a7debdbad9e922b8a78ed49f7a7ca0ac65e
-      bt: db77c3470cf1b3c80c2e3b1b3ddc59d9891912489bfcf39b7f67c2f314ca7f6d
-      ct: d0993682df5b495f4a6784882e0f007dbc378adb35007d250e2c098975f4d32e
-    output:
-      - input_file: inputs/branch.in
-        output:
-          registers:
-            a:
-              type: bool
-              value: "true"
-    initial_ast: 32dcc6719d7d1214782cd1ffe02f067eec8adbf1f3820546e539887d4f1334c8
-    imports_resolved_ast: 32dcc6719d7d1214782cd1ffe02f067eec8adbf1f3820546e539887d4f1334c8
-    canonicalized_ast: 32dcc6719d7d1214782cd1ffe02f067eec8adbf1f3820546e539887d4f1334c8
-    type_inferenced_ast: 996f46f1dba11bdde037a8e033ca97870871eb89d4e3e402b59f99fcc0c35323
+outputs: []
diff --git a/tests/expectations/compiler/compiler/address/equal.leo.out b/tests/expectations/compiler/compiler/address/equal.leo.out
index 72f8327413..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/address/equal.leo.out
+++ b/tests/expectations/compiler/compiler/address/equal.leo.out
@@ -1,28 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 511
-      num_constraints: 511
-      at: 61e8ee994e9e7edc1f84fa3cbe8c421ade231189b9ddf6a9a75eeef9915c20f7
-      bt: 2194515882da93c79fa24d47c40fddc44f0284da25da7b89efb935c0ea7382f8
-      ct: a0736e8c8f3bb1c39a147348754e53dfd31fd76a1df9cd9960472841bcc531df
-    output:
-      - input_file: inputs/address1.in
-        output:
-          registers:
-            a:
-              type: bool
-              value: "true"
-      - input_file: inputs/address2.in
-        output:
-          registers:
-            a:
-              type: bool
-              value: "false"
-    initial_ast: d9d5346dff8f825d58daabb3a4fe2fcd1471a3fb3c80e46e5583c4f6cdb12b2b
-    imports_resolved_ast: d9d5346dff8f825d58daabb3a4fe2fcd1471a3fb3c80e46e5583c4f6cdb12b2b
-    canonicalized_ast: d9d5346dff8f825d58daabb3a4fe2fcd1471a3fb3c80e46e5583c4f6cdb12b2b
-    type_inferenced_ast: 32a303da117b08aebfb74f7454cd80dfe28b07fd464a61b6d6a3ce23d451f135
+outputs: []
diff --git a/tests/expectations/compiler/compiler/address/index.leo.out b/tests/expectations/compiler/compiler/address/index.leo.out
index 67a9431af8..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/address/index.leo.out
+++ b/tests/expectations/compiler/compiler/address/index.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1694
-      num_constraints: 2719
-      at: f9a9bc8304df327c7b16f088b61ac518fb3a7b6457ccc35a1ab9eab4565a1981
-      bt: 045eba0fdd405714f788492fd5914b053e0ece622e9a542270d8cfe85c0ee291
-      ct: e8fa4a33a657c70a7cecc7e9b284157b369b7ea57879948e108daf93e778551c
-    output:
-      - input_file: inputs/index.in
-        output:
-          registers:
-            a:
-              type: bool
-              value: "true"
-    initial_ast: 9961e21337ff8eed0a27fff91fc442c2530a1bfaf80da6d497a93a371896b1f8
-    imports_resolved_ast: 9961e21337ff8eed0a27fff91fc442c2530a1bfaf80da6d497a93a371896b1f8
-    canonicalized_ast: 9961e21337ff8eed0a27fff91fc442c2530a1bfaf80da6d497a93a371896b1f8
-    type_inferenced_ast: cc47000b2cf462f5cb891467cc99f2d21c44ced2198e988dc3de59f166aa1603
+outputs: []
diff --git a/tests/expectations/compiler/compiler/address/ternary.leo.out b/tests/expectations/compiler/compiler/address/ternary.leo.out
index 55dabfd5e7..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/address/ternary.leo.out
+++ b/tests/expectations/compiler/compiler/address/ternary.leo.out
@@ -1,28 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1022
-      num_constraints: 1022
-      at: 1b42ef63a212d2ea51cab07171c8fb1438112afdbd14501470c2477b9eeb4c99
-      bt: 15054154626f1ae748008fc4ed9a650c3873b608988ff31312fe4049957dfffb
-      ct: dbda9de51fe9897456cbbcc3b450ed7d66185fb6018c7a0c72414784f29b2ad4
-    output:
-      - input_file: inputs/address1.in
-        output:
-          registers:
-            a:
-              type: bool
-              value: "false"
-      - input_file: inputs/address2.in
-        output:
-          registers:
-            a:
-              type: bool
-              value: "false"
-    initial_ast: 6f8e7a94ccb702790204360959a2673abf6b53027fccaaa9feed8a4e41ee05c1
-    imports_resolved_ast: 6f8e7a94ccb702790204360959a2673abf6b53027fccaaa9feed8a4e41ee05c1
-    canonicalized_ast: 6f8e7a94ccb702790204360959a2673abf6b53027fccaaa9feed8a4e41ee05c1
-    type_inferenced_ast: 91e597663c88fbfd0c6ff787d109f5a71d5357c44d5306f7149714cda86475ae
+outputs: []
diff --git a/tests/expectations/compiler/compiler/aliases/arith.leo.out b/tests/expectations/compiler/compiler/aliases/arith.leo.out
index afd5ac5a6e..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/aliases/arith.leo.out
+++ b/tests/expectations/compiler/compiler/aliases/arith.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 130
-      num_constraints: 131
-      at: 543fa6d0af950bf301b03e1d060f09a396c2dc452933a3f54a9ef177bfda6180
-      bt: a46e57da3c684733a4f1736d56fe7952266ba68b2a23eebcb4ef933f4ebb41ff
-      ct: fd808ddd42dbcc9eb18899f0eb8a2bc1ee8e03f983ecec6daa77e2c2d9910d1e
-    output:
-      - input_file: inputs/basic.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: a4a3b4b30742544a6dae3d76794504173c1cc64f217bd3feda033ce51512a670
-    imports_resolved_ast: a4a3b4b30742544a6dae3d76794504173c1cc64f217bd3feda033ce51512a670
-    canonicalized_ast: a4a3b4b30742544a6dae3d76794504173c1cc64f217bd3feda033ce51512a670
-    type_inferenced_ast: 508686ddeb2f8fad60d9ad58639b5a761e6c5f5b61e105803eb8a98d8065a2ad
+outputs: []
diff --git a/tests/expectations/compiler/compiler/aliases/basic.leo.out b/tests/expectations/compiler/compiler/aliases/basic.leo.out
index 246cf547ed..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/aliases/basic.leo.out
+++ b/tests/expectations/compiler/compiler/aliases/basic.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 163
-      num_constraints: 165
-      at: 2e4efaa1289da67c2193ecea16201f9597166a181e5d852d41661ad4b9f67844
-      bt: bf213d7a070672f468bd4696a2165494ea56abce861fa4448817d94420ce6f78
-      ct: e674d668d6c90bd7c273e33096d7eea5a052a6e14b2b43bad69c3e1c969faf72
-    output:
-      - input_file: inputs/basic.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: d83b33119db295fa2ed7795c8e17d4073cabba5e90e9438cd53f3a9a77585f19
-    imports_resolved_ast: d83b33119db295fa2ed7795c8e17d4073cabba5e90e9438cd53f3a9a77585f19
-    canonicalized_ast: d83b33119db295fa2ed7795c8e17d4073cabba5e90e9438cd53f3a9a77585f19
-    type_inferenced_ast: 77be8ec74bc15f2a45e8bf29e7973bc0c721008fe5508dcc6d02b91aae3d84ee
+outputs: []
diff --git a/tests/expectations/compiler/compiler/aliases/duplicate_name_fail.leo.out b/tests/expectations/compiler/compiler/aliases/duplicate_name_fail.leo.out
index 4e2c598ab8..3f519cf1b5 100644
--- a/tests/expectations/compiler/compiler/aliases/duplicate_name_fail.leo.out
+++ b/tests/expectations/compiler/compiler/aliases/duplicate_name_fail.leo.out
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - "Error [EASG0373044]: a alias named \"int\" already exists in this scope\n    --> compiler-test:4:6\n     |\n   4 | type int = u8;\n     |      ^^^"
+outputs: []
diff --git a/tests/expectations/compiler/compiler/aliases/fn_return.leo.out b/tests/expectations/compiler/compiler/aliases/fn_return.leo.out
index 80aeb65553..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/aliases/fn_return.leo.out
+++ b/tests/expectations/compiler/compiler/aliases/fn_return.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: inputs/dummy.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 7feac3e33e75789d3b532a7cc857f324cd7abed380d578791803b3162edcfdec
-    imports_resolved_ast: 7feac3e33e75789d3b532a7cc857f324cd7abed380d578791803b3162edcfdec
-    canonicalized_ast: 7feac3e33e75789d3b532a7cc857f324cd7abed380d578791803b3162edcfdec
-    type_inferenced_ast: bc54ad21e90ab297b40ff570dfc379cbca61fdc9e20bd6899f4b964f726954b0
+outputs: []
diff --git a/tests/expectations/compiler/compiler/aliases/shadowing_arg.leo.out b/tests/expectations/compiler/compiler/aliases/shadowing_arg.leo.out
index e9b87ef19d..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/aliases/shadowing_arg.leo.out
+++ b/tests/expectations/compiler/compiler/aliases/shadowing_arg.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 33
-      num_constraints: 33
-      at: a06eb411f53130890e49a9f69bddb47294f83d0589b68c415747223b23dee7ed
-      bt: d3062f2cf90527cdc167b4e2c3ac10f1a8d51edcefa4991ac3d62fee0d3553cc
-      ct: ba3a1dbda7521fc175cc7ea8b04f1d61a74268d3a43a5e30c3ee86ae6ff797d0
-    output:
-      - input_file: inputs/basic.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 671704ed30a8c68ebffe2a58ff4799f626badf975d2d0dded3b06f5264e5c0db
-    imports_resolved_ast: 671704ed30a8c68ebffe2a58ff4799f626badf975d2d0dded3b06f5264e5c0db
-    canonicalized_ast: 671704ed30a8c68ebffe2a58ff4799f626badf975d2d0dded3b06f5264e5c0db
-    type_inferenced_ast: eb525f7c227207a1037b96838d2f0cf597968c14117b3fae30564f3cd5a3a27b
+outputs: []
diff --git a/tests/expectations/compiler/compiler/aliases/shadowing_var_allowed.leo.out b/tests/expectations/compiler/compiler/aliases/shadowing_var_allowed.leo.out
index c1d479dd9b..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/aliases/shadowing_var_allowed.leo.out
+++ b/tests/expectations/compiler/compiler/aliases/shadowing_var_allowed.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: inputs/dummy.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: cd2e85ff29ee11d30e73dbba0a612223a8a26dff125069ad7ac05697fd4c9829
-    imports_resolved_ast: cd2e85ff29ee11d30e73dbba0a612223a8a26dff125069ad7ac05697fd4c9829
-    canonicalized_ast: cd2e85ff29ee11d30e73dbba0a612223a8a26dff125069ad7ac05697fd4c9829
-    type_inferenced_ast: 1e73226b2cbbd5c7a36ffe70b778e0e544976d2e09a1f0ba3f2b486d1b604d58
+outputs: []
diff --git a/tests/expectations/compiler/compiler/aliases/wrong_type_assign_fail.leo.out b/tests/expectations/compiler/compiler/aliases/wrong_type_assign_fail.leo.out
index 9bf7a388c7..3f519cf1b5 100644
--- a/tests/expectations/compiler/compiler/aliases/wrong_type_assign_fail.leo.out
+++ b/tests/expectations/compiler/compiler/aliases/wrong_type_assign_fail.leo.out
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - "Error [EASG0373025]: unexpected type, expected: 'u32', received: 'u8'\n    --> compiler-test:6:18\n     |\n   6 |     let a: int = x;\n     |                  ^"
+outputs: []
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 6b288be483..3f519cf1b5 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
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - "Error [EASG0373019]: array index out of bounds: '0'\n    --> compiler-test:7:24\n     |\n   7 |     const z: [u8; 2] = y[..1u32][..x];\n     |                        ^^^^^^^^^^^^^^"
+outputs: []
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..3f519cf1b5 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
@@ -1,5 +1,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     |             ^^^^^^^^^^^"
+outputs: []
diff --git a/tests/expectations/compiler/compiler/array/complex_access.leo.out b/tests/expectations/compiler/compiler/array/complex_access.leo.out
index 841bf13445..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/array/complex_access.leo.out
+++ b/tests/expectations/compiler/compiler/array/complex_access.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 637
-      num_constraints: 662
-      at: 9f1bcfcac007139af57f04172704330d348767a9c51fe8ce15fb60f457fa6337
-      bt: b6500ddf37d10958fdc014dcb2f54b37a2c684f05b7f0aa4776556331db8c924
-      ct: a15c712d74487a80767116103c38fa7277066705d0c7f1f9902a6016466706f0
-    output:
-      - input_file: input/complex_access.in
-        output:
-          registers:
-            out:
-              type: bool
-              value: "true"
-    initial_ast: 843884ddf198fe566cea0f8e84a2902f720d6211c9d8bad98299eea4da846870
-    imports_resolved_ast: 843884ddf198fe566cea0f8e84a2902f720d6211c9d8bad98299eea4da846870
-    canonicalized_ast: c30721e60523bc31af9a9bf342d9b89bf92a26e3886394cc0c1a574560715bdf
-    type_inferenced_ast: c37f209961a9acff1d942af1e4a9a332123676f2bc581ca94604314f9d738a1e
+outputs: []
diff --git a/tests/expectations/compiler/compiler/array/equal_initializer.leo.out b/tests/expectations/compiler/compiler/array/equal_initializer.leo.out
index 300b2e071b..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/array/equal_initializer.leo.out
+++ b/tests/expectations/compiler/compiler/array/equal_initializer.leo.out
@@ -1,28 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 95
-      num_constraints: 95
-      at: 5884e806c47756fa1d12f47e5cc5249843d8de4e2fafcb373c5a0d67dfe22d69
-      bt: 983c734b40e342144d6b4d52e315da9ff9f97580f019f606403924bb977a5be7
-      ct: 49f0db71bd29b80dbe5f2f96573a5959b1df339c92350e16f111bade214037aa
-    output:
-      - input_file: input/six_zeros.in
-        output:
-          registers:
-            x:
-              type: bool
-              value: "true"
-      - input_file: input/count_to_6.in
-        output:
-          registers:
-            x:
-              type: bool
-              value: "false"
-    initial_ast: aa24022f240400d709b97a44c143ce481109bb0a66926aa5c97cf2e2d06dea2a
-    imports_resolved_ast: aa24022f240400d709b97a44c143ce481109bb0a66926aa5c97cf2e2d06dea2a
-    canonicalized_ast: ace5006c27d2e3784fb73d52adc641f6285a041452ba0d23de5983c5eede1139
-    type_inferenced_ast: 611bc2fab64e417c9cfad3c59ca333561b8167a6fc7be957d972d96125e040ba
+outputs: []
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 bb5e60688e..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/array/equal_initializer_2.leo.out
+++ b/tests/expectations/compiler/compiler/array/equal_initializer_2.leo.out
@@ -1,28 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 95
-      num_constraints: 95
-      at: 9273b9ab94dee8605c4f1e49fe99910f674468f5026b8d2c48ecaa4d8c006f3a
-      bt: a3614a9ddd1ae0fde16a61336aba5a02b44816b3e43e23c7b9663976319bcb8a
-      ct: 49f0db71bd29b80dbe5f2f96573a5959b1df339c92350e16f111bade214037aa
-    output:
-      - input_file: input/six_zeros.in
-        output:
-          registers:
-            x:
-              type: bool
-              value: "false"
-      - input_file: input/count_to_6.in
-        output:
-          registers:
-            x:
-              type: bool
-              value: "true"
-    initial_ast: 307b6817fa2a5005462686901129e97bf75c00bf14568fafbe1de2c8afc1804d
-    imports_resolved_ast: 307b6817fa2a5005462686901129e97bf75c00bf14568fafbe1de2c8afc1804d
-    canonicalized_ast: cbaa304ba210d8155762701d8e6a2ddca3eaffb008a813ed7a60db1fb0043f10
-    type_inferenced_ast: 47e371ce112ac17fd65bfd100d24829e8c4819e1f96cc715b8c6245f01d608bb
+outputs: []
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 3445cbb64c..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/array/input_nested_3x2.leo.out
+++ b/tests/expectations/compiler/compiler/array/input_nested_3x2.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 95
-      num_constraints: 95
-      at: 5884e806c47756fa1d12f47e5cc5249843d8de4e2fafcb373c5a0d67dfe22d69
-      bt: 983c734b40e342144d6b4d52e315da9ff9f97580f019f606403924bb977a5be7
-      ct: 49f0db71bd29b80dbe5f2f96573a5959b1df339c92350e16f111bade214037aa
-    output:
-      - input_file: input/input_nested_3x2.in
-        output:
-          registers:
-            x:
-              type: bool
-              value: "true"
-    initial_ast: 6d5be1a3d383ecafa89b5327d3a4b9bce9a459f6c0241cb01f408566ec4a1cc4
-    imports_resolved_ast: 6d5be1a3d383ecafa89b5327d3a4b9bce9a459f6c0241cb01f408566ec4a1cc4
-    canonicalized_ast: eb64230be87deb03ac7f076961a82194a15afd964aa6966a10314b38def69684
-    type_inferenced_ast: e7985a24db781a3e42c9b2a67d1e8febc78fc2ad4e388a90207d00eb89734ffd
+outputs: []
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..3f519cf1b5 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
@@ -1,5 +1,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     |                             ^"
+outputs: []
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 399ef15a56..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/array/input_tuple_3x2.leo.out
+++ b/tests/expectations/compiler/compiler/array/input_tuple_3x2.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 95
-      num_constraints: 95
-      at: 5884e806c47756fa1d12f47e5cc5249843d8de4e2fafcb373c5a0d67dfe22d69
-      bt: 983c734b40e342144d6b4d52e315da9ff9f97580f019f606403924bb977a5be7
-      ct: 49f0db71bd29b80dbe5f2f96573a5959b1df339c92350e16f111bade214037aa
-    output:
-      - input_file: input/input_tuple_3x2.in
-        output:
-          registers:
-            x:
-              type: bool
-              value: "true"
-    initial_ast: aa24022f240400d709b97a44c143ce481109bb0a66926aa5c97cf2e2d06dea2a
-    imports_resolved_ast: aa24022f240400d709b97a44c143ce481109bb0a66926aa5c97cf2e2d06dea2a
-    canonicalized_ast: ace5006c27d2e3784fb73d52adc641f6285a041452ba0d23de5983c5eede1139
-    type_inferenced_ast: 611bc2fab64e417c9cfad3c59ca333561b8167a6fc7be957d972d96125e040ba
+outputs: []
diff --git a/tests/expectations/compiler/compiler/array/input_tuple_3x2_fail.leo.out b/tests/expectations/compiler/compiler/array/input_tuple_3x2_fail.leo.out
index 995afe29e0..3f519cf1b5 100644
--- a/tests/expectations/compiler/compiler/array/input_tuple_3x2_fail.leo.out
+++ b/tests/expectations/compiler/compiler/array/input_tuple_3x2_fail.leo.out
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - aborting due to syntax error
+outputs: []
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 b920c88311..3f519cf1b5 100644
--- a/tests/expectations/compiler/compiler/array/multi_fail_initializer.leo.out
+++ b/tests/expectations/compiler/compiler/array/multi_fail_initializer.leo.out
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - "Error [EASG0373025]: 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     |                               ^^^^^^^^^^^^^"
+outputs: []
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 1c81b18dcc..3f519cf1b5 100644
--- a/tests/expectations/compiler/compiler/array/multi_fail_inline.leo.out
+++ b/tests/expectations/compiler/compiler/array/multi_fail_inline.leo.out
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - "Error [EASG0373025]: unexpected type, expected: 'array of length 2', received: 'array of length 1'\n    --> compiler-test:5:35\n     |\n   5 |                                   [1u8]];   // incorrect dimensions\n     |                                   ^^^^^"
+outputs: []
diff --git a/tests/expectations/compiler/compiler/array/multi_initializer.leo.out b/tests/expectations/compiler/compiler/array/multi_initializer.leo.out
index a41e6d561f..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/array/multi_initializer.leo.out
+++ b/tests/expectations/compiler/compiler/array/multi_initializer.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: input/dummy.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 0724c81ae70c56ff047b5d28ef949b72c4b581ce0bb443957064efa1636a3cab
-    imports_resolved_ast: 0724c81ae70c56ff047b5d28ef949b72c4b581ce0bb443957064efa1636a3cab
-    canonicalized_ast: ed0b7200a455978fed9b1df0c9e3ab9bf4815d79048f28f4205c69b420ee02df
-    type_inferenced_ast: 1e5c78e15d8c9328190e95ccbc2e4e105d9ce430b98704a12472e2c3cc870526
+outputs: []
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 3a9fe9224b..3f519cf1b5 100644
--- a/tests/expectations/compiler/compiler/array/multi_initializer_fail.leo.out
+++ b/tests/expectations/compiler/compiler/array/multi_initializer_fail.leo.out
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - "Error [EASG0373025]: 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     |                               ^^^^^^^^^^^^^"
+outputs: []
diff --git a/tests/expectations/compiler/compiler/array/nested.leo.out b/tests/expectations/compiler/compiler/array/nested.leo.out
index f0661b99e1..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/array/nested.leo.out
+++ b/tests/expectations/compiler/compiler/array/nested.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: input/dummy.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 60d0b81c9f3631aca3c9607df74cfb8e4dbc0d387836398dea86f016fa4210fd
-    imports_resolved_ast: 60d0b81c9f3631aca3c9607df74cfb8e4dbc0d387836398dea86f016fa4210fd
-    canonicalized_ast: 6570de0e96b21780ed7793a860948b2c6ff7a92da7ce7f3dd7775ff30d70656f
-    type_inferenced_ast: ace51ab56a61b988bd2c3f65431e87234a96fa92554d36d4e83d7235832506f6
+outputs: []
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 18f3110b60..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/array/nested_3x2_value.leo.out
+++ b/tests/expectations/compiler/compiler/array/nested_3x2_value.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: input/dummy.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 754eca05d485d80c4b710db30efc66f91c0eafdc02c2707f854238863b6c6c02
-    imports_resolved_ast: 754eca05d485d80c4b710db30efc66f91c0eafdc02c2707f854238863b6c6c02
-    canonicalized_ast: e5554c42dc9a45ab57ea5ac28996969640fb6f8da1ad8db805f65f5d555c8cf4
-    type_inferenced_ast: aa30bccd05b7386ffb8a7df7cad89ec39117c6b5fc51a9e68624064832b4f225
+outputs: []
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 e9692944ca..3f519cf1b5 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
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - "Error [EASG0373025]: 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     |                              ^^^^^^^^^^^"
+outputs: []
diff --git a/tests/expectations/compiler/compiler/array/registers.leo.out b/tests/expectations/compiler/compiler/array/registers.leo.out
index 96a5800d2b..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/array/registers.leo.out
+++ b/tests/expectations/compiler/compiler/array/registers.leo.out
@@ -1,28 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 119
-      num_constraints: 143
-      at: 144d1bd1f6756ac172ddddf3ca5cf4358ba8fc053fd754b56a425ab6566af47a
-      bt: 43972815ec9d0ab821613fde2cd6a5df9ee42f50758a27a0fed6dc111b44f3ee
-      ct: 5ed7a755b881aa851f3d3e966a4bd18dd48ce59be71b4ada39c9c891f8297201
-    output:
-      - input_file: input/registers_ones.in
-        output:
-          registers:
-            r:
-              type: "[u8; 3]"
-              value: "\"321\""
-      - input_file: input/registers_zeros.in
-        output:
-          registers:
-            r:
-              type: "[u8; 3]"
-              value: "\"123\""
-    initial_ast: 4e74124bc410534941ef9b79ffb64656d14e145b5a79fbd14419c1aef2f0ef69
-    imports_resolved_ast: 4e74124bc410534941ef9b79ffb64656d14e145b5a79fbd14419c1aef2f0ef69
-    canonicalized_ast: 4e74124bc410534941ef9b79ffb64656d14e145b5a79fbd14419c1aef2f0ef69
-    type_inferenced_ast: f5cb6326028b3cf9187889be6ac5ed5bd095a570d45ae63c7285a09366fc6803
+outputs: []
diff --git a/tests/expectations/compiler/compiler/array/slice.leo.out b/tests/expectations/compiler/compiler/array/slice.leo.out
index 48d49f7866..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/array/slice.leo.out
+++ b/tests/expectations/compiler/compiler/array/slice.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 47
-      num_constraints: 47
-      at: 9034e7c6c2ae58e279196614600093d655bcdad8237302b84a66e63ec1c2f00e
-      bt: f23a0442b41c8901611d5f1a9a8493a0cb03c68e183a81a1b88c5a6600fa7420
-      ct: ad66abc1bf940dbc76573c0a516ebf633c1411f9997101d86ded0faff025d52c
-    output:
-      - input_file: input/three_ones.in
-        output:
-          registers:
-            x:
-              type: bool
-              value: "true"
-    initial_ast: 0e4761ba1228f0a490b51ff2c31df33f623a08d32f62833d64859ca103689f4a
-    imports_resolved_ast: 0e4761ba1228f0a490b51ff2c31df33f623a08d32f62833d64859ca103689f4a
-    canonicalized_ast: 0e4761ba1228f0a490b51ff2c31df33f623a08d32f62833d64859ca103689f4a
-    type_inferenced_ast: 1494bb64c16ec2dc03bfb2e37b89f93e02a70860ced1ce0b42b5ee5ead31b0d5
+outputs: []
diff --git a/tests/expectations/compiler/compiler/array/slice_lower.leo.out b/tests/expectations/compiler/compiler/array/slice_lower.leo.out
index 15e2bd02c2..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/array/slice_lower.leo.out
+++ b/tests/expectations/compiler/compiler/array/slice_lower.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: input/dummy.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 1bf9b30e052d9ecc042a0b20bbc195a98d463ab206963469b9199de462b8be15
-    imports_resolved_ast: 1bf9b30e052d9ecc042a0b20bbc195a98d463ab206963469b9199de462b8be15
-    canonicalized_ast: 1bf9b30e052d9ecc042a0b20bbc195a98d463ab206963469b9199de462b8be15
-    type_inferenced_ast: 6d2531af8ed5b04b23039d0b508cf388135a0fc6e1dc0de3befb4d49ce360fbc
+outputs: []
diff --git a/tests/expectations/compiler/compiler/array/spread.leo.out b/tests/expectations/compiler/compiler/array/spread.leo.out
index 5914e93782..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/array/spread.leo.out
+++ b/tests/expectations/compiler/compiler/array/spread.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 71
-      num_constraints: 71
-      at: a08e2e54701e419ba564483a59fb3f6cc30614b8a7c903f9ff6f4b85e63da5c6
-      bt: 65113b6e5dc0f7d88f04b7e60a519801a313d2e9d4129db502ccef0dfdb14988
-      ct: 7a28ca50094ed4577eef8066cf1a814affa63139e6cc3d7ccf8d65c69499de60
-    output:
-      - input_file: input/three_ones.in
-        output:
-          registers:
-            x:
-              type: bool
-              value: "true"
-    initial_ast: 140097342b7a16fae8542da5d13eb9c2cb4e1b743fa226e345d815f62d0781bb
-    imports_resolved_ast: 140097342b7a16fae8542da5d13eb9c2cb4e1b743fa226e345d815f62d0781bb
-    canonicalized_ast: 140097342b7a16fae8542da5d13eb9c2cb4e1b743fa226e345d815f62d0781bb
-    type_inferenced_ast: a2442e72c5010224894e46a1c6f245356c0d86428ce617eb31faaf57806ca2df
+outputs: []
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 94a0008165..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/array/ternary_in_array.leo.out
+++ b/tests/expectations/compiler/compiler/array/ternary_in_array.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 39
-      num_constraints: 39
-      at: 6f3ffff33f4e513211e7a55cc9edcab3bc2d2a146c2b280981308bb69165f86f
-      bt: adde6ad1b603a50c986ec99b6edcc972138bb6239e58a1b88e931bc0165b2e8e
-      ct: 867e3f6ee1f26af954e7868633a595d319267d91afc5d7e2074fe641fabde1d6
-    output:
-      - input_file: input/three_ones.in
-        output:
-          registers:
-            x:
-              type: bool
-              value: "true"
-    initial_ast: 002cb467a5c1357617b45f955944bb4a79ab465dc13f3eb5eb8db4c158b8c745
-    imports_resolved_ast: 002cb467a5c1357617b45f955944bb4a79ab465dc13f3eb5eb8db4c158b8c745
-    canonicalized_ast: 002cb467a5c1357617b45f955944bb4a79ab465dc13f3eb5eb8db4c158b8c745
-    type_inferenced_ast: 323fc99ac247b37bb395eb08691d451a3b6b563a15bb94b5af6a0193ccc0bd34
+outputs: []
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 b3c16f0157..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/array/tuple_3x2_value.leo.out
+++ b/tests/expectations/compiler/compiler/array/tuple_3x2_value.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: input/dummy.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 97fd9b78f7912a7627e2b2f5615ae35e39304af6122fab85f9b49fcf6a85d8f2
-    imports_resolved_ast: 97fd9b78f7912a7627e2b2f5615ae35e39304af6122fab85f9b49fcf6a85d8f2
-    canonicalized_ast: cf8a8faae5f2847199324cbef87583e9af1249c03891ae31f3ce0093879326d5
-    type_inferenced_ast: 731117b4aa8260da475471088df325cb540d84c536ce60f3488e01a4428e84ae
+outputs: []
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 6183b26503..3f519cf1b5 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
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - "Error [EASG0373025]: 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     |                              ^^^^^^^^^^^"
+outputs: []
diff --git a/tests/expectations/compiler/compiler/array/type_fail.leo.out b/tests/expectations/compiler/compiler/array/type_fail.leo.out
index 06738a76cd..3f519cf1b5 100644
--- a/tests/expectations/compiler/compiler/array/type_fail.leo.out
+++ b/tests/expectations/compiler/compiler/array/type_fail.leo.out
@@ -1,5 +1,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     |                   ^"
+outputs: []
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 c4b141e5cf..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/array/type_input_3x2.leo.out
+++ b/tests/expectations/compiler/compiler/array/type_input_3x2.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 95
-      num_constraints: 95
-      at: 5884e806c47756fa1d12f47e5cc5249843d8de4e2fafcb373c5a0d67dfe22d69
-      bt: 983c734b40e342144d6b4d52e315da9ff9f97580f019f606403924bb977a5be7
-      ct: 49f0db71bd29b80dbe5f2f96573a5959b1df339c92350e16f111bade214037aa
-    output:
-      - input_file: input/input_tuple_3x2.in
-        output:
-          registers:
-            x:
-              type: bool
-              value: "true"
-    initial_ast: 9f2080fab6a85294afa2423cd79482fb3d944c4afab7363e66a4086a120ad34d
-    imports_resolved_ast: 9f2080fab6a85294afa2423cd79482fb3d944c4afab7363e66a4086a120ad34d
-    canonicalized_ast: 9f2080fab6a85294afa2423cd79482fb3d944c4afab7363e66a4086a120ad34d
-    type_inferenced_ast: f8c6b9a9ac418220c87bbd1a99a5eb15817cfa289d822624f2d3cc41e10718b4
+outputs: []
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 44117e0d63..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/array/type_input_4x3x2.leo.out
+++ b/tests/expectations/compiler/compiler/array/type_input_4x3x2.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 383
-      num_constraints: 383
-      at: ec8cf3ea9e586d3c504b8b467b4404d213dd375aa2691f2b9a8670c879ffa24d
-      bt: 9b5ba17ea683af827718f9062b3102faa0be01b9f67022e2322db989bf90f057
-      ct: 6fe90b4e46834afeb215a4702281504d676eae391588e5b576f6e406f6ddd504
-    output:
-      - input_file: input/type_tuple_value_nested_4x3x2.in
-        output:
-          registers:
-            x:
-              type: bool
-              value: "true"
-    initial_ast: f61370b311806223d351c6dd611a178362cf8ad6de976d7b0ed709b51fadbecb
-    imports_resolved_ast: f61370b311806223d351c6dd611a178362cf8ad6de976d7b0ed709b51fadbecb
-    canonicalized_ast: f61370b311806223d351c6dd611a178362cf8ad6de976d7b0ed709b51fadbecb
-    type_inferenced_ast: 54531d6afced0deaa59c93b9270768a5e89ea8ea1df34365eb4e440bdf725904
+outputs: []
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 8c26312c64..ef090731fb 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
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 143
-      num_constraints: 143
-      at: f09e0b896fb2cb30fe4bbcf791b4695de26287361de6def1e75e861643d12714
-      bt: f97a8f270a0603d5674319afa5e572f5f146f02a36f9387f860a6cf1f8a786cc
-      ct: 88cc1bad895de526a15b231e1fe8065848e8008bda5e2662f7c9eec9a976ff98
-    output:
-      - input_file: input/type_nested_value_nested_3x2.in
-        output:
-          registers:
-            x:
-              type: bool
-              value: "true"
-    initial_ast: 6bacdd1d42bfa807910c0455c68213007d5ca8f15ee1f3c743d946bfbbff79b7
-    imports_resolved_ast: 6bacdd1d42bfa807910c0455c68213007d5ca8f15ee1f3c743d946bfbbff79b7
-    canonicalized_ast: 6bacdd1d42bfa807910c0455c68213007d5ca8f15ee1f3c743d946bfbbff79b7
-    type_inferenced_ast: 1b2a08879a8d42fafc9eecc12b89f0f36719e02205ee48bf6075475e71942132
+outputs: []
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 24df29595e..3f519cf1b5 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
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - "Error [EASG0373025]: 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     |                             ^^^^^^^^^^^"
+outputs: []
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 45f267cf6d..ef090731fb 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
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: input/dummy.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: c3c30cd2e66f21abef8c49e0ac3d49ed3b607097815c354b14ea9e44d41c0a69
-    imports_resolved_ast: c3c30cd2e66f21abef8c49e0ac3d49ed3b607097815c354b14ea9e44d41c0a69
-    canonicalized_ast: c3c30cd2e66f21abef8c49e0ac3d49ed3b607097815c354b14ea9e44d41c0a69
-    type_inferenced_ast: 557825e28344c8313d9961f9551eabe9c32ee85c524b9b9a6b0fc202c22fa9f3
+outputs: []
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 45474940cb..3f519cf1b5 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
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - "Error [EASG0373025]: 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     |                                  ^^^^^^^^^^^^^^^^"
+outputs: []
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 8a7be41081..ef090731fb 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
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: input/dummy.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 6c062f01a78d515f780a4c13de65d466edda274a2cb519af47a319ed165db0fa
-    imports_resolved_ast: 6c062f01a78d515f780a4c13de65d466edda274a2cb519af47a319ed165db0fa
-    canonicalized_ast: 382e9b8b4a635b0be6f62409a20bbdc10d37d08c17658414d1ddef8e6eb00749
-    type_inferenced_ast: 13d8af6038fbc63ae76be51f23e43152ab473b895d206160716008da87da3416
+outputs: []
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 e6be12de69..3f519cf1b5 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
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - "Error [EASG0373025]: 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     |                             ^^^^^^^^^^^"
+outputs: []
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 ab9861224d..ef090731fb 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
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: input/dummy.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 228ba794b578de8828d761676c15059c51455aff96b02ef3cfafbef53c35454b
-    imports_resolved_ast: 228ba794b578de8828d761676c15059c51455aff96b02ef3cfafbef53c35454b
-    canonicalized_ast: 7869bd9531ba014bc2515e13bcafdfed2f9566e7008c1e015d43bb749d8d1d4a
-    type_inferenced_ast: 84b8976993f08b1b46fef6012018ad050eed6df1e34ae83fc0b57799a1acb395
+outputs: []
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 640c3e964a..3f519cf1b5 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
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - "Error [EASG0373025]: 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     |                                  ^^^^^^^^^^^^^^"
+outputs: []
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 fc80de0f79..ef090731fb 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
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: input/dummy.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 0ea5856bbe7ad96107544e2b12c7ca54c279c4cd1c8b9610083430600ffa86f9
-    imports_resolved_ast: 0ea5856bbe7ad96107544e2b12c7ca54c279c4cd1c8b9610083430600ffa86f9
-    canonicalized_ast: 0083c78a81a6ec44627ca89fe949a5301ccaa54ead7104b9a2a3fbd979cf9a2c
-    type_inferenced_ast: a8b44ce543535e16db5d93df805dc5693d3a1140798cb336d573986de8dfdbca
+outputs: []
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 f05e92f051..3f519cf1b5 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
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - "Error [EASG0373025]: 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     |                             ^^^^^^^^^^^"
+outputs: []
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 d3e94231c4..ef090731fb 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
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: input/dummy.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: db7e9050580f794aa657700225126e8033c0241240874f6e35df0507469be247
-    imports_resolved_ast: db7e9050580f794aa657700225126e8033c0241240874f6e35df0507469be247
-    canonicalized_ast: 55304d82a024ad2418e156ad661224040904775f070995bf1b828d1264c3487f
-    type_inferenced_ast: db99dd94ad4ef9de46304df000494eeda3e8b51835c46e6a3988ee87f91457fa
+outputs: []
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 02afe9a48e..3f519cf1b5 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
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - "Error [EASG0373025]: 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     |                                ^^^^^^^^^^^^^^^^"
+outputs: []
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 41f758d3c4..ef090731fb 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
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: input/dummy.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 2730f954bc76f81d29b02a15f8025d75ca963234716112745b806789bb8eb297
-    imports_resolved_ast: 2730f954bc76f81d29b02a15f8025d75ca963234716112745b806789bb8eb297
-    canonicalized_ast: 4e07d5e399fa0f60ab84796ecc6195b2a8da0b3a9e725152465512e98f0ca753
-    type_inferenced_ast: ea0f726ce456c52c62b73aae38afb74b160ae527480d05f3254c0fdaefdad58e
+outputs: []
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 1b75a63f99..3f519cf1b5 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
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - "Error [EASG0373025]: 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     |                             ^^^^^^^^^^^"
+outputs: []
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 5586e09832..ef090731fb 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
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: input/dummy.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 445b35e7d287dc14a77b2c1c4c77d9b7b4fbd6e7c31f6f35c91a446eeca29775
-    imports_resolved_ast: 445b35e7d287dc14a77b2c1c4c77d9b7b4fbd6e7c31f6f35c91a446eeca29775
-    canonicalized_ast: 48590d7afce08e9e0cd4a45048faa360c18109098b5a9074dfc21b252a47d3e8
-    type_inferenced_ast: 0cc5d17973908631180a791f151bdc42aa3e8394b3fbc7607f717bc61baaf904
+outputs: []
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 67e96d07cf..3f519cf1b5 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
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - "Error [EASG0373025]: 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     |                                ^^^^^^^^^^^^^^"
+outputs: []
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..3f519cf1b5 100644
--- a/tests/expectations/compiler/compiler/array/variable_slice_fail.leo.out
+++ b/tests/expectations/compiler/compiler/array/variable_slice_fail.leo.out
@@ -1,5 +1,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     |                 ^^^^^"
+outputs: []
diff --git a/tests/expectations/compiler/compiler/boolean/and.leo.out b/tests/expectations/compiler/compiler/boolean/and.leo.out
index 3c726a7331..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/boolean/and.leo.out
+++ b/tests/expectations/compiler/compiler/boolean/and.leo.out
@@ -1,40 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 3
-      num_constraints: 3
-      at: bbd0722c65502a4b903833f9ff9e614e877f9b5c58c670593e2aa290d0457b2f
-      bt: 49e8fa1fd3f85b0f486c49f194e4fff3da5e8039685fca1f3327389cbe9fc180
-      ct: ae5c1ab4ec8811a2ec2efb38b91ab4a8b6fb80bd914b31f9a70559531aeb6a46
-    output:
-      - input_file: input/false_false.in
-        output:
-          registers:
-            x:
-              type: bool
-              value: "false"
-      - input_file: input/false_true.in
-        output:
-          registers:
-            x:
-              type: bool
-              value: "false"
-      - input_file: input/true_false.in
-        output:
-          registers:
-            x:
-              type: bool
-              value: "false"
-      - input_file: input/true_true.in
-        output:
-          registers:
-            x:
-              type: bool
-              value: "true"
-    initial_ast: 2f7c3b9c806a873b6445200eb78a8e0e546ffe64c90fe2133355dd37a342b11b
-    imports_resolved_ast: 2f7c3b9c806a873b6445200eb78a8e0e546ffe64c90fe2133355dd37a342b11b
-    canonicalized_ast: 2f7c3b9c806a873b6445200eb78a8e0e546ffe64c90fe2133355dd37a342b11b
-    type_inferenced_ast: 87b86a66fc6e60502be0b0fb7cf677d5128390aec53f6893827a1bf02fca8370
+outputs: []
diff --git a/tests/expectations/compiler/compiler/boolean/conditional.leo.out b/tests/expectations/compiler/compiler/boolean/conditional.leo.out
index 51f3b463d5..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/boolean/conditional.leo.out
+++ b/tests/expectations/compiler/compiler/boolean/conditional.leo.out
@@ -1,40 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 3
-      num_constraints: 3
-      at: bbd0722c65502a4b903833f9ff9e614e877f9b5c58c670593e2aa290d0457b2f
-      bt: 49e8fa1fd3f85b0f486c49f194e4fff3da5e8039685fca1f3327389cbe9fc180
-      ct: ae5c1ab4ec8811a2ec2efb38b91ab4a8b6fb80bd914b31f9a70559531aeb6a46
-    output:
-      - input_file: input/false_false.in
-        output:
-          registers:
-            x:
-              type: bool
-              value: "false"
-      - input_file: input/false_true.in
-        output:
-          registers:
-            x:
-              type: bool
-              value: "false"
-      - input_file: input/true_false.in
-        output:
-          registers:
-            x:
-              type: bool
-              value: "false"
-      - input_file: input/true_true.in
-        output:
-          registers:
-            x:
-              type: bool
-              value: "true"
-    initial_ast: 5316ba00882aa3f9b538d349ed7141c4ee7c77ec01f6af9911b2652b6cd3e659
-    imports_resolved_ast: 5316ba00882aa3f9b538d349ed7141c4ee7c77ec01f6af9911b2652b6cd3e659
-    canonicalized_ast: 5316ba00882aa3f9b538d349ed7141c4ee7c77ec01f6af9911b2652b6cd3e659
-    type_inferenced_ast: 7933d0a8f47892e42c3c670bc6433e8d820042a7396e10b6a63d22bd5b740f96
+outputs: []
diff --git a/tests/expectations/compiler/compiler/boolean/equal.leo.out b/tests/expectations/compiler/compiler/boolean/equal.leo.out
index 4f3e535ca9..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/boolean/equal.leo.out
+++ b/tests/expectations/compiler/compiler/boolean/equal.leo.out
@@ -1,40 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 3
-      num_constraints: 3
-      at: 01e9615846575e848deea9a9802ceed188fdbfc4660f6f22de41845adcce14ac
-      bt: 49e8fa1fd3f85b0f486c49f194e4fff3da5e8039685fca1f3327389cbe9fc180
-      ct: 7ca43d5c34997f3c866631161cb33186cc016972238c07771ae105ca1b05320d
-    output:
-      - input_file: input/false_false.in
-        output:
-          registers:
-            x:
-              type: bool
-              value: "true"
-      - input_file: input/false_true.in
-        output:
-          registers:
-            x:
-              type: bool
-              value: "false"
-      - input_file: input/true_false.in
-        output:
-          registers:
-            x:
-              type: bool
-              value: "false"
-      - input_file: input/true_true.in
-        output:
-          registers:
-            x:
-              type: bool
-              value: "true"
-    initial_ast: 08f026e24cab51634a7a2a6f1f3b082eace1d4be649cd9ff7c244194891d7d78
-    imports_resolved_ast: 08f026e24cab51634a7a2a6f1f3b082eace1d4be649cd9ff7c244194891d7d78
-    canonicalized_ast: 08f026e24cab51634a7a2a6f1f3b082eace1d4be649cd9ff7c244194891d7d78
-    type_inferenced_ast: 2112e9f631a77bb16ba1561bbe1028a415413f23fd32d21bfe086e071938c845
+outputs: []
diff --git a/tests/expectations/compiler/compiler/boolean/not_equal.leo.out b/tests/expectations/compiler/compiler/boolean/not_equal.leo.out
index d31cdae376..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/boolean/not_equal.leo.out
+++ b/tests/expectations/compiler/compiler/boolean/not_equal.leo.out
@@ -1,40 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 3
-      num_constraints: 3
-      at: 01e9615846575e848deea9a9802ceed188fdbfc4660f6f22de41845adcce14ac
-      bt: 49e8fa1fd3f85b0f486c49f194e4fff3da5e8039685fca1f3327389cbe9fc180
-      ct: 7ca43d5c34997f3c866631161cb33186cc016972238c07771ae105ca1b05320d
-    output:
-      - input_file: input/false_false.in
-        output:
-          registers:
-            x:
-              type: bool
-              value: "false"
-      - input_file: input/false_true.in
-        output:
-          registers:
-            x:
-              type: bool
-              value: "true"
-      - input_file: input/true_false.in
-        output:
-          registers:
-            x:
-              type: bool
-              value: "true"
-      - input_file: input/true_true.in
-        output:
-          registers:
-            x:
-              type: bool
-              value: "false"
-    initial_ast: 094effa7fe12695679a571f560e1d3e8c299cde8de280f9309010c85f48bab95
-    imports_resolved_ast: 094effa7fe12695679a571f560e1d3e8c299cde8de280f9309010c85f48bab95
-    canonicalized_ast: 094effa7fe12695679a571f560e1d3e8c299cde8de280f9309010c85f48bab95
-    type_inferenced_ast: ab25cb7bf7d8fe3ec64be183550ba8d6acfaf17464cf70ec45c6497fc065ac29
+outputs: []
diff --git a/tests/expectations/compiler/compiler/boolean/or.leo.out b/tests/expectations/compiler/compiler/boolean/or.leo.out
index de8536a60d..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/boolean/or.leo.out
+++ b/tests/expectations/compiler/compiler/boolean/or.leo.out
@@ -1,40 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 3
-      num_constraints: 3
-      at: 1df8316bf2fa59a7a92242252ec3c26a425f07212a4c716b2fefd4ddabc2d773
-      bt: b95daadce52bb9a3b59565f7078664afbebde46b9b5d6a187e4877926e7a506c
-      ct: fc07ea064122a2b3be5414ded4cd1e51e3aef7240ad33c8888d757909e9c2c07
-    output:
-      - input_file: input/false_false.in
-        output:
-          registers:
-            x:
-              type: bool
-              value: "false"
-      - input_file: input/false_true.in
-        output:
-          registers:
-            x:
-              type: bool
-              value: "true"
-      - input_file: input/true_false.in
-        output:
-          registers:
-            x:
-              type: bool
-              value: "true"
-      - input_file: input/true_true.in
-        output:
-          registers:
-            x:
-              type: bool
-              value: "true"
-    initial_ast: e2facdce5f7cdbed4a3215cc258e54418aac4f4b846349b35e1da67b577b76c9
-    imports_resolved_ast: e2facdce5f7cdbed4a3215cc258e54418aac4f4b846349b35e1da67b577b76c9
-    canonicalized_ast: e2facdce5f7cdbed4a3215cc258e54418aac4f4b846349b35e1da67b577b76c9
-    type_inferenced_ast: fb43dcb50c9822e2d4e4f35e9cc73f0893e508161296be5666cd90c4f7a971bc
+outputs: []
diff --git a/tests/expectations/compiler/compiler/char/invalid_char.leo.out b/tests/expectations/compiler/compiler/char/invalid_char.leo.out
index c788506554..3f519cf1b5 100644
--- a/tests/expectations/compiler/compiler/char/invalid_char.leo.out
+++ b/tests/expectations/compiler/compiler/char/invalid_char.leo.out
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - "Error [EPAR0370000]: '\n    --> compiler-test:4:23\n     |\n   4 |     const not_valid = '';\n     |                       ^"
+outputs: []
diff --git a/tests/expectations/compiler/compiler/char/neq.leo.out b/tests/expectations/compiler/compiler/char/neq.leo.out
index 70b851fbc6..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/char/neq.leo.out
+++ b/tests/expectations/compiler/compiler/char/neq.leo.out
@@ -1,106 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 6
-      num_constraints: 3
-      at: cc1286e0b6fa2e90fb6f0880431a7c1e2cc37a329fae3aff1c13f51036c66f12
-      bt: 02c492cb6df07172e56cffd0cfd902a8443921e1256a2d907bbabd30bf6b8f6d
-      ct: a1f8e2b168c0f2f28f0ca3f16ce9b25ba7f7c410cfd68b0912bf19c90b53f2a2
-    output:
-      - input_file: inputs/ascii.in
-        output:
-          registers:
-            r:
-              type: char
-              value: "'Z'"
-      - input_file: inputs/escaped_unicode1.in
-        output:
-          registers:
-            r:
-              type: char
-              value: "'a'"
-      - input_file: inputs/escaped_unicode2.in
-        output:
-          registers:
-            r:
-              type: char
-              value: "'a'"
-      - input_file: inputs/escaped_unicode3.in
-        output:
-          registers:
-            r:
-              type: char
-              value: "'a'"
-      - input_file: inputs/escaped_unicode4.in
-        output:
-          registers:
-            r:
-              type: char
-              value: "'a'"
-      - input_file: inputs/escaped_unicode5.in
-        output:
-          registers:
-            r:
-              type: char
-              value: "'a'"
-      - input_file: inputs/escaped_unicode6.in
-        output:
-          registers:
-            r:
-              type: char
-              value: "'a'"
-      - input_file: inputs/escaped.in
-        output:
-          registers:
-            r:
-              type: char
-              value: "'a'"
-      - input_file: inputs/hex1.in
-        output:
-          registers:
-            r:
-              type: char
-              value: "'a'"
-      - input_file: inputs/hex2.in
-        output:
-          registers:
-            r:
-              type: char
-              value: "'a'"
-      - input_file: inputs/unicode1.in
-        output:
-          registers:
-            r:
-              type: char
-              value: "'a'"
-      - input_file: inputs/unicode2.in
-        output:
-          registers:
-            r:
-              type: char
-              value: "'a'"
-      - input_file: inputs/unicode3.in
-        output:
-          registers:
-            r:
-              type: char
-              value: "'a'"
-      - input_file: inputs/unicode4.in
-        output:
-          registers:
-            r:
-              type: char
-              value: "'a'"
-      - input_file: inputs/unicode5.in
-        output:
-          registers:
-            r:
-              type: char
-              value: "'a'"
-    initial_ast: ac56e34b2a2cb282d36133df39d80947dfdfc56b5655b3ba9f408ba529c8f505
-    imports_resolved_ast: ac56e34b2a2cb282d36133df39d80947dfdfc56b5655b3ba9f408ba529c8f505
-    canonicalized_ast: ac56e34b2a2cb282d36133df39d80947dfdfc56b5655b3ba9f408ba529c8f505
-    type_inferenced_ast: 2eecf906226893c46f526a72f272a3f11eb34ada7cc4cd573439ebfed44ba170
+outputs: []
diff --git a/tests/expectations/compiler/compiler/char/nonprinting.leo.out b/tests/expectations/compiler/compiler/char/nonprinting.leo.out
index 2743086dc3..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/char/nonprinting.leo.out
+++ b/tests/expectations/compiler/compiler/char/nonprinting.leo.out
@@ -1,25 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 36
-      num_constraints: 3
-      at: 25579220a31118007fe071d3083ad5a5503f7dc6bd4d51abf15f1a7778a99c86
-      bt: 8f5bf097224289e45b78e01a711900a993240585fe13744f9ab71a9c5c4d9111
-      ct: df019f90846f94966d481bfb6d579bee9c47d281176e210ccd973210afc957a1
-    output:
-      - input_file: inputs/nonprinting.in
-        output:
-          registers:
-            r0:
-              type: "[char; 33]"
-              value: "\"\\u{0}\\u{1}\\u{2}\\u{3}\\u{4}\\u{5}\\u{6}\\u{7}\\u{8}\\t\\n\\u{b}\\u{c}\\r\\u{e}\\u{f}\\u{10}\\u{11}\\u{12}\\u{13}\\u{14}\\u{15}\\u{16}\\u{17}\\u{18}\\u{19}\\u{1a}\\u{1b}\\u{1c}\\u{1d}\\u{1e}\\u{1f} \""
-            r1:
-              type: bool
-              value: "true"
-    initial_ast: da8550065db88bba8f0a982612194f6122ec97025c4af5d3007d3a4d42519cb9
-    imports_resolved_ast: da8550065db88bba8f0a982612194f6122ec97025c4af5d3007d3a4d42519cb9
-    canonicalized_ast: da8550065db88bba8f0a982612194f6122ec97025c4af5d3007d3a4d42519cb9
-    type_inferenced_ast: b3ea99e7660209825c5bb1abcba8c1835cf96b79c8707e616513122ab10ac0d5
+outputs: []
diff --git a/tests/expectations/compiler/compiler/char/out.leo.out b/tests/expectations/compiler/compiler/char/out.leo.out
index e61799dc7c..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/char/out.leo.out
+++ b/tests/expectations/compiler/compiler/char/out.leo.out
@@ -1,106 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 6
-      num_constraints: 4
-      at: 2859fe6f24016b5634df2791da7de932e68ec32c73b5b573e0c39e968c7a4e12
-      bt: 8143508f19c8eee208a7fbbcfb833aeeace6ba0a761e41d028599d2237cc60fa
-      ct: d0c6feeed1e6b8d5c0e03dc9e25641b7fdc34ad912e2b1488296d4a99ed6cbf5
-    output:
-      - input_file: inputs/ascii.in
-        output:
-          registers:
-            r:
-              type: char
-              value: "'a'"
-      - input_file: inputs/escaped_unicode1.in
-        output:
-          registers:
-            r:
-              type: char
-              value: "'\\u{f}'"
-      - input_file: inputs/escaped_unicode2.in
-        output:
-          registers:
-            r:
-              type: char
-              value: "'å'"
-      - input_file: inputs/escaped_unicode3.in
-        output:
-          registers:
-            r:
-              type: char
-              value: "'Ӡ'"
-      - input_file: inputs/escaped_unicode4.in
-        output:
-          registers:
-            r:
-              type: char
-              value: "'\\u{2764}'"
-      - input_file: inputs/escaped_unicode5.in
-        output:
-          registers:
-            r:
-              type: char
-              value: "'\\u{1f622}'"
-      - input_file: inputs/escaped_unicode6.in
-        output:
-          registers:
-            r:
-              type: char
-              value: "'\\u{10001f}'"
-      - input_file: inputs/escaped.in
-        output:
-          registers:
-            r:
-              type: char
-              value: "'\\''"
-      - input_file: inputs/hex1.in
-        output:
-          registers:
-            r:
-              type: char
-              value: "'*'"
-      - input_file: inputs/hex2.in
-        output:
-          registers:
-            r:
-              type: char
-              value: "'\\u{7f}'"
-      - input_file: inputs/unicode1.in
-        output:
-          registers:
-            r:
-              type: char
-              value: "'\\u{e00f}'"
-      - input_file: inputs/unicode2.in
-        output:
-          registers:
-            r:
-              type: char
-              value: "'å'"
-      - input_file: inputs/unicode3.in
-        output:
-          registers:
-            r:
-              type: char
-              value: "'Ӡ'"
-      - input_file: inputs/unicode4.in
-        output:
-          registers:
-            r:
-              type: char
-              value: "'\\u{2764}'"
-      - input_file: inputs/unicode5.in
-        output:
-          registers:
-            r:
-              type: char
-              value: "'\\u{1f62d}'"
-    initial_ast: 6e1cf86d47e056682c6e51dcf0390eb34505b60d50de60970a688f237525bedf
-    imports_resolved_ast: 6e1cf86d47e056682c6e51dcf0390eb34505b60d50de60970a688f237525bedf
-    canonicalized_ast: 6e1cf86d47e056682c6e51dcf0390eb34505b60d50de60970a688f237525bedf
-    type_inferenced_ast: feb16e72f13a884e3303b336f7f20ff8ff4066a8f9861860e28b9c6901215b76
+outputs: []
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 0fc5a81aef..ef090731fb 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
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: input/dummy.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 58f66e3a45b1752bb5dbb454adbbe6136394a7a87bc7b812d154aec1d5eac816
-    imports_resolved_ast: 58f66e3a45b1752bb5dbb454adbbe6136394a7a87bc7b812d154aec1d5eac816
-    canonicalized_ast: f7359bbb8cecd0923c0aa7dd7fd6b01cb2c64e45f1e777709fb14d4e6ba0ee5a
-    type_inferenced_ast: f3a0378b8b60f66ca164be498224592907216262a54a92d878e52f0a85f53389
+outputs: []
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..3f519cf1b5 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
@@ -1,5 +1,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     |   ^^^^^^^^^^^^^^^^^^^^^^^^^^"
+outputs: []
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 43b8d36554..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/circuits/const_self_variable.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/const_self_variable.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: input/dummy.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 50c0f7261d879373f4e01ec3d140a2067ca4e78622c8340e8312d717f6effb05
-    imports_resolved_ast: 50c0f7261d879373f4e01ec3d140a2067ca4e78622c8340e8312d717f6effb05
-    canonicalized_ast: 50c0f7261d879373f4e01ec3d140a2067ca4e78622c8340e8312d717f6effb05
-    type_inferenced_ast: 161edd5d1900f2902bd8cc972308ce7fb0afe7c6cf64ab7cfe952c3f1b3189c0
+outputs: []
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 e995bb86db..3f519cf1b5 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
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - "Error [EASG0373032]: illegal assignment to immutable variable 'self'\n    --> compiler-test:7:9\n     |\n   7 |         self.a = new;\n     |         ^^^^^^^^^^^^"
+outputs: []
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 4a4ff1f5fd..ef090731fb 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
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 95
-      num_constraints: 95
-      at: a57d02fa8b8a2336cc5c407e6a9489a3cb89357e3a3d966f18d8f0f86c21602f
-      bt: e0a9aa0cab882fb690b28137d24f271ccaa334521934a3badc07592a31b7be7f
-      ct: 7b8a2025971971c829b68fc994c6761496807e5b091ba4360d90fb6f35f4656e
-    output:
-      - input_file: func_circ.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: bfd7751e8ea64c6d41af36d968f194a18a5411ac71932a67766f40448ce755f5
-    imports_resolved_ast: bfd7751e8ea64c6d41af36d968f194a18a5411ac71932a67766f40448ce755f5
-    canonicalized_ast: bfd7751e8ea64c6d41af36d968f194a18a5411ac71932a67766f40448ce755f5
-    type_inferenced_ast: 910b51f962861da6011f214a5379bc9296034e3fecda347b17c7db97df833a25
+outputs: []
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 3e8bc37c51..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/circuits/duplicate_name_context.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/duplicate_name_context.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: input/dummy.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: d8a66347f480161a2215c92d2cf6ded2d0b49fd76b7eb0036d4fa33de371925a
-    imports_resolved_ast: d8a66347f480161a2215c92d2cf6ded2d0b49fd76b7eb0036d4fa33de371925a
-    canonicalized_ast: d8a66347f480161a2215c92d2cf6ded2d0b49fd76b7eb0036d4fa33de371925a
-    type_inferenced_ast: d5bb87130d78bb39fa948ce868999184f90c78ada176cf08c49051517de3351c
+outputs: []
diff --git a/tests/expectations/compiler/compiler/circuits/inline.leo.out b/tests/expectations/compiler/compiler/circuits/inline.leo.out
index dff5b84d3e..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/circuits/inline.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/inline.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 32
-      num_constraints: 32
-      at: 4f36fe54f989d60bb9c279120800f4f44596c2efb7ba703669d4c4d591569780
-      bt: d378030968a64801f66d95699329086ca17e676d8bffcf73f6b431cbda7c7005
-      ct: dbd098af6556ed79650d149b1691be336a46f8bad6f327e942508dd11342575e
-    output:
-      - input_file: inline.in
-        output:
-          registers:
-            r0:
-              type: u32
-              value: "100"
-    initial_ast: c40a1d60f872fdb03ab7379a3abf43439a100b8f1546b76ffeac60c8739e0d68
-    imports_resolved_ast: c40a1d60f872fdb03ab7379a3abf43439a100b8f1546b76ffeac60c8739e0d68
-    canonicalized_ast: c40a1d60f872fdb03ab7379a3abf43439a100b8f1546b76ffeac60c8739e0d68
-    type_inferenced_ast: 3d56ffd95d1b84970e24f10a48f52053717876f062db72d8be93f413f7b2c9a3
+outputs: []
diff --git a/tests/expectations/compiler/compiler/circuits/inline_fail.leo.out b/tests/expectations/compiler/compiler/circuits/inline_fail.leo.out
index 8af6948767..3f519cf1b5 100644
--- a/tests/expectations/compiler/compiler/circuits/inline_fail.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/inline_fail.leo.out
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - "Error [EASG0373002]: missing circuit member 'x' for initialization of circuit 'Foo'\n    --> compiler-test:9:15\n     |\n   9 |     const a = Foo { y: 0u32 };\n     |               ^^^^^^^^^^^^^^^"
+outputs: []
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 53e7c8bd36..3f519cf1b5 100644
--- a/tests/expectations/compiler/compiler/circuits/inline_member_fail.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/inline_member_fail.leo.out
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - "Error [EASG0373002]: missing circuit member 'x' for initialization of circuit 'Foo'\n    --> compiler-test:9:15\n     |\n   9 |     const a = Foo { y };\n     |               ^^^^^^^^^"
+outputs: []
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 486a6ec9b8..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/circuits/inline_member_pass.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/inline_member_pass.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: inline.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: cf642f2f983cd8bcd6cbca2d2920f5234d79375601c1da3c06f97b6185a5629d
-    imports_resolved_ast: cf642f2f983cd8bcd6cbca2d2920f5234d79375601c1da3c06f97b6185a5629d
-    canonicalized_ast: f99560385252ad2965e39b19402e7c56db402458206187eeb54adc26effd9bb5
-    type_inferenced_ast: c7c5cd5ed24fd3967f19a5ad895aeb7778b3dfadc7965c3f5bc1d44c61448083
+outputs: []
diff --git a/tests/expectations/compiler/compiler/circuits/inline_undefined.leo.out b/tests/expectations/compiler/compiler/circuits/inline_undefined.leo.out
index 690ccca5b5..3f519cf1b5 100644
--- a/tests/expectations/compiler/compiler/circuits/inline_undefined.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/inline_undefined.leo.out
@@ -1,5 +1,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     |               ^^^"
+outputs: []
diff --git a/tests/expectations/compiler/compiler/circuits/member_function.leo.out b/tests/expectations/compiler/compiler/circuits/member_function.leo.out
index 48b1947e43..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/circuits/member_function.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/member_function.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: input/dummy.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 5273a592b167cfe040b2bca7337521084d7a6640651bca584545e9eeb2e4fa88
-    imports_resolved_ast: 5273a592b167cfe040b2bca7337521084d7a6640651bca584545e9eeb2e4fa88
-    canonicalized_ast: 5273a592b167cfe040b2bca7337521084d7a6640651bca584545e9eeb2e4fa88
-    type_inferenced_ast: 6d1bef6ecbba4533266f9478b06e52acc56f04850e99a658abffe39e7e463cdf
+outputs: []
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 fdaddd7eed..3f519cf1b5 100644
--- a/tests/expectations/compiler/compiler/circuits/member_function_fail.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/member_function_fail.leo.out
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - "Error [EASG0373001]: illegal reference to non-existant member 'echoed' of circuit 'Foo'\n    --> compiler-test:11:17\n     |\n  11 |     const err = a.echoed(1u32);\n     |                 ^^^^^^^^"
+outputs: []
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 fd47d80984..3f519cf1b5 100644
--- a/tests/expectations/compiler/compiler/circuits/member_function_invalid.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/member_function_invalid.leo.out
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - "Error [EASG0373008]: 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     |                 ^^^^^^"
+outputs: []
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 5428da7f87..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/circuits/member_function_nested.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/member_function_nested.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 161
-      num_constraints: 163
-      at: 4251eba02c1be1eeb4193b08906095b69cdec831207fe2ddba09e783ad4725ce
-      bt: 799dc824f6ba6a51959a395a3b5ebf05629aa241dbca9550190f32380b91ae1c
-      ct: 2aa6128cdf932752c8864c26a6a3d4991f3e6a75b22c1261a3389efa67375b01
-    output:
-      - input_file: inline.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 241f1a42877b012b2e2062cefbd83523a5c719557cb422cf1fbd7efb0f7b1796
-    imports_resolved_ast: 241f1a42877b012b2e2062cefbd83523a5c719557cb422cf1fbd7efb0f7b1796
-    canonicalized_ast: 241f1a42877b012b2e2062cefbd83523a5c719557cb422cf1fbd7efb0f7b1796
-    type_inferenced_ast: 2982ee6fda2fcbd00f64d2c0c75ccacf58ab05961f85e9a64cc0ddec12bb5209
+outputs: []
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 867b688fa2..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/circuits/member_static_function.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/member_static_function.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: input/dummy.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 11dfbfa2561534a1c965d8f8862b23ed56be50986903c139b763f88a1ba3ad8d
-    imports_resolved_ast: 11dfbfa2561534a1c965d8f8862b23ed56be50986903c139b763f88a1ba3ad8d
-    canonicalized_ast: 11dfbfa2561534a1c965d8f8862b23ed56be50986903c139b763f88a1ba3ad8d
-    type_inferenced_ast: 6aab6f0cf6a9237ec02b5ce3f4ad8f24c8faa8ec5ccbc7f3af1023d0269dceea
+outputs: []
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 9311064dc2..3f519cf1b5 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
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - "Error [EASG0373027]: 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     |                 ^^^"
+outputs: []
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 a10fb07f86..ef090731fb 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
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: input/dummy.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 42f603efbf7ee8ca53394266f33fbf09110420c822385179d656861e8ceb4a32
-    imports_resolved_ast: 42f603efbf7ee8ca53394266f33fbf09110420c822385179d656861e8ceb4a32
-    canonicalized_ast: 92d91209d7675fc14ae1fd44c28d1384f1c56c5852654b4dac46dd123340d9c0
-    type_inferenced_ast: 0527005fb0925ac29af65bb0c12c39991d466c20def41ce7e4a2ded51ae233fc
+outputs: []
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 918bf95807..3f519cf1b5 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
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - "Error [EASG0373001]: illegal reference to non-existant member 'echoed' of circuit 'Foo'\n    --> compiler-test:10:17\n     |\n  10 |     const err = Foo::echoed(1u32);\n     |                 ^^^^^^^^^^^"
+outputs: []
diff --git a/tests/expectations/compiler/compiler/circuits/member_variable.leo.out b/tests/expectations/compiler/compiler/circuits/member_variable.leo.out
index 01852c344d..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/circuits/member_variable.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/member_variable.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: input/dummy.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: cf41b78f9435c6555014db8aeebe662556f4f8547ee0f3a204d6f522fcf72644
-    imports_resolved_ast: cf41b78f9435c6555014db8aeebe662556f4f8547ee0f3a204d6f522fcf72644
-    canonicalized_ast: cf41b78f9435c6555014db8aeebe662556f4f8547ee0f3a204d6f522fcf72644
-    type_inferenced_ast: d947fa6d8fa1b34cc9822ade386062dbd6ebc2cb5987479d4263bcfa554586cd
+outputs: []
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 dafeae69a8..ef090731fb 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
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: input/dummy.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 622baae85ab7776fc38cff17465e8e0dbcdb98f4ba74e734ca494b696cea8ccd
-    imports_resolved_ast: 622baae85ab7776fc38cff17465e8e0dbcdb98f4ba74e734ca494b696cea8ccd
-    canonicalized_ast: 622baae85ab7776fc38cff17465e8e0dbcdb98f4ba74e734ca494b696cea8ccd
-    type_inferenced_ast: c604cecb0efbae6b8ea3d69909c5decbb06d6a2e95ff67661f5936ef8fd951a5
+outputs: []
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 eef6c84a76..3f519cf1b5 100644
--- a/tests/expectations/compiler/compiler/circuits/member_variable_fail.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/member_variable_fail.leo.out
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - "Error [EASG0373001]: illegal reference to non-existant member 'y' of circuit 'Foo'\n    --> compiler-test:9:17\n     |\n   9 |     const err = a.y;\n     |                 ^^^"
+outputs: []
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 f81a2e6a10..3f519cf1b5 100644
--- a/tests/expectations/compiler/compiler/circuits/mut_function_fail.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/mut_function_fail.leo.out
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - "Error [EASG0373006]: attempt to assign to function 'bar'\n    --> compiler-test:12:5\n     |\n  12 |     f.bar = 1u8;\n     |     ^^^^^^^^^^^"
+outputs: []
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 a560ec1f26..3f519cf1b5 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
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - "Error [EASG0373006]: attempt to assign to function 'bar'\n    --> compiler-test:9:9\n     |\n   9 |         self.bar = new;\n     |         ^^^^^^^^^^^^^^"
+outputs: []
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 a560ec1f26..3f519cf1b5 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
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - "Error [EASG0373006]: attempt to assign to function 'bar'\n    --> compiler-test:9:9\n     |\n   9 |         self.bar = new;\n     |         ^^^^^^^^^^^^^^"
+outputs: []
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 15d4737f53..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/circuits/mut_self_variable.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/mut_self_variable.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: input/dummy.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: ba91ea172a2f753bf4a338f29fff05c358d4dc0cb1c2ef461d492ee4fe2a1114
-    imports_resolved_ast: ba91ea172a2f753bf4a338f29fff05c358d4dc0cb1c2ef461d492ee4fe2a1114
-    canonicalized_ast: 8d1beaecc785aa79a5a6bec47cf10426b9d3d87ccc15c359f12c7d3ee2a95561
-    type_inferenced_ast: 520a83004a666274e62958b6e2025d11ed5e24d888b6bc0ded6d01ee9a3bc634
+outputs: []
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 075d930428..ef090731fb 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
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: input/dummy.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: fe7ca41c29d33107a4316b9c6788898217129937cbf1de0f2ea7566a360245f0
-    imports_resolved_ast: fe7ca41c29d33107a4316b9c6788898217129937cbf1de0f2ea7566a360245f0
-    canonicalized_ast: d2b30a9485e7166a0efde9d179432e481a4d40540e1b3eeec043b84d993e66df
-    type_inferenced_ast: 2c666d0e878095617bc562aa74de4fe069401b4a80ba8dba28a47a789f517ab5
+outputs: []
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 1f3edc74a6..ef090731fb 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
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: input/dummy.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 659e5fcdd16752c6e3504f821a5afd6f0756bd6b8641f127ba049c2a4c83a088
-    imports_resolved_ast: 659e5fcdd16752c6e3504f821a5afd6f0756bd6b8641f127ba049c2a4c83a088
-    canonicalized_ast: 8cf6113b757cfeee53554c67dd3f380f0f417032b8835259bf30076b19349f61
-    type_inferenced_ast: d4106eb006385de5bf2a56a1ebaa25a65b048f77dda6fb9585c86a9260073585
+outputs: []
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 e995bb86db..3f519cf1b5 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
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - "Error [EASG0373032]: illegal assignment to immutable variable 'self'\n    --> compiler-test:7:9\n     |\n   7 |         self.a = new;\n     |         ^^^^^^^^^^^^"
+outputs: []
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 3bd203bc2a..3f519cf1b5 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
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - "Error [EASG0373005]: 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     |                   ^"
+outputs: []
diff --git a/tests/expectations/compiler/compiler/circuits/mut_variable.leo.out b/tests/expectations/compiler/compiler/circuits/mut_variable.leo.out
index 2d1473ebfd..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/circuits/mut_variable.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/mut_variable.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: input/dummy.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 8c4a98dec3d2e9e826e3419c91a251e821861a146325b025c52ff15b5edefe1c
-    imports_resolved_ast: 8c4a98dec3d2e9e826e3419c91a251e821861a146325b025c52ff15b5edefe1c
-    canonicalized_ast: 8c4a98dec3d2e9e826e3419c91a251e821861a146325b025c52ff15b5edefe1c
-    type_inferenced_ast: 2497671092bacab8cb5d75177298a700100bfa8412a48a7115d178e5d9816a6b
+outputs: []
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 4e0dd84533..3f519cf1b5 100644
--- a/tests/expectations/compiler/compiler/circuits/mut_variable_fail.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/mut_variable_fail.leo.out
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - "Error [EASG0373032]: illegal assignment to immutable variable 'f'\n    --> compiler-test:10:5\n     |\n  10 |     f.a = 1u8;\n     |     ^^^^^^^^^"
+outputs: []
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 3e206e0757..ef090731fb 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
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: input/dummy.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 1f7de14429213b2b3b564d664c33e9cea134e1a157b861a1cf0ea1abc90b32f6
-    imports_resolved_ast: 1f7de14429213b2b3b564d664c33e9cea134e1a157b861a1cf0ea1abc90b32f6
-    canonicalized_ast: 94752f37ca7553267f341d2f96e657eb2fe6b5e403a4d3fb7d66d1662b81eb00
-    type_inferenced_ast: e675411217f3465fdc23bab3c2f50c2264452d198ab3dd2e8059e546e54312a4
+outputs: []
diff --git a/tests/expectations/compiler/compiler/circuits/pedersen_mock.leo.out b/tests/expectations/compiler/compiler/circuits/pedersen_mock.leo.out
index ba7f2afaa3..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/circuits/pedersen_mock.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/pedersen_mock.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 33823
-      num_constraints: 50719
-      at: 894e21b7ca1c178a167a94f174b4ea0d37b102b394100a15c92e78e16a87acdf
-      bt: 6756180897cb6c9fe53fce913fd9ad1c77a5b537b805da2c7f42de0473d12c94
-      ct: 2f2e90dcee9f8a28e7a9fd4ee37093e4d247d07e4ab97937ecd0ba60ec5dd903
-    output:
-      - input_file: pedersen.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: c341e62f8a3940ddc9527bcd01c814f8d496a1f02ca903b080b6228d155af02b
-    imports_resolved_ast: c341e62f8a3940ddc9527bcd01c814f8d496a1f02ca903b080b6228d155af02b
-    canonicalized_ast: 60cd9f24460e06522814151af817c9d394c779477091aab2c77c77dfe228b611
-    type_inferenced_ast: 876f075ed034c8914b9f74f46f07bd6c2ed3e7d7f1ffb15e756da10e9ec9abf8
+outputs: []
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 e10652f432..ef090731fb 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
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: input/dummy.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 5da09287f1d3a5e4ab57f8da2c8094df25c3b35614791e2f6e84a77b609f29b0
-    imports_resolved_ast: 5da09287f1d3a5e4ab57f8da2c8094df25c3b35614791e2f6e84a77b609f29b0
-    canonicalized_ast: de5114bff3425e0c67e9e70e3a0d02bdf2d6c3ed9108dac43a00b79d4db9b3d2
-    type_inferenced_ast: 9a6f5ee1784a1af0a04736e1b3bc886107bbddc5d45bbabd59812d083acacdea
+outputs: []
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 ac229cd771..ef090731fb 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
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: input/dummy.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 1dce719e850f6ca6a091fea163d5d6bb069bcdafeeed0a10fb332ba8837e6e5c
-    imports_resolved_ast: 1dce719e850f6ca6a091fea163d5d6bb069bcdafeeed0a10fb332ba8837e6e5c
-    canonicalized_ast: 3bd96f7e9530f426db4a2e12d5a93a5ebcafedbcb7b4549d08ad387fa15918d9
-    type_inferenced_ast: 6bbb246f57aa199b9ef31b61b6e858004617455efe22393892bf0c22f552d69a
+outputs: []
diff --git a/tests/expectations/compiler/compiler/circuits/self_circuit.leo.out b/tests/expectations/compiler/compiler/circuits/self_circuit.leo.out
index d12165d6a1..3f519cf1b5 100644
--- a/tests/expectations/compiler/compiler/circuits/self_circuit.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/self_circuit.leo.out
@@ -1,5 +1,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     |     ^^^^^^"
+outputs: []
diff --git a/tests/expectations/compiler/compiler/circuits/self_fail.leo.out b/tests/expectations/compiler/compiler/circuits/self_fail.leo.out
index 25126ce204..3f519cf1b5 100644
--- a/tests/expectations/compiler/compiler/circuits/self_fail.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/self_fail.leo.out
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - "Error [EASG0373000]: failed to resolve circuit: 'Self'\n    --> compiler-test:4:5\n     |\n   4 |     Self::main();\n     |     ^^^^"
+outputs: []
diff --git a/tests/expectations/compiler/compiler/circuits/self_member.leo.out b/tests/expectations/compiler/compiler/circuits/self_member.leo.out
index 40907b9500..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/circuits/self_member.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/self_member.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: input/dummy.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: c2f6d0da67de691b14cffbdbe20eba613f2ea274c45aba4347045da2446b6af6
-    imports_resolved_ast: c2f6d0da67de691b14cffbdbe20eba613f2ea274c45aba4347045da2446b6af6
-    canonicalized_ast: c2f6d0da67de691b14cffbdbe20eba613f2ea274c45aba4347045da2446b6af6
-    type_inferenced_ast: 3bf3d109f59519ecbfd601c36a8cb89cfb36e1ace395e361860023b8f93fc220
+outputs: []
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 85e1e719ef..3f519cf1b5 100644
--- a/tests/expectations/compiler/compiler/circuits/self_member_invalid.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/self_member_invalid.leo.out
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - "Error [EASG0373008]: cannot call static function 'bar' of circuit 'Foo' from target\n    --> compiler-test:13:17\n     |\n  13 |     const err = foo.bar();\n     |                 ^^^^^^^"
+outputs: []
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 604086e9eb..3f519cf1b5 100644
--- a/tests/expectations/compiler/compiler/circuits/self_member_undefined.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/self_member_undefined.leo.out
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - "Error [EASG0373008]: cannot call static function 'bar' of circuit 'Foo' from target\n    --> compiler-test:11:17\n     |\n  11 |     const err = foo.bar();\n     |                 ^^^^^^^"
+outputs: []
diff --git a/tests/expectations/compiler/compiler/console/assert.leo.out b/tests/expectations/compiler/compiler/console/assert.leo.out
index 7a1aa047e9..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/console/assert.leo.out
+++ b/tests/expectations/compiler/compiler/console/assert.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: assert.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: bd23695040d06dbd59426b363ea66da8c9344aad064615d1b5beb6326933acbc
-    imports_resolved_ast: bd23695040d06dbd59426b363ea66da8c9344aad064615d1b5beb6326933acbc
-    canonicalized_ast: bd23695040d06dbd59426b363ea66da8c9344aad064615d1b5beb6326933acbc
-    type_inferenced_ast: 198e2817e4d6d454d7e1d1eba8226757d7f044b20e6dd4f6962530b177c469c5
+outputs: []
diff --git a/tests/expectations/compiler/compiler/console/conditional_assert.leo.out b/tests/expectations/compiler/compiler/console/conditional_assert.leo.out
index 1fb87c4c58..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/console/conditional_assert.leo.out
+++ b/tests/expectations/compiler/compiler/console/conditional_assert.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: cond.in
-        output:
-          registers: {}
-      - input_file: cond_2.in
-        output:
-          registers: {}
-    initial_ast: a7b374e2c0a97af2160b5f6faeadb17a12e8908c1a7b3d251194e6867fd98f07
-    imports_resolved_ast: a7b374e2c0a97af2160b5f6faeadb17a12e8908c1a7b3d251194e6867fd98f07
-    canonicalized_ast: ebd1a1f28fafd6fc55c13f4c362ae9a13dee4717e41d99c23fd0d32c5fcdc526
-    type_inferenced_ast: eb15aba7bdb3c3a2f776af8cb80f52f44d6d6ab60e5ee3c032ab4ec8a90a2436
+outputs: []
diff --git a/tests/expectations/compiler/compiler/console/error.leo.out b/tests/expectations/compiler/compiler/console/error.leo.out
index da322715ae..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/console/error.leo.out
+++ b/tests/expectations/compiler/compiler/console/error.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: input/dummy.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 2496cb4a0f1486bbacccee48e3b8b93999916e585e238a5c7d63c34235d15a36
-    imports_resolved_ast: 2496cb4a0f1486bbacccee48e3b8b93999916e585e238a5c7d63c34235d15a36
-    canonicalized_ast: 2496cb4a0f1486bbacccee48e3b8b93999916e585e238a5c7d63c34235d15a36
-    type_inferenced_ast: aa056968c0d635d56e2ad011db4df7fec65b62eb7b0ca8ec5c75ca8fca0f33eb
+outputs: []
diff --git a/tests/expectations/compiler/compiler/console/log.leo.out b/tests/expectations/compiler/compiler/console/log.leo.out
index 6cf52c9b4d..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/console/log.leo.out
+++ b/tests/expectations/compiler/compiler/console/log.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: input/dummy.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 8421d5ef70b41b773b771cb1991a5120a556d13127fb1c6cf7bbd6328150c7d5
-    imports_resolved_ast: 8421d5ef70b41b773b771cb1991a5120a556d13127fb1c6cf7bbd6328150c7d5
-    canonicalized_ast: 8421d5ef70b41b773b771cb1991a5120a556d13127fb1c6cf7bbd6328150c7d5
-    type_inferenced_ast: 34e28d45203ffd3ec760af7baf8db09cfb14584107951fc5803122c0fc13f0e2
+outputs: []
diff --git a/tests/expectations/compiler/compiler/console/log_conditional.leo.out b/tests/expectations/compiler/compiler/console/log_conditional.leo.out
index d2c91fd30b..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/console/log_conditional.leo.out
+++ b/tests/expectations/compiler/compiler/console/log_conditional.leo.out
@@ -1,28 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 190
-      num_constraints: 190
-      at: a1a80b7c355e1fa32c2136c4dc7a0fd0670affbdda869a9161a3a69f396c6b9a
-      bt: fbf306d0d13bf3d40926ad7adc07f122cb8d065e7e5d55f3416ac30d7ebe7a7c
-      ct: 97e2acff1b76912c52107342393ec04a09af81353a25f7ce330b8492f41381cf
-    output:
-      - input_file: input/input_unequal.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "false"
-      - input_file: input/input_equal.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 389c0d4a68bf27db627b83d460a2947a2321a76fc73e727806a9fe8c7f63fe88
-    imports_resolved_ast: 389c0d4a68bf27db627b83d460a2947a2321a76fc73e727806a9fe8c7f63fe88
-    canonicalized_ast: 389c0d4a68bf27db627b83d460a2947a2321a76fc73e727806a9fe8c7f63fe88
-    type_inferenced_ast: d5fe9155615c6ca70430e6b33661214f14844a61d5064ad56d388fea147abfd7
+outputs: []
diff --git a/tests/expectations/compiler/compiler/console/log_fail.leo.out b/tests/expectations/compiler/compiler/console/log_fail.leo.out
index 3d62711430..3f519cf1b5 100644
--- a/tests/expectations/compiler/compiler/console/log_fail.leo.out
+++ b/tests/expectations/compiler/compiler/console/log_fail.leo.out
@@ -1,5 +1,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     |                  ^^^^^"
+outputs: []
diff --git a/tests/expectations/compiler/compiler/console/log_input.leo.out b/tests/expectations/compiler/compiler/console/log_input.leo.out
index f185bd153a..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/console/log_input.leo.out
+++ b/tests/expectations/compiler/compiler/console/log_input.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: input/dummy.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: de5d7719988638c095aba736ca2e09c2037be42e22c3b29bc2c07705e7bfd6ee
-    imports_resolved_ast: de5d7719988638c095aba736ca2e09c2037be42e22c3b29bc2c07705e7bfd6ee
-    canonicalized_ast: de5d7719988638c095aba736ca2e09c2037be42e22c3b29bc2c07705e7bfd6ee
-    type_inferenced_ast: 8e6fed7036467ea6116184b59b25589393393308a1c1fe963dc0ac4a9e76481a
+outputs: []
diff --git a/tests/expectations/compiler/compiler/console/log_parameter.leo.out b/tests/expectations/compiler/compiler/console/log_parameter.leo.out
index 3d65eacddb..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/console/log_parameter.leo.out
+++ b/tests/expectations/compiler/compiler/console/log_parameter.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: input/dummy.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 97523a5fea528d3defe4ddc2fa7b0a8af6b4ea8a364893c62c467f759cb4ee3f
-    imports_resolved_ast: 97523a5fea528d3defe4ddc2fa7b0a8af6b4ea8a364893c62c467f759cb4ee3f
-    canonicalized_ast: 97523a5fea528d3defe4ddc2fa7b0a8af6b4ea8a364893c62c467f759cb4ee3f
-    type_inferenced_ast: 613f187637adb705d9b61d73f3dd074de1443bc619326e2fd51fa8f722579f82
+outputs: []
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..3f519cf1b5 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
@@ -1,5 +1,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     |                 ^^^^"
+outputs: []
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..3f519cf1b5 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
@@ -1,5 +1,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     |                 ^^^^^^^^"
+outputs: []
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 13d96cc9b2..3f519cf1b5 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
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - "Error [EASG0373027]: failed to resolve variable reference 'a'\n    --> compiler-test:4:23\n     |\n   4 |     console.log(\"{}\", a);\n     |                       ^"
+outputs: []
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 e294fa474c..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/console/log_parameter_many.leo.out
+++ b/tests/expectations/compiler/compiler/console/log_parameter_many.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: input/dummy.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: af681f8f7631db769ad1f0b9822b86407fb04871adb16e1069b83ee85b6cda3e
-    imports_resolved_ast: af681f8f7631db769ad1f0b9822b86407fb04871adb16e1069b83ee85b6cda3e
-    canonicalized_ast: af681f8f7631db769ad1f0b9822b86407fb04871adb16e1069b83ee85b6cda3e
-    type_inferenced_ast: c9824cee4e17d7cdb31526d24ed5aea45f719596b8dad46f4aec822fbff92e50
+outputs: []
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 6b1788bf0c..3f519cf1b5 100644
--- a/tests/expectations/compiler/compiler/core/core_circuit_invalid.leo.out
+++ b/tests/expectations/compiler/compiler/core/core_circuit_invalid.leo.out
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - "Error [EASG0373043]: failed to resolve import: 'core.unstable.blake2s'\n    --> compiler-test:3:30\n     |\n   3 | import core.unstable.blake2s.BadCircuit; // `BadCircuit` is not included in the blake2s package\n     |                              ^^^^^^^^^^"
+outputs: []
diff --git a/tests/expectations/compiler/compiler/core/core_circuit_star_fail.leo.out b/tests/expectations/compiler/compiler/core/core_circuit_star_fail.leo.out
index c5cfe9c2bc..3f519cf1b5 100644
--- a/tests/expectations/compiler/compiler/core/core_circuit_star_fail.leo.out
+++ b/tests/expectations/compiler/compiler/core/core_circuit_star_fail.leo.out
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - "Error [EAST0372011]: failed to resolve import: 'core'\n    --> compiler-test:3:13\n     |\n   3 | import core.*; // You cannot import all dependencies from core at once\n     |             ^"
+outputs: []
diff --git a/tests/expectations/compiler/compiler/core/core_package_invalid.leo.out b/tests/expectations/compiler/compiler/core/core_package_invalid.leo.out
index 1d348aeb97..3f519cf1b5 100644
--- a/tests/expectations/compiler/compiler/core/core_package_invalid.leo.out
+++ b/tests/expectations/compiler/compiler/core/core_package_invalid.leo.out
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - "Error [EAST0372011]: failed to resolve import: 'core'\n    --> compiler-test:3:13\n     |\n   3 | import core.bad_circuit; // `bad_circuit` is not a core package\n     |             ^^^^^^^^^^^"
+outputs: []
diff --git a/tests/expectations/compiler/compiler/core/core_unstable_package_invalid.leo.out b/tests/expectations/compiler/compiler/core/core_unstable_package_invalid.leo.out
index ff3bf66480..3f519cf1b5 100644
--- a/tests/expectations/compiler/compiler/core/core_unstable_package_invalid.leo.out
+++ b/tests/expectations/compiler/compiler/core/core_unstable_package_invalid.leo.out
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - "Error [EAST0372011]: failed to resolve import: 'core.unstable'\n    --> compiler-test:3:22\n     |\n   3 | import core.unstable.bad_circuit; // `bad_circuit` is not a core unstable package\n     |                      ^^^^^^^^^^^"
+outputs: []
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 ea0de75b49..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/definition/out_of_order.leo.out
+++ b/tests/expectations/compiler/compiler/definition/out_of_order.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: input/dummy.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 2b8f9e74a55ef80fa57c803636de64003b225c4cc4b826d0feba3be380ec0b32
-    imports_resolved_ast: 2b8f9e74a55ef80fa57c803636de64003b225c4cc4b826d0feba3be380ec0b32
-    canonicalized_ast: 56bb9f0f648dde5fd777de5bba07c44218022d1b91410b6b111bf49fb119588d
-    type_inferenced_ast: ef607716cf7d424af7888a58b121cf8c43a173424d06b04d8530f0db96dd2c31
+outputs: []
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 e0d71173c8..ef090731fb 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
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: input/dummy.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 53fcf08b3818e474a00c1cb70aca58d29bb956611ffdd069a242ef2633af6c50
-    imports_resolved_ast: 80581d0ec6076d59b9fbaff32b646df1120b6ca28cdfe69482cbec641e7e3a1a
-    canonicalized_ast: 57c3de1d28c5b809c265e221ad26d3970445174a2edf2b0f22995e4eb6ffd807
-    type_inferenced_ast: ca53699361b6d4aa80b2f733df6f39bd1a279d68336c2c6cbf196897a26b5e2a
+outputs: []
diff --git a/tests/expectations/compiler/compiler/field/add.leo.out b/tests/expectations/compiler/compiler/field/add.leo.out
index 2238b1d873..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/field/add.leo.out
+++ b/tests/expectations/compiler/compiler/field/add.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 5
-      num_constraints: 3
-      at: 58e404664f2d64d2fd5fee64bf6e997f542a822b8b17e394fcdd7bed05386db8
-      bt: f91b8601243dbd0d25e7df8f34ff304ca78a295fdfafbe0102ec6ce4fcb3c0f0
-      ct: fe68b86a12c0b8c1585a656d7c4b8c47fbe19677b5da7ce0aae1d80dffb2a2ca
-    output:
-      - input_file: inputs/fields.in
-        output:
-          registers:
-            r:
-              type: bool
-              value: "true"
-    initial_ast: dc99169bc40dff6491c84f2b70dc970fb74d8bcb139ce23ab2b0da5bff720430
-    imports_resolved_ast: dc99169bc40dff6491c84f2b70dc970fb74d8bcb139ce23ab2b0da5bff720430
-    canonicalized_ast: dc99169bc40dff6491c84f2b70dc970fb74d8bcb139ce23ab2b0da5bff720430
-    type_inferenced_ast: 50e3aacddace87d41cc0c5ec8b9819a5c40ca1c9c3574ea883b85b8fd77c1cc3
+outputs: []
diff --git a/tests/expectations/compiler/compiler/field/div.leo.out b/tests/expectations/compiler/compiler/field/div.leo.out
index b39950d9e7..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/field/div.leo.out
+++ b/tests/expectations/compiler/compiler/field/div.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 7
-      num_constraints: 5
-      at: 545f3730dcbdb3a3dff41db4263dd41f9be9cf279fdc3cde9518973db0c88685
-      bt: 0a5ae5a6be6351f852bbcc193e57320be38fff279cf6fd65a3239c3a64239b27
-      ct: f25b05da849d0d7fcaab89d41d9624efacb48b7ba983f73a0d5f383b16f7009b
-    output:
-      - input_file: inputs/fields.in
-        output:
-          registers:
-            r:
-              type: bool
-              value: "true"
-    initial_ast: 4f93fba73bf22c15fd88cd83958c1d096f5fcdfbe1c95e871f14cd672e4790e8
-    imports_resolved_ast: 4f93fba73bf22c15fd88cd83958c1d096f5fcdfbe1c95e871f14cd672e4790e8
-    canonicalized_ast: 4f93fba73bf22c15fd88cd83958c1d096f5fcdfbe1c95e871f14cd672e4790e8
-    type_inferenced_ast: 9b23dc524ac18ebeb198dde3e95d00cf452183cbfe0652c232a7ae0b29d4f34e
+outputs: []
diff --git a/tests/expectations/compiler/compiler/field/eq.leo.out b/tests/expectations/compiler/compiler/field/eq.leo.out
index 19bf013d51..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/field/eq.leo.out
+++ b/tests/expectations/compiler/compiler/field/eq.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 4
-      num_constraints: 3
-      at: ca775a363045cd405dd1d60cd10edb6cc6e4c0b164934951dab0977509b8225c
-      bt: 02c492cb6df07172e56cffd0cfd902a8443921e1256a2d907bbabd30bf6b8f6d
-      ct: a1f8e2b168c0f2f28f0ca3f16ce9b25ba7f7c410cfd68b0912bf19c90b53f2a2
-    output:
-      - input_file: inputs/fields.in
-        output:
-          registers:
-            r:
-              type: bool
-              value: "true"
-    initial_ast: 279038173ca3a2bbeaefe14da8c79f4da2a885f59626a7ebc05a512f38a96e79
-    imports_resolved_ast: 279038173ca3a2bbeaefe14da8c79f4da2a885f59626a7ebc05a512f38a96e79
-    canonicalized_ast: 279038173ca3a2bbeaefe14da8c79f4da2a885f59626a7ebc05a512f38a96e79
-    type_inferenced_ast: 0c67233c225770430cb57c611f70eeb248a7892884b140aa4e141c9a46bb48b8
+outputs: []
diff --git a/tests/expectations/compiler/compiler/field/field.leo.out b/tests/expectations/compiler/compiler/field/field.leo.out
index 3c66b486b6..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/field/field.leo.out
+++ b/tests/expectations/compiler/compiler/field/field.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 4
-      num_constraints: 3
-      at: cfcc3adf871aef0910034c4c3478746733a9746d44fd678971ee2e1e5e69dffd
-      bt: 02c492cb6df07172e56cffd0cfd902a8443921e1256a2d907bbabd30bf6b8f6d
-      ct: a1f8e2b168c0f2f28f0ca3f16ce9b25ba7f7c410cfd68b0912bf19c90b53f2a2
-    output:
-      - input_file: inputs/fields.in
-        output:
-          registers:
-            r:
-              type: bool
-              value: "true"
-    initial_ast: ab26194ed8eb600aca9329f95d1d34f567f8f23a7f3abf1bd374d68fedf835ab
-    imports_resolved_ast: ab26194ed8eb600aca9329f95d1d34f567f8f23a7f3abf1bd374d68fedf835ab
-    canonicalized_ast: ab26194ed8eb600aca9329f95d1d34f567f8f23a7f3abf1bd374d68fedf835ab
-    type_inferenced_ast: a129961f338ed15ef697362226422a48534480c0985c5023ea5183e9150cba07
+outputs: []
diff --git a/tests/expectations/compiler/compiler/field/mul.leo.out b/tests/expectations/compiler/compiler/field/mul.leo.out
index ca464c6b39..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/field/mul.leo.out
+++ b/tests/expectations/compiler/compiler/field/mul.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 6
-      num_constraints: 4
-      at: 7dcea624bdc7a6e6fb5f5e93395e84a96db66898779eb3f5595c4e30e3684f17
-      bt: c21a8e9f463d2fad68fd3a88904dd88f2a3dc7dcb01835357fa4ee457ef1673b
-      ct: 4b4ef106804964b8a1ee7c1dad3d4682d20a0d07f576130bfec9989b353bf596
-    output:
-      - input_file: inputs/fields.in
-        output:
-          registers:
-            r:
-              type: bool
-              value: "false"
-    initial_ast: 8d0d2d5203583fe24eb60eb496dcdc3a83066ad82a8b5e92d35ab6b803e029ea
-    imports_resolved_ast: 8d0d2d5203583fe24eb60eb496dcdc3a83066ad82a8b5e92d35ab6b803e029ea
-    canonicalized_ast: 8d0d2d5203583fe24eb60eb496dcdc3a83066ad82a8b5e92d35ab6b803e029ea
-    type_inferenced_ast: 09780678c1e754f760bf08f1aecc706c058ffa6b73885dd5440f40e6354ac926
+outputs: []
diff --git a/tests/expectations/compiler/compiler/field/negate.leo.out b/tests/expectations/compiler/compiler/field/negate.leo.out
index 542372e6d8..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/field/negate.leo.out
+++ b/tests/expectations/compiler/compiler/field/negate.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 4
-      num_constraints: 3
-      at: cc1286e0b6fa2e90fb6f0880431a7c1e2cc37a329fae3aff1c13f51036c66f12
-      bt: 02c492cb6df07172e56cffd0cfd902a8443921e1256a2d907bbabd30bf6b8f6d
-      ct: a1f8e2b168c0f2f28f0ca3f16ce9b25ba7f7c410cfd68b0912bf19c90b53f2a2
-    output:
-      - input_file: inputs/fields.in
-        output:
-          registers:
-            r:
-              type: bool
-              value: "true"
-    initial_ast: cbae2cc36e7902468336fe1356e7de41a43288ebfd6b024251086b9d8a32cec5
-    imports_resolved_ast: cbae2cc36e7902468336fe1356e7de41a43288ebfd6b024251086b9d8a32cec5
-    canonicalized_ast: cbae2cc36e7902468336fe1356e7de41a43288ebfd6b024251086b9d8a32cec5
-    type_inferenced_ast: bd4b2bb9ce68719f78756803cbcde2f7dc0aa09f1f2612fa909bd2df39816dfb
+outputs: []
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..3f519cf1b5 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
@@ -1,5 +1,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     |             ^"
+outputs: []
diff --git a/tests/expectations/compiler/compiler/function/array_input.leo.out b/tests/expectations/compiler/compiler/function/array_input.leo.out
index 397414838c..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/function/array_input.leo.out
+++ b/tests/expectations/compiler/compiler/function/array_input.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: input/dummy.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: e53134e16501c1dc8fcc1fa68e513aa486d6b4ee2c3ce762da4b45b8f06029d1
-    imports_resolved_ast: e53134e16501c1dc8fcc1fa68e513aa486d6b4ee2c3ce762da4b45b8f06029d1
-    canonicalized_ast: 9024b75cbe9df679b3b0473589f2a1698bfc340d125c9bd76562d9e92548b945
-    type_inferenced_ast: 5c1f49685a0e099ecd11607a35c6e67c97d5dec8551c153cd5789e07006b1318
+outputs: []
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 c391a82254..ef090731fb 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
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: input/dummy.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 8541fbc5a256e744d4939e6e221565a0bada891ed6269eceb3a84b288bdeadcc
-    imports_resolved_ast: 8541fbc5a256e744d4939e6e221565a0bada891ed6269eceb3a84b288bdeadcc
-    canonicalized_ast: b43be48e63718566c98d68fb855f0de85845855b9eb80f7929205db537bc1da2
-    type_inferenced_ast: 558ac6d5261ca88b84d1a26447cf01b6e250fecc219441e0b4cb82d31c2e4dcc
+outputs: []
diff --git a/tests/expectations/compiler/compiler/function/conditional_return.leo.out b/tests/expectations/compiler/compiler/function/conditional_return.leo.out
index 268f73fc7a..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/function/conditional_return.leo.out
+++ b/tests/expectations/compiler/compiler/function/conditional_return.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 95
-      num_constraints: 127
-      at: 2cbb45563950440ec6b2ad12e378f1df49d6a12d4e773f0aa898f65f4eb109ff
-      bt: 7e12153373f45abf58e3b2954d1f1abfc951c7c1203e9e6c96fc37d9d25d8442
-      ct: 50977b6cd45450d9fddf5934d9167f889165f6ff117b03bb780bd6d89434daf4
-    output:
-      - input_file: input/integers.in
-        output:
-          registers:
-            a:
-              type: u32
-              value: "4"
-    initial_ast: cf2d49dcd581c923b4ccfeb9c155de0e836fb8725c3c3af7abc5e6334231ba2f
-    imports_resolved_ast: cf2d49dcd581c923b4ccfeb9c155de0e836fb8725c3c3af7abc5e6334231ba2f
-    canonicalized_ast: cf2d49dcd581c923b4ccfeb9c155de0e836fb8725c3c3af7abc5e6334231ba2f
-    type_inferenced_ast: 085d3126391766edfb8cd9b92bff04cb67175fea26de3ff127392f4aab681cf8
+outputs: []
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 3d740f571f..3f519cf1b5 100644
--- a/tests/expectations/compiler/compiler/function/duplicate_definition_fail.leo.out
+++ b/tests/expectations/compiler/compiler/function/duplicate_definition_fail.leo.out
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - "Error [EASG0373015]: a function named \"main\" already exists in this scope\n    --> compiler-test:8:1\n     |\n   8 | function main() {\n   9 |      ...\n  10 | }\n     | ^"
+outputs: []
diff --git a/tests/expectations/compiler/compiler/function/duplicate_parameter_fail.leo.out b/tests/expectations/compiler/compiler/function/duplicate_parameter_fail.leo.out
index 7edb1e7d52..3f519cf1b5 100644
--- a/tests/expectations/compiler/compiler/function/duplicate_parameter_fail.leo.out
+++ b/tests/expectations/compiler/compiler/function/duplicate_parameter_fail.leo.out
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - "Error [EASG0373045]: a function input named \"a\" already exists in this scope\n    --> compiler-test:3:23\n     |\n   3 | function main(a: u32, a: u32) {\n     |                       ^"
+outputs: []
diff --git a/tests/expectations/compiler/compiler/function/empty.leo.out b/tests/expectations/compiler/compiler/function/empty.leo.out
index 0cf4e77f14..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/function/empty.leo.out
+++ b/tests/expectations/compiler/compiler/function/empty.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: input/dummy.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: cab7d9499f0129277addc5a322ee12374593a292749c88220555b8ec73a0855a
-    imports_resolved_ast: cab7d9499f0129277addc5a322ee12374593a292749c88220555b8ec73a0855a
-    canonicalized_ast: e95711f5d76b04852f206614b42e6e38cc83b307d617e4eaaca8ade4c65e1c7b
-    type_inferenced_ast: fede77484a950576c3362c642eb3225e51c7a1ad0998950eb77cdd66630f92de
+outputs: []
diff --git a/tests/expectations/compiler/compiler/function/iteration.leo.out b/tests/expectations/compiler/compiler/function/iteration.leo.out
index 07abe01cec..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/function/iteration.leo.out
+++ b/tests/expectations/compiler/compiler/function/iteration.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: input/dummy.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: a608123169470d0c7e940599945a527f8516b010c900464bc649db94167ee6e0
-    imports_resolved_ast: a608123169470d0c7e940599945a527f8516b010c900464bc649db94167ee6e0
-    canonicalized_ast: 721cf0941964bdfd4835cb367fa7c472ad612ad214686ce4ca7f264faf43b0fd
-    type_inferenced_ast: ff52c35a361f5669d3f9ba5ec58b740c190bb3737a8e2e0485d41f8ace63a7d4
+outputs: []
diff --git a/tests/expectations/compiler/compiler/function/iteration_repeated.leo.out b/tests/expectations/compiler/compiler/function/iteration_repeated.leo.out
index 6050614409..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/function/iteration_repeated.leo.out
+++ b/tests/expectations/compiler/compiler/function/iteration_repeated.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: input/dummy.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 45b332b088617597f7367003f3cf7c6bf00a69a490f2c64eed1e622eb099d2b6
-    imports_resolved_ast: 45b332b088617597f7367003f3cf7c6bf00a69a490f2c64eed1e622eb099d2b6
-    canonicalized_ast: 71c61b47872ad3a5e9724e6d7bcb315eb06f00234bcbb2ab801861f9561bc9ff
-    type_inferenced_ast: 038d42871e44b9d120c49d4465ebf2551af030799827c08363c0a032f3ba712e
+outputs: []
diff --git a/tests/expectations/compiler/compiler/function/multiple_returns.leo.out b/tests/expectations/compiler/compiler/function/multiple_returns.leo.out
index 24c8f41281..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/function/multiple_returns.leo.out
+++ b/tests/expectations/compiler/compiler/function/multiple_returns.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: input/dummy.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: c43d366baa8a13cae723e98783ec3afc4efd25da0e9c075b2719af866c142c31
-    imports_resolved_ast: c43d366baa8a13cae723e98783ec3afc4efd25da0e9c075b2719af866c142c31
-    canonicalized_ast: c43d366baa8a13cae723e98783ec3afc4efd25da0e9c075b2719af866c142c31
-    type_inferenced_ast: cd99ea6925a98417f259aa058291494bb866060239e6c36715960f75f1497c2a
+outputs: []
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 6b1a084492..3f519cf1b5 100644
--- a/tests/expectations/compiler/compiler/function/multiple_returns_fail.leo.out
+++ b/tests/expectations/compiler/compiler/function/multiple_returns_fail.leo.out
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - "Error [EASG0373034]: 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     |     ^"
+outputs: []
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 a7586b72b2..3f519cf1b5 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
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - "Error [EASG0373033]: 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     | ^"
+outputs: []
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 48df2bb219..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/function/multiple_returns_main.leo.out
+++ b/tests/expectations/compiler/compiler/function/multiple_returns_main.leo.out
@@ -1,25 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 2
-      num_constraints: 2
-      at: 401937c524c61a28b4fab76d7a1f85bb628850012af62362a0922610372faf92
-      bt: cdf9a9cee4f2edf55111a95ae60bde9801080f6bde638a5c79273a39a2f9f7f5
-      ct: 643d5437104296e21d906ecb15b2c96ad278f20cfc4af53b12bb6069bd853726
-    output:
-      - input_file: input/dummy.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-            r1:
-              type: bool
-              value: "true"
-    initial_ast: f8b2853c4b5db8f5e8402455ceae54d8ae421c4b950d15fc88fe9f9c9a9701b8
-    imports_resolved_ast: f8b2853c4b5db8f5e8402455ceae54d8ae421c4b950d15fc88fe9f9c9a9701b8
-    canonicalized_ast: f8b2853c4b5db8f5e8402455ceae54d8ae421c4b950d15fc88fe9f9c9a9701b8
-    type_inferenced_ast: 8a3cbc4e3f51c432179167c22247efecc49afe8990c5b2e5a1eb757d0f5adad9
+outputs: []
diff --git a/tests/expectations/compiler/compiler/function/newlines.leo.out b/tests/expectations/compiler/compiler/function/newlines.leo.out
index f786c38c0d..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/function/newlines.leo.out
+++ b/tests/expectations/compiler/compiler/function/newlines.leo.out
@@ -1,25 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 64
-      num_constraints: 64
-      at: 2517dbbd3bc6f74f73a279bfe223141cdef8fce801edcc2972d568a815e43bcd
-      bt: 3a136bbbffaef5f4563e06a03444cfe5c512767d8c88a8be5b39034e18fe0081
-      ct: 60e36dc4bc844fe8285371cf70c955b79990f094bc50b3401dcac4cbede63e8d
-    output:
-      - input_file: input/integers.in
-        output:
-          registers:
-            a:
-              type: u32
-              value: "0"
-            b:
-              type: u32
-              value: "0"
-    initial_ast: 659826ae1cff74192eca6a5936459d0ec78b73a389516602b4d04cf6b80b1004
-    imports_resolved_ast: 659826ae1cff74192eca6a5936459d0ec78b73a389516602b4d04cf6b80b1004
-    canonicalized_ast: 659826ae1cff74192eca6a5936459d0ec78b73a389516602b4d04cf6b80b1004
-    type_inferenced_ast: 9b105138d6298e591c2882c5162f18c4f0dc223ab4128e09ce35b44ad14d2269
+outputs: []
diff --git a/tests/expectations/compiler/compiler/function/repeated.leo.out b/tests/expectations/compiler/compiler/function/repeated.leo.out
index 194613e53c..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/function/repeated.leo.out
+++ b/tests/expectations/compiler/compiler/function/repeated.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: input/dummy.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 46f6995392feecd25891b21595f4c575527c5d589d2fe9da94c6ac4bf8e9e7ea
-    imports_resolved_ast: 46f6995392feecd25891b21595f4c575527c5d589d2fe9da94c6ac4bf8e9e7ea
-    canonicalized_ast: 46f6995392feecd25891b21595f4c575527c5d589d2fe9da94c6ac4bf8e9e7ea
-    type_inferenced_ast: 06a0c346db5203f1f3db18eff7c5cf26f6f82aba1ff8b5696bdce5df09dd1b28
+outputs: []
diff --git a/tests/expectations/compiler/compiler/function/return.leo.out b/tests/expectations/compiler/compiler/function/return.leo.out
index 5a31d2fb98..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/function/return.leo.out
+++ b/tests/expectations/compiler/compiler/function/return.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: input/dummy.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: e90708076fd49dc98d0de821c59d48efbf93b106e50fb43c10583a29b2c34336
-    imports_resolved_ast: e90708076fd49dc98d0de821c59d48efbf93b106e50fb43c10583a29b2c34336
-    canonicalized_ast: e90708076fd49dc98d0de821c59d48efbf93b106e50fb43c10583a29b2c34336
-    type_inferenced_ast: de9f76b0880df3267d0031ecf46d21907a338ef64455ffac3aaf3ef6111148f6
+outputs: []
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 0aca9e37e9..3f519cf1b5 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
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - "Error [EASG0373025]: 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     |            ^^^^^^^^^^^^^"
+outputs: []
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 046e409de6..ef090731fb 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
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: input/dummy.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: e6ef0c39821512fd98748cd7d9da04102fff12d3f9332aeb815b36870a3ff0c5
-    imports_resolved_ast: e6ef0c39821512fd98748cd7d9da04102fff12d3f9332aeb815b36870a3ff0c5
-    canonicalized_ast: ed7a3f6a24fa1a3a9e7b4cc8c97ce09440fb9d46123a4e310e44afb58a1a1de6
-    type_inferenced_ast: a0aa0fb8a603954c8370d3520394910163acb807ec344d14b6a26f14f2912262
+outputs: []
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 231dbf0254..3f519cf1b5 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
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - "Error [EASG0373025]: 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     |            ^^^^^^^^^^^^^"
+outputs: []
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 b11f8bf73b..ef090731fb 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
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: input/dummy.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: eb9e4ceedbd5812235005bd1f6b113fb8558b59f87acb3df796ff08b15ec14ca
-    imports_resolved_ast: eb9e4ceedbd5812235005bd1f6b113fb8558b59f87acb3df796ff08b15ec14ca
-    canonicalized_ast: 9d46523fc611325b41481c2084e8eb9215573cc46d69b8aa5082bc9489bd9f44
-    type_inferenced_ast: 0f025d6f74e4ca27c52316acd2efcb4cc4158d1ba9ea6f79a46f4e417b918173
+outputs: []
diff --git a/tests/expectations/compiler/compiler/function/return_tuple.leo.out b/tests/expectations/compiler/compiler/function/return_tuple.leo.out
index 7d3dd37c72..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/function/return_tuple.leo.out
+++ b/tests/expectations/compiler/compiler/function/return_tuple.leo.out
@@ -1,25 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 65
-      num_constraints: 66
-      at: 0c8cb242ee3815f5ea6fdd08873577a6cc51fcfbda8cb5671f0b4dc851939d07
-      bt: 32bbce55a7ed95a5b0277ef5ddfa171ad065c5c7c743031d8b0bd8e50e51b0af
-      ct: 1390f763c4329cb5c51853b83d8d5d6e92d8ea8fed8fc7299285908d14c9d3b4
-    output:
-      - input_file: tuple.in
-        output:
-          registers:
-            r0:
-              type: "(u8, u8)"
-              value: "(1, 2)"
-            r1:
-              type: u32
-              value: "103"
-    initial_ast: 3818078d8b7b34d11b38a9e53d326543a357f4db169acc32a52e2b08a8126602
-    imports_resolved_ast: 3818078d8b7b34d11b38a9e53d326543a357f4db169acc32a52e2b08a8126602
-    canonicalized_ast: 3818078d8b7b34d11b38a9e53d326543a357f4db169acc32a52e2b08a8126602
-    type_inferenced_ast: 3eb5fbe370ce358e9d00865a230bb5eb6f2cfdb85f30408a164da43dfe16277d
+outputs: []
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 0d26ed29e9..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/function/return_tuple_conditional.leo.out
+++ b/tests/expectations/compiler/compiler/function/return_tuple_conditional.leo.out
@@ -1,25 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 130
-      num_constraints: 132
-      at: 7836d2e1325fb4703563ba9378382f72310a39dff412635938abf6aa59e3e316
-      bt: ba2c8bf85cf2734ed977cbe9aa29422a1e6f91a3ac9384a66de46152c5a0dae9
-      ct: d3a10973b5ff8e5b494994d909dc9de72e93f8a9d2de5fd5fca1cd3a4a9e1e77
-    output:
-      - input_file: input/integers.in
-        output:
-          registers:
-            a:
-              type: u32
-              value: "1"
-            b:
-              type: u32
-              value: "1"
-    initial_ast: 6fc23eeb1a55273b0089acff714d6eb2952c3380c262d8e577c123659e501553
-    imports_resolved_ast: 6fc23eeb1a55273b0089acff714d6eb2952c3380c262d8e577c123659e501553
-    canonicalized_ast: 6fc23eeb1a55273b0089acff714d6eb2952c3380c262d8e577c123659e501553
-    type_inferenced_ast: 43750961183eda5acb2302e5a9d9daf2809ee2f34d6ed53ec6494c867d0788a8
+outputs: []
diff --git a/tests/expectations/compiler/compiler/function/scope_fail.leo.out b/tests/expectations/compiler/compiler/function/scope_fail.leo.out
index 194746f3ae..3f519cf1b5 100644
--- a/tests/expectations/compiler/compiler/function/scope_fail.leo.out
+++ b/tests/expectations/compiler/compiler/function/scope_fail.leo.out
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - "Error [EASG0373027]: failed to resolve variable reference 'myGlobal'\n    --> compiler-test:5:12\n     |\n   5 |     return myGlobal;\n     |            ^^^^^^^^"
+outputs: []
diff --git a/tests/expectations/compiler/compiler/function/undefined.leo.out b/tests/expectations/compiler/compiler/function/undefined.leo.out
index 8af5ccb5a9..3f519cf1b5 100644
--- a/tests/expectations/compiler/compiler/function/undefined.leo.out
+++ b/tests/expectations/compiler/compiler/function/undefined.leo.out
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - "Error [EASG0373023]: failed to resolve function: 'my_function'\n    --> compiler-test:5:5\n     |\n   5 |     my_function();\n     |     ^^^^^^^^^^^"
+outputs: []
diff --git a/tests/expectations/compiler/compiler/function/value_unchanged.leo.out b/tests/expectations/compiler/compiler/function/value_unchanged.leo.out
index 91e5ab153c..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/function/value_unchanged.leo.out
+++ b/tests/expectations/compiler/compiler/function/value_unchanged.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: input/dummy.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: d70652e4acf04c7036a90f79e5bd61b60d37c2198fcccff97a9033f5bf3c9a1b
-    imports_resolved_ast: d70652e4acf04c7036a90f79e5bd61b60d37c2198fcccff97a9033f5bf3c9a1b
-    canonicalized_ast: ca06a00411c276665b7f9cab072e87bb6c4225406aa58703ace0c9db33c4535d
-    type_inferenced_ast: 830057c5a032606c73f38792b8efcc8bd99f7e167482875715cd3db538bcd8f1
+outputs: []
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 1f8e049ff5..ef090731fb 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
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 95
-      num_constraints: 95
-      at: 8db8901199024f620eff3a2a9d95e74862d07f8413a6fef789347f012de915ce
-      bt: 134fe0b804695f759f665fe6754e85dc3556cb7c4fd7fca0e78ed2f55d048873
-      ct: 8770257f9e15fb2972e7ca01e77f3d4d0303033d75d9e990b7065a3096ce9cfb
-    output:
-      - input_file: globals.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "false"
-    initial_ast: b4e5073c07791c4726b69f3e60ec66ccebefb7a3811f4a3576fc4042f8c80114
-    imports_resolved_ast: b4e5073c07791c4726b69f3e60ec66ccebefb7a3811f4a3576fc4042f8c80114
-    canonicalized_ast: 03a4e0ffc6deea9c6500a9d91eb683a780e8f5961801bea1aab26c14e4543325
-    type_inferenced_ast: 66d0a55ff2ab6931d5806dcbb2ff23f9dbc41a883f19a45af8a41d3be84e136d
+outputs: []
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 5c6cabd3d7..3f519cf1b5 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
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - "Error [EASG0373032]: illegal assignment to immutable variable 'basic'\n    --> compiler-test:7:5\n     |\n   7 |     basic = 2u32;\n     |     ^^^^^^^^^^^^"
+outputs: []
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 7e534a8e9f..ef090731fb 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
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: "../input/dummy.in"
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 879c62f85e5eb066be85524e22d73775a649468ee2d42ff96451abefc1529b28
-    imports_resolved_ast: d9bba4501a505c68c5256e0f8177a490126f99945c3f53c42471b466ec0e6377
-    canonicalized_ast: cec8aa804ed735a7cf6504445621c5d5fdc214366e665aaf1e8b3d6e5ee1ff75
-    type_inferenced_ast: 909a8409502b79921a81e425ca9e748a69411ac5ad0c809249b9b82d635a8533
+outputs: []
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 9e299f3691..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/import_local/import_all.leo.out
+++ b/tests/expectations/compiler/compiler/import_local/import_all.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: input/dummy.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 6e689aa459b9ea2fa0c18c9dc0f2512db9d430f5c7101cb3104a275711d60210
-    imports_resolved_ast: c4260b58a631ee77b0492ba1354182b2c95d260dcf01a62e2a0797eb5f268478
-    canonicalized_ast: 7e2eaf52ce5c79242b44357609ab667df411190bf7a11228d240c314f0ce0502
-    type_inferenced_ast: be897b5b17a946c2595afcc8a802df5fa4e013ba3acb4159a0123d7cf1941544
+outputs: []
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 c31d7c3d2f..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/import_local/import_as.leo.out
+++ b/tests/expectations/compiler/compiler/import_local/import_as.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: input/dummy.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 411dd9625db7686b2cdc3546042b29bc1e51d023b14b0b8397c22bb4db825a77
-    imports_resolved_ast: 3dfd262969fe1c4bd78e4deb971f29b5afa64b540ef60c0a892399ba9f9d20be
-    canonicalized_ast: e7d378e3ff24b63d8a6ec0e2ae1c30148ed9f2028eb80bcf224d55efa3303fd1
-    type_inferenced_ast: d98bff9e38944b9423e8bf2b463d081920d079db600cc8eec3a4d6ba96716745
+outputs: []
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 c672b24d18..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/import_local/import_dir.leo.out
+++ b/tests/expectations/compiler/compiler/import_local/import_dir.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: input/dummy.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 105b64dc1443f190ae9034a4b1f0a7c4fbbb104482aed9b7b843c19d16b3aaa0
-    imports_resolved_ast: e7a789c2f6fb7b5c5fdbb5760cd9700ff256985c860df18e7f30dc5df4d392cf
-    canonicalized_ast: f62ac8e2461d1ba60ecb95399945f0a22999bbac751c56927f505f75138b90c2
-    type_inferenced_ast: 3cb02077dd4fffa806a72c61dacca999d404821c3301ea52d2854d86fa65c20a
+outputs: []
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 81bd6d66e8..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/import_local/import_files.leo.out
+++ b/tests/expectations/compiler/compiler/import_local/import_files.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: input/dummy.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 17ec836ed9b5f45fbf2b55fc9f7ae5c75d59902113f3e099141b3acbcf9ccb11
-    imports_resolved_ast: ad65dc58d894dad3f8ff60db45610e89f7b7a9ca8bad1bba405d4fbe9b29f240
-    canonicalized_ast: 9164f55bdd309c60e5d7cd5842aeb10227fb61884639c7661811b1be9cb134fe
-    type_inferenced_ast: 741f2ae43a36b8775a733aaaf736ae7df67ec0b8e57bb94425710760b8459d31
+outputs: []
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 551b30394a..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/import_local/import_many.leo.out
+++ b/tests/expectations/compiler/compiler/import_local/import_many.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: input/dummy.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: ae6826642faa492e34507695dbd11e5b44c319aecb0b1e78b29ce03ae446d907
-    imports_resolved_ast: e08b138c63ede9de6e090e6b7fbcfbbc27a1ae49b032a6cffcafaa8f76410839
-    canonicalized_ast: e08b138c63ede9de6e090e6b7fbcfbbc27a1ae49b032a6cffcafaa8f76410839
-    type_inferenced_ast: b311680f4429cc16661f774b0547936be148a3dd9f478013adefe575629b88fa
+outputs: []
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 8932b70d43..ef090731fb 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
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: input/dummy.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 41aa6d44d33c491b1f66bb2e3d8a6882b43822b211e3e2ac8add332be00535fb
-    imports_resolved_ast: 1e06d16faa2b57dfac9628bdb7d288a24b8cdaeed152b0bb1c1bbcfdbd54dd72
-    canonicalized_ast: 1e06d16faa2b57dfac9628bdb7d288a24b8cdaeed152b0bb1c1bbcfdbd54dd72
-    type_inferenced_ast: 27a376c64ada78a53a328326b0a5592bf683dc036cf1a3f5a15621405678a427
+outputs: []
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 acb4a60b7e..ef090731fb 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
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: input/dummy.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: bb86f336b58de89c79741628133e6aa997f3f49a6f066b8c054261e91e3f18a8
-    imports_resolved_ast: 1fe862bf85cf0c88ce3c52066118d544f367984dbe97665b2719281de15c449c
-    canonicalized_ast: 1fe862bf85cf0c88ce3c52066118d544f367984dbe97665b2719281de15c449c
-    type_inferenced_ast: d8f6f5bde53232553d1ff891e7f78823645d9a8984139d06409cb2ccde562e76
+outputs: []
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..3f519cf1b5 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
@@ -1,5 +1,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     |               ^"
+outputs: []
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..3f519cf1b5 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
@@ -1,5 +1,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     |                     ^"
+outputs: []
diff --git a/tests/expectations/compiler/compiler/input_files/program_input/different_types_const_signed_fail.leo.out b/tests/expectations/compiler/compiler/input_files/program_input/different_types_const_signed_fail.leo.out
index 995afe29e0..3f519cf1b5 100644
--- a/tests/expectations/compiler/compiler/input_files/program_input/different_types_const_signed_fail.leo.out
+++ b/tests/expectations/compiler/compiler/input_files/program_input/different_types_const_signed_fail.leo.out
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - aborting due to syntax error
+outputs: []
diff --git a/tests/expectations/compiler/compiler/input_files/program_input/different_types_const_unsigned_fail.leo.out b/tests/expectations/compiler/compiler/input_files/program_input/different_types_const_unsigned_fail.leo.out
index 995afe29e0..3f519cf1b5 100644
--- a/tests/expectations/compiler/compiler/input_files/program_input/different_types_const_unsigned_fail.leo.out
+++ b/tests/expectations/compiler/compiler/input_files/program_input/different_types_const_unsigned_fail.leo.out
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - aborting due to syntax error
+outputs: []
diff --git a/tests/expectations/compiler/compiler/input_files/program_input/different_types_fail_signed.leo.out b/tests/expectations/compiler/compiler/input_files/program_input/different_types_fail_signed.leo.out
index 995afe29e0..3f519cf1b5 100644
--- a/tests/expectations/compiler/compiler/input_files/program_input/different_types_fail_signed.leo.out
+++ b/tests/expectations/compiler/compiler/input_files/program_input/different_types_fail_signed.leo.out
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - aborting due to syntax error
+outputs: []
diff --git a/tests/expectations/compiler/compiler/input_files/program_input/different_types_unsigned_fail.leo.out b/tests/expectations/compiler/compiler/input_files/program_input/different_types_unsigned_fail.leo.out
index 995afe29e0..3f519cf1b5 100644
--- a/tests/expectations/compiler/compiler/input_files/program_input/different_types_unsigned_fail.leo.out
+++ b/tests/expectations/compiler/compiler/input_files/program_input/different_types_unsigned_fail.leo.out
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - aborting due to syntax error
+outputs: []
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 718b98b089..ef090731fb 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
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: input/main.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: e729490bdc66ccc317a772b7ccc583a24a5de9dddf0c9d5b1f3eef8623e6a569
-    imports_resolved_ast: e729490bdc66ccc317a772b7ccc583a24a5de9dddf0c9d5b1f3eef8623e6a569
-    canonicalized_ast: e729490bdc66ccc317a772b7ccc583a24a5de9dddf0c9d5b1f3eef8623e6a569
-    type_inferenced_ast: 05f1d5a501376bbcbfac394be538319ab70e516dd9d3b2d7261f840c5c9e5d8d
+outputs: []
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 870a57e321..ef090731fb 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
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 31
-      num_constraints: 31
-      at: 9dbf37472d7a01111bf49d73870895e1669fce2d7c86d19fa1cd9bf97102c34a
-      bt: 51c5020146972aaa76ab053686ae5364f63ce6185620eba3780cf86581f29cfe
-      ct: e02be0defc1d4e9bfd935093780a8693b624228f7dc2501ac1f065af2eee9bc8
-    output:
-      - input_file: input/main_array.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: ded49ef329b1c709191a4f6d85c43787e7091b82eb5813f618bf377e7c27a47c
-    imports_resolved_ast: ded49ef329b1c709191a4f6d85c43787e7091b82eb5813f618bf377e7c27a47c
-    canonicalized_ast: ded49ef329b1c709191a4f6d85c43787e7091b82eb5813f618bf377e7c27a47c
-    type_inferenced_ast: 5f12b94ae74deaac2dcc82ae1ee611bd1d1e837a2211722a11cc904790aa4d60
+outputs: []
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..3f519cf1b5 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
@@ -1,5 +1,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     |               ^"
+outputs: []
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 79d5ab3f9b..ef090731fb 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
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 6
-      num_constraints: 5
-      at: a92e6894c8f239ebb17b299d1e49ef48d0c2a8690c56eb1362550ebeeb16a507
-      bt: 8f725e0070f28462aac3db98a5282a9ffa8139f0103651a30df68d193419eacd
-      ct: 6d17d0577f11cb480fd832f84c38611e836e8aa93457407aa17c07c6ef9d3e03
-    output:
-      - input_file: input/main_char.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 28776a06ced3fbb9476dd3abdca0d6d5444c621c26b6883f07d03f2d437677b7
-    imports_resolved_ast: 28776a06ced3fbb9476dd3abdca0d6d5444c621c26b6883f07d03f2d437677b7
-    canonicalized_ast: 28776a06ced3fbb9476dd3abdca0d6d5444c621c26b6883f07d03f2d437677b7
-    type_inferenced_ast: 2bca0f0f14ac8d4eb281b8ce8d612c15a4209b765b68140b5a4b7efefdec5eea
+outputs: []
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 0dbd0e966a..ef090731fb 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
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 6
-      num_constraints: 5
-      at: ab475a59a3c7d4299665005e00fe7232cd3ea2238493f31211c33f3057e3c1d7
-      bt: 691f0be87cb1ac6a001269af3d7dbe2c860290538950dc921f318ccf2f319d66
-      ct: 6d17d0577f11cb480fd832f84c38611e836e8aa93457407aa17c07c6ef9d3e03
-    output:
-      - input_file: input/main_field.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "false"
-    initial_ast: d5808d80af60a541768c6ac9f7ce7371cee9654d6f102c1fa4d9be22169d7fae
-    imports_resolved_ast: d5808d80af60a541768c6ac9f7ce7371cee9654d6f102c1fa4d9be22169d7fae
-    canonicalized_ast: d5808d80af60a541768c6ac9f7ce7371cee9654d6f102c1fa4d9be22169d7fae
-    type_inferenced_ast: 84667daeb71be0318df27b0172d186013b8eaae16a75a3676d7f4a6366ef9dbc
+outputs: []
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 a87a815581..ef090731fb 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
@@ -1,19 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 12
-      num_constraints: 9
-      at: df88b362955f00b8c41afd9e31c9e41e4b8254a71ea0f3f2f97d5b6b8b767415
-      bt: df58aff07b131c34e977ffb5657bbd21852f59fd7e059117c419c3c6070a7053
-      ct: 335cdfb09b13172262042abccf4560511666deaa63cc1b3f30dd35dcb554840f
-    output:
-      - input_file: input/main_group.in
-        output:
-          registers: {}
-    initial_ast: 731684bc8e22a3bbde7816d4f9ddc4db9561244b81caff4ef23e90ab5949ef60
-    imports_resolved_ast: 731684bc8e22a3bbde7816d4f9ddc4db9561244b81caff4ef23e90ab5949ef60
-    canonicalized_ast: d4b3e34c002f7dd2bfb3b12b5028d44a84113e9c9a2d22d7576763cd59c7521b
-    type_inferenced_ast: 326c07a3eae5f211848b943adcb05103121e0b241967bfd4a545ff6f6566f699
+outputs: []
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 0f10b6a61a..ef090731fb 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
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 223
-      num_constraints: 223
-      at: 87fe022f8971e90450cc219824d04ea84f08040429143393193aa2de0321759f
-      bt: 65e18f4e1e32d72f87d238401f8397b5d8ba20e7da7d50cc5930faa5673cdb77
-      ct: 389354117abccc4ef9f4822705889f64f1d16b7e0d2adae52005c7b91b0ccabb
-    output:
-      - input_file: input/main_multi_dimension_array.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: f74b907c08c1bfd4d2afc9df5589bc2aed1923db5e858c5cc6046f5aed735cf2
-    imports_resolved_ast: f74b907c08c1bfd4d2afc9df5589bc2aed1923db5e858c5cc6046f5aed735cf2
-    canonicalized_ast: f80f2c0fd5fa415c5ca0b8295d918a884ae8590f5f9760947ca5a0513f531f73
-    type_inferenced_ast: a866c7acc69cab458f8b6fe729b35cfd4fc66d578155382d130b24e2e092df8b
+outputs: []
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 1f690616a0..ef090731fb 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
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 3
-      num_constraints: 3
-      at: 01e9615846575e848deea9a9802ceed188fdbfc4660f6f22de41845adcce14ac
-      bt: 49e8fa1fd3f85b0f486c49f194e4fff3da5e8039685fca1f3327389cbe9fc180
-      ct: 7ca43d5c34997f3c866631161cb33186cc016972238c07771ae105ca1b05320d
-    output:
-      - input_file: input/main_multiple.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 094effa7fe12695679a571f560e1d3e8c299cde8de280f9309010c85f48bab95
-    imports_resolved_ast: 094effa7fe12695679a571f560e1d3e8c299cde8de280f9309010c85f48bab95
-    canonicalized_ast: 094effa7fe12695679a571f560e1d3e8c299cde8de280f9309010c85f48bab95
-    type_inferenced_ast: ab25cb7bf7d8fe3ec64be183550ba8d6acfaf17464cf70ec45c6497fc065ac29
+outputs: []
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 0c516a8133..ef090731fb 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
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 26
-      num_constraints: 21
-      at: b4c72e270b0067ca380a70c8cb2632c33b17e7323b3817deb04e5fe72aa99c13
-      bt: d476126ef8e9588f0ed444a75f025c1c468618ae84829d4d2deb37679e537563
-      ct: 789b2eca89cbf96799b7c12eaa66df8efcec7fe1c6c8af5e741fe4955c5dee32
-    output:
-      - input_file: input/main_string.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: a2b01e8b8d8311d8a890b0e008689dc890b104d2b6fcfc82a16e1e45975ea68b
-    imports_resolved_ast: a2b01e8b8d8311d8a890b0e008689dc890b104d2b6fcfc82a16e1e45975ea68b
-    canonicalized_ast: 8774633846aa1d61e6534c0e930777ba9452aa7368116928ba1188501d30a495
-    type_inferenced_ast: be4ce222d81884b156c4fd0567755685283f7502ab192fcfaf562f0b0737a2e0
+outputs: []
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 9c084bd2f6..ef090731fb 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
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 33
-      num_constraints: 33
-      at: 16cd2aaf51f97f0d967f934facd55d3da0f128b5548ca7d9033099dabb8755aa
-      bt: 13ce6219d223223b0e2a5b8bab43bda704fb2509e20143c1c8dc28238c65a0c3
-      ct: 1a2cc6ebebf9b0d70351fb54db6ab269bfec125b7d84dea8450ee1566d937a38
-    output:
-      - input_file: input/main_tuple.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 01b9440246bf141fbdc27ab27f53d1b4f42415fb70a2f4d838d0a3a542fe7133
-    imports_resolved_ast: 01b9440246bf141fbdc27ab27f53d1b4f42415fb70a2f4d838d0a3a542fe7133
-    canonicalized_ast: 01b9440246bf141fbdc27ab27f53d1b4f42415fb70a2f4d838d0a3a542fe7133
-    type_inferenced_ast: 2c84fc650ddadfb9a335688f4490156e05a5c5ea1b3ac935d8d5f2f2d3cd8c58
+outputs: []
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..3f519cf1b5 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
@@ -1,5 +1,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     |               ^"
+outputs: []
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 29c1c52cbb..3f519cf1b5 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
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - "Error [EASG0373024]: failed to resolve type for variable definition 'unknown'\n    --> compiler-test:4:17\n     |\n   4 |     let b = a * 2;\n     |                 ^"
+outputs: []
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..3f519cf1b5 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
@@ -1,5 +1,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     |               ^"
+outputs: []
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 49969669f4..ef090731fb 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
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 3
-      num_constraints: 3
-      at: 83b1bd5868cfd70d986276428ff81a9120e0848a6f44d7bd6d5a25d6063c7669
-      bt: 5a01b0726c5b948a3b336179b77081865f51dc2f1de630ce95b03424a5ae7998
-      ct: 7ca43d5c34997f3c866631161cb33186cc016972238c07771ae105ca1b05320d
-    output:
-      - input_file: input/basic.in
-        output:
-          registers:
-            b:
-              type: bool
-              value: "true"
-    initial_ast: dc7f40a1cfc4daa659784bf538f1273145b430875116ef1aad7fd778dcb5f736
-    imports_resolved_ast: dc7f40a1cfc4daa659784bf538f1273145b430875116ef1aad7fd778dcb5f736
-    canonicalized_ast: dc7f40a1cfc4daa659784bf538f1273145b430875116ef1aad7fd778dcb5f736
-    type_inferenced_ast: f86a95c627e69d54fd6f1f651eda77cfc1ac1fab33b1ef8bbe5bf511a8c4beb7
+outputs: []
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 b284218dd5..ef090731fb 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
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 847
-      num_constraints: 847
-      at: 7a173ccf91016726958e205fb7a60e954c826a7d8f3dbfba86417c4dad8a8809
-      bt: ef390629424c3ec765f6759eba6be4285e92bbb34e1fdb083ea723021fda1a83
-      ct: 048882f78f795732711ba34cb6892495a782c2573a1358a9c679b97fa5ea5fe7
-    output:
-      - input_file: input/token_withdraw.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 6b051c3f9ce82efb30d3ba89764cc9c2607a126cb0cede72ad55ecda6c9d996d
-    imports_resolved_ast: 6b051c3f9ce82efb30d3ba89764cc9c2607a126cb0cede72ad55ecda6c9d996d
-    canonicalized_ast: 6b051c3f9ce82efb30d3ba89764cc9c2607a126cb0cede72ad55ecda6c9d996d
-    type_inferenced_ast: 3c04200d560739b0d551204b65e56abc11f26843b99aa0361362f61f0d6a3328
+outputs: []
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 4794c19048..ef090731fb 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
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: input/main.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 815bdfe9a6fb4bb4795686872a62882c0a953e7a5313ef7da066b11770fcb089
-    imports_resolved_ast: 815bdfe9a6fb4bb4795686872a62882c0a953e7a5313ef7da066b11770fcb089
-    canonicalized_ast: 815bdfe9a6fb4bb4795686872a62882c0a953e7a5313ef7da066b11770fcb089
-    type_inferenced_ast: 437a14fea047eb893748b86f8a5cedb18ae7960ea92a5075b5a215125cc27863
+outputs: []
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 6f82dd1cdb..ef090731fb 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
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: input/main_array.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 48d4334146fe85c3bf1cdd75bcf4bf5026e50bb04b624ddbe1fc9d0eb3e510a3
-    imports_resolved_ast: 48d4334146fe85c3bf1cdd75bcf4bf5026e50bb04b624ddbe1fc9d0eb3e510a3
-    canonicalized_ast: 48d4334146fe85c3bf1cdd75bcf4bf5026e50bb04b624ddbe1fc9d0eb3e510a3
-    type_inferenced_ast: 90903b46ecc931e02742ad4caa7dce04f5efe18cad4260d1c9de5c29cf378a93
+outputs: []
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..3f519cf1b5 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
@@ -1,5 +1,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     |                     ^"
+outputs: []
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 1432cad627..ef090731fb 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
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: input/main_char.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 54251e3a72e7c6743344cb585df6b89aef0d5b965aa13d090e89044209bf647a
-    imports_resolved_ast: 54251e3a72e7c6743344cb585df6b89aef0d5b965aa13d090e89044209bf647a
-    canonicalized_ast: 54251e3a72e7c6743344cb585df6b89aef0d5b965aa13d090e89044209bf647a
-    type_inferenced_ast: b3a96fc8bbfda13b19f509c3ed5bed3908ca929219581c8d7b56bb7f81590770
+outputs: []
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 f47c13cea4..ef090731fb 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
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: input/main_field.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "false"
-    initial_ast: 24edf3e347b161cb68d4dd19a0a56b457ee1f1668a29ad637ff22eaa0cbb384e
-    imports_resolved_ast: 24edf3e347b161cb68d4dd19a0a56b457ee1f1668a29ad637ff22eaa0cbb384e
-    canonicalized_ast: 24edf3e347b161cb68d4dd19a0a56b457ee1f1668a29ad637ff22eaa0cbb384e
-    type_inferenced_ast: 85af373372ad915f6633a0099e914ddc05e70f7d5fd92ad25be47c3627c68149
+outputs: []
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 21cd56b63c..ef090731fb 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
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: input/main_group.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: d6802e04fa242223923742fc9e82345b67b73138d867608c62c55999a356691d
-    imports_resolved_ast: d6802e04fa242223923742fc9e82345b67b73138d867608c62c55999a356691d
-    canonicalized_ast: d6802e04fa242223923742fc9e82345b67b73138d867608c62c55999a356691d
-    type_inferenced_ast: 0c53a395040f8aea133164e05ad0496f712ebd082228a635b4d181c9f4508127
+outputs: []
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 4952ae0921..ef090731fb 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
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 223
-      num_constraints: 223
-      at: 87fe022f8971e90450cc219824d04ea84f08040429143393193aa2de0321759f
-      bt: 65e18f4e1e32d72f87d238401f8397b5d8ba20e7da7d50cc5930faa5673cdb77
-      ct: 389354117abccc4ef9f4822705889f64f1d16b7e0d2adae52005c7b91b0ccabb
-    output:
-      - input_file: input/main_multi_dimension_array.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 473f66e852f694cee2d87935eee5fe7306ee404b935515ad400a06872b124e5b
-    imports_resolved_ast: 473f66e852f694cee2d87935eee5fe7306ee404b935515ad400a06872b124e5b
-    canonicalized_ast: 13943d9f8f5fb1fc9e5f9f025d3a09bc59db16494c5c225b7e4b8a7a53893c51
-    type_inferenced_ast: 95eb1672ac750fbac9e1fe689a8516c00f83108e156ddda9d6cd69003d50a222
+outputs: []
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 8a3f5633c2..ef090731fb 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
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: input/main_multiple.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 0fe6762404e0aeb23e1adaec3a6ab638b06843ecea823306f364cf1aedd4fd07
-    imports_resolved_ast: 0fe6762404e0aeb23e1adaec3a6ab638b06843ecea823306f364cf1aedd4fd07
-    canonicalized_ast: 0fe6762404e0aeb23e1adaec3a6ab638b06843ecea823306f364cf1aedd4fd07
-    type_inferenced_ast: 94ed42f51b4f47128964754310daf696a8bcd47e3e94e23d3e90bc2132dc9682
+outputs: []
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 9b1ad3623e..ef090731fb 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
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: input/main_string.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 4eee03b645a71b2cbe735305679051d2292f219f5db6ffc2bbb539188c6b377a
-    imports_resolved_ast: 4eee03b645a71b2cbe735305679051d2292f219f5db6ffc2bbb539188c6b377a
-    canonicalized_ast: 8f1fdffc6178e5375519646b43359d4e067a897c2ca2e360b67dbfc5523103d3
-    type_inferenced_ast: d177e4046f5c7fde3ad62e66677db285279075784874f9961dec6a445d65278d
+outputs: []
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 63b0e047a4..ef090731fb 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
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: input/main_tuple.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 2c4ba5703d0e1adf9d8ba82a2369531fe720fddce8da06eedb189c2a78f12b01
-    imports_resolved_ast: 2c4ba5703d0e1adf9d8ba82a2369531fe720fddce8da06eedb189c2a78f12b01
-    canonicalized_ast: 2c4ba5703d0e1adf9d8ba82a2369531fe720fddce8da06eedb189c2a78f12b01
-    type_inferenced_ast: a75332a525dafba95c50a29eac05374ebf52b6ae7717966d15dec81ce1bd8623
+outputs: []
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..3f519cf1b5 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
@@ -1,5 +1,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     |                     ^"
+outputs: []
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 b6092883b1..ef090731fb 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
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 64
-      num_constraints: 64
-      at: 2517dbbd3bc6f74f73a279bfe223141cdef8fce801edcc2972d568a815e43bcd
-      bt: 3a136bbbffaef5f4563e06a03444cfe5c512767d8c88a8be5b39034e18fe0081
-      ct: 60e36dc4bc844fe8285371cf70c955b79990f094bc50b3401dcac4cbede63e8d
-    output:
-      - input_file: input/array.in
-        output:
-          registers:
-            r2:
-              type: "[[u8; 4]; 2]"
-              value: "\"[0, 0, 0, 0][0, 0, 0, 0]\""
-    initial_ast: 010d0b94b6ddb74416025e35b34ce1c7feb5a768d8bf0f733c530f49b00f70c4
-    imports_resolved_ast: 010d0b94b6ddb74416025e35b34ce1c7feb5a768d8bf0f733c530f49b00f70c4
-    canonicalized_ast: 010d0b94b6ddb74416025e35b34ce1c7feb5a768d8bf0f733c530f49b00f70c4
-    type_inferenced_ast: ab23cd03d09ac3221aa71d2bc7e5c6fe13fa3f9eb4293a3ae25cb739cb608bd9
+outputs: []
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..3f519cf1b5 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
@@ -1,5 +1,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     | ^"
+outputs: []
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 d6fc879e40..ef090731fb 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
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 17
-      num_constraints: 18
-      at: 54a6bab98206b1a92fff5ae07a6838e5ec25365afa7756a58b492f7a288c8654
-      bt: 322eda19d0ceaeddbc296d56bce789cf038e440fd8fbd6e118606a4248844b2c
-      ct: 748f424d53dc4319858b691a3c593aec6165ed4e67847b32285a436b9e2e7cc1
-    output:
-      - input_file: input/main.in
-        output:
-          registers:
-            r:
-              type: u8
-              value: "101"
-    initial_ast: f47238f679ee2b220452140330e99f2a6cf063be523ed8e4ce0e9d56cf806128
-    imports_resolved_ast: f47238f679ee2b220452140330e99f2a6cf063be523ed8e4ce0e9d56cf806128
-    canonicalized_ast: f47238f679ee2b220452140330e99f2a6cf063be523ed8e4ce0e9d56cf806128
-    type_inferenced_ast: 6c62586bdcd983ee1ac3ae22b88577a5c2f0c5e5e5ed711f86c12f434917fd5f
+outputs: []
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 36e4948b29..ef090731fb 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
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 527
-      num_constraints: 527
-      at: 7f6c7713392a44fa83a3fbffafd830d6e20356d72aff3d67f78c70ea5439a735
-      bt: b21f2049f4ae8c11dff5de8b33d532f3ea7637bfdbd09395d056495472c1853a
-      ct: 096693f8f4f40acd0e3f82bd256738e157f33989bcc68a7b8eabe44e8449bbb0
-    output:
-      - input_file: input/dummy.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 6fce132965ff40126f6175d2abe5b8598004e90cdb29c4707f7c63dbe1093474
-    imports_resolved_ast: 6fce132965ff40126f6175d2abe5b8598004e90cdb29c4707f7c63dbe1093474
-    canonicalized_ast: 6fce132965ff40126f6175d2abe5b8598004e90cdb29c4707f7c63dbe1093474
-    type_inferenced_ast: 75cff35e24806b8a66431668c319a96e95f5106a8fe513eb53abb264beab4390
+outputs: []
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 9ee8ceab48..ef090731fb 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
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 511
-      num_constraints: 511
-      at: bb121a0b56bee9895a337644cf8ece2f09dcf9113cd75c29f9bf26d635ba6d22
-      bt: 4a54bb6ffc0c9de1f8f349449b9071745f3db6985adb9b1d657e8aaa4309cc41
-      ct: a0736e8c8f3bb1c39a147348754e53dfd31fd76a1df9cd9960472841bcc531df
-    output:
-      - input_file: input/dummy.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: a155141331da2d7bdaa11ae738d6ca2e1d62d875c872b8b8213184d989cc8baa
-    imports_resolved_ast: a155141331da2d7bdaa11ae738d6ca2e1d62d875c872b8b8213184d989cc8baa
-    canonicalized_ast: a155141331da2d7bdaa11ae738d6ca2e1d62d875c872b8b8213184d989cc8baa
-    type_inferenced_ast: b4969327ce0ee30ab1526ce3b2479a7bf6efa38cb9616477f854cd28b1faf61a
+outputs: []
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 1faa7ef6dd..ef090731fb 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
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: input/dummy.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 0c90e79ea8f0f5b227c498d43b8f308afb6438185fe33531617ac04b301941ce
-    imports_resolved_ast: 0c90e79ea8f0f5b227c498d43b8f308afb6438185fe33531617ac04b301941ce
-    canonicalized_ast: 0c90e79ea8f0f5b227c498d43b8f308afb6438185fe33531617ac04b301941ce
-    type_inferenced_ast: 8a53562f4f66ec6d9ad612558abfe45fa08c5b37943f7a46226ea7909fcf85e0
+outputs: []
diff --git a/tests/expectations/compiler/compiler/input_files/program_state/section_invalid.leo.out b/tests/expectations/compiler/compiler/input_files/program_state/section_invalid.leo.out
index 995afe29e0..3f519cf1b5 100644
--- a/tests/expectations/compiler/compiler/input_files/program_state/section_invalid.leo.out
+++ b/tests/expectations/compiler/compiler/input_files/program_state/section_invalid.leo.out
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - aborting due to syntax error
+outputs: []
diff --git a/tests/expectations/compiler/compiler/input_files/program_state/section_undefined.leo.out b/tests/expectations/compiler/compiler/input_files/program_state/section_undefined.leo.out
index 995afe29e0..3f519cf1b5 100644
--- a/tests/expectations/compiler/compiler/input_files/program_state/section_undefined.leo.out
+++ b/tests/expectations/compiler/compiler/input_files/program_state/section_undefined.leo.out
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - aborting due to syntax error
+outputs: []
diff --git a/tests/expectations/compiler/compiler/input_files/program_state/visibility_fail.leo.out b/tests/expectations/compiler/compiler/input_files/program_state/visibility_fail.leo.out
index 995afe29e0..3f519cf1b5 100644
--- a/tests/expectations/compiler/compiler/input_files/program_state/visibility_fail.leo.out
+++ b/tests/expectations/compiler/compiler/input_files/program_state/visibility_fail.leo.out
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - aborting due to syntax error
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/i128/add.leo.out b/tests/expectations/compiler/compiler/integers/i128/add.leo.out
index c636d50366..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/i128/add.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/add.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1404
-      num_constraints: 1405
-      at: b738445f9fa8039b6d93543917f21faebabd70ce5f0fc95bc2b82f9a96653e78
-      bt: 7d12a27b02e7c965ac1775f6711d6da181ea2a809f8bf644ab1755929013f7e4
-      ct: e7b4e2f5a4e98c3a9016990ee3dd9bbf5e55e7a98e1dc3ac7d4b458ecdcdde7e
-    output:
-      - input_file: i128.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 642f93bdca1804ff63c7d74a395836b4fae13013a8a208bd8a36647a0a51a9c4
-    imports_resolved_ast: 642f93bdca1804ff63c7d74a395836b4fae13013a8a208bd8a36647a0a51a9c4
-    canonicalized_ast: 642f93bdca1804ff63c7d74a395836b4fae13013a8a208bd8a36647a0a51a9c4
-    type_inferenced_ast: e72578824d94283a0c95b48e47d756370f3ac29b54e82648870b8f09e592665f
+outputs: []
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 277e2de091..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/i128/console_assert.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/console_assert.leo.out
@@ -1,19 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 511
-      num_constraints: 511
-      at: f130bde196ac7e190b505a42dfb30c41772c4c7eafe9e7203be9222892b767ce
-      bt: 7ac37b347f82644239128aa66e9caf34375b1fd860069659581477883d92fb7a
-      ct: 3e4c7833e73f9ee37e42c796e8af7a6d417a012b776b348abedbfd317110858d
-    output:
-      - input_file: i128.in
-        output:
-          registers: {}
-    initial_ast: 941047af9fff3f74b6e522fe98c16108e9e9b7ec4514cff470af18a68316f614
-    imports_resolved_ast: 941047af9fff3f74b6e522fe98c16108e9e9b7ec4514cff470af18a68316f614
-    canonicalized_ast: ca55154cc08f628f72fd7c45e107ebf849f38c077dfe08e80082db1feee4b4ed
-    type_inferenced_ast: 9396147f96ed2ce2ec5b359b65ebe55d824888fb3c778b83486a4cd3b61e0785
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/i128/div.leo.out b/tests/expectations/compiler/compiler/integers/i128/div.leo.out
index 5ff4b0fdf7..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/i128/div.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/div.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 264820
-      num_constraints: 330868
-      at: 90e89968758ed4552073b4217621741d7471a683f004aff63679ee176690ebb4
-      bt: a83224709a5d2ea9ba982fd81f35188e299590ab7ce201773857c54a39b27d93
-      ct: 26d5f56acb9effc130128af10b00b426d2396e7d8962636268b3dd08ba8df5e3
-    output:
-      - input_file: i128.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 9b5ecfc8daa3ee55e1e24a6f6e19f5a6f5c4725efabf7074bc22657f7ad89b26
-    imports_resolved_ast: 9b5ecfc8daa3ee55e1e24a6f6e19f5a6f5c4725efabf7074bc22657f7ad89b26
-    canonicalized_ast: 9b5ecfc8daa3ee55e1e24a6f6e19f5a6f5c4725efabf7074bc22657f7ad89b26
-    type_inferenced_ast: be5f66a85fa7ae6cd81164c6da438e2e146558c9b429993d83d4177b8b5c4469
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/i128/eq.leo.out b/tests/expectations/compiler/compiler/integers/i128/eq.leo.out
index 3db655c771..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/i128/eq.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/eq.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 513
-      num_constraints: 513
-      at: 75b34d698fc2359df51943102062181aa5ee62b84a221747dfd7f8868bf48efd
-      bt: c1e085f0d8047bc5b5f574ca9de7d79a0ce3b3235e3bfb83ff15aecf05ad1323
-      ct: c224fec21cf5a2b24eb94033a20aeb4729d3d0cf596339145cb49ea6a44cc5d8
-    output:
-      - input_file: i128.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 4aab7c6dbe39e04833f6a043508421d22d62b87fa931fa8940ce8af5c876cbe1
-    imports_resolved_ast: 4aab7c6dbe39e04833f6a043508421d22d62b87fa931fa8940ce8af5c876cbe1
-    canonicalized_ast: 4aab7c6dbe39e04833f6a043508421d22d62b87fa931fa8940ce8af5c876cbe1
-    type_inferenced_ast: b4067b1b34a4f7984160a017456f026691c60f150c59c9e4817ea740c338abb7
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/i128/ge.leo.out b/tests/expectations/compiler/compiler/integers/i128/ge.leo.out
index ecf7c64027..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/i128/ge.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/ge.leo.out
@@ -1,28 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 897
-      num_constraints: 897
-      at: 96f20d0620bc9136e98bfe583ce40c6ad4359d33c7bafe02d1e121e411b1df50
-      bt: bf4203445221fa42994f563865391d625b571513cf25a20cf465fbe26647ec5d
-      ct: 8d7309bdb692a71de6c9efc246984ce389534e8fc31222a94d5217720c2d20e9
-    output:
-      - input_file: i128_e.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-      - input_file: i128_g.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: baa6a3685d6b0fce00d68e12fae11a15f8e939d1cdb6fc2742ee57f778b7da7c
-    imports_resolved_ast: baa6a3685d6b0fce00d68e12fae11a15f8e939d1cdb6fc2742ee57f778b7da7c
-    canonicalized_ast: baa6a3685d6b0fce00d68e12fae11a15f8e939d1cdb6fc2742ee57f778b7da7c
-    type_inferenced_ast: 406d1f28168a11a6e8404a14d80b20bdd5067823dc00b83c60d1ccf217db17f8
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/i128/gt.leo.out b/tests/expectations/compiler/compiler/integers/i128/gt.leo.out
index e3f4e3d9bf..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/i128/gt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/gt.leo.out
@@ -1,28 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 897
-      num_constraints: 897
-      at: 98a9cad46c764246288557ee4b5ded8e4f2ca8c99e07068d8e5cfef000e22e31
-      bt: 7734cf8efdd437cd881763da604d9524fca91092bda9b6fc677ff9c30fa4b3c7
-      ct: 8d7309bdb692a71de6c9efc246984ce389534e8fc31222a94d5217720c2d20e9
-    output:
-      - input_file: i128_g.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-      - input_file: i128_e.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: e2b90c71500bfbdd6d581f1f66d974507922f946f48175b82768c804ca2892f5
-    imports_resolved_ast: e2b90c71500bfbdd6d581f1f66d974507922f946f48175b82768c804ca2892f5
-    canonicalized_ast: e2b90c71500bfbdd6d581f1f66d974507922f946f48175b82768c804ca2892f5
-    type_inferenced_ast: 1752aa11aea71f4a459400f14558caf6a523bad2885bc11f8449cc25af81715c
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/i128/le.leo.out b/tests/expectations/compiler/compiler/integers/i128/le.leo.out
index c80c011dda..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/i128/le.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/le.leo.out
@@ -1,28 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 897
-      num_constraints: 897
-      at: e7341bd3736199176968e0d217b64de1913590fe3c69e32c4a398014df18f20f
-      bt: 78d5b43e2c7d048af797f16a430d0ce5b99f8305fb1dbd0c7a0a6f36cbd6b046
-      ct: 8d7309bdb692a71de6c9efc246984ce389534e8fc31222a94d5217720c2d20e9
-    output:
-      - input_file: i128_l.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-      - input_file: i128_e.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 8753b11c3aca4b8feb1be18420840b4c9de9ddcb07d089ed2f5f4c384afc204a
-    imports_resolved_ast: 8753b11c3aca4b8feb1be18420840b4c9de9ddcb07d089ed2f5f4c384afc204a
-    canonicalized_ast: 8753b11c3aca4b8feb1be18420840b4c9de9ddcb07d089ed2f5f4c384afc204a
-    type_inferenced_ast: 79b296585b1e4ce4b1e9b3e29180ebfa06f7892d553d31a1f148e952f46ce768
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/i128/lt.leo.out b/tests/expectations/compiler/compiler/integers/i128/lt.leo.out
index 43e665808f..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/i128/lt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/lt.leo.out
@@ -1,28 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 897
-      num_constraints: 897
-      at: 9164a7c32351fa140180bb6aedc74fc291dde69bbff2b1e9c2191b3d155356dd
-      bt: 9a46d23879218b3aa9d5b6575fc677aca1f7470b3b4e623a26f410a38200661b
-      ct: 8d7309bdb692a71de6c9efc246984ce389534e8fc31222a94d5217720c2d20e9
-    output:
-      - input_file: i128_l.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-      - input_file: i128_e.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: ff20432be7beb83e5e5b022eef93d6ea0ef262fb834ce0eef5633c1db97abe03
-    imports_resolved_ast: ff20432be7beb83e5e5b022eef93d6ea0ef262fb834ce0eef5633c1db97abe03
-    canonicalized_ast: ff20432be7beb83e5e5b022eef93d6ea0ef262fb834ce0eef5633c1db97abe03
-    type_inferenced_ast: 5a43f0e27448024f978e71e784a16071cccbe7d8bf666ce7c42653e593244249
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/i128/max.leo.out b/tests/expectations/compiler/compiler/integers/i128/max.leo.out
index c77d9b0f0c..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/i128/max.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/max.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: "../input/dummy.in"
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 48a298fe2f4f2855ad2f9e089cfbc6749ee6f8f95f81ca9a97360f331aaae1fb
-    imports_resolved_ast: 48a298fe2f4f2855ad2f9e089cfbc6749ee6f8f95f81ca9a97360f331aaae1fb
-    canonicalized_ast: 48a298fe2f4f2855ad2f9e089cfbc6749ee6f8f95f81ca9a97360f331aaae1fb
-    type_inferenced_ast: 5f10c4f16a11b966282e2484c7f243a794f2c1a2377be993b694080434791ff6
+outputs: []
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 dcf61b19c0..3f519cf1b5 100644
--- a/tests/expectations/compiler/compiler/integers/i128/max_fail.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/max_fail.leo.out
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - "Error [EASG0373030]: failed to parse int value '170141183460469231731687303715884105728'\n    --> compiler-test:4:21\n     |\n   4 |     const a: i128 = 170141183460469231731687303715884105728;\n     |                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^"
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/i128/min.leo.out b/tests/expectations/compiler/compiler/integers/i128/min.leo.out
index f1a1a00980..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/i128/min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/min.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: "../input/dummy.in"
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 7607f334bcc8676c2276fc9c0950437719631f6d7221e1f3288a4f144096fa0d
-    imports_resolved_ast: 7607f334bcc8676c2276fc9c0950437719631f6d7221e1f3288a4f144096fa0d
-    canonicalized_ast: 7607f334bcc8676c2276fc9c0950437719631f6d7221e1f3288a4f144096fa0d
-    type_inferenced_ast: 2d21167fca05fd5c84ab023d5fb99d8bf84f733797d01dbdf5cfb924d0aa0a26
+outputs: []
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 1521d75463..3f519cf1b5 100644
--- a/tests/expectations/compiler/compiler/integers/i128/min_fail.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/min_fail.leo.out
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - "Error [EASG0373030]: failed to parse int value '-170141183460469231731687303715884105729'\n    --> compiler-test:4:21\n     |\n   4 |     const a: i128 = -170141183460469231731687303715884105729;\n     |                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^"
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/i128/mul.leo.out b/tests/expectations/compiler/compiler/integers/i128/mul.leo.out
index 7a8b72f486..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/i128/mul.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/mul.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 393216
-      num_constraints: 393217
-      at: d5a0c9b374587e6c25f437a157bef0c152665743371172ba94d04e13a1a8f509
-      bt: 2d0600e403e694d114c452c3e5c1ad2137e48b5344b3760dbec2e826420b8a9e
-      ct: 76b519a48f8267fa180bc68f3e7a84fe7319a3ad2e76338916cb399d9cea22d8
-    output:
-      - input_file: i128.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 16a27b027b669640d3c23c1eca2db5ea3286bf3623baf9038cb28c4937e88c34
-    imports_resolved_ast: 16a27b027b669640d3c23c1eca2db5ea3286bf3623baf9038cb28c4937e88c34
-    canonicalized_ast: 16a27b027b669640d3c23c1eca2db5ea3286bf3623baf9038cb28c4937e88c34
-    type_inferenced_ast: ab943eb3fb77eff83662d400ce152c5a27588bbecb72bba0c2f06146fc1e671b
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/i128/ne.leo.out b/tests/expectations/compiler/compiler/integers/i128/ne.leo.out
index 08df752694..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/i128/ne.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/ne.leo.out
@@ -1,28 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 513
-      num_constraints: 513
-      at: 8f9d3ef916a970cb762ca6f3829a8b4897dc65d493a2ea2eb4fa812a2062fe67
-      bt: edc1de9388a8bb2c659c9b4e9deecd8406826abcfe220d295bf7d85a550c0c43
-      ct: c224fec21cf5a2b24eb94033a20aeb4729d3d0cf596339145cb49ea6a44cc5d8
-    output:
-      - input_file: i128_ne.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-      - input_file: i128_e.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 6438b7751a9bfbc114ec061c946ab917fe196c321b6382a803e263fc131e94cf
-    imports_resolved_ast: 6438b7751a9bfbc114ec061c946ab917fe196c321b6382a803e263fc131e94cf
-    canonicalized_ast: 6438b7751a9bfbc114ec061c946ab917fe196c321b6382a803e263fc131e94cf
-    type_inferenced_ast: f956cebfdaffc93e04d75ec4017db28671a9ca95b46d7e46f0fe7c03921c8fcc
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/i128/negate.leo.out b/tests/expectations/compiler/compiler/integers/i128/negate.leo.out
index d24af05f3a..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/i128/negate.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/negate.leo.out
@@ -1,28 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 765
-      num_constraints: 765
-      at: 46af0432868923f7cad6e7db2de33a69ccad1a789e92d552ec26f8fc19a7d33d
-      bt: f1167d856668e1efcd49f020430a704e62ad6e46006e7faf58acdac8bb8a5ba2
-      ct: 075f6359a5dd933b671b42c06465f4c70f5ec152176c234fb4d3cdfbe6255daf
-    output:
-      - input_file: i128.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-      - input_file: i128.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: f20c4c3491707834724e32b0bd9116e203db8e8e03bc77f14d958fff910ea7a8
-    imports_resolved_ast: f20c4c3491707834724e32b0bd9116e203db8e8e03bc77f14d958fff910ea7a8
-    canonicalized_ast: f20c4c3491707834724e32b0bd9116e203db8e8e03bc77f14d958fff910ea7a8
-    type_inferenced_ast: 06e7d8be76d296f884f35880eb91b74b438316b04f1e189ac265ee76692da63f
+outputs: []
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 9e893a8160..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/i128/negate_min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/negate_min.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: "../input/dummy.in"
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 910fc83d7c92963a426e05d43b855610cddcd68f7ca007dc83a6dae90fc12be2
-    imports_resolved_ast: 910fc83d7c92963a426e05d43b855610cddcd68f7ca007dc83a6dae90fc12be2
-    canonicalized_ast: 910fc83d7c92963a426e05d43b855610cddcd68f7ca007dc83a6dae90fc12be2
-    type_inferenced_ast: f27e5afe0c4bf455ca2b3cc989d8659066d2f9c817741cb0d1b7e66a756dc04f
+outputs: []
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 1c085131e8..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/i128/negate_zero.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/negate_zero.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: dummy.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 68dd2506b7582cec89325afd649b76057840759d535cedca3e4cde98efeb0877
-    imports_resolved_ast: 68dd2506b7582cec89325afd649b76057840759d535cedca3e4cde98efeb0877
-    canonicalized_ast: 68dd2506b7582cec89325afd649b76057840759d535cedca3e4cde98efeb0877
-    type_inferenced_ast: 67b08390d952e54e77e5704a13dfcedd83f4eba2f031d8d369c5c580722e02f0
+outputs: []
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..3f519cf1b5 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
@@ -1,5 +1,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     |               ^"
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/i128/sub.leo.out b/tests/expectations/compiler/compiler/integers/i128/sub.leo.out
index b32c214970..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/i128/sub.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/sub.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1658
-      num_constraints: 1659
-      at: bb46c735f0d1698aa6cf8637b23babcdf0df3ec6e64f4b2e7d3e86f6f461e961
-      bt: 859297637693ebdf41005288cf212906c1d7619049b4305d34d9dededb24b5c5
-      ct: 50293f70acfe4a8aadffa8b17c18b0411493c8760fc474dcdf26f5bc7d70ada4
-    output:
-      - input_file: i128.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: bc09a92a140e879b4fe0a16156a776015e48283e90b6f1af3ab2647a9ca044ce
-    imports_resolved_ast: bc09a92a140e879b4fe0a16156a776015e48283e90b6f1af3ab2647a9ca044ce
-    canonicalized_ast: bc09a92a140e879b4fe0a16156a776015e48283e90b6f1af3ab2647a9ca044ce
-    type_inferenced_ast: f9b47c27d64d9bd058c7341a828c51c31fcb4bc2bdb34bd8169d53a768559859
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/i128/ternary.leo.out b/tests/expectations/compiler/compiler/integers/i128/ternary.leo.out
index 716a3d3807..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/i128/ternary.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/ternary.leo.out
@@ -1,28 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 896
-      num_constraints: 1024
-      at: 0830a3e788b536b36f271fadaadcc919281b2171d4e18814385b74f6820cb5c9
-      bt: 1fb9bfc22c01a54c08602e7f3883c19b00de1070aa9bad9e9234e322f9043711
-      ct: ee9facabe4c76f5eb89984d3c5cb15f92eaa0cc3b4bc4fdff261aeb36ad0101b
-    output:
-      - input_file: i128.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-      - input_file: i128_rev.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 59f299e993a6a2a19cfca109677cc4d5a72db425ace34b4b55d3b8b7cb54fdfe
-    imports_resolved_ast: 59f299e993a6a2a19cfca109677cc4d5a72db425ace34b4b55d3b8b7cb54fdfe
-    canonicalized_ast: 59f299e993a6a2a19cfca109677cc4d5a72db425ace34b4b55d3b8b7cb54fdfe
-    type_inferenced_ast: c83d950f8244fef52d7b25a588457ad771da0f73440f4d2523ac747623cf7a3a
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/i16/add.leo.out b/tests/expectations/compiler/compiler/integers/i16/add.leo.out
index abdfe2f639..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/i16/add.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/add.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 172
-      num_constraints: 173
-      at: 6b89cd61c27d609100734788caaf250a61c4e65e8bb53a70cb9a67bd3970d344
-      bt: 3685748e2150def12598827c6d3217b7665ad912fcf517afafed7dd933dd68a2
-      ct: acefb38d2e822ba8454f989fcdcfad22e9c15b0115cebecf3ec7f842412b0812
-    output:
-      - input_file: i16.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: a67c4ea1ac24f9da48cc18159bda3779585be4d0ff2ef7b2e36111c8e30a7095
-    imports_resolved_ast: a67c4ea1ac24f9da48cc18159bda3779585be4d0ff2ef7b2e36111c8e30a7095
-    canonicalized_ast: a67c4ea1ac24f9da48cc18159bda3779585be4d0ff2ef7b2e36111c8e30a7095
-    type_inferenced_ast: 7d10fe70a4c3ad44ce07ae4fab3d1082d3f238757d318694f536e5b2e963c76a
+outputs: []
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 822c334963..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/i16/console_assert.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/console_assert.leo.out
@@ -1,19 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 63
-      num_constraints: 63
-      at: 781fbf42db29f7fa9c21d99e21d8f011ec22b33ad26d3f80438687aafd462285
-      bt: abee7b67c55170fc3341444203a9a70e68690dce751aa36d3e91f1cf7ceef73d
-      ct: 51c18ee4216feeb01d0b0d661dfeb294e7e100873586edf79be89c8b54d9e168
-    output:
-      - input_file: i16.in
-        output:
-          registers: {}
-    initial_ast: f68bd73d5f657b880c76f678c5d8b6903aebd0701415977f5dd35009b383daaf
-    imports_resolved_ast: f68bd73d5f657b880c76f678c5d8b6903aebd0701415977f5dd35009b383daaf
-    canonicalized_ast: a1a4fada7b1c3d4e82ac1065a720c6b11fdffd4a1cf270128432e04cee150cbb
-    type_inferenced_ast: 18633259cef0bf8b6f58b4fdddeff2e0f212f4bfd9a3a9d2e7c8b328117ee679
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/i16/div.leo.out b/tests/expectations/compiler/compiler/integers/i16/div.leo.out
index 66143f881a..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/i16/div.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/div.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 4358
-      num_constraints: 5446
-      at: 285c49252166e044a1648d7cdeaa3975efca0e746efd365d2f170900157df8b9
-      bt: b7dcf6f446108df31801263f54f0d504800d85f341baa945f13eb2dbbbbe4851
-      ct: 6743f276428e33d909885898f76d747836254decaf153021c75df8d62b890e41
-    output:
-      - input_file: i16.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: a0694975f2bd295505d998da6b165707f8231c8df9f046fccde58cc8f42da438
-    imports_resolved_ast: a0694975f2bd295505d998da6b165707f8231c8df9f046fccde58cc8f42da438
-    canonicalized_ast: a0694975f2bd295505d998da6b165707f8231c8df9f046fccde58cc8f42da438
-    type_inferenced_ast: 66bbe4a003338adcacbf310ee8b26cb128175b0125523981d2378088760a321d
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/i16/eq.leo.out b/tests/expectations/compiler/compiler/integers/i16/eq.leo.out
index 109d08d761..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/i16/eq.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/eq.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 65
-      num_constraints: 65
-      at: 8c8b795ef4142f2651625b90b3624d24de5138c3fb0981288a8cc5e12bf31f82
-      bt: eba2113bdda3d667d9e8c87f545fe4e2a0143b18a3fff0c1aaa46dd376ed1735
-      ct: f037d279ccea3ca689e05801ec3ba0053b5ce66a1763d4620262ea9b69873008
-    output:
-      - input_file: i16.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: b961658930719fa317e5762c0f759cccf808d0c25e4036efdc24efd3dd917145
-    imports_resolved_ast: b961658930719fa317e5762c0f759cccf808d0c25e4036efdc24efd3dd917145
-    canonicalized_ast: b961658930719fa317e5762c0f759cccf808d0c25e4036efdc24efd3dd917145
-    type_inferenced_ast: 6e404e9ce612711f1170f49704f440a1698f61a5d830eeea3460025bd9883f29
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/i16/ge.leo.out b/tests/expectations/compiler/compiler/integers/i16/ge.leo.out
index 35249b2b08..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/i16/ge.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/ge.leo.out
@@ -1,28 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 113
-      num_constraints: 113
-      at: aacaa02fab172aad56801a9785e4265f42a5b7a8a90f3277508d9bdf9b71739e
-      bt: dc20f75204b1fb858e1971441f24a4aa1780e545581c55ff3d52cec41be65b79
-      ct: 92784334fb47e5a53eb972ec42d95f97470117bb6839cf2d46e8fcbd38a662f9
-    output:
-      - input_file: i16_e.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-      - input_file: i16_g.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: af26d10d2f2a9d2c506829aec8c88fb34ae2ef681ffc4d3b8ec4b284bfdf3d9c
-    imports_resolved_ast: af26d10d2f2a9d2c506829aec8c88fb34ae2ef681ffc4d3b8ec4b284bfdf3d9c
-    canonicalized_ast: af26d10d2f2a9d2c506829aec8c88fb34ae2ef681ffc4d3b8ec4b284bfdf3d9c
-    type_inferenced_ast: 54cb6e5e03539e745b67bcfcd2d8175571e58747a26184d61991fd243e026efe
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/i16/gt.leo.out b/tests/expectations/compiler/compiler/integers/i16/gt.leo.out
index 7a4d515135..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/i16/gt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/gt.leo.out
@@ -1,28 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 113
-      num_constraints: 113
-      at: 5c1bf4b2c0dcee44497206b68fafb1e2e98bc020688d260da3730723c0c90dd8
-      bt: 07da85fcfccc58758d043e27b0aab5a749760c644824684c13befde258deb78c
-      ct: 92784334fb47e5a53eb972ec42d95f97470117bb6839cf2d46e8fcbd38a662f9
-    output:
-      - input_file: i16_g.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-      - input_file: i16_e.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 062d3eb6035e1677c45329522cbd26b8a9b5bc6d501510db6d48a47e262253e6
-    imports_resolved_ast: 062d3eb6035e1677c45329522cbd26b8a9b5bc6d501510db6d48a47e262253e6
-    canonicalized_ast: 062d3eb6035e1677c45329522cbd26b8a9b5bc6d501510db6d48a47e262253e6
-    type_inferenced_ast: 2f160dd1d274d6efc5359b8643d33846d32e78ab5c541ed5f5c58fb42c9ea245
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/i16/le.leo.out b/tests/expectations/compiler/compiler/integers/i16/le.leo.out
index bee4bdc77f..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/i16/le.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/le.leo.out
@@ -1,28 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 113
-      num_constraints: 113
-      at: a38a17fb5f40313343215b604602dfb492eb06cc8ac81d7d75443663398eb105
-      bt: 34c1c5f1fd258fc5f18137e0cd367a6c3149958ec8b92123518e293db31afbe3
-      ct: 92784334fb47e5a53eb972ec42d95f97470117bb6839cf2d46e8fcbd38a662f9
-    output:
-      - input_file: i16_l.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-      - input_file: i16_e.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 6680714854c32707931c35b568b4ca58e6fb30fb6d6af7dd88752712a5932295
-    imports_resolved_ast: 6680714854c32707931c35b568b4ca58e6fb30fb6d6af7dd88752712a5932295
-    canonicalized_ast: 6680714854c32707931c35b568b4ca58e6fb30fb6d6af7dd88752712a5932295
-    type_inferenced_ast: 9933127e345e202a0e2876dd14a3443a3a104f9faae4a6428e10268f7793b66d
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/i16/lt.leo.out b/tests/expectations/compiler/compiler/integers/i16/lt.leo.out
index bdbcfa8b12..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/i16/lt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/lt.leo.out
@@ -1,28 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 113
-      num_constraints: 113
-      at: 882216b2b7d92dafe18a2ba6eefed789ba0084c92957772d0b1e3797ac391d8f
-      bt: 564588048812d9300963caf70148f154c231faa3209aed2ee5f9dd51a31af0ef
-      ct: 92784334fb47e5a53eb972ec42d95f97470117bb6839cf2d46e8fcbd38a662f9
-    output:
-      - input_file: i16_l.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-      - input_file: i16_e.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 763c352848bf7747e761659811842656e84bb2e5e8b31cea06ded7f6b6b79f90
-    imports_resolved_ast: 763c352848bf7747e761659811842656e84bb2e5e8b31cea06ded7f6b6b79f90
-    canonicalized_ast: 763c352848bf7747e761659811842656e84bb2e5e8b31cea06ded7f6b6b79f90
-    type_inferenced_ast: e4f72776d8aea450005835d7e69ef1f46e0b13c18673b97709546d49216064af
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/i16/max.leo.out b/tests/expectations/compiler/compiler/integers/i16/max.leo.out
index b8375ba80f..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/i16/max.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/max.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: "../input/dummy.in"
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 3683f5647eb1ba2d1999c80f2eb629a3ed5a7114e888b0282066556a2df7877b
-    imports_resolved_ast: 3683f5647eb1ba2d1999c80f2eb629a3ed5a7114e888b0282066556a2df7877b
-    canonicalized_ast: 3683f5647eb1ba2d1999c80f2eb629a3ed5a7114e888b0282066556a2df7877b
-    type_inferenced_ast: 0d239b14f356b7fc5b65558b1a74ac63af72e7f599d2af7d9f78bfca7d0dec06
+outputs: []
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 f794128e4b..3f519cf1b5 100644
--- a/tests/expectations/compiler/compiler/integers/i16/max_fail.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/max_fail.leo.out
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - "Error [EASG0373030]: failed to parse int value '32768'\n    --> compiler-test:4:20\n     |\n   4 |     const a: i16 = 32768;\n     |                    ^^^^^"
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/i16/min.leo.out b/tests/expectations/compiler/compiler/integers/i16/min.leo.out
index 6fe7c31078..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/i16/min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/min.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: "../input/dummy.in"
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: ff4a8d9a961ad3cb815e5c7fd71f32c2071b802fcec05e4768fced1f66c52d35
-    imports_resolved_ast: ff4a8d9a961ad3cb815e5c7fd71f32c2071b802fcec05e4768fced1f66c52d35
-    canonicalized_ast: ff4a8d9a961ad3cb815e5c7fd71f32c2071b802fcec05e4768fced1f66c52d35
-    type_inferenced_ast: 27745e526e1e647526bd04fac6cf28e6c190a4d6aca2e0f235d7eff8ec1d00c3
+outputs: []
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 956353eb27..3f519cf1b5 100644
--- a/tests/expectations/compiler/compiler/integers/i16/min_fail.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/min_fail.leo.out
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - "Error [EASG0373030]: failed to parse int value '-32769'\n    --> compiler-test:4:20\n     |\n   4 |     const a: i16 = -32769;\n     |                    ^^^^^^"
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/i16/mul.leo.out b/tests/expectations/compiler/compiler/integers/i16/mul.leo.out
index e02846dff2..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/i16/mul.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/mul.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 6144
-      num_constraints: 6145
-      at: a82b875e925052eba2aa8b33aaa6a654c144148e94e18bbe9649dcdd1fc0ad71
-      bt: cd23bca179b84ca9238460e8de4ec0c0afdc0ce1e3d6669329fc4baf08e7e0db
-      ct: f60e073d0353b71ab07769daa585ce03799bb2f4095a0dda5f9009b4f42162ed
-    output:
-      - input_file: i16.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: e2ea9bad702ec0c03da96d6de6e49e19600c7c59a984b1f6293456a6422a44ee
-    imports_resolved_ast: e2ea9bad702ec0c03da96d6de6e49e19600c7c59a984b1f6293456a6422a44ee
-    canonicalized_ast: e2ea9bad702ec0c03da96d6de6e49e19600c7c59a984b1f6293456a6422a44ee
-    type_inferenced_ast: 529c3f87ac0b87c521d21958a8fa03f1bd4a77a047ed0815935c33a35780dcb2
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/i16/ne.leo.out b/tests/expectations/compiler/compiler/integers/i16/ne.leo.out
index 8239a63289..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/i16/ne.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/ne.leo.out
@@ -1,28 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 65
-      num_constraints: 65
-      at: 83a4d089927a9811a9d4ed5b3ee2e50e395cd598de865653be04a2c51904b072
-      bt: 30bc7cfbc53a2e928ca0310b6041f1f1548ad7c1197ffc9301b46522122e5561
-      ct: f037d279ccea3ca689e05801ec3ba0053b5ce66a1763d4620262ea9b69873008
-    output:
-      - input_file: i16_ne.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-      - input_file: i16_e.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: c7ab4b48ebe504d361335859297d54229144960db82dde7a6d7124821dc5bdaf
-    imports_resolved_ast: c7ab4b48ebe504d361335859297d54229144960db82dde7a6d7124821dc5bdaf
-    canonicalized_ast: c7ab4b48ebe504d361335859297d54229144960db82dde7a6d7124821dc5bdaf
-    type_inferenced_ast: fba12a2f71c2ae3dba292b834566ba9d3495f888e21fb07109b15be597f2b6bf
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/i16/negate.leo.out b/tests/expectations/compiler/compiler/integers/i16/negate.leo.out
index d0ec10d082..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/i16/negate.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/negate.leo.out
@@ -1,28 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 93
-      num_constraints: 93
-      at: 29988ea86584610f4511315204ed49c45d0303c44e0fb59c0df19dc048cee369
-      bt: 9bba1722080b8c396e72a645c5ca7dff2943c0b29a741569acdba3887e40c8af
-      ct: 4f89ea4838bc4544e2767b7dc68a1e0fa0649d7401bb7ae8292bd6aa654eda28
-    output:
-      - input_file: i16.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-      - input_file: i16.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: ecbc2a7d13b6a8d1bf35f53a9d80c4aab380495ec93663410c390e5d6d4f602e
-    imports_resolved_ast: ecbc2a7d13b6a8d1bf35f53a9d80c4aab380495ec93663410c390e5d6d4f602e
-    canonicalized_ast: ecbc2a7d13b6a8d1bf35f53a9d80c4aab380495ec93663410c390e5d6d4f602e
-    type_inferenced_ast: 106f4bc60cc6c007d1418e2571c3183f4372988be97c319574e965d2a08d9f3d
+outputs: []
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 cb03f28c62..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/i16/negate_min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/negate_min.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: "../input/dummy.in"
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: a8449e15a25ff4327992829605e38edc70f958d0e3af40e3244b687b6a7a524f
-    imports_resolved_ast: a8449e15a25ff4327992829605e38edc70f958d0e3af40e3244b687b6a7a524f
-    canonicalized_ast: a8449e15a25ff4327992829605e38edc70f958d0e3af40e3244b687b6a7a524f
-    type_inferenced_ast: 90abf0bc2284b1bee472bcc256040c4dafd0e98c8938b9912778ed9c31d3f8ec
+outputs: []
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 bc9c8258fe..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/i16/negate_zero.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/negate_zero.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: dummy.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: d0091da13c0406b347d3c276e90831cdd65da70e601ff244bd9c861c2c30af31
-    imports_resolved_ast: d0091da13c0406b347d3c276e90831cdd65da70e601ff244bd9c861c2c30af31
-    canonicalized_ast: d0091da13c0406b347d3c276e90831cdd65da70e601ff244bd9c861c2c30af31
-    type_inferenced_ast: bf3619f3735b49c2daa579800f40de768515f8367c7b934567ae1e79eb8d9228
+outputs: []
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..3f519cf1b5 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
@@ -1,5 +1,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     |               ^"
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/i16/sub.leo.out b/tests/expectations/compiler/compiler/integers/i16/sub.leo.out
index 468b2421a7..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/i16/sub.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/sub.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 202
-      num_constraints: 203
-      at: 7b1b870d629fe64b117f0be092b7336e6b4149ac6778d0f4d02273e0c2b59a2a
-      bt: 035e3e8f741942f4683b2262c8f0fc75c0c5a89252c069ed956abce34019b988
-      ct: cd38769a0ae3aefd48815d80555886d23370399b29596b8433ad23be67afc55f
-    output:
-      - input_file: i16.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 29b5330610e95c16d51f5296a10729b570a50e19862685ad5d3209e458e42c79
-    imports_resolved_ast: 29b5330610e95c16d51f5296a10729b570a50e19862685ad5d3209e458e42c79
-    canonicalized_ast: 29b5330610e95c16d51f5296a10729b570a50e19862685ad5d3209e458e42c79
-    type_inferenced_ast: b50322c970ad5e34639834c22770e359a2a3fe6434064ef3687e03889af3f02b
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/i16/ternary.leo.out b/tests/expectations/compiler/compiler/integers/i16/ternary.leo.out
index 9781a6c474..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/i16/ternary.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/ternary.leo.out
@@ -1,28 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 112
-      num_constraints: 128
-      at: b0a107f586de648c8446ae3246117de3b20ba9c0249d261f234106809d112f0a
-      bt: 0e5faacb5d80488eeda9e7fa79ddd96e54c010e0e98571449f79cad816cc18a2
-      ct: 2b3428d7c7335edc32ab219fe11c92e215d70a52c89434de349f4951561d5795
-    output:
-      - input_file: i16.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-      - input_file: i16_rev.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 331af238c9ee45bd3b604155405f8ab4061ff16416387249364f83432f7f8b5a
-    imports_resolved_ast: 331af238c9ee45bd3b604155405f8ab4061ff16416387249364f83432f7f8b5a
-    canonicalized_ast: 331af238c9ee45bd3b604155405f8ab4061ff16416387249364f83432f7f8b5a
-    type_inferenced_ast: 50a018ce4b160bd86e9fbdfe9db17bcfd055e4800f06c55551eed3100d3f64e6
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/i32/add.leo.out b/tests/expectations/compiler/compiler/integers/i32/add.leo.out
index 68fc4a45f6..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/i32/add.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/add.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 348
-      num_constraints: 349
-      at: 2fe67b488b0f96f2f6be7e96dc7f102984b0132232e452f44e40cad21a1dc5f3
-      bt: 8dd304125c8178327f11b0894be2788080258a5a80aab3c1df046fea9f262789
-      ct: 8b73986e71edfc8b716f535eaa069b04cc15502adbd166ae713df42cb9d37a3c
-    output:
-      - input_file: i32.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 39635af165ae775232853b12ac07b0a21f39382ae3e146001e1a05b7c60849c3
-    imports_resolved_ast: 39635af165ae775232853b12ac07b0a21f39382ae3e146001e1a05b7c60849c3
-    canonicalized_ast: 39635af165ae775232853b12ac07b0a21f39382ae3e146001e1a05b7c60849c3
-    type_inferenced_ast: 8da17349b8496481730002123096f5c09debd25133db8045665aa2ae405efe1a
+outputs: []
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 4f1f835132..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/i32/console_assert.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/console_assert.leo.out
@@ -1,19 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 127
-      num_constraints: 127
-      at: 051151c1ab89f2c0ff0fe5d336668c3fcd6dc4744d1f5b8e135dcb7bf6a6195c
-      bt: 6b92443726163ac0fc32f7c9edace0ec8369e793d24105d93d121cb0bd5c3128
-      ct: 7cb2d3f0ccfb9a2e747c6a05bdb52812c4539c836ff62c4e555fac13ef2084d4
-    output:
-      - input_file: i32.in
-        output:
-          registers: {}
-    initial_ast: 6ba5c49aaa9ed5abf49a7f538392cb18905e6805b7d3780e5d6391adb7df6631
-    imports_resolved_ast: 6ba5c49aaa9ed5abf49a7f538392cb18905e6805b7d3780e5d6391adb7df6631
-    canonicalized_ast: 35877250663e7d44c5e01e64cd99d5e1b8fa84da4d00667bade1fd9a517f3803
-    type_inferenced_ast: 2c72c8cf340cc122fb5a081c8dd6eaa22ac2c79511e98fd5f23f4b8b1dac3526
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/i32/div.leo.out b/tests/expectations/compiler/compiler/integers/i32/div.leo.out
index 40804c7cb0..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/i32/div.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/div.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 16918
-      num_constraints: 21142
-      at: a8ca22c0da8166ef4f88e959be315231681516ee6113dff620637774f8e4a670
-      bt: e09097be6926888dddac4cd61c1b3419e05b5b700ba3acca116f6eb2c01cb0a4
-      ct: 13922ea4b7763c9228f5dfedfb0d8e2f7d5a3bbed934cd6df5ae99f4150222d2
-    output:
-      - input_file: i32.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 3917fa03634f3abb0d497bfae7ba98c15dd93f867e3e1bf724bab8fc724ce8cf
-    imports_resolved_ast: 3917fa03634f3abb0d497bfae7ba98c15dd93f867e3e1bf724bab8fc724ce8cf
-    canonicalized_ast: 3917fa03634f3abb0d497bfae7ba98c15dd93f867e3e1bf724bab8fc724ce8cf
-    type_inferenced_ast: 1f460bec4ed9e4478b7ef9df14773eb92ad310d790cae429a0caadbc7f750d2e
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/i32/eq.leo.out b/tests/expectations/compiler/compiler/integers/i32/eq.leo.out
index 690a556f61..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/i32/eq.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/eq.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 129
-      num_constraints: 129
-      at: 4ce4f2bf481c4f7e47396527999e129066d1f157413884f91ced3d2b525a3187
-      bt: e63628fc48d1e71ea44830c010e442f577239e29f7ffada0d8df34c28e67f107
-      ct: 9f4c72431c0c7c03e216195a071c971c53deed8e3bfce450bffb3a6fad7418d5
-    output:
-      - input_file: i32.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 180d1048dd64c67ea367750630057b9c5302a89a81144d0148ea1dfafada8b4c
-    imports_resolved_ast: 180d1048dd64c67ea367750630057b9c5302a89a81144d0148ea1dfafada8b4c
-    canonicalized_ast: 180d1048dd64c67ea367750630057b9c5302a89a81144d0148ea1dfafada8b4c
-    type_inferenced_ast: f2f2254b22bc172f1859835e478e9456b3fdbc497f5a48483fc87969d6bf6144
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/i32/ge.leo.out b/tests/expectations/compiler/compiler/integers/i32/ge.leo.out
index f55b8e9939..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/i32/ge.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/ge.leo.out
@@ -1,28 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 225
-      num_constraints: 225
-      at: fba74e6ed7ae0c0cf0bd2c874940e7e9daf6c7c4e08cf9359b31279433ec0ef5
-      bt: 3f23038cdf71876dea48b44b9cae993b3f649b628bcdaf6f1cb77bbafa92b600
-      ct: d7067f500143a40e015fd1f4447a4ea5b9ee6ebdf007e08be51772a8a2b672c3
-    output:
-      - input_file: i32_e.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-      - input_file: i32_g.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 6401f6c0567fe73628faf73dc3cd71635bbba9b997c918d182f6fdf2dda68b82
-    imports_resolved_ast: 6401f6c0567fe73628faf73dc3cd71635bbba9b997c918d182f6fdf2dda68b82
-    canonicalized_ast: 6401f6c0567fe73628faf73dc3cd71635bbba9b997c918d182f6fdf2dda68b82
-    type_inferenced_ast: 9e105f38de69dddfd99b143f279f063950e305321a343dea0bf10924af6f7c2b
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/i32/gt.leo.out b/tests/expectations/compiler/compiler/integers/i32/gt.leo.out
index 4ec0e63ed9..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/i32/gt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/gt.leo.out
@@ -1,28 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 225
-      num_constraints: 225
-      at: fec1628688d454ab244e921b74f7f70ff6c7acf18280488dfb43cd0bb4bd70d2
-      bt: 02fd44d092923c1a89fc492a9660926934e03005d8c3fa5f42ae2a3fbd7048ea
-      ct: d7067f500143a40e015fd1f4447a4ea5b9ee6ebdf007e08be51772a8a2b672c3
-    output:
-      - input_file: i32_g.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-      - input_file: i32_e.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: f82734600ac57a9a5bd1ef4c2439cc5bbea882cd2ed81646ce6abd7915abc344
-    imports_resolved_ast: f82734600ac57a9a5bd1ef4c2439cc5bbea882cd2ed81646ce6abd7915abc344
-    canonicalized_ast: f82734600ac57a9a5bd1ef4c2439cc5bbea882cd2ed81646ce6abd7915abc344
-    type_inferenced_ast: 67d4dfb5c34b3e9aa457c7897d28cf85a2366bf987279f50eb44ad5cfe617ffa
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/i32/le.leo.out b/tests/expectations/compiler/compiler/integers/i32/le.leo.out
index c420c4c1f0..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/i32/le.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/le.leo.out
@@ -1,28 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 225
-      num_constraints: 225
-      at: 39f909848aee2ee744719f8692f58b9745aeaeededc431f1b06df839384bff07
-      bt: 4e75a3c5fd91239e6bf32d96c6a4a702e040e4a3bddcc282706ca76facb9e942
-      ct: d7067f500143a40e015fd1f4447a4ea5b9ee6ebdf007e08be51772a8a2b672c3
-    output:
-      - input_file: i32_l.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-      - input_file: i32_e.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 51baf4d7be19032fb911d8f5e7fb250ccf3e9e272644c013699be201cf44d00a
-    imports_resolved_ast: 51baf4d7be19032fb911d8f5e7fb250ccf3e9e272644c013699be201cf44d00a
-    canonicalized_ast: 51baf4d7be19032fb911d8f5e7fb250ccf3e9e272644c013699be201cf44d00a
-    type_inferenced_ast: 0427991a5b5ca595f7a0d5fb0d842ecc18433533366ae437fcbdaff134150481
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/i32/lt.leo.out b/tests/expectations/compiler/compiler/integers/i32/lt.leo.out
index c656ee7282..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/i32/lt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/lt.leo.out
@@ -1,28 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 225
-      num_constraints: 225
-      at: fcca8f94beb99b6f86edd3f8c36b81043482e6c449fc4278d53d546c295810ed
-      bt: 26e3dae4bf8fe37424b8ef7cc60b6136809286a8e64736e63b8b5dfacf774c21
-      ct: d7067f500143a40e015fd1f4447a4ea5b9ee6ebdf007e08be51772a8a2b672c3
-    output:
-      - input_file: i32_l.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-      - input_file: i32_e.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: e464cb5a70dcb5bf51ab5ccffa10b54ea29f0e68775593f05bb0d585144487a8
-    imports_resolved_ast: e464cb5a70dcb5bf51ab5ccffa10b54ea29f0e68775593f05bb0d585144487a8
-    canonicalized_ast: e464cb5a70dcb5bf51ab5ccffa10b54ea29f0e68775593f05bb0d585144487a8
-    type_inferenced_ast: 486d0d877dbc748210bc6a82d40a132709d83a44d5e4de255e9c40dd3bf6cedd
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/i32/max.leo.out b/tests/expectations/compiler/compiler/integers/i32/max.leo.out
index 48b7243612..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/i32/max.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/max.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: "../input/dummy.in"
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 2596ba582e34d7147902c469c3544d438d8ba64aeecd103938a1eb8e3536f360
-    imports_resolved_ast: 2596ba582e34d7147902c469c3544d438d8ba64aeecd103938a1eb8e3536f360
-    canonicalized_ast: 2596ba582e34d7147902c469c3544d438d8ba64aeecd103938a1eb8e3536f360
-    type_inferenced_ast: aa0a685388d2f3aed81db5c35ead63975e8ad4df5803390f1976795ad544430f
+outputs: []
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 0d54553e56..3f519cf1b5 100644
--- a/tests/expectations/compiler/compiler/integers/i32/max_fail.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/max_fail.leo.out
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - "Error [EASG0373030]: failed to parse int value '2147483648'\n    --> compiler-test:4:20\n     |\n   4 |     const a: i32 = 2147483648;\n     |                    ^^^^^^^^^^"
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/i32/min.leo.out b/tests/expectations/compiler/compiler/integers/i32/min.leo.out
index 0f8d4cf6b8..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/i32/min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/min.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: "../input/dummy.in"
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: e08bac68e7d8ebb03c3fc1538c525de5e2caeaed750b548f4756abf12d6d38a5
-    imports_resolved_ast: e08bac68e7d8ebb03c3fc1538c525de5e2caeaed750b548f4756abf12d6d38a5
-    canonicalized_ast: e08bac68e7d8ebb03c3fc1538c525de5e2caeaed750b548f4756abf12d6d38a5
-    type_inferenced_ast: f529d963cc870de92960d5c2eb5ec8ceeae22256f0164399867b996a14be14aa
+outputs: []
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 73ba63d793..3f519cf1b5 100644
--- a/tests/expectations/compiler/compiler/integers/i32/min_fail.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/min_fail.leo.out
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - "Error [EASG0373030]: failed to parse int value '-2147483649'\n    --> compiler-test:4:20\n     |\n   4 |     const a: i32 = -2147483649;\n     |                    ^^^^^^^^^^^"
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/i32/mul.leo.out b/tests/expectations/compiler/compiler/integers/i32/mul.leo.out
index 4c3c4bc942..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/i32/mul.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/mul.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 24576
-      num_constraints: 24577
-      at: 3f0c50eed51d601da1dd661e666f96fcf5285b7be20881d92b7fa14e6147c5fd
-      bt: fc2efd0d73e1d0feb345c15515e796fcd289003e5e388d35be464e3ee76a0cb5
-      ct: f720f62a8a58bc4a64c837cfad115c98d50ccfe3b208fb9fa346c5c17ff7ded4
-    output:
-      - input_file: i32.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 3fc63e8ecf481c6f4224c0206b16af942eb407b151f1fc21d8774cbf84ccc5d6
-    imports_resolved_ast: 3fc63e8ecf481c6f4224c0206b16af942eb407b151f1fc21d8774cbf84ccc5d6
-    canonicalized_ast: 3fc63e8ecf481c6f4224c0206b16af942eb407b151f1fc21d8774cbf84ccc5d6
-    type_inferenced_ast: 89f3c749fb559365b2ea0d804cb9146d923993a6c2c2dd9a3942057d7ff343d4
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/i32/ne.leo.out b/tests/expectations/compiler/compiler/integers/i32/ne.leo.out
index db5011ded1..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/i32/ne.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/ne.leo.out
@@ -1,28 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 129
-      num_constraints: 129
-      at: 6cde17fb079861287679ad93d9ed9125cfc21000431bfeaf5a2054360ce51ef7
-      bt: 1178e67ab79eac96592f17313168c4300d53e89ab571025054d53d19dfdfd1b8
-      ct: 9f4c72431c0c7c03e216195a071c971c53deed8e3bfce450bffb3a6fad7418d5
-    output:
-      - input_file: i32_ne.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-      - input_file: i32_e.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 79492afcb10499d002f2b1f6c60bd7e656817f7c638068ad4bb7b3f5087537c7
-    imports_resolved_ast: 79492afcb10499d002f2b1f6c60bd7e656817f7c638068ad4bb7b3f5087537c7
-    canonicalized_ast: 79492afcb10499d002f2b1f6c60bd7e656817f7c638068ad4bb7b3f5087537c7
-    type_inferenced_ast: 2f324fbbfefac3d5fd095be4ca42fd83c711ae407e9631b0814f543331662dcf
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/i32/negate.leo.out b/tests/expectations/compiler/compiler/integers/i32/negate.leo.out
index 51672f6983..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/i32/negate.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/negate.leo.out
@@ -1,28 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 189
-      num_constraints: 189
-      at: 2254172298dcedafc294b068f855ab0dd689491362b1b490a8c95435e4b159da
-      bt: 244d201ae16e93cdd97ca56d698598a5a66e1bcb2794d58b5e24f6f9df9760a4
-      ct: 1607b4ad7556c35957a6cbce85868f0f82d2c65e55f13350ef81738caec6e235
-    output:
-      - input_file: i32.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-      - input_file: i32.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: c895e4172b4155a740dfe2aebfc4ded6f694b017d0eb1b7700b42e4498ecf151
-    imports_resolved_ast: c895e4172b4155a740dfe2aebfc4ded6f694b017d0eb1b7700b42e4498ecf151
-    canonicalized_ast: c895e4172b4155a740dfe2aebfc4ded6f694b017d0eb1b7700b42e4498ecf151
-    type_inferenced_ast: 47858526755f4292e5e423544d3ed6b4c664b08566f1a3f066433a8e21f4480a
+outputs: []
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 0ac80cea4c..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/i32/negate_min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/negate_min.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: "../input/dummy.in"
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: bcbd4fdb79ebffa456407355e6d4f71d039014dd03cee2466850f90c1c1c17e2
-    imports_resolved_ast: bcbd4fdb79ebffa456407355e6d4f71d039014dd03cee2466850f90c1c1c17e2
-    canonicalized_ast: bcbd4fdb79ebffa456407355e6d4f71d039014dd03cee2466850f90c1c1c17e2
-    type_inferenced_ast: d2bc0ba76d451989365a4f3c40cffde6abc17865a43b2816d89bd884e8b0bdff
+outputs: []
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 f37306e8cb..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/i32/negate_zero.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/negate_zero.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: dummy.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: b1ec676bc801b40fa773668c988ce9da33fec783743e214269a777ad122cda49
-    imports_resolved_ast: b1ec676bc801b40fa773668c988ce9da33fec783743e214269a777ad122cda49
-    canonicalized_ast: b1ec676bc801b40fa773668c988ce9da33fec783743e214269a777ad122cda49
-    type_inferenced_ast: 97b5d8261ddffbfff0316e3bf97df502a9b1c75e79b2e94d0b8f8f8c565699de
+outputs: []
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..3f519cf1b5 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
@@ -1,5 +1,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     |               ^"
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/i32/sub.leo.out b/tests/expectations/compiler/compiler/integers/i32/sub.leo.out
index 113536fbea..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/i32/sub.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/sub.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 410
-      num_constraints: 411
-      at: 3293cb0f2e38fae78ca837de736471f6e36a372f92282123f6082e07648b412b
-      bt: c342f65da421c48d402ba324062abbb064eb525a99fe5379fcb1654a33a11d68
-      ct: 8a37ed12cbab476be56f1dc175e38c689f5bde3909161865409085a34c4a19f1
-    output:
-      - input_file: i32.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: d3776192bdb897e3ffdfe76557ba210babd9fd36945d47133552271858ff5c35
-    imports_resolved_ast: d3776192bdb897e3ffdfe76557ba210babd9fd36945d47133552271858ff5c35
-    canonicalized_ast: d3776192bdb897e3ffdfe76557ba210babd9fd36945d47133552271858ff5c35
-    type_inferenced_ast: 36e7d5a21e55cd5d61ea6644e8d5c84a0640972921fbdcfd6e27886caf6b5216
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/i32/ternary.leo.out b/tests/expectations/compiler/compiler/integers/i32/ternary.leo.out
index 4960310094..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/i32/ternary.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/ternary.leo.out
@@ -1,28 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 224
-      num_constraints: 256
-      at: 45301188494f0c65b2e88eac9117ba7367e772ea34e9b8f34bf3d49dbd1dd067
-      bt: 35d9c47cfd4fc137760d0ee411c0b097541cab7aae2b0a9ea83b368328fe5c23
-      ct: 032da4c7df957d9ca89b5395be6e1c84cab7d19a78abe1b02bb37b26ca65b0e4
-    output:
-      - input_file: i32.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-      - input_file: i32_rev.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 04e630cdddd76554c0049b08a3ed7a6a2c824a7dc929796e3fc713c6d11f70be
-    imports_resolved_ast: 04e630cdddd76554c0049b08a3ed7a6a2c824a7dc929796e3fc713c6d11f70be
-    canonicalized_ast: 04e630cdddd76554c0049b08a3ed7a6a2c824a7dc929796e3fc713c6d11f70be
-    type_inferenced_ast: 0655b17c3f9cc5c7500c8c7edfef4effa43668f096da5338b2c44ae316b0a5e1
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/i64/add.leo.out b/tests/expectations/compiler/compiler/integers/i64/add.leo.out
index c7c89b8c83..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/i64/add.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/add.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 700
-      num_constraints: 701
-      at: cecef57cd6d6e05c1f08807f82c42ac9ab45def4542662ca606c2e8183f36c76
-      bt: dbea824d3f892b3f86e08d05b68eecdc0de998bcd12186475d90ede9dfc5dfd8
-      ct: 8bc1636c45d8da73bfa0c5a71972d9829c9954007eff5db6f8fa4672d5b57c4f
-    output:
-      - input_file: i64.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 8e59e1adb08d85f3d13a4e0501c7299d8258d13dd979c0a971d5f2ce75f631a6
-    imports_resolved_ast: 8e59e1adb08d85f3d13a4e0501c7299d8258d13dd979c0a971d5f2ce75f631a6
-    canonicalized_ast: 8e59e1adb08d85f3d13a4e0501c7299d8258d13dd979c0a971d5f2ce75f631a6
-    type_inferenced_ast: 3a117cd702a7f13a7cbafd2c05c301d87562a0c6a971486c0cb07391f732c02d
+outputs: []
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 325e819d35..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/i64/console_assert.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/console_assert.leo.out
@@ -1,19 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 255
-      num_constraints: 255
-      at: 68080cb19b62be7f91ee2118affb7b55ea272e15e17581869385053a5c6d3623
-      bt: 2c1d031e57e285b1277f2c37853fc7fdff23711e1147d7b26ed74d3acd28ceff
-      ct: 0b136215b60005ed17aa4eea76bc4e2b0349c0fecf57dc06f5dba31981f270d0
-    output:
-      - input_file: i64.in
-        output:
-          registers: {}
-    initial_ast: 9389a270a24424ceb480768d8d0811101f2f92c7fc7447efe29686fd30d075e8
-    imports_resolved_ast: 9389a270a24424ceb480768d8d0811101f2f92c7fc7447efe29686fd30d075e8
-    canonicalized_ast: f44f1275eb6295af14fcc1773894b0694bb8657cb7b472b16cc1e5d846ca6a6c
-    type_inferenced_ast: 546c1d880e97e95d1b91a1e6b73fc9cf240c734921ebe534e2a7af6cb224f477
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/i64/div.leo.out b/tests/expectations/compiler/compiler/integers/i64/div.leo.out
index 90ff4e41f0..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/i64/div.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/div.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 66614
-      num_constraints: 83254
-      at: 329edae9756f7bd721526c1b0790df530231fd3294f92161fb6c6b92036f03cd
-      bt: 81f681cc8f8cfc15fbecf76405b9a65ee9bf78492f8c012067a6a3db6efd466a
-      ct: 308cc563c21dc87ce980daf26ae9f4716b2e9f26517940e244ce3d98f488d280
-    output:
-      - input_file: i64.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 6fee781a23a251aafaea1000be3025d52bdeceb3b95aa746cdcc9560834227e3
-    imports_resolved_ast: 6fee781a23a251aafaea1000be3025d52bdeceb3b95aa746cdcc9560834227e3
-    canonicalized_ast: 6fee781a23a251aafaea1000be3025d52bdeceb3b95aa746cdcc9560834227e3
-    type_inferenced_ast: 4e93f3e08a4f65b47fe98c337cc6b1b3cf1be2cef22ab55d3bfd7491e8776a17
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/i64/eq.leo.out b/tests/expectations/compiler/compiler/integers/i64/eq.leo.out
index 0a6b595adc..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/i64/eq.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/eq.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 257
-      num_constraints: 257
-      at: 30dc67aa22cadc6e5ec8c73e0096443263121e29adf46bb33ed310b07765ff6e
-      bt: 1aaee32179419b6185d75c5745bd13c7c8ba869bad0132405ef1b28915bfe5d9
-      ct: 8edd5528a862bbd5590cfbd0d52871e395cf73e3a22c70839571b36506fbe3a7
-    output:
-      - input_file: i64.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: bdde37443fd01021b4b7928e9d28c94146ff2f6804200387638b5912729c6acb
-    imports_resolved_ast: bdde37443fd01021b4b7928e9d28c94146ff2f6804200387638b5912729c6acb
-    canonicalized_ast: bdde37443fd01021b4b7928e9d28c94146ff2f6804200387638b5912729c6acb
-    type_inferenced_ast: 20102db693d9c531d240a5926a64f5720c0e30bb5e15ba8ec55a9ccb5dc5a7e1
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/i64/ge.leo.out b/tests/expectations/compiler/compiler/integers/i64/ge.leo.out
index 171923e14a..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/i64/ge.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/ge.leo.out
@@ -1,28 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 449
-      num_constraints: 449
-      at: 04829ad53a315f620a66d1fc8152176c29a250b57c54482f7e2fba84cad444c4
-      bt: 46fa1dbc8f6cc62609913fe96ad20cff4ba8ba7ea886b3682c3b4dc9a491b334
-      ct: 7b765314986bd8a51a62dabdef866c5fe05ad9bf392fb0e25b7ce3b9969f81e1
-    output:
-      - input_file: i64_e.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-      - input_file: i64_g.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 5c1016b42105d692df8c5a799884607097e1f0e4e971f54f12f722a8b6767b85
-    imports_resolved_ast: 5c1016b42105d692df8c5a799884607097e1f0e4e971f54f12f722a8b6767b85
-    canonicalized_ast: 5c1016b42105d692df8c5a799884607097e1f0e4e971f54f12f722a8b6767b85
-    type_inferenced_ast: 93f78d3f8250f873ffd7c7e677b4821bb727ec7018dc371c1ad383ba7496a830
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/i64/gt.leo.out b/tests/expectations/compiler/compiler/integers/i64/gt.leo.out
index 24f40ebe9b..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/i64/gt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/gt.leo.out
@@ -1,28 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 449
-      num_constraints: 449
-      at: 2805d5c14f23da221eefbd223bafa37ae210f961594e020f8aeb1a9ff00d7287
-      bt: 3947204249ecf9b6f7339e9c6409daf25d626f7e807ac182d3222e61fb4499dd
-      ct: 7b765314986bd8a51a62dabdef866c5fe05ad9bf392fb0e25b7ce3b9969f81e1
-    output:
-      - input_file: i64_g.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-      - input_file: i64_e.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: a0404ddcc589b6006a5186d8ed29c981c7b0be8e8ff56c40eb9affee5fe2f2b0
-    imports_resolved_ast: a0404ddcc589b6006a5186d8ed29c981c7b0be8e8ff56c40eb9affee5fe2f2b0
-    canonicalized_ast: a0404ddcc589b6006a5186d8ed29c981c7b0be8e8ff56c40eb9affee5fe2f2b0
-    type_inferenced_ast: 42efeba3e4bb618fcd85360650196171a2e786149c92c5fc9bc5ee3559af3e62
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/i64/le.leo.out b/tests/expectations/compiler/compiler/integers/i64/le.leo.out
index f5635d7292..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/i64/le.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/le.leo.out
@@ -1,28 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 449
-      num_constraints: 449
-      at: 228ee4529b5cacfbd2dfbe9fe20088c9e8de89c4f80fcca316cd4ed3830ff633
-      bt: b228ce69df9ccfd94eb2d43619a82e2720dc0b34666b6850f0cd42db04befdef
-      ct: 7b765314986bd8a51a62dabdef866c5fe05ad9bf392fb0e25b7ce3b9969f81e1
-    output:
-      - input_file: i64_l.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-      - input_file: i64_e.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 78dbfbb72aaf373d3503564f96a35cd03525c6e39a756c17be39ff732ffd5cf9
-    imports_resolved_ast: 78dbfbb72aaf373d3503564f96a35cd03525c6e39a756c17be39ff732ffd5cf9
-    canonicalized_ast: 78dbfbb72aaf373d3503564f96a35cd03525c6e39a756c17be39ff732ffd5cf9
-    type_inferenced_ast: dd127a982da4220d309a73347d52abb8175d73c45156384aae81e32c99451511
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/i64/lt.leo.out b/tests/expectations/compiler/compiler/integers/i64/lt.leo.out
index 780f8e3d13..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/i64/lt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/lt.leo.out
@@ -1,28 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 449
-      num_constraints: 449
-      at: 639536c4b5bf6a7c935ad88f1b89a66819ee24afa34d949536ab84e9cddd7fa0
-      bt: fcbfd8b9b01e1754f1023d94765533fb9199baa19fddcb89a4d2a010e7844284
-      ct: 7b765314986bd8a51a62dabdef866c5fe05ad9bf392fb0e25b7ce3b9969f81e1
-    output:
-      - input_file: i64_l.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-      - input_file: i64_e.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: db923fdd10ce89e66c72f1db5f8e95e3016dd8513ee687250b21b7aa5ce4daec
-    imports_resolved_ast: db923fdd10ce89e66c72f1db5f8e95e3016dd8513ee687250b21b7aa5ce4daec
-    canonicalized_ast: db923fdd10ce89e66c72f1db5f8e95e3016dd8513ee687250b21b7aa5ce4daec
-    type_inferenced_ast: eaa70c92e2390a74eec47bee46b954cdcc2fca0f441545902759a13b81d3cfe0
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/i64/max.leo.out b/tests/expectations/compiler/compiler/integers/i64/max.leo.out
index 2302a3b102..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/i64/max.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/max.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: "../input/dummy.in"
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 0703335d2e00880f1443d9c5b5e7b5f5a81ef393a45e6cdfdd4880f090895c52
-    imports_resolved_ast: 0703335d2e00880f1443d9c5b5e7b5f5a81ef393a45e6cdfdd4880f090895c52
-    canonicalized_ast: 0703335d2e00880f1443d9c5b5e7b5f5a81ef393a45e6cdfdd4880f090895c52
-    type_inferenced_ast: b5afbedc3b27ae8576a74efae219f1fe5381f93ef957934e31821f26c950d36f
+outputs: []
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 e650a7040c..3f519cf1b5 100644
--- a/tests/expectations/compiler/compiler/integers/i64/max_fail.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/max_fail.leo.out
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - "Error [EASG0373030]: failed to parse int value '9223372036854775808'\n    --> compiler-test:4:20\n     |\n   4 |     const a: i64 = 9223372036854775808;\n     |                    ^^^^^^^^^^^^^^^^^^^"
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/i64/min.leo.out b/tests/expectations/compiler/compiler/integers/i64/min.leo.out
index 4b13c2c9e7..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/i64/min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/min.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: "../input/dummy.in"
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 5724b0d2d9d2977ddc189b58e5cba10201d51f3c38cc57e77f0d5c53c98656cb
-    imports_resolved_ast: 5724b0d2d9d2977ddc189b58e5cba10201d51f3c38cc57e77f0d5c53c98656cb
-    canonicalized_ast: 5724b0d2d9d2977ddc189b58e5cba10201d51f3c38cc57e77f0d5c53c98656cb
-    type_inferenced_ast: 2495a438e9e13500365e60ebc5dae138a9ac1608e0ccef13a65bbbeb411646c1
+outputs: []
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 96c0168ffc..3f519cf1b5 100644
--- a/tests/expectations/compiler/compiler/integers/i64/min_fail.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/min_fail.leo.out
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - "Error [EASG0373030]: failed to parse int value '-9223372036854775809'\n    --> compiler-test:4:20\n     |\n   4 |     const a: i64 = -9223372036854775809;\n     |                    ^^^^^^^^^^^^^^^^^^^^"
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/i64/mul.leo.out b/tests/expectations/compiler/compiler/integers/i64/mul.leo.out
index ee4b5ef6ce..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/i64/mul.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/mul.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 98304
-      num_constraints: 98305
-      at: bad40272ae6cda7f44d2b892d1768eee85552b506921982eef405d5cc8d70e43
-      bt: 2fc487f7ec79d8c33c89cf5c899ad0b56f7468af6aec96081b6f08344fbf872f
-      ct: 37717cfdc15b44be3cd83355ff38227c8abc7aa09152746fe4cd7f42ae31ea9f
-    output:
-      - input_file: i64.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 7d81fb85fdaf9767a4248d83f81f48e91be6e2ce749a4a02f9fe85494154eda8
-    imports_resolved_ast: 7d81fb85fdaf9767a4248d83f81f48e91be6e2ce749a4a02f9fe85494154eda8
-    canonicalized_ast: 7d81fb85fdaf9767a4248d83f81f48e91be6e2ce749a4a02f9fe85494154eda8
-    type_inferenced_ast: 54a87debd3d8471ba6f1afef722be088ac023304fb2c27a2ef39699bf16fe81d
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/i64/ne.leo.out b/tests/expectations/compiler/compiler/integers/i64/ne.leo.out
index 43899bcc08..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/i64/ne.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/ne.leo.out
@@ -1,28 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 257
-      num_constraints: 257
-      at: 2ba8d0827cc16bb5d0076549483425de1dd0da9b3fb06fd790c256ec8d1df36b
-      bt: 7abc1550aed02405fe1d0951da294ee11583b4215ddc3889429f16ac75604766
-      ct: 8edd5528a862bbd5590cfbd0d52871e395cf73e3a22c70839571b36506fbe3a7
-    output:
-      - input_file: i64_ne.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-      - input_file: i64_e.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: cb56faba44a5f54ab7fc9021e0903b7cdd70d56bbcf97fcfdaf355475a4a2011
-    imports_resolved_ast: cb56faba44a5f54ab7fc9021e0903b7cdd70d56bbcf97fcfdaf355475a4a2011
-    canonicalized_ast: cb56faba44a5f54ab7fc9021e0903b7cdd70d56bbcf97fcfdaf355475a4a2011
-    type_inferenced_ast: ef1112d9d7f63b6addabad7a4cfbb672ef167272ea603b11a92b8b39e468fbb9
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/i64/negate.leo.out b/tests/expectations/compiler/compiler/integers/i64/negate.leo.out
index b36a02f1d4..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/i64/negate.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/negate.leo.out
@@ -1,28 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 381
-      num_constraints: 381
-      at: 417f4d29cfbc9a9a971f4d94932ac19b448b4b7407e37e0558c3e232b4dfa073
-      bt: f99ae12913da76b1006f5da90b82a67453e4ade0ae3c1102088527b9165abfc3
-      ct: e7cff3106d84b6f974711e728b4b6138785655ed58ad24bcd957a5fbbde6be62
-    output:
-      - input_file: i64.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-      - input_file: i64.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 4ace760ee44ede5868a0ea11f96f47c596da9772ab3b821be5879782747bb64d
-    imports_resolved_ast: 4ace760ee44ede5868a0ea11f96f47c596da9772ab3b821be5879782747bb64d
-    canonicalized_ast: 4ace760ee44ede5868a0ea11f96f47c596da9772ab3b821be5879782747bb64d
-    type_inferenced_ast: eb5b6e6f6f1c91ef1489e0d686e0ea142762777b4991ee12f235ff73a91742eb
+outputs: []
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 a9ef61f2b6..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/i64/negate_min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/negate_min.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: "../input/dummy.in"
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 96d8371bf9102e40d6c297ad0e042d91b9bab58212d3ace9fa0811d3be54eec5
-    imports_resolved_ast: 96d8371bf9102e40d6c297ad0e042d91b9bab58212d3ace9fa0811d3be54eec5
-    canonicalized_ast: 96d8371bf9102e40d6c297ad0e042d91b9bab58212d3ace9fa0811d3be54eec5
-    type_inferenced_ast: 1b6005dedf0bdb85dc9d50b0435bdfa1b9d34d75f516a2383890882ad3bf3b08
+outputs: []
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 680da0f38f..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/i64/negate_zero.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/negate_zero.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: dummy.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: d5df39c563c640844bfd7a3fd95b53c107f66a8ce0adb7154084aad9cc42a623
-    imports_resolved_ast: d5df39c563c640844bfd7a3fd95b53c107f66a8ce0adb7154084aad9cc42a623
-    canonicalized_ast: d5df39c563c640844bfd7a3fd95b53c107f66a8ce0adb7154084aad9cc42a623
-    type_inferenced_ast: 928fe3ff4063f147fe708ef5301279b7434b5f1708f1f59a9d14f28001aaad7d
+outputs: []
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..3f519cf1b5 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
@@ -1,5 +1,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     |               ^"
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/i64/sub.leo.out b/tests/expectations/compiler/compiler/integers/i64/sub.leo.out
index f5f50da10e..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/i64/sub.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/sub.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 826
-      num_constraints: 827
-      at: 353e78ba99a7a4accd8ff4d7fee5562d844f55009ffb547ee95bc741f3b75bde
-      bt: b2855c9d479f9679702723e00941392e8c7e3b66b48b997c2ff7e575b3b2a33d
-      ct: def36d63bd06a167e8b411f9f7a6208bd5da2233b7e44755d8f7fa3d483be554
-    output:
-      - input_file: i64.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 0918267d4d883608bdb8b1c178450077f0931539dc573d3829e37f24176a88f5
-    imports_resolved_ast: 0918267d4d883608bdb8b1c178450077f0931539dc573d3829e37f24176a88f5
-    canonicalized_ast: 0918267d4d883608bdb8b1c178450077f0931539dc573d3829e37f24176a88f5
-    type_inferenced_ast: f2d7b1656ffb683dbb9ec39f37938cc188186aa708fef560b75523f0863886b8
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/i64/ternary.leo.out b/tests/expectations/compiler/compiler/integers/i64/ternary.leo.out
index 837cc91d60..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/i64/ternary.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/ternary.leo.out
@@ -1,28 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 448
-      num_constraints: 512
-      at: e36c9bfd01fbf30c1f31d53e2b19d1a83989e86701ba58838688174b9ad804d7
-      bt: edadcd06780bd97cb60d245565ce94697ee12b4d71ce9148f1546f1c4390b668
-      ct: f1bb709127145aae7603feda04afbc3e401fdf290c1d549be8d2d4b21ece9b58
-    output:
-      - input_file: i64.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-      - input_file: i64_rev.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: f60c769d564a5a76451d1b347c300f1ff5c0030b412ba5d84559fdd67fe6bb79
-    imports_resolved_ast: f60c769d564a5a76451d1b347c300f1ff5c0030b412ba5d84559fdd67fe6bb79
-    canonicalized_ast: f60c769d564a5a76451d1b347c300f1ff5c0030b412ba5d84559fdd67fe6bb79
-    type_inferenced_ast: d28a4ada3a3c80b09dc1f8be54035ad7a162b5c2cf8f1b7c2eba78f02387d879
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/i8/add.leo.out b/tests/expectations/compiler/compiler/integers/i8/add.leo.out
index bb7943cee0..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/i8/add.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/add.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 84
-      num_constraints: 85
-      at: 5d1a78f3ac820a4873a0602f69d7efb764135c6df25bfc4c182daee12402a595
-      bt: 85916f4efb04caeb618ad35bc96528d6aeffd742b574cb93ed22ffcd46c87751
-      ct: 846591a223fd860defb812adf90d4d103f16e168465e64986ac960819b4fae52
-    output:
-      - input_file: i8.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 7507e4dd7081d148a851507da3d728d435ef2919517e01732a06014e32769efd
-    imports_resolved_ast: 7507e4dd7081d148a851507da3d728d435ef2919517e01732a06014e32769efd
-    canonicalized_ast: 7507e4dd7081d148a851507da3d728d435ef2919517e01732a06014e32769efd
-    type_inferenced_ast: ce071846a448bd392dbcb7a285c65f235daf29f9b398a8445948e6a261aa8b13
+outputs: []
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 f273dc87f6..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/i8/console_assert.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/console_assert.leo.out
@@ -1,19 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 31
-      num_constraints: 31
-      at: 8111e478f64beb722ec96fbd80076cb73b735813b20e8f2ed6e3c21febceaae7
-      bt: c2cfac5aa6e125cb6cde720b0598fef7933c4aa62926fe99405bf1c2829dd4ce
-      ct: a3fa97a403ebea95a47d7ded7c01cee45af74afbfa876c203e4e96f6054b8815
-    output:
-      - input_file: i8.in
-        output:
-          registers: {}
-    initial_ast: 17b1eb126e8cb1e246f071e8ad20a25eee7a8abd80e3681e525439292221632c
-    imports_resolved_ast: 17b1eb126e8cb1e246f071e8ad20a25eee7a8abd80e3681e525439292221632c
-    canonicalized_ast: 6db2d0a6b45f27e9e9b8c840e91d602b11922ab7781c5d98634c80ebad314766
-    type_inferenced_ast: b2c9bddf865c2f5682da9a10df552b6d6170ca2dcf45839470a745a1fce2ecda
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/i8/div.leo.out b/tests/expectations/compiler/compiler/integers/i8/div.leo.out
index 50f03674fa..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/i8/div.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/div.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1150
-      num_constraints: 1438
-      at: ea4e10bc92af056bb4b3797063565094853fe4ba595f03fd6d4a8a0fc30ca195
-      bt: a41852ab8ac16bc91220ddd5b2fd1dacf3bebb624715cf2c3dc53f5dd172da9b
-      ct: 0449683ea39f4822da71f08082f051f005ecf6b846ab99e48c6ab9ac5aaa75be
-    output:
-      - input_file: i8.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 832849cc580efd35a4f63217783eb380f94620f893f13a64769a01a30f4c1434
-    imports_resolved_ast: 832849cc580efd35a4f63217783eb380f94620f893f13a64769a01a30f4c1434
-    canonicalized_ast: 832849cc580efd35a4f63217783eb380f94620f893f13a64769a01a30f4c1434
-    type_inferenced_ast: a0af076a419008b086212d675a91408ce30ffe05ff21ab32c1968f20b04f29d7
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/i8/eq.leo.out b/tests/expectations/compiler/compiler/integers/i8/eq.leo.out
index 9161c8b17a..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/i8/eq.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/eq.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 33
-      num_constraints: 33
-      at: 424965aff58c62dd2bf38daa6426a3edcc19aa86bff3842fe4e73f743d37e1cb
-      bt: 03d1b6a8fdf9f73f595cf97261f1bae81000c89364c7af58f4f7f04aba7bac30
-      ct: 2aae7d6631260dcaafbfe9709ade84e75f5172a9baad48e108e7264d5fc17cf6
-    output:
-      - input_file: i8.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 00e6ec9c3cffe65504b49e598aee8b7c8c59823f9c1c8954d659c00704f6e12e
-    imports_resolved_ast: 00e6ec9c3cffe65504b49e598aee8b7c8c59823f9c1c8954d659c00704f6e12e
-    canonicalized_ast: 00e6ec9c3cffe65504b49e598aee8b7c8c59823f9c1c8954d659c00704f6e12e
-    type_inferenced_ast: 8d64e2540f69eb74fe27f35f221c854a71b5fdfcc1364a54c45ce742bbec9a20
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/i8/ge.leo.out b/tests/expectations/compiler/compiler/integers/i8/ge.leo.out
index 1d340dcd00..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/i8/ge.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/ge.leo.out
@@ -1,28 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 57
-      num_constraints: 57
-      at: 0c041f98ae4465c405aa6cf9dfb23157cee029c4ba12162385a49d230eaea769
-      bt: a55f11270f22104142bcee90897c9d9a8463b2fa9043957f85d82725f4bb075e
-      ct: 5a4c4f077603c1f7c4b31cf17fee281ab3cb7d2a9571be40a2f3a88577759477
-    output:
-      - input_file: i8_e.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-      - input_file: i8_g.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 1e21bb732ec541ff7a980ab309747c26b105354577ff211f1dd7712f059232f5
-    imports_resolved_ast: 1e21bb732ec541ff7a980ab309747c26b105354577ff211f1dd7712f059232f5
-    canonicalized_ast: 1e21bb732ec541ff7a980ab309747c26b105354577ff211f1dd7712f059232f5
-    type_inferenced_ast: 9cd5f4bc30be5e47771f86af4a03f7731a408abca3451e8edbd1791f20c7b54e
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/i8/gt.leo.out b/tests/expectations/compiler/compiler/integers/i8/gt.leo.out
index b18fcf2599..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/i8/gt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/gt.leo.out
@@ -1,28 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 57
-      num_constraints: 57
-      at: fd43cbc2bdaa1e99408e9ca7bd13774576b88c884f64a153fbd8ba2a710c0b42
-      bt: 4a959c05229442ca476ef20cfe1988fab90d5ca1b8f1c75f75719d475030c086
-      ct: 5a4c4f077603c1f7c4b31cf17fee281ab3cb7d2a9571be40a2f3a88577759477
-    output:
-      - input_file: i8_g.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-      - input_file: i8_e.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 7108a8fe50fbe2b7386ef743b0627f75a4c282821f10e76713672f94830d2cbb
-    imports_resolved_ast: 7108a8fe50fbe2b7386ef743b0627f75a4c282821f10e76713672f94830d2cbb
-    canonicalized_ast: 7108a8fe50fbe2b7386ef743b0627f75a4c282821f10e76713672f94830d2cbb
-    type_inferenced_ast: 7a23bf5cda0089bdb57387dd291bf63a93f77f83748f0d8f90ebf6c32e458c95
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/i8/le.leo.out b/tests/expectations/compiler/compiler/integers/i8/le.leo.out
index 966c759f5d..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/i8/le.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/le.leo.out
@@ -1,28 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 57
-      num_constraints: 57
-      at: 5a23ebca65ed09a730f98babb863f4b6c166d80b0e97790788b5b2c1ed0e3f8a
-      bt: 13756f3827f4f5f9c3d57ac57364366b9716cd3474416861f9aa9fe7a79206d0
-      ct: 5a4c4f077603c1f7c4b31cf17fee281ab3cb7d2a9571be40a2f3a88577759477
-    output:
-      - input_file: i8_l.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-      - input_file: i8_e.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 40f8e855fce1d652c99ceb24edaacbe328ae159382b1ce13170c63669f4301e3
-    imports_resolved_ast: 40f8e855fce1d652c99ceb24edaacbe328ae159382b1ce13170c63669f4301e3
-    canonicalized_ast: 40f8e855fce1d652c99ceb24edaacbe328ae159382b1ce13170c63669f4301e3
-    type_inferenced_ast: 66d57cbb8408f594263277a42765cc12fcdc97db2fbc322191df5a39ab2f7040
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/i8/lt.leo.out b/tests/expectations/compiler/compiler/integers/i8/lt.leo.out
index fdd7e21c80..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/i8/lt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/lt.leo.out
@@ -1,28 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 57
-      num_constraints: 57
-      at: b93e8bf8fef6bb33a2552fc46f20f842010f187164d846f84b2a8618628c59a9
-      bt: 2edb58dffc1fb55bd54dd589b8fb4cf15292f14cc2e9d478bb372b57c958ead9
-      ct: 5a4c4f077603c1f7c4b31cf17fee281ab3cb7d2a9571be40a2f3a88577759477
-    output:
-      - input_file: i8_l.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-      - input_file: i8_e.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: df68f7c978cd30eff24891875fe147f6e24ce56b328d7207814ddeb5ada6bf13
-    imports_resolved_ast: df68f7c978cd30eff24891875fe147f6e24ce56b328d7207814ddeb5ada6bf13
-    canonicalized_ast: df68f7c978cd30eff24891875fe147f6e24ce56b328d7207814ddeb5ada6bf13
-    type_inferenced_ast: 23714958eb385969480b522715c5c0c5007bdad644282aab21e07b1aab965d30
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/i8/max.leo.out b/tests/expectations/compiler/compiler/integers/i8/max.leo.out
index 901d82a33c..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/i8/max.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/max.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: "../input/dummy.in"
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: af42ac6f8eb44ea7890e558b2d50b67db5ab53e74022c6426aa7a63edfdf43ec
-    imports_resolved_ast: af42ac6f8eb44ea7890e558b2d50b67db5ab53e74022c6426aa7a63edfdf43ec
-    canonicalized_ast: af42ac6f8eb44ea7890e558b2d50b67db5ab53e74022c6426aa7a63edfdf43ec
-    type_inferenced_ast: 715450b67c109631ecef7e45c8ecaae33433daec07148953c070b97b856dbf2d
+outputs: []
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 dbd082ebcf..3f519cf1b5 100644
--- a/tests/expectations/compiler/compiler/integers/i8/max_fail.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/max_fail.leo.out
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - "Error [EASG0373030]: failed to parse int value '128'\n    --> compiler-test:4:19\n     |\n   4 |     const a: i8 = 128;\n     |                   ^^^"
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/i8/min.leo.out b/tests/expectations/compiler/compiler/integers/i8/min.leo.out
index 94ed4491b4..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/i8/min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/min.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: "../input/dummy.in"
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 42725429d83957372ca63c97764550141db3f8851616a33460e68ad212df74ce
-    imports_resolved_ast: 42725429d83957372ca63c97764550141db3f8851616a33460e68ad212df74ce
-    canonicalized_ast: 42725429d83957372ca63c97764550141db3f8851616a33460e68ad212df74ce
-    type_inferenced_ast: 4e4799716883d22d1e491cf20f30104174d54c64176130dcc0fb6519a08b936d
+outputs: []
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 8b62f07ded..3f519cf1b5 100644
--- a/tests/expectations/compiler/compiler/integers/i8/min_fail.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/min_fail.leo.out
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - "Error [EASG0373030]: failed to parse int value '-129'\n    --> compiler-test:4:19\n     |\n   4 |     const a: i8 = -129;\n     |                   ^^^^"
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/i8/mul.leo.out b/tests/expectations/compiler/compiler/integers/i8/mul.leo.out
index 4c0d20d093..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/i8/mul.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/mul.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1536
-      num_constraints: 1537
-      at: 245902065d66fcdaff6db49bdd20f72f3e3e85ef6afcf2e12435ee63df39b543
-      bt: 0b017985fe9a0650c67351f1cc247871e9cc9e8c907f2cb47791c5ae1a5b324a
-      ct: 3fb41ccb74d402bc413944e9eb543a7333552052b7781eb257d2b861659d5a09
-    output:
-      - input_file: i8.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: c7ea692c1c4c5b5adf571bbaf8350017c123dc7de9a130d1d3c6d92065f76b30
-    imports_resolved_ast: c7ea692c1c4c5b5adf571bbaf8350017c123dc7de9a130d1d3c6d92065f76b30
-    canonicalized_ast: c7ea692c1c4c5b5adf571bbaf8350017c123dc7de9a130d1d3c6d92065f76b30
-    type_inferenced_ast: 9324477964c91456cad1ef2d1531eeeb0a8a67d85b7cf4a0e5e59bd86beb2a86
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/i8/ne.leo.out b/tests/expectations/compiler/compiler/integers/i8/ne.leo.out
index ca9eafb5c2..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/i8/ne.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/ne.leo.out
@@ -1,28 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 33
-      num_constraints: 33
-      at: 5e88cd940df2c48a53e64a9b8589045ef766371daa5cc885df982902d9fcc754
-      bt: 10b52342f8c44eb9b3335b4df9ca4136de3ad35d5b580b2ab32ae5e10bcdf3b4
-      ct: 2aae7d6631260dcaafbfe9709ade84e75f5172a9baad48e108e7264d5fc17cf6
-    output:
-      - input_file: i8_ne.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-      - input_file: i8_e.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 727d71a97c85ff472274e9c77d09017023aa4a01ae55f5ef4cd1f34d493e10f0
-    imports_resolved_ast: 727d71a97c85ff472274e9c77d09017023aa4a01ae55f5ef4cd1f34d493e10f0
-    canonicalized_ast: 727d71a97c85ff472274e9c77d09017023aa4a01ae55f5ef4cd1f34d493e10f0
-    type_inferenced_ast: a620d767d5f718c1bd7adb7acadc46b8fa4870d05d4b7f131ac717e3b4b825f6
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/i8/negate.leo.out b/tests/expectations/compiler/compiler/integers/i8/negate.leo.out
index f8ba9ade14..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/i8/negate.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/negate.leo.out
@@ -1,28 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 45
-      num_constraints: 45
-      at: e308c63d5f53aa3c65315a1d38ba5ee664cce7bb22aaeaab07a37a9006d909cc
-      bt: 43214e3563d9bc921ffc9079215a945f8450cf3c02506bd6e23144b2e18944d3
-      ct: a2352ad3a95bc4b0d0ca56ac5b1bcec0cc3b62077d2c3d883f90f8bf014a8e28
-    output:
-      - input_file: i8.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-      - input_file: i8.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 048dee046e9726b86bc863821709b9b1b9a5f54afdce25a6bd46bd5fbb6307a2
-    imports_resolved_ast: 048dee046e9726b86bc863821709b9b1b9a5f54afdce25a6bd46bd5fbb6307a2
-    canonicalized_ast: 048dee046e9726b86bc863821709b9b1b9a5f54afdce25a6bd46bd5fbb6307a2
-    type_inferenced_ast: 75838a90ef9995dc6562f4a017a4bb4fcbd455a6d1a9401db836e5844c22aea3
+outputs: []
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..3f519cf1b5 100644
--- a/tests/expectations/compiler/compiler/integers/i8/negate_min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/negate_min.leo.out
@@ -1,5 +1,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     |               ^^"
+outputs: []
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 c9aca1e50a..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/i8/negate_zero.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/negate_zero.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: dummy.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: f4eb2af96d56786f773843ae4a471cc27884a1d2427c4995b4303635d2341a3a
-    imports_resolved_ast: f4eb2af96d56786f773843ae4a471cc27884a1d2427c4995b4303635d2341a3a
-    canonicalized_ast: f4eb2af96d56786f773843ae4a471cc27884a1d2427c4995b4303635d2341a3a
-    type_inferenced_ast: 55a75c5ff5da70a4312ac3cdc1579f754ad578570160cafd05c67c1049344b3a
+outputs: []
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..3f519cf1b5 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
@@ -1,5 +1,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     |               ^"
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/i8/sub.leo.out b/tests/expectations/compiler/compiler/integers/i8/sub.leo.out
index 44189647b2..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/i8/sub.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/sub.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 98
-      num_constraints: 99
-      at: f5fc42455c37ae32df3b6d311ff2204dce57fa397f524fe0854ad9ffb3ff5c36
-      bt: 35a61219fd7bf101cf1a1a66ad2f71df661d6dc9dda2ed9df12c7650164559aa
-      ct: 85ae6ad5b3f62dc914806dac5751645342d399c583d6b6b00cd9e67f738aab30
-    output:
-      - input_file: i8.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 2c5edc8449cb6cce29bb2a02b8e3c346ab6cfd7df9cae0a00ee243999586e1a3
-    imports_resolved_ast: 2c5edc8449cb6cce29bb2a02b8e3c346ab6cfd7df9cae0a00ee243999586e1a3
-    canonicalized_ast: 2c5edc8449cb6cce29bb2a02b8e3c346ab6cfd7df9cae0a00ee243999586e1a3
-    type_inferenced_ast: c39c0bb54e8aad9f3b59c59d2437bfcb776d26dde9c8382bae06caf1902d92ae
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/i8/ternary.leo.out b/tests/expectations/compiler/compiler/integers/i8/ternary.leo.out
index 41fd97e1fa..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/i8/ternary.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/ternary.leo.out
@@ -1,28 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 56
-      num_constraints: 64
-      at: a15ec92a38acf1a47952df144e5299f49dbde96fbe1a3f3b2af4bbca483d65aa
-      bt: 90a2489533355ee3e27d5cf485612441ec10e21923eb78e6be21633ce11fa8f1
-      ct: 4c2d67fc6e1c4ad44f323c1b958ed94313153573aa72a3c0f0d25b17b54e63bc
-    output:
-      - input_file: i8.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-      - input_file: i8_rev.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 5b3ece3765ccc07057987288af24aa37205ddf5fc38146057f6a2f042d52e2ff
-    imports_resolved_ast: 5b3ece3765ccc07057987288af24aa37205ddf5fc38146057f6a2f042d52e2ff
-    canonicalized_ast: 5b3ece3765ccc07057987288af24aa37205ddf5fc38146057f6a2f042d52e2ff
-    type_inferenced_ast: ed6896d5e12795fbf9705edb4ff13a68fff3d920aa01cb40b73c25b9c6e36663
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/u128/add.leo.out b/tests/expectations/compiler/compiler/integers/u128/add.leo.out
index 8c558529ab..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/u128/add.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/add.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 769
-      num_constraints: 770
-      at: 46a7cb5b4abbe0c2a583d206d68549c1d2dacbc295a7e98ab603b1e589a748ed
-      bt: 3bd68a594ade714a6dce154fa8fe1b206c3339d591863157d5d4a30e82be8c38
-      ct: ee4814a6df109d34265d062047ac22141174bab478caf254c5623f917c5d7a66
-    output:
-      - input_file: u128.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: ba86672003228d42172ddb6064b6c18793cd2b10368476457a5765d72da968bb
-    imports_resolved_ast: ba86672003228d42172ddb6064b6c18793cd2b10368476457a5765d72da968bb
-    canonicalized_ast: ba86672003228d42172ddb6064b6c18793cd2b10368476457a5765d72da968bb
-    type_inferenced_ast: 90f8e8d95d0489fe8412b8b011c96cc3297fed62522f35dda922ffe5bc8e5eb7
+outputs: []
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 2c938e0941..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/u128/console_assert.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/console_assert.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 766
-      num_constraints: 766
-      at: fc8f29e5d4a184ccde7548e9a88adf215d9745a7a1f38cb41e6046c00f684f92
-      bt: a6020f3baa81181dab1735218a3d3c8a2504b7f30c6c73c0c12e8edf0aa403b6
-      ct: 22bcd53d2a96f7cf838f37fb01781267764156a778d5b2df80572f5030de4b0f
-    output:
-      - input_file: u128.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: ad919602ee4b538d6500101020bef0d5eab3f0737c717eeb26a4eb223b20ec2e
-    imports_resolved_ast: ad919602ee4b538d6500101020bef0d5eab3f0737c717eeb26a4eb223b20ec2e
-    canonicalized_ast: ad919602ee4b538d6500101020bef0d5eab3f0737c717eeb26a4eb223b20ec2e
-    type_inferenced_ast: 7ddb15730afe53d6cfd7831572139ec4d846fa9f02bdae1955352b002c4bb2eb
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/u128/div.leo.out b/tests/expectations/compiler/compiler/integers/u128/div.leo.out
index a628da7ba8..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/u128/div.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/div.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 263418
-      num_constraints: 329465
-      at: 7f9291f6c2c9d381cb6d96c1b958eb025a7fa82d19065612225198341d8ed37d
-      bt: e26d177238ab12a9e8091dfb18f68e0e82d410b1ebce7c8633bd0a4973f5db2f
-      ct: f36c23bcc522e47f2efe7c42ec8f9bccfb980c46c71d03f69222eb87a3aa6dd5
-    output:
-      - input_file: u128.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 2f1e3590db8fd98beb8eec3b15e51932dc50f6acccca4d89a04d9e4e45719a93
-    imports_resolved_ast: 2f1e3590db8fd98beb8eec3b15e51932dc50f6acccca4d89a04d9e4e45719a93
-    canonicalized_ast: 2f1e3590db8fd98beb8eec3b15e51932dc50f6acccca4d89a04d9e4e45719a93
-    type_inferenced_ast: f7edc6e2efd7b862eafc38618b8d86ec92e270fbab2cf2f568b8f2e5feecc28a
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/u128/eq.leo.out b/tests/expectations/compiler/compiler/integers/u128/eq.leo.out
index fb7f3e8e90..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/u128/eq.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/eq.leo.out
@@ -1,28 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 513
-      num_constraints: 513
-      at: 75b34d698fc2359df51943102062181aa5ee62b84a221747dfd7f8868bf48efd
-      bt: c1e085f0d8047bc5b5f574ca9de7d79a0ce3b3235e3bfb83ff15aecf05ad1323
-      ct: c224fec21cf5a2b24eb94033a20aeb4729d3d0cf596339145cb49ea6a44cc5d8
-    output:
-      - input_file: u128_e.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-      - input_file: u128_n.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: be16e6c68a47140cb65dfd6fa6ae2084799092b353a4d7bbbbe6ea3cba689c48
-    imports_resolved_ast: be16e6c68a47140cb65dfd6fa6ae2084799092b353a4d7bbbbe6ea3cba689c48
-    canonicalized_ast: be16e6c68a47140cb65dfd6fa6ae2084799092b353a4d7bbbbe6ea3cba689c48
-    type_inferenced_ast: 70dabec56f6de97872802c0b63e48dc68b921c7bba5e526ee16f443973c1c35d
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/u128/ge.leo.out b/tests/expectations/compiler/compiler/integers/u128/ge.leo.out
index e76870ad68..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/u128/ge.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/ge.leo.out
@@ -1,34 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 897
-      num_constraints: 897
-      at: 8c535817cf7f33927b88bddc0b246636aea9421a249b5025229c513521a43cdd
-      bt: 75543c2d7e977fd59df93d598b3ba1ab92b7e6048a823fb41969668e29286a6b
-      ct: 8d7309bdb692a71de6c9efc246984ce389534e8fc31222a94d5217720c2d20e9
-    output:
-      - input_file: u128_g.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-      - input_file: u128_e.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-      - input_file: u128_f.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: caca64001b0311d16373bfa5ce2f040cf054551675f664bd93f68b8a381ccc0b
-    imports_resolved_ast: caca64001b0311d16373bfa5ce2f040cf054551675f664bd93f68b8a381ccc0b
-    canonicalized_ast: caca64001b0311d16373bfa5ce2f040cf054551675f664bd93f68b8a381ccc0b
-    type_inferenced_ast: ad84a0f1e55ece76d7989d24b048f59e40af35918495fb0c7d9a023b810645d0
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/u128/gt.leo.out b/tests/expectations/compiler/compiler/integers/u128/gt.leo.out
index 9219d787db..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/u128/gt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/gt.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 897
-      num_constraints: 897
-      at: f53fbab433e2588176ab0a5677a6d546a108e5a98abe79ccb5abbc57a4181afd
-      bt: 2005303715fb1fda8dbf03970acb45982b78b7c61034b172e9ea3cd363a013f8
-      ct: 8d7309bdb692a71de6c9efc246984ce389534e8fc31222a94d5217720c2d20e9
-    output:
-      - input_file: u128_g.in
-        output:
-          registers: {}
-      - input_file: u128_f.in
-        output:
-          registers: {}
-    initial_ast: 820ed988d142189cd95bfc559ded7f9de3a1327338e47844a7a2200d79af56a9
-    imports_resolved_ast: 820ed988d142189cd95bfc559ded7f9de3a1327338e47844a7a2200d79af56a9
-    canonicalized_ast: 3392a949832c1db83f1280df3ca8c03a4fbc0645a31325a055b63c9e44d50cdd
-    type_inferenced_ast: 5561d2a1ae0ff0c81d9cf1f4b9daf4ab75897efb06e87e8904492919f0d9f7f2
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/u128/input.leo.out b/tests/expectations/compiler/compiler/integers/u128/input.leo.out
index 2cf493020d..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/u128/input.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/input.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 511
-      num_constraints: 511
-      at: f130bde196ac7e190b505a42dfb30c41772c4c7eafe9e7203be9222892b767ce
-      bt: 7ac37b347f82644239128aa66e9caf34375b1fd860069659581477883d92fb7a
-      ct: 3e4c7833e73f9ee37e42c796e8af7a6d417a012b776b348abedbfd317110858d
-    output:
-      - input_file: u128_g.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 725037d892c3a0d37394849bb896f53665de6bfb21ecbf07ca498c58a50febac
-    imports_resolved_ast: 725037d892c3a0d37394849bb896f53665de6bfb21ecbf07ca498c58a50febac
-    canonicalized_ast: 725037d892c3a0d37394849bb896f53665de6bfb21ecbf07ca498c58a50febac
-    type_inferenced_ast: 792c1e73125395e09c23e92e715b83a86bbcc337f5bca3a6a7a4ae6719e85143
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/u128/le.leo.out b/tests/expectations/compiler/compiler/integers/u128/le.leo.out
index 42c486ba6e..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/u128/le.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/le.leo.out
@@ -1,34 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 897
-      num_constraints: 897
-      at: 3898b682c2301fc8f7812b25fafec37b2382eede8f6e86d20bf9468c8b7e4a74
-      bt: 8e0a2864aa6383434f6d7843e06d6594b85a65b2009c612f72b3d8c6f07fb4ef
-      ct: 8d7309bdb692a71de6c9efc246984ce389534e8fc31222a94d5217720c2d20e9
-    output:
-      - input_file: u128_f.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "false"
-      - input_file: u128_e.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-      - input_file: u128_l.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "false"
-    initial_ast: a2c1fd53a31ef6621356b270a00943ccdae328cd449fafa6c9e23d59ba32be17
-    imports_resolved_ast: a2c1fd53a31ef6621356b270a00943ccdae328cd449fafa6c9e23d59ba32be17
-    canonicalized_ast: a2c1fd53a31ef6621356b270a00943ccdae328cd449fafa6c9e23d59ba32be17
-    type_inferenced_ast: bf6dab074ed66340481a8690067e8272bd202f9d6eeb4c53102a4114051e5117
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/u128/lt.leo.out b/tests/expectations/compiler/compiler/integers/u128/lt.leo.out
index f6780a1416..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/u128/lt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/lt.leo.out
@@ -1,28 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 897
-      num_constraints: 897
-      at: 8bc0a661fdc05173ef7b37762e7f6fdd9e5788a8fa17b7b7d485b8ffbbdeb7c5
-      bt: 1669da8e0d67919ecf7e28a3727b73be52d08f9af5feb640a8cd6f2d302caa07
-      ct: 8d7309bdb692a71de6c9efc246984ce389534e8fc31222a94d5217720c2d20e9
-    output:
-      - input_file: u128_f.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "false"
-      - input_file: u128_g.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "false"
-    initial_ast: 5c1e4693b718191aa0f3071ec02509a38ff2a8017ce0641ff0142f2bfa7da96a
-    imports_resolved_ast: 5c1e4693b718191aa0f3071ec02509a38ff2a8017ce0641ff0142f2bfa7da96a
-    canonicalized_ast: 5c1e4693b718191aa0f3071ec02509a38ff2a8017ce0641ff0142f2bfa7da96a
-    type_inferenced_ast: 6453c5fa284e2b06dbe031d7411f2d59388c75d4f3f18d2b48c4df5f91c7d870
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/u128/max.leo.out b/tests/expectations/compiler/compiler/integers/u128/max.leo.out
index 0380abce37..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/u128/max.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/max.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: "../input/dummy.in"
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: c0f6616cbef7676909cabcc405f75fefd1807abdacbe00d81069f7ba074372d5
-    imports_resolved_ast: c0f6616cbef7676909cabcc405f75fefd1807abdacbe00d81069f7ba074372d5
-    canonicalized_ast: c0f6616cbef7676909cabcc405f75fefd1807abdacbe00d81069f7ba074372d5
-    type_inferenced_ast: 6d956778ffaa3453c3af36f0d8b84fc62aff73c71f5a685421b2a310fc036121
+outputs: []
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 379df98977..3f519cf1b5 100644
--- a/tests/expectations/compiler/compiler/integers/u128/max_fail.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/max_fail.leo.out
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - "Error [EASG0373030]: failed to parse int value '340282366920938463463374607431768211456'\n    --> compiler-test:4:21\n     |\n   4 |     const a: u128 = 340282366920938463463374607431768211456;\n     |                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^"
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/u128/min.leo.out b/tests/expectations/compiler/compiler/integers/u128/min.leo.out
index ec563dd1bb..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/u128/min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/min.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: "../input/dummy.in"
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 9151781352023ac8d55f9c28b1c00ebd782f0ebdc9fc0d431eacc82abdc895c1
-    imports_resolved_ast: 9151781352023ac8d55f9c28b1c00ebd782f0ebdc9fc0d431eacc82abdc895c1
-    canonicalized_ast: 9151781352023ac8d55f9c28b1c00ebd782f0ebdc9fc0d431eacc82abdc895c1
-    type_inferenced_ast: 037701324af5adc4f453a37faef5c91eee6aabd37e3aa3c612203c41e4602b66
+outputs: []
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 2decda5aa3..3f519cf1b5 100644
--- a/tests/expectations/compiler/compiler/integers/u128/min_fail.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/min_fail.leo.out
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - "Error [EASG0373030]: failed to parse int value '-1'\n    --> compiler-test:4:21\n     |\n   4 |     const a: u128 = -1;\n     |                     ^^"
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/u128/mul.leo.out b/tests/expectations/compiler/compiler/integers/u128/mul.leo.out
index d063a3ddf7..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/u128/mul.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/mul.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 50431
-      num_constraints: 66944
-      at: 76a413f70472403c5adeed7a79d4c2a43f5b24850b4874fff1f6a323d4396a65
-      bt: 011ebf5dd53ae194c7135690f3bc6307a362ea10ba113e19ae7195be6ab375a9
-      ct: 147b92b75d75f78bed11d65294d9ae2479b8ab32f98521755557fd54076f3c07
-    output:
-      - input_file: mul.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "false"
-    initial_ast: 9bacdd7f562607e16f88a6cc64a6093fd09e678f8a09d485edb6e1e9cffb90e4
-    imports_resolved_ast: 9bacdd7f562607e16f88a6cc64a6093fd09e678f8a09d485edb6e1e9cffb90e4
-    canonicalized_ast: 9bacdd7f562607e16f88a6cc64a6093fd09e678f8a09d485edb6e1e9cffb90e4
-    type_inferenced_ast: 2fb1d8964dccf7acfc38e37cf41d859c30e19b052470ed54923b944fe8ec9b15
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/u128/ne.leo.out b/tests/expectations/compiler/compiler/integers/u128/ne.leo.out
index 507b010140..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/u128/ne.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/ne.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 513
-      num_constraints: 513
-      at: 8f9d3ef916a970cb762ca6f3829a8b4897dc65d493a2ea2eb4fa812a2062fe67
-      bt: edc1de9388a8bb2c659c9b4e9deecd8406826abcfe220d295bf7d85a550c0c43
-      ct: c224fec21cf5a2b24eb94033a20aeb4729d3d0cf596339145cb49ea6a44cc5d8
-    output:
-      - input_file: ne.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 6796d9b74beb8daf62ccd75c5a5bcb5942d00742e35e558dcd49e4accf571458
-    imports_resolved_ast: 6796d9b74beb8daf62ccd75c5a5bcb5942d00742e35e558dcd49e4accf571458
-    canonicalized_ast: 6796d9b74beb8daf62ccd75c5a5bcb5942d00742e35e558dcd49e4accf571458
-    type_inferenced_ast: 1a122fec3c383117b7241a98a77518aa07fc495bf5724a721439e3d2c561b770
+outputs: []
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..3f519cf1b5 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
@@ -1,5 +1,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     |               ^"
+outputs: []
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..3f519cf1b5 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
@@ -1,5 +1,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     |               ^"
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/u128/sub.leo.out b/tests/expectations/compiler/compiler/integers/u128/sub.leo.out
index e120fc8c02..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/u128/sub.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/sub.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 769
-      num_constraints: 770
-      at: 46a7cb5b4abbe0c2a583d206d68549c1d2dacbc295a7e98ab603b1e589a748ed
-      bt: 3bd68a594ade714a6dce154fa8fe1b206c3339d591863157d5d4a30e82be8c38
-      ct: 950ff5f999ac2edfb80654ff5270b048ac8a19131c655af6d145533a9ef97c6f
-    output:
-      - input_file: u128_f.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 22b1398c07fa127567d547dec76a9db42d17dfbfd3c381fd9b597e6d54ebe520
-    imports_resolved_ast: 22b1398c07fa127567d547dec76a9db42d17dfbfd3c381fd9b597e6d54ebe520
-    canonicalized_ast: 22b1398c07fa127567d547dec76a9db42d17dfbfd3c381fd9b597e6d54ebe520
-    type_inferenced_ast: 9378705614f9bb993d720e7ab3b9ad2bb6f9566c355ad8e6efdc35ed804ed1f9
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/u128/ternary.leo.out b/tests/expectations/compiler/compiler/integers/u128/ternary.leo.out
index b82d2a83e7..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/u128/ternary.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/ternary.leo.out
@@ -1,28 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 896
-      num_constraints: 1024
-      at: 0830a3e788b536b36f271fadaadcc919281b2171d4e18814385b74f6820cb5c9
-      bt: 1fb9bfc22c01a54c08602e7f3883c19b00de1070aa9bad9e9234e322f9043711
-      ct: ee9facabe4c76f5eb89984d3c5cb15f92eaa0cc3b4bc4fdff261aeb36ad0101b
-    output:
-      - input_file: u128_t.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-      - input_file: u128_f.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: d8edd41c3446a777f3d2b0b033cee9135477ebee6a559854906789ac31db6a9a
-    imports_resolved_ast: d8edd41c3446a777f3d2b0b033cee9135477ebee6a559854906789ac31db6a9a
-    canonicalized_ast: d8edd41c3446a777f3d2b0b033cee9135477ebee6a559854906789ac31db6a9a
-    type_inferenced_ast: 0a750c50386c174281af10df1a1ab346b11fa42554a4378fa03b4846afd960b6
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/u16/add.leo.out b/tests/expectations/compiler/compiler/integers/u16/add.leo.out
index 31bc564fcf..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/u16/add.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/add.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 96
-      num_constraints: 97
-      at: 370387ad947bfe3a763fa62847b00f95580ec1c1b754cf600e06b313a84044ec
-      bt: c404ca4ebed24418ea98c0994a710e335e65d373114e9e1be5ba5354ced20806
-      ct: 7413addd13f168a5677d482e41bd131e5773eca1ab5c5bd62829ed0b67fd3508
-    output:
-      - input_file: u16.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: eb6419bbaed4c761e2c76e927f773367006508a4721ea1c70cd633fe47976545
-    imports_resolved_ast: eb6419bbaed4c761e2c76e927f773367006508a4721ea1c70cd633fe47976545
-    canonicalized_ast: eb6419bbaed4c761e2c76e927f773367006508a4721ea1c70cd633fe47976545
-    type_inferenced_ast: 4da352adef1ef9a4d872afa8c0a563d66058c4b5f2c7ae6e1d6e76f9d0e6f828
+outputs: []
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 11f505cb32..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/u16/console_assert.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/console_assert.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 94
-      num_constraints: 94
-      at: 6ed4469920fbabddf709f8603a84e89ce62e33de0c1728efada4b412dbc9efb6
-      bt: 7a2ed9c91a2df8eed7704b5a71f92b9e20beeade151f02135169ab5f4ca69b6a
-      ct: 09526721ae1dd7355e4608df2b3eabc5c7007bceb8c6b99389aa8160c63a8982
-    output:
-      - input_file: u16.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: d530ffa650127824ba18491674144411e798de3f154c8cf6a2a7972739df7512
-    imports_resolved_ast: d530ffa650127824ba18491674144411e798de3f154c8cf6a2a7972739df7512
-    canonicalized_ast: d530ffa650127824ba18491674144411e798de3f154c8cf6a2a7972739df7512
-    type_inferenced_ast: d5482fa8b8ade8232890a04bc9d29c9bf9f02a4dc9d49cfbe5595836a0fdabfc
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/u16/div.leo.out b/tests/expectations/compiler/compiler/integers/u16/div.leo.out
index 3fc719f817..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/u16/div.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/div.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 4188
-      num_constraints: 5275
-      at: f1b7abc9150b53dfc10ee7e67e8c985a07f4e0169cd1e8ed234c67c14019f669
-      bt: ce2d469f0b5ace885987081e8dca6a93f663d3f90317850debc36b4fa3ebed96
-      ct: 5ecb4125316e7086ed355d51b635965c19ce3f234575dd3e521c187714c00dda
-    output:
-      - input_file: u16.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 41193e8e4d4bb9d346c56a0a2630ccc9c46003d3a72a215945c74af3aede4606
-    imports_resolved_ast: 41193e8e4d4bb9d346c56a0a2630ccc9c46003d3a72a215945c74af3aede4606
-    canonicalized_ast: 41193e8e4d4bb9d346c56a0a2630ccc9c46003d3a72a215945c74af3aede4606
-    type_inferenced_ast: 9aa867a159c530813bd8a1805fb093a208edcaf48466be37b18c311cc3590782
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/u16/eq.leo.out b/tests/expectations/compiler/compiler/integers/u16/eq.leo.out
index 4e75571070..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/u16/eq.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/eq.leo.out
@@ -1,28 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 65
-      num_constraints: 65
-      at: 8c8b795ef4142f2651625b90b3624d24de5138c3fb0981288a8cc5e12bf31f82
-      bt: eba2113bdda3d667d9e8c87f545fe4e2a0143b18a3fff0c1aaa46dd376ed1735
-      ct: f037d279ccea3ca689e05801ec3ba0053b5ce66a1763d4620262ea9b69873008
-    output:
-      - input_file: u16_e.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-      - input_file: u16_n.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: b45f803365a72727350696859672c162fa18a9b2b97b3c155a03cb1bf74f9e68
-    imports_resolved_ast: b45f803365a72727350696859672c162fa18a9b2b97b3c155a03cb1bf74f9e68
-    canonicalized_ast: b45f803365a72727350696859672c162fa18a9b2b97b3c155a03cb1bf74f9e68
-    type_inferenced_ast: d34a794b0695b41198003b21773b5abd4b4aa044de22a346301158aabb005d8e
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/u16/ge.leo.out b/tests/expectations/compiler/compiler/integers/u16/ge.leo.out
index a72469e83e..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/u16/ge.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/ge.leo.out
@@ -1,34 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 113
-      num_constraints: 113
-      at: c3a94f401722187113083aa4cc5bf90ec46ae91b4ac1d0ba51d765590fe51410
-      bt: 43d500d0bdcdf8461bd9605a2665bc17410cb0c7b1c743142aad3a41e74fcbe5
-      ct: 92784334fb47e5a53eb972ec42d95f97470117bb6839cf2d46e8fcbd38a662f9
-    output:
-      - input_file: u16_g.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-      - input_file: u16_e.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-      - input_file: u16_f.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 05e8b0ca21ae27026fec7897079a23f522be4ecca74009c42a7d820dbf3b37dc
-    imports_resolved_ast: 05e8b0ca21ae27026fec7897079a23f522be4ecca74009c42a7d820dbf3b37dc
-    canonicalized_ast: 05e8b0ca21ae27026fec7897079a23f522be4ecca74009c42a7d820dbf3b37dc
-    type_inferenced_ast: f79fa9920321f18c258cdbe99fcd37b7de5ebd943bdf1a6091954c9c8501c4c0
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/u16/gt.leo.out b/tests/expectations/compiler/compiler/integers/u16/gt.leo.out
index 3effd84987..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/u16/gt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/gt.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 113
-      num_constraints: 113
-      at: 800702d0776e95fee2689e79fcfe570db9fbd128310fc88565e72d322bea0407
-      bt: 417dc25c14bf36db410808a30f2263083728f1158cbf74a81bd8d8b5cba878d9
-      ct: 92784334fb47e5a53eb972ec42d95f97470117bb6839cf2d46e8fcbd38a662f9
-    output:
-      - input_file: u16_g.in
-        output:
-          registers: {}
-      - input_file: u16_f.in
-        output:
-          registers: {}
-    initial_ast: 07aa194712e885c67e73bd8ce425b09aa0b11a0597fd28e2b6b861c2890a7dbf
-    imports_resolved_ast: 07aa194712e885c67e73bd8ce425b09aa0b11a0597fd28e2b6b861c2890a7dbf
-    canonicalized_ast: 585b9eb84b4794b44a491f3a20919aa03b1defb10b34ff0c1ccaf16943c95498
-    type_inferenced_ast: f58d2c30292c5b7066145cc1f9f103c347c69bcfd103f68a11870d436d93034c
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/u16/input.leo.out b/tests/expectations/compiler/compiler/integers/u16/input.leo.out
index bb56c37ebc..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/u16/input.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/input.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 63
-      num_constraints: 63
-      at: 781fbf42db29f7fa9c21d99e21d8f011ec22b33ad26d3f80438687aafd462285
-      bt: abee7b67c55170fc3341444203a9a70e68690dce751aa36d3e91f1cf7ceef73d
-      ct: 51c18ee4216feeb01d0b0d661dfeb294e7e100873586edf79be89c8b54d9e168
-    output:
-      - input_file: u16_g.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: ce84d1a90125776ce0b144842cfdc4722338fc48bddbf027a6684704f02e71c5
-    imports_resolved_ast: ce84d1a90125776ce0b144842cfdc4722338fc48bddbf027a6684704f02e71c5
-    canonicalized_ast: ce84d1a90125776ce0b144842cfdc4722338fc48bddbf027a6684704f02e71c5
-    type_inferenced_ast: 4f28676ebd5a0be24690d37c2625b5f5080a5ae41368bff213d41b96377d9ee0
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/u16/le.leo.out b/tests/expectations/compiler/compiler/integers/u16/le.leo.out
index 765ed6181f..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/u16/le.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/le.leo.out
@@ -1,34 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 113
-      num_constraints: 113
-      at: ae8d8223fa654f971c969e68e926621d014e80b200e28a3bcb53f7e0760af811
-      bt: 7549aaa9e0eaa389b14dbf7a0c15122a1cd9707f492b8bedee98ae8f09bd9142
-      ct: 92784334fb47e5a53eb972ec42d95f97470117bb6839cf2d46e8fcbd38a662f9
-    output:
-      - input_file: u16_f.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "false"
-      - input_file: u16_e.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-      - input_file: u16_l.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "false"
-    initial_ast: 4cec9681367670442f9db73b42d312321bff0f30aeec0160b5c25c3e2dd33829
-    imports_resolved_ast: 4cec9681367670442f9db73b42d312321bff0f30aeec0160b5c25c3e2dd33829
-    canonicalized_ast: 4cec9681367670442f9db73b42d312321bff0f30aeec0160b5c25c3e2dd33829
-    type_inferenced_ast: 7cd703e68f80f112a3d93757cb906045e316616c15f781773028a4d1b4793551
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/u16/lt.leo.out b/tests/expectations/compiler/compiler/integers/u16/lt.leo.out
index 851f22fa65..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/u16/lt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/lt.leo.out
@@ -1,28 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 113
-      num_constraints: 113
-      at: f7f35cbd164c83cc4421fe89d14a349b70962c362186e237daff824054459d17
-      bt: 1bbe7b7f496597bd94e86ea0452146e8360ba0b2b2d922a81cfc51b4b5fa4fda
-      ct: 92784334fb47e5a53eb972ec42d95f97470117bb6839cf2d46e8fcbd38a662f9
-    output:
-      - input_file: u16_f.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "false"
-      - input_file: u16_g.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "false"
-    initial_ast: 68a12590c757f5286e98808d5a22bb707166828f74d4b89716553328b57867f3
-    imports_resolved_ast: 68a12590c757f5286e98808d5a22bb707166828f74d4b89716553328b57867f3
-    canonicalized_ast: 68a12590c757f5286e98808d5a22bb707166828f74d4b89716553328b57867f3
-    type_inferenced_ast: d1c19b097acf638840cadcbc81cc6e51fc750c2c49b84bcf36abc467d36e51f4
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/u16/max.leo.out b/tests/expectations/compiler/compiler/integers/u16/max.leo.out
index f9c3c2d5b2..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/u16/max.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/max.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: "../input/dummy.in"
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 6a13120d649e7db047df9453464a4a88965409a39257b56ad8466f397ab61217
-    imports_resolved_ast: 6a13120d649e7db047df9453464a4a88965409a39257b56ad8466f397ab61217
-    canonicalized_ast: 6a13120d649e7db047df9453464a4a88965409a39257b56ad8466f397ab61217
-    type_inferenced_ast: a08685b22ab2a58652759e3657a8246bd65e23d18fe895a0987e3567926eddc2
+outputs: []
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 5589174d2d..3f519cf1b5 100644
--- a/tests/expectations/compiler/compiler/integers/u16/max_fail.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/max_fail.leo.out
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - "Error [EASG0373030]: failed to parse int value '65536'\n    --> compiler-test:4:20\n     |\n   4 |     const a: u16 = 65536;\n     |                    ^^^^^"
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/u16/min.leo.out b/tests/expectations/compiler/compiler/integers/u16/min.leo.out
index a5a6aadb9d..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/u16/min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/min.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: "../input/dummy.in"
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 10bca9f23d35f0a354948dafb069860d71618205c9e0efb483c465c5794ee83a
-    imports_resolved_ast: 10bca9f23d35f0a354948dafb069860d71618205c9e0efb483c465c5794ee83a
-    canonicalized_ast: 10bca9f23d35f0a354948dafb069860d71618205c9e0efb483c465c5794ee83a
-    type_inferenced_ast: b7673715a9b643f97ea30652defed51f23f6ba79ae9ef39c81d25fd7d3bb815e
+outputs: []
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 6d7454bc9e..3f519cf1b5 100644
--- a/tests/expectations/compiler/compiler/integers/u16/min_fail.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/min_fail.leo.out
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - "Error [EASG0373030]: failed to parse int value '-1'\n    --> compiler-test:4:20\n     |\n   4 |     const a: u16 = -1;\n     |                    ^^"
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/u16/mul.leo.out b/tests/expectations/compiler/compiler/integers/u16/mul.leo.out
index b84d167f1d..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/u16/mul.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/mul.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 899
-      num_constraints: 1172
-      at: 26bd7cae34fa05bfe268e134e02dad80d3978fdbcf60cecc47f41102c659c539
-      bt: f660e7fad189d6e454e78216e0128e07d47145da1eeb6b53ed5a73cdf4fe9888
-      ct: 267549c071634baac2f681f050ede9777ca6d302d8a0ca04c60f6f60e497d64e
-    output:
-      - input_file: mul.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "false"
-    initial_ast: 9b02c262401b83f83f76f3dd22aceaa0bdb1bdd196faf68bdd71e4105bd3b143
-    imports_resolved_ast: 9b02c262401b83f83f76f3dd22aceaa0bdb1bdd196faf68bdd71e4105bd3b143
-    canonicalized_ast: 9b02c262401b83f83f76f3dd22aceaa0bdb1bdd196faf68bdd71e4105bd3b143
-    type_inferenced_ast: b5b3e21e917355dbbb35d62ee33a1f565b592dee2c62e4a56eb7521ea168c7d7
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/u16/ne.leo.out b/tests/expectations/compiler/compiler/integers/u16/ne.leo.out
index 978b1e07e8..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/u16/ne.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/ne.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 65
-      num_constraints: 65
-      at: 83a4d089927a9811a9d4ed5b3ee2e50e395cd598de865653be04a2c51904b072
-      bt: 30bc7cfbc53a2e928ca0310b6041f1f1548ad7c1197ffc9301b46522122e5561
-      ct: f037d279ccea3ca689e05801ec3ba0053b5ce66a1763d4620262ea9b69873008
-    output:
-      - input_file: ne.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 30ee8bc862393f3ffec75051160d88c703e24711dc4a742369fd824485792a44
-    imports_resolved_ast: 30ee8bc862393f3ffec75051160d88c703e24711dc4a742369fd824485792a44
-    canonicalized_ast: 30ee8bc862393f3ffec75051160d88c703e24711dc4a742369fd824485792a44
-    type_inferenced_ast: e0f90d2b1c766550e9d7fe202705709a93771f8fce9debf3c119d0f1bf2ff19e
+outputs: []
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..3f519cf1b5 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
@@ -1,5 +1,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     |               ^"
+outputs: []
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..3f519cf1b5 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
@@ -1,5 +1,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     |               ^"
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/u16/sub.leo.out b/tests/expectations/compiler/compiler/integers/u16/sub.leo.out
index c330ad2612..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/u16/sub.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/sub.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 96
-      num_constraints: 97
-      at: 370387ad947bfe3a763fa62847b00f95580ec1c1b754cf600e06b313a84044ec
-      bt: c404ca4ebed24418ea98c0994a710e335e65d373114e9e1be5ba5354ced20806
-      ct: 81a951fd0bc0072abf02978c9c6547c090936985ea19b50e3c148595d4870599
-    output:
-      - input_file: u16_f.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 63558d4f64eb9c248b6391254bc279f1ae53c08602a35e86b73d8876ae5cbff7
-    imports_resolved_ast: 63558d4f64eb9c248b6391254bc279f1ae53c08602a35e86b73d8876ae5cbff7
-    canonicalized_ast: 63558d4f64eb9c248b6391254bc279f1ae53c08602a35e86b73d8876ae5cbff7
-    type_inferenced_ast: f272cb2627650262ddfa289e945abddb91525bb8899c8d4d7853d9e5a398aa56
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/u16/ternary.leo.out b/tests/expectations/compiler/compiler/integers/u16/ternary.leo.out
index 31197445ef..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/u16/ternary.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/ternary.leo.out
@@ -1,28 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 112
-      num_constraints: 128
-      at: b0a107f586de648c8446ae3246117de3b20ba9c0249d261f234106809d112f0a
-      bt: 0e5faacb5d80488eeda9e7fa79ddd96e54c010e0e98571449f79cad816cc18a2
-      ct: 2b3428d7c7335edc32ab219fe11c92e215d70a52c89434de349f4951561d5795
-    output:
-      - input_file: u16_t.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-      - input_file: u16_f.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: a5453842c01ff883e970a8acbc0c0164e21ab8ee9667e7d198fd02b44e4cdf56
-    imports_resolved_ast: a5453842c01ff883e970a8acbc0c0164e21ab8ee9667e7d198fd02b44e4cdf56
-    canonicalized_ast: a5453842c01ff883e970a8acbc0c0164e21ab8ee9667e7d198fd02b44e4cdf56
-    type_inferenced_ast: 486a1e2a5f9e3eb3704f6ea039a832bfdad7a436464140933e978cee5dd42466
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/u32/add.leo.out b/tests/expectations/compiler/compiler/integers/u32/add.leo.out
index e4810ab1e5..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/u32/add.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/add.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 192
-      num_constraints: 193
-      at: 6cb7221b25d9868ec3dfc97292d22e7b9b7e7571ffd39a14523c2dcd6ee63c60
-      bt: db97ec2b7f2b40889263b26fc6f01de19f78a4b007371ad2f54869e9a31d21db
-      ct: 2773a172ee849b2e45b68f0c367651fc5a0715e9415d2d97601d41e540d713d0
-    output:
-      - input_file: u32.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 3ca20068a4f2cc3ce017686240c82a7320f94700e9068448d7bbcaa6c8d11afd
-    imports_resolved_ast: 3ca20068a4f2cc3ce017686240c82a7320f94700e9068448d7bbcaa6c8d11afd
-    canonicalized_ast: 3ca20068a4f2cc3ce017686240c82a7320f94700e9068448d7bbcaa6c8d11afd
-    type_inferenced_ast: 6f31cebf6905062ec9c55324ee499173987eb04820414eeda3a6696a9a4df4e5
+outputs: []
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 3990b9d39e..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/u32/console_assert.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/console_assert.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 190
-      num_constraints: 190
-      at: a1a80b7c355e1fa32c2136c4dc7a0fd0670affbdda869a9161a3a69f396c6b9a
-      bt: fbf306d0d13bf3d40926ad7adc07f122cb8d065e7e5d55f3416ac30d7ebe7a7c
-      ct: 97e2acff1b76912c52107342393ec04a09af81353a25f7ce330b8492f41381cf
-    output:
-      - input_file: u32.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 00f676e0063c85f5caa851dd5e1e9061cbdf79c85da857d6e5d89d42cda9651b
-    imports_resolved_ast: 00f676e0063c85f5caa851dd5e1e9061cbdf79c85da857d6e5d89d42cda9651b
-    canonicalized_ast: 00f676e0063c85f5caa851dd5e1e9061cbdf79c85da857d6e5d89d42cda9651b
-    type_inferenced_ast: 20a848a26a90c695b25384daf05ebc98716ec0951992087dfc4370e15920b805
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/u32/div.leo.out b/tests/expectations/compiler/compiler/integers/u32/div.leo.out
index ec1450b695..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/u32/div.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/div.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 16572
-      num_constraints: 20795
-      at: 4f6450d5e7991f179adb08e1b026e453c4c6abd66f38ea4a175a888b3c1bdbf1
-      bt: 3f6fd055b4a8dacc1138d93848e7ea7424a5bc64af98ad3ee1e6e5ff4719e3c3
-      ct: a5941a2d70ce52e20004890f9a7198b0f22c93803e9d159824e716ff2ed2d223
-    output:
-      - input_file: u32.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 3edfc10e7ea7c05f9f42f2f22b673431820a526c5c6bd0729d98c48ba3c8e8aa
-    imports_resolved_ast: 3edfc10e7ea7c05f9f42f2f22b673431820a526c5c6bd0729d98c48ba3c8e8aa
-    canonicalized_ast: 3edfc10e7ea7c05f9f42f2f22b673431820a526c5c6bd0729d98c48ba3c8e8aa
-    type_inferenced_ast: 90e585dbd2a3e0d8d2d9bec6aeb443d2d3276826e18f3ce39e7cc0b4b9edad8a
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/u32/eq.leo.out b/tests/expectations/compiler/compiler/integers/u32/eq.leo.out
index 34082bd47f..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/u32/eq.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/eq.leo.out
@@ -1,28 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 129
-      num_constraints: 129
-      at: 4ce4f2bf481c4f7e47396527999e129066d1f157413884f91ced3d2b525a3187
-      bt: e63628fc48d1e71ea44830c010e442f577239e29f7ffada0d8df34c28e67f107
-      ct: 9f4c72431c0c7c03e216195a071c971c53deed8e3bfce450bffb3a6fad7418d5
-    output:
-      - input_file: u32_e.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-      - input_file: u32_n.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 0064b1991c2086b76844f10afc932e912382ca46ce87a491fa698112c647da7b
-    imports_resolved_ast: 0064b1991c2086b76844f10afc932e912382ca46ce87a491fa698112c647da7b
-    canonicalized_ast: 0064b1991c2086b76844f10afc932e912382ca46ce87a491fa698112c647da7b
-    type_inferenced_ast: e3aa9184fea93463cfc41a487e3cc59a9dd21846d201926424bf94eb0bd1ec04
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/u32/ge.leo.out b/tests/expectations/compiler/compiler/integers/u32/ge.leo.out
index 6a162f8cfe..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/u32/ge.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/ge.leo.out
@@ -1,34 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 225
-      num_constraints: 225
-      at: b09f4d28fdd36c49a340f1d95f86886acc00f8e584a50dd3c98bf6adc63bb13d
-      bt: 37e95d209b9ca56b6ed5debe1d21d2c72e48d6a0898a59833bdf3daf2ce1c96b
-      ct: d7067f500143a40e015fd1f4447a4ea5b9ee6ebdf007e08be51772a8a2b672c3
-    output:
-      - input_file: u32_g.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-      - input_file: u32_e.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-      - input_file: u32_f.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 5cf54eb75aca0534ecdcebdfcd29487598ac2bfbff4ccd94e1f8372cc66647f2
-    imports_resolved_ast: 5cf54eb75aca0534ecdcebdfcd29487598ac2bfbff4ccd94e1f8372cc66647f2
-    canonicalized_ast: 5cf54eb75aca0534ecdcebdfcd29487598ac2bfbff4ccd94e1f8372cc66647f2
-    type_inferenced_ast: fb2ff53ccf82f2b41a3c9db523623d42b49beca8a2cf2ed50743bd17c748a75c
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/u32/gt.leo.out b/tests/expectations/compiler/compiler/integers/u32/gt.leo.out
index 5c1b7b51ca..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/u32/gt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/gt.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 225
-      num_constraints: 225
-      at: 63019ae9d78e708c481c3ed306a9fb7e5a4ddc8db20d1a2a48e2e161aca53542
-      bt: 3a99f6fa32ac0358a66ac53d0cef7af442097730b5f56ec8f8d9974108f25215
-      ct: d7067f500143a40e015fd1f4447a4ea5b9ee6ebdf007e08be51772a8a2b672c3
-    output:
-      - input_file: u32_g.in
-        output:
-          registers: {}
-      - input_file: u32_f.in
-        output:
-          registers: {}
-    initial_ast: ce24730aad7178331b88c496a8acbb95da355169193369d49801fc9eac092371
-    imports_resolved_ast: ce24730aad7178331b88c496a8acbb95da355169193369d49801fc9eac092371
-    canonicalized_ast: 21cd67ad1094e56f7cbcc6bc839d9b20c25e8d15e2017d64c4672da2233385e4
-    type_inferenced_ast: 532bef95e9c6d5432f89a08f207e25e30b61b862f7a1fd225603cb89f0b203b5
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/u32/input.leo.out b/tests/expectations/compiler/compiler/integers/u32/input.leo.out
index f2190b9b36..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/u32/input.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/input.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 127
-      num_constraints: 127
-      at: 051151c1ab89f2c0ff0fe5d336668c3fcd6dc4744d1f5b8e135dcb7bf6a6195c
-      bt: 6b92443726163ac0fc32f7c9edace0ec8369e793d24105d93d121cb0bd5c3128
-      ct: 7cb2d3f0ccfb9a2e747c6a05bdb52812c4539c836ff62c4e555fac13ef2084d4
-    output:
-      - input_file: u32_g.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: b6d84a8bb303dcb914251907999a4c4747f2f1ba76547f9b6bf42cf964b8c173
-    imports_resolved_ast: b6d84a8bb303dcb914251907999a4c4747f2f1ba76547f9b6bf42cf964b8c173
-    canonicalized_ast: b6d84a8bb303dcb914251907999a4c4747f2f1ba76547f9b6bf42cf964b8c173
-    type_inferenced_ast: 20de2c6d503d1dd20412d2f689fc34a0965994743221604b2e83dfb62ea1b76c
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/u32/le.leo.out b/tests/expectations/compiler/compiler/integers/u32/le.leo.out
index d54beb1abb..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/u32/le.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/le.leo.out
@@ -1,34 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 225
-      num_constraints: 225
-      at: be1f0e82bb31df7cf90717f08c3dc7f68f997c41433d5971d2d0f250faff6847
-      bt: 6e596324acc04a48f980f6248f44cbf54a25671a41051bbffc087505edbf031f
-      ct: d7067f500143a40e015fd1f4447a4ea5b9ee6ebdf007e08be51772a8a2b672c3
-    output:
-      - input_file: u32_f.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "false"
-      - input_file: u32_e.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-      - input_file: u32_l.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "false"
-    initial_ast: 609c549354bf45d203924554785e66eaa4506fc72cab880da747d87be55fb687
-    imports_resolved_ast: 609c549354bf45d203924554785e66eaa4506fc72cab880da747d87be55fb687
-    canonicalized_ast: 609c549354bf45d203924554785e66eaa4506fc72cab880da747d87be55fb687
-    type_inferenced_ast: deba08692c955e042da5d13a1209eb8fc84398362e51d95c8866b18332034706
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/u32/lt.leo.out b/tests/expectations/compiler/compiler/integers/u32/lt.leo.out
index 14201458e4..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/u32/lt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/lt.leo.out
@@ -1,28 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 225
-      num_constraints: 225
-      at: aa2fc0bfe167bccae6c9eca820227eb4b981007c89579a32d3b5ec4a8268f30d
-      bt: 953b00df7ba097904b71a60403e38d69eece1a6e0b6791b13214cb6ea803fbb3
-      ct: d7067f500143a40e015fd1f4447a4ea5b9ee6ebdf007e08be51772a8a2b672c3
-    output:
-      - input_file: u32_f.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "false"
-      - input_file: u32_g.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "false"
-    initial_ast: 62a00f0678c643a199718696e42d0acb438f78f1cf5c6dbcd4ecb45b7a8a7100
-    imports_resolved_ast: 62a00f0678c643a199718696e42d0acb438f78f1cf5c6dbcd4ecb45b7a8a7100
-    canonicalized_ast: 62a00f0678c643a199718696e42d0acb438f78f1cf5c6dbcd4ecb45b7a8a7100
-    type_inferenced_ast: eb21e43b5fb6fd7fe7b7fe35af69df697aa5fc8ca94325a0b6f957c55828b46e
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/u32/max.leo.out b/tests/expectations/compiler/compiler/integers/u32/max.leo.out
index 6894c507e7..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/u32/max.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/max.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: "../input/dummy.in"
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: e39345598cb3fb70a83082c7996f36d8c30ba9414fe7f6b9cc982bba85ec0a6a
-    imports_resolved_ast: e39345598cb3fb70a83082c7996f36d8c30ba9414fe7f6b9cc982bba85ec0a6a
-    canonicalized_ast: e39345598cb3fb70a83082c7996f36d8c30ba9414fe7f6b9cc982bba85ec0a6a
-    type_inferenced_ast: bca1eb2f17887930dfabe774271b8455b15536e4f835deb9961e1668ad405c3c
+outputs: []
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 b7d67e21c2..3f519cf1b5 100644
--- a/tests/expectations/compiler/compiler/integers/u32/max_fail.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/max_fail.leo.out
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - "Error [EASG0373030]: failed to parse int value '4294967296'\n    --> compiler-test:4:20\n     |\n   4 |     const a: u32 = 4294967296;\n     |                    ^^^^^^^^^^"
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/u32/min.leo.out b/tests/expectations/compiler/compiler/integers/u32/min.leo.out
index ced1a702ef..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/u32/min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/min.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: "../input/dummy.in"
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 9ca4ca8404f1fc0d16a652b741f3e57d3483d8cdb05304a58f6b1ee3580886c1
-    imports_resolved_ast: 9ca4ca8404f1fc0d16a652b741f3e57d3483d8cdb05304a58f6b1ee3580886c1
-    canonicalized_ast: 9ca4ca8404f1fc0d16a652b741f3e57d3483d8cdb05304a58f6b1ee3580886c1
-    type_inferenced_ast: 156bc2c711d9666d42cff2bb99582ff06ad6a13a49ee529a59242e729d71f7dc
+outputs: []
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 b7e23834bd..3f519cf1b5 100644
--- a/tests/expectations/compiler/compiler/integers/u32/min_fail.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/min_fail.leo.out
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - "Error [EASG0373030]: failed to parse int value '-1'\n    --> compiler-test:4:20\n     |\n   4 |     const a: u32 = -1;\n     |                    ^^"
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/u32/mul.leo.out b/tests/expectations/compiler/compiler/integers/u32/mul.leo.out
index cf8fdc3da5..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/u32/mul.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/mul.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 3332
-      num_constraints: 4389
-      at: 2edbd98e47b4ed8cd7d7c761594353aa4ae9ca443e4d1e1f43c1e89e61955a13
-      bt: 127cc198f6c432cd8add8297902708b759e48ff05fb8c042a356cb5bd81524a8
-      ct: e4cb5fbafce0c6aae444c1ddf3f1883ca3df62c790a4baa8a3755bd75bb42f49
-    output:
-      - input_file: mul.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "false"
-    initial_ast: 64377d0d7fdebe1312a8b11a1e0e45b2664cbf51042de5ffddfd56a1b2c49c35
-    imports_resolved_ast: 64377d0d7fdebe1312a8b11a1e0e45b2664cbf51042de5ffddfd56a1b2c49c35
-    canonicalized_ast: 64377d0d7fdebe1312a8b11a1e0e45b2664cbf51042de5ffddfd56a1b2c49c35
-    type_inferenced_ast: 4e218b33b3b57390e30f068e49f5ed008626b4ebb22615fdd29929bf36ec2ed0
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/u32/ne.leo.out b/tests/expectations/compiler/compiler/integers/u32/ne.leo.out
index 730c529f30..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/u32/ne.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/ne.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 129
-      num_constraints: 129
-      at: 6cde17fb079861287679ad93d9ed9125cfc21000431bfeaf5a2054360ce51ef7
-      bt: 1178e67ab79eac96592f17313168c4300d53e89ab571025054d53d19dfdfd1b8
-      ct: 9f4c72431c0c7c03e216195a071c971c53deed8e3bfce450bffb3a6fad7418d5
-    output:
-      - input_file: ne.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 0857646d1f6fdb13fc94c7fea7f0d91fcb1fdccb4841661a170b00c3091f5691
-    imports_resolved_ast: 0857646d1f6fdb13fc94c7fea7f0d91fcb1fdccb4841661a170b00c3091f5691
-    canonicalized_ast: 0857646d1f6fdb13fc94c7fea7f0d91fcb1fdccb4841661a170b00c3091f5691
-    type_inferenced_ast: 85905a294e0eea013e6f7c4fe93858e935258f5001d1bb6aa082325ec90df1fe
+outputs: []
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..3f519cf1b5 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
@@ -1,5 +1,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     |               ^"
+outputs: []
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..3f519cf1b5 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
@@ -1,5 +1,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     |               ^"
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/u32/sub.leo.out b/tests/expectations/compiler/compiler/integers/u32/sub.leo.out
index 9a4a91c185..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/u32/sub.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/sub.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 192
-      num_constraints: 193
-      at: 6cb7221b25d9868ec3dfc97292d22e7b9b7e7571ffd39a14523c2dcd6ee63c60
-      bt: db97ec2b7f2b40889263b26fc6f01de19f78a4b007371ad2f54869e9a31d21db
-      ct: 0a2d17cb1ee78051a702abbb771d34100ff951ae893e69981ee2507b5aba6671
-    output:
-      - input_file: u32_f.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 5ad8be6dc638e835e2f7b4e9dd26f9ae282dbe59d9853db13ce09f38d3e43b1f
-    imports_resolved_ast: 5ad8be6dc638e835e2f7b4e9dd26f9ae282dbe59d9853db13ce09f38d3e43b1f
-    canonicalized_ast: 5ad8be6dc638e835e2f7b4e9dd26f9ae282dbe59d9853db13ce09f38d3e43b1f
-    type_inferenced_ast: e7b074bd40b37ada9a90999b35fdbcd56886e2f98949a4093ba8c495661a75d1
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/u32/ternary.leo.out b/tests/expectations/compiler/compiler/integers/u32/ternary.leo.out
index b22494cd5e..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/u32/ternary.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/ternary.leo.out
@@ -1,28 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 224
-      num_constraints: 256
-      at: 45301188494f0c65b2e88eac9117ba7367e772ea34e9b8f34bf3d49dbd1dd067
-      bt: 35d9c47cfd4fc137760d0ee411c0b097541cab7aae2b0a9ea83b368328fe5c23
-      ct: 032da4c7df957d9ca89b5395be6e1c84cab7d19a78abe1b02bb37b26ca65b0e4
-    output:
-      - input_file: u32_t.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-      - input_file: u32_f.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: c5b7d8bd3863f44039ab510def2034acb99362b39a5428e6fc117483353f4afe
-    imports_resolved_ast: c5b7d8bd3863f44039ab510def2034acb99362b39a5428e6fc117483353f4afe
-    canonicalized_ast: c5b7d8bd3863f44039ab510def2034acb99362b39a5428e6fc117483353f4afe
-    type_inferenced_ast: dc3eaf97d5cb489ebffb01f14ba974027562ca17f438301c26167aa3471ddc52
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/u64/add.leo.out b/tests/expectations/compiler/compiler/integers/u64/add.leo.out
index 788d42dcc1..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/u64/add.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/add.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 384
-      num_constraints: 385
-      at: 03f552addf49f5f1c8402d8af8dd733983efa7fd3436d677d89d74a1c6548962
-      bt: 8cbfb6559664a4d73354d718f19247484a98da79ddf83350c1a070cb14fda399
-      ct: 0715661d18c8621f5c33eee669d8d659ee3a767d6ef515102191cdc19577ac02
-    output:
-      - input_file: u64.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 0ef0459ce0ac2ba8a9c2272d6c4f67f7dd9cd7d36c557c65339d2ef8d2c5b187
-    imports_resolved_ast: 0ef0459ce0ac2ba8a9c2272d6c4f67f7dd9cd7d36c557c65339d2ef8d2c5b187
-    canonicalized_ast: 0ef0459ce0ac2ba8a9c2272d6c4f67f7dd9cd7d36c557c65339d2ef8d2c5b187
-    type_inferenced_ast: 248f3c601e2a40da8679d72f7b7316b939d60cf137c4b51cbb45fa17f7707f6e
+outputs: []
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 dc696c5d5e..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/u64/console_assert.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/console_assert.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 382
-      num_constraints: 382
-      at: 9d064db37e95194967d924cd23aecd5ddd20a17c31a48470f0b624f5937ff750
-      bt: 21d30b45426d69b866ddb826df03348580bcd064b2586cd615e3c270d7b85397
-      ct: bd9112f8b3135d07d5b5a2491f17add20c7ca9d7881df20e3ff47918d208e75d
-    output:
-      - input_file: u64.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: d2f3122d85fa05ee19f871887e18aa6efabad907605cea1f15450ef959b2879a
-    imports_resolved_ast: d2f3122d85fa05ee19f871887e18aa6efabad907605cea1f15450ef959b2879a
-    canonicalized_ast: d2f3122d85fa05ee19f871887e18aa6efabad907605cea1f15450ef959b2879a
-    type_inferenced_ast: f815e8620acc120dd2d65879e28cb0454628ce35522a1c2ff767fa01035bdf58
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/u64/div.leo.out b/tests/expectations/compiler/compiler/integers/u64/div.leo.out
index 001652407f..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/u64/div.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/div.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 65916
-      num_constraints: 82555
-      at: 071831a1f073f5ba74377785488634267645562682b9dbeaafd1f65e39bf17d3
-      bt: bcde87dd40262305d4c32a5949fa939d1b83f6ae51143eba7c147eab61314987
-      ct: 7c81f1ec1d5e9746863df8f4128342df3b6ad3abe2397c2274a0c3fc45750094
-    output:
-      - input_file: u64.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 2fdc5cbc880c5460481529ab25107dd0aca1981e62799cbc2b2493aa09118a48
-    imports_resolved_ast: 2fdc5cbc880c5460481529ab25107dd0aca1981e62799cbc2b2493aa09118a48
-    canonicalized_ast: 2fdc5cbc880c5460481529ab25107dd0aca1981e62799cbc2b2493aa09118a48
-    type_inferenced_ast: 961438f46e01229747be641eee9975d6368894da0e8a6b34339bd6268dd8afa6
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/u64/eq.leo.out b/tests/expectations/compiler/compiler/integers/u64/eq.leo.out
index 769418bc71..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/u64/eq.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/eq.leo.out
@@ -1,28 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 257
-      num_constraints: 257
-      at: 30dc67aa22cadc6e5ec8c73e0096443263121e29adf46bb33ed310b07765ff6e
-      bt: 1aaee32179419b6185d75c5745bd13c7c8ba869bad0132405ef1b28915bfe5d9
-      ct: 8edd5528a862bbd5590cfbd0d52871e395cf73e3a22c70839571b36506fbe3a7
-    output:
-      - input_file: u64_e.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-      - input_file: u64_n.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: ad4f42340cbf53046e609f62504385802398d608ada37e91f60134edf598ba59
-    imports_resolved_ast: ad4f42340cbf53046e609f62504385802398d608ada37e91f60134edf598ba59
-    canonicalized_ast: ad4f42340cbf53046e609f62504385802398d608ada37e91f60134edf598ba59
-    type_inferenced_ast: 4cf9af4071478957995abe43c2e193df18a860eaa82449a0952b732ec7be9a9c
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/u64/ge.leo.out b/tests/expectations/compiler/compiler/integers/u64/ge.leo.out
index 085d10a1f8..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/u64/ge.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/ge.leo.out
@@ -1,34 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 449
-      num_constraints: 449
-      at: 43b83eacdd7b17b700c040da76128375494a8f013882c2cd401cf5c9ceeef74a
-      bt: bd9dd7ede35a39f80c5b4b97dca300dcd37110f2270cb25d8935d964db04e2ab
-      ct: 7b765314986bd8a51a62dabdef866c5fe05ad9bf392fb0e25b7ce3b9969f81e1
-    output:
-      - input_file: u64_g.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-      - input_file: u64_e.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-      - input_file: u64_f.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 98a856a767ee58ea53ec7a6f489d6db69a9e828b76e7b8b26c0222b89b4be3d3
-    imports_resolved_ast: 98a856a767ee58ea53ec7a6f489d6db69a9e828b76e7b8b26c0222b89b4be3d3
-    canonicalized_ast: 98a856a767ee58ea53ec7a6f489d6db69a9e828b76e7b8b26c0222b89b4be3d3
-    type_inferenced_ast: 2d3be362efd6a4a97dc1b06eff92c06facd649dab585f3ad681d5ce49e4e37cf
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/u64/gt.leo.out b/tests/expectations/compiler/compiler/integers/u64/gt.leo.out
index ceb14c1bab..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/u64/gt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/gt.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 449
-      num_constraints: 449
-      at: 961c527f11c9cd68f1dff327e550127f82fc974a4b92c1dedc47a2f7426590a9
-      bt: fcf7dc96d2a270e2f93cf6e19151e06c10a1b5361d5ac92a8cb2a2ba36c19067
-      ct: 7b765314986bd8a51a62dabdef866c5fe05ad9bf392fb0e25b7ce3b9969f81e1
-    output:
-      - input_file: u64_g.in
-        output:
-          registers: {}
-      - input_file: u64_f.in
-        output:
-          registers: {}
-    initial_ast: c667f170b175a4c3991b2df81c0605d3980cab1ae01ae4c66c71f3a311d711c2
-    imports_resolved_ast: c667f170b175a4c3991b2df81c0605d3980cab1ae01ae4c66c71f3a311d711c2
-    canonicalized_ast: 173da56c6c9a8cd27a1181d9fe1197db4168f4f25129dbd02ef474e5c77c110f
-    type_inferenced_ast: 4618a65899c633510140b465505d8f767d890f40bc24535513f73d04e187a884
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/u64/input.leo.out b/tests/expectations/compiler/compiler/integers/u64/input.leo.out
index ba72baf0a0..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/u64/input.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/input.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 255
-      num_constraints: 255
-      at: 68080cb19b62be7f91ee2118affb7b55ea272e15e17581869385053a5c6d3623
-      bt: 2c1d031e57e285b1277f2c37853fc7fdff23711e1147d7b26ed74d3acd28ceff
-      ct: 0b136215b60005ed17aa4eea76bc4e2b0349c0fecf57dc06f5dba31981f270d0
-    output:
-      - input_file: u64_g.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 2f1b1bd0b33a99d4962b01003146df394ef6b0ba913080a4a905ad393ae5ad44
-    imports_resolved_ast: 2f1b1bd0b33a99d4962b01003146df394ef6b0ba913080a4a905ad393ae5ad44
-    canonicalized_ast: 2f1b1bd0b33a99d4962b01003146df394ef6b0ba913080a4a905ad393ae5ad44
-    type_inferenced_ast: 4b97d8527b94d514fa342714f89595dd6384f95d21ead2b6f52ca4141e54b2b4
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/u64/le.leo.out b/tests/expectations/compiler/compiler/integers/u64/le.leo.out
index 4404e32632..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/u64/le.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/le.leo.out
@@ -1,34 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 449
-      num_constraints: 449
-      at: d8041c17d69554c3c06ad3d72f58df129a6df56184fd121c815b1ddfe0951d52
-      bt: 20b7ff1d5fb8aeb0ff37cde558c4da0c1949885789a23bdf21a415cefb159e16
-      ct: 7b765314986bd8a51a62dabdef866c5fe05ad9bf392fb0e25b7ce3b9969f81e1
-    output:
-      - input_file: u64_f.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "false"
-      - input_file: u64_e.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-      - input_file: u64_l.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "false"
-    initial_ast: 254f1e1190e4badc566cf6325a2204b54c3862730fd1927f940bed7fc59661ef
-    imports_resolved_ast: 254f1e1190e4badc566cf6325a2204b54c3862730fd1927f940bed7fc59661ef
-    canonicalized_ast: 254f1e1190e4badc566cf6325a2204b54c3862730fd1927f940bed7fc59661ef
-    type_inferenced_ast: d0f1f32a7cfddb8fdeb6d3c8d1dc671e360e6da220cc027d96ba9af05a89c9ee
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/u64/lt.leo.out b/tests/expectations/compiler/compiler/integers/u64/lt.leo.out
index e5858787e1..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/u64/lt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/lt.leo.out
@@ -1,28 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 449
-      num_constraints: 449
-      at: 6fad339784c0e41ffb56fc6d4b5949563cf1a7e53e91cf1c643df2dd798c9cf8
-      bt: ac1a1706eaf7c384375eebf95d38ab272e9c27745c6a9f5feed56e6ecbe28e8b
-      ct: 7b765314986bd8a51a62dabdef866c5fe05ad9bf392fb0e25b7ce3b9969f81e1
-    output:
-      - input_file: u64_f.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "false"
-      - input_file: u64_g.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "false"
-    initial_ast: 78e1412b1d5489da7cc5748403694f48facede592b307e53b8ff81c88706aaba
-    imports_resolved_ast: 78e1412b1d5489da7cc5748403694f48facede592b307e53b8ff81c88706aaba
-    canonicalized_ast: 78e1412b1d5489da7cc5748403694f48facede592b307e53b8ff81c88706aaba
-    type_inferenced_ast: de8ae920138c080d121776efa9920dc1b51108aaf7e18e75c61fcd4436bfdbdb
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/u64/max.leo.out b/tests/expectations/compiler/compiler/integers/u64/max.leo.out
index 2740bb1a85..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/u64/max.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/max.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: "../input/dummy.in"
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: b683fad49d2ee3cf8e2c08db1994d40178fd8620ed5b2a1aa84a222a2db4d466
-    imports_resolved_ast: b683fad49d2ee3cf8e2c08db1994d40178fd8620ed5b2a1aa84a222a2db4d466
-    canonicalized_ast: b683fad49d2ee3cf8e2c08db1994d40178fd8620ed5b2a1aa84a222a2db4d466
-    type_inferenced_ast: 58e6327fa6d926a54bf437c8b3368b1bb2a62c9f86c372139b0952de56b94d78
+outputs: []
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 55b5108fa8..3f519cf1b5 100644
--- a/tests/expectations/compiler/compiler/integers/u64/max_fail.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/max_fail.leo.out
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - "Error [EASG0373030]: failed to parse int value '18446744073709551616'\n    --> compiler-test:4:20\n     |\n   4 |     const a: u64 = 18446744073709551616;\n     |                    ^^^^^^^^^^^^^^^^^^^^"
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/u64/min.leo.out b/tests/expectations/compiler/compiler/integers/u64/min.leo.out
index 8668160ca6..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/u64/min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/min.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: "../input/dummy.in"
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 2ab7dc6aeaa06191668ce218bf971a797d818d82d57e5c5238571ac7d51b3e1a
-    imports_resolved_ast: 2ab7dc6aeaa06191668ce218bf971a797d818d82d57e5c5238571ac7d51b3e1a
-    canonicalized_ast: 2ab7dc6aeaa06191668ce218bf971a797d818d82d57e5c5238571ac7d51b3e1a
-    type_inferenced_ast: 9b04ce3a661bfcbc23b9066b315b48ca4cc51c10364dc3f2aa6196efd1633056
+outputs: []
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 f0d007ea6c..3f519cf1b5 100644
--- a/tests/expectations/compiler/compiler/integers/u64/min_fail.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/min_fail.leo.out
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - "Error [EASG0373030]: failed to parse int value '-1'\n    --> compiler-test:4:20\n     |\n   4 |     const a: u64 = -1;\n     |                    ^^"
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/u64/mul.leo.out b/tests/expectations/compiler/compiler/integers/u64/mul.leo.out
index ea52e75d85..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/u64/mul.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/mul.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 12805
-      num_constraints: 16966
-      at: 94607d20548e2b4a046e0f3eb55624da27ec73bcaeee0e8258b3d2e2e607b2fd
-      bt: 8063dc2ec3957d32cb243785803b1fe280885ae5bbb7b50ae5dd71b4a5b404dd
-      ct: 5c2a423f5d488da02561837d1ae9e5b86ede29cd64555ebc88229ab4ef9d8fa2
-    output:
-      - input_file: mul.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "false"
-    initial_ast: 234cebde72559d83c7ca897456c95a46345a67de7fd6b82aa9fb3a0ce5cd9d6d
-    imports_resolved_ast: 234cebde72559d83c7ca897456c95a46345a67de7fd6b82aa9fb3a0ce5cd9d6d
-    canonicalized_ast: 234cebde72559d83c7ca897456c95a46345a67de7fd6b82aa9fb3a0ce5cd9d6d
-    type_inferenced_ast: 41a3dae72352f43712f3cc0cb507ab92031b48cfdb7fcb06f959b6060758d17b
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/u64/ne.leo.out b/tests/expectations/compiler/compiler/integers/u64/ne.leo.out
index 28e0fa8284..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/u64/ne.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/ne.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 257
-      num_constraints: 257
-      at: 2ba8d0827cc16bb5d0076549483425de1dd0da9b3fb06fd790c256ec8d1df36b
-      bt: 7abc1550aed02405fe1d0951da294ee11583b4215ddc3889429f16ac75604766
-      ct: 8edd5528a862bbd5590cfbd0d52871e395cf73e3a22c70839571b36506fbe3a7
-    output:
-      - input_file: ne.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: d4062e73e7e24af37d9e4d1770d18e008d47f5df0dbc2de56a1089496e53ea1b
-    imports_resolved_ast: d4062e73e7e24af37d9e4d1770d18e008d47f5df0dbc2de56a1089496e53ea1b
-    canonicalized_ast: d4062e73e7e24af37d9e4d1770d18e008d47f5df0dbc2de56a1089496e53ea1b
-    type_inferenced_ast: 0b9394287626c1cbe2240d34740fc8cd3202690de88d4dae3b1062ed519415e9
+outputs: []
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..3f519cf1b5 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
@@ -1,5 +1,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     |               ^"
+outputs: []
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..3f519cf1b5 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
@@ -1,5 +1,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     |               ^"
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/u64/sub.leo.out b/tests/expectations/compiler/compiler/integers/u64/sub.leo.out
index 2d4c78d409..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/u64/sub.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/sub.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 384
-      num_constraints: 385
-      at: 03f552addf49f5f1c8402d8af8dd733983efa7fd3436d677d89d74a1c6548962
-      bt: 8cbfb6559664a4d73354d718f19247484a98da79ddf83350c1a070cb14fda399
-      ct: 4906d35acd2d4c5fda24a10932dbccfb9c814de0b6160b29fa57540935c864ee
-    output:
-      - input_file: u64_f.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 9776d9311c67fd4c0a402d7b62623d78090a7c548e25841d2629d503bfe185ff
-    imports_resolved_ast: 9776d9311c67fd4c0a402d7b62623d78090a7c548e25841d2629d503bfe185ff
-    canonicalized_ast: 9776d9311c67fd4c0a402d7b62623d78090a7c548e25841d2629d503bfe185ff
-    type_inferenced_ast: 0ca6841975de33f74979b293de56ac993cdaa92fedfe1932bec2ffaf847d43fc
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/u64/ternary.leo.out b/tests/expectations/compiler/compiler/integers/u64/ternary.leo.out
index 41f8fede4f..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/u64/ternary.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/ternary.leo.out
@@ -1,28 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 448
-      num_constraints: 512
-      at: e36c9bfd01fbf30c1f31d53e2b19d1a83989e86701ba58838688174b9ad804d7
-      bt: edadcd06780bd97cb60d245565ce94697ee12b4d71ce9148f1546f1c4390b668
-      ct: f1bb709127145aae7603feda04afbc3e401fdf290c1d549be8d2d4b21ece9b58
-    output:
-      - input_file: u64_t.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-      - input_file: u64_f.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 3295b9a5f343261562befdfbf3a7ee33326d6316a1101c00c909cc79747f5bb4
-    imports_resolved_ast: 3295b9a5f343261562befdfbf3a7ee33326d6316a1101c00c909cc79747f5bb4
-    canonicalized_ast: 3295b9a5f343261562befdfbf3a7ee33326d6316a1101c00c909cc79747f5bb4
-    type_inferenced_ast: a17c197c6672681826a04859b8fbe7e007401aa62fa8feed14ebefc81f958793
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/u8/add.leo.out b/tests/expectations/compiler/compiler/integers/u8/add.leo.out
index 6ca74c3a29..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/u8/add.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/add.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 48
-      num_constraints: 49
-      at: 69fb3c4168c95acd03a37f194310a3c4650940b98570ed2354b4cf40a46c3cdc
-      bt: 0864b812eb8b0fd3cb3173bde347790cd9975d1117accb115141afe0444cea3c
-      ct: 463f6e3dc8e5ed795eb81d0b200c7f8d7ee4294ef49dc7469646067364331ccf
-    output:
-      - input_file: u8.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 9dea438cfe465dadf7fdeed3bbddd7e382f583f3f6ba99e9402fede4ba47a442
-    imports_resolved_ast: 9dea438cfe465dadf7fdeed3bbddd7e382f583f3f6ba99e9402fede4ba47a442
-    canonicalized_ast: 9dea438cfe465dadf7fdeed3bbddd7e382f583f3f6ba99e9402fede4ba47a442
-    type_inferenced_ast: 6a607b10a9897d5b69b303c7f1640af33ddaae750077e18a29e0c6c24dfb581d
+outputs: []
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 e40fc7da91..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/u8/console_assert.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/console_assert.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 46
-      num_constraints: 46
-      at: 829f4510ef3fb07e4ffecffe519507a8c6790309f86f349e2b8c5c42cc09e1c9
-      bt: 10f68596bcedd566b8eecf0bd255093865e9652e35d141d868fcba35ed67b24a
-      ct: 547830d9a13714ce4f3490f83aeafb5faa68aac46614867b7c19beb99eb908ff
-    output:
-      - input_file: u8.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 836bd0b470cd210052613fd9b13c5e420cc52b5da5f05a1dbbbdabbda9e35d5e
-    imports_resolved_ast: 836bd0b470cd210052613fd9b13c5e420cc52b5da5f05a1dbbbdabbda9e35d5e
-    canonicalized_ast: 836bd0b470cd210052613fd9b13c5e420cc52b5da5f05a1dbbbdabbda9e35d5e
-    type_inferenced_ast: 65e7b6fd34672f4f4d0f09df9e2d1d3a3d6c2c632128eb8f8a2c6f0c95d28a3b
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/u8/div.leo.out b/tests/expectations/compiler/compiler/integers/u8/div.leo.out
index 07d963bfdf..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/u8/div.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/div.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1068
-      num_constraints: 1355
-      at: 8ed58147507a99812dafb5a57a6c403d92d4454ea232cc7ee8b7f387a1435aa4
-      bt: 9e0ee614664ff1c133eff0a1bdb47f8521967aacb928ff34195d0639aec895d6
-      ct: 0b81ff43876b3dbc83461a76cfd1c6ff5513f2a5597441d526a472bd74b66ad1
-    output:
-      - input_file: u8.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 5e159a778450deb8e7a193f93700d4f70f356b414c4acf927d31117d6f4c6246
-    imports_resolved_ast: 5e159a778450deb8e7a193f93700d4f70f356b414c4acf927d31117d6f4c6246
-    canonicalized_ast: 5e159a778450deb8e7a193f93700d4f70f356b414c4acf927d31117d6f4c6246
-    type_inferenced_ast: 1b9a06f4b0a525f5e8a678fed6eedfd9227fa5d416c578711a4b61b37ebefbc5
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/u8/eq.leo.out b/tests/expectations/compiler/compiler/integers/u8/eq.leo.out
index 60854938a0..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/u8/eq.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/eq.leo.out
@@ -1,28 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 33
-      num_constraints: 33
-      at: 424965aff58c62dd2bf38daa6426a3edcc19aa86bff3842fe4e73f743d37e1cb
-      bt: 03d1b6a8fdf9f73f595cf97261f1bae81000c89364c7af58f4f7f04aba7bac30
-      ct: 2aae7d6631260dcaafbfe9709ade84e75f5172a9baad48e108e7264d5fc17cf6
-    output:
-      - input_file: u8_e.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-      - input_file: u8_n.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: e3e4dc868de4fdf770bb339ab8e7dfb54e4d0786c58f892d1bca34a28403ed1f
-    imports_resolved_ast: e3e4dc868de4fdf770bb339ab8e7dfb54e4d0786c58f892d1bca34a28403ed1f
-    canonicalized_ast: e3e4dc868de4fdf770bb339ab8e7dfb54e4d0786c58f892d1bca34a28403ed1f
-    type_inferenced_ast: 3e57ddf8d981040924b7eb460f3627fe35eee8dfe7a54c7cbf4a48f609e408cb
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/u8/ge.leo.out b/tests/expectations/compiler/compiler/integers/u8/ge.leo.out
index b65b35b985..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/u8/ge.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/ge.leo.out
@@ -1,34 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 57
-      num_constraints: 57
-      at: bc8380502907fbf4dc375e6ffc6ff09063dfb74d4bf1deb5c0a822f892e73acb
-      bt: 6af90ba76909462a3da873fbb2276b4020df6b3318671bd44aef4572df6326fc
-      ct: 5a4c4f077603c1f7c4b31cf17fee281ab3cb7d2a9571be40a2f3a88577759477
-    output:
-      - input_file: u8_g.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-      - input_file: u8_e.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-      - input_file: u8_f.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 6695ac31b2462e549a79a622e8cb11eae73c20503e727b9f50fbab4c572c785d
-    imports_resolved_ast: 6695ac31b2462e549a79a622e8cb11eae73c20503e727b9f50fbab4c572c785d
-    canonicalized_ast: 6695ac31b2462e549a79a622e8cb11eae73c20503e727b9f50fbab4c572c785d
-    type_inferenced_ast: 5f6c660c11b7fc64e7947923a77f30cddb93ab223f59cb322a29876b04f7c9a8
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/u8/gt.leo.out b/tests/expectations/compiler/compiler/integers/u8/gt.leo.out
index fac5211983..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/u8/gt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/gt.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 57
-      num_constraints: 57
-      at: 38f7f88206d5c28524fd286b4d4eff928bc29bf167f9ccdb1459377fcdee677f
-      bt: 0edd7a2aa1dabdeb3cd270d78086cb74dfc5f4c957e6f2ce7546daed614a3579
-      ct: 5a4c4f077603c1f7c4b31cf17fee281ab3cb7d2a9571be40a2f3a88577759477
-    output:
-      - input_file: u8_g.in
-        output:
-          registers: {}
-      - input_file: u8_f.in
-        output:
-          registers: {}
-    initial_ast: 4a99a7af4e976c85ed87114d8a267a1d047b17f60fda4030e793fd5f66cf2c53
-    imports_resolved_ast: 4a99a7af4e976c85ed87114d8a267a1d047b17f60fda4030e793fd5f66cf2c53
-    canonicalized_ast: 5df377575d61a53ae6c1cd898ef1ab739660a9716eaeebee9c8a767c8d05ec60
-    type_inferenced_ast: e69731b76d3e389f51f854eac84befd1d7e1c61180ca46a150f07b2aa768f2d8
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/u8/input.leo.out b/tests/expectations/compiler/compiler/integers/u8/input.leo.out
index 0747f5d164..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/u8/input.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/input.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 31
-      num_constraints: 31
-      at: 8111e478f64beb722ec96fbd80076cb73b735813b20e8f2ed6e3c21febceaae7
-      bt: c2cfac5aa6e125cb6cde720b0598fef7933c4aa62926fe99405bf1c2829dd4ce
-      ct: a3fa97a403ebea95a47d7ded7c01cee45af74afbfa876c203e4e96f6054b8815
-    output:
-      - input_file: u8_g.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 35b67dd962ab49f7cda88997fbd0028a30d591229b5a7e9ad8d062b1b31d4565
-    imports_resolved_ast: 35b67dd962ab49f7cda88997fbd0028a30d591229b5a7e9ad8d062b1b31d4565
-    canonicalized_ast: 35b67dd962ab49f7cda88997fbd0028a30d591229b5a7e9ad8d062b1b31d4565
-    type_inferenced_ast: e8966ad1d14fd288b6dbda6b1de78f01048e73d231122e997f11c08b5b6c404d
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/u8/le.leo.out b/tests/expectations/compiler/compiler/integers/u8/le.leo.out
index e93f6fb6dd..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/u8/le.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/le.leo.out
@@ -1,34 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 57
-      num_constraints: 57
-      at: 4f2c1500ec12fc38d3a05a67cab6066e0bedda66bdd2a9b81b58189a4e2efb44
-      bt: 7166372193964d2e6e881f4178c1a8fd80afe2c60584af277e73e606f4ac4efd
-      ct: 5a4c4f077603c1f7c4b31cf17fee281ab3cb7d2a9571be40a2f3a88577759477
-    output:
-      - input_file: u8_f.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "false"
-      - input_file: u8_e.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-      - input_file: u8_l.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "false"
-    initial_ast: 72590f8b2a5ac7c0a4e663ce39009c0032ee66011f7fa1d5d61b34bd313e0e86
-    imports_resolved_ast: 72590f8b2a5ac7c0a4e663ce39009c0032ee66011f7fa1d5d61b34bd313e0e86
-    canonicalized_ast: 72590f8b2a5ac7c0a4e663ce39009c0032ee66011f7fa1d5d61b34bd313e0e86
-    type_inferenced_ast: eda186febeb1927b5f0427f36ecaf1f6fc6c5201d8d0ddbf7399a31b0a181c0b
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/u8/lt.leo.out b/tests/expectations/compiler/compiler/integers/u8/lt.leo.out
index 82ef830edf..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/u8/lt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/lt.leo.out
@@ -1,28 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 57
-      num_constraints: 57
-      at: 6a0450b269677ab3f038f68befed6b3dd7e4471cba20c9b3cbb1987d11623de2
-      bt: 1c92f5790ff308be2d3a812b0b14b7445192b9b9fb271cabd8a18dc925deb34d
-      ct: 5a4c4f077603c1f7c4b31cf17fee281ab3cb7d2a9571be40a2f3a88577759477
-    output:
-      - input_file: u8_f.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "false"
-      - input_file: u8_g.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "false"
-    initial_ast: 57691c69dc440d8028e25c3e4487c52a89c5b23ff2976faa8dac057b29170945
-    imports_resolved_ast: 57691c69dc440d8028e25c3e4487c52a89c5b23ff2976faa8dac057b29170945
-    canonicalized_ast: 57691c69dc440d8028e25c3e4487c52a89c5b23ff2976faa8dac057b29170945
-    type_inferenced_ast: eced084868377db05c2cde7dc441f0d657610891ceec6df4445debef18ee1804
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/u8/max.leo.out b/tests/expectations/compiler/compiler/integers/u8/max.leo.out
index 5265fe397a..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/u8/max.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/max.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: "../input/dummy.in"
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 1e5b1da2899876d937c9ecdf22665be02e309b6ec9fd6fa7473ffebb48a9e19b
-    imports_resolved_ast: 1e5b1da2899876d937c9ecdf22665be02e309b6ec9fd6fa7473ffebb48a9e19b
-    canonicalized_ast: 1e5b1da2899876d937c9ecdf22665be02e309b6ec9fd6fa7473ffebb48a9e19b
-    type_inferenced_ast: 042f053591ca529430101b4412ca9de1d0ea595d332b5ee73ea9aae0774fff7e
+outputs: []
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 2c635d7168..3f519cf1b5 100644
--- a/tests/expectations/compiler/compiler/integers/u8/max_fail.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/max_fail.leo.out
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - "Error [EASG0373030]: failed to parse int value '256'\n    --> compiler-test:4:19\n     |\n   4 |     const a: u8 = 256;\n     |                   ^^^"
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/u8/min.leo.out b/tests/expectations/compiler/compiler/integers/u8/min.leo.out
index 850285bf40..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/u8/min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/min.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: "../input/dummy.in"
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 0ad4671e3a0aaf948a2ccafb0030bd29f77ebe358d8bc309e24a76691adbc15d
-    imports_resolved_ast: 0ad4671e3a0aaf948a2ccafb0030bd29f77ebe358d8bc309e24a76691adbc15d
-    canonicalized_ast: 0ad4671e3a0aaf948a2ccafb0030bd29f77ebe358d8bc309e24a76691adbc15d
-    type_inferenced_ast: dcf3b29842bb4b58aec3edc927f4df1373b82497624fd480af3b2c995f973a1e
+outputs: []
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 4f759d7ea2..3f519cf1b5 100644
--- a/tests/expectations/compiler/compiler/integers/u8/min_fail.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/min_fail.leo.out
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - "Error [EASG0373030]: failed to parse int value '-1'\n    --> compiler-test:4:19\n     |\n   4 |     const a: u8 = -1;\n     |                   ^^"
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/u8/mul.leo.out b/tests/expectations/compiler/compiler/integers/u8/mul.leo.out
index 96ad005f3f..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/u8/mul.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/mul.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 258
-      num_constraints: 331
-      at: 9db6e7fa73b98bf7623bed5997bf61d51f348aaf43d9249b629a866a9085f08b
-      bt: a9bb86254052a3c5b275213180e89108aea721369a9d32cbd837a1cb974d76b3
-      ct: 4dc6b4ca7c3bcedbbe8abbaee96615345e08b304dd65b217319ece1224721b57
-    output:
-      - input_file: mul.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "false"
-    initial_ast: 8db1872b44d014eca2e66c5de1be6ae902623a1548ca53b6146de18dced3d409
-    imports_resolved_ast: 8db1872b44d014eca2e66c5de1be6ae902623a1548ca53b6146de18dced3d409
-    canonicalized_ast: 8db1872b44d014eca2e66c5de1be6ae902623a1548ca53b6146de18dced3d409
-    type_inferenced_ast: c838cd4e5527762edc4fc43355c05b68085c39fd5a338f68caafc0160c68a574
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/u8/ne.leo.out b/tests/expectations/compiler/compiler/integers/u8/ne.leo.out
index cda424ec4f..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/u8/ne.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/ne.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 33
-      num_constraints: 33
-      at: 5e88cd940df2c48a53e64a9b8589045ef766371daa5cc885df982902d9fcc754
-      bt: 10b52342f8c44eb9b3335b4df9ca4136de3ad35d5b580b2ab32ae5e10bcdf3b4
-      ct: 2aae7d6631260dcaafbfe9709ade84e75f5172a9baad48e108e7264d5fc17cf6
-    output:
-      - input_file: ne.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: f74da59a77c90926a1d926b1c35fd5a18e44de0f8cb6aba39fa176d431f4f965
-    imports_resolved_ast: f74da59a77c90926a1d926b1c35fd5a18e44de0f8cb6aba39fa176d431f4f965
-    canonicalized_ast: f74da59a77c90926a1d926b1c35fd5a18e44de0f8cb6aba39fa176d431f4f965
-    type_inferenced_ast: 474128f7bfe69e7ea64a76c57e729dc85520425fc36ef88c123aebdc670176a3
+outputs: []
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..3f519cf1b5 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
@@ -1,5 +1,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     |               ^"
+outputs: []
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..3f519cf1b5 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
@@ -1,5 +1,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     |               ^"
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/u8/sub.leo.out b/tests/expectations/compiler/compiler/integers/u8/sub.leo.out
index 65468f7374..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/u8/sub.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/sub.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 48
-      num_constraints: 49
-      at: 69fb3c4168c95acd03a37f194310a3c4650940b98570ed2354b4cf40a46c3cdc
-      bt: 0864b812eb8b0fd3cb3173bde347790cd9975d1117accb115141afe0444cea3c
-      ct: a09cd762cf1db927d99cef196452f092d030aa05851fe466816535ac34c6188f
-    output:
-      - input_file: u8_f.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 4ad8780e5c0a3128317266059864223beac927b6d00745353114baaf5261fbca
-    imports_resolved_ast: 4ad8780e5c0a3128317266059864223beac927b6d00745353114baaf5261fbca
-    canonicalized_ast: 4ad8780e5c0a3128317266059864223beac927b6d00745353114baaf5261fbca
-    type_inferenced_ast: c26b34ca605ac96edbd443f0f4015493d509054c3e7b749fc9ee31ef1800d6c8
+outputs: []
diff --git a/tests/expectations/compiler/compiler/integers/u8/ternary.leo.out b/tests/expectations/compiler/compiler/integers/u8/ternary.leo.out
index 99d682ebbc..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/integers/u8/ternary.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/ternary.leo.out
@@ -1,28 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 56
-      num_constraints: 64
-      at: a15ec92a38acf1a47952df144e5299f49dbde96fbe1a3f3b2af4bbca483d65aa
-      bt: 90a2489533355ee3e27d5cf485612441ec10e21923eb78e6be21633ce11fa8f1
-      ct: 4c2d67fc6e1c4ad44f323c1b958ed94313153573aa72a3c0f0d25b17b54e63bc
-    output:
-      - input_file: u8_t.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-      - input_file: u8_f.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 74e87cd14415c4e1c4d2d89bbe56ee8ca5fc988df4cc894381b4a087fa409095
-    imports_resolved_ast: 74e87cd14415c4e1c4d2d89bbe56ee8ca5fc988df4cc894381b4a087fa409095
-    canonicalized_ast: 74e87cd14415c4e1c4d2d89bbe56ee8ca5fc988df4cc894381b4a087fa409095
-    type_inferenced_ast: f5ae3a29090e07ccd418d3ab78fd24161fe26cc6a365ff71861f4d6ad5e8a0b4
+outputs: []
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 01784c8694..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/mutability/array_dyn_mut.leo.out
+++ b/tests/expectations/compiler/compiler/mutability/array_dyn_mut.leo.out
@@ -1,28 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1277
-      num_constraints: 1604
-      at: c5d2d5bbb85d0f7ba48170fdb652aff057db6d1babf378d8a548af874e0734ff
-      bt: 726f3c39d11da5bc8487b8b7228a55cb7819a47a9b674d41f9c756c6927fb55a
-      ct: 7c4917152b59cb9caa30bad7d5119a3e36c40f7a783fdb8ff602dd5447573cc7
-    output:
-      - input_file: input/index1.in
-        output:
-          registers:
-            r0:
-              type: "[u32; 3]"
-              value: "\"303\""
-      - input_file: input/index2.in
-        output:
-          registers:
-            r0:
-              type: "[u32; 3]"
-              value: "\"150\""
-    initial_ast: b56c67d410c98a75c5f742d382e223355d214484d198ccaefe65296421c6854b
-    imports_resolved_ast: b56c67d410c98a75c5f742d382e223355d214484d198ccaefe65296421c6854b
-    canonicalized_ast: 7217fa688744caee18ab779ab9c43deac2d70a8d0b989873fe720d3f46a5e366
-    type_inferenced_ast: 6d673f91cd5c98cd1ae69777a317cf2b2ee50fd291996c8ae70d036705e76062
+outputs: []
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 79439395c7..ef090731fb 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
@@ -1,28 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 924
-      num_constraints: 1310
-      at: f4c2d999e3cfce5433bbde762d8c826c8df8764b9223dd5d7147cd09810f25b7
-      bt: fa02e90dd0bde30bc5feab46c3ea4fae0493dc6808d56bc6a1d937eb17297981
-      ct: 8f6f484310918a186286820e4efd1e7494774c314e9e5c6f78bb60bdeae948f4
-    output:
-      - input_file: input/index1_tuple.in
-        output:
-          registers:
-            r0:
-              type: "[(u32, u32); 3]"
-              value: "\"(1, 1)(0, 1)(3, 3)\""
-      - input_file: input/index2_tuple.in
-        output:
-          registers:
-            r0:
-              type: "[(u32, u32); 3]"
-              value: "\"(1, 1)(2, 2)(0, 1)\""
-    initial_ast: 7ca87cb79f11b6342bc6db56d6b051c68bcedb798ba9eb88992dcfe0873ce139
-    imports_resolved_ast: 7ca87cb79f11b6342bc6db56d6b051c68bcedb798ba9eb88992dcfe0873ce139
-    canonicalized_ast: 7ca87cb79f11b6342bc6db56d6b051c68bcedb798ba9eb88992dcfe0873ce139
-    type_inferenced_ast: 26f6c295a4ab2515eadf95855c66e3fa29d158a43765baa87895fea42bb379d1
+outputs: []
diff --git a/tests/expectations/compiler/compiler/mutability/array_fail.leo.out b/tests/expectations/compiler/compiler/mutability/array_fail.leo.out
index fb91d0943d..3f519cf1b5 100644
--- a/tests/expectations/compiler/compiler/mutability/array_fail.leo.out
+++ b/tests/expectations/compiler/compiler/mutability/array_fail.leo.out
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - "Error [EASG0373032]: illegal assignment to immutable variable 'a'\n    --> compiler-test:5:5\n     |\n   5 |     a[0] = 0;\n     |     ^^^^^^^^"
+outputs: []
diff --git a/tests/expectations/compiler/compiler/mutability/array_mut.leo.out b/tests/expectations/compiler/compiler/mutability/array_mut.leo.out
index 4f64a7778a..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/mutability/array_mut.leo.out
+++ b/tests/expectations/compiler/compiler/mutability/array_mut.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: input/dummy.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 3ba284ff6893de7ffb6f90092f7c39cefd51c61022e827842fc7d4be7ed72dcd
-    imports_resolved_ast: 3ba284ff6893de7ffb6f90092f7c39cefd51c61022e827842fc7d4be7ed72dcd
-    canonicalized_ast: 3ba284ff6893de7ffb6f90092f7c39cefd51c61022e827842fc7d4be7ed72dcd
-    type_inferenced_ast: 75acbd9ccfb46be0f54046274dc1c200ad7b244bc8e98789d5d7e80fd2d15518
+outputs: []
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 b876f414f1..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/mutability/array_splice_mut.leo.out
+++ b/tests/expectations/compiler/compiler/mutability/array_splice_mut.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: input/dummy.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 7d636b2e99784c858ee66e66497caaf184f7a9fa9340d0dd1d6618e6e4b6592e
-    imports_resolved_ast: 7d636b2e99784c858ee66e66497caaf184f7a9fa9340d0dd1d6618e6e4b6592e
-    canonicalized_ast: 7d636b2e99784c858ee66e66497caaf184f7a9fa9340d0dd1d6618e6e4b6592e
-    type_inferenced_ast: 796ceba3c23358c37039eb3484c761a7a5d605ad09877ba006090928be814458
+outputs: []
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 82e3d7f297..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/mutability/array_tuple_mut.leo.out
+++ b/tests/expectations/compiler/compiler/mutability/array_tuple_mut.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: input/dummy.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 2a6e7d5838f323e53cb753dc3bae3a6e379ef0deeb0172c1c7df231cd700a5b6
-    imports_resolved_ast: 2a6e7d5838f323e53cb753dc3bae3a6e379ef0deeb0172c1c7df231cd700a5b6
-    canonicalized_ast: 2a6e7d5838f323e53cb753dc3bae3a6e379ef0deeb0172c1c7df231cd700a5b6
-    type_inferenced_ast: d5eafbcdb2a34278a296ff9b217aa63f8baab298450533f42ace506d0df031d6
+outputs: []
diff --git a/tests/expectations/compiler/compiler/mutability/circuit_fail.leo.out b/tests/expectations/compiler/compiler/mutability/circuit_fail.leo.out
index 7da40fbd62..3f519cf1b5 100644
--- a/tests/expectations/compiler/compiler/mutability/circuit_fail.leo.out
+++ b/tests/expectations/compiler/compiler/mutability/circuit_fail.leo.out
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - "Error [EASG0373032]: illegal assignment to immutable variable 'a'\n    --> compiler-test:10:5\n     |\n  10 |     a.x = 0;\n     |     ^^^^^^^"
+outputs: []
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 60c212a3e6..3f519cf1b5 100644
--- a/tests/expectations/compiler/compiler/mutability/circuit_function_const.leo.out
+++ b/tests/expectations/compiler/compiler/mutability/circuit_function_const.leo.out
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - "Error [EASG0373009]: cannot call mutable member function 'foo' of circuit 'Foo' from immutable context\n    --> compiler-test:15:5\n     |\n  15 |     a.foo();\n     |     ^^^^^"
+outputs: []
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 42baf76272..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/mutability/circuit_function_mut.leo.out
+++ b/tests/expectations/compiler/compiler/mutability/circuit_function_mut.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: input/dummy.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 71448f3f5387cd67a8d8c0b974fa93cf81cdfb72ae0d8f9499c9c5e478a0d15b
-    imports_resolved_ast: 71448f3f5387cd67a8d8c0b974fa93cf81cdfb72ae0d8f9499c9c5e478a0d15b
-    canonicalized_ast: 16d4030e454d8c83d2073afaaa7e8fa1eb40d36026909144db29d311ab005f46
-    type_inferenced_ast: a446d016451281bab9b21f8a86250b4a3fd8a9b6f917e855e5dae816362c8925
+outputs: []
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 1c73aff5da..3f519cf1b5 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
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - "Error [EASG0373005]: 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     |                   ^"
+outputs: []
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 643f7e5a5d..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/mutability/circuit_variable_mut.leo.out
+++ b/tests/expectations/compiler/compiler/mutability/circuit_variable_mut.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: input/dummy.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 83da7a1bf2887678937835ac77b33a0e21dd3b04d5739146f16a559b8dc3c6ab
-    imports_resolved_ast: 83da7a1bf2887678937835ac77b33a0e21dd3b04d5739146f16a559b8dc3c6ab
-    canonicalized_ast: 83da7a1bf2887678937835ac77b33a0e21dd3b04d5739146f16a559b8dc3c6ab
-    type_inferenced_ast: bd7710479d2a5bb2da060358fc13379dc1d7e334ead42519315bce0cd0db30c0
+outputs: []
diff --git a/tests/expectations/compiler/compiler/mutability/cond_mut.leo.out b/tests/expectations/compiler/compiler/mutability/cond_mut.leo.out
index f3092ce949..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/mutability/cond_mut.leo.out
+++ b/tests/expectations/compiler/compiler/mutability/cond_mut.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: input/dummy.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 384eb00d7e551705537f37e10e28eb35f88175f77351c6add02de4b896630ca6
-    imports_resolved_ast: 384eb00d7e551705537f37e10e28eb35f88175f77351c6add02de4b896630ca6
-    canonicalized_ast: 40b13bb543186c6f032ca6fca8144acbfa5cfcc4e691ed1f79c5120be2db8809
-    type_inferenced_ast: 49d93167578fd99537e1895963545e6e95f2c55162f42f2bb9ee8b4d014152ee
+outputs: []
diff --git a/tests/expectations/compiler/compiler/mutability/const.leo.out b/tests/expectations/compiler/compiler/mutability/const.leo.out
index 4a957ebc26..3f519cf1b5 100644
--- a/tests/expectations/compiler/compiler/mutability/const.leo.out
+++ b/tests/expectations/compiler/compiler/mutability/const.leo.out
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - "Error [EASG0373032]: illegal assignment to immutable variable 'a'\n    --> compiler-test:6:5\n     |\n   6 |     a = 0;\n     |     ^^^^^"
+outputs: []
diff --git a/tests/expectations/compiler/compiler/mutability/function_input.leo.out b/tests/expectations/compiler/compiler/mutability/function_input.leo.out
index 3c818f62f7..3f519cf1b5 100644
--- a/tests/expectations/compiler/compiler/mutability/function_input.leo.out
+++ b/tests/expectations/compiler/compiler/mutability/function_input.leo.out
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - "Error [EASG0373027]: failed to resolve variable reference 'a'\n    --> compiler-test:5:5\n     |\n   5 |     a = false;\n     |     ^"
+outputs: []
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 6ffeaf479f..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/mutability/function_input_mut.leo.out
+++ b/tests/expectations/compiler/compiler/mutability/function_input_mut.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: input/dummy.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 77803f27d711c6b4c7f51dd846bb82dee64dadc3627e9cedcc0c125a734c5b7c
-    imports_resolved_ast: 77803f27d711c6b4c7f51dd846bb82dee64dadc3627e9cedcc0c125a734c5b7c
-    canonicalized_ast: 77803f27d711c6b4c7f51dd846bb82dee64dadc3627e9cedcc0c125a734c5b7c
-    type_inferenced_ast: 9cc5c0db46856226084812857f8982677ed5688259a4deb0d189c9b92eba1756
+outputs: []
diff --git a/tests/expectations/compiler/compiler/mutability/let_fail.leo.out b/tests/expectations/compiler/compiler/mutability/let_fail.leo.out
index 4a957ebc26..3f519cf1b5 100644
--- a/tests/expectations/compiler/compiler/mutability/let_fail.leo.out
+++ b/tests/expectations/compiler/compiler/mutability/let_fail.leo.out
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - "Error [EASG0373032]: illegal assignment to immutable variable 'a'\n    --> compiler-test:6:5\n     |\n   6 |     a = 0;\n     |     ^^^^^"
+outputs: []
diff --git a/tests/expectations/compiler/compiler/mutability/let_mut.leo.out b/tests/expectations/compiler/compiler/mutability/let_mut.leo.out
index 303c236de1..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/mutability/let_mut.leo.out
+++ b/tests/expectations/compiler/compiler/mutability/let_mut.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: input/dummy.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 561fab3e5b172eb73713783c43b079b77ab5ce1ee799526bd9c3dee51c6e15d8
-    imports_resolved_ast: 561fab3e5b172eb73713783c43b079b77ab5ce1ee799526bd9c3dee51c6e15d8
-    canonicalized_ast: 561fab3e5b172eb73713783c43b079b77ab5ce1ee799526bd9c3dee51c6e15d8
-    type_inferenced_ast: 3715f38b2b0a49f93133616eb252d1067ef1abec8d0895cf9c7de588fcf9e6d8
+outputs: []
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 a0711af408..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/mutability/let_mut_nested.leo.out
+++ b/tests/expectations/compiler/compiler/mutability/let_mut_nested.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: input/dummy.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 4de7e4f24434d5a611566054ce5e1cff1edf0e9a76fa77ab5b121bd412eceb91
-    imports_resolved_ast: 4de7e4f24434d5a611566054ce5e1cff1edf0e9a76fa77ab5b121bd412eceb91
-    canonicalized_ast: 4de7e4f24434d5a611566054ce5e1cff1edf0e9a76fa77ab5b121bd412eceb91
-    type_inferenced_ast: 65d3153d31e7f29f65b4896eddab3fc8bb78ff919921e77a05d51b50180320d6
+outputs: []
diff --git a/tests/expectations/compiler/compiler/mutability/swap.leo.out b/tests/expectations/compiler/compiler/mutability/swap.leo.out
index 6a67168d5f..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/mutability/swap.leo.out
+++ b/tests/expectations/compiler/compiler/mutability/swap.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 127
-      num_constraints: 127
-      at: e89e71bb78cba20472e8ebfaeb36e6a9564861cf2b14846eb695a5937149dbfb
-      bt: 16d04f802c27d778734e07a0126cae3f096bc4e2e0b4362fe5687a338f1dece5
-      ct: acfbc6fdb7a3696d43be3cd62939a9731cb8b11c215564c52b3c67343cbda41f
-    output:
-      - input_file: input/dummy.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "false"
-    initial_ast: abe0177ae796b70cfdd8c6d30fcd5a9d713e3d16fccfdf63853ea6f0a8a9df54
-    imports_resolved_ast: abe0177ae796b70cfdd8c6d30fcd5a9d713e3d16fccfdf63853ea6f0a8a9df54
-    canonicalized_ast: abe0177ae796b70cfdd8c6d30fcd5a9d713e3d16fccfdf63853ea6f0a8a9df54
-    type_inferenced_ast: 43109986d2643a72bb5300c298952755f692cdd10e7071fb40b2b006412606d9
+outputs: []
diff --git a/tests/expectations/compiler/compiler/statements/all_loops.leo.out b/tests/expectations/compiler/compiler/statements/all_loops.leo.out
index 9876a424fc..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/statements/all_loops.leo.out
+++ b/tests/expectations/compiler/compiler/statements/all_loops.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: inputs/dummy.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: d94b77f7891ca44d554f59cc07370505a1dec9cc1a5133674faf8797bddcfb4b
-    imports_resolved_ast: d94b77f7891ca44d554f59cc07370505a1dec9cc1a5133674faf8797bddcfb4b
-    canonicalized_ast: 10fb59963f44b2261fc0dd0aca8a57bf3c6c6252d9da82717fd13fbb57760ad3
-    type_inferenced_ast: 833d4e649f0e3cebfddcaccd9abde073ea29a9262a93fa233e0a5dcada33b46a
+outputs: []
diff --git a/tests/expectations/compiler/compiler/statements/assign_ternary.leo.out b/tests/expectations/compiler/compiler/statements/assign_ternary.leo.out
index fa0d9f6a95..3f519cf1b5 100644
--- a/tests/expectations/compiler/compiler/statements/assign_ternary.leo.out
+++ b/tests/expectations/compiler/compiler/statements/assign_ternary.leo.out
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - "Error [EASG0373025]: unexpected type, expected: 'u32', received: 'bool'\n    --> compiler-test:4:23\n     |\n   4 |     let x = true ? x: true;\n     |                       ^^^^"
+outputs: []
diff --git a/tests/expectations/compiler/compiler/statements/block.leo.out b/tests/expectations/compiler/compiler/statements/block.leo.out
index e6d2d81ac5..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/statements/block.leo.out
+++ b/tests/expectations/compiler/compiler/statements/block.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 96
-      num_constraints: 97
-      at: 82703e2aa614d0f54a1c321e06edd2e79a9574a91d0984d6f5e98926710962f2
-      bt: 54bbc6eb42c38f8bbb12360c98b483e782f47c2875d6b88b6ae2b7cd70220cf8
-      ct: 52022ccbdc5119e02384f852f21e0ed0b6d729cb1cd18aea031f73037e467755
-    output:
-      - input_file: inputs/u32_3.in
-        output:
-          registers:
-            a:
-              type: bool
-              value: "true"
-    initial_ast: e83bec8b595276da8d5fee23a1aae15ca08ce2f369c3a47cfb5732b90b020e1f
-    imports_resolved_ast: e83bec8b595276da8d5fee23a1aae15ca08ce2f369c3a47cfb5732b90b020e1f
-    canonicalized_ast: d84f3bd449f9a10b2bf8de7e284c1764dee5650840a82e38518906448f7f0457
-    type_inferenced_ast: 10d48e474c04c96d7754f41070ec3a406a2a3ef3ee6938185953ff52eaba5c87
+outputs: []
diff --git a/tests/expectations/compiler/compiler/statements/chain.leo.out b/tests/expectations/compiler/compiler/statements/chain.leo.out
index 602b31525c..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/statements/chain.leo.out
+++ b/tests/expectations/compiler/compiler/statements/chain.leo.out
@@ -1,34 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 319
-      num_constraints: 415
-      at: 910d51dc69b7ed7e2dfe1a786fad9b226b2ff30c7678f397cb8d8850fd76442e
-      bt: 3ae01a0af5534bca6ad67bd2609a5370a4982c7f6d17fb8c285054c3d08f9c4f
-      ct: 67836f65a02c595fcbf6d6a6d223a15e138d99a542390693ac4f582d073869e6
-    output:
-      - input_file: inputs/u32_3.in
-        output:
-          registers:
-            a:
-              type: bool
-              value: "true"
-      - input_file: inputs/u32_5.in
-        output:
-          registers:
-            a:
-              type: bool
-              value: "false"
-      - input_file: inputs/u32_6.in
-        output:
-          registers:
-            a:
-              type: bool
-              value: "false"
-    initial_ast: 51f43c865b5082a79df9bba465629cc4d9cc9f3a472e35d0301ae1dc6ef37039
-    imports_resolved_ast: 51f43c865b5082a79df9bba465629cc4d9cc9f3a472e35d0301ae1dc6ef37039
-    canonicalized_ast: 51f43c865b5082a79df9bba465629cc4d9cc9f3a472e35d0301ae1dc6ef37039
-    type_inferenced_ast: 6198dfeacc891f4e22635060fa58a476fcae08cb6cfa74b6e8d80c07adc6c36d
+outputs: []
diff --git a/tests/expectations/compiler/compiler/statements/compound_assignment.leo.out b/tests/expectations/compiler/compiler/statements/compound_assignment.leo.out
index 200e0e0e5c..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/statements/compound_assignment.leo.out
+++ b/tests/expectations/compiler/compiler/statements/compound_assignment.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 9
-      num_constraints: 9
-      at: cfc27ce5fe57455170b7873e5ff2eb5f8f997fc5fc62faad746879e0b78608b0
-      bt: 6fde8d6341a34a59e776a14fd2071105f796edd8743b718e9d4d7eeab31f5eea
-      ct: 95d15e75300129c5b4dd7f324bec76f91976db7c7b6075f942e9ea82b243e0b3
-    output:
-      - input_file: inputs/dummy.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: 108be85422345d78a93d2e36e633c3a15a1465e7c868f65e2925a47e0b5f691a
-    imports_resolved_ast: 108be85422345d78a93d2e36e633c3a15a1465e7c868f65e2925a47e0b5f691a
-    canonicalized_ast: d986fa603a5031dbd5034507d05df038fe99f60f603f7ca4b2d2c8ac2b409e7a
-    type_inferenced_ast: c95a6049c552c5b018f423fc1999b433cf94429c6edc32e2b55d326b78e36812
+outputs: []
diff --git a/tests/expectations/compiler/compiler/statements/duplicate_variable.leo.out b/tests/expectations/compiler/compiler/statements/duplicate_variable.leo.out
index e975210ed2..3f519cf1b5 100644
--- a/tests/expectations/compiler/compiler/statements/duplicate_variable.leo.out
+++ b/tests/expectations/compiler/compiler/statements/duplicate_variable.leo.out
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - "Error [EASG0373016]: a variable named \"x\" already exists in this scope\n    --> compiler-test:5:3\n     |\n   5 |   let x = true;\n     |   ^^^^^^^^^^^^"
+outputs: []
diff --git a/tests/expectations/compiler/compiler/statements/for_loop.leo.out b/tests/expectations/compiler/compiler/statements/for_loop.leo.out
index 57be45f90b..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/statements/for_loop.leo.out
+++ b/tests/expectations/compiler/compiler/statements/for_loop.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 512
-      num_constraints: 675
-      at: 5d537a7963ae43ff2b7b0222c18a237015c858d7203554574a785cd56d4d24c5
-      bt: 192ca0dd8a20d69b443b952a7226e8c82936fedd2c9735d2b792883a01e46e3b
-      ct: 04609638ad65317edb75529646b34f10a846b39b3ddb783e4aeceddde17b79f9
-    output:
-      - input_file: inputs/u32_3.in
-        output:
-          registers:
-            a:
-              type: bool
-              value: "true"
-    initial_ast: a8e737bf2fcc5b5096dae768b52c04d56891a4eedd47640a0e1aea5fa4b5da1a
-    imports_resolved_ast: a8e737bf2fcc5b5096dae768b52c04d56891a4eedd47640a0e1aea5fa4b5da1a
-    canonicalized_ast: cb2eb0272a5a1730cebeaab7a63578ae0f366615af0687a83772fdcbab8b4a93
-    type_inferenced_ast: 4d4e9f8fa02ed1c33893ee0f05737a8fc22062039bf2c6a69c8a95c09ba3c6d4
+outputs: []
diff --git a/tests/expectations/compiler/compiler/statements/iteration_basic.leo.out b/tests/expectations/compiler/compiler/statements/iteration_basic.leo.out
index c5e803d5c2..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/statements/iteration_basic.leo.out
+++ b/tests/expectations/compiler/compiler/statements/iteration_basic.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 162
-      num_constraints: 165
-      at: 5b2ee97bca1c978a9cb40345a5358b6da05b06c94ef08ade726f32a8d0840c4e
-      bt: 9dc810c17c3ede695558cbade305db754bfc9de90c983ab114557f2cc9bb3631
-      ct: 16ed7b0c9d703be9a60d4b2e0da9a52403de8b03c35a545db7c05b698eddcdfd
-    output:
-      - input_file: inputs/u32_3.in
-        output:
-          registers:
-            a:
-              type: bool
-              value: "true"
-    initial_ast: 416faf733ca084378ca66e5900ab7ffdbb057312e358d6652d6260eff3670fc6
-    imports_resolved_ast: 416faf733ca084378ca66e5900ab7ffdbb057312e358d6652d6260eff3670fc6
-    canonicalized_ast: 2ec69f397b7c48bc222d812fe4afae7ea375048ceb798e17063f08ea9ccdd040
-    type_inferenced_ast: 8062f011312fc76f0f1d73a628292f38deb179974e1edd18af52ee7084279ab2
+outputs: []
diff --git a/tests/expectations/compiler/compiler/statements/iteration_variable.leo.out b/tests/expectations/compiler/compiler/statements/iteration_variable.leo.out
index 502d9d29f0..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/statements/iteration_variable.leo.out
+++ b/tests/expectations/compiler/compiler/statements/iteration_variable.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 129
-      num_constraints: 131
-      at: 3ce06ba8c0b8ed0af6941d5d0a487cfb836053b5f7098525dbc159dbbca3508a
-      bt: d0528d867b40b0642b9b93a6b7f6d64ceb8d7e97799848ccd6b7fecfb86e2889
-      ct: 638bf6e71b08cf88ff8fc38ff7594880102164a51a452dec39b42c10f6f36c35
-    output:
-      - input_file: inputs/u32_3.in
-        output:
-          registers:
-            a:
-              type: bool
-              value: "true"
-    initial_ast: 038e16c427982d50e1f29bfb1ef4b9b5809592d431a167809641d2816255fe70
-    imports_resolved_ast: 038e16c427982d50e1f29bfb1ef4b9b5809592d431a167809641d2816255fe70
-    canonicalized_ast: 1d600ee2250660418ea73d55518937eac92695b6441fc2656de4568c4e7bed8c
-    type_inferenced_ast: 4f070f1df9bc5c1c7a5b4932b3348504b0a0b07df862e6ca027ee272208a5f79
+outputs: []
diff --git a/tests/expectations/compiler/compiler/statements/multiple_returns.leo.out b/tests/expectations/compiler/compiler/statements/multiple_returns.leo.out
index aa199caf4a..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/statements/multiple_returns.leo.out
+++ b/tests/expectations/compiler/compiler/statements/multiple_returns.leo.out
@@ -1,28 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 63
-      num_constraints: 63
-      at: 37a483a8d794b0cd2f37b20c69eb00e2d9a3d950319dd18ead861dd505d84ce9
-      bt: 6c9fd7d4b3947c363bdb576b2c2c827c3ebfe4c3b56eda2abb8a37e436b69638
-      ct: c0d39de2b3b1c321288b265a4f0e72c13da3b07b0f5d61d14b66215440c56a42
-    output:
-      - input_file: inputs/u32_3.in
-        output:
-          registers:
-            a:
-              type: bool
-              value: "true"
-      - input_file: inputs/u32_5.in
-        output:
-          registers:
-            a:
-              type: bool
-              value: "false"
-    initial_ast: f842a0668ac2fa61ee1f4c693c5159b1395527ee355e8d1d54da9e1ed63ac3ca
-    imports_resolved_ast: f842a0668ac2fa61ee1f4c693c5159b1395527ee355e8d1d54da9e1ed63ac3ca
-    canonicalized_ast: f842a0668ac2fa61ee1f4c693c5159b1395527ee355e8d1d54da9e1ed63ac3ca
-    type_inferenced_ast: 5adf5966c1fdb8a72af941b5b706d7a24b732441b7f56fb3de1319035ade46ec
+outputs: []
diff --git a/tests/expectations/compiler/compiler/statements/mutate.leo.out b/tests/expectations/compiler/compiler/statements/mutate.leo.out
index 88e5c52e5d..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/statements/mutate.leo.out
+++ b/tests/expectations/compiler/compiler/statements/mutate.leo.out
@@ -1,28 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 253
-      num_constraints: 317
-      at: 30a9d7ef92bc14334cf2058df46dd513d99b7d21712c6c8bedfce9c48bc0f402
-      bt: eaddc0804e3047ae886466758455accba906f9ae990696f12c17a3237a9c9688
-      ct: e60851ccedd572c63dbcec5e0d84ddf45d76423dcf08fe0c9761fe17ce2bdd4e
-    output:
-      - input_file: inputs/u32_3.in
-        output:
-          registers:
-            a:
-              type: bool
-              value: "true"
-      - input_file: inputs/u32_5.in
-        output:
-          registers:
-            a:
-              type: bool
-              value: "true"
-    initial_ast: 1939d0c4720ac464347a680666fee91d1db59acfd36c8e7f6ea1255b4787b39b
-    imports_resolved_ast: 1939d0c4720ac464347a680666fee91d1db59acfd36c8e7f6ea1255b4787b39b
-    canonicalized_ast: 1939d0c4720ac464347a680666fee91d1db59acfd36c8e7f6ea1255b4787b39b
-    type_inferenced_ast: 662b43067b1ddf0db1b7f5d71a07eb84ff79074c187398d4367b8694f066726b
+outputs: []
diff --git a/tests/expectations/compiler/compiler/statements/nested_mutate.leo.out b/tests/expectations/compiler/compiler/statements/nested_mutate.leo.out
index 22e2fa0227..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/statements/nested_mutate.leo.out
+++ b/tests/expectations/compiler/compiler/statements/nested_mutate.leo.out
@@ -1,34 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 481
-      num_constraints: 547
-      at: 2f636d0f9b9af543c900753ff89b3eb0bd5cc4f81f8afc19c5cb0901b4b51b0a
-      bt: 86e567b4b178b61f7a2ae29ac78c6f60fc1b6c9cdfdbb6c896c8b059b68a90b6
-      ct: eb4c6eaa123567ee0a5b12a2812f90b4f532e657b59249aaad97092bd32cdbe9
-    output:
-      - input_file: inputs/u32_3.in
-        output:
-          registers:
-            a:
-              type: bool
-              value: "true"
-      - input_file: inputs/u32_5.in
-        output:
-          registers:
-            a:
-              type: bool
-              value: "true"
-      - input_file: inputs/u32_6.in
-        output:
-          registers:
-            a:
-              type: bool
-              value: "false"
-    initial_ast: ebf32d52f9b74643177b087221c52f994e439347407c948643b7261e107007ed
-    imports_resolved_ast: ebf32d52f9b74643177b087221c52f994e439347407c948643b7261e107007ed
-    canonicalized_ast: 2a2f30c10bc808923ae1f7fedc3debd765be612cfa1d100a853d0a2dfb65f58b
-    type_inferenced_ast: 628f6316908cc79ef0740fdd8baf179e9e969d19d82786f51e78a4d11bd6dab8
+outputs: []
diff --git a/tests/expectations/compiler/compiler/statements/reverse_loops.leo.out b/tests/expectations/compiler/compiler/statements/reverse_loops.leo.out
index 44d14de590..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/statements/reverse_loops.leo.out
+++ b/tests/expectations/compiler/compiler/statements/reverse_loops.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: inputs/dummy.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: f64afadac31c349e9c03da12d924241f36316181323adf5bd8d64b01198747f6
-    imports_resolved_ast: f64afadac31c349e9c03da12d924241f36316181323adf5bd8d64b01198747f6
-    canonicalized_ast: feee8d1b761c72c684f8b6a7cb985357fa8897cbc229e69302df68655669a77e
-    type_inferenced_ast: c8d365cde5e39faabbea291d537590c08423e4dd281327d67f3a6994a5492e53
+outputs: []
diff --git a/tests/expectations/compiler/compiler/statements/reverse_one.leo.out b/tests/expectations/compiler/compiler/statements/reverse_one.leo.out
index a95ee39d2c..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/statements/reverse_one.leo.out
+++ b/tests/expectations/compiler/compiler/statements/reverse_one.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 1
-      num_constraints: 1
-      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
-      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
-      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
-    output:
-      - input_file: inputs/dummy.in
-        output:
-          registers:
-            r0:
-              type: bool
-              value: "true"
-    initial_ast: e999f088de99a6223d147bd686fac839d98f2d6ba2a9abb38b6d234f8c90231d
-    imports_resolved_ast: e999f088de99a6223d147bd686fac839d98f2d6ba2a9abb38b6d234f8c90231d
-    canonicalized_ast: bb02f855d59f2f551f3248cca61b12a53c28977f0ec41cf9bed9d1434c88b9ab
-    type_inferenced_ast: 1be9b8e6dc45ea9bd2bfd6888d1538563b532e57f180a8cbbf0dd6036ee2bf56
+outputs: []
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 285509211b..ef090731fb 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
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 25
-      num_constraints: 33
-      at: 00318b0f80b01b9e2d5a8154a536deb1545f04abd493a84071ef13dce1a9d92d
-      bt: 799ee4dc07f6320b8c3dcbd5ebdf6de8a4cf5af8b1edc45dbe5621c8a34fa38d
-      ct: 7b6ec9eacd65cfa47dfe7e73eb7c8fa4be804a9fb878fddf59fe5d06e7c04489
-    output:
-      - input_file: inputs/ternary_explicit_and_implicit.in
-        output:
-          registers:
-            a:
-              type: u8
-              value: "3"
-    initial_ast: 8eb489d084203ff568db699a97d68cb7be586b99269cd3caa5ed075735a89430
-    imports_resolved_ast: 8eb489d084203ff568db699a97d68cb7be586b99269cd3caa5ed075735a89430
-    canonicalized_ast: 8eb489d084203ff568db699a97d68cb7be586b99269cd3caa5ed075735a89430
-    type_inferenced_ast: 9599e37cdf0cbd702e3ee2e025996cd72d6df4c173ce591f713b685dc19d4d0f
+outputs: []
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 384fa46cc2..3f519cf1b5 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
@@ -1,5 +1,4 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs:
-  - "Error [EASG0373014]: 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     |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^"
+outputs: []
diff --git a/tests/expectations/compiler/compiler/string/equality.leo.out b/tests/expectations/compiler/compiler/string/equality.leo.out
index ab5b54b3ff..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/string/equality.leo.out
+++ b/tests/expectations/compiler/compiler/string/equality.leo.out
@@ -1,28 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 92
-      num_constraints: 75
-      at: c03384068dd2b9bd528c65e301960d5c4f61bf94949c9080f28a4bc57f81e856
-      bt: 7f653d4004b13eee112bbefcf900b0c8201524129423cdda82799c18fdcfb3f7
-      ct: bce0d8a64cf530613e693412358d17d231ec8516108ab4ee5a47ddf185a471fa
-    output:
-      - input_file: inputs/string.in
-        output:
-          registers:
-            out:
-              type: bool
-              value: "true"
-      - input_file: inputs/weird.in
-        output:
-          registers:
-            out:
-              type: bool
-              value: "false"
-    initial_ast: 18cc23be73fed22f06b3bfdb93c1b92688131d4bbeb0d68ed8dc691c97f0c415
-    imports_resolved_ast: 18cc23be73fed22f06b3bfdb93c1b92688131d4bbeb0d68ed8dc691c97f0c415
-    canonicalized_ast: 63331696106397640ace1c15d354979b8a05f25dd650465954cd1fd72124bae6
-    type_inferenced_ast: 83e3cba193c50f19049cdf4296d75187cfd9d6d9fa5276fd328c2e3acf0936e2
+outputs: []
diff --git a/tests/expectations/compiler/compiler/string/replace.leo.out b/tests/expectations/compiler/compiler/string/replace.leo.out
index 3fb95cb985..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/string/replace.leo.out
+++ b/tests/expectations/compiler/compiler/string/replace.leo.out
@@ -1,28 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 68
-      num_constraints: 51
-      at: 45fa182371664010950da6ec3fa6360de34dda5cb814b3c8bd119a09e86b5c77
-      bt: 4da3499799890924c2910625e052c6757e7cfd857ebbd18afd3d16b5bd0e9a73
-      ct: 183c15a7bf0d7c109b082a55e696874797e7ce685096881ce803f6bfa453a875
-    output:
-      - input_file: inputs/string.in
-        output:
-          registers:
-            out:
-              type: bool
-              value: "true"
-      - input_file: inputs/weird.in
-        output:
-          registers:
-            out:
-              type: bool
-              value: "true"
-    initial_ast: f3c204e48bcf159d84b551a7af01a54b49a9cd6b0ba35ab8c3e68d50caf215e6
-    imports_resolved_ast: f3c204e48bcf159d84b551a7af01a54b49a9cd6b0ba35ab8c3e68d50caf215e6
-    canonicalized_ast: 91c83cb469e2c9d1b4f6835dd2d503d330c9cfdc7ee4693490cced2835caa4e7
-    type_inferenced_ast: d7f4ab6acb5c9569c42367d28c8af286c07147cb68a6ec31146b844ec257d2ac
+outputs: []
diff --git a/tests/expectations/compiler/compiler/string/string_transformation.leo.out b/tests/expectations/compiler/compiler/string/string_transformation.leo.out
index b8352f44e2..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/string/string_transformation.leo.out
+++ b/tests/expectations/compiler/compiler/string/string_transformation.leo.out
@@ -1,22 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 9
-      num_constraints: 7
-      at: 5f4cfa276f9e316a42c9292a4f149fcf3c301a4ca3dc14112b7d59e8ef1e002c
-      bt: c728f18e4b654023c5189f382573af92682099ed5c7c08e706604e6f1cb7d72d
-      ct: 74aca434b2a72f7215a0dbe138b708fb2c2857d95dc3bc4776903c90d5f47bb9
-    output:
-      - input_file: inputs/two.in
-        output:
-          registers:
-            out:
-              type: bool
-              value: "true"
-    initial_ast: cb6caa7598139ad4bdf20a4ace3eb443f83932c91606214227c192684efa2c33
-    imports_resolved_ast: cb6caa7598139ad4bdf20a4ace3eb443f83932c91606214227c192684efa2c33
-    canonicalized_ast: ef8938160ef517c3856d42b1c651877de6baaa791409cd92ea0552b8c82b228a
-    type_inferenced_ast: 313f5120e880583f9cced569d3afcfe7b893a8b9c58f521680037df4202e6d8c
+outputs: []
diff --git a/tests/expectations/compiler/compiler/tuples/access.leo.out b/tests/expectations/compiler/compiler/tuples/access.leo.out
index 7611a6cff7..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/tuples/access.leo.out
+++ b/tests/expectations/compiler/compiler/tuples/access.leo.out
@@ -1,25 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 2
-      num_constraints: 2
-      at: 401937c524c61a28b4fab76d7a1f85bb628850012af62362a0922610372faf92
-      bt: cdf9a9cee4f2edf55111a95ae60bde9801080f6bde638a5c79273a39a2f9f7f5
-      ct: 643d5437104296e21d906ecb15b2c96ad278f20cfc4af53b12bb6069bd853726
-    output:
-      - input_file: inputs/true_true.in
-        output:
-          registers:
-            b:
-              type: bool
-              value: "true"
-            c:
-              type: bool
-              value: "false"
-    initial_ast: 1398434e8180a7aba868bc9caa21b5d226a4c8216e0086a6f48d6c503e41c263
-    imports_resolved_ast: 1398434e8180a7aba868bc9caa21b5d226a4c8216e0086a6f48d6c503e41c263
-    canonicalized_ast: 1398434e8180a7aba868bc9caa21b5d226a4c8216e0086a6f48d6c503e41c263
-    type_inferenced_ast: fed99174e3afb30da68a430b96242d63b45bb1ce58028d5c7352cc64dcbd98b7
+outputs: []
diff --git a/tests/expectations/compiler/compiler/tuples/basic.leo.out b/tests/expectations/compiler/compiler/tuples/basic.leo.out
index 3841846e9d..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/tuples/basic.leo.out
+++ b/tests/expectations/compiler/compiler/tuples/basic.leo.out
@@ -1,25 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 2
-      num_constraints: 2
-      at: 401937c524c61a28b4fab76d7a1f85bb628850012af62362a0922610372faf92
-      bt: cdf9a9cee4f2edf55111a95ae60bde9801080f6bde638a5c79273a39a2f9f7f5
-      ct: 643d5437104296e21d906ecb15b2c96ad278f20cfc4af53b12bb6069bd853726
-    output:
-      - input_file: inputs/true_true.in
-        output:
-          registers:
-            b:
-              type: bool
-              value: "true"
-            c:
-              type: bool
-              value: "false"
-    initial_ast: 51cc6c9ff08fa4320783cf8b6683f784a6325a0e371c7d93049c30eb9d04cf72
-    imports_resolved_ast: 51cc6c9ff08fa4320783cf8b6683f784a6325a0e371c7d93049c30eb9d04cf72
-    canonicalized_ast: 51cc6c9ff08fa4320783cf8b6683f784a6325a0e371c7d93049c30eb9d04cf72
-    type_inferenced_ast: a1e55a4a926b0d9c8d0f611136c7f9ba8ed5c6156a85d1d04adc9faaadf1a611
+outputs: []
diff --git a/tests/expectations/compiler/compiler/tuples/dependent.leo.out b/tests/expectations/compiler/compiler/tuples/dependent.leo.out
index 8b49eeab86..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/tuples/dependent.leo.out
+++ b/tests/expectations/compiler/compiler/tuples/dependent.leo.out
@@ -1,25 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 2
-      num_constraints: 2
-      at: 401937c524c61a28b4fab76d7a1f85bb628850012af62362a0922610372faf92
-      bt: cdf9a9cee4f2edf55111a95ae60bde9801080f6bde638a5c79273a39a2f9f7f5
-      ct: 643d5437104296e21d906ecb15b2c96ad278f20cfc4af53b12bb6069bd853726
-    output:
-      - input_file: inputs/true_true.in
-        output:
-          registers:
-            b:
-              type: bool
-              value: "true"
-            c:
-              type: bool
-              value: "false"
-    initial_ast: 6692e9d94d784dd3cd11dbf48ac13b0b54f61d83ba0d85bf038e9bf84590851f
-    imports_resolved_ast: 6692e9d94d784dd3cd11dbf48ac13b0b54f61d83ba0d85bf038e9bf84590851f
-    canonicalized_ast: 6692e9d94d784dd3cd11dbf48ac13b0b54f61d83ba0d85bf038e9bf84590851f
-    type_inferenced_ast: 0d8c2b2b77762cfb957d5d6247366317b8fbe4ac7cb985df1b4d3511accf13b8
+outputs: []
diff --git a/tests/expectations/compiler/compiler/tuples/destructured.leo.out b/tests/expectations/compiler/compiler/tuples/destructured.leo.out
index 774c7fdf01..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/tuples/destructured.leo.out
+++ b/tests/expectations/compiler/compiler/tuples/destructured.leo.out
@@ -1,25 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 2
-      num_constraints: 2
-      at: 401937c524c61a28b4fab76d7a1f85bb628850012af62362a0922610372faf92
-      bt: cdf9a9cee4f2edf55111a95ae60bde9801080f6bde638a5c79273a39a2f9f7f5
-      ct: 643d5437104296e21d906ecb15b2c96ad278f20cfc4af53b12bb6069bd853726
-    output:
-      - input_file: inputs/true_true.in
-        output:
-          registers:
-            b:
-              type: bool
-              value: "false"
-            c:
-              type: bool
-              value: "true"
-    initial_ast: 531df9191a6ee867da7a9c5aa5120a9ab93eec5d4d29bdc78aa965fce0f52c8d
-    imports_resolved_ast: 531df9191a6ee867da7a9c5aa5120a9ab93eec5d4d29bdc78aa965fce0f52c8d
-    canonicalized_ast: 531df9191a6ee867da7a9c5aa5120a9ab93eec5d4d29bdc78aa965fce0f52c8d
-    type_inferenced_ast: b841d6651b93193e0bbd24df8b667bd16066ee77481dd3b8b0187c37968ca1c1
+outputs: []
diff --git a/tests/expectations/compiler/compiler/tuples/nested_access.leo.out b/tests/expectations/compiler/compiler/tuples/nested_access.leo.out
index f88364c476..ef090731fb 100644
--- a/tests/expectations/compiler/compiler/tuples/nested_access.leo.out
+++ b/tests/expectations/compiler/compiler/tuples/nested_access.leo.out
@@ -1,25 +1,4 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs:
-  - circuit:
-      num_public_variables: 0
-      num_private_variables: 2
-      num_constraints: 2
-      at: 401937c524c61a28b4fab76d7a1f85bb628850012af62362a0922610372faf92
-      bt: cdf9a9cee4f2edf55111a95ae60bde9801080f6bde638a5c79273a39a2f9f7f5
-      ct: 643d5437104296e21d906ecb15b2c96ad278f20cfc4af53b12bb6069bd853726
-    output:
-      - input_file: inputs/true_true.in
-        output:
-          registers:
-            b:
-              type: bool
-              value: "false"
-            c:
-              type: bool
-              value: "false"
-    initial_ast: fbd413171641a048b40bf3141ee1ae3218a205e4679721ce61e0e114bb2e340b
-    imports_resolved_ast: fbd413171641a048b40bf3141ee1ae3218a205e4679721ce61e0e114bb2e340b
-    canonicalized_ast: fbd413171641a048b40bf3141ee1ae3218a205e4679721ce61e0e114bb2e340b
-    type_inferenced_ast: 8dcc217ea727817113ac27684c71b3b8914a9f621952b8555d5fc4843a79967f
+outputs: []

From 78e3b333e1c305ed6387a57a8bce7c6ce1f7f8b0 Mon Sep 17 00:00:00 2001
From: gluaxspeed <jonathan.t.pavlik@gmail.com>
Date: Fri, 27 Aug 2021 21:51:59 -0700
Subject: [PATCH 11/23] forgot to re-populate tests

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

diff --git a/tests/expectations/compiler/compiler/address/branch.leo.out b/tests/expectations/compiler/compiler/address/branch.leo.out
index ef090731fb..39b1bdba4b 100644
--- a/tests/expectations/compiler/compiler/address/branch.leo.out
+++ b/tests/expectations/compiler/compiler/address/branch.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1024
+      num_constraints: 1536
+      at: 5afd1d58b6826912fe5cba06b60d9a7debdbad9e922b8a78ed49f7a7ca0ac65e
+      bt: db77c3470cf1b3c80c2e3b1b3ddc59d9891912489bfcf39b7f67c2f314ca7f6d
+      ct: d0993682df5b495f4a6784882e0f007dbc378adb35007d250e2c098975f4d32e
+    output:
+      - input_file: inputs/branch.in
+        output:
+          registers:
+            a:
+              type: bool
+              value: "true"
+    initial_ast: 32dcc6719d7d1214782cd1ffe02f067eec8adbf1f3820546e539887d4f1334c8
+    imports_resolved_ast: 32dcc6719d7d1214782cd1ffe02f067eec8adbf1f3820546e539887d4f1334c8
+    canonicalized_ast: 32dcc6719d7d1214782cd1ffe02f067eec8adbf1f3820546e539887d4f1334c8
+    type_inferenced_ast: 996f46f1dba11bdde037a8e033ca97870871eb89d4e3e402b59f99fcc0c35323
diff --git a/tests/expectations/compiler/compiler/address/equal.leo.out b/tests/expectations/compiler/compiler/address/equal.leo.out
index ef090731fb..72f8327413 100644
--- a/tests/expectations/compiler/compiler/address/equal.leo.out
+++ b/tests/expectations/compiler/compiler/address/equal.leo.out
@@ -1,4 +1,28 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 511
+      num_constraints: 511
+      at: 61e8ee994e9e7edc1f84fa3cbe8c421ade231189b9ddf6a9a75eeef9915c20f7
+      bt: 2194515882da93c79fa24d47c40fddc44f0284da25da7b89efb935c0ea7382f8
+      ct: a0736e8c8f3bb1c39a147348754e53dfd31fd76a1df9cd9960472841bcc531df
+    output:
+      - input_file: inputs/address1.in
+        output:
+          registers:
+            a:
+              type: bool
+              value: "true"
+      - input_file: inputs/address2.in
+        output:
+          registers:
+            a:
+              type: bool
+              value: "false"
+    initial_ast: d9d5346dff8f825d58daabb3a4fe2fcd1471a3fb3c80e46e5583c4f6cdb12b2b
+    imports_resolved_ast: d9d5346dff8f825d58daabb3a4fe2fcd1471a3fb3c80e46e5583c4f6cdb12b2b
+    canonicalized_ast: d9d5346dff8f825d58daabb3a4fe2fcd1471a3fb3c80e46e5583c4f6cdb12b2b
+    type_inferenced_ast: 32a303da117b08aebfb74f7454cd80dfe28b07fd464a61b6d6a3ce23d451f135
diff --git a/tests/expectations/compiler/compiler/address/index.leo.out b/tests/expectations/compiler/compiler/address/index.leo.out
index ef090731fb..67a9431af8 100644
--- a/tests/expectations/compiler/compiler/address/index.leo.out
+++ b/tests/expectations/compiler/compiler/address/index.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1694
+      num_constraints: 2719
+      at: f9a9bc8304df327c7b16f088b61ac518fb3a7b6457ccc35a1ab9eab4565a1981
+      bt: 045eba0fdd405714f788492fd5914b053e0ece622e9a542270d8cfe85c0ee291
+      ct: e8fa4a33a657c70a7cecc7e9b284157b369b7ea57879948e108daf93e778551c
+    output:
+      - input_file: inputs/index.in
+        output:
+          registers:
+            a:
+              type: bool
+              value: "true"
+    initial_ast: 9961e21337ff8eed0a27fff91fc442c2530a1bfaf80da6d497a93a371896b1f8
+    imports_resolved_ast: 9961e21337ff8eed0a27fff91fc442c2530a1bfaf80da6d497a93a371896b1f8
+    canonicalized_ast: 9961e21337ff8eed0a27fff91fc442c2530a1bfaf80da6d497a93a371896b1f8
+    type_inferenced_ast: cc47000b2cf462f5cb891467cc99f2d21c44ced2198e988dc3de59f166aa1603
diff --git a/tests/expectations/compiler/compiler/address/ternary.leo.out b/tests/expectations/compiler/compiler/address/ternary.leo.out
index ef090731fb..55dabfd5e7 100644
--- a/tests/expectations/compiler/compiler/address/ternary.leo.out
+++ b/tests/expectations/compiler/compiler/address/ternary.leo.out
@@ -1,4 +1,28 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1022
+      num_constraints: 1022
+      at: 1b42ef63a212d2ea51cab07171c8fb1438112afdbd14501470c2477b9eeb4c99
+      bt: 15054154626f1ae748008fc4ed9a650c3873b608988ff31312fe4049957dfffb
+      ct: dbda9de51fe9897456cbbcc3b450ed7d66185fb6018c7a0c72414784f29b2ad4
+    output:
+      - input_file: inputs/address1.in
+        output:
+          registers:
+            a:
+              type: bool
+              value: "false"
+      - input_file: inputs/address2.in
+        output:
+          registers:
+            a:
+              type: bool
+              value: "false"
+    initial_ast: 6f8e7a94ccb702790204360959a2673abf6b53027fccaaa9feed8a4e41ee05c1
+    imports_resolved_ast: 6f8e7a94ccb702790204360959a2673abf6b53027fccaaa9feed8a4e41ee05c1
+    canonicalized_ast: 6f8e7a94ccb702790204360959a2673abf6b53027fccaaa9feed8a4e41ee05c1
+    type_inferenced_ast: 91e597663c88fbfd0c6ff787d109f5a71d5357c44d5306f7149714cda86475ae
diff --git a/tests/expectations/compiler/compiler/aliases/arith.leo.out b/tests/expectations/compiler/compiler/aliases/arith.leo.out
index ef090731fb..afd5ac5a6e 100644
--- a/tests/expectations/compiler/compiler/aliases/arith.leo.out
+++ b/tests/expectations/compiler/compiler/aliases/arith.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 130
+      num_constraints: 131
+      at: 543fa6d0af950bf301b03e1d060f09a396c2dc452933a3f54a9ef177bfda6180
+      bt: a46e57da3c684733a4f1736d56fe7952266ba68b2a23eebcb4ef933f4ebb41ff
+      ct: fd808ddd42dbcc9eb18899f0eb8a2bc1ee8e03f983ecec6daa77e2c2d9910d1e
+    output:
+      - input_file: inputs/basic.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: a4a3b4b30742544a6dae3d76794504173c1cc64f217bd3feda033ce51512a670
+    imports_resolved_ast: a4a3b4b30742544a6dae3d76794504173c1cc64f217bd3feda033ce51512a670
+    canonicalized_ast: a4a3b4b30742544a6dae3d76794504173c1cc64f217bd3feda033ce51512a670
+    type_inferenced_ast: 508686ddeb2f8fad60d9ad58639b5a761e6c5f5b61e105803eb8a98d8065a2ad
diff --git a/tests/expectations/compiler/compiler/aliases/basic.leo.out b/tests/expectations/compiler/compiler/aliases/basic.leo.out
index ef090731fb..246cf547ed 100644
--- a/tests/expectations/compiler/compiler/aliases/basic.leo.out
+++ b/tests/expectations/compiler/compiler/aliases/basic.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 163
+      num_constraints: 165
+      at: 2e4efaa1289da67c2193ecea16201f9597166a181e5d852d41661ad4b9f67844
+      bt: bf213d7a070672f468bd4696a2165494ea56abce861fa4448817d94420ce6f78
+      ct: e674d668d6c90bd7c273e33096d7eea5a052a6e14b2b43bad69c3e1c969faf72
+    output:
+      - input_file: inputs/basic.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: d83b33119db295fa2ed7795c8e17d4073cabba5e90e9438cd53f3a9a77585f19
+    imports_resolved_ast: d83b33119db295fa2ed7795c8e17d4073cabba5e90e9438cd53f3a9a77585f19
+    canonicalized_ast: d83b33119db295fa2ed7795c8e17d4073cabba5e90e9438cd53f3a9a77585f19
+    type_inferenced_ast: 77be8ec74bc15f2a45e8bf29e7973bc0c721008fe5508dcc6d02b91aae3d84ee
diff --git a/tests/expectations/compiler/compiler/aliases/duplicate_name_fail.leo.out b/tests/expectations/compiler/compiler/aliases/duplicate_name_fail.leo.out
index 3f519cf1b5..4e2c598ab8 100644
--- a/tests/expectations/compiler/compiler/aliases/duplicate_name_fail.leo.out
+++ b/tests/expectations/compiler/compiler/aliases/duplicate_name_fail.leo.out
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EASG0373044]: a alias named \"int\" already exists in this scope\n    --> compiler-test:4:6\n     |\n   4 | type int = u8;\n     |      ^^^"
diff --git a/tests/expectations/compiler/compiler/aliases/fn_return.leo.out b/tests/expectations/compiler/compiler/aliases/fn_return.leo.out
index ef090731fb..80aeb65553 100644
--- a/tests/expectations/compiler/compiler/aliases/fn_return.leo.out
+++ b/tests/expectations/compiler/compiler/aliases/fn_return.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: inputs/dummy.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 7feac3e33e75789d3b532a7cc857f324cd7abed380d578791803b3162edcfdec
+    imports_resolved_ast: 7feac3e33e75789d3b532a7cc857f324cd7abed380d578791803b3162edcfdec
+    canonicalized_ast: 7feac3e33e75789d3b532a7cc857f324cd7abed380d578791803b3162edcfdec
+    type_inferenced_ast: bc54ad21e90ab297b40ff570dfc379cbca61fdc9e20bd6899f4b964f726954b0
diff --git a/tests/expectations/compiler/compiler/aliases/shadowing_arg.leo.out b/tests/expectations/compiler/compiler/aliases/shadowing_arg.leo.out
index ef090731fb..e9b87ef19d 100644
--- a/tests/expectations/compiler/compiler/aliases/shadowing_arg.leo.out
+++ b/tests/expectations/compiler/compiler/aliases/shadowing_arg.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 33
+      num_constraints: 33
+      at: a06eb411f53130890e49a9f69bddb47294f83d0589b68c415747223b23dee7ed
+      bt: d3062f2cf90527cdc167b4e2c3ac10f1a8d51edcefa4991ac3d62fee0d3553cc
+      ct: ba3a1dbda7521fc175cc7ea8b04f1d61a74268d3a43a5e30c3ee86ae6ff797d0
+    output:
+      - input_file: inputs/basic.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 671704ed30a8c68ebffe2a58ff4799f626badf975d2d0dded3b06f5264e5c0db
+    imports_resolved_ast: 671704ed30a8c68ebffe2a58ff4799f626badf975d2d0dded3b06f5264e5c0db
+    canonicalized_ast: 671704ed30a8c68ebffe2a58ff4799f626badf975d2d0dded3b06f5264e5c0db
+    type_inferenced_ast: eb525f7c227207a1037b96838d2f0cf597968c14117b3fae30564f3cd5a3a27b
diff --git a/tests/expectations/compiler/compiler/aliases/shadowing_var_allowed.leo.out b/tests/expectations/compiler/compiler/aliases/shadowing_var_allowed.leo.out
index ef090731fb..c1d479dd9b 100644
--- a/tests/expectations/compiler/compiler/aliases/shadowing_var_allowed.leo.out
+++ b/tests/expectations/compiler/compiler/aliases/shadowing_var_allowed.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: inputs/dummy.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: cd2e85ff29ee11d30e73dbba0a612223a8a26dff125069ad7ac05697fd4c9829
+    imports_resolved_ast: cd2e85ff29ee11d30e73dbba0a612223a8a26dff125069ad7ac05697fd4c9829
+    canonicalized_ast: cd2e85ff29ee11d30e73dbba0a612223a8a26dff125069ad7ac05697fd4c9829
+    type_inferenced_ast: 1e73226b2cbbd5c7a36ffe70b778e0e544976d2e09a1f0ba3f2b486d1b604d58
diff --git a/tests/expectations/compiler/compiler/aliases/wrong_type_assign_fail.leo.out b/tests/expectations/compiler/compiler/aliases/wrong_type_assign_fail.leo.out
index 3f519cf1b5..9bf7a388c7 100644
--- a/tests/expectations/compiler/compiler/aliases/wrong_type_assign_fail.leo.out
+++ b/tests/expectations/compiler/compiler/aliases/wrong_type_assign_fail.leo.out
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EASG0373025]: unexpected type, expected: 'u32', received: 'u8'\n    --> compiler-test:6:18\n     |\n   6 |     let a: int = x;\n     |                  ^"
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 3f519cf1b5..6b288be483 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
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EASG0373019]: array index out of bounds: '0'\n    --> compiler-test:7:24\n     |\n   7 |     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 3f519cf1b5..018bc69003 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
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+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     |             ^^^^^^^^^^^"
diff --git a/tests/expectations/compiler/compiler/array/complex_access.leo.out b/tests/expectations/compiler/compiler/array/complex_access.leo.out
index ef090731fb..841bf13445 100644
--- a/tests/expectations/compiler/compiler/array/complex_access.leo.out
+++ b/tests/expectations/compiler/compiler/array/complex_access.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 637
+      num_constraints: 662
+      at: 9f1bcfcac007139af57f04172704330d348767a9c51fe8ce15fb60f457fa6337
+      bt: b6500ddf37d10958fdc014dcb2f54b37a2c684f05b7f0aa4776556331db8c924
+      ct: a15c712d74487a80767116103c38fa7277066705d0c7f1f9902a6016466706f0
+    output:
+      - input_file: input/complex_access.in
+        output:
+          registers:
+            out:
+              type: bool
+              value: "true"
+    initial_ast: 843884ddf198fe566cea0f8e84a2902f720d6211c9d8bad98299eea4da846870
+    imports_resolved_ast: 843884ddf198fe566cea0f8e84a2902f720d6211c9d8bad98299eea4da846870
+    canonicalized_ast: c30721e60523bc31af9a9bf342d9b89bf92a26e3886394cc0c1a574560715bdf
+    type_inferenced_ast: c37f209961a9acff1d942af1e4a9a332123676f2bc581ca94604314f9d738a1e
diff --git a/tests/expectations/compiler/compiler/array/equal_initializer.leo.out b/tests/expectations/compiler/compiler/array/equal_initializer.leo.out
index ef090731fb..300b2e071b 100644
--- a/tests/expectations/compiler/compiler/array/equal_initializer.leo.out
+++ b/tests/expectations/compiler/compiler/array/equal_initializer.leo.out
@@ -1,4 +1,28 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 95
+      num_constraints: 95
+      at: 5884e806c47756fa1d12f47e5cc5249843d8de4e2fafcb373c5a0d67dfe22d69
+      bt: 983c734b40e342144d6b4d52e315da9ff9f97580f019f606403924bb977a5be7
+      ct: 49f0db71bd29b80dbe5f2f96573a5959b1df339c92350e16f111bade214037aa
+    output:
+      - input_file: input/six_zeros.in
+        output:
+          registers:
+            x:
+              type: bool
+              value: "true"
+      - input_file: input/count_to_6.in
+        output:
+          registers:
+            x:
+              type: bool
+              value: "false"
+    initial_ast: aa24022f240400d709b97a44c143ce481109bb0a66926aa5c97cf2e2d06dea2a
+    imports_resolved_ast: aa24022f240400d709b97a44c143ce481109bb0a66926aa5c97cf2e2d06dea2a
+    canonicalized_ast: ace5006c27d2e3784fb73d52adc641f6285a041452ba0d23de5983c5eede1139
+    type_inferenced_ast: 611bc2fab64e417c9cfad3c59ca333561b8167a6fc7be957d972d96125e040ba
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 ef090731fb..bb5e60688e 100644
--- a/tests/expectations/compiler/compiler/array/equal_initializer_2.leo.out
+++ b/tests/expectations/compiler/compiler/array/equal_initializer_2.leo.out
@@ -1,4 +1,28 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 95
+      num_constraints: 95
+      at: 9273b9ab94dee8605c4f1e49fe99910f674468f5026b8d2c48ecaa4d8c006f3a
+      bt: a3614a9ddd1ae0fde16a61336aba5a02b44816b3e43e23c7b9663976319bcb8a
+      ct: 49f0db71bd29b80dbe5f2f96573a5959b1df339c92350e16f111bade214037aa
+    output:
+      - input_file: input/six_zeros.in
+        output:
+          registers:
+            x:
+              type: bool
+              value: "false"
+      - input_file: input/count_to_6.in
+        output:
+          registers:
+            x:
+              type: bool
+              value: "true"
+    initial_ast: 307b6817fa2a5005462686901129e97bf75c00bf14568fafbe1de2c8afc1804d
+    imports_resolved_ast: 307b6817fa2a5005462686901129e97bf75c00bf14568fafbe1de2c8afc1804d
+    canonicalized_ast: cbaa304ba210d8155762701d8e6a2ddca3eaffb008a813ed7a60db1fb0043f10
+    type_inferenced_ast: 47e371ce112ac17fd65bfd100d24829e8c4819e1f96cc715b8c6245f01d608bb
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 ef090731fb..3445cbb64c 100644
--- a/tests/expectations/compiler/compiler/array/input_nested_3x2.leo.out
+++ b/tests/expectations/compiler/compiler/array/input_nested_3x2.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 95
+      num_constraints: 95
+      at: 5884e806c47756fa1d12f47e5cc5249843d8de4e2fafcb373c5a0d67dfe22d69
+      bt: 983c734b40e342144d6b4d52e315da9ff9f97580f019f606403924bb977a5be7
+      ct: 49f0db71bd29b80dbe5f2f96573a5959b1df339c92350e16f111bade214037aa
+    output:
+      - input_file: input/input_nested_3x2.in
+        output:
+          registers:
+            x:
+              type: bool
+              value: "true"
+    initial_ast: 6d5be1a3d383ecafa89b5327d3a4b9bce9a459f6c0241cb01f408566ec4a1cc4
+    imports_resolved_ast: 6d5be1a3d383ecafa89b5327d3a4b9bce9a459f6c0241cb01f408566ec4a1cc4
+    canonicalized_ast: eb64230be87deb03ac7f076961a82194a15afd964aa6966a10314b38def69684
+    type_inferenced_ast: e7985a24db781a3e42c9b2a67d1e8febc78fc2ad4e388a90207d00eb89734ffd
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 3f519cf1b5..498d522f18 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
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+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     |                             ^"
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 ef090731fb..399ef15a56 100644
--- a/tests/expectations/compiler/compiler/array/input_tuple_3x2.leo.out
+++ b/tests/expectations/compiler/compiler/array/input_tuple_3x2.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 95
+      num_constraints: 95
+      at: 5884e806c47756fa1d12f47e5cc5249843d8de4e2fafcb373c5a0d67dfe22d69
+      bt: 983c734b40e342144d6b4d52e315da9ff9f97580f019f606403924bb977a5be7
+      ct: 49f0db71bd29b80dbe5f2f96573a5959b1df339c92350e16f111bade214037aa
+    output:
+      - input_file: input/input_tuple_3x2.in
+        output:
+          registers:
+            x:
+              type: bool
+              value: "true"
+    initial_ast: aa24022f240400d709b97a44c143ce481109bb0a66926aa5c97cf2e2d06dea2a
+    imports_resolved_ast: aa24022f240400d709b97a44c143ce481109bb0a66926aa5c97cf2e2d06dea2a
+    canonicalized_ast: ace5006c27d2e3784fb73d52adc641f6285a041452ba0d23de5983c5eede1139
+    type_inferenced_ast: 611bc2fab64e417c9cfad3c59ca333561b8167a6fc7be957d972d96125e040ba
diff --git a/tests/expectations/compiler/compiler/array/input_tuple_3x2_fail.leo.out b/tests/expectations/compiler/compiler/array/input_tuple_3x2_fail.leo.out
index 3f519cf1b5..995afe29e0 100644
--- a/tests/expectations/compiler/compiler/array/input_tuple_3x2_fail.leo.out
+++ b/tests/expectations/compiler/compiler/array/input_tuple_3x2_fail.leo.out
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - aborting due to syntax error
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 3f519cf1b5..b920c88311 100644
--- a/tests/expectations/compiler/compiler/array/multi_fail_initializer.leo.out
+++ b/tests/expectations/compiler/compiler/array/multi_fail_initializer.leo.out
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EASG0373025]: 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     |                               ^^^^^^^^^^^^^"
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 3f519cf1b5..1c81b18dcc 100644
--- a/tests/expectations/compiler/compiler/array/multi_fail_inline.leo.out
+++ b/tests/expectations/compiler/compiler/array/multi_fail_inline.leo.out
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EASG0373025]: unexpected type, expected: 'array of length 2', received: 'array of length 1'\n    --> compiler-test:5:35\n     |\n   5 |                                   [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 ef090731fb..a41e6d561f 100644
--- a/tests/expectations/compiler/compiler/array/multi_initializer.leo.out
+++ b/tests/expectations/compiler/compiler/array/multi_initializer.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: input/dummy.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 0724c81ae70c56ff047b5d28ef949b72c4b581ce0bb443957064efa1636a3cab
+    imports_resolved_ast: 0724c81ae70c56ff047b5d28ef949b72c4b581ce0bb443957064efa1636a3cab
+    canonicalized_ast: ed0b7200a455978fed9b1df0c9e3ab9bf4815d79048f28f4205c69b420ee02df
+    type_inferenced_ast: 1e5c78e15d8c9328190e95ccbc2e4e105d9ce430b98704a12472e2c3cc870526
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 3f519cf1b5..3a9fe9224b 100644
--- a/tests/expectations/compiler/compiler/array/multi_initializer_fail.leo.out
+++ b/tests/expectations/compiler/compiler/array/multi_initializer_fail.leo.out
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EASG0373025]: 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     |                               ^^^^^^^^^^^^^"
diff --git a/tests/expectations/compiler/compiler/array/nested.leo.out b/tests/expectations/compiler/compiler/array/nested.leo.out
index ef090731fb..f0661b99e1 100644
--- a/tests/expectations/compiler/compiler/array/nested.leo.out
+++ b/tests/expectations/compiler/compiler/array/nested.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: input/dummy.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 60d0b81c9f3631aca3c9607df74cfb8e4dbc0d387836398dea86f016fa4210fd
+    imports_resolved_ast: 60d0b81c9f3631aca3c9607df74cfb8e4dbc0d387836398dea86f016fa4210fd
+    canonicalized_ast: 6570de0e96b21780ed7793a860948b2c6ff7a92da7ce7f3dd7775ff30d70656f
+    type_inferenced_ast: ace51ab56a61b988bd2c3f65431e87234a96fa92554d36d4e83d7235832506f6
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 ef090731fb..18f3110b60 100644
--- a/tests/expectations/compiler/compiler/array/nested_3x2_value.leo.out
+++ b/tests/expectations/compiler/compiler/array/nested_3x2_value.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: input/dummy.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 754eca05d485d80c4b710db30efc66f91c0eafdc02c2707f854238863b6c6c02
+    imports_resolved_ast: 754eca05d485d80c4b710db30efc66f91c0eafdc02c2707f854238863b6c6c02
+    canonicalized_ast: e5554c42dc9a45ab57ea5ac28996969640fb6f8da1ad8db805f65f5d555c8cf4
+    type_inferenced_ast: aa30bccd05b7386ffb8a7df7cad89ec39117c6b5fc51a9e68624064832b4f225
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 3f519cf1b5..e9692944ca 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
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EASG0373025]: 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     |                              ^^^^^^^^^^^"
diff --git a/tests/expectations/compiler/compiler/array/registers.leo.out b/tests/expectations/compiler/compiler/array/registers.leo.out
index ef090731fb..96a5800d2b 100644
--- a/tests/expectations/compiler/compiler/array/registers.leo.out
+++ b/tests/expectations/compiler/compiler/array/registers.leo.out
@@ -1,4 +1,28 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 119
+      num_constraints: 143
+      at: 144d1bd1f6756ac172ddddf3ca5cf4358ba8fc053fd754b56a425ab6566af47a
+      bt: 43972815ec9d0ab821613fde2cd6a5df9ee42f50758a27a0fed6dc111b44f3ee
+      ct: 5ed7a755b881aa851f3d3e966a4bd18dd48ce59be71b4ada39c9c891f8297201
+    output:
+      - input_file: input/registers_ones.in
+        output:
+          registers:
+            r:
+              type: "[u8; 3]"
+              value: "\"321\""
+      - input_file: input/registers_zeros.in
+        output:
+          registers:
+            r:
+              type: "[u8; 3]"
+              value: "\"123\""
+    initial_ast: 4e74124bc410534941ef9b79ffb64656d14e145b5a79fbd14419c1aef2f0ef69
+    imports_resolved_ast: 4e74124bc410534941ef9b79ffb64656d14e145b5a79fbd14419c1aef2f0ef69
+    canonicalized_ast: 4e74124bc410534941ef9b79ffb64656d14e145b5a79fbd14419c1aef2f0ef69
+    type_inferenced_ast: f5cb6326028b3cf9187889be6ac5ed5bd095a570d45ae63c7285a09366fc6803
diff --git a/tests/expectations/compiler/compiler/array/slice.leo.out b/tests/expectations/compiler/compiler/array/slice.leo.out
index ef090731fb..48d49f7866 100644
--- a/tests/expectations/compiler/compiler/array/slice.leo.out
+++ b/tests/expectations/compiler/compiler/array/slice.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 47
+      num_constraints: 47
+      at: 9034e7c6c2ae58e279196614600093d655bcdad8237302b84a66e63ec1c2f00e
+      bt: f23a0442b41c8901611d5f1a9a8493a0cb03c68e183a81a1b88c5a6600fa7420
+      ct: ad66abc1bf940dbc76573c0a516ebf633c1411f9997101d86ded0faff025d52c
+    output:
+      - input_file: input/three_ones.in
+        output:
+          registers:
+            x:
+              type: bool
+              value: "true"
+    initial_ast: 0e4761ba1228f0a490b51ff2c31df33f623a08d32f62833d64859ca103689f4a
+    imports_resolved_ast: 0e4761ba1228f0a490b51ff2c31df33f623a08d32f62833d64859ca103689f4a
+    canonicalized_ast: 0e4761ba1228f0a490b51ff2c31df33f623a08d32f62833d64859ca103689f4a
+    type_inferenced_ast: 1494bb64c16ec2dc03bfb2e37b89f93e02a70860ced1ce0b42b5ee5ead31b0d5
diff --git a/tests/expectations/compiler/compiler/array/slice_lower.leo.out b/tests/expectations/compiler/compiler/array/slice_lower.leo.out
index ef090731fb..15e2bd02c2 100644
--- a/tests/expectations/compiler/compiler/array/slice_lower.leo.out
+++ b/tests/expectations/compiler/compiler/array/slice_lower.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: input/dummy.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 1bf9b30e052d9ecc042a0b20bbc195a98d463ab206963469b9199de462b8be15
+    imports_resolved_ast: 1bf9b30e052d9ecc042a0b20bbc195a98d463ab206963469b9199de462b8be15
+    canonicalized_ast: 1bf9b30e052d9ecc042a0b20bbc195a98d463ab206963469b9199de462b8be15
+    type_inferenced_ast: 6d2531af8ed5b04b23039d0b508cf388135a0fc6e1dc0de3befb4d49ce360fbc
diff --git a/tests/expectations/compiler/compiler/array/spread.leo.out b/tests/expectations/compiler/compiler/array/spread.leo.out
index ef090731fb..5914e93782 100644
--- a/tests/expectations/compiler/compiler/array/spread.leo.out
+++ b/tests/expectations/compiler/compiler/array/spread.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 71
+      num_constraints: 71
+      at: a08e2e54701e419ba564483a59fb3f6cc30614b8a7c903f9ff6f4b85e63da5c6
+      bt: 65113b6e5dc0f7d88f04b7e60a519801a313d2e9d4129db502ccef0dfdb14988
+      ct: 7a28ca50094ed4577eef8066cf1a814affa63139e6cc3d7ccf8d65c69499de60
+    output:
+      - input_file: input/three_ones.in
+        output:
+          registers:
+            x:
+              type: bool
+              value: "true"
+    initial_ast: 140097342b7a16fae8542da5d13eb9c2cb4e1b743fa226e345d815f62d0781bb
+    imports_resolved_ast: 140097342b7a16fae8542da5d13eb9c2cb4e1b743fa226e345d815f62d0781bb
+    canonicalized_ast: 140097342b7a16fae8542da5d13eb9c2cb4e1b743fa226e345d815f62d0781bb
+    type_inferenced_ast: a2442e72c5010224894e46a1c6f245356c0d86428ce617eb31faaf57806ca2df
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 ef090731fb..94a0008165 100644
--- a/tests/expectations/compiler/compiler/array/ternary_in_array.leo.out
+++ b/tests/expectations/compiler/compiler/array/ternary_in_array.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 39
+      num_constraints: 39
+      at: 6f3ffff33f4e513211e7a55cc9edcab3bc2d2a146c2b280981308bb69165f86f
+      bt: adde6ad1b603a50c986ec99b6edcc972138bb6239e58a1b88e931bc0165b2e8e
+      ct: 867e3f6ee1f26af954e7868633a595d319267d91afc5d7e2074fe641fabde1d6
+    output:
+      - input_file: input/three_ones.in
+        output:
+          registers:
+            x:
+              type: bool
+              value: "true"
+    initial_ast: 002cb467a5c1357617b45f955944bb4a79ab465dc13f3eb5eb8db4c158b8c745
+    imports_resolved_ast: 002cb467a5c1357617b45f955944bb4a79ab465dc13f3eb5eb8db4c158b8c745
+    canonicalized_ast: 002cb467a5c1357617b45f955944bb4a79ab465dc13f3eb5eb8db4c158b8c745
+    type_inferenced_ast: 323fc99ac247b37bb395eb08691d451a3b6b563a15bb94b5af6a0193ccc0bd34
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 ef090731fb..b3c16f0157 100644
--- a/tests/expectations/compiler/compiler/array/tuple_3x2_value.leo.out
+++ b/tests/expectations/compiler/compiler/array/tuple_3x2_value.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: input/dummy.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 97fd9b78f7912a7627e2b2f5615ae35e39304af6122fab85f9b49fcf6a85d8f2
+    imports_resolved_ast: 97fd9b78f7912a7627e2b2f5615ae35e39304af6122fab85f9b49fcf6a85d8f2
+    canonicalized_ast: cf8a8faae5f2847199324cbef87583e9af1249c03891ae31f3ce0093879326d5
+    type_inferenced_ast: 731117b4aa8260da475471088df325cb540d84c536ce60f3488e01a4428e84ae
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 3f519cf1b5..6183b26503 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
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EASG0373025]: 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     |                              ^^^^^^^^^^^"
diff --git a/tests/expectations/compiler/compiler/array/type_fail.leo.out b/tests/expectations/compiler/compiler/array/type_fail.leo.out
index 3f519cf1b5..06738a76cd 100644
--- a/tests/expectations/compiler/compiler/array/type_fail.leo.out
+++ b/tests/expectations/compiler/compiler/array/type_fail.leo.out
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EPAR0370005]: expected ( -- got '-'\n    --> compiler-test:4:19\n     |\n   4 |     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 ef090731fb..c4b141e5cf 100644
--- a/tests/expectations/compiler/compiler/array/type_input_3x2.leo.out
+++ b/tests/expectations/compiler/compiler/array/type_input_3x2.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 95
+      num_constraints: 95
+      at: 5884e806c47756fa1d12f47e5cc5249843d8de4e2fafcb373c5a0d67dfe22d69
+      bt: 983c734b40e342144d6b4d52e315da9ff9f97580f019f606403924bb977a5be7
+      ct: 49f0db71bd29b80dbe5f2f96573a5959b1df339c92350e16f111bade214037aa
+    output:
+      - input_file: input/input_tuple_3x2.in
+        output:
+          registers:
+            x:
+              type: bool
+              value: "true"
+    initial_ast: 9f2080fab6a85294afa2423cd79482fb3d944c4afab7363e66a4086a120ad34d
+    imports_resolved_ast: 9f2080fab6a85294afa2423cd79482fb3d944c4afab7363e66a4086a120ad34d
+    canonicalized_ast: 9f2080fab6a85294afa2423cd79482fb3d944c4afab7363e66a4086a120ad34d
+    type_inferenced_ast: f8c6b9a9ac418220c87bbd1a99a5eb15817cfa289d822624f2d3cc41e10718b4
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 ef090731fb..44117e0d63 100644
--- a/tests/expectations/compiler/compiler/array/type_input_4x3x2.leo.out
+++ b/tests/expectations/compiler/compiler/array/type_input_4x3x2.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 383
+      num_constraints: 383
+      at: ec8cf3ea9e586d3c504b8b467b4404d213dd375aa2691f2b9a8670c879ffa24d
+      bt: 9b5ba17ea683af827718f9062b3102faa0be01b9f67022e2322db989bf90f057
+      ct: 6fe90b4e46834afeb215a4702281504d676eae391588e5b576f6e406f6ddd504
+    output:
+      - input_file: input/type_tuple_value_nested_4x3x2.in
+        output:
+          registers:
+            x:
+              type: bool
+              value: "true"
+    initial_ast: f61370b311806223d351c6dd611a178362cf8ad6de976d7b0ed709b51fadbecb
+    imports_resolved_ast: f61370b311806223d351c6dd611a178362cf8ad6de976d7b0ed709b51fadbecb
+    canonicalized_ast: f61370b311806223d351c6dd611a178362cf8ad6de976d7b0ed709b51fadbecb
+    type_inferenced_ast: 54531d6afced0deaa59c93b9270768a5e89ea8ea1df34365eb4e440bdf725904
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 ef090731fb..8c26312c64 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
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 143
+      num_constraints: 143
+      at: f09e0b896fb2cb30fe4bbcf791b4695de26287361de6def1e75e861643d12714
+      bt: f97a8f270a0603d5674319afa5e572f5f146f02a36f9387f860a6cf1f8a786cc
+      ct: 88cc1bad895de526a15b231e1fe8065848e8008bda5e2662f7c9eec9a976ff98
+    output:
+      - input_file: input/type_nested_value_nested_3x2.in
+        output:
+          registers:
+            x:
+              type: bool
+              value: "true"
+    initial_ast: 6bacdd1d42bfa807910c0455c68213007d5ca8f15ee1f3c743d946bfbbff79b7
+    imports_resolved_ast: 6bacdd1d42bfa807910c0455c68213007d5ca8f15ee1f3c743d946bfbbff79b7
+    canonicalized_ast: 6bacdd1d42bfa807910c0455c68213007d5ca8f15ee1f3c743d946bfbbff79b7
+    type_inferenced_ast: 1b2a08879a8d42fafc9eecc12b89f0f36719e02205ee48bf6075475e71942132
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 3f519cf1b5..24df29595e 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
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EASG0373025]: 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     |                             ^^^^^^^^^^^"
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 ef090731fb..45f267cf6d 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
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: input/dummy.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: c3c30cd2e66f21abef8c49e0ac3d49ed3b607097815c354b14ea9e44d41c0a69
+    imports_resolved_ast: c3c30cd2e66f21abef8c49e0ac3d49ed3b607097815c354b14ea9e44d41c0a69
+    canonicalized_ast: c3c30cd2e66f21abef8c49e0ac3d49ed3b607097815c354b14ea9e44d41c0a69
+    type_inferenced_ast: 557825e28344c8313d9961f9551eabe9c32ee85c524b9b9a6b0fc202c22fa9f3
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 3f519cf1b5..45474940cb 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
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EASG0373025]: 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     |                                  ^^^^^^^^^^^^^^^^"
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 ef090731fb..8a7be41081 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
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: input/dummy.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 6c062f01a78d515f780a4c13de65d466edda274a2cb519af47a319ed165db0fa
+    imports_resolved_ast: 6c062f01a78d515f780a4c13de65d466edda274a2cb519af47a319ed165db0fa
+    canonicalized_ast: 382e9b8b4a635b0be6f62409a20bbdc10d37d08c17658414d1ddef8e6eb00749
+    type_inferenced_ast: 13d8af6038fbc63ae76be51f23e43152ab473b895d206160716008da87da3416
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 3f519cf1b5..e6be12de69 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
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EASG0373025]: 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     |                             ^^^^^^^^^^^"
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 ef090731fb..ab9861224d 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
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: input/dummy.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 228ba794b578de8828d761676c15059c51455aff96b02ef3cfafbef53c35454b
+    imports_resolved_ast: 228ba794b578de8828d761676c15059c51455aff96b02ef3cfafbef53c35454b
+    canonicalized_ast: 7869bd9531ba014bc2515e13bcafdfed2f9566e7008c1e015d43bb749d8d1d4a
+    type_inferenced_ast: 84b8976993f08b1b46fef6012018ad050eed6df1e34ae83fc0b57799a1acb395
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 3f519cf1b5..640c3e964a 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
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EASG0373025]: 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     |                                  ^^^^^^^^^^^^^^"
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 ef090731fb..fc80de0f79 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
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: input/dummy.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 0ea5856bbe7ad96107544e2b12c7ca54c279c4cd1c8b9610083430600ffa86f9
+    imports_resolved_ast: 0ea5856bbe7ad96107544e2b12c7ca54c279c4cd1c8b9610083430600ffa86f9
+    canonicalized_ast: 0083c78a81a6ec44627ca89fe949a5301ccaa54ead7104b9a2a3fbd979cf9a2c
+    type_inferenced_ast: a8b44ce543535e16db5d93df805dc5693d3a1140798cb336d573986de8dfdbca
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 3f519cf1b5..f05e92f051 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
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EASG0373025]: 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     |                             ^^^^^^^^^^^"
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 ef090731fb..d3e94231c4 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
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: input/dummy.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: db7e9050580f794aa657700225126e8033c0241240874f6e35df0507469be247
+    imports_resolved_ast: db7e9050580f794aa657700225126e8033c0241240874f6e35df0507469be247
+    canonicalized_ast: 55304d82a024ad2418e156ad661224040904775f070995bf1b828d1264c3487f
+    type_inferenced_ast: db99dd94ad4ef9de46304df000494eeda3e8b51835c46e6a3988ee87f91457fa
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 3f519cf1b5..02afe9a48e 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
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EASG0373025]: 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     |                                ^^^^^^^^^^^^^^^^"
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 ef090731fb..41f758d3c4 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
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: input/dummy.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 2730f954bc76f81d29b02a15f8025d75ca963234716112745b806789bb8eb297
+    imports_resolved_ast: 2730f954bc76f81d29b02a15f8025d75ca963234716112745b806789bb8eb297
+    canonicalized_ast: 4e07d5e399fa0f60ab84796ecc6195b2a8da0b3a9e725152465512e98f0ca753
+    type_inferenced_ast: ea0f726ce456c52c62b73aae38afb74b160ae527480d05f3254c0fdaefdad58e
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 3f519cf1b5..1b75a63f99 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
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EASG0373025]: 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     |                             ^^^^^^^^^^^"
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 ef090731fb..5586e09832 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
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: input/dummy.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 445b35e7d287dc14a77b2c1c4c77d9b7b4fbd6e7c31f6f35c91a446eeca29775
+    imports_resolved_ast: 445b35e7d287dc14a77b2c1c4c77d9b7b4fbd6e7c31f6f35c91a446eeca29775
+    canonicalized_ast: 48590d7afce08e9e0cd4a45048faa360c18109098b5a9074dfc21b252a47d3e8
+    type_inferenced_ast: 0cc5d17973908631180a791f151bdc42aa3e8394b3fbc7607f717bc61baaf904
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 3f519cf1b5..67e96d07cf 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
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EASG0373025]: 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     |                                ^^^^^^^^^^^^^^"
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 3f519cf1b5..2362a9a01e 100644
--- a/tests/expectations/compiler/compiler/array/variable_slice_fail.leo.out
+++ b/tests/expectations/compiler/compiler/array/variable_slice_fail.leo.out
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EPAR0370007]: unexpected identifier: expected 'assert', 'error', 'log' -- got 'debug'\n    --> compiler-test:7:17\n     |\n   7 |         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 ef090731fb..3c726a7331 100644
--- a/tests/expectations/compiler/compiler/boolean/and.leo.out
+++ b/tests/expectations/compiler/compiler/boolean/and.leo.out
@@ -1,4 +1,40 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 3
+      num_constraints: 3
+      at: bbd0722c65502a4b903833f9ff9e614e877f9b5c58c670593e2aa290d0457b2f
+      bt: 49e8fa1fd3f85b0f486c49f194e4fff3da5e8039685fca1f3327389cbe9fc180
+      ct: ae5c1ab4ec8811a2ec2efb38b91ab4a8b6fb80bd914b31f9a70559531aeb6a46
+    output:
+      - input_file: input/false_false.in
+        output:
+          registers:
+            x:
+              type: bool
+              value: "false"
+      - input_file: input/false_true.in
+        output:
+          registers:
+            x:
+              type: bool
+              value: "false"
+      - input_file: input/true_false.in
+        output:
+          registers:
+            x:
+              type: bool
+              value: "false"
+      - input_file: input/true_true.in
+        output:
+          registers:
+            x:
+              type: bool
+              value: "true"
+    initial_ast: 2f7c3b9c806a873b6445200eb78a8e0e546ffe64c90fe2133355dd37a342b11b
+    imports_resolved_ast: 2f7c3b9c806a873b6445200eb78a8e0e546ffe64c90fe2133355dd37a342b11b
+    canonicalized_ast: 2f7c3b9c806a873b6445200eb78a8e0e546ffe64c90fe2133355dd37a342b11b
+    type_inferenced_ast: 87b86a66fc6e60502be0b0fb7cf677d5128390aec53f6893827a1bf02fca8370
diff --git a/tests/expectations/compiler/compiler/boolean/conditional.leo.out b/tests/expectations/compiler/compiler/boolean/conditional.leo.out
index ef090731fb..51f3b463d5 100644
--- a/tests/expectations/compiler/compiler/boolean/conditional.leo.out
+++ b/tests/expectations/compiler/compiler/boolean/conditional.leo.out
@@ -1,4 +1,40 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 3
+      num_constraints: 3
+      at: bbd0722c65502a4b903833f9ff9e614e877f9b5c58c670593e2aa290d0457b2f
+      bt: 49e8fa1fd3f85b0f486c49f194e4fff3da5e8039685fca1f3327389cbe9fc180
+      ct: ae5c1ab4ec8811a2ec2efb38b91ab4a8b6fb80bd914b31f9a70559531aeb6a46
+    output:
+      - input_file: input/false_false.in
+        output:
+          registers:
+            x:
+              type: bool
+              value: "false"
+      - input_file: input/false_true.in
+        output:
+          registers:
+            x:
+              type: bool
+              value: "false"
+      - input_file: input/true_false.in
+        output:
+          registers:
+            x:
+              type: bool
+              value: "false"
+      - input_file: input/true_true.in
+        output:
+          registers:
+            x:
+              type: bool
+              value: "true"
+    initial_ast: 5316ba00882aa3f9b538d349ed7141c4ee7c77ec01f6af9911b2652b6cd3e659
+    imports_resolved_ast: 5316ba00882aa3f9b538d349ed7141c4ee7c77ec01f6af9911b2652b6cd3e659
+    canonicalized_ast: 5316ba00882aa3f9b538d349ed7141c4ee7c77ec01f6af9911b2652b6cd3e659
+    type_inferenced_ast: 7933d0a8f47892e42c3c670bc6433e8d820042a7396e10b6a63d22bd5b740f96
diff --git a/tests/expectations/compiler/compiler/boolean/equal.leo.out b/tests/expectations/compiler/compiler/boolean/equal.leo.out
index ef090731fb..4f3e535ca9 100644
--- a/tests/expectations/compiler/compiler/boolean/equal.leo.out
+++ b/tests/expectations/compiler/compiler/boolean/equal.leo.out
@@ -1,4 +1,40 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 3
+      num_constraints: 3
+      at: 01e9615846575e848deea9a9802ceed188fdbfc4660f6f22de41845adcce14ac
+      bt: 49e8fa1fd3f85b0f486c49f194e4fff3da5e8039685fca1f3327389cbe9fc180
+      ct: 7ca43d5c34997f3c866631161cb33186cc016972238c07771ae105ca1b05320d
+    output:
+      - input_file: input/false_false.in
+        output:
+          registers:
+            x:
+              type: bool
+              value: "true"
+      - input_file: input/false_true.in
+        output:
+          registers:
+            x:
+              type: bool
+              value: "false"
+      - input_file: input/true_false.in
+        output:
+          registers:
+            x:
+              type: bool
+              value: "false"
+      - input_file: input/true_true.in
+        output:
+          registers:
+            x:
+              type: bool
+              value: "true"
+    initial_ast: 08f026e24cab51634a7a2a6f1f3b082eace1d4be649cd9ff7c244194891d7d78
+    imports_resolved_ast: 08f026e24cab51634a7a2a6f1f3b082eace1d4be649cd9ff7c244194891d7d78
+    canonicalized_ast: 08f026e24cab51634a7a2a6f1f3b082eace1d4be649cd9ff7c244194891d7d78
+    type_inferenced_ast: 2112e9f631a77bb16ba1561bbe1028a415413f23fd32d21bfe086e071938c845
diff --git a/tests/expectations/compiler/compiler/boolean/not_equal.leo.out b/tests/expectations/compiler/compiler/boolean/not_equal.leo.out
index ef090731fb..d31cdae376 100644
--- a/tests/expectations/compiler/compiler/boolean/not_equal.leo.out
+++ b/tests/expectations/compiler/compiler/boolean/not_equal.leo.out
@@ -1,4 +1,40 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 3
+      num_constraints: 3
+      at: 01e9615846575e848deea9a9802ceed188fdbfc4660f6f22de41845adcce14ac
+      bt: 49e8fa1fd3f85b0f486c49f194e4fff3da5e8039685fca1f3327389cbe9fc180
+      ct: 7ca43d5c34997f3c866631161cb33186cc016972238c07771ae105ca1b05320d
+    output:
+      - input_file: input/false_false.in
+        output:
+          registers:
+            x:
+              type: bool
+              value: "false"
+      - input_file: input/false_true.in
+        output:
+          registers:
+            x:
+              type: bool
+              value: "true"
+      - input_file: input/true_false.in
+        output:
+          registers:
+            x:
+              type: bool
+              value: "true"
+      - input_file: input/true_true.in
+        output:
+          registers:
+            x:
+              type: bool
+              value: "false"
+    initial_ast: 094effa7fe12695679a571f560e1d3e8c299cde8de280f9309010c85f48bab95
+    imports_resolved_ast: 094effa7fe12695679a571f560e1d3e8c299cde8de280f9309010c85f48bab95
+    canonicalized_ast: 094effa7fe12695679a571f560e1d3e8c299cde8de280f9309010c85f48bab95
+    type_inferenced_ast: ab25cb7bf7d8fe3ec64be183550ba8d6acfaf17464cf70ec45c6497fc065ac29
diff --git a/tests/expectations/compiler/compiler/boolean/or.leo.out b/tests/expectations/compiler/compiler/boolean/or.leo.out
index ef090731fb..de8536a60d 100644
--- a/tests/expectations/compiler/compiler/boolean/or.leo.out
+++ b/tests/expectations/compiler/compiler/boolean/or.leo.out
@@ -1,4 +1,40 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 3
+      num_constraints: 3
+      at: 1df8316bf2fa59a7a92242252ec3c26a425f07212a4c716b2fefd4ddabc2d773
+      bt: b95daadce52bb9a3b59565f7078664afbebde46b9b5d6a187e4877926e7a506c
+      ct: fc07ea064122a2b3be5414ded4cd1e51e3aef7240ad33c8888d757909e9c2c07
+    output:
+      - input_file: input/false_false.in
+        output:
+          registers:
+            x:
+              type: bool
+              value: "false"
+      - input_file: input/false_true.in
+        output:
+          registers:
+            x:
+              type: bool
+              value: "true"
+      - input_file: input/true_false.in
+        output:
+          registers:
+            x:
+              type: bool
+              value: "true"
+      - input_file: input/true_true.in
+        output:
+          registers:
+            x:
+              type: bool
+              value: "true"
+    initial_ast: e2facdce5f7cdbed4a3215cc258e54418aac4f4b846349b35e1da67b577b76c9
+    imports_resolved_ast: e2facdce5f7cdbed4a3215cc258e54418aac4f4b846349b35e1da67b577b76c9
+    canonicalized_ast: e2facdce5f7cdbed4a3215cc258e54418aac4f4b846349b35e1da67b577b76c9
+    type_inferenced_ast: fb43dcb50c9822e2d4e4f35e9cc73f0893e508161296be5666cd90c4f7a971bc
diff --git a/tests/expectations/compiler/compiler/char/invalid_char.leo.out b/tests/expectations/compiler/compiler/char/invalid_char.leo.out
index 3f519cf1b5..c788506554 100644
--- a/tests/expectations/compiler/compiler/char/invalid_char.leo.out
+++ b/tests/expectations/compiler/compiler/char/invalid_char.leo.out
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EPAR0370000]: '\n    --> compiler-test:4:23\n     |\n   4 |     const not_valid = '';\n     |                       ^"
diff --git a/tests/expectations/compiler/compiler/char/neq.leo.out b/tests/expectations/compiler/compiler/char/neq.leo.out
index ef090731fb..70b851fbc6 100644
--- a/tests/expectations/compiler/compiler/char/neq.leo.out
+++ b/tests/expectations/compiler/compiler/char/neq.leo.out
@@ -1,4 +1,106 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 6
+      num_constraints: 3
+      at: cc1286e0b6fa2e90fb6f0880431a7c1e2cc37a329fae3aff1c13f51036c66f12
+      bt: 02c492cb6df07172e56cffd0cfd902a8443921e1256a2d907bbabd30bf6b8f6d
+      ct: a1f8e2b168c0f2f28f0ca3f16ce9b25ba7f7c410cfd68b0912bf19c90b53f2a2
+    output:
+      - input_file: inputs/ascii.in
+        output:
+          registers:
+            r:
+              type: char
+              value: "'Z'"
+      - input_file: inputs/escaped_unicode1.in
+        output:
+          registers:
+            r:
+              type: char
+              value: "'a'"
+      - input_file: inputs/escaped_unicode2.in
+        output:
+          registers:
+            r:
+              type: char
+              value: "'a'"
+      - input_file: inputs/escaped_unicode3.in
+        output:
+          registers:
+            r:
+              type: char
+              value: "'a'"
+      - input_file: inputs/escaped_unicode4.in
+        output:
+          registers:
+            r:
+              type: char
+              value: "'a'"
+      - input_file: inputs/escaped_unicode5.in
+        output:
+          registers:
+            r:
+              type: char
+              value: "'a'"
+      - input_file: inputs/escaped_unicode6.in
+        output:
+          registers:
+            r:
+              type: char
+              value: "'a'"
+      - input_file: inputs/escaped.in
+        output:
+          registers:
+            r:
+              type: char
+              value: "'a'"
+      - input_file: inputs/hex1.in
+        output:
+          registers:
+            r:
+              type: char
+              value: "'a'"
+      - input_file: inputs/hex2.in
+        output:
+          registers:
+            r:
+              type: char
+              value: "'a'"
+      - input_file: inputs/unicode1.in
+        output:
+          registers:
+            r:
+              type: char
+              value: "'a'"
+      - input_file: inputs/unicode2.in
+        output:
+          registers:
+            r:
+              type: char
+              value: "'a'"
+      - input_file: inputs/unicode3.in
+        output:
+          registers:
+            r:
+              type: char
+              value: "'a'"
+      - input_file: inputs/unicode4.in
+        output:
+          registers:
+            r:
+              type: char
+              value: "'a'"
+      - input_file: inputs/unicode5.in
+        output:
+          registers:
+            r:
+              type: char
+              value: "'a'"
+    initial_ast: ac56e34b2a2cb282d36133df39d80947dfdfc56b5655b3ba9f408ba529c8f505
+    imports_resolved_ast: ac56e34b2a2cb282d36133df39d80947dfdfc56b5655b3ba9f408ba529c8f505
+    canonicalized_ast: ac56e34b2a2cb282d36133df39d80947dfdfc56b5655b3ba9f408ba529c8f505
+    type_inferenced_ast: 2eecf906226893c46f526a72f272a3f11eb34ada7cc4cd573439ebfed44ba170
diff --git a/tests/expectations/compiler/compiler/char/nonprinting.leo.out b/tests/expectations/compiler/compiler/char/nonprinting.leo.out
index ef090731fb..2743086dc3 100644
--- a/tests/expectations/compiler/compiler/char/nonprinting.leo.out
+++ b/tests/expectations/compiler/compiler/char/nonprinting.leo.out
@@ -1,4 +1,25 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 36
+      num_constraints: 3
+      at: 25579220a31118007fe071d3083ad5a5503f7dc6bd4d51abf15f1a7778a99c86
+      bt: 8f5bf097224289e45b78e01a711900a993240585fe13744f9ab71a9c5c4d9111
+      ct: df019f90846f94966d481bfb6d579bee9c47d281176e210ccd973210afc957a1
+    output:
+      - input_file: inputs/nonprinting.in
+        output:
+          registers:
+            r0:
+              type: "[char; 33]"
+              value: "\"\\u{0}\\u{1}\\u{2}\\u{3}\\u{4}\\u{5}\\u{6}\\u{7}\\u{8}\\t\\n\\u{b}\\u{c}\\r\\u{e}\\u{f}\\u{10}\\u{11}\\u{12}\\u{13}\\u{14}\\u{15}\\u{16}\\u{17}\\u{18}\\u{19}\\u{1a}\\u{1b}\\u{1c}\\u{1d}\\u{1e}\\u{1f} \""
+            r1:
+              type: bool
+              value: "true"
+    initial_ast: da8550065db88bba8f0a982612194f6122ec97025c4af5d3007d3a4d42519cb9
+    imports_resolved_ast: da8550065db88bba8f0a982612194f6122ec97025c4af5d3007d3a4d42519cb9
+    canonicalized_ast: da8550065db88bba8f0a982612194f6122ec97025c4af5d3007d3a4d42519cb9
+    type_inferenced_ast: b3ea99e7660209825c5bb1abcba8c1835cf96b79c8707e616513122ab10ac0d5
diff --git a/tests/expectations/compiler/compiler/char/out.leo.out b/tests/expectations/compiler/compiler/char/out.leo.out
index ef090731fb..e61799dc7c 100644
--- a/tests/expectations/compiler/compiler/char/out.leo.out
+++ b/tests/expectations/compiler/compiler/char/out.leo.out
@@ -1,4 +1,106 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 6
+      num_constraints: 4
+      at: 2859fe6f24016b5634df2791da7de932e68ec32c73b5b573e0c39e968c7a4e12
+      bt: 8143508f19c8eee208a7fbbcfb833aeeace6ba0a761e41d028599d2237cc60fa
+      ct: d0c6feeed1e6b8d5c0e03dc9e25641b7fdc34ad912e2b1488296d4a99ed6cbf5
+    output:
+      - input_file: inputs/ascii.in
+        output:
+          registers:
+            r:
+              type: char
+              value: "'a'"
+      - input_file: inputs/escaped_unicode1.in
+        output:
+          registers:
+            r:
+              type: char
+              value: "'\\u{f}'"
+      - input_file: inputs/escaped_unicode2.in
+        output:
+          registers:
+            r:
+              type: char
+              value: "'å'"
+      - input_file: inputs/escaped_unicode3.in
+        output:
+          registers:
+            r:
+              type: char
+              value: "'Ӡ'"
+      - input_file: inputs/escaped_unicode4.in
+        output:
+          registers:
+            r:
+              type: char
+              value: "'\\u{2764}'"
+      - input_file: inputs/escaped_unicode5.in
+        output:
+          registers:
+            r:
+              type: char
+              value: "'\\u{1f622}'"
+      - input_file: inputs/escaped_unicode6.in
+        output:
+          registers:
+            r:
+              type: char
+              value: "'\\u{10001f}'"
+      - input_file: inputs/escaped.in
+        output:
+          registers:
+            r:
+              type: char
+              value: "'\\''"
+      - input_file: inputs/hex1.in
+        output:
+          registers:
+            r:
+              type: char
+              value: "'*'"
+      - input_file: inputs/hex2.in
+        output:
+          registers:
+            r:
+              type: char
+              value: "'\\u{7f}'"
+      - input_file: inputs/unicode1.in
+        output:
+          registers:
+            r:
+              type: char
+              value: "'\\u{e00f}'"
+      - input_file: inputs/unicode2.in
+        output:
+          registers:
+            r:
+              type: char
+              value: "'å'"
+      - input_file: inputs/unicode3.in
+        output:
+          registers:
+            r:
+              type: char
+              value: "'Ӡ'"
+      - input_file: inputs/unicode4.in
+        output:
+          registers:
+            r:
+              type: char
+              value: "'\\u{2764}'"
+      - input_file: inputs/unicode5.in
+        output:
+          registers:
+            r:
+              type: char
+              value: "'\\u{1f62d}'"
+    initial_ast: 6e1cf86d47e056682c6e51dcf0390eb34505b60d50de60970a688f237525bedf
+    imports_resolved_ast: 6e1cf86d47e056682c6e51dcf0390eb34505b60d50de60970a688f237525bedf
+    canonicalized_ast: 6e1cf86d47e056682c6e51dcf0390eb34505b60d50de60970a688f237525bedf
+    type_inferenced_ast: feb16e72f13a884e3303b336f7f20ff8ff4066a8f9861860e28b9c6901215b76
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 ef090731fb..0fc5a81aef 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
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: input/dummy.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 58f66e3a45b1752bb5dbb454adbbe6136394a7a87bc7b812d154aec1d5eac816
+    imports_resolved_ast: 58f66e3a45b1752bb5dbb454adbbe6136394a7a87bc7b812d154aec1d5eac816
+    canonicalized_ast: f7359bbb8cecd0923c0aa7dd7fd6b01cb2c64e45f1e777709fb14d4e6ba0ee5a
+    type_inferenced_ast: f3a0378b8b60f66ca164be498224592907216262a54a92d878e52f0a85f53389
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 3f519cf1b5..7d1e87d756 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
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+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     |   ^^^^^^^^^^^^^^^^^^^^^^^^^^"
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 ef090731fb..43b8d36554 100644
--- a/tests/expectations/compiler/compiler/circuits/const_self_variable.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/const_self_variable.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: input/dummy.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 50c0f7261d879373f4e01ec3d140a2067ca4e78622c8340e8312d717f6effb05
+    imports_resolved_ast: 50c0f7261d879373f4e01ec3d140a2067ca4e78622c8340e8312d717f6effb05
+    canonicalized_ast: 50c0f7261d879373f4e01ec3d140a2067ca4e78622c8340e8312d717f6effb05
+    type_inferenced_ast: 161edd5d1900f2902bd8cc972308ce7fb0afe7c6cf64ab7cfe952c3f1b3189c0
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 3f519cf1b5..e995bb86db 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
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EASG0373032]: illegal assignment to immutable variable 'self'\n    --> compiler-test:7:9\n     |\n   7 |         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 ef090731fb..4a4ff1f5fd 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
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 95
+      num_constraints: 95
+      at: a57d02fa8b8a2336cc5c407e6a9489a3cb89357e3a3d966f18d8f0f86c21602f
+      bt: e0a9aa0cab882fb690b28137d24f271ccaa334521934a3badc07592a31b7be7f
+      ct: 7b8a2025971971c829b68fc994c6761496807e5b091ba4360d90fb6f35f4656e
+    output:
+      - input_file: func_circ.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: bfd7751e8ea64c6d41af36d968f194a18a5411ac71932a67766f40448ce755f5
+    imports_resolved_ast: bfd7751e8ea64c6d41af36d968f194a18a5411ac71932a67766f40448ce755f5
+    canonicalized_ast: bfd7751e8ea64c6d41af36d968f194a18a5411ac71932a67766f40448ce755f5
+    type_inferenced_ast: 910b51f962861da6011f214a5379bc9296034e3fecda347b17c7db97df833a25
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 ef090731fb..3e8bc37c51 100644
--- a/tests/expectations/compiler/compiler/circuits/duplicate_name_context.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/duplicate_name_context.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: input/dummy.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: d8a66347f480161a2215c92d2cf6ded2d0b49fd76b7eb0036d4fa33de371925a
+    imports_resolved_ast: d8a66347f480161a2215c92d2cf6ded2d0b49fd76b7eb0036d4fa33de371925a
+    canonicalized_ast: d8a66347f480161a2215c92d2cf6ded2d0b49fd76b7eb0036d4fa33de371925a
+    type_inferenced_ast: d5bb87130d78bb39fa948ce868999184f90c78ada176cf08c49051517de3351c
diff --git a/tests/expectations/compiler/compiler/circuits/inline.leo.out b/tests/expectations/compiler/compiler/circuits/inline.leo.out
index ef090731fb..dff5b84d3e 100644
--- a/tests/expectations/compiler/compiler/circuits/inline.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/inline.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 32
+      num_constraints: 32
+      at: 4f36fe54f989d60bb9c279120800f4f44596c2efb7ba703669d4c4d591569780
+      bt: d378030968a64801f66d95699329086ca17e676d8bffcf73f6b431cbda7c7005
+      ct: dbd098af6556ed79650d149b1691be336a46f8bad6f327e942508dd11342575e
+    output:
+      - input_file: inline.in
+        output:
+          registers:
+            r0:
+              type: u32
+              value: "100"
+    initial_ast: c40a1d60f872fdb03ab7379a3abf43439a100b8f1546b76ffeac60c8739e0d68
+    imports_resolved_ast: c40a1d60f872fdb03ab7379a3abf43439a100b8f1546b76ffeac60c8739e0d68
+    canonicalized_ast: c40a1d60f872fdb03ab7379a3abf43439a100b8f1546b76ffeac60c8739e0d68
+    type_inferenced_ast: 3d56ffd95d1b84970e24f10a48f52053717876f062db72d8be93f413f7b2c9a3
diff --git a/tests/expectations/compiler/compiler/circuits/inline_fail.leo.out b/tests/expectations/compiler/compiler/circuits/inline_fail.leo.out
index 3f519cf1b5..8af6948767 100644
--- a/tests/expectations/compiler/compiler/circuits/inline_fail.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/inline_fail.leo.out
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EASG0373002]: missing circuit member 'x' for initialization of circuit 'Foo'\n    --> compiler-test:9:15\n     |\n   9 |     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 3f519cf1b5..53e7c8bd36 100644
--- a/tests/expectations/compiler/compiler/circuits/inline_member_fail.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/inline_member_fail.leo.out
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EASG0373002]: missing circuit member 'x' for initialization of circuit 'Foo'\n    --> compiler-test:9:15\n     |\n   9 |     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 ef090731fb..486a6ec9b8 100644
--- a/tests/expectations/compiler/compiler/circuits/inline_member_pass.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/inline_member_pass.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: inline.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: cf642f2f983cd8bcd6cbca2d2920f5234d79375601c1da3c06f97b6185a5629d
+    imports_resolved_ast: cf642f2f983cd8bcd6cbca2d2920f5234d79375601c1da3c06f97b6185a5629d
+    canonicalized_ast: f99560385252ad2965e39b19402e7c56db402458206187eeb54adc26effd9bb5
+    type_inferenced_ast: c7c5cd5ed24fd3967f19a5ad895aeb7778b3dfadc7965c3f5bc1d44c61448083
diff --git a/tests/expectations/compiler/compiler/circuits/inline_undefined.leo.out b/tests/expectations/compiler/compiler/circuits/inline_undefined.leo.out
index 3f519cf1b5..690ccca5b5 100644
--- a/tests/expectations/compiler/compiler/circuits/inline_undefined.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/inline_undefined.leo.out
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EASG0373000]: failed to resolve circuit: 'Foo'\n    --> compiler-test:4:15\n     |\n   4 |     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 ef090731fb..48b1947e43 100644
--- a/tests/expectations/compiler/compiler/circuits/member_function.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/member_function.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: input/dummy.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 5273a592b167cfe040b2bca7337521084d7a6640651bca584545e9eeb2e4fa88
+    imports_resolved_ast: 5273a592b167cfe040b2bca7337521084d7a6640651bca584545e9eeb2e4fa88
+    canonicalized_ast: 5273a592b167cfe040b2bca7337521084d7a6640651bca584545e9eeb2e4fa88
+    type_inferenced_ast: 6d1bef6ecbba4533266f9478b06e52acc56f04850e99a658abffe39e7e463cdf
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 3f519cf1b5..fdaddd7eed 100644
--- a/tests/expectations/compiler/compiler/circuits/member_function_fail.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/member_function_fail.leo.out
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EASG0373001]: illegal reference to non-existant member 'echoed' of circuit 'Foo'\n    --> compiler-test:11:17\n     |\n  11 |     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 3f519cf1b5..fd47d80984 100644
--- a/tests/expectations/compiler/compiler/circuits/member_function_invalid.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/member_function_invalid.leo.out
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EASG0373008]: 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     |                 ^^^^^^"
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 ef090731fb..5428da7f87 100644
--- a/tests/expectations/compiler/compiler/circuits/member_function_nested.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/member_function_nested.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 161
+      num_constraints: 163
+      at: 4251eba02c1be1eeb4193b08906095b69cdec831207fe2ddba09e783ad4725ce
+      bt: 799dc824f6ba6a51959a395a3b5ebf05629aa241dbca9550190f32380b91ae1c
+      ct: 2aa6128cdf932752c8864c26a6a3d4991f3e6a75b22c1261a3389efa67375b01
+    output:
+      - input_file: inline.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 241f1a42877b012b2e2062cefbd83523a5c719557cb422cf1fbd7efb0f7b1796
+    imports_resolved_ast: 241f1a42877b012b2e2062cefbd83523a5c719557cb422cf1fbd7efb0f7b1796
+    canonicalized_ast: 241f1a42877b012b2e2062cefbd83523a5c719557cb422cf1fbd7efb0f7b1796
+    type_inferenced_ast: 2982ee6fda2fcbd00f64d2c0c75ccacf58ab05961f85e9a64cc0ddec12bb5209
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 ef090731fb..867b688fa2 100644
--- a/tests/expectations/compiler/compiler/circuits/member_static_function.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/member_static_function.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: input/dummy.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 11dfbfa2561534a1c965d8f8862b23ed56be50986903c139b763f88a1ba3ad8d
+    imports_resolved_ast: 11dfbfa2561534a1c965d8f8862b23ed56be50986903c139b763f88a1ba3ad8d
+    canonicalized_ast: 11dfbfa2561534a1c965d8f8862b23ed56be50986903c139b763f88a1ba3ad8d
+    type_inferenced_ast: 6aab6f0cf6a9237ec02b5ce3f4ad8f24c8faa8ec5ccbc7f3af1023d0269dceea
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 3f519cf1b5..9311064dc2 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
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EASG0373027]: 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     |                 ^^^"
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 ef090731fb..a10fb07f86 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
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: input/dummy.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 42f603efbf7ee8ca53394266f33fbf09110420c822385179d656861e8ceb4a32
+    imports_resolved_ast: 42f603efbf7ee8ca53394266f33fbf09110420c822385179d656861e8ceb4a32
+    canonicalized_ast: 92d91209d7675fc14ae1fd44c28d1384f1c56c5852654b4dac46dd123340d9c0
+    type_inferenced_ast: 0527005fb0925ac29af65bb0c12c39991d466c20def41ce7e4a2ded51ae233fc
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 3f519cf1b5..918bf95807 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
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EASG0373001]: illegal reference to non-existant member 'echoed' of circuit 'Foo'\n    --> compiler-test:10:17\n     |\n  10 |     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 ef090731fb..01852c344d 100644
--- a/tests/expectations/compiler/compiler/circuits/member_variable.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/member_variable.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: input/dummy.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: cf41b78f9435c6555014db8aeebe662556f4f8547ee0f3a204d6f522fcf72644
+    imports_resolved_ast: cf41b78f9435c6555014db8aeebe662556f4f8547ee0f3a204d6f522fcf72644
+    canonicalized_ast: cf41b78f9435c6555014db8aeebe662556f4f8547ee0f3a204d6f522fcf72644
+    type_inferenced_ast: d947fa6d8fa1b34cc9822ade386062dbd6ebc2cb5987479d4263bcfa554586cd
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 ef090731fb..dafeae69a8 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
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: input/dummy.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 622baae85ab7776fc38cff17465e8e0dbcdb98f4ba74e734ca494b696cea8ccd
+    imports_resolved_ast: 622baae85ab7776fc38cff17465e8e0dbcdb98f4ba74e734ca494b696cea8ccd
+    canonicalized_ast: 622baae85ab7776fc38cff17465e8e0dbcdb98f4ba74e734ca494b696cea8ccd
+    type_inferenced_ast: c604cecb0efbae6b8ea3d69909c5decbb06d6a2e95ff67661f5936ef8fd951a5
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 3f519cf1b5..eef6c84a76 100644
--- a/tests/expectations/compiler/compiler/circuits/member_variable_fail.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/member_variable_fail.leo.out
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EASG0373001]: illegal reference to non-existant member 'y' of circuit 'Foo'\n    --> compiler-test:9:17\n     |\n   9 |     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 3f519cf1b5..f81a2e6a10 100644
--- a/tests/expectations/compiler/compiler/circuits/mut_function_fail.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/mut_function_fail.leo.out
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EASG0373006]: attempt to assign to function 'bar'\n    --> compiler-test:12:5\n     |\n  12 |     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 3f519cf1b5..a560ec1f26 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
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EASG0373006]: attempt to assign to function 'bar'\n    --> compiler-test:9:9\n     |\n   9 |         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 3f519cf1b5..a560ec1f26 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
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EASG0373006]: attempt to assign to function 'bar'\n    --> compiler-test:9:9\n     |\n   9 |         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 ef090731fb..15d4737f53 100644
--- a/tests/expectations/compiler/compiler/circuits/mut_self_variable.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/mut_self_variable.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: input/dummy.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: ba91ea172a2f753bf4a338f29fff05c358d4dc0cb1c2ef461d492ee4fe2a1114
+    imports_resolved_ast: ba91ea172a2f753bf4a338f29fff05c358d4dc0cb1c2ef461d492ee4fe2a1114
+    canonicalized_ast: 8d1beaecc785aa79a5a6bec47cf10426b9d3d87ccc15c359f12c7d3ee2a95561
+    type_inferenced_ast: 520a83004a666274e62958b6e2025d11ed5e24d888b6bc0ded6d01ee9a3bc634
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 ef090731fb..075d930428 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
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: input/dummy.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: fe7ca41c29d33107a4316b9c6788898217129937cbf1de0f2ea7566a360245f0
+    imports_resolved_ast: fe7ca41c29d33107a4316b9c6788898217129937cbf1de0f2ea7566a360245f0
+    canonicalized_ast: d2b30a9485e7166a0efde9d179432e481a4d40540e1b3eeec043b84d993e66df
+    type_inferenced_ast: 2c666d0e878095617bc562aa74de4fe069401b4a80ba8dba28a47a789f517ab5
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 ef090731fb..1f3edc74a6 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
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: input/dummy.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 659e5fcdd16752c6e3504f821a5afd6f0756bd6b8641f127ba049c2a4c83a088
+    imports_resolved_ast: 659e5fcdd16752c6e3504f821a5afd6f0756bd6b8641f127ba049c2a4c83a088
+    canonicalized_ast: 8cf6113b757cfeee53554c67dd3f380f0f417032b8835259bf30076b19349f61
+    type_inferenced_ast: d4106eb006385de5bf2a56a1ebaa25a65b048f77dda6fb9585c86a9260073585
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 3f519cf1b5..e995bb86db 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
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EASG0373032]: illegal assignment to immutable variable 'self'\n    --> compiler-test:7:9\n     |\n   7 |         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 3f519cf1b5..3bd203bc2a 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
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EASG0373005]: 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     |                   ^"
diff --git a/tests/expectations/compiler/compiler/circuits/mut_variable.leo.out b/tests/expectations/compiler/compiler/circuits/mut_variable.leo.out
index ef090731fb..2d1473ebfd 100644
--- a/tests/expectations/compiler/compiler/circuits/mut_variable.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/mut_variable.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: input/dummy.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 8c4a98dec3d2e9e826e3419c91a251e821861a146325b025c52ff15b5edefe1c
+    imports_resolved_ast: 8c4a98dec3d2e9e826e3419c91a251e821861a146325b025c52ff15b5edefe1c
+    canonicalized_ast: 8c4a98dec3d2e9e826e3419c91a251e821861a146325b025c52ff15b5edefe1c
+    type_inferenced_ast: 2497671092bacab8cb5d75177298a700100bfa8412a48a7115d178e5d9816a6b
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 3f519cf1b5..4e0dd84533 100644
--- a/tests/expectations/compiler/compiler/circuits/mut_variable_fail.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/mut_variable_fail.leo.out
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EASG0373032]: illegal assignment to immutable variable 'f'\n    --> compiler-test:10:5\n     |\n  10 |     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 ef090731fb..3e206e0757 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
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: input/dummy.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 1f7de14429213b2b3b564d664c33e9cea134e1a157b861a1cf0ea1abc90b32f6
+    imports_resolved_ast: 1f7de14429213b2b3b564d664c33e9cea134e1a157b861a1cf0ea1abc90b32f6
+    canonicalized_ast: 94752f37ca7553267f341d2f96e657eb2fe6b5e403a4d3fb7d66d1662b81eb00
+    type_inferenced_ast: e675411217f3465fdc23bab3c2f50c2264452d198ab3dd2e8059e546e54312a4
diff --git a/tests/expectations/compiler/compiler/circuits/pedersen_mock.leo.out b/tests/expectations/compiler/compiler/circuits/pedersen_mock.leo.out
index ef090731fb..ba7f2afaa3 100644
--- a/tests/expectations/compiler/compiler/circuits/pedersen_mock.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/pedersen_mock.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 33823
+      num_constraints: 50719
+      at: 894e21b7ca1c178a167a94f174b4ea0d37b102b394100a15c92e78e16a87acdf
+      bt: 6756180897cb6c9fe53fce913fd9ad1c77a5b537b805da2c7f42de0473d12c94
+      ct: 2f2e90dcee9f8a28e7a9fd4ee37093e4d247d07e4ab97937ecd0ba60ec5dd903
+    output:
+      - input_file: pedersen.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: c341e62f8a3940ddc9527bcd01c814f8d496a1f02ca903b080b6228d155af02b
+    imports_resolved_ast: c341e62f8a3940ddc9527bcd01c814f8d496a1f02ca903b080b6228d155af02b
+    canonicalized_ast: 60cd9f24460e06522814151af817c9d394c779477091aab2c77c77dfe228b611
+    type_inferenced_ast: 876f075ed034c8914b9f74f46f07bd6c2ed3e7d7f1ffb15e756da10e9ec9abf8
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 ef090731fb..e10652f432 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
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: input/dummy.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 5da09287f1d3a5e4ab57f8da2c8094df25c3b35614791e2f6e84a77b609f29b0
+    imports_resolved_ast: 5da09287f1d3a5e4ab57f8da2c8094df25c3b35614791e2f6e84a77b609f29b0
+    canonicalized_ast: de5114bff3425e0c67e9e70e3a0d02bdf2d6c3ed9108dac43a00b79d4db9b3d2
+    type_inferenced_ast: 9a6f5ee1784a1af0a04736e1b3bc886107bbddc5d45bbabd59812d083acacdea
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 ef090731fb..ac229cd771 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
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: input/dummy.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 1dce719e850f6ca6a091fea163d5d6bb069bcdafeeed0a10fb332ba8837e6e5c
+    imports_resolved_ast: 1dce719e850f6ca6a091fea163d5d6bb069bcdafeeed0a10fb332ba8837e6e5c
+    canonicalized_ast: 3bd96f7e9530f426db4a2e12d5a93a5ebcafedbcb7b4549d08ad387fa15918d9
+    type_inferenced_ast: 6bbb246f57aa199b9ef31b61b6e858004617455efe22393892bf0c22f552d69a
diff --git a/tests/expectations/compiler/compiler/circuits/self_circuit.leo.out b/tests/expectations/compiler/compiler/circuits/self_circuit.leo.out
index 3f519cf1b5..d12165d6a1 100644
--- a/tests/expectations/compiler/compiler/circuits/self_circuit.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/self_circuit.leo.out
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EPAR0370009]: unexpected string: expected 'ident', got 'static'\n    --> compiler-test:5:5\n     |\n   5 |     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 3f519cf1b5..25126ce204 100644
--- a/tests/expectations/compiler/compiler/circuits/self_fail.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/self_fail.leo.out
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EASG0373000]: failed to resolve circuit: 'Self'\n    --> compiler-test:4:5\n     |\n   4 |     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 ef090731fb..40907b9500 100644
--- a/tests/expectations/compiler/compiler/circuits/self_member.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/self_member.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: input/dummy.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: c2f6d0da67de691b14cffbdbe20eba613f2ea274c45aba4347045da2446b6af6
+    imports_resolved_ast: c2f6d0da67de691b14cffbdbe20eba613f2ea274c45aba4347045da2446b6af6
+    canonicalized_ast: c2f6d0da67de691b14cffbdbe20eba613f2ea274c45aba4347045da2446b6af6
+    type_inferenced_ast: 3bf3d109f59519ecbfd601c36a8cb89cfb36e1ace395e361860023b8f93fc220
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 3f519cf1b5..85e1e719ef 100644
--- a/tests/expectations/compiler/compiler/circuits/self_member_invalid.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/self_member_invalid.leo.out
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EASG0373008]: cannot call static function 'bar' of circuit 'Foo' from target\n    --> compiler-test:13:17\n     |\n  13 |     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 3f519cf1b5..604086e9eb 100644
--- a/tests/expectations/compiler/compiler/circuits/self_member_undefined.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/self_member_undefined.leo.out
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EASG0373008]: cannot call static function 'bar' of circuit 'Foo' from target\n    --> compiler-test:11:17\n     |\n  11 |     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 ef090731fb..7a1aa047e9 100644
--- a/tests/expectations/compiler/compiler/console/assert.leo.out
+++ b/tests/expectations/compiler/compiler/console/assert.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: assert.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: bd23695040d06dbd59426b363ea66da8c9344aad064615d1b5beb6326933acbc
+    imports_resolved_ast: bd23695040d06dbd59426b363ea66da8c9344aad064615d1b5beb6326933acbc
+    canonicalized_ast: bd23695040d06dbd59426b363ea66da8c9344aad064615d1b5beb6326933acbc
+    type_inferenced_ast: 198e2817e4d6d454d7e1d1eba8226757d7f044b20e6dd4f6962530b177c469c5
diff --git a/tests/expectations/compiler/compiler/console/conditional_assert.leo.out b/tests/expectations/compiler/compiler/console/conditional_assert.leo.out
index ef090731fb..1fb87c4c58 100644
--- a/tests/expectations/compiler/compiler/console/conditional_assert.leo.out
+++ b/tests/expectations/compiler/compiler/console/conditional_assert.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: cond.in
+        output:
+          registers: {}
+      - input_file: cond_2.in
+        output:
+          registers: {}
+    initial_ast: a7b374e2c0a97af2160b5f6faeadb17a12e8908c1a7b3d251194e6867fd98f07
+    imports_resolved_ast: a7b374e2c0a97af2160b5f6faeadb17a12e8908c1a7b3d251194e6867fd98f07
+    canonicalized_ast: ebd1a1f28fafd6fc55c13f4c362ae9a13dee4717e41d99c23fd0d32c5fcdc526
+    type_inferenced_ast: eb15aba7bdb3c3a2f776af8cb80f52f44d6d6ab60e5ee3c032ab4ec8a90a2436
diff --git a/tests/expectations/compiler/compiler/console/error.leo.out b/tests/expectations/compiler/compiler/console/error.leo.out
index ef090731fb..da322715ae 100644
--- a/tests/expectations/compiler/compiler/console/error.leo.out
+++ b/tests/expectations/compiler/compiler/console/error.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: input/dummy.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 2496cb4a0f1486bbacccee48e3b8b93999916e585e238a5c7d63c34235d15a36
+    imports_resolved_ast: 2496cb4a0f1486bbacccee48e3b8b93999916e585e238a5c7d63c34235d15a36
+    canonicalized_ast: 2496cb4a0f1486bbacccee48e3b8b93999916e585e238a5c7d63c34235d15a36
+    type_inferenced_ast: aa056968c0d635d56e2ad011db4df7fec65b62eb7b0ca8ec5c75ca8fca0f33eb
diff --git a/tests/expectations/compiler/compiler/console/log.leo.out b/tests/expectations/compiler/compiler/console/log.leo.out
index ef090731fb..6cf52c9b4d 100644
--- a/tests/expectations/compiler/compiler/console/log.leo.out
+++ b/tests/expectations/compiler/compiler/console/log.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: input/dummy.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 8421d5ef70b41b773b771cb1991a5120a556d13127fb1c6cf7bbd6328150c7d5
+    imports_resolved_ast: 8421d5ef70b41b773b771cb1991a5120a556d13127fb1c6cf7bbd6328150c7d5
+    canonicalized_ast: 8421d5ef70b41b773b771cb1991a5120a556d13127fb1c6cf7bbd6328150c7d5
+    type_inferenced_ast: 34e28d45203ffd3ec760af7baf8db09cfb14584107951fc5803122c0fc13f0e2
diff --git a/tests/expectations/compiler/compiler/console/log_conditional.leo.out b/tests/expectations/compiler/compiler/console/log_conditional.leo.out
index ef090731fb..d2c91fd30b 100644
--- a/tests/expectations/compiler/compiler/console/log_conditional.leo.out
+++ b/tests/expectations/compiler/compiler/console/log_conditional.leo.out
@@ -1,4 +1,28 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 190
+      num_constraints: 190
+      at: a1a80b7c355e1fa32c2136c4dc7a0fd0670affbdda869a9161a3a69f396c6b9a
+      bt: fbf306d0d13bf3d40926ad7adc07f122cb8d065e7e5d55f3416ac30d7ebe7a7c
+      ct: 97e2acff1b76912c52107342393ec04a09af81353a25f7ce330b8492f41381cf
+    output:
+      - input_file: input/input_unequal.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "false"
+      - input_file: input/input_equal.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 389c0d4a68bf27db627b83d460a2947a2321a76fc73e727806a9fe8c7f63fe88
+    imports_resolved_ast: 389c0d4a68bf27db627b83d460a2947a2321a76fc73e727806a9fe8c7f63fe88
+    canonicalized_ast: 389c0d4a68bf27db627b83d460a2947a2321a76fc73e727806a9fe8c7f63fe88
+    type_inferenced_ast: d5fe9155615c6ca70430e6b33661214f14844a61d5064ad56d388fea147abfd7
diff --git a/tests/expectations/compiler/compiler/console/log_fail.leo.out b/tests/expectations/compiler/compiler/console/log_fail.leo.out
index 3f519cf1b5..3d62711430 100644
--- a/tests/expectations/compiler/compiler/console/log_fail.leo.out
+++ b/tests/expectations/compiler/compiler/console/log_fail.leo.out
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EPAR0370009]: unexpected string: expected 'formatted string', got 'hello'\n    --> compiler-test:4:18\n     |\n   4 |     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 ef090731fb..f185bd153a 100644
--- a/tests/expectations/compiler/compiler/console/log_input.leo.out
+++ b/tests/expectations/compiler/compiler/console/log_input.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: input/dummy.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: de5d7719988638c095aba736ca2e09c2037be42e22c3b29bc2c07705e7bfd6ee
+    imports_resolved_ast: de5d7719988638c095aba736ca2e09c2037be42e22c3b29bc2c07705e7bfd6ee
+    canonicalized_ast: de5d7719988638c095aba736ca2e09c2037be42e22c3b29bc2c07705e7bfd6ee
+    type_inferenced_ast: 8e6fed7036467ea6116184b59b25589393393308a1c1fe963dc0ac4a9e76481a
diff --git a/tests/expectations/compiler/compiler/console/log_parameter.leo.out b/tests/expectations/compiler/compiler/console/log_parameter.leo.out
index ef090731fb..3d65eacddb 100644
--- a/tests/expectations/compiler/compiler/console/log_parameter.leo.out
+++ b/tests/expectations/compiler/compiler/console/log_parameter.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: input/dummy.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 97523a5fea528d3defe4ddc2fa7b0a8af6b4ea8a364893c62c467f759cb4ee3f
+    imports_resolved_ast: 97523a5fea528d3defe4ddc2fa7b0a8af6b4ea8a364893c62c467f759cb4ee3f
+    canonicalized_ast: 97523a5fea528d3defe4ddc2fa7b0a8af6b4ea8a364893c62c467f759cb4ee3f
+    type_inferenced_ast: 613f187637adb705d9b61d73f3dd074de1443bc619326e2fd51fa8f722579f82
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 3f519cf1b5..a29353bd2f 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
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [ECMP0376006]: Formatter given 1 containers and found 0 parameters\n    --> compiler-test:4:17\n     |\n   4 |     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 3f519cf1b5..7af538b8d5 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
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [ECMP0376006]: Formatter given 0 containers and found 1 parameters\n    --> compiler-test:4:17\n     |\n   4 |     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 3f519cf1b5..13d96cc9b2 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
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EASG0373027]: failed to resolve variable reference 'a'\n    --> compiler-test:4:23\n     |\n   4 |     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 ef090731fb..e294fa474c 100644
--- a/tests/expectations/compiler/compiler/console/log_parameter_many.leo.out
+++ b/tests/expectations/compiler/compiler/console/log_parameter_many.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: input/dummy.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: af681f8f7631db769ad1f0b9822b86407fb04871adb16e1069b83ee85b6cda3e
+    imports_resolved_ast: af681f8f7631db769ad1f0b9822b86407fb04871adb16e1069b83ee85b6cda3e
+    canonicalized_ast: af681f8f7631db769ad1f0b9822b86407fb04871adb16e1069b83ee85b6cda3e
+    type_inferenced_ast: c9824cee4e17d7cdb31526d24ed5aea45f719596b8dad46f4aec822fbff92e50
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 3f519cf1b5..6b1788bf0c 100644
--- a/tests/expectations/compiler/compiler/core/core_circuit_invalid.leo.out
+++ b/tests/expectations/compiler/compiler/core/core_circuit_invalid.leo.out
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EASG0373043]: failed to resolve import: 'core.unstable.blake2s'\n    --> compiler-test:3:30\n     |\n   3 | import core.unstable.blake2s.BadCircuit; // `BadCircuit` is not included in the blake2s package\n     |                              ^^^^^^^^^^"
diff --git a/tests/expectations/compiler/compiler/core/core_circuit_star_fail.leo.out b/tests/expectations/compiler/compiler/core/core_circuit_star_fail.leo.out
index 3f519cf1b5..c5cfe9c2bc 100644
--- a/tests/expectations/compiler/compiler/core/core_circuit_star_fail.leo.out
+++ b/tests/expectations/compiler/compiler/core/core_circuit_star_fail.leo.out
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EAST0372011]: failed to resolve import: 'core'\n    --> compiler-test:3:13\n     |\n   3 | import core.*; // You cannot import all dependencies from core at once\n     |             ^"
diff --git a/tests/expectations/compiler/compiler/core/core_package_invalid.leo.out b/tests/expectations/compiler/compiler/core/core_package_invalid.leo.out
index 3f519cf1b5..1d348aeb97 100644
--- a/tests/expectations/compiler/compiler/core/core_package_invalid.leo.out
+++ b/tests/expectations/compiler/compiler/core/core_package_invalid.leo.out
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EAST0372011]: failed to resolve import: 'core'\n    --> compiler-test:3:13\n     |\n   3 | import core.bad_circuit; // `bad_circuit` is not a core package\n     |             ^^^^^^^^^^^"
diff --git a/tests/expectations/compiler/compiler/core/core_unstable_package_invalid.leo.out b/tests/expectations/compiler/compiler/core/core_unstable_package_invalid.leo.out
index 3f519cf1b5..ff3bf66480 100644
--- a/tests/expectations/compiler/compiler/core/core_unstable_package_invalid.leo.out
+++ b/tests/expectations/compiler/compiler/core/core_unstable_package_invalid.leo.out
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EAST0372011]: failed to resolve import: 'core.unstable'\n    --> compiler-test:3:22\n     |\n   3 | import core.unstable.bad_circuit; // `bad_circuit` is not a core unstable 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 ef090731fb..ea0de75b49 100644
--- a/tests/expectations/compiler/compiler/definition/out_of_order.leo.out
+++ b/tests/expectations/compiler/compiler/definition/out_of_order.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: input/dummy.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 2b8f9e74a55ef80fa57c803636de64003b225c4cc4b826d0feba3be380ec0b32
+    imports_resolved_ast: 2b8f9e74a55ef80fa57c803636de64003b225c4cc4b826d0feba3be380ec0b32
+    canonicalized_ast: 56bb9f0f648dde5fd777de5bba07c44218022d1b91410b6b111bf49fb119588d
+    type_inferenced_ast: ef607716cf7d424af7888a58b121cf8c43a173424d06b04d8530f0db96dd2c31
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 ef090731fb..e0d71173c8 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
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: input/dummy.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 53fcf08b3818e474a00c1cb70aca58d29bb956611ffdd069a242ef2633af6c50
+    imports_resolved_ast: 80581d0ec6076d59b9fbaff32b646df1120b6ca28cdfe69482cbec641e7e3a1a
+    canonicalized_ast: 57c3de1d28c5b809c265e221ad26d3970445174a2edf2b0f22995e4eb6ffd807
+    type_inferenced_ast: ca53699361b6d4aa80b2f733df6f39bd1a279d68336c2c6cbf196897a26b5e2a
diff --git a/tests/expectations/compiler/compiler/field/add.leo.out b/tests/expectations/compiler/compiler/field/add.leo.out
index ef090731fb..2238b1d873 100644
--- a/tests/expectations/compiler/compiler/field/add.leo.out
+++ b/tests/expectations/compiler/compiler/field/add.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 5
+      num_constraints: 3
+      at: 58e404664f2d64d2fd5fee64bf6e997f542a822b8b17e394fcdd7bed05386db8
+      bt: f91b8601243dbd0d25e7df8f34ff304ca78a295fdfafbe0102ec6ce4fcb3c0f0
+      ct: fe68b86a12c0b8c1585a656d7c4b8c47fbe19677b5da7ce0aae1d80dffb2a2ca
+    output:
+      - input_file: inputs/fields.in
+        output:
+          registers:
+            r:
+              type: bool
+              value: "true"
+    initial_ast: dc99169bc40dff6491c84f2b70dc970fb74d8bcb139ce23ab2b0da5bff720430
+    imports_resolved_ast: dc99169bc40dff6491c84f2b70dc970fb74d8bcb139ce23ab2b0da5bff720430
+    canonicalized_ast: dc99169bc40dff6491c84f2b70dc970fb74d8bcb139ce23ab2b0da5bff720430
+    type_inferenced_ast: 50e3aacddace87d41cc0c5ec8b9819a5c40ca1c9c3574ea883b85b8fd77c1cc3
diff --git a/tests/expectations/compiler/compiler/field/div.leo.out b/tests/expectations/compiler/compiler/field/div.leo.out
index ef090731fb..b39950d9e7 100644
--- a/tests/expectations/compiler/compiler/field/div.leo.out
+++ b/tests/expectations/compiler/compiler/field/div.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 7
+      num_constraints: 5
+      at: 545f3730dcbdb3a3dff41db4263dd41f9be9cf279fdc3cde9518973db0c88685
+      bt: 0a5ae5a6be6351f852bbcc193e57320be38fff279cf6fd65a3239c3a64239b27
+      ct: f25b05da849d0d7fcaab89d41d9624efacb48b7ba983f73a0d5f383b16f7009b
+    output:
+      - input_file: inputs/fields.in
+        output:
+          registers:
+            r:
+              type: bool
+              value: "true"
+    initial_ast: 4f93fba73bf22c15fd88cd83958c1d096f5fcdfbe1c95e871f14cd672e4790e8
+    imports_resolved_ast: 4f93fba73bf22c15fd88cd83958c1d096f5fcdfbe1c95e871f14cd672e4790e8
+    canonicalized_ast: 4f93fba73bf22c15fd88cd83958c1d096f5fcdfbe1c95e871f14cd672e4790e8
+    type_inferenced_ast: 9b23dc524ac18ebeb198dde3e95d00cf452183cbfe0652c232a7ae0b29d4f34e
diff --git a/tests/expectations/compiler/compiler/field/eq.leo.out b/tests/expectations/compiler/compiler/field/eq.leo.out
index ef090731fb..19bf013d51 100644
--- a/tests/expectations/compiler/compiler/field/eq.leo.out
+++ b/tests/expectations/compiler/compiler/field/eq.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 4
+      num_constraints: 3
+      at: ca775a363045cd405dd1d60cd10edb6cc6e4c0b164934951dab0977509b8225c
+      bt: 02c492cb6df07172e56cffd0cfd902a8443921e1256a2d907bbabd30bf6b8f6d
+      ct: a1f8e2b168c0f2f28f0ca3f16ce9b25ba7f7c410cfd68b0912bf19c90b53f2a2
+    output:
+      - input_file: inputs/fields.in
+        output:
+          registers:
+            r:
+              type: bool
+              value: "true"
+    initial_ast: 279038173ca3a2bbeaefe14da8c79f4da2a885f59626a7ebc05a512f38a96e79
+    imports_resolved_ast: 279038173ca3a2bbeaefe14da8c79f4da2a885f59626a7ebc05a512f38a96e79
+    canonicalized_ast: 279038173ca3a2bbeaefe14da8c79f4da2a885f59626a7ebc05a512f38a96e79
+    type_inferenced_ast: 0c67233c225770430cb57c611f70eeb248a7892884b140aa4e141c9a46bb48b8
diff --git a/tests/expectations/compiler/compiler/field/field.leo.out b/tests/expectations/compiler/compiler/field/field.leo.out
index ef090731fb..3c66b486b6 100644
--- a/tests/expectations/compiler/compiler/field/field.leo.out
+++ b/tests/expectations/compiler/compiler/field/field.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 4
+      num_constraints: 3
+      at: cfcc3adf871aef0910034c4c3478746733a9746d44fd678971ee2e1e5e69dffd
+      bt: 02c492cb6df07172e56cffd0cfd902a8443921e1256a2d907bbabd30bf6b8f6d
+      ct: a1f8e2b168c0f2f28f0ca3f16ce9b25ba7f7c410cfd68b0912bf19c90b53f2a2
+    output:
+      - input_file: inputs/fields.in
+        output:
+          registers:
+            r:
+              type: bool
+              value: "true"
+    initial_ast: ab26194ed8eb600aca9329f95d1d34f567f8f23a7f3abf1bd374d68fedf835ab
+    imports_resolved_ast: ab26194ed8eb600aca9329f95d1d34f567f8f23a7f3abf1bd374d68fedf835ab
+    canonicalized_ast: ab26194ed8eb600aca9329f95d1d34f567f8f23a7f3abf1bd374d68fedf835ab
+    type_inferenced_ast: a129961f338ed15ef697362226422a48534480c0985c5023ea5183e9150cba07
diff --git a/tests/expectations/compiler/compiler/field/mul.leo.out b/tests/expectations/compiler/compiler/field/mul.leo.out
index ef090731fb..ca464c6b39 100644
--- a/tests/expectations/compiler/compiler/field/mul.leo.out
+++ b/tests/expectations/compiler/compiler/field/mul.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 6
+      num_constraints: 4
+      at: 7dcea624bdc7a6e6fb5f5e93395e84a96db66898779eb3f5595c4e30e3684f17
+      bt: c21a8e9f463d2fad68fd3a88904dd88f2a3dc7dcb01835357fa4ee457ef1673b
+      ct: 4b4ef106804964b8a1ee7c1dad3d4682d20a0d07f576130bfec9989b353bf596
+    output:
+      - input_file: inputs/fields.in
+        output:
+          registers:
+            r:
+              type: bool
+              value: "false"
+    initial_ast: 8d0d2d5203583fe24eb60eb496dcdc3a83066ad82a8b5e92d35ab6b803e029ea
+    imports_resolved_ast: 8d0d2d5203583fe24eb60eb496dcdc3a83066ad82a8b5e92d35ab6b803e029ea
+    canonicalized_ast: 8d0d2d5203583fe24eb60eb496dcdc3a83066ad82a8b5e92d35ab6b803e029ea
+    type_inferenced_ast: 09780678c1e754f760bf08f1aecc706c058ffa6b73885dd5440f40e6354ac926
diff --git a/tests/expectations/compiler/compiler/field/negate.leo.out b/tests/expectations/compiler/compiler/field/negate.leo.out
index ef090731fb..542372e6d8 100644
--- a/tests/expectations/compiler/compiler/field/negate.leo.out
+++ b/tests/expectations/compiler/compiler/field/negate.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 4
+      num_constraints: 3
+      at: cc1286e0b6fa2e90fb6f0880431a7c1e2cc37a329fae3aff1c13f51036c66f12
+      bt: 02c492cb6df07172e56cffd0cfd902a8443921e1256a2d907bbabd30bf6b8f6d
+      ct: a1f8e2b168c0f2f28f0ca3f16ce9b25ba7f7c410cfd68b0912bf19c90b53f2a2
+    output:
+      - input_file: inputs/fields.in
+        output:
+          registers:
+            r:
+              type: bool
+              value: "true"
+    initial_ast: cbae2cc36e7902468336fe1356e7de41a43288ebfd6b024251086b9d8a32cec5
+    imports_resolved_ast: cbae2cc36e7902468336fe1356e7de41a43288ebfd6b024251086b9d8a32cec5
+    canonicalized_ast: cbae2cc36e7902468336fe1356e7de41a43288ebfd6b024251086b9d8a32cec5
+    type_inferenced_ast: bd4b2bb9ce68719f78756803cbcde2f7dc0aa09f1f2612fa909bd2df39816dfb
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 3f519cf1b5..bcdd357d41 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
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EPAR0370004]: Unexpected white space between terms 1 and field\n    --> compiler-test:4:13\n     |\n   4 |   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 ef090731fb..397414838c 100644
--- a/tests/expectations/compiler/compiler/function/array_input.leo.out
+++ b/tests/expectations/compiler/compiler/function/array_input.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: input/dummy.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: e53134e16501c1dc8fcc1fa68e513aa486d6b4ee2c3ce762da4b45b8f06029d1
+    imports_resolved_ast: e53134e16501c1dc8fcc1fa68e513aa486d6b4ee2c3ce762da4b45b8f06029d1
+    canonicalized_ast: 9024b75cbe9df679b3b0473589f2a1698bfc340d125c9bd76562d9e92548b945
+    type_inferenced_ast: 5c1f49685a0e099ecd11607a35c6e67c97d5dec8551c153cd5789e07006b1318
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 ef090731fb..c391a82254 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
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: input/dummy.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 8541fbc5a256e744d4939e6e221565a0bada891ed6269eceb3a84b288bdeadcc
+    imports_resolved_ast: 8541fbc5a256e744d4939e6e221565a0bada891ed6269eceb3a84b288bdeadcc
+    canonicalized_ast: b43be48e63718566c98d68fb855f0de85845855b9eb80f7929205db537bc1da2
+    type_inferenced_ast: 558ac6d5261ca88b84d1a26447cf01b6e250fecc219441e0b4cb82d31c2e4dcc
diff --git a/tests/expectations/compiler/compiler/function/conditional_return.leo.out b/tests/expectations/compiler/compiler/function/conditional_return.leo.out
index ef090731fb..268f73fc7a 100644
--- a/tests/expectations/compiler/compiler/function/conditional_return.leo.out
+++ b/tests/expectations/compiler/compiler/function/conditional_return.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 95
+      num_constraints: 127
+      at: 2cbb45563950440ec6b2ad12e378f1df49d6a12d4e773f0aa898f65f4eb109ff
+      bt: 7e12153373f45abf58e3b2954d1f1abfc951c7c1203e9e6c96fc37d9d25d8442
+      ct: 50977b6cd45450d9fddf5934d9167f889165f6ff117b03bb780bd6d89434daf4
+    output:
+      - input_file: input/integers.in
+        output:
+          registers:
+            a:
+              type: u32
+              value: "4"
+    initial_ast: cf2d49dcd581c923b4ccfeb9c155de0e836fb8725c3c3af7abc5e6334231ba2f
+    imports_resolved_ast: cf2d49dcd581c923b4ccfeb9c155de0e836fb8725c3c3af7abc5e6334231ba2f
+    canonicalized_ast: cf2d49dcd581c923b4ccfeb9c155de0e836fb8725c3c3af7abc5e6334231ba2f
+    type_inferenced_ast: 085d3126391766edfb8cd9b92bff04cb67175fea26de3ff127392f4aab681cf8
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 3f519cf1b5..3d740f571f 100644
--- a/tests/expectations/compiler/compiler/function/duplicate_definition_fail.leo.out
+++ b/tests/expectations/compiler/compiler/function/duplicate_definition_fail.leo.out
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EASG0373015]: a function named \"main\" already exists in this scope\n    --> compiler-test:8:1\n     |\n   8 | function main() {\n   9 |      ...\n  10 | }\n     | ^"
diff --git a/tests/expectations/compiler/compiler/function/duplicate_parameter_fail.leo.out b/tests/expectations/compiler/compiler/function/duplicate_parameter_fail.leo.out
index 3f519cf1b5..7edb1e7d52 100644
--- a/tests/expectations/compiler/compiler/function/duplicate_parameter_fail.leo.out
+++ b/tests/expectations/compiler/compiler/function/duplicate_parameter_fail.leo.out
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EASG0373045]: a function input named \"a\" already exists in this scope\n    --> compiler-test:3:23\n     |\n   3 | function main(a: u32, a: u32) {\n     |                       ^"
diff --git a/tests/expectations/compiler/compiler/function/empty.leo.out b/tests/expectations/compiler/compiler/function/empty.leo.out
index ef090731fb..0cf4e77f14 100644
--- a/tests/expectations/compiler/compiler/function/empty.leo.out
+++ b/tests/expectations/compiler/compiler/function/empty.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: input/dummy.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: cab7d9499f0129277addc5a322ee12374593a292749c88220555b8ec73a0855a
+    imports_resolved_ast: cab7d9499f0129277addc5a322ee12374593a292749c88220555b8ec73a0855a
+    canonicalized_ast: e95711f5d76b04852f206614b42e6e38cc83b307d617e4eaaca8ade4c65e1c7b
+    type_inferenced_ast: fede77484a950576c3362c642eb3225e51c7a1ad0998950eb77cdd66630f92de
diff --git a/tests/expectations/compiler/compiler/function/iteration.leo.out b/tests/expectations/compiler/compiler/function/iteration.leo.out
index ef090731fb..07abe01cec 100644
--- a/tests/expectations/compiler/compiler/function/iteration.leo.out
+++ b/tests/expectations/compiler/compiler/function/iteration.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: input/dummy.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: a608123169470d0c7e940599945a527f8516b010c900464bc649db94167ee6e0
+    imports_resolved_ast: a608123169470d0c7e940599945a527f8516b010c900464bc649db94167ee6e0
+    canonicalized_ast: 721cf0941964bdfd4835cb367fa7c472ad612ad214686ce4ca7f264faf43b0fd
+    type_inferenced_ast: ff52c35a361f5669d3f9ba5ec58b740c190bb3737a8e2e0485d41f8ace63a7d4
diff --git a/tests/expectations/compiler/compiler/function/iteration_repeated.leo.out b/tests/expectations/compiler/compiler/function/iteration_repeated.leo.out
index ef090731fb..6050614409 100644
--- a/tests/expectations/compiler/compiler/function/iteration_repeated.leo.out
+++ b/tests/expectations/compiler/compiler/function/iteration_repeated.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: input/dummy.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 45b332b088617597f7367003f3cf7c6bf00a69a490f2c64eed1e622eb099d2b6
+    imports_resolved_ast: 45b332b088617597f7367003f3cf7c6bf00a69a490f2c64eed1e622eb099d2b6
+    canonicalized_ast: 71c61b47872ad3a5e9724e6d7bcb315eb06f00234bcbb2ab801861f9561bc9ff
+    type_inferenced_ast: 038d42871e44b9d120c49d4465ebf2551af030799827c08363c0a032f3ba712e
diff --git a/tests/expectations/compiler/compiler/function/multiple_returns.leo.out b/tests/expectations/compiler/compiler/function/multiple_returns.leo.out
index ef090731fb..24c8f41281 100644
--- a/tests/expectations/compiler/compiler/function/multiple_returns.leo.out
+++ b/tests/expectations/compiler/compiler/function/multiple_returns.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: input/dummy.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: c43d366baa8a13cae723e98783ec3afc4efd25da0e9c075b2719af866c142c31
+    imports_resolved_ast: c43d366baa8a13cae723e98783ec3afc4efd25da0e9c075b2719af866c142c31
+    canonicalized_ast: c43d366baa8a13cae723e98783ec3afc4efd25da0e9c075b2719af866c142c31
+    type_inferenced_ast: cd99ea6925a98417f259aa058291494bb866060239e6c36715960f75f1497c2a
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 3f519cf1b5..6b1a084492 100644
--- a/tests/expectations/compiler/compiler/function/multiple_returns_fail.leo.out
+++ b/tests/expectations/compiler/compiler/function/multiple_returns_fail.leo.out
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EASG0373034]: 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     |     ^"
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 3f519cf1b5..a7586b72b2 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
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EASG0373033]: 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     | ^"
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 ef090731fb..48df2bb219 100644
--- a/tests/expectations/compiler/compiler/function/multiple_returns_main.leo.out
+++ b/tests/expectations/compiler/compiler/function/multiple_returns_main.leo.out
@@ -1,4 +1,25 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 2
+      num_constraints: 2
+      at: 401937c524c61a28b4fab76d7a1f85bb628850012af62362a0922610372faf92
+      bt: cdf9a9cee4f2edf55111a95ae60bde9801080f6bde638a5c79273a39a2f9f7f5
+      ct: 643d5437104296e21d906ecb15b2c96ad278f20cfc4af53b12bb6069bd853726
+    output:
+      - input_file: input/dummy.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+            r1:
+              type: bool
+              value: "true"
+    initial_ast: f8b2853c4b5db8f5e8402455ceae54d8ae421c4b950d15fc88fe9f9c9a9701b8
+    imports_resolved_ast: f8b2853c4b5db8f5e8402455ceae54d8ae421c4b950d15fc88fe9f9c9a9701b8
+    canonicalized_ast: f8b2853c4b5db8f5e8402455ceae54d8ae421c4b950d15fc88fe9f9c9a9701b8
+    type_inferenced_ast: 8a3cbc4e3f51c432179167c22247efecc49afe8990c5b2e5a1eb757d0f5adad9
diff --git a/tests/expectations/compiler/compiler/function/newlines.leo.out b/tests/expectations/compiler/compiler/function/newlines.leo.out
index ef090731fb..f786c38c0d 100644
--- a/tests/expectations/compiler/compiler/function/newlines.leo.out
+++ b/tests/expectations/compiler/compiler/function/newlines.leo.out
@@ -1,4 +1,25 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 64
+      num_constraints: 64
+      at: 2517dbbd3bc6f74f73a279bfe223141cdef8fce801edcc2972d568a815e43bcd
+      bt: 3a136bbbffaef5f4563e06a03444cfe5c512767d8c88a8be5b39034e18fe0081
+      ct: 60e36dc4bc844fe8285371cf70c955b79990f094bc50b3401dcac4cbede63e8d
+    output:
+      - input_file: input/integers.in
+        output:
+          registers:
+            a:
+              type: u32
+              value: "0"
+            b:
+              type: u32
+              value: "0"
+    initial_ast: 659826ae1cff74192eca6a5936459d0ec78b73a389516602b4d04cf6b80b1004
+    imports_resolved_ast: 659826ae1cff74192eca6a5936459d0ec78b73a389516602b4d04cf6b80b1004
+    canonicalized_ast: 659826ae1cff74192eca6a5936459d0ec78b73a389516602b4d04cf6b80b1004
+    type_inferenced_ast: 9b105138d6298e591c2882c5162f18c4f0dc223ab4128e09ce35b44ad14d2269
diff --git a/tests/expectations/compiler/compiler/function/repeated.leo.out b/tests/expectations/compiler/compiler/function/repeated.leo.out
index ef090731fb..194613e53c 100644
--- a/tests/expectations/compiler/compiler/function/repeated.leo.out
+++ b/tests/expectations/compiler/compiler/function/repeated.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: input/dummy.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 46f6995392feecd25891b21595f4c575527c5d589d2fe9da94c6ac4bf8e9e7ea
+    imports_resolved_ast: 46f6995392feecd25891b21595f4c575527c5d589d2fe9da94c6ac4bf8e9e7ea
+    canonicalized_ast: 46f6995392feecd25891b21595f4c575527c5d589d2fe9da94c6ac4bf8e9e7ea
+    type_inferenced_ast: 06a0c346db5203f1f3db18eff7c5cf26f6f82aba1ff8b5696bdce5df09dd1b28
diff --git a/tests/expectations/compiler/compiler/function/return.leo.out b/tests/expectations/compiler/compiler/function/return.leo.out
index ef090731fb..5a31d2fb98 100644
--- a/tests/expectations/compiler/compiler/function/return.leo.out
+++ b/tests/expectations/compiler/compiler/function/return.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: input/dummy.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: e90708076fd49dc98d0de821c59d48efbf93b106e50fb43c10583a29b2c34336
+    imports_resolved_ast: e90708076fd49dc98d0de821c59d48efbf93b106e50fb43c10583a29b2c34336
+    canonicalized_ast: e90708076fd49dc98d0de821c59d48efbf93b106e50fb43c10583a29b2c34336
+    type_inferenced_ast: de9f76b0880df3267d0031ecf46d21907a338ef64455ffac3aaf3ef6111148f6
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 3f519cf1b5..0aca9e37e9 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
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EASG0373025]: 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     |            ^^^^^^^^^^^^^"
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 ef090731fb..046e409de6 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
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: input/dummy.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: e6ef0c39821512fd98748cd7d9da04102fff12d3f9332aeb815b36870a3ff0c5
+    imports_resolved_ast: e6ef0c39821512fd98748cd7d9da04102fff12d3f9332aeb815b36870a3ff0c5
+    canonicalized_ast: ed7a3f6a24fa1a3a9e7b4cc8c97ce09440fb9d46123a4e310e44afb58a1a1de6
+    type_inferenced_ast: a0aa0fb8a603954c8370d3520394910163acb807ec344d14b6a26f14f2912262
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 3f519cf1b5..231dbf0254 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
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EASG0373025]: 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     |            ^^^^^^^^^^^^^"
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 ef090731fb..b11f8bf73b 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
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: input/dummy.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: eb9e4ceedbd5812235005bd1f6b113fb8558b59f87acb3df796ff08b15ec14ca
+    imports_resolved_ast: eb9e4ceedbd5812235005bd1f6b113fb8558b59f87acb3df796ff08b15ec14ca
+    canonicalized_ast: 9d46523fc611325b41481c2084e8eb9215573cc46d69b8aa5082bc9489bd9f44
+    type_inferenced_ast: 0f025d6f74e4ca27c52316acd2efcb4cc4158d1ba9ea6f79a46f4e417b918173
diff --git a/tests/expectations/compiler/compiler/function/return_tuple.leo.out b/tests/expectations/compiler/compiler/function/return_tuple.leo.out
index ef090731fb..7d3dd37c72 100644
--- a/tests/expectations/compiler/compiler/function/return_tuple.leo.out
+++ b/tests/expectations/compiler/compiler/function/return_tuple.leo.out
@@ -1,4 +1,25 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 65
+      num_constraints: 66
+      at: 0c8cb242ee3815f5ea6fdd08873577a6cc51fcfbda8cb5671f0b4dc851939d07
+      bt: 32bbce55a7ed95a5b0277ef5ddfa171ad065c5c7c743031d8b0bd8e50e51b0af
+      ct: 1390f763c4329cb5c51853b83d8d5d6e92d8ea8fed8fc7299285908d14c9d3b4
+    output:
+      - input_file: tuple.in
+        output:
+          registers:
+            r0:
+              type: "(u8, u8)"
+              value: "(1, 2)"
+            r1:
+              type: u32
+              value: "103"
+    initial_ast: 3818078d8b7b34d11b38a9e53d326543a357f4db169acc32a52e2b08a8126602
+    imports_resolved_ast: 3818078d8b7b34d11b38a9e53d326543a357f4db169acc32a52e2b08a8126602
+    canonicalized_ast: 3818078d8b7b34d11b38a9e53d326543a357f4db169acc32a52e2b08a8126602
+    type_inferenced_ast: 3eb5fbe370ce358e9d00865a230bb5eb6f2cfdb85f30408a164da43dfe16277d
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 ef090731fb..0d26ed29e9 100644
--- a/tests/expectations/compiler/compiler/function/return_tuple_conditional.leo.out
+++ b/tests/expectations/compiler/compiler/function/return_tuple_conditional.leo.out
@@ -1,4 +1,25 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 130
+      num_constraints: 132
+      at: 7836d2e1325fb4703563ba9378382f72310a39dff412635938abf6aa59e3e316
+      bt: ba2c8bf85cf2734ed977cbe9aa29422a1e6f91a3ac9384a66de46152c5a0dae9
+      ct: d3a10973b5ff8e5b494994d909dc9de72e93f8a9d2de5fd5fca1cd3a4a9e1e77
+    output:
+      - input_file: input/integers.in
+        output:
+          registers:
+            a:
+              type: u32
+              value: "1"
+            b:
+              type: u32
+              value: "1"
+    initial_ast: 6fc23eeb1a55273b0089acff714d6eb2952c3380c262d8e577c123659e501553
+    imports_resolved_ast: 6fc23eeb1a55273b0089acff714d6eb2952c3380c262d8e577c123659e501553
+    canonicalized_ast: 6fc23eeb1a55273b0089acff714d6eb2952c3380c262d8e577c123659e501553
+    type_inferenced_ast: 43750961183eda5acb2302e5a9d9daf2809ee2f34d6ed53ec6494c867d0788a8
diff --git a/tests/expectations/compiler/compiler/function/scope_fail.leo.out b/tests/expectations/compiler/compiler/function/scope_fail.leo.out
index 3f519cf1b5..194746f3ae 100644
--- a/tests/expectations/compiler/compiler/function/scope_fail.leo.out
+++ b/tests/expectations/compiler/compiler/function/scope_fail.leo.out
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EASG0373027]: failed to resolve variable reference 'myGlobal'\n    --> compiler-test:5:12\n     |\n   5 |     return myGlobal;\n     |            ^^^^^^^^"
diff --git a/tests/expectations/compiler/compiler/function/undefined.leo.out b/tests/expectations/compiler/compiler/function/undefined.leo.out
index 3f519cf1b5..8af5ccb5a9 100644
--- a/tests/expectations/compiler/compiler/function/undefined.leo.out
+++ b/tests/expectations/compiler/compiler/function/undefined.leo.out
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EASG0373023]: failed to resolve function: 'my_function'\n    --> compiler-test:5:5\n     |\n   5 |     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 ef090731fb..91e5ab153c 100644
--- a/tests/expectations/compiler/compiler/function/value_unchanged.leo.out
+++ b/tests/expectations/compiler/compiler/function/value_unchanged.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: input/dummy.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: d70652e4acf04c7036a90f79e5bd61b60d37c2198fcccff97a9033f5bf3c9a1b
+    imports_resolved_ast: d70652e4acf04c7036a90f79e5bd61b60d37c2198fcccff97a9033f5bf3c9a1b
+    canonicalized_ast: ca06a00411c276665b7f9cab072e87bb6c4225406aa58703ace0c9db33c4535d
+    type_inferenced_ast: 830057c5a032606c73f38792b8efcc8bd99f7e167482875715cd3db538bcd8f1
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 ef090731fb..1f8e049ff5 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
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 95
+      num_constraints: 95
+      at: 8db8901199024f620eff3a2a9d95e74862d07f8413a6fef789347f012de915ce
+      bt: 134fe0b804695f759f665fe6754e85dc3556cb7c4fd7fca0e78ed2f55d048873
+      ct: 8770257f9e15fb2972e7ca01e77f3d4d0303033d75d9e990b7065a3096ce9cfb
+    output:
+      - input_file: globals.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "false"
+    initial_ast: b4e5073c07791c4726b69f3e60ec66ccebefb7a3811f4a3576fc4042f8c80114
+    imports_resolved_ast: b4e5073c07791c4726b69f3e60ec66ccebefb7a3811f4a3576fc4042f8c80114
+    canonicalized_ast: 03a4e0ffc6deea9c6500a9d91eb683a780e8f5961801bea1aab26c14e4543325
+    type_inferenced_ast: 66d0a55ff2ab6931d5806dcbb2ff23f9dbc41a883f19a45af8a41d3be84e136d
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 3f519cf1b5..5c6cabd3d7 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
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EASG0373032]: illegal assignment to immutable variable 'basic'\n    --> compiler-test:7:5\n     |\n   7 |     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 ef090731fb..7e534a8e9f 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
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: "../input/dummy.in"
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 879c62f85e5eb066be85524e22d73775a649468ee2d42ff96451abefc1529b28
+    imports_resolved_ast: d9bba4501a505c68c5256e0f8177a490126f99945c3f53c42471b466ec0e6377
+    canonicalized_ast: cec8aa804ed735a7cf6504445621c5d5fdc214366e665aaf1e8b3d6e5ee1ff75
+    type_inferenced_ast: 909a8409502b79921a81e425ca9e748a69411ac5ad0c809249b9b82d635a8533
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 ef090731fb..9e299f3691 100644
--- a/tests/expectations/compiler/compiler/import_local/import_all.leo.out
+++ b/tests/expectations/compiler/compiler/import_local/import_all.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: input/dummy.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 6e689aa459b9ea2fa0c18c9dc0f2512db9d430f5c7101cb3104a275711d60210
+    imports_resolved_ast: c4260b58a631ee77b0492ba1354182b2c95d260dcf01a62e2a0797eb5f268478
+    canonicalized_ast: 7e2eaf52ce5c79242b44357609ab667df411190bf7a11228d240c314f0ce0502
+    type_inferenced_ast: be897b5b17a946c2595afcc8a802df5fa4e013ba3acb4159a0123d7cf1941544
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 ef090731fb..c31d7c3d2f 100644
--- a/tests/expectations/compiler/compiler/import_local/import_as.leo.out
+++ b/tests/expectations/compiler/compiler/import_local/import_as.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: input/dummy.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 411dd9625db7686b2cdc3546042b29bc1e51d023b14b0b8397c22bb4db825a77
+    imports_resolved_ast: 3dfd262969fe1c4bd78e4deb971f29b5afa64b540ef60c0a892399ba9f9d20be
+    canonicalized_ast: e7d378e3ff24b63d8a6ec0e2ae1c30148ed9f2028eb80bcf224d55efa3303fd1
+    type_inferenced_ast: d98bff9e38944b9423e8bf2b463d081920d079db600cc8eec3a4d6ba96716745
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 ef090731fb..c672b24d18 100644
--- a/tests/expectations/compiler/compiler/import_local/import_dir.leo.out
+++ b/tests/expectations/compiler/compiler/import_local/import_dir.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: input/dummy.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 105b64dc1443f190ae9034a4b1f0a7c4fbbb104482aed9b7b843c19d16b3aaa0
+    imports_resolved_ast: e7a789c2f6fb7b5c5fdbb5760cd9700ff256985c860df18e7f30dc5df4d392cf
+    canonicalized_ast: f62ac8e2461d1ba60ecb95399945f0a22999bbac751c56927f505f75138b90c2
+    type_inferenced_ast: 3cb02077dd4fffa806a72c61dacca999d404821c3301ea52d2854d86fa65c20a
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 ef090731fb..81bd6d66e8 100644
--- a/tests/expectations/compiler/compiler/import_local/import_files.leo.out
+++ b/tests/expectations/compiler/compiler/import_local/import_files.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: input/dummy.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 17ec836ed9b5f45fbf2b55fc9f7ae5c75d59902113f3e099141b3acbcf9ccb11
+    imports_resolved_ast: ad65dc58d894dad3f8ff60db45610e89f7b7a9ca8bad1bba405d4fbe9b29f240
+    canonicalized_ast: 9164f55bdd309c60e5d7cd5842aeb10227fb61884639c7661811b1be9cb134fe
+    type_inferenced_ast: 741f2ae43a36b8775a733aaaf736ae7df67ec0b8e57bb94425710760b8459d31
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 ef090731fb..551b30394a 100644
--- a/tests/expectations/compiler/compiler/import_local/import_many.leo.out
+++ b/tests/expectations/compiler/compiler/import_local/import_many.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: input/dummy.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: ae6826642faa492e34507695dbd11e5b44c319aecb0b1e78b29ce03ae446d907
+    imports_resolved_ast: e08b138c63ede9de6e090e6b7fbcfbbc27a1ae49b032a6cffcafaa8f76410839
+    canonicalized_ast: e08b138c63ede9de6e090e6b7fbcfbbc27a1ae49b032a6cffcafaa8f76410839
+    type_inferenced_ast: b311680f4429cc16661f774b0547936be148a3dd9f478013adefe575629b88fa
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 ef090731fb..8932b70d43 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
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: input/dummy.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 41aa6d44d33c491b1f66bb2e3d8a6882b43822b211e3e2ac8add332be00535fb
+    imports_resolved_ast: 1e06d16faa2b57dfac9628bdb7d288a24b8cdaeed152b0bb1c1bbcfdbd54dd72
+    canonicalized_ast: 1e06d16faa2b57dfac9628bdb7d288a24b8cdaeed152b0bb1c1bbcfdbd54dd72
+    type_inferenced_ast: 27a376c64ada78a53a328326b0a5592bf683dc036cf1a3f5a15621405678a427
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 ef090731fb..acb4a60b7e 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
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: input/dummy.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: bb86f336b58de89c79741628133e6aa997f3f49a6f066b8c054261e91e3f18a8
+    imports_resolved_ast: 1fe862bf85cf0c88ce3c52066118d544f367984dbe97665b2719281de15c449c
+    canonicalized_ast: 1fe862bf85cf0c88ce3c52066118d544f367984dbe97665b2719281de15c449c
+    type_inferenced_ast: d8f6f5bde53232553d1ff891e7f78823645d9a8984139d06409cb2ccde562e76
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 3f519cf1b5..a93d0799e0 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
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+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     |               ^"
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 3f519cf1b5..fff9ee336c 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
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [ECMP0376035]: Input variable a declared twice\n    --> compiler-test:3:21\n     |\n   3 | function main(const a: u32) {\n     |                     ^"
diff --git a/tests/expectations/compiler/compiler/input_files/program_input/different_types_const_signed_fail.leo.out b/tests/expectations/compiler/compiler/input_files/program_input/different_types_const_signed_fail.leo.out
index 3f519cf1b5..995afe29e0 100644
--- a/tests/expectations/compiler/compiler/input_files/program_input/different_types_const_signed_fail.leo.out
+++ b/tests/expectations/compiler/compiler/input_files/program_input/different_types_const_signed_fail.leo.out
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - aborting due to syntax error
diff --git a/tests/expectations/compiler/compiler/input_files/program_input/different_types_const_unsigned_fail.leo.out b/tests/expectations/compiler/compiler/input_files/program_input/different_types_const_unsigned_fail.leo.out
index 3f519cf1b5..995afe29e0 100644
--- a/tests/expectations/compiler/compiler/input_files/program_input/different_types_const_unsigned_fail.leo.out
+++ b/tests/expectations/compiler/compiler/input_files/program_input/different_types_const_unsigned_fail.leo.out
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - aborting due to syntax error
diff --git a/tests/expectations/compiler/compiler/input_files/program_input/different_types_fail_signed.leo.out b/tests/expectations/compiler/compiler/input_files/program_input/different_types_fail_signed.leo.out
index 3f519cf1b5..995afe29e0 100644
--- a/tests/expectations/compiler/compiler/input_files/program_input/different_types_fail_signed.leo.out
+++ b/tests/expectations/compiler/compiler/input_files/program_input/different_types_fail_signed.leo.out
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - aborting due to syntax error
diff --git a/tests/expectations/compiler/compiler/input_files/program_input/different_types_unsigned_fail.leo.out b/tests/expectations/compiler/compiler/input_files/program_input/different_types_unsigned_fail.leo.out
index 3f519cf1b5..995afe29e0 100644
--- a/tests/expectations/compiler/compiler/input_files/program_input/different_types_unsigned_fail.leo.out
+++ b/tests/expectations/compiler/compiler/input_files/program_input/different_types_unsigned_fail.leo.out
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - aborting due to syntax error
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 ef090731fb..718b98b089 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
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: input/main.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: e729490bdc66ccc317a772b7ccc583a24a5de9dddf0c9d5b1f3eef8623e6a569
+    imports_resolved_ast: e729490bdc66ccc317a772b7ccc583a24a5de9dddf0c9d5b1f3eef8623e6a569
+    canonicalized_ast: e729490bdc66ccc317a772b7ccc583a24a5de9dddf0c9d5b1f3eef8623e6a569
+    type_inferenced_ast: 05f1d5a501376bbcbfac394be538319ab70e516dd9d3b2d7261f840c5c9e5d8d
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 ef090731fb..870a57e321 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
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 31
+      num_constraints: 31
+      at: 9dbf37472d7a01111bf49d73870895e1669fce2d7c86d19fa1cd9bf97102c34a
+      bt: 51c5020146972aaa76ab053686ae5364f63ce6185620eba3780cf86581f29cfe
+      ct: e02be0defc1d4e9bfd935093780a8693b624228f7dc2501ac1f065af2eee9bc8
+    output:
+      - input_file: input/main_array.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: ded49ef329b1c709191a4f6d85c43787e7091b82eb5813f618bf377e7c27a47c
+    imports_resolved_ast: ded49ef329b1c709191a4f6d85c43787e7091b82eb5813f618bf377e7c27a47c
+    canonicalized_ast: ded49ef329b1c709191a4f6d85c43787e7091b82eb5813f618bf377e7c27a47c
+    type_inferenced_ast: 5f12b94ae74deaac2dcc82ae1ee611bd1d1e837a2211722a11cc904790aa4d60
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 3f519cf1b5..97ab65d88b 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
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+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     |               ^"
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 ef090731fb..79d5ab3f9b 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
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 6
+      num_constraints: 5
+      at: a92e6894c8f239ebb17b299d1e49ef48d0c2a8690c56eb1362550ebeeb16a507
+      bt: 8f725e0070f28462aac3db98a5282a9ffa8139f0103651a30df68d193419eacd
+      ct: 6d17d0577f11cb480fd832f84c38611e836e8aa93457407aa17c07c6ef9d3e03
+    output:
+      - input_file: input/main_char.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 28776a06ced3fbb9476dd3abdca0d6d5444c621c26b6883f07d03f2d437677b7
+    imports_resolved_ast: 28776a06ced3fbb9476dd3abdca0d6d5444c621c26b6883f07d03f2d437677b7
+    canonicalized_ast: 28776a06ced3fbb9476dd3abdca0d6d5444c621c26b6883f07d03f2d437677b7
+    type_inferenced_ast: 2bca0f0f14ac8d4eb281b8ce8d612c15a4209b765b68140b5a4b7efefdec5eea
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 ef090731fb..0dbd0e966a 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
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 6
+      num_constraints: 5
+      at: ab475a59a3c7d4299665005e00fe7232cd3ea2238493f31211c33f3057e3c1d7
+      bt: 691f0be87cb1ac6a001269af3d7dbe2c860290538950dc921f318ccf2f319d66
+      ct: 6d17d0577f11cb480fd832f84c38611e836e8aa93457407aa17c07c6ef9d3e03
+    output:
+      - input_file: input/main_field.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "false"
+    initial_ast: d5808d80af60a541768c6ac9f7ce7371cee9654d6f102c1fa4d9be22169d7fae
+    imports_resolved_ast: d5808d80af60a541768c6ac9f7ce7371cee9654d6f102c1fa4d9be22169d7fae
+    canonicalized_ast: d5808d80af60a541768c6ac9f7ce7371cee9654d6f102c1fa4d9be22169d7fae
+    type_inferenced_ast: 84667daeb71be0318df27b0172d186013b8eaae16a75a3676d7f4a6366ef9dbc
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 ef090731fb..a87a815581 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
@@ -1,4 +1,19 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 12
+      num_constraints: 9
+      at: df88b362955f00b8c41afd9e31c9e41e4b8254a71ea0f3f2f97d5b6b8b767415
+      bt: df58aff07b131c34e977ffb5657bbd21852f59fd7e059117c419c3c6070a7053
+      ct: 335cdfb09b13172262042abccf4560511666deaa63cc1b3f30dd35dcb554840f
+    output:
+      - input_file: input/main_group.in
+        output:
+          registers: {}
+    initial_ast: 731684bc8e22a3bbde7816d4f9ddc4db9561244b81caff4ef23e90ab5949ef60
+    imports_resolved_ast: 731684bc8e22a3bbde7816d4f9ddc4db9561244b81caff4ef23e90ab5949ef60
+    canonicalized_ast: d4b3e34c002f7dd2bfb3b12b5028d44a84113e9c9a2d22d7576763cd59c7521b
+    type_inferenced_ast: 326c07a3eae5f211848b943adcb05103121e0b241967bfd4a545ff6f6566f699
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 ef090731fb..0f10b6a61a 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
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 223
+      num_constraints: 223
+      at: 87fe022f8971e90450cc219824d04ea84f08040429143393193aa2de0321759f
+      bt: 65e18f4e1e32d72f87d238401f8397b5d8ba20e7da7d50cc5930faa5673cdb77
+      ct: 389354117abccc4ef9f4822705889f64f1d16b7e0d2adae52005c7b91b0ccabb
+    output:
+      - input_file: input/main_multi_dimension_array.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: f74b907c08c1bfd4d2afc9df5589bc2aed1923db5e858c5cc6046f5aed735cf2
+    imports_resolved_ast: f74b907c08c1bfd4d2afc9df5589bc2aed1923db5e858c5cc6046f5aed735cf2
+    canonicalized_ast: f80f2c0fd5fa415c5ca0b8295d918a884ae8590f5f9760947ca5a0513f531f73
+    type_inferenced_ast: a866c7acc69cab458f8b6fe729b35cfd4fc66d578155382d130b24e2e092df8b
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 ef090731fb..1f690616a0 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
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 3
+      num_constraints: 3
+      at: 01e9615846575e848deea9a9802ceed188fdbfc4660f6f22de41845adcce14ac
+      bt: 49e8fa1fd3f85b0f486c49f194e4fff3da5e8039685fca1f3327389cbe9fc180
+      ct: 7ca43d5c34997f3c866631161cb33186cc016972238c07771ae105ca1b05320d
+    output:
+      - input_file: input/main_multiple.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 094effa7fe12695679a571f560e1d3e8c299cde8de280f9309010c85f48bab95
+    imports_resolved_ast: 094effa7fe12695679a571f560e1d3e8c299cde8de280f9309010c85f48bab95
+    canonicalized_ast: 094effa7fe12695679a571f560e1d3e8c299cde8de280f9309010c85f48bab95
+    type_inferenced_ast: ab25cb7bf7d8fe3ec64be183550ba8d6acfaf17464cf70ec45c6497fc065ac29
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 ef090731fb..0c516a8133 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
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 26
+      num_constraints: 21
+      at: b4c72e270b0067ca380a70c8cb2632c33b17e7323b3817deb04e5fe72aa99c13
+      bt: d476126ef8e9588f0ed444a75f025c1c468618ae84829d4d2deb37679e537563
+      ct: 789b2eca89cbf96799b7c12eaa66df8efcec7fe1c6c8af5e741fe4955c5dee32
+    output:
+      - input_file: input/main_string.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: a2b01e8b8d8311d8a890b0e008689dc890b104d2b6fcfc82a16e1e45975ea68b
+    imports_resolved_ast: a2b01e8b8d8311d8a890b0e008689dc890b104d2b6fcfc82a16e1e45975ea68b
+    canonicalized_ast: 8774633846aa1d61e6534c0e930777ba9452aa7368116928ba1188501d30a495
+    type_inferenced_ast: be4ce222d81884b156c4fd0567755685283f7502ab192fcfaf562f0b0737a2e0
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 ef090731fb..9c084bd2f6 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
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 33
+      num_constraints: 33
+      at: 16cd2aaf51f97f0d967f934facd55d3da0f128b5548ca7d9033099dabb8755aa
+      bt: 13ce6219d223223b0e2a5b8bab43bda704fb2509e20143c1c8dc28238c65a0c3
+      ct: 1a2cc6ebebf9b0d70351fb54db6ab269bfec125b7d84dea8450ee1566d937a38
+    output:
+      - input_file: input/main_tuple.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 01b9440246bf141fbdc27ab27f53d1b4f42415fb70a2f4d838d0a3a542fe7133
+    imports_resolved_ast: 01b9440246bf141fbdc27ab27f53d1b4f42415fb70a2f4d838d0a3a542fe7133
+    canonicalized_ast: 01b9440246bf141fbdc27ab27f53d1b4f42415fb70a2f4d838d0a3a542fe7133
+    type_inferenced_ast: 2c84fc650ddadfb9a335688f4490156e05a5c5ea1b3ac935d8d5f2f2d3cd8c58
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 3f519cf1b5..2699fc0238 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
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+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     |               ^"
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 3f519cf1b5..29c1c52cbb 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
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EASG0373024]: failed to resolve type for variable definition 'unknown'\n    --> compiler-test:4:17\n     |\n   4 |     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 3f519cf1b5..29564d375c 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
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [ECMP0376035]: Input variable a declared twice\n    --> compiler-test:3:15\n     |\n   3 | 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 ef090731fb..49969669f4 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
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 3
+      num_constraints: 3
+      at: 83b1bd5868cfd70d986276428ff81a9120e0848a6f44d7bd6d5a25d6063c7669
+      bt: 5a01b0726c5b948a3b336179b77081865f51dc2f1de630ce95b03424a5ae7998
+      ct: 7ca43d5c34997f3c866631161cb33186cc016972238c07771ae105ca1b05320d
+    output:
+      - input_file: input/basic.in
+        output:
+          registers:
+            b:
+              type: bool
+              value: "true"
+    initial_ast: dc7f40a1cfc4daa659784bf538f1273145b430875116ef1aad7fd778dcb5f736
+    imports_resolved_ast: dc7f40a1cfc4daa659784bf538f1273145b430875116ef1aad7fd778dcb5f736
+    canonicalized_ast: dc7f40a1cfc4daa659784bf538f1273145b430875116ef1aad7fd778dcb5f736
+    type_inferenced_ast: f86a95c627e69d54fd6f1f651eda77cfc1ac1fab33b1ef8bbe5bf511a8c4beb7
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 ef090731fb..b284218dd5 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
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 847
+      num_constraints: 847
+      at: 7a173ccf91016726958e205fb7a60e954c826a7d8f3dbfba86417c4dad8a8809
+      bt: ef390629424c3ec765f6759eba6be4285e92bbb34e1fdb083ea723021fda1a83
+      ct: 048882f78f795732711ba34cb6892495a782c2573a1358a9c679b97fa5ea5fe7
+    output:
+      - input_file: input/token_withdraw.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 6b051c3f9ce82efb30d3ba89764cc9c2607a126cb0cede72ad55ecda6c9d996d
+    imports_resolved_ast: 6b051c3f9ce82efb30d3ba89764cc9c2607a126cb0cede72ad55ecda6c9d996d
+    canonicalized_ast: 6b051c3f9ce82efb30d3ba89764cc9c2607a126cb0cede72ad55ecda6c9d996d
+    type_inferenced_ast: 3c04200d560739b0d551204b65e56abc11f26843b99aa0361362f61f0d6a3328
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 ef090731fb..4794c19048 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
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: input/main.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 815bdfe9a6fb4bb4795686872a62882c0a953e7a5313ef7da066b11770fcb089
+    imports_resolved_ast: 815bdfe9a6fb4bb4795686872a62882c0a953e7a5313ef7da066b11770fcb089
+    canonicalized_ast: 815bdfe9a6fb4bb4795686872a62882c0a953e7a5313ef7da066b11770fcb089
+    type_inferenced_ast: 437a14fea047eb893748b86f8a5cedb18ae7960ea92a5075b5a215125cc27863
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 ef090731fb..6f82dd1cdb 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
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: input/main_array.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 48d4334146fe85c3bf1cdd75bcf4bf5026e50bb04b624ddbe1fc9d0eb3e510a3
+    imports_resolved_ast: 48d4334146fe85c3bf1cdd75bcf4bf5026e50bb04b624ddbe1fc9d0eb3e510a3
+    canonicalized_ast: 48d4334146fe85c3bf1cdd75bcf4bf5026e50bb04b624ddbe1fc9d0eb3e510a3
+    type_inferenced_ast: 90903b46ecc931e02742ad4caa7dce04f5efe18cad4260d1c9de5c29cf378a93
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 3f519cf1b5..2b6757d01d 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
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+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     |                     ^"
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 ef090731fb..1432cad627 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
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: input/main_char.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 54251e3a72e7c6743344cb585df6b89aef0d5b965aa13d090e89044209bf647a
+    imports_resolved_ast: 54251e3a72e7c6743344cb585df6b89aef0d5b965aa13d090e89044209bf647a
+    canonicalized_ast: 54251e3a72e7c6743344cb585df6b89aef0d5b965aa13d090e89044209bf647a
+    type_inferenced_ast: b3a96fc8bbfda13b19f509c3ed5bed3908ca929219581c8d7b56bb7f81590770
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 ef090731fb..f47c13cea4 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
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: input/main_field.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "false"
+    initial_ast: 24edf3e347b161cb68d4dd19a0a56b457ee1f1668a29ad637ff22eaa0cbb384e
+    imports_resolved_ast: 24edf3e347b161cb68d4dd19a0a56b457ee1f1668a29ad637ff22eaa0cbb384e
+    canonicalized_ast: 24edf3e347b161cb68d4dd19a0a56b457ee1f1668a29ad637ff22eaa0cbb384e
+    type_inferenced_ast: 85af373372ad915f6633a0099e914ddc05e70f7d5fd92ad25be47c3627c68149
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 ef090731fb..21cd56b63c 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
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: input/main_group.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: d6802e04fa242223923742fc9e82345b67b73138d867608c62c55999a356691d
+    imports_resolved_ast: d6802e04fa242223923742fc9e82345b67b73138d867608c62c55999a356691d
+    canonicalized_ast: d6802e04fa242223923742fc9e82345b67b73138d867608c62c55999a356691d
+    type_inferenced_ast: 0c53a395040f8aea133164e05ad0496f712ebd082228a635b4d181c9f4508127
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 ef090731fb..4952ae0921 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
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 223
+      num_constraints: 223
+      at: 87fe022f8971e90450cc219824d04ea84f08040429143393193aa2de0321759f
+      bt: 65e18f4e1e32d72f87d238401f8397b5d8ba20e7da7d50cc5930faa5673cdb77
+      ct: 389354117abccc4ef9f4822705889f64f1d16b7e0d2adae52005c7b91b0ccabb
+    output:
+      - input_file: input/main_multi_dimension_array.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 473f66e852f694cee2d87935eee5fe7306ee404b935515ad400a06872b124e5b
+    imports_resolved_ast: 473f66e852f694cee2d87935eee5fe7306ee404b935515ad400a06872b124e5b
+    canonicalized_ast: 13943d9f8f5fb1fc9e5f9f025d3a09bc59db16494c5c225b7e4b8a7a53893c51
+    type_inferenced_ast: 95eb1672ac750fbac9e1fe689a8516c00f83108e156ddda9d6cd69003d50a222
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 ef090731fb..8a3f5633c2 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
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: input/main_multiple.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 0fe6762404e0aeb23e1adaec3a6ab638b06843ecea823306f364cf1aedd4fd07
+    imports_resolved_ast: 0fe6762404e0aeb23e1adaec3a6ab638b06843ecea823306f364cf1aedd4fd07
+    canonicalized_ast: 0fe6762404e0aeb23e1adaec3a6ab638b06843ecea823306f364cf1aedd4fd07
+    type_inferenced_ast: 94ed42f51b4f47128964754310daf696a8bcd47e3e94e23d3e90bc2132dc9682
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 ef090731fb..9b1ad3623e 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
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: input/main_string.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 4eee03b645a71b2cbe735305679051d2292f219f5db6ffc2bbb539188c6b377a
+    imports_resolved_ast: 4eee03b645a71b2cbe735305679051d2292f219f5db6ffc2bbb539188c6b377a
+    canonicalized_ast: 8f1fdffc6178e5375519646b43359d4e067a897c2ca2e360b67dbfc5523103d3
+    type_inferenced_ast: d177e4046f5c7fde3ad62e66677db285279075784874f9961dec6a445d65278d
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 ef090731fb..63b0e047a4 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
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: input/main_tuple.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 2c4ba5703d0e1adf9d8ba82a2369531fe720fddce8da06eedb189c2a78f12b01
+    imports_resolved_ast: 2c4ba5703d0e1adf9d8ba82a2369531fe720fddce8da06eedb189c2a78f12b01
+    canonicalized_ast: 2c4ba5703d0e1adf9d8ba82a2369531fe720fddce8da06eedb189c2a78f12b01
+    type_inferenced_ast: a75332a525dafba95c50a29eac05374ebf52b6ae7717966d15dec81ce1bd8623
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 3f519cf1b5..6ab90fa4b5 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
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+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     |                     ^"
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 ef090731fb..b6092883b1 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
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 64
+      num_constraints: 64
+      at: 2517dbbd3bc6f74f73a279bfe223141cdef8fce801edcc2972d568a815e43bcd
+      bt: 3a136bbbffaef5f4563e06a03444cfe5c512767d8c88a8be5b39034e18fe0081
+      ct: 60e36dc4bc844fe8285371cf70c955b79990f094bc50b3401dcac4cbede63e8d
+    output:
+      - input_file: input/array.in
+        output:
+          registers:
+            r2:
+              type: "[[u8; 4]; 2]"
+              value: "\"[0, 0, 0, 0][0, 0, 0, 0]\""
+    initial_ast: 010d0b94b6ddb74416025e35b34ce1c7feb5a768d8bf0f733c530f49b00f70c4
+    imports_resolved_ast: 010d0b94b6ddb74416025e35b34ce1c7feb5a768d8bf0f733c530f49b00f70c4
+    canonicalized_ast: 010d0b94b6ddb74416025e35b34ce1c7feb5a768d8bf0f733c530f49b00f70c4
+    type_inferenced_ast: ab23cd03d09ac3221aa71d2bc7e5c6fe13fa3f9eb4293a3ae25cb739cb608bd9
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 3f519cf1b5..3fd558ebfb 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
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+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     | ^"
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 ef090731fb..d6fc879e40 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
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 17
+      num_constraints: 18
+      at: 54a6bab98206b1a92fff5ae07a6838e5ec25365afa7756a58b492f7a288c8654
+      bt: 322eda19d0ceaeddbc296d56bce789cf038e440fd8fbd6e118606a4248844b2c
+      ct: 748f424d53dc4319858b691a3c593aec6165ed4e67847b32285a436b9e2e7cc1
+    output:
+      - input_file: input/main.in
+        output:
+          registers:
+            r:
+              type: u8
+              value: "101"
+    initial_ast: f47238f679ee2b220452140330e99f2a6cf063be523ed8e4ce0e9d56cf806128
+    imports_resolved_ast: f47238f679ee2b220452140330e99f2a6cf063be523ed8e4ce0e9d56cf806128
+    canonicalized_ast: f47238f679ee2b220452140330e99f2a6cf063be523ed8e4ce0e9d56cf806128
+    type_inferenced_ast: 6c62586bdcd983ee1ac3ae22b88577a5c2f0c5e5e5ed711f86c12f434917fd5f
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 ef090731fb..36e4948b29 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
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 527
+      num_constraints: 527
+      at: 7f6c7713392a44fa83a3fbffafd830d6e20356d72aff3d67f78c70ea5439a735
+      bt: b21f2049f4ae8c11dff5de8b33d532f3ea7637bfdbd09395d056495472c1853a
+      ct: 096693f8f4f40acd0e3f82bd256738e157f33989bcc68a7b8eabe44e8449bbb0
+    output:
+      - input_file: input/dummy.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 6fce132965ff40126f6175d2abe5b8598004e90cdb29c4707f7c63dbe1093474
+    imports_resolved_ast: 6fce132965ff40126f6175d2abe5b8598004e90cdb29c4707f7c63dbe1093474
+    canonicalized_ast: 6fce132965ff40126f6175d2abe5b8598004e90cdb29c4707f7c63dbe1093474
+    type_inferenced_ast: 75cff35e24806b8a66431668c319a96e95f5106a8fe513eb53abb264beab4390
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 ef090731fb..9ee8ceab48 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
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 511
+      num_constraints: 511
+      at: bb121a0b56bee9895a337644cf8ece2f09dcf9113cd75c29f9bf26d635ba6d22
+      bt: 4a54bb6ffc0c9de1f8f349449b9071745f3db6985adb9b1d657e8aaa4309cc41
+      ct: a0736e8c8f3bb1c39a147348754e53dfd31fd76a1df9cd9960472841bcc531df
+    output:
+      - input_file: input/dummy.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: a155141331da2d7bdaa11ae738d6ca2e1d62d875c872b8b8213184d989cc8baa
+    imports_resolved_ast: a155141331da2d7bdaa11ae738d6ca2e1d62d875c872b8b8213184d989cc8baa
+    canonicalized_ast: a155141331da2d7bdaa11ae738d6ca2e1d62d875c872b8b8213184d989cc8baa
+    type_inferenced_ast: b4969327ce0ee30ab1526ce3b2479a7bf6efa38cb9616477f854cd28b1faf61a
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 ef090731fb..1faa7ef6dd 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
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: input/dummy.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 0c90e79ea8f0f5b227c498d43b8f308afb6438185fe33531617ac04b301941ce
+    imports_resolved_ast: 0c90e79ea8f0f5b227c498d43b8f308afb6438185fe33531617ac04b301941ce
+    canonicalized_ast: 0c90e79ea8f0f5b227c498d43b8f308afb6438185fe33531617ac04b301941ce
+    type_inferenced_ast: 8a53562f4f66ec6d9ad612558abfe45fa08c5b37943f7a46226ea7909fcf85e0
diff --git a/tests/expectations/compiler/compiler/input_files/program_state/section_invalid.leo.out b/tests/expectations/compiler/compiler/input_files/program_state/section_invalid.leo.out
index 3f519cf1b5..995afe29e0 100644
--- a/tests/expectations/compiler/compiler/input_files/program_state/section_invalid.leo.out
+++ b/tests/expectations/compiler/compiler/input_files/program_state/section_invalid.leo.out
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - aborting due to syntax error
diff --git a/tests/expectations/compiler/compiler/input_files/program_state/section_undefined.leo.out b/tests/expectations/compiler/compiler/input_files/program_state/section_undefined.leo.out
index 3f519cf1b5..995afe29e0 100644
--- a/tests/expectations/compiler/compiler/input_files/program_state/section_undefined.leo.out
+++ b/tests/expectations/compiler/compiler/input_files/program_state/section_undefined.leo.out
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - aborting due to syntax error
diff --git a/tests/expectations/compiler/compiler/input_files/program_state/visibility_fail.leo.out b/tests/expectations/compiler/compiler/input_files/program_state/visibility_fail.leo.out
index 3f519cf1b5..995afe29e0 100644
--- a/tests/expectations/compiler/compiler/input_files/program_state/visibility_fail.leo.out
+++ b/tests/expectations/compiler/compiler/input_files/program_state/visibility_fail.leo.out
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - aborting due to syntax error
diff --git a/tests/expectations/compiler/compiler/integers/i128/add.leo.out b/tests/expectations/compiler/compiler/integers/i128/add.leo.out
index ef090731fb..c636d50366 100644
--- a/tests/expectations/compiler/compiler/integers/i128/add.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/add.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1404
+      num_constraints: 1405
+      at: b738445f9fa8039b6d93543917f21faebabd70ce5f0fc95bc2b82f9a96653e78
+      bt: 7d12a27b02e7c965ac1775f6711d6da181ea2a809f8bf644ab1755929013f7e4
+      ct: e7b4e2f5a4e98c3a9016990ee3dd9bbf5e55e7a98e1dc3ac7d4b458ecdcdde7e
+    output:
+      - input_file: i128.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 642f93bdca1804ff63c7d74a395836b4fae13013a8a208bd8a36647a0a51a9c4
+    imports_resolved_ast: 642f93bdca1804ff63c7d74a395836b4fae13013a8a208bd8a36647a0a51a9c4
+    canonicalized_ast: 642f93bdca1804ff63c7d74a395836b4fae13013a8a208bd8a36647a0a51a9c4
+    type_inferenced_ast: e72578824d94283a0c95b48e47d756370f3ac29b54e82648870b8f09e592665f
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 ef090731fb..277e2de091 100644
--- a/tests/expectations/compiler/compiler/integers/i128/console_assert.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/console_assert.leo.out
@@ -1,4 +1,19 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 511
+      num_constraints: 511
+      at: f130bde196ac7e190b505a42dfb30c41772c4c7eafe9e7203be9222892b767ce
+      bt: 7ac37b347f82644239128aa66e9caf34375b1fd860069659581477883d92fb7a
+      ct: 3e4c7833e73f9ee37e42c796e8af7a6d417a012b776b348abedbfd317110858d
+    output:
+      - input_file: i128.in
+        output:
+          registers: {}
+    initial_ast: 941047af9fff3f74b6e522fe98c16108e9e9b7ec4514cff470af18a68316f614
+    imports_resolved_ast: 941047af9fff3f74b6e522fe98c16108e9e9b7ec4514cff470af18a68316f614
+    canonicalized_ast: ca55154cc08f628f72fd7c45e107ebf849f38c077dfe08e80082db1feee4b4ed
+    type_inferenced_ast: 9396147f96ed2ce2ec5b359b65ebe55d824888fb3c778b83486a4cd3b61e0785
diff --git a/tests/expectations/compiler/compiler/integers/i128/div.leo.out b/tests/expectations/compiler/compiler/integers/i128/div.leo.out
index ef090731fb..5ff4b0fdf7 100644
--- a/tests/expectations/compiler/compiler/integers/i128/div.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/div.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 264820
+      num_constraints: 330868
+      at: 90e89968758ed4552073b4217621741d7471a683f004aff63679ee176690ebb4
+      bt: a83224709a5d2ea9ba982fd81f35188e299590ab7ce201773857c54a39b27d93
+      ct: 26d5f56acb9effc130128af10b00b426d2396e7d8962636268b3dd08ba8df5e3
+    output:
+      - input_file: i128.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 9b5ecfc8daa3ee55e1e24a6f6e19f5a6f5c4725efabf7074bc22657f7ad89b26
+    imports_resolved_ast: 9b5ecfc8daa3ee55e1e24a6f6e19f5a6f5c4725efabf7074bc22657f7ad89b26
+    canonicalized_ast: 9b5ecfc8daa3ee55e1e24a6f6e19f5a6f5c4725efabf7074bc22657f7ad89b26
+    type_inferenced_ast: be5f66a85fa7ae6cd81164c6da438e2e146558c9b429993d83d4177b8b5c4469
diff --git a/tests/expectations/compiler/compiler/integers/i128/eq.leo.out b/tests/expectations/compiler/compiler/integers/i128/eq.leo.out
index ef090731fb..3db655c771 100644
--- a/tests/expectations/compiler/compiler/integers/i128/eq.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/eq.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 513
+      num_constraints: 513
+      at: 75b34d698fc2359df51943102062181aa5ee62b84a221747dfd7f8868bf48efd
+      bt: c1e085f0d8047bc5b5f574ca9de7d79a0ce3b3235e3bfb83ff15aecf05ad1323
+      ct: c224fec21cf5a2b24eb94033a20aeb4729d3d0cf596339145cb49ea6a44cc5d8
+    output:
+      - input_file: i128.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 4aab7c6dbe39e04833f6a043508421d22d62b87fa931fa8940ce8af5c876cbe1
+    imports_resolved_ast: 4aab7c6dbe39e04833f6a043508421d22d62b87fa931fa8940ce8af5c876cbe1
+    canonicalized_ast: 4aab7c6dbe39e04833f6a043508421d22d62b87fa931fa8940ce8af5c876cbe1
+    type_inferenced_ast: b4067b1b34a4f7984160a017456f026691c60f150c59c9e4817ea740c338abb7
diff --git a/tests/expectations/compiler/compiler/integers/i128/ge.leo.out b/tests/expectations/compiler/compiler/integers/i128/ge.leo.out
index ef090731fb..ecf7c64027 100644
--- a/tests/expectations/compiler/compiler/integers/i128/ge.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/ge.leo.out
@@ -1,4 +1,28 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 897
+      num_constraints: 897
+      at: 96f20d0620bc9136e98bfe583ce40c6ad4359d33c7bafe02d1e121e411b1df50
+      bt: bf4203445221fa42994f563865391d625b571513cf25a20cf465fbe26647ec5d
+      ct: 8d7309bdb692a71de6c9efc246984ce389534e8fc31222a94d5217720c2d20e9
+    output:
+      - input_file: i128_e.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+      - input_file: i128_g.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: baa6a3685d6b0fce00d68e12fae11a15f8e939d1cdb6fc2742ee57f778b7da7c
+    imports_resolved_ast: baa6a3685d6b0fce00d68e12fae11a15f8e939d1cdb6fc2742ee57f778b7da7c
+    canonicalized_ast: baa6a3685d6b0fce00d68e12fae11a15f8e939d1cdb6fc2742ee57f778b7da7c
+    type_inferenced_ast: 406d1f28168a11a6e8404a14d80b20bdd5067823dc00b83c60d1ccf217db17f8
diff --git a/tests/expectations/compiler/compiler/integers/i128/gt.leo.out b/tests/expectations/compiler/compiler/integers/i128/gt.leo.out
index ef090731fb..e3f4e3d9bf 100644
--- a/tests/expectations/compiler/compiler/integers/i128/gt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/gt.leo.out
@@ -1,4 +1,28 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 897
+      num_constraints: 897
+      at: 98a9cad46c764246288557ee4b5ded8e4f2ca8c99e07068d8e5cfef000e22e31
+      bt: 7734cf8efdd437cd881763da604d9524fca91092bda9b6fc677ff9c30fa4b3c7
+      ct: 8d7309bdb692a71de6c9efc246984ce389534e8fc31222a94d5217720c2d20e9
+    output:
+      - input_file: i128_g.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+      - input_file: i128_e.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: e2b90c71500bfbdd6d581f1f66d974507922f946f48175b82768c804ca2892f5
+    imports_resolved_ast: e2b90c71500bfbdd6d581f1f66d974507922f946f48175b82768c804ca2892f5
+    canonicalized_ast: e2b90c71500bfbdd6d581f1f66d974507922f946f48175b82768c804ca2892f5
+    type_inferenced_ast: 1752aa11aea71f4a459400f14558caf6a523bad2885bc11f8449cc25af81715c
diff --git a/tests/expectations/compiler/compiler/integers/i128/le.leo.out b/tests/expectations/compiler/compiler/integers/i128/le.leo.out
index ef090731fb..c80c011dda 100644
--- a/tests/expectations/compiler/compiler/integers/i128/le.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/le.leo.out
@@ -1,4 +1,28 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 897
+      num_constraints: 897
+      at: e7341bd3736199176968e0d217b64de1913590fe3c69e32c4a398014df18f20f
+      bt: 78d5b43e2c7d048af797f16a430d0ce5b99f8305fb1dbd0c7a0a6f36cbd6b046
+      ct: 8d7309bdb692a71de6c9efc246984ce389534e8fc31222a94d5217720c2d20e9
+    output:
+      - input_file: i128_l.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+      - input_file: i128_e.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 8753b11c3aca4b8feb1be18420840b4c9de9ddcb07d089ed2f5f4c384afc204a
+    imports_resolved_ast: 8753b11c3aca4b8feb1be18420840b4c9de9ddcb07d089ed2f5f4c384afc204a
+    canonicalized_ast: 8753b11c3aca4b8feb1be18420840b4c9de9ddcb07d089ed2f5f4c384afc204a
+    type_inferenced_ast: 79b296585b1e4ce4b1e9b3e29180ebfa06f7892d553d31a1f148e952f46ce768
diff --git a/tests/expectations/compiler/compiler/integers/i128/lt.leo.out b/tests/expectations/compiler/compiler/integers/i128/lt.leo.out
index ef090731fb..43e665808f 100644
--- a/tests/expectations/compiler/compiler/integers/i128/lt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/lt.leo.out
@@ -1,4 +1,28 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 897
+      num_constraints: 897
+      at: 9164a7c32351fa140180bb6aedc74fc291dde69bbff2b1e9c2191b3d155356dd
+      bt: 9a46d23879218b3aa9d5b6575fc677aca1f7470b3b4e623a26f410a38200661b
+      ct: 8d7309bdb692a71de6c9efc246984ce389534e8fc31222a94d5217720c2d20e9
+    output:
+      - input_file: i128_l.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+      - input_file: i128_e.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: ff20432be7beb83e5e5b022eef93d6ea0ef262fb834ce0eef5633c1db97abe03
+    imports_resolved_ast: ff20432be7beb83e5e5b022eef93d6ea0ef262fb834ce0eef5633c1db97abe03
+    canonicalized_ast: ff20432be7beb83e5e5b022eef93d6ea0ef262fb834ce0eef5633c1db97abe03
+    type_inferenced_ast: 5a43f0e27448024f978e71e784a16071cccbe7d8bf666ce7c42653e593244249
diff --git a/tests/expectations/compiler/compiler/integers/i128/max.leo.out b/tests/expectations/compiler/compiler/integers/i128/max.leo.out
index ef090731fb..c77d9b0f0c 100644
--- a/tests/expectations/compiler/compiler/integers/i128/max.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/max.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: "../input/dummy.in"
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 48a298fe2f4f2855ad2f9e089cfbc6749ee6f8f95f81ca9a97360f331aaae1fb
+    imports_resolved_ast: 48a298fe2f4f2855ad2f9e089cfbc6749ee6f8f95f81ca9a97360f331aaae1fb
+    canonicalized_ast: 48a298fe2f4f2855ad2f9e089cfbc6749ee6f8f95f81ca9a97360f331aaae1fb
+    type_inferenced_ast: 5f10c4f16a11b966282e2484c7f243a794f2c1a2377be993b694080434791ff6
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 3f519cf1b5..dcf61b19c0 100644
--- a/tests/expectations/compiler/compiler/integers/i128/max_fail.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/max_fail.leo.out
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EASG0373030]: failed to parse int value '170141183460469231731687303715884105728'\n    --> compiler-test:4:21\n     |\n   4 |     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 ef090731fb..f1a1a00980 100644
--- a/tests/expectations/compiler/compiler/integers/i128/min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/min.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: "../input/dummy.in"
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 7607f334bcc8676c2276fc9c0950437719631f6d7221e1f3288a4f144096fa0d
+    imports_resolved_ast: 7607f334bcc8676c2276fc9c0950437719631f6d7221e1f3288a4f144096fa0d
+    canonicalized_ast: 7607f334bcc8676c2276fc9c0950437719631f6d7221e1f3288a4f144096fa0d
+    type_inferenced_ast: 2d21167fca05fd5c84ab023d5fb99d8bf84f733797d01dbdf5cfb924d0aa0a26
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 3f519cf1b5..1521d75463 100644
--- a/tests/expectations/compiler/compiler/integers/i128/min_fail.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/min_fail.leo.out
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EASG0373030]: failed to parse int value '-170141183460469231731687303715884105729'\n    --> compiler-test:4:21\n     |\n   4 |     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 ef090731fb..7a8b72f486 100644
--- a/tests/expectations/compiler/compiler/integers/i128/mul.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/mul.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 393216
+      num_constraints: 393217
+      at: d5a0c9b374587e6c25f437a157bef0c152665743371172ba94d04e13a1a8f509
+      bt: 2d0600e403e694d114c452c3e5c1ad2137e48b5344b3760dbec2e826420b8a9e
+      ct: 76b519a48f8267fa180bc68f3e7a84fe7319a3ad2e76338916cb399d9cea22d8
+    output:
+      - input_file: i128.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 16a27b027b669640d3c23c1eca2db5ea3286bf3623baf9038cb28c4937e88c34
+    imports_resolved_ast: 16a27b027b669640d3c23c1eca2db5ea3286bf3623baf9038cb28c4937e88c34
+    canonicalized_ast: 16a27b027b669640d3c23c1eca2db5ea3286bf3623baf9038cb28c4937e88c34
+    type_inferenced_ast: ab943eb3fb77eff83662d400ce152c5a27588bbecb72bba0c2f06146fc1e671b
diff --git a/tests/expectations/compiler/compiler/integers/i128/ne.leo.out b/tests/expectations/compiler/compiler/integers/i128/ne.leo.out
index ef090731fb..08df752694 100644
--- a/tests/expectations/compiler/compiler/integers/i128/ne.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/ne.leo.out
@@ -1,4 +1,28 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 513
+      num_constraints: 513
+      at: 8f9d3ef916a970cb762ca6f3829a8b4897dc65d493a2ea2eb4fa812a2062fe67
+      bt: edc1de9388a8bb2c659c9b4e9deecd8406826abcfe220d295bf7d85a550c0c43
+      ct: c224fec21cf5a2b24eb94033a20aeb4729d3d0cf596339145cb49ea6a44cc5d8
+    output:
+      - input_file: i128_ne.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+      - input_file: i128_e.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 6438b7751a9bfbc114ec061c946ab917fe196c321b6382a803e263fc131e94cf
+    imports_resolved_ast: 6438b7751a9bfbc114ec061c946ab917fe196c321b6382a803e263fc131e94cf
+    canonicalized_ast: 6438b7751a9bfbc114ec061c946ab917fe196c321b6382a803e263fc131e94cf
+    type_inferenced_ast: f956cebfdaffc93e04d75ec4017db28671a9ca95b46d7e46f0fe7c03921c8fcc
diff --git a/tests/expectations/compiler/compiler/integers/i128/negate.leo.out b/tests/expectations/compiler/compiler/integers/i128/negate.leo.out
index ef090731fb..d24af05f3a 100644
--- a/tests/expectations/compiler/compiler/integers/i128/negate.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/negate.leo.out
@@ -1,4 +1,28 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 765
+      num_constraints: 765
+      at: 46af0432868923f7cad6e7db2de33a69ccad1a789e92d552ec26f8fc19a7d33d
+      bt: f1167d856668e1efcd49f020430a704e62ad6e46006e7faf58acdac8bb8a5ba2
+      ct: 075f6359a5dd933b671b42c06465f4c70f5ec152176c234fb4d3cdfbe6255daf
+    output:
+      - input_file: i128.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+      - input_file: i128.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: f20c4c3491707834724e32b0bd9116e203db8e8e03bc77f14d958fff910ea7a8
+    imports_resolved_ast: f20c4c3491707834724e32b0bd9116e203db8e8e03bc77f14d958fff910ea7a8
+    canonicalized_ast: f20c4c3491707834724e32b0bd9116e203db8e8e03bc77f14d958fff910ea7a8
+    type_inferenced_ast: 06e7d8be76d296f884f35880eb91b74b438316b04f1e189ac265ee76692da63f
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 ef090731fb..9e893a8160 100644
--- a/tests/expectations/compiler/compiler/integers/i128/negate_min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/negate_min.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: "../input/dummy.in"
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 910fc83d7c92963a426e05d43b855610cddcd68f7ca007dc83a6dae90fc12be2
+    imports_resolved_ast: 910fc83d7c92963a426e05d43b855610cddcd68f7ca007dc83a6dae90fc12be2
+    canonicalized_ast: 910fc83d7c92963a426e05d43b855610cddcd68f7ca007dc83a6dae90fc12be2
+    type_inferenced_ast: f27e5afe0c4bf455ca2b3cc989d8659066d2f9c817741cb0d1b7e66a756dc04f
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 ef090731fb..1c085131e8 100644
--- a/tests/expectations/compiler/compiler/integers/i128/negate_zero.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/negate_zero.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: dummy.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 68dd2506b7582cec89325afd649b76057840759d535cedca3e4cde98efeb0877
+    imports_resolved_ast: 68dd2506b7582cec89325afd649b76057840759d535cedca3e4cde98efeb0877
+    canonicalized_ast: 68dd2506b7582cec89325afd649b76057840759d535cedca3e4cde98efeb0877
+    type_inferenced_ast: 67b08390d952e54e77e5704a13dfcedd83f4eba2f031d8d369c5c580722e02f0
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 3f519cf1b5..58e069fbb0 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
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EPAR0370004]: Unexpected white space between terms 1 and i128\n    --> compiler-test:4:15\n     |\n   4 |     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 ef090731fb..b32c214970 100644
--- a/tests/expectations/compiler/compiler/integers/i128/sub.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/sub.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1658
+      num_constraints: 1659
+      at: bb46c735f0d1698aa6cf8637b23babcdf0df3ec6e64f4b2e7d3e86f6f461e961
+      bt: 859297637693ebdf41005288cf212906c1d7619049b4305d34d9dededb24b5c5
+      ct: 50293f70acfe4a8aadffa8b17c18b0411493c8760fc474dcdf26f5bc7d70ada4
+    output:
+      - input_file: i128.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: bc09a92a140e879b4fe0a16156a776015e48283e90b6f1af3ab2647a9ca044ce
+    imports_resolved_ast: bc09a92a140e879b4fe0a16156a776015e48283e90b6f1af3ab2647a9ca044ce
+    canonicalized_ast: bc09a92a140e879b4fe0a16156a776015e48283e90b6f1af3ab2647a9ca044ce
+    type_inferenced_ast: f9b47c27d64d9bd058c7341a828c51c31fcb4bc2bdb34bd8169d53a768559859
diff --git a/tests/expectations/compiler/compiler/integers/i128/ternary.leo.out b/tests/expectations/compiler/compiler/integers/i128/ternary.leo.out
index ef090731fb..716a3d3807 100644
--- a/tests/expectations/compiler/compiler/integers/i128/ternary.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/ternary.leo.out
@@ -1,4 +1,28 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 896
+      num_constraints: 1024
+      at: 0830a3e788b536b36f271fadaadcc919281b2171d4e18814385b74f6820cb5c9
+      bt: 1fb9bfc22c01a54c08602e7f3883c19b00de1070aa9bad9e9234e322f9043711
+      ct: ee9facabe4c76f5eb89984d3c5cb15f92eaa0cc3b4bc4fdff261aeb36ad0101b
+    output:
+      - input_file: i128.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+      - input_file: i128_rev.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 59f299e993a6a2a19cfca109677cc4d5a72db425ace34b4b55d3b8b7cb54fdfe
+    imports_resolved_ast: 59f299e993a6a2a19cfca109677cc4d5a72db425ace34b4b55d3b8b7cb54fdfe
+    canonicalized_ast: 59f299e993a6a2a19cfca109677cc4d5a72db425ace34b4b55d3b8b7cb54fdfe
+    type_inferenced_ast: c83d950f8244fef52d7b25a588457ad771da0f73440f4d2523ac747623cf7a3a
diff --git a/tests/expectations/compiler/compiler/integers/i16/add.leo.out b/tests/expectations/compiler/compiler/integers/i16/add.leo.out
index ef090731fb..abdfe2f639 100644
--- a/tests/expectations/compiler/compiler/integers/i16/add.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/add.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 172
+      num_constraints: 173
+      at: 6b89cd61c27d609100734788caaf250a61c4e65e8bb53a70cb9a67bd3970d344
+      bt: 3685748e2150def12598827c6d3217b7665ad912fcf517afafed7dd933dd68a2
+      ct: acefb38d2e822ba8454f989fcdcfad22e9c15b0115cebecf3ec7f842412b0812
+    output:
+      - input_file: i16.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: a67c4ea1ac24f9da48cc18159bda3779585be4d0ff2ef7b2e36111c8e30a7095
+    imports_resolved_ast: a67c4ea1ac24f9da48cc18159bda3779585be4d0ff2ef7b2e36111c8e30a7095
+    canonicalized_ast: a67c4ea1ac24f9da48cc18159bda3779585be4d0ff2ef7b2e36111c8e30a7095
+    type_inferenced_ast: 7d10fe70a4c3ad44ce07ae4fab3d1082d3f238757d318694f536e5b2e963c76a
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 ef090731fb..822c334963 100644
--- a/tests/expectations/compiler/compiler/integers/i16/console_assert.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/console_assert.leo.out
@@ -1,4 +1,19 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 63
+      num_constraints: 63
+      at: 781fbf42db29f7fa9c21d99e21d8f011ec22b33ad26d3f80438687aafd462285
+      bt: abee7b67c55170fc3341444203a9a70e68690dce751aa36d3e91f1cf7ceef73d
+      ct: 51c18ee4216feeb01d0b0d661dfeb294e7e100873586edf79be89c8b54d9e168
+    output:
+      - input_file: i16.in
+        output:
+          registers: {}
+    initial_ast: f68bd73d5f657b880c76f678c5d8b6903aebd0701415977f5dd35009b383daaf
+    imports_resolved_ast: f68bd73d5f657b880c76f678c5d8b6903aebd0701415977f5dd35009b383daaf
+    canonicalized_ast: a1a4fada7b1c3d4e82ac1065a720c6b11fdffd4a1cf270128432e04cee150cbb
+    type_inferenced_ast: 18633259cef0bf8b6f58b4fdddeff2e0f212f4bfd9a3a9d2e7c8b328117ee679
diff --git a/tests/expectations/compiler/compiler/integers/i16/div.leo.out b/tests/expectations/compiler/compiler/integers/i16/div.leo.out
index ef090731fb..66143f881a 100644
--- a/tests/expectations/compiler/compiler/integers/i16/div.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/div.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 4358
+      num_constraints: 5446
+      at: 285c49252166e044a1648d7cdeaa3975efca0e746efd365d2f170900157df8b9
+      bt: b7dcf6f446108df31801263f54f0d504800d85f341baa945f13eb2dbbbbe4851
+      ct: 6743f276428e33d909885898f76d747836254decaf153021c75df8d62b890e41
+    output:
+      - input_file: i16.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: a0694975f2bd295505d998da6b165707f8231c8df9f046fccde58cc8f42da438
+    imports_resolved_ast: a0694975f2bd295505d998da6b165707f8231c8df9f046fccde58cc8f42da438
+    canonicalized_ast: a0694975f2bd295505d998da6b165707f8231c8df9f046fccde58cc8f42da438
+    type_inferenced_ast: 66bbe4a003338adcacbf310ee8b26cb128175b0125523981d2378088760a321d
diff --git a/tests/expectations/compiler/compiler/integers/i16/eq.leo.out b/tests/expectations/compiler/compiler/integers/i16/eq.leo.out
index ef090731fb..109d08d761 100644
--- a/tests/expectations/compiler/compiler/integers/i16/eq.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/eq.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 65
+      num_constraints: 65
+      at: 8c8b795ef4142f2651625b90b3624d24de5138c3fb0981288a8cc5e12bf31f82
+      bt: eba2113bdda3d667d9e8c87f545fe4e2a0143b18a3fff0c1aaa46dd376ed1735
+      ct: f037d279ccea3ca689e05801ec3ba0053b5ce66a1763d4620262ea9b69873008
+    output:
+      - input_file: i16.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: b961658930719fa317e5762c0f759cccf808d0c25e4036efdc24efd3dd917145
+    imports_resolved_ast: b961658930719fa317e5762c0f759cccf808d0c25e4036efdc24efd3dd917145
+    canonicalized_ast: b961658930719fa317e5762c0f759cccf808d0c25e4036efdc24efd3dd917145
+    type_inferenced_ast: 6e404e9ce612711f1170f49704f440a1698f61a5d830eeea3460025bd9883f29
diff --git a/tests/expectations/compiler/compiler/integers/i16/ge.leo.out b/tests/expectations/compiler/compiler/integers/i16/ge.leo.out
index ef090731fb..35249b2b08 100644
--- a/tests/expectations/compiler/compiler/integers/i16/ge.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/ge.leo.out
@@ -1,4 +1,28 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 113
+      num_constraints: 113
+      at: aacaa02fab172aad56801a9785e4265f42a5b7a8a90f3277508d9bdf9b71739e
+      bt: dc20f75204b1fb858e1971441f24a4aa1780e545581c55ff3d52cec41be65b79
+      ct: 92784334fb47e5a53eb972ec42d95f97470117bb6839cf2d46e8fcbd38a662f9
+    output:
+      - input_file: i16_e.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+      - input_file: i16_g.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: af26d10d2f2a9d2c506829aec8c88fb34ae2ef681ffc4d3b8ec4b284bfdf3d9c
+    imports_resolved_ast: af26d10d2f2a9d2c506829aec8c88fb34ae2ef681ffc4d3b8ec4b284bfdf3d9c
+    canonicalized_ast: af26d10d2f2a9d2c506829aec8c88fb34ae2ef681ffc4d3b8ec4b284bfdf3d9c
+    type_inferenced_ast: 54cb6e5e03539e745b67bcfcd2d8175571e58747a26184d61991fd243e026efe
diff --git a/tests/expectations/compiler/compiler/integers/i16/gt.leo.out b/tests/expectations/compiler/compiler/integers/i16/gt.leo.out
index ef090731fb..7a4d515135 100644
--- a/tests/expectations/compiler/compiler/integers/i16/gt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/gt.leo.out
@@ -1,4 +1,28 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 113
+      num_constraints: 113
+      at: 5c1bf4b2c0dcee44497206b68fafb1e2e98bc020688d260da3730723c0c90dd8
+      bt: 07da85fcfccc58758d043e27b0aab5a749760c644824684c13befde258deb78c
+      ct: 92784334fb47e5a53eb972ec42d95f97470117bb6839cf2d46e8fcbd38a662f9
+    output:
+      - input_file: i16_g.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+      - input_file: i16_e.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 062d3eb6035e1677c45329522cbd26b8a9b5bc6d501510db6d48a47e262253e6
+    imports_resolved_ast: 062d3eb6035e1677c45329522cbd26b8a9b5bc6d501510db6d48a47e262253e6
+    canonicalized_ast: 062d3eb6035e1677c45329522cbd26b8a9b5bc6d501510db6d48a47e262253e6
+    type_inferenced_ast: 2f160dd1d274d6efc5359b8643d33846d32e78ab5c541ed5f5c58fb42c9ea245
diff --git a/tests/expectations/compiler/compiler/integers/i16/le.leo.out b/tests/expectations/compiler/compiler/integers/i16/le.leo.out
index ef090731fb..bee4bdc77f 100644
--- a/tests/expectations/compiler/compiler/integers/i16/le.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/le.leo.out
@@ -1,4 +1,28 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 113
+      num_constraints: 113
+      at: a38a17fb5f40313343215b604602dfb492eb06cc8ac81d7d75443663398eb105
+      bt: 34c1c5f1fd258fc5f18137e0cd367a6c3149958ec8b92123518e293db31afbe3
+      ct: 92784334fb47e5a53eb972ec42d95f97470117bb6839cf2d46e8fcbd38a662f9
+    output:
+      - input_file: i16_l.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+      - input_file: i16_e.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 6680714854c32707931c35b568b4ca58e6fb30fb6d6af7dd88752712a5932295
+    imports_resolved_ast: 6680714854c32707931c35b568b4ca58e6fb30fb6d6af7dd88752712a5932295
+    canonicalized_ast: 6680714854c32707931c35b568b4ca58e6fb30fb6d6af7dd88752712a5932295
+    type_inferenced_ast: 9933127e345e202a0e2876dd14a3443a3a104f9faae4a6428e10268f7793b66d
diff --git a/tests/expectations/compiler/compiler/integers/i16/lt.leo.out b/tests/expectations/compiler/compiler/integers/i16/lt.leo.out
index ef090731fb..bdbcfa8b12 100644
--- a/tests/expectations/compiler/compiler/integers/i16/lt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/lt.leo.out
@@ -1,4 +1,28 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 113
+      num_constraints: 113
+      at: 882216b2b7d92dafe18a2ba6eefed789ba0084c92957772d0b1e3797ac391d8f
+      bt: 564588048812d9300963caf70148f154c231faa3209aed2ee5f9dd51a31af0ef
+      ct: 92784334fb47e5a53eb972ec42d95f97470117bb6839cf2d46e8fcbd38a662f9
+    output:
+      - input_file: i16_l.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+      - input_file: i16_e.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 763c352848bf7747e761659811842656e84bb2e5e8b31cea06ded7f6b6b79f90
+    imports_resolved_ast: 763c352848bf7747e761659811842656e84bb2e5e8b31cea06ded7f6b6b79f90
+    canonicalized_ast: 763c352848bf7747e761659811842656e84bb2e5e8b31cea06ded7f6b6b79f90
+    type_inferenced_ast: e4f72776d8aea450005835d7e69ef1f46e0b13c18673b97709546d49216064af
diff --git a/tests/expectations/compiler/compiler/integers/i16/max.leo.out b/tests/expectations/compiler/compiler/integers/i16/max.leo.out
index ef090731fb..b8375ba80f 100644
--- a/tests/expectations/compiler/compiler/integers/i16/max.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/max.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: "../input/dummy.in"
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 3683f5647eb1ba2d1999c80f2eb629a3ed5a7114e888b0282066556a2df7877b
+    imports_resolved_ast: 3683f5647eb1ba2d1999c80f2eb629a3ed5a7114e888b0282066556a2df7877b
+    canonicalized_ast: 3683f5647eb1ba2d1999c80f2eb629a3ed5a7114e888b0282066556a2df7877b
+    type_inferenced_ast: 0d239b14f356b7fc5b65558b1a74ac63af72e7f599d2af7d9f78bfca7d0dec06
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 3f519cf1b5..f794128e4b 100644
--- a/tests/expectations/compiler/compiler/integers/i16/max_fail.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/max_fail.leo.out
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EASG0373030]: failed to parse int value '32768'\n    --> compiler-test:4:20\n     |\n   4 |     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 ef090731fb..6fe7c31078 100644
--- a/tests/expectations/compiler/compiler/integers/i16/min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/min.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: "../input/dummy.in"
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: ff4a8d9a961ad3cb815e5c7fd71f32c2071b802fcec05e4768fced1f66c52d35
+    imports_resolved_ast: ff4a8d9a961ad3cb815e5c7fd71f32c2071b802fcec05e4768fced1f66c52d35
+    canonicalized_ast: ff4a8d9a961ad3cb815e5c7fd71f32c2071b802fcec05e4768fced1f66c52d35
+    type_inferenced_ast: 27745e526e1e647526bd04fac6cf28e6c190a4d6aca2e0f235d7eff8ec1d00c3
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 3f519cf1b5..956353eb27 100644
--- a/tests/expectations/compiler/compiler/integers/i16/min_fail.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/min_fail.leo.out
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EASG0373030]: failed to parse int value '-32769'\n    --> compiler-test:4:20\n     |\n   4 |     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 ef090731fb..e02846dff2 100644
--- a/tests/expectations/compiler/compiler/integers/i16/mul.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/mul.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 6144
+      num_constraints: 6145
+      at: a82b875e925052eba2aa8b33aaa6a654c144148e94e18bbe9649dcdd1fc0ad71
+      bt: cd23bca179b84ca9238460e8de4ec0c0afdc0ce1e3d6669329fc4baf08e7e0db
+      ct: f60e073d0353b71ab07769daa585ce03799bb2f4095a0dda5f9009b4f42162ed
+    output:
+      - input_file: i16.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: e2ea9bad702ec0c03da96d6de6e49e19600c7c59a984b1f6293456a6422a44ee
+    imports_resolved_ast: e2ea9bad702ec0c03da96d6de6e49e19600c7c59a984b1f6293456a6422a44ee
+    canonicalized_ast: e2ea9bad702ec0c03da96d6de6e49e19600c7c59a984b1f6293456a6422a44ee
+    type_inferenced_ast: 529c3f87ac0b87c521d21958a8fa03f1bd4a77a047ed0815935c33a35780dcb2
diff --git a/tests/expectations/compiler/compiler/integers/i16/ne.leo.out b/tests/expectations/compiler/compiler/integers/i16/ne.leo.out
index ef090731fb..8239a63289 100644
--- a/tests/expectations/compiler/compiler/integers/i16/ne.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/ne.leo.out
@@ -1,4 +1,28 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 65
+      num_constraints: 65
+      at: 83a4d089927a9811a9d4ed5b3ee2e50e395cd598de865653be04a2c51904b072
+      bt: 30bc7cfbc53a2e928ca0310b6041f1f1548ad7c1197ffc9301b46522122e5561
+      ct: f037d279ccea3ca689e05801ec3ba0053b5ce66a1763d4620262ea9b69873008
+    output:
+      - input_file: i16_ne.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+      - input_file: i16_e.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: c7ab4b48ebe504d361335859297d54229144960db82dde7a6d7124821dc5bdaf
+    imports_resolved_ast: c7ab4b48ebe504d361335859297d54229144960db82dde7a6d7124821dc5bdaf
+    canonicalized_ast: c7ab4b48ebe504d361335859297d54229144960db82dde7a6d7124821dc5bdaf
+    type_inferenced_ast: fba12a2f71c2ae3dba292b834566ba9d3495f888e21fb07109b15be597f2b6bf
diff --git a/tests/expectations/compiler/compiler/integers/i16/negate.leo.out b/tests/expectations/compiler/compiler/integers/i16/negate.leo.out
index ef090731fb..d0ec10d082 100644
--- a/tests/expectations/compiler/compiler/integers/i16/negate.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/negate.leo.out
@@ -1,4 +1,28 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 93
+      num_constraints: 93
+      at: 29988ea86584610f4511315204ed49c45d0303c44e0fb59c0df19dc048cee369
+      bt: 9bba1722080b8c396e72a645c5ca7dff2943c0b29a741569acdba3887e40c8af
+      ct: 4f89ea4838bc4544e2767b7dc68a1e0fa0649d7401bb7ae8292bd6aa654eda28
+    output:
+      - input_file: i16.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+      - input_file: i16.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: ecbc2a7d13b6a8d1bf35f53a9d80c4aab380495ec93663410c390e5d6d4f602e
+    imports_resolved_ast: ecbc2a7d13b6a8d1bf35f53a9d80c4aab380495ec93663410c390e5d6d4f602e
+    canonicalized_ast: ecbc2a7d13b6a8d1bf35f53a9d80c4aab380495ec93663410c390e5d6d4f602e
+    type_inferenced_ast: 106f4bc60cc6c007d1418e2571c3183f4372988be97c319574e965d2a08d9f3d
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 ef090731fb..cb03f28c62 100644
--- a/tests/expectations/compiler/compiler/integers/i16/negate_min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/negate_min.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: "../input/dummy.in"
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: a8449e15a25ff4327992829605e38edc70f958d0e3af40e3244b687b6a7a524f
+    imports_resolved_ast: a8449e15a25ff4327992829605e38edc70f958d0e3af40e3244b687b6a7a524f
+    canonicalized_ast: a8449e15a25ff4327992829605e38edc70f958d0e3af40e3244b687b6a7a524f
+    type_inferenced_ast: 90abf0bc2284b1bee472bcc256040c4dafd0e98c8938b9912778ed9c31d3f8ec
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 ef090731fb..bc9c8258fe 100644
--- a/tests/expectations/compiler/compiler/integers/i16/negate_zero.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/negate_zero.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: dummy.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: d0091da13c0406b347d3c276e90831cdd65da70e601ff244bd9c861c2c30af31
+    imports_resolved_ast: d0091da13c0406b347d3c276e90831cdd65da70e601ff244bd9c861c2c30af31
+    canonicalized_ast: d0091da13c0406b347d3c276e90831cdd65da70e601ff244bd9c861c2c30af31
+    type_inferenced_ast: bf3619f3735b49c2daa579800f40de768515f8367c7b934567ae1e79eb8d9228
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 3f519cf1b5..8484337bd0 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
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EPAR0370004]: Unexpected white space between terms 1 and i16\n    --> compiler-test:4:15\n     |\n   4 |     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 ef090731fb..468b2421a7 100644
--- a/tests/expectations/compiler/compiler/integers/i16/sub.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/sub.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 202
+      num_constraints: 203
+      at: 7b1b870d629fe64b117f0be092b7336e6b4149ac6778d0f4d02273e0c2b59a2a
+      bt: 035e3e8f741942f4683b2262c8f0fc75c0c5a89252c069ed956abce34019b988
+      ct: cd38769a0ae3aefd48815d80555886d23370399b29596b8433ad23be67afc55f
+    output:
+      - input_file: i16.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 29b5330610e95c16d51f5296a10729b570a50e19862685ad5d3209e458e42c79
+    imports_resolved_ast: 29b5330610e95c16d51f5296a10729b570a50e19862685ad5d3209e458e42c79
+    canonicalized_ast: 29b5330610e95c16d51f5296a10729b570a50e19862685ad5d3209e458e42c79
+    type_inferenced_ast: b50322c970ad5e34639834c22770e359a2a3fe6434064ef3687e03889af3f02b
diff --git a/tests/expectations/compiler/compiler/integers/i16/ternary.leo.out b/tests/expectations/compiler/compiler/integers/i16/ternary.leo.out
index ef090731fb..9781a6c474 100644
--- a/tests/expectations/compiler/compiler/integers/i16/ternary.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/ternary.leo.out
@@ -1,4 +1,28 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 112
+      num_constraints: 128
+      at: b0a107f586de648c8446ae3246117de3b20ba9c0249d261f234106809d112f0a
+      bt: 0e5faacb5d80488eeda9e7fa79ddd96e54c010e0e98571449f79cad816cc18a2
+      ct: 2b3428d7c7335edc32ab219fe11c92e215d70a52c89434de349f4951561d5795
+    output:
+      - input_file: i16.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+      - input_file: i16_rev.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 331af238c9ee45bd3b604155405f8ab4061ff16416387249364f83432f7f8b5a
+    imports_resolved_ast: 331af238c9ee45bd3b604155405f8ab4061ff16416387249364f83432f7f8b5a
+    canonicalized_ast: 331af238c9ee45bd3b604155405f8ab4061ff16416387249364f83432f7f8b5a
+    type_inferenced_ast: 50a018ce4b160bd86e9fbdfe9db17bcfd055e4800f06c55551eed3100d3f64e6
diff --git a/tests/expectations/compiler/compiler/integers/i32/add.leo.out b/tests/expectations/compiler/compiler/integers/i32/add.leo.out
index ef090731fb..68fc4a45f6 100644
--- a/tests/expectations/compiler/compiler/integers/i32/add.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/add.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 348
+      num_constraints: 349
+      at: 2fe67b488b0f96f2f6be7e96dc7f102984b0132232e452f44e40cad21a1dc5f3
+      bt: 8dd304125c8178327f11b0894be2788080258a5a80aab3c1df046fea9f262789
+      ct: 8b73986e71edfc8b716f535eaa069b04cc15502adbd166ae713df42cb9d37a3c
+    output:
+      - input_file: i32.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 39635af165ae775232853b12ac07b0a21f39382ae3e146001e1a05b7c60849c3
+    imports_resolved_ast: 39635af165ae775232853b12ac07b0a21f39382ae3e146001e1a05b7c60849c3
+    canonicalized_ast: 39635af165ae775232853b12ac07b0a21f39382ae3e146001e1a05b7c60849c3
+    type_inferenced_ast: 8da17349b8496481730002123096f5c09debd25133db8045665aa2ae405efe1a
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 ef090731fb..4f1f835132 100644
--- a/tests/expectations/compiler/compiler/integers/i32/console_assert.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/console_assert.leo.out
@@ -1,4 +1,19 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 127
+      num_constraints: 127
+      at: 051151c1ab89f2c0ff0fe5d336668c3fcd6dc4744d1f5b8e135dcb7bf6a6195c
+      bt: 6b92443726163ac0fc32f7c9edace0ec8369e793d24105d93d121cb0bd5c3128
+      ct: 7cb2d3f0ccfb9a2e747c6a05bdb52812c4539c836ff62c4e555fac13ef2084d4
+    output:
+      - input_file: i32.in
+        output:
+          registers: {}
+    initial_ast: 6ba5c49aaa9ed5abf49a7f538392cb18905e6805b7d3780e5d6391adb7df6631
+    imports_resolved_ast: 6ba5c49aaa9ed5abf49a7f538392cb18905e6805b7d3780e5d6391adb7df6631
+    canonicalized_ast: 35877250663e7d44c5e01e64cd99d5e1b8fa84da4d00667bade1fd9a517f3803
+    type_inferenced_ast: 2c72c8cf340cc122fb5a081c8dd6eaa22ac2c79511e98fd5f23f4b8b1dac3526
diff --git a/tests/expectations/compiler/compiler/integers/i32/div.leo.out b/tests/expectations/compiler/compiler/integers/i32/div.leo.out
index ef090731fb..40804c7cb0 100644
--- a/tests/expectations/compiler/compiler/integers/i32/div.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/div.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 16918
+      num_constraints: 21142
+      at: a8ca22c0da8166ef4f88e959be315231681516ee6113dff620637774f8e4a670
+      bt: e09097be6926888dddac4cd61c1b3419e05b5b700ba3acca116f6eb2c01cb0a4
+      ct: 13922ea4b7763c9228f5dfedfb0d8e2f7d5a3bbed934cd6df5ae99f4150222d2
+    output:
+      - input_file: i32.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 3917fa03634f3abb0d497bfae7ba98c15dd93f867e3e1bf724bab8fc724ce8cf
+    imports_resolved_ast: 3917fa03634f3abb0d497bfae7ba98c15dd93f867e3e1bf724bab8fc724ce8cf
+    canonicalized_ast: 3917fa03634f3abb0d497bfae7ba98c15dd93f867e3e1bf724bab8fc724ce8cf
+    type_inferenced_ast: 1f460bec4ed9e4478b7ef9df14773eb92ad310d790cae429a0caadbc7f750d2e
diff --git a/tests/expectations/compiler/compiler/integers/i32/eq.leo.out b/tests/expectations/compiler/compiler/integers/i32/eq.leo.out
index ef090731fb..690a556f61 100644
--- a/tests/expectations/compiler/compiler/integers/i32/eq.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/eq.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 129
+      num_constraints: 129
+      at: 4ce4f2bf481c4f7e47396527999e129066d1f157413884f91ced3d2b525a3187
+      bt: e63628fc48d1e71ea44830c010e442f577239e29f7ffada0d8df34c28e67f107
+      ct: 9f4c72431c0c7c03e216195a071c971c53deed8e3bfce450bffb3a6fad7418d5
+    output:
+      - input_file: i32.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 180d1048dd64c67ea367750630057b9c5302a89a81144d0148ea1dfafada8b4c
+    imports_resolved_ast: 180d1048dd64c67ea367750630057b9c5302a89a81144d0148ea1dfafada8b4c
+    canonicalized_ast: 180d1048dd64c67ea367750630057b9c5302a89a81144d0148ea1dfafada8b4c
+    type_inferenced_ast: f2f2254b22bc172f1859835e478e9456b3fdbc497f5a48483fc87969d6bf6144
diff --git a/tests/expectations/compiler/compiler/integers/i32/ge.leo.out b/tests/expectations/compiler/compiler/integers/i32/ge.leo.out
index ef090731fb..f55b8e9939 100644
--- a/tests/expectations/compiler/compiler/integers/i32/ge.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/ge.leo.out
@@ -1,4 +1,28 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 225
+      num_constraints: 225
+      at: fba74e6ed7ae0c0cf0bd2c874940e7e9daf6c7c4e08cf9359b31279433ec0ef5
+      bt: 3f23038cdf71876dea48b44b9cae993b3f649b628bcdaf6f1cb77bbafa92b600
+      ct: d7067f500143a40e015fd1f4447a4ea5b9ee6ebdf007e08be51772a8a2b672c3
+    output:
+      - input_file: i32_e.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+      - input_file: i32_g.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 6401f6c0567fe73628faf73dc3cd71635bbba9b997c918d182f6fdf2dda68b82
+    imports_resolved_ast: 6401f6c0567fe73628faf73dc3cd71635bbba9b997c918d182f6fdf2dda68b82
+    canonicalized_ast: 6401f6c0567fe73628faf73dc3cd71635bbba9b997c918d182f6fdf2dda68b82
+    type_inferenced_ast: 9e105f38de69dddfd99b143f279f063950e305321a343dea0bf10924af6f7c2b
diff --git a/tests/expectations/compiler/compiler/integers/i32/gt.leo.out b/tests/expectations/compiler/compiler/integers/i32/gt.leo.out
index ef090731fb..4ec0e63ed9 100644
--- a/tests/expectations/compiler/compiler/integers/i32/gt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/gt.leo.out
@@ -1,4 +1,28 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 225
+      num_constraints: 225
+      at: fec1628688d454ab244e921b74f7f70ff6c7acf18280488dfb43cd0bb4bd70d2
+      bt: 02fd44d092923c1a89fc492a9660926934e03005d8c3fa5f42ae2a3fbd7048ea
+      ct: d7067f500143a40e015fd1f4447a4ea5b9ee6ebdf007e08be51772a8a2b672c3
+    output:
+      - input_file: i32_g.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+      - input_file: i32_e.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: f82734600ac57a9a5bd1ef4c2439cc5bbea882cd2ed81646ce6abd7915abc344
+    imports_resolved_ast: f82734600ac57a9a5bd1ef4c2439cc5bbea882cd2ed81646ce6abd7915abc344
+    canonicalized_ast: f82734600ac57a9a5bd1ef4c2439cc5bbea882cd2ed81646ce6abd7915abc344
+    type_inferenced_ast: 67d4dfb5c34b3e9aa457c7897d28cf85a2366bf987279f50eb44ad5cfe617ffa
diff --git a/tests/expectations/compiler/compiler/integers/i32/le.leo.out b/tests/expectations/compiler/compiler/integers/i32/le.leo.out
index ef090731fb..c420c4c1f0 100644
--- a/tests/expectations/compiler/compiler/integers/i32/le.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/le.leo.out
@@ -1,4 +1,28 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 225
+      num_constraints: 225
+      at: 39f909848aee2ee744719f8692f58b9745aeaeededc431f1b06df839384bff07
+      bt: 4e75a3c5fd91239e6bf32d96c6a4a702e040e4a3bddcc282706ca76facb9e942
+      ct: d7067f500143a40e015fd1f4447a4ea5b9ee6ebdf007e08be51772a8a2b672c3
+    output:
+      - input_file: i32_l.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+      - input_file: i32_e.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 51baf4d7be19032fb911d8f5e7fb250ccf3e9e272644c013699be201cf44d00a
+    imports_resolved_ast: 51baf4d7be19032fb911d8f5e7fb250ccf3e9e272644c013699be201cf44d00a
+    canonicalized_ast: 51baf4d7be19032fb911d8f5e7fb250ccf3e9e272644c013699be201cf44d00a
+    type_inferenced_ast: 0427991a5b5ca595f7a0d5fb0d842ecc18433533366ae437fcbdaff134150481
diff --git a/tests/expectations/compiler/compiler/integers/i32/lt.leo.out b/tests/expectations/compiler/compiler/integers/i32/lt.leo.out
index ef090731fb..c656ee7282 100644
--- a/tests/expectations/compiler/compiler/integers/i32/lt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/lt.leo.out
@@ -1,4 +1,28 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 225
+      num_constraints: 225
+      at: fcca8f94beb99b6f86edd3f8c36b81043482e6c449fc4278d53d546c295810ed
+      bt: 26e3dae4bf8fe37424b8ef7cc60b6136809286a8e64736e63b8b5dfacf774c21
+      ct: d7067f500143a40e015fd1f4447a4ea5b9ee6ebdf007e08be51772a8a2b672c3
+    output:
+      - input_file: i32_l.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+      - input_file: i32_e.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: e464cb5a70dcb5bf51ab5ccffa10b54ea29f0e68775593f05bb0d585144487a8
+    imports_resolved_ast: e464cb5a70dcb5bf51ab5ccffa10b54ea29f0e68775593f05bb0d585144487a8
+    canonicalized_ast: e464cb5a70dcb5bf51ab5ccffa10b54ea29f0e68775593f05bb0d585144487a8
+    type_inferenced_ast: 486d0d877dbc748210bc6a82d40a132709d83a44d5e4de255e9c40dd3bf6cedd
diff --git a/tests/expectations/compiler/compiler/integers/i32/max.leo.out b/tests/expectations/compiler/compiler/integers/i32/max.leo.out
index ef090731fb..48b7243612 100644
--- a/tests/expectations/compiler/compiler/integers/i32/max.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/max.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: "../input/dummy.in"
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 2596ba582e34d7147902c469c3544d438d8ba64aeecd103938a1eb8e3536f360
+    imports_resolved_ast: 2596ba582e34d7147902c469c3544d438d8ba64aeecd103938a1eb8e3536f360
+    canonicalized_ast: 2596ba582e34d7147902c469c3544d438d8ba64aeecd103938a1eb8e3536f360
+    type_inferenced_ast: aa0a685388d2f3aed81db5c35ead63975e8ad4df5803390f1976795ad544430f
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 3f519cf1b5..0d54553e56 100644
--- a/tests/expectations/compiler/compiler/integers/i32/max_fail.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/max_fail.leo.out
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EASG0373030]: failed to parse int value '2147483648'\n    --> compiler-test:4:20\n     |\n   4 |     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 ef090731fb..0f8d4cf6b8 100644
--- a/tests/expectations/compiler/compiler/integers/i32/min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/min.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: "../input/dummy.in"
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: e08bac68e7d8ebb03c3fc1538c525de5e2caeaed750b548f4756abf12d6d38a5
+    imports_resolved_ast: e08bac68e7d8ebb03c3fc1538c525de5e2caeaed750b548f4756abf12d6d38a5
+    canonicalized_ast: e08bac68e7d8ebb03c3fc1538c525de5e2caeaed750b548f4756abf12d6d38a5
+    type_inferenced_ast: f529d963cc870de92960d5c2eb5ec8ceeae22256f0164399867b996a14be14aa
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 3f519cf1b5..73ba63d793 100644
--- a/tests/expectations/compiler/compiler/integers/i32/min_fail.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/min_fail.leo.out
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EASG0373030]: failed to parse int value '-2147483649'\n    --> compiler-test:4:20\n     |\n   4 |     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 ef090731fb..4c3c4bc942 100644
--- a/tests/expectations/compiler/compiler/integers/i32/mul.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/mul.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 24576
+      num_constraints: 24577
+      at: 3f0c50eed51d601da1dd661e666f96fcf5285b7be20881d92b7fa14e6147c5fd
+      bt: fc2efd0d73e1d0feb345c15515e796fcd289003e5e388d35be464e3ee76a0cb5
+      ct: f720f62a8a58bc4a64c837cfad115c98d50ccfe3b208fb9fa346c5c17ff7ded4
+    output:
+      - input_file: i32.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 3fc63e8ecf481c6f4224c0206b16af942eb407b151f1fc21d8774cbf84ccc5d6
+    imports_resolved_ast: 3fc63e8ecf481c6f4224c0206b16af942eb407b151f1fc21d8774cbf84ccc5d6
+    canonicalized_ast: 3fc63e8ecf481c6f4224c0206b16af942eb407b151f1fc21d8774cbf84ccc5d6
+    type_inferenced_ast: 89f3c749fb559365b2ea0d804cb9146d923993a6c2c2dd9a3942057d7ff343d4
diff --git a/tests/expectations/compiler/compiler/integers/i32/ne.leo.out b/tests/expectations/compiler/compiler/integers/i32/ne.leo.out
index ef090731fb..db5011ded1 100644
--- a/tests/expectations/compiler/compiler/integers/i32/ne.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/ne.leo.out
@@ -1,4 +1,28 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 129
+      num_constraints: 129
+      at: 6cde17fb079861287679ad93d9ed9125cfc21000431bfeaf5a2054360ce51ef7
+      bt: 1178e67ab79eac96592f17313168c4300d53e89ab571025054d53d19dfdfd1b8
+      ct: 9f4c72431c0c7c03e216195a071c971c53deed8e3bfce450bffb3a6fad7418d5
+    output:
+      - input_file: i32_ne.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+      - input_file: i32_e.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 79492afcb10499d002f2b1f6c60bd7e656817f7c638068ad4bb7b3f5087537c7
+    imports_resolved_ast: 79492afcb10499d002f2b1f6c60bd7e656817f7c638068ad4bb7b3f5087537c7
+    canonicalized_ast: 79492afcb10499d002f2b1f6c60bd7e656817f7c638068ad4bb7b3f5087537c7
+    type_inferenced_ast: 2f324fbbfefac3d5fd095be4ca42fd83c711ae407e9631b0814f543331662dcf
diff --git a/tests/expectations/compiler/compiler/integers/i32/negate.leo.out b/tests/expectations/compiler/compiler/integers/i32/negate.leo.out
index ef090731fb..51672f6983 100644
--- a/tests/expectations/compiler/compiler/integers/i32/negate.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/negate.leo.out
@@ -1,4 +1,28 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 189
+      num_constraints: 189
+      at: 2254172298dcedafc294b068f855ab0dd689491362b1b490a8c95435e4b159da
+      bt: 244d201ae16e93cdd97ca56d698598a5a66e1bcb2794d58b5e24f6f9df9760a4
+      ct: 1607b4ad7556c35957a6cbce85868f0f82d2c65e55f13350ef81738caec6e235
+    output:
+      - input_file: i32.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+      - input_file: i32.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: c895e4172b4155a740dfe2aebfc4ded6f694b017d0eb1b7700b42e4498ecf151
+    imports_resolved_ast: c895e4172b4155a740dfe2aebfc4ded6f694b017d0eb1b7700b42e4498ecf151
+    canonicalized_ast: c895e4172b4155a740dfe2aebfc4ded6f694b017d0eb1b7700b42e4498ecf151
+    type_inferenced_ast: 47858526755f4292e5e423544d3ed6b4c664b08566f1a3f066433a8e21f4480a
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 ef090731fb..0ac80cea4c 100644
--- a/tests/expectations/compiler/compiler/integers/i32/negate_min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/negate_min.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: "../input/dummy.in"
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: bcbd4fdb79ebffa456407355e6d4f71d039014dd03cee2466850f90c1c1c17e2
+    imports_resolved_ast: bcbd4fdb79ebffa456407355e6d4f71d039014dd03cee2466850f90c1c1c17e2
+    canonicalized_ast: bcbd4fdb79ebffa456407355e6d4f71d039014dd03cee2466850f90c1c1c17e2
+    type_inferenced_ast: d2bc0ba76d451989365a4f3c40cffde6abc17865a43b2816d89bd884e8b0bdff
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 ef090731fb..f37306e8cb 100644
--- a/tests/expectations/compiler/compiler/integers/i32/negate_zero.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/negate_zero.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: dummy.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: b1ec676bc801b40fa773668c988ce9da33fec783743e214269a777ad122cda49
+    imports_resolved_ast: b1ec676bc801b40fa773668c988ce9da33fec783743e214269a777ad122cda49
+    canonicalized_ast: b1ec676bc801b40fa773668c988ce9da33fec783743e214269a777ad122cda49
+    type_inferenced_ast: 97b5d8261ddffbfff0316e3bf97df502a9b1c75e79b2e94d0b8f8f8c565699de
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 3f519cf1b5..8bf423a222 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
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EPAR0370004]: Unexpected white space between terms 1 and i32\n    --> compiler-test:4:15\n     |\n   4 |     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 ef090731fb..113536fbea 100644
--- a/tests/expectations/compiler/compiler/integers/i32/sub.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/sub.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 410
+      num_constraints: 411
+      at: 3293cb0f2e38fae78ca837de736471f6e36a372f92282123f6082e07648b412b
+      bt: c342f65da421c48d402ba324062abbb064eb525a99fe5379fcb1654a33a11d68
+      ct: 8a37ed12cbab476be56f1dc175e38c689f5bde3909161865409085a34c4a19f1
+    output:
+      - input_file: i32.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: d3776192bdb897e3ffdfe76557ba210babd9fd36945d47133552271858ff5c35
+    imports_resolved_ast: d3776192bdb897e3ffdfe76557ba210babd9fd36945d47133552271858ff5c35
+    canonicalized_ast: d3776192bdb897e3ffdfe76557ba210babd9fd36945d47133552271858ff5c35
+    type_inferenced_ast: 36e7d5a21e55cd5d61ea6644e8d5c84a0640972921fbdcfd6e27886caf6b5216
diff --git a/tests/expectations/compiler/compiler/integers/i32/ternary.leo.out b/tests/expectations/compiler/compiler/integers/i32/ternary.leo.out
index ef090731fb..4960310094 100644
--- a/tests/expectations/compiler/compiler/integers/i32/ternary.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/ternary.leo.out
@@ -1,4 +1,28 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 224
+      num_constraints: 256
+      at: 45301188494f0c65b2e88eac9117ba7367e772ea34e9b8f34bf3d49dbd1dd067
+      bt: 35d9c47cfd4fc137760d0ee411c0b097541cab7aae2b0a9ea83b368328fe5c23
+      ct: 032da4c7df957d9ca89b5395be6e1c84cab7d19a78abe1b02bb37b26ca65b0e4
+    output:
+      - input_file: i32.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+      - input_file: i32_rev.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 04e630cdddd76554c0049b08a3ed7a6a2c824a7dc929796e3fc713c6d11f70be
+    imports_resolved_ast: 04e630cdddd76554c0049b08a3ed7a6a2c824a7dc929796e3fc713c6d11f70be
+    canonicalized_ast: 04e630cdddd76554c0049b08a3ed7a6a2c824a7dc929796e3fc713c6d11f70be
+    type_inferenced_ast: 0655b17c3f9cc5c7500c8c7edfef4effa43668f096da5338b2c44ae316b0a5e1
diff --git a/tests/expectations/compiler/compiler/integers/i64/add.leo.out b/tests/expectations/compiler/compiler/integers/i64/add.leo.out
index ef090731fb..c7c89b8c83 100644
--- a/tests/expectations/compiler/compiler/integers/i64/add.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/add.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 700
+      num_constraints: 701
+      at: cecef57cd6d6e05c1f08807f82c42ac9ab45def4542662ca606c2e8183f36c76
+      bt: dbea824d3f892b3f86e08d05b68eecdc0de998bcd12186475d90ede9dfc5dfd8
+      ct: 8bc1636c45d8da73bfa0c5a71972d9829c9954007eff5db6f8fa4672d5b57c4f
+    output:
+      - input_file: i64.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 8e59e1adb08d85f3d13a4e0501c7299d8258d13dd979c0a971d5f2ce75f631a6
+    imports_resolved_ast: 8e59e1adb08d85f3d13a4e0501c7299d8258d13dd979c0a971d5f2ce75f631a6
+    canonicalized_ast: 8e59e1adb08d85f3d13a4e0501c7299d8258d13dd979c0a971d5f2ce75f631a6
+    type_inferenced_ast: 3a117cd702a7f13a7cbafd2c05c301d87562a0c6a971486c0cb07391f732c02d
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 ef090731fb..325e819d35 100644
--- a/tests/expectations/compiler/compiler/integers/i64/console_assert.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/console_assert.leo.out
@@ -1,4 +1,19 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 255
+      num_constraints: 255
+      at: 68080cb19b62be7f91ee2118affb7b55ea272e15e17581869385053a5c6d3623
+      bt: 2c1d031e57e285b1277f2c37853fc7fdff23711e1147d7b26ed74d3acd28ceff
+      ct: 0b136215b60005ed17aa4eea76bc4e2b0349c0fecf57dc06f5dba31981f270d0
+    output:
+      - input_file: i64.in
+        output:
+          registers: {}
+    initial_ast: 9389a270a24424ceb480768d8d0811101f2f92c7fc7447efe29686fd30d075e8
+    imports_resolved_ast: 9389a270a24424ceb480768d8d0811101f2f92c7fc7447efe29686fd30d075e8
+    canonicalized_ast: f44f1275eb6295af14fcc1773894b0694bb8657cb7b472b16cc1e5d846ca6a6c
+    type_inferenced_ast: 546c1d880e97e95d1b91a1e6b73fc9cf240c734921ebe534e2a7af6cb224f477
diff --git a/tests/expectations/compiler/compiler/integers/i64/div.leo.out b/tests/expectations/compiler/compiler/integers/i64/div.leo.out
index ef090731fb..90ff4e41f0 100644
--- a/tests/expectations/compiler/compiler/integers/i64/div.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/div.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 66614
+      num_constraints: 83254
+      at: 329edae9756f7bd721526c1b0790df530231fd3294f92161fb6c6b92036f03cd
+      bt: 81f681cc8f8cfc15fbecf76405b9a65ee9bf78492f8c012067a6a3db6efd466a
+      ct: 308cc563c21dc87ce980daf26ae9f4716b2e9f26517940e244ce3d98f488d280
+    output:
+      - input_file: i64.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 6fee781a23a251aafaea1000be3025d52bdeceb3b95aa746cdcc9560834227e3
+    imports_resolved_ast: 6fee781a23a251aafaea1000be3025d52bdeceb3b95aa746cdcc9560834227e3
+    canonicalized_ast: 6fee781a23a251aafaea1000be3025d52bdeceb3b95aa746cdcc9560834227e3
+    type_inferenced_ast: 4e93f3e08a4f65b47fe98c337cc6b1b3cf1be2cef22ab55d3bfd7491e8776a17
diff --git a/tests/expectations/compiler/compiler/integers/i64/eq.leo.out b/tests/expectations/compiler/compiler/integers/i64/eq.leo.out
index ef090731fb..0a6b595adc 100644
--- a/tests/expectations/compiler/compiler/integers/i64/eq.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/eq.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 257
+      num_constraints: 257
+      at: 30dc67aa22cadc6e5ec8c73e0096443263121e29adf46bb33ed310b07765ff6e
+      bt: 1aaee32179419b6185d75c5745bd13c7c8ba869bad0132405ef1b28915bfe5d9
+      ct: 8edd5528a862bbd5590cfbd0d52871e395cf73e3a22c70839571b36506fbe3a7
+    output:
+      - input_file: i64.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: bdde37443fd01021b4b7928e9d28c94146ff2f6804200387638b5912729c6acb
+    imports_resolved_ast: bdde37443fd01021b4b7928e9d28c94146ff2f6804200387638b5912729c6acb
+    canonicalized_ast: bdde37443fd01021b4b7928e9d28c94146ff2f6804200387638b5912729c6acb
+    type_inferenced_ast: 20102db693d9c531d240a5926a64f5720c0e30bb5e15ba8ec55a9ccb5dc5a7e1
diff --git a/tests/expectations/compiler/compiler/integers/i64/ge.leo.out b/tests/expectations/compiler/compiler/integers/i64/ge.leo.out
index ef090731fb..171923e14a 100644
--- a/tests/expectations/compiler/compiler/integers/i64/ge.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/ge.leo.out
@@ -1,4 +1,28 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 449
+      num_constraints: 449
+      at: 04829ad53a315f620a66d1fc8152176c29a250b57c54482f7e2fba84cad444c4
+      bt: 46fa1dbc8f6cc62609913fe96ad20cff4ba8ba7ea886b3682c3b4dc9a491b334
+      ct: 7b765314986bd8a51a62dabdef866c5fe05ad9bf392fb0e25b7ce3b9969f81e1
+    output:
+      - input_file: i64_e.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+      - input_file: i64_g.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 5c1016b42105d692df8c5a799884607097e1f0e4e971f54f12f722a8b6767b85
+    imports_resolved_ast: 5c1016b42105d692df8c5a799884607097e1f0e4e971f54f12f722a8b6767b85
+    canonicalized_ast: 5c1016b42105d692df8c5a799884607097e1f0e4e971f54f12f722a8b6767b85
+    type_inferenced_ast: 93f78d3f8250f873ffd7c7e677b4821bb727ec7018dc371c1ad383ba7496a830
diff --git a/tests/expectations/compiler/compiler/integers/i64/gt.leo.out b/tests/expectations/compiler/compiler/integers/i64/gt.leo.out
index ef090731fb..24f40ebe9b 100644
--- a/tests/expectations/compiler/compiler/integers/i64/gt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/gt.leo.out
@@ -1,4 +1,28 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 449
+      num_constraints: 449
+      at: 2805d5c14f23da221eefbd223bafa37ae210f961594e020f8aeb1a9ff00d7287
+      bt: 3947204249ecf9b6f7339e9c6409daf25d626f7e807ac182d3222e61fb4499dd
+      ct: 7b765314986bd8a51a62dabdef866c5fe05ad9bf392fb0e25b7ce3b9969f81e1
+    output:
+      - input_file: i64_g.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+      - input_file: i64_e.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: a0404ddcc589b6006a5186d8ed29c981c7b0be8e8ff56c40eb9affee5fe2f2b0
+    imports_resolved_ast: a0404ddcc589b6006a5186d8ed29c981c7b0be8e8ff56c40eb9affee5fe2f2b0
+    canonicalized_ast: a0404ddcc589b6006a5186d8ed29c981c7b0be8e8ff56c40eb9affee5fe2f2b0
+    type_inferenced_ast: 42efeba3e4bb618fcd85360650196171a2e786149c92c5fc9bc5ee3559af3e62
diff --git a/tests/expectations/compiler/compiler/integers/i64/le.leo.out b/tests/expectations/compiler/compiler/integers/i64/le.leo.out
index ef090731fb..f5635d7292 100644
--- a/tests/expectations/compiler/compiler/integers/i64/le.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/le.leo.out
@@ -1,4 +1,28 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 449
+      num_constraints: 449
+      at: 228ee4529b5cacfbd2dfbe9fe20088c9e8de89c4f80fcca316cd4ed3830ff633
+      bt: b228ce69df9ccfd94eb2d43619a82e2720dc0b34666b6850f0cd42db04befdef
+      ct: 7b765314986bd8a51a62dabdef866c5fe05ad9bf392fb0e25b7ce3b9969f81e1
+    output:
+      - input_file: i64_l.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+      - input_file: i64_e.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 78dbfbb72aaf373d3503564f96a35cd03525c6e39a756c17be39ff732ffd5cf9
+    imports_resolved_ast: 78dbfbb72aaf373d3503564f96a35cd03525c6e39a756c17be39ff732ffd5cf9
+    canonicalized_ast: 78dbfbb72aaf373d3503564f96a35cd03525c6e39a756c17be39ff732ffd5cf9
+    type_inferenced_ast: dd127a982da4220d309a73347d52abb8175d73c45156384aae81e32c99451511
diff --git a/tests/expectations/compiler/compiler/integers/i64/lt.leo.out b/tests/expectations/compiler/compiler/integers/i64/lt.leo.out
index ef090731fb..780f8e3d13 100644
--- a/tests/expectations/compiler/compiler/integers/i64/lt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/lt.leo.out
@@ -1,4 +1,28 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 449
+      num_constraints: 449
+      at: 639536c4b5bf6a7c935ad88f1b89a66819ee24afa34d949536ab84e9cddd7fa0
+      bt: fcbfd8b9b01e1754f1023d94765533fb9199baa19fddcb89a4d2a010e7844284
+      ct: 7b765314986bd8a51a62dabdef866c5fe05ad9bf392fb0e25b7ce3b9969f81e1
+    output:
+      - input_file: i64_l.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+      - input_file: i64_e.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: db923fdd10ce89e66c72f1db5f8e95e3016dd8513ee687250b21b7aa5ce4daec
+    imports_resolved_ast: db923fdd10ce89e66c72f1db5f8e95e3016dd8513ee687250b21b7aa5ce4daec
+    canonicalized_ast: db923fdd10ce89e66c72f1db5f8e95e3016dd8513ee687250b21b7aa5ce4daec
+    type_inferenced_ast: eaa70c92e2390a74eec47bee46b954cdcc2fca0f441545902759a13b81d3cfe0
diff --git a/tests/expectations/compiler/compiler/integers/i64/max.leo.out b/tests/expectations/compiler/compiler/integers/i64/max.leo.out
index ef090731fb..2302a3b102 100644
--- a/tests/expectations/compiler/compiler/integers/i64/max.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/max.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: "../input/dummy.in"
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 0703335d2e00880f1443d9c5b5e7b5f5a81ef393a45e6cdfdd4880f090895c52
+    imports_resolved_ast: 0703335d2e00880f1443d9c5b5e7b5f5a81ef393a45e6cdfdd4880f090895c52
+    canonicalized_ast: 0703335d2e00880f1443d9c5b5e7b5f5a81ef393a45e6cdfdd4880f090895c52
+    type_inferenced_ast: b5afbedc3b27ae8576a74efae219f1fe5381f93ef957934e31821f26c950d36f
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 3f519cf1b5..e650a7040c 100644
--- a/tests/expectations/compiler/compiler/integers/i64/max_fail.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/max_fail.leo.out
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EASG0373030]: failed to parse int value '9223372036854775808'\n    --> compiler-test:4:20\n     |\n   4 |     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 ef090731fb..4b13c2c9e7 100644
--- a/tests/expectations/compiler/compiler/integers/i64/min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/min.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: "../input/dummy.in"
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 5724b0d2d9d2977ddc189b58e5cba10201d51f3c38cc57e77f0d5c53c98656cb
+    imports_resolved_ast: 5724b0d2d9d2977ddc189b58e5cba10201d51f3c38cc57e77f0d5c53c98656cb
+    canonicalized_ast: 5724b0d2d9d2977ddc189b58e5cba10201d51f3c38cc57e77f0d5c53c98656cb
+    type_inferenced_ast: 2495a438e9e13500365e60ebc5dae138a9ac1608e0ccef13a65bbbeb411646c1
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 3f519cf1b5..96c0168ffc 100644
--- a/tests/expectations/compiler/compiler/integers/i64/min_fail.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/min_fail.leo.out
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EASG0373030]: failed to parse int value '-9223372036854775809'\n    --> compiler-test:4:20\n     |\n   4 |     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 ef090731fb..ee4b5ef6ce 100644
--- a/tests/expectations/compiler/compiler/integers/i64/mul.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/mul.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 98304
+      num_constraints: 98305
+      at: bad40272ae6cda7f44d2b892d1768eee85552b506921982eef405d5cc8d70e43
+      bt: 2fc487f7ec79d8c33c89cf5c899ad0b56f7468af6aec96081b6f08344fbf872f
+      ct: 37717cfdc15b44be3cd83355ff38227c8abc7aa09152746fe4cd7f42ae31ea9f
+    output:
+      - input_file: i64.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 7d81fb85fdaf9767a4248d83f81f48e91be6e2ce749a4a02f9fe85494154eda8
+    imports_resolved_ast: 7d81fb85fdaf9767a4248d83f81f48e91be6e2ce749a4a02f9fe85494154eda8
+    canonicalized_ast: 7d81fb85fdaf9767a4248d83f81f48e91be6e2ce749a4a02f9fe85494154eda8
+    type_inferenced_ast: 54a87debd3d8471ba6f1afef722be088ac023304fb2c27a2ef39699bf16fe81d
diff --git a/tests/expectations/compiler/compiler/integers/i64/ne.leo.out b/tests/expectations/compiler/compiler/integers/i64/ne.leo.out
index ef090731fb..43899bcc08 100644
--- a/tests/expectations/compiler/compiler/integers/i64/ne.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/ne.leo.out
@@ -1,4 +1,28 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 257
+      num_constraints: 257
+      at: 2ba8d0827cc16bb5d0076549483425de1dd0da9b3fb06fd790c256ec8d1df36b
+      bt: 7abc1550aed02405fe1d0951da294ee11583b4215ddc3889429f16ac75604766
+      ct: 8edd5528a862bbd5590cfbd0d52871e395cf73e3a22c70839571b36506fbe3a7
+    output:
+      - input_file: i64_ne.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+      - input_file: i64_e.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: cb56faba44a5f54ab7fc9021e0903b7cdd70d56bbcf97fcfdaf355475a4a2011
+    imports_resolved_ast: cb56faba44a5f54ab7fc9021e0903b7cdd70d56bbcf97fcfdaf355475a4a2011
+    canonicalized_ast: cb56faba44a5f54ab7fc9021e0903b7cdd70d56bbcf97fcfdaf355475a4a2011
+    type_inferenced_ast: ef1112d9d7f63b6addabad7a4cfbb672ef167272ea603b11a92b8b39e468fbb9
diff --git a/tests/expectations/compiler/compiler/integers/i64/negate.leo.out b/tests/expectations/compiler/compiler/integers/i64/negate.leo.out
index ef090731fb..b36a02f1d4 100644
--- a/tests/expectations/compiler/compiler/integers/i64/negate.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/negate.leo.out
@@ -1,4 +1,28 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 381
+      num_constraints: 381
+      at: 417f4d29cfbc9a9a971f4d94932ac19b448b4b7407e37e0558c3e232b4dfa073
+      bt: f99ae12913da76b1006f5da90b82a67453e4ade0ae3c1102088527b9165abfc3
+      ct: e7cff3106d84b6f974711e728b4b6138785655ed58ad24bcd957a5fbbde6be62
+    output:
+      - input_file: i64.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+      - input_file: i64.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 4ace760ee44ede5868a0ea11f96f47c596da9772ab3b821be5879782747bb64d
+    imports_resolved_ast: 4ace760ee44ede5868a0ea11f96f47c596da9772ab3b821be5879782747bb64d
+    canonicalized_ast: 4ace760ee44ede5868a0ea11f96f47c596da9772ab3b821be5879782747bb64d
+    type_inferenced_ast: eb5b6e6f6f1c91ef1489e0d686e0ea142762777b4991ee12f235ff73a91742eb
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 ef090731fb..a9ef61f2b6 100644
--- a/tests/expectations/compiler/compiler/integers/i64/negate_min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/negate_min.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: "../input/dummy.in"
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 96d8371bf9102e40d6c297ad0e042d91b9bab58212d3ace9fa0811d3be54eec5
+    imports_resolved_ast: 96d8371bf9102e40d6c297ad0e042d91b9bab58212d3ace9fa0811d3be54eec5
+    canonicalized_ast: 96d8371bf9102e40d6c297ad0e042d91b9bab58212d3ace9fa0811d3be54eec5
+    type_inferenced_ast: 1b6005dedf0bdb85dc9d50b0435bdfa1b9d34d75f516a2383890882ad3bf3b08
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 ef090731fb..680da0f38f 100644
--- a/tests/expectations/compiler/compiler/integers/i64/negate_zero.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/negate_zero.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: dummy.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: d5df39c563c640844bfd7a3fd95b53c107f66a8ce0adb7154084aad9cc42a623
+    imports_resolved_ast: d5df39c563c640844bfd7a3fd95b53c107f66a8ce0adb7154084aad9cc42a623
+    canonicalized_ast: d5df39c563c640844bfd7a3fd95b53c107f66a8ce0adb7154084aad9cc42a623
+    type_inferenced_ast: 928fe3ff4063f147fe708ef5301279b7434b5f1708f1f59a9d14f28001aaad7d
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 3f519cf1b5..c5d6f40e8c 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
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EPAR0370004]: Unexpected white space between terms 1 and i64\n    --> compiler-test:4:15\n     |\n   4 |     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 ef090731fb..f5f50da10e 100644
--- a/tests/expectations/compiler/compiler/integers/i64/sub.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/sub.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 826
+      num_constraints: 827
+      at: 353e78ba99a7a4accd8ff4d7fee5562d844f55009ffb547ee95bc741f3b75bde
+      bt: b2855c9d479f9679702723e00941392e8c7e3b66b48b997c2ff7e575b3b2a33d
+      ct: def36d63bd06a167e8b411f9f7a6208bd5da2233b7e44755d8f7fa3d483be554
+    output:
+      - input_file: i64.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 0918267d4d883608bdb8b1c178450077f0931539dc573d3829e37f24176a88f5
+    imports_resolved_ast: 0918267d4d883608bdb8b1c178450077f0931539dc573d3829e37f24176a88f5
+    canonicalized_ast: 0918267d4d883608bdb8b1c178450077f0931539dc573d3829e37f24176a88f5
+    type_inferenced_ast: f2d7b1656ffb683dbb9ec39f37938cc188186aa708fef560b75523f0863886b8
diff --git a/tests/expectations/compiler/compiler/integers/i64/ternary.leo.out b/tests/expectations/compiler/compiler/integers/i64/ternary.leo.out
index ef090731fb..837cc91d60 100644
--- a/tests/expectations/compiler/compiler/integers/i64/ternary.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/ternary.leo.out
@@ -1,4 +1,28 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 448
+      num_constraints: 512
+      at: e36c9bfd01fbf30c1f31d53e2b19d1a83989e86701ba58838688174b9ad804d7
+      bt: edadcd06780bd97cb60d245565ce94697ee12b4d71ce9148f1546f1c4390b668
+      ct: f1bb709127145aae7603feda04afbc3e401fdf290c1d549be8d2d4b21ece9b58
+    output:
+      - input_file: i64.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+      - input_file: i64_rev.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: f60c769d564a5a76451d1b347c300f1ff5c0030b412ba5d84559fdd67fe6bb79
+    imports_resolved_ast: f60c769d564a5a76451d1b347c300f1ff5c0030b412ba5d84559fdd67fe6bb79
+    canonicalized_ast: f60c769d564a5a76451d1b347c300f1ff5c0030b412ba5d84559fdd67fe6bb79
+    type_inferenced_ast: d28a4ada3a3c80b09dc1f8be54035ad7a162b5c2cf8f1b7c2eba78f02387d879
diff --git a/tests/expectations/compiler/compiler/integers/i8/add.leo.out b/tests/expectations/compiler/compiler/integers/i8/add.leo.out
index ef090731fb..bb7943cee0 100644
--- a/tests/expectations/compiler/compiler/integers/i8/add.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/add.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 84
+      num_constraints: 85
+      at: 5d1a78f3ac820a4873a0602f69d7efb764135c6df25bfc4c182daee12402a595
+      bt: 85916f4efb04caeb618ad35bc96528d6aeffd742b574cb93ed22ffcd46c87751
+      ct: 846591a223fd860defb812adf90d4d103f16e168465e64986ac960819b4fae52
+    output:
+      - input_file: i8.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 7507e4dd7081d148a851507da3d728d435ef2919517e01732a06014e32769efd
+    imports_resolved_ast: 7507e4dd7081d148a851507da3d728d435ef2919517e01732a06014e32769efd
+    canonicalized_ast: 7507e4dd7081d148a851507da3d728d435ef2919517e01732a06014e32769efd
+    type_inferenced_ast: ce071846a448bd392dbcb7a285c65f235daf29f9b398a8445948e6a261aa8b13
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 ef090731fb..f273dc87f6 100644
--- a/tests/expectations/compiler/compiler/integers/i8/console_assert.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/console_assert.leo.out
@@ -1,4 +1,19 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 31
+      num_constraints: 31
+      at: 8111e478f64beb722ec96fbd80076cb73b735813b20e8f2ed6e3c21febceaae7
+      bt: c2cfac5aa6e125cb6cde720b0598fef7933c4aa62926fe99405bf1c2829dd4ce
+      ct: a3fa97a403ebea95a47d7ded7c01cee45af74afbfa876c203e4e96f6054b8815
+    output:
+      - input_file: i8.in
+        output:
+          registers: {}
+    initial_ast: 17b1eb126e8cb1e246f071e8ad20a25eee7a8abd80e3681e525439292221632c
+    imports_resolved_ast: 17b1eb126e8cb1e246f071e8ad20a25eee7a8abd80e3681e525439292221632c
+    canonicalized_ast: 6db2d0a6b45f27e9e9b8c840e91d602b11922ab7781c5d98634c80ebad314766
+    type_inferenced_ast: b2c9bddf865c2f5682da9a10df552b6d6170ca2dcf45839470a745a1fce2ecda
diff --git a/tests/expectations/compiler/compiler/integers/i8/div.leo.out b/tests/expectations/compiler/compiler/integers/i8/div.leo.out
index ef090731fb..50f03674fa 100644
--- a/tests/expectations/compiler/compiler/integers/i8/div.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/div.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1150
+      num_constraints: 1438
+      at: ea4e10bc92af056bb4b3797063565094853fe4ba595f03fd6d4a8a0fc30ca195
+      bt: a41852ab8ac16bc91220ddd5b2fd1dacf3bebb624715cf2c3dc53f5dd172da9b
+      ct: 0449683ea39f4822da71f08082f051f005ecf6b846ab99e48c6ab9ac5aaa75be
+    output:
+      - input_file: i8.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 832849cc580efd35a4f63217783eb380f94620f893f13a64769a01a30f4c1434
+    imports_resolved_ast: 832849cc580efd35a4f63217783eb380f94620f893f13a64769a01a30f4c1434
+    canonicalized_ast: 832849cc580efd35a4f63217783eb380f94620f893f13a64769a01a30f4c1434
+    type_inferenced_ast: a0af076a419008b086212d675a91408ce30ffe05ff21ab32c1968f20b04f29d7
diff --git a/tests/expectations/compiler/compiler/integers/i8/eq.leo.out b/tests/expectations/compiler/compiler/integers/i8/eq.leo.out
index ef090731fb..9161c8b17a 100644
--- a/tests/expectations/compiler/compiler/integers/i8/eq.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/eq.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 33
+      num_constraints: 33
+      at: 424965aff58c62dd2bf38daa6426a3edcc19aa86bff3842fe4e73f743d37e1cb
+      bt: 03d1b6a8fdf9f73f595cf97261f1bae81000c89364c7af58f4f7f04aba7bac30
+      ct: 2aae7d6631260dcaafbfe9709ade84e75f5172a9baad48e108e7264d5fc17cf6
+    output:
+      - input_file: i8.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 00e6ec9c3cffe65504b49e598aee8b7c8c59823f9c1c8954d659c00704f6e12e
+    imports_resolved_ast: 00e6ec9c3cffe65504b49e598aee8b7c8c59823f9c1c8954d659c00704f6e12e
+    canonicalized_ast: 00e6ec9c3cffe65504b49e598aee8b7c8c59823f9c1c8954d659c00704f6e12e
+    type_inferenced_ast: 8d64e2540f69eb74fe27f35f221c854a71b5fdfcc1364a54c45ce742bbec9a20
diff --git a/tests/expectations/compiler/compiler/integers/i8/ge.leo.out b/tests/expectations/compiler/compiler/integers/i8/ge.leo.out
index ef090731fb..1d340dcd00 100644
--- a/tests/expectations/compiler/compiler/integers/i8/ge.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/ge.leo.out
@@ -1,4 +1,28 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 57
+      num_constraints: 57
+      at: 0c041f98ae4465c405aa6cf9dfb23157cee029c4ba12162385a49d230eaea769
+      bt: a55f11270f22104142bcee90897c9d9a8463b2fa9043957f85d82725f4bb075e
+      ct: 5a4c4f077603c1f7c4b31cf17fee281ab3cb7d2a9571be40a2f3a88577759477
+    output:
+      - input_file: i8_e.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+      - input_file: i8_g.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 1e21bb732ec541ff7a980ab309747c26b105354577ff211f1dd7712f059232f5
+    imports_resolved_ast: 1e21bb732ec541ff7a980ab309747c26b105354577ff211f1dd7712f059232f5
+    canonicalized_ast: 1e21bb732ec541ff7a980ab309747c26b105354577ff211f1dd7712f059232f5
+    type_inferenced_ast: 9cd5f4bc30be5e47771f86af4a03f7731a408abca3451e8edbd1791f20c7b54e
diff --git a/tests/expectations/compiler/compiler/integers/i8/gt.leo.out b/tests/expectations/compiler/compiler/integers/i8/gt.leo.out
index ef090731fb..b18fcf2599 100644
--- a/tests/expectations/compiler/compiler/integers/i8/gt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/gt.leo.out
@@ -1,4 +1,28 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 57
+      num_constraints: 57
+      at: fd43cbc2bdaa1e99408e9ca7bd13774576b88c884f64a153fbd8ba2a710c0b42
+      bt: 4a959c05229442ca476ef20cfe1988fab90d5ca1b8f1c75f75719d475030c086
+      ct: 5a4c4f077603c1f7c4b31cf17fee281ab3cb7d2a9571be40a2f3a88577759477
+    output:
+      - input_file: i8_g.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+      - input_file: i8_e.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 7108a8fe50fbe2b7386ef743b0627f75a4c282821f10e76713672f94830d2cbb
+    imports_resolved_ast: 7108a8fe50fbe2b7386ef743b0627f75a4c282821f10e76713672f94830d2cbb
+    canonicalized_ast: 7108a8fe50fbe2b7386ef743b0627f75a4c282821f10e76713672f94830d2cbb
+    type_inferenced_ast: 7a23bf5cda0089bdb57387dd291bf63a93f77f83748f0d8f90ebf6c32e458c95
diff --git a/tests/expectations/compiler/compiler/integers/i8/le.leo.out b/tests/expectations/compiler/compiler/integers/i8/le.leo.out
index ef090731fb..966c759f5d 100644
--- a/tests/expectations/compiler/compiler/integers/i8/le.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/le.leo.out
@@ -1,4 +1,28 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 57
+      num_constraints: 57
+      at: 5a23ebca65ed09a730f98babb863f4b6c166d80b0e97790788b5b2c1ed0e3f8a
+      bt: 13756f3827f4f5f9c3d57ac57364366b9716cd3474416861f9aa9fe7a79206d0
+      ct: 5a4c4f077603c1f7c4b31cf17fee281ab3cb7d2a9571be40a2f3a88577759477
+    output:
+      - input_file: i8_l.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+      - input_file: i8_e.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 40f8e855fce1d652c99ceb24edaacbe328ae159382b1ce13170c63669f4301e3
+    imports_resolved_ast: 40f8e855fce1d652c99ceb24edaacbe328ae159382b1ce13170c63669f4301e3
+    canonicalized_ast: 40f8e855fce1d652c99ceb24edaacbe328ae159382b1ce13170c63669f4301e3
+    type_inferenced_ast: 66d57cbb8408f594263277a42765cc12fcdc97db2fbc322191df5a39ab2f7040
diff --git a/tests/expectations/compiler/compiler/integers/i8/lt.leo.out b/tests/expectations/compiler/compiler/integers/i8/lt.leo.out
index ef090731fb..fdd7e21c80 100644
--- a/tests/expectations/compiler/compiler/integers/i8/lt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/lt.leo.out
@@ -1,4 +1,28 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 57
+      num_constraints: 57
+      at: b93e8bf8fef6bb33a2552fc46f20f842010f187164d846f84b2a8618628c59a9
+      bt: 2edb58dffc1fb55bd54dd589b8fb4cf15292f14cc2e9d478bb372b57c958ead9
+      ct: 5a4c4f077603c1f7c4b31cf17fee281ab3cb7d2a9571be40a2f3a88577759477
+    output:
+      - input_file: i8_l.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+      - input_file: i8_e.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: df68f7c978cd30eff24891875fe147f6e24ce56b328d7207814ddeb5ada6bf13
+    imports_resolved_ast: df68f7c978cd30eff24891875fe147f6e24ce56b328d7207814ddeb5ada6bf13
+    canonicalized_ast: df68f7c978cd30eff24891875fe147f6e24ce56b328d7207814ddeb5ada6bf13
+    type_inferenced_ast: 23714958eb385969480b522715c5c0c5007bdad644282aab21e07b1aab965d30
diff --git a/tests/expectations/compiler/compiler/integers/i8/max.leo.out b/tests/expectations/compiler/compiler/integers/i8/max.leo.out
index ef090731fb..901d82a33c 100644
--- a/tests/expectations/compiler/compiler/integers/i8/max.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/max.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: "../input/dummy.in"
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: af42ac6f8eb44ea7890e558b2d50b67db5ab53e74022c6426aa7a63edfdf43ec
+    imports_resolved_ast: af42ac6f8eb44ea7890e558b2d50b67db5ab53e74022c6426aa7a63edfdf43ec
+    canonicalized_ast: af42ac6f8eb44ea7890e558b2d50b67db5ab53e74022c6426aa7a63edfdf43ec
+    type_inferenced_ast: 715450b67c109631ecef7e45c8ecaae33433daec07148953c070b97b856dbf2d
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 3f519cf1b5..dbd082ebcf 100644
--- a/tests/expectations/compiler/compiler/integers/i8/max_fail.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/max_fail.leo.out
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EASG0373030]: failed to parse int value '128'\n    --> compiler-test:4:19\n     |\n   4 |     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 ef090731fb..94ed4491b4 100644
--- a/tests/expectations/compiler/compiler/integers/i8/min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/min.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: "../input/dummy.in"
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 42725429d83957372ca63c97764550141db3f8851616a33460e68ad212df74ce
+    imports_resolved_ast: 42725429d83957372ca63c97764550141db3f8851616a33460e68ad212df74ce
+    canonicalized_ast: 42725429d83957372ca63c97764550141db3f8851616a33460e68ad212df74ce
+    type_inferenced_ast: 4e4799716883d22d1e491cf20f30104174d54c64176130dcc0fb6519a08b936d
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 3f519cf1b5..8b62f07ded 100644
--- a/tests/expectations/compiler/compiler/integers/i8/min_fail.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/min_fail.leo.out
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EASG0373030]: failed to parse int value '-129'\n    --> compiler-test:4:19\n     |\n   4 |     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 ef090731fb..4c0d20d093 100644
--- a/tests/expectations/compiler/compiler/integers/i8/mul.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/mul.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1536
+      num_constraints: 1537
+      at: 245902065d66fcdaff6db49bdd20f72f3e3e85ef6afcf2e12435ee63df39b543
+      bt: 0b017985fe9a0650c67351f1cc247871e9cc9e8c907f2cb47791c5ae1a5b324a
+      ct: 3fb41ccb74d402bc413944e9eb543a7333552052b7781eb257d2b861659d5a09
+    output:
+      - input_file: i8.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: c7ea692c1c4c5b5adf571bbaf8350017c123dc7de9a130d1d3c6d92065f76b30
+    imports_resolved_ast: c7ea692c1c4c5b5adf571bbaf8350017c123dc7de9a130d1d3c6d92065f76b30
+    canonicalized_ast: c7ea692c1c4c5b5adf571bbaf8350017c123dc7de9a130d1d3c6d92065f76b30
+    type_inferenced_ast: 9324477964c91456cad1ef2d1531eeeb0a8a67d85b7cf4a0e5e59bd86beb2a86
diff --git a/tests/expectations/compiler/compiler/integers/i8/ne.leo.out b/tests/expectations/compiler/compiler/integers/i8/ne.leo.out
index ef090731fb..ca9eafb5c2 100644
--- a/tests/expectations/compiler/compiler/integers/i8/ne.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/ne.leo.out
@@ -1,4 +1,28 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 33
+      num_constraints: 33
+      at: 5e88cd940df2c48a53e64a9b8589045ef766371daa5cc885df982902d9fcc754
+      bt: 10b52342f8c44eb9b3335b4df9ca4136de3ad35d5b580b2ab32ae5e10bcdf3b4
+      ct: 2aae7d6631260dcaafbfe9709ade84e75f5172a9baad48e108e7264d5fc17cf6
+    output:
+      - input_file: i8_ne.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+      - input_file: i8_e.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 727d71a97c85ff472274e9c77d09017023aa4a01ae55f5ef4cd1f34d493e10f0
+    imports_resolved_ast: 727d71a97c85ff472274e9c77d09017023aa4a01ae55f5ef4cd1f34d493e10f0
+    canonicalized_ast: 727d71a97c85ff472274e9c77d09017023aa4a01ae55f5ef4cd1f34d493e10f0
+    type_inferenced_ast: a620d767d5f718c1bd7adb7acadc46b8fa4870d05d4b7f131ac717e3b4b825f6
diff --git a/tests/expectations/compiler/compiler/integers/i8/negate.leo.out b/tests/expectations/compiler/compiler/integers/i8/negate.leo.out
index ef090731fb..f8ba9ade14 100644
--- a/tests/expectations/compiler/compiler/integers/i8/negate.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/negate.leo.out
@@ -1,4 +1,28 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 45
+      num_constraints: 45
+      at: e308c63d5f53aa3c65315a1d38ba5ee664cce7bb22aaeaab07a37a9006d909cc
+      bt: 43214e3563d9bc921ffc9079215a945f8450cf3c02506bd6e23144b2e18944d3
+      ct: a2352ad3a95bc4b0d0ca56ac5b1bcec0cc3b62077d2c3d883f90f8bf014a8e28
+    output:
+      - input_file: i8.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+      - input_file: i8.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 048dee046e9726b86bc863821709b9b1b9a5f54afdce25a6bd46bd5fbb6307a2
+    imports_resolved_ast: 048dee046e9726b86bc863821709b9b1b9a5f54afdce25a6bd46bd5fbb6307a2
+    canonicalized_ast: 048dee046e9726b86bc863821709b9b1b9a5f54afdce25a6bd46bd5fbb6307a2
+    type_inferenced_ast: 75838a90ef9995dc6562f4a017a4bb4fcbd455a6d1a9401db836e5844c22aea3
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 3f519cf1b5..cc8f46e1c2 100644
--- a/tests/expectations/compiler/compiler/integers/i8/negate_min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/negate_min.leo.out
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+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     |               ^^"
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 ef090731fb..c9aca1e50a 100644
--- a/tests/expectations/compiler/compiler/integers/i8/negate_zero.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/negate_zero.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: dummy.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: f4eb2af96d56786f773843ae4a471cc27884a1d2427c4995b4303635d2341a3a
+    imports_resolved_ast: f4eb2af96d56786f773843ae4a471cc27884a1d2427c4995b4303635d2341a3a
+    canonicalized_ast: f4eb2af96d56786f773843ae4a471cc27884a1d2427c4995b4303635d2341a3a
+    type_inferenced_ast: 55a75c5ff5da70a4312ac3cdc1579f754ad578570160cafd05c67c1049344b3a
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 3f519cf1b5..5a8f095af1 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
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EPAR0370004]: Unexpected white space between terms 1 and i8\n    --> compiler-test:4:15\n     |\n   4 |     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 ef090731fb..44189647b2 100644
--- a/tests/expectations/compiler/compiler/integers/i8/sub.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/sub.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 98
+      num_constraints: 99
+      at: f5fc42455c37ae32df3b6d311ff2204dce57fa397f524fe0854ad9ffb3ff5c36
+      bt: 35a61219fd7bf101cf1a1a66ad2f71df661d6dc9dda2ed9df12c7650164559aa
+      ct: 85ae6ad5b3f62dc914806dac5751645342d399c583d6b6b00cd9e67f738aab30
+    output:
+      - input_file: i8.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 2c5edc8449cb6cce29bb2a02b8e3c346ab6cfd7df9cae0a00ee243999586e1a3
+    imports_resolved_ast: 2c5edc8449cb6cce29bb2a02b8e3c346ab6cfd7df9cae0a00ee243999586e1a3
+    canonicalized_ast: 2c5edc8449cb6cce29bb2a02b8e3c346ab6cfd7df9cae0a00ee243999586e1a3
+    type_inferenced_ast: c39c0bb54e8aad9f3b59c59d2437bfcb776d26dde9c8382bae06caf1902d92ae
diff --git a/tests/expectations/compiler/compiler/integers/i8/ternary.leo.out b/tests/expectations/compiler/compiler/integers/i8/ternary.leo.out
index ef090731fb..41fd97e1fa 100644
--- a/tests/expectations/compiler/compiler/integers/i8/ternary.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/ternary.leo.out
@@ -1,4 +1,28 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 56
+      num_constraints: 64
+      at: a15ec92a38acf1a47952df144e5299f49dbde96fbe1a3f3b2af4bbca483d65aa
+      bt: 90a2489533355ee3e27d5cf485612441ec10e21923eb78e6be21633ce11fa8f1
+      ct: 4c2d67fc6e1c4ad44f323c1b958ed94313153573aa72a3c0f0d25b17b54e63bc
+    output:
+      - input_file: i8.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+      - input_file: i8_rev.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 5b3ece3765ccc07057987288af24aa37205ddf5fc38146057f6a2f042d52e2ff
+    imports_resolved_ast: 5b3ece3765ccc07057987288af24aa37205ddf5fc38146057f6a2f042d52e2ff
+    canonicalized_ast: 5b3ece3765ccc07057987288af24aa37205ddf5fc38146057f6a2f042d52e2ff
+    type_inferenced_ast: ed6896d5e12795fbf9705edb4ff13a68fff3d920aa01cb40b73c25b9c6e36663
diff --git a/tests/expectations/compiler/compiler/integers/u128/add.leo.out b/tests/expectations/compiler/compiler/integers/u128/add.leo.out
index ef090731fb..8c558529ab 100644
--- a/tests/expectations/compiler/compiler/integers/u128/add.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/add.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 769
+      num_constraints: 770
+      at: 46a7cb5b4abbe0c2a583d206d68549c1d2dacbc295a7e98ab603b1e589a748ed
+      bt: 3bd68a594ade714a6dce154fa8fe1b206c3339d591863157d5d4a30e82be8c38
+      ct: ee4814a6df109d34265d062047ac22141174bab478caf254c5623f917c5d7a66
+    output:
+      - input_file: u128.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: ba86672003228d42172ddb6064b6c18793cd2b10368476457a5765d72da968bb
+    imports_resolved_ast: ba86672003228d42172ddb6064b6c18793cd2b10368476457a5765d72da968bb
+    canonicalized_ast: ba86672003228d42172ddb6064b6c18793cd2b10368476457a5765d72da968bb
+    type_inferenced_ast: 90f8e8d95d0489fe8412b8b011c96cc3297fed62522f35dda922ffe5bc8e5eb7
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 ef090731fb..2c938e0941 100644
--- a/tests/expectations/compiler/compiler/integers/u128/console_assert.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/console_assert.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 766
+      num_constraints: 766
+      at: fc8f29e5d4a184ccde7548e9a88adf215d9745a7a1f38cb41e6046c00f684f92
+      bt: a6020f3baa81181dab1735218a3d3c8a2504b7f30c6c73c0c12e8edf0aa403b6
+      ct: 22bcd53d2a96f7cf838f37fb01781267764156a778d5b2df80572f5030de4b0f
+    output:
+      - input_file: u128.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: ad919602ee4b538d6500101020bef0d5eab3f0737c717eeb26a4eb223b20ec2e
+    imports_resolved_ast: ad919602ee4b538d6500101020bef0d5eab3f0737c717eeb26a4eb223b20ec2e
+    canonicalized_ast: ad919602ee4b538d6500101020bef0d5eab3f0737c717eeb26a4eb223b20ec2e
+    type_inferenced_ast: 7ddb15730afe53d6cfd7831572139ec4d846fa9f02bdae1955352b002c4bb2eb
diff --git a/tests/expectations/compiler/compiler/integers/u128/div.leo.out b/tests/expectations/compiler/compiler/integers/u128/div.leo.out
index ef090731fb..a628da7ba8 100644
--- a/tests/expectations/compiler/compiler/integers/u128/div.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/div.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 263418
+      num_constraints: 329465
+      at: 7f9291f6c2c9d381cb6d96c1b958eb025a7fa82d19065612225198341d8ed37d
+      bt: e26d177238ab12a9e8091dfb18f68e0e82d410b1ebce7c8633bd0a4973f5db2f
+      ct: f36c23bcc522e47f2efe7c42ec8f9bccfb980c46c71d03f69222eb87a3aa6dd5
+    output:
+      - input_file: u128.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 2f1e3590db8fd98beb8eec3b15e51932dc50f6acccca4d89a04d9e4e45719a93
+    imports_resolved_ast: 2f1e3590db8fd98beb8eec3b15e51932dc50f6acccca4d89a04d9e4e45719a93
+    canonicalized_ast: 2f1e3590db8fd98beb8eec3b15e51932dc50f6acccca4d89a04d9e4e45719a93
+    type_inferenced_ast: f7edc6e2efd7b862eafc38618b8d86ec92e270fbab2cf2f568b8f2e5feecc28a
diff --git a/tests/expectations/compiler/compiler/integers/u128/eq.leo.out b/tests/expectations/compiler/compiler/integers/u128/eq.leo.out
index ef090731fb..fb7f3e8e90 100644
--- a/tests/expectations/compiler/compiler/integers/u128/eq.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/eq.leo.out
@@ -1,4 +1,28 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 513
+      num_constraints: 513
+      at: 75b34d698fc2359df51943102062181aa5ee62b84a221747dfd7f8868bf48efd
+      bt: c1e085f0d8047bc5b5f574ca9de7d79a0ce3b3235e3bfb83ff15aecf05ad1323
+      ct: c224fec21cf5a2b24eb94033a20aeb4729d3d0cf596339145cb49ea6a44cc5d8
+    output:
+      - input_file: u128_e.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+      - input_file: u128_n.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: be16e6c68a47140cb65dfd6fa6ae2084799092b353a4d7bbbbe6ea3cba689c48
+    imports_resolved_ast: be16e6c68a47140cb65dfd6fa6ae2084799092b353a4d7bbbbe6ea3cba689c48
+    canonicalized_ast: be16e6c68a47140cb65dfd6fa6ae2084799092b353a4d7bbbbe6ea3cba689c48
+    type_inferenced_ast: 70dabec56f6de97872802c0b63e48dc68b921c7bba5e526ee16f443973c1c35d
diff --git a/tests/expectations/compiler/compiler/integers/u128/ge.leo.out b/tests/expectations/compiler/compiler/integers/u128/ge.leo.out
index ef090731fb..e76870ad68 100644
--- a/tests/expectations/compiler/compiler/integers/u128/ge.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/ge.leo.out
@@ -1,4 +1,34 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 897
+      num_constraints: 897
+      at: 8c535817cf7f33927b88bddc0b246636aea9421a249b5025229c513521a43cdd
+      bt: 75543c2d7e977fd59df93d598b3ba1ab92b7e6048a823fb41969668e29286a6b
+      ct: 8d7309bdb692a71de6c9efc246984ce389534e8fc31222a94d5217720c2d20e9
+    output:
+      - input_file: u128_g.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+      - input_file: u128_e.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+      - input_file: u128_f.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: caca64001b0311d16373bfa5ce2f040cf054551675f664bd93f68b8a381ccc0b
+    imports_resolved_ast: caca64001b0311d16373bfa5ce2f040cf054551675f664bd93f68b8a381ccc0b
+    canonicalized_ast: caca64001b0311d16373bfa5ce2f040cf054551675f664bd93f68b8a381ccc0b
+    type_inferenced_ast: ad84a0f1e55ece76d7989d24b048f59e40af35918495fb0c7d9a023b810645d0
diff --git a/tests/expectations/compiler/compiler/integers/u128/gt.leo.out b/tests/expectations/compiler/compiler/integers/u128/gt.leo.out
index ef090731fb..9219d787db 100644
--- a/tests/expectations/compiler/compiler/integers/u128/gt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/gt.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 897
+      num_constraints: 897
+      at: f53fbab433e2588176ab0a5677a6d546a108e5a98abe79ccb5abbc57a4181afd
+      bt: 2005303715fb1fda8dbf03970acb45982b78b7c61034b172e9ea3cd363a013f8
+      ct: 8d7309bdb692a71de6c9efc246984ce389534e8fc31222a94d5217720c2d20e9
+    output:
+      - input_file: u128_g.in
+        output:
+          registers: {}
+      - input_file: u128_f.in
+        output:
+          registers: {}
+    initial_ast: 820ed988d142189cd95bfc559ded7f9de3a1327338e47844a7a2200d79af56a9
+    imports_resolved_ast: 820ed988d142189cd95bfc559ded7f9de3a1327338e47844a7a2200d79af56a9
+    canonicalized_ast: 3392a949832c1db83f1280df3ca8c03a4fbc0645a31325a055b63c9e44d50cdd
+    type_inferenced_ast: 5561d2a1ae0ff0c81d9cf1f4b9daf4ab75897efb06e87e8904492919f0d9f7f2
diff --git a/tests/expectations/compiler/compiler/integers/u128/input.leo.out b/tests/expectations/compiler/compiler/integers/u128/input.leo.out
index ef090731fb..2cf493020d 100644
--- a/tests/expectations/compiler/compiler/integers/u128/input.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/input.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 511
+      num_constraints: 511
+      at: f130bde196ac7e190b505a42dfb30c41772c4c7eafe9e7203be9222892b767ce
+      bt: 7ac37b347f82644239128aa66e9caf34375b1fd860069659581477883d92fb7a
+      ct: 3e4c7833e73f9ee37e42c796e8af7a6d417a012b776b348abedbfd317110858d
+    output:
+      - input_file: u128_g.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 725037d892c3a0d37394849bb896f53665de6bfb21ecbf07ca498c58a50febac
+    imports_resolved_ast: 725037d892c3a0d37394849bb896f53665de6bfb21ecbf07ca498c58a50febac
+    canonicalized_ast: 725037d892c3a0d37394849bb896f53665de6bfb21ecbf07ca498c58a50febac
+    type_inferenced_ast: 792c1e73125395e09c23e92e715b83a86bbcc337f5bca3a6a7a4ae6719e85143
diff --git a/tests/expectations/compiler/compiler/integers/u128/le.leo.out b/tests/expectations/compiler/compiler/integers/u128/le.leo.out
index ef090731fb..42c486ba6e 100644
--- a/tests/expectations/compiler/compiler/integers/u128/le.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/le.leo.out
@@ -1,4 +1,34 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 897
+      num_constraints: 897
+      at: 3898b682c2301fc8f7812b25fafec37b2382eede8f6e86d20bf9468c8b7e4a74
+      bt: 8e0a2864aa6383434f6d7843e06d6594b85a65b2009c612f72b3d8c6f07fb4ef
+      ct: 8d7309bdb692a71de6c9efc246984ce389534e8fc31222a94d5217720c2d20e9
+    output:
+      - input_file: u128_f.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "false"
+      - input_file: u128_e.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+      - input_file: u128_l.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "false"
+    initial_ast: a2c1fd53a31ef6621356b270a00943ccdae328cd449fafa6c9e23d59ba32be17
+    imports_resolved_ast: a2c1fd53a31ef6621356b270a00943ccdae328cd449fafa6c9e23d59ba32be17
+    canonicalized_ast: a2c1fd53a31ef6621356b270a00943ccdae328cd449fafa6c9e23d59ba32be17
+    type_inferenced_ast: bf6dab074ed66340481a8690067e8272bd202f9d6eeb4c53102a4114051e5117
diff --git a/tests/expectations/compiler/compiler/integers/u128/lt.leo.out b/tests/expectations/compiler/compiler/integers/u128/lt.leo.out
index ef090731fb..f6780a1416 100644
--- a/tests/expectations/compiler/compiler/integers/u128/lt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/lt.leo.out
@@ -1,4 +1,28 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 897
+      num_constraints: 897
+      at: 8bc0a661fdc05173ef7b37762e7f6fdd9e5788a8fa17b7b7d485b8ffbbdeb7c5
+      bt: 1669da8e0d67919ecf7e28a3727b73be52d08f9af5feb640a8cd6f2d302caa07
+      ct: 8d7309bdb692a71de6c9efc246984ce389534e8fc31222a94d5217720c2d20e9
+    output:
+      - input_file: u128_f.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "false"
+      - input_file: u128_g.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "false"
+    initial_ast: 5c1e4693b718191aa0f3071ec02509a38ff2a8017ce0641ff0142f2bfa7da96a
+    imports_resolved_ast: 5c1e4693b718191aa0f3071ec02509a38ff2a8017ce0641ff0142f2bfa7da96a
+    canonicalized_ast: 5c1e4693b718191aa0f3071ec02509a38ff2a8017ce0641ff0142f2bfa7da96a
+    type_inferenced_ast: 6453c5fa284e2b06dbe031d7411f2d59388c75d4f3f18d2b48c4df5f91c7d870
diff --git a/tests/expectations/compiler/compiler/integers/u128/max.leo.out b/tests/expectations/compiler/compiler/integers/u128/max.leo.out
index ef090731fb..0380abce37 100644
--- a/tests/expectations/compiler/compiler/integers/u128/max.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/max.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: "../input/dummy.in"
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: c0f6616cbef7676909cabcc405f75fefd1807abdacbe00d81069f7ba074372d5
+    imports_resolved_ast: c0f6616cbef7676909cabcc405f75fefd1807abdacbe00d81069f7ba074372d5
+    canonicalized_ast: c0f6616cbef7676909cabcc405f75fefd1807abdacbe00d81069f7ba074372d5
+    type_inferenced_ast: 6d956778ffaa3453c3af36f0d8b84fc62aff73c71f5a685421b2a310fc036121
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 3f519cf1b5..379df98977 100644
--- a/tests/expectations/compiler/compiler/integers/u128/max_fail.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/max_fail.leo.out
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EASG0373030]: failed to parse int value '340282366920938463463374607431768211456'\n    --> compiler-test:4:21\n     |\n   4 |     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 ef090731fb..ec563dd1bb 100644
--- a/tests/expectations/compiler/compiler/integers/u128/min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/min.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: "../input/dummy.in"
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 9151781352023ac8d55f9c28b1c00ebd782f0ebdc9fc0d431eacc82abdc895c1
+    imports_resolved_ast: 9151781352023ac8d55f9c28b1c00ebd782f0ebdc9fc0d431eacc82abdc895c1
+    canonicalized_ast: 9151781352023ac8d55f9c28b1c00ebd782f0ebdc9fc0d431eacc82abdc895c1
+    type_inferenced_ast: 037701324af5adc4f453a37faef5c91eee6aabd37e3aa3c612203c41e4602b66
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 3f519cf1b5..2decda5aa3 100644
--- a/tests/expectations/compiler/compiler/integers/u128/min_fail.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/min_fail.leo.out
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EASG0373030]: failed to parse int value '-1'\n    --> compiler-test:4:21\n     |\n   4 |     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 ef090731fb..d063a3ddf7 100644
--- a/tests/expectations/compiler/compiler/integers/u128/mul.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/mul.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 50431
+      num_constraints: 66944
+      at: 76a413f70472403c5adeed7a79d4c2a43f5b24850b4874fff1f6a323d4396a65
+      bt: 011ebf5dd53ae194c7135690f3bc6307a362ea10ba113e19ae7195be6ab375a9
+      ct: 147b92b75d75f78bed11d65294d9ae2479b8ab32f98521755557fd54076f3c07
+    output:
+      - input_file: mul.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "false"
+    initial_ast: 9bacdd7f562607e16f88a6cc64a6093fd09e678f8a09d485edb6e1e9cffb90e4
+    imports_resolved_ast: 9bacdd7f562607e16f88a6cc64a6093fd09e678f8a09d485edb6e1e9cffb90e4
+    canonicalized_ast: 9bacdd7f562607e16f88a6cc64a6093fd09e678f8a09d485edb6e1e9cffb90e4
+    type_inferenced_ast: 2fb1d8964dccf7acfc38e37cf41d859c30e19b052470ed54923b944fe8ec9b15
diff --git a/tests/expectations/compiler/compiler/integers/u128/ne.leo.out b/tests/expectations/compiler/compiler/integers/u128/ne.leo.out
index ef090731fb..507b010140 100644
--- a/tests/expectations/compiler/compiler/integers/u128/ne.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/ne.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 513
+      num_constraints: 513
+      at: 8f9d3ef916a970cb762ca6f3829a8b4897dc65d493a2ea2eb4fa812a2062fe67
+      bt: edc1de9388a8bb2c659c9b4e9deecd8406826abcfe220d295bf7d85a550c0c43
+      ct: c224fec21cf5a2b24eb94033a20aeb4729d3d0cf596339145cb49ea6a44cc5d8
+    output:
+      - input_file: ne.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 6796d9b74beb8daf62ccd75c5a5bcb5942d00742e35e558dcd49e4accf571458
+    imports_resolved_ast: 6796d9b74beb8daf62ccd75c5a5bcb5942d00742e35e558dcd49e4accf571458
+    canonicalized_ast: 6796d9b74beb8daf62ccd75c5a5bcb5942d00742e35e558dcd49e4accf571458
+    type_inferenced_ast: 1a122fec3c383117b7241a98a77518aa07fc495bf5724a721439e3d2c561b770
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 3f519cf1b5..e5b8fb94a9 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
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [ECMP0376089]: failed to parse `-2` as expected integer type\n    --> compiler-test:3:15\n     |\n   3 | 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 3f519cf1b5..b53dbf17a5 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
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EPAR0370004]: Unexpected white space between terms 1 and u128\n    --> compiler-test:4:15\n     |\n   4 |     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 ef090731fb..e120fc8c02 100644
--- a/tests/expectations/compiler/compiler/integers/u128/sub.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/sub.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 769
+      num_constraints: 770
+      at: 46a7cb5b4abbe0c2a583d206d68549c1d2dacbc295a7e98ab603b1e589a748ed
+      bt: 3bd68a594ade714a6dce154fa8fe1b206c3339d591863157d5d4a30e82be8c38
+      ct: 950ff5f999ac2edfb80654ff5270b048ac8a19131c655af6d145533a9ef97c6f
+    output:
+      - input_file: u128_f.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 22b1398c07fa127567d547dec76a9db42d17dfbfd3c381fd9b597e6d54ebe520
+    imports_resolved_ast: 22b1398c07fa127567d547dec76a9db42d17dfbfd3c381fd9b597e6d54ebe520
+    canonicalized_ast: 22b1398c07fa127567d547dec76a9db42d17dfbfd3c381fd9b597e6d54ebe520
+    type_inferenced_ast: 9378705614f9bb993d720e7ab3b9ad2bb6f9566c355ad8e6efdc35ed804ed1f9
diff --git a/tests/expectations/compiler/compiler/integers/u128/ternary.leo.out b/tests/expectations/compiler/compiler/integers/u128/ternary.leo.out
index ef090731fb..b82d2a83e7 100644
--- a/tests/expectations/compiler/compiler/integers/u128/ternary.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/ternary.leo.out
@@ -1,4 +1,28 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 896
+      num_constraints: 1024
+      at: 0830a3e788b536b36f271fadaadcc919281b2171d4e18814385b74f6820cb5c9
+      bt: 1fb9bfc22c01a54c08602e7f3883c19b00de1070aa9bad9e9234e322f9043711
+      ct: ee9facabe4c76f5eb89984d3c5cb15f92eaa0cc3b4bc4fdff261aeb36ad0101b
+    output:
+      - input_file: u128_t.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+      - input_file: u128_f.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: d8edd41c3446a777f3d2b0b033cee9135477ebee6a559854906789ac31db6a9a
+    imports_resolved_ast: d8edd41c3446a777f3d2b0b033cee9135477ebee6a559854906789ac31db6a9a
+    canonicalized_ast: d8edd41c3446a777f3d2b0b033cee9135477ebee6a559854906789ac31db6a9a
+    type_inferenced_ast: 0a750c50386c174281af10df1a1ab346b11fa42554a4378fa03b4846afd960b6
diff --git a/tests/expectations/compiler/compiler/integers/u16/add.leo.out b/tests/expectations/compiler/compiler/integers/u16/add.leo.out
index ef090731fb..31bc564fcf 100644
--- a/tests/expectations/compiler/compiler/integers/u16/add.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/add.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 96
+      num_constraints: 97
+      at: 370387ad947bfe3a763fa62847b00f95580ec1c1b754cf600e06b313a84044ec
+      bt: c404ca4ebed24418ea98c0994a710e335e65d373114e9e1be5ba5354ced20806
+      ct: 7413addd13f168a5677d482e41bd131e5773eca1ab5c5bd62829ed0b67fd3508
+    output:
+      - input_file: u16.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: eb6419bbaed4c761e2c76e927f773367006508a4721ea1c70cd633fe47976545
+    imports_resolved_ast: eb6419bbaed4c761e2c76e927f773367006508a4721ea1c70cd633fe47976545
+    canonicalized_ast: eb6419bbaed4c761e2c76e927f773367006508a4721ea1c70cd633fe47976545
+    type_inferenced_ast: 4da352adef1ef9a4d872afa8c0a563d66058c4b5f2c7ae6e1d6e76f9d0e6f828
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 ef090731fb..11f505cb32 100644
--- a/tests/expectations/compiler/compiler/integers/u16/console_assert.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/console_assert.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 94
+      num_constraints: 94
+      at: 6ed4469920fbabddf709f8603a84e89ce62e33de0c1728efada4b412dbc9efb6
+      bt: 7a2ed9c91a2df8eed7704b5a71f92b9e20beeade151f02135169ab5f4ca69b6a
+      ct: 09526721ae1dd7355e4608df2b3eabc5c7007bceb8c6b99389aa8160c63a8982
+    output:
+      - input_file: u16.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: d530ffa650127824ba18491674144411e798de3f154c8cf6a2a7972739df7512
+    imports_resolved_ast: d530ffa650127824ba18491674144411e798de3f154c8cf6a2a7972739df7512
+    canonicalized_ast: d530ffa650127824ba18491674144411e798de3f154c8cf6a2a7972739df7512
+    type_inferenced_ast: d5482fa8b8ade8232890a04bc9d29c9bf9f02a4dc9d49cfbe5595836a0fdabfc
diff --git a/tests/expectations/compiler/compiler/integers/u16/div.leo.out b/tests/expectations/compiler/compiler/integers/u16/div.leo.out
index ef090731fb..3fc719f817 100644
--- a/tests/expectations/compiler/compiler/integers/u16/div.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/div.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 4188
+      num_constraints: 5275
+      at: f1b7abc9150b53dfc10ee7e67e8c985a07f4e0169cd1e8ed234c67c14019f669
+      bt: ce2d469f0b5ace885987081e8dca6a93f663d3f90317850debc36b4fa3ebed96
+      ct: 5ecb4125316e7086ed355d51b635965c19ce3f234575dd3e521c187714c00dda
+    output:
+      - input_file: u16.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 41193e8e4d4bb9d346c56a0a2630ccc9c46003d3a72a215945c74af3aede4606
+    imports_resolved_ast: 41193e8e4d4bb9d346c56a0a2630ccc9c46003d3a72a215945c74af3aede4606
+    canonicalized_ast: 41193e8e4d4bb9d346c56a0a2630ccc9c46003d3a72a215945c74af3aede4606
+    type_inferenced_ast: 9aa867a159c530813bd8a1805fb093a208edcaf48466be37b18c311cc3590782
diff --git a/tests/expectations/compiler/compiler/integers/u16/eq.leo.out b/tests/expectations/compiler/compiler/integers/u16/eq.leo.out
index ef090731fb..4e75571070 100644
--- a/tests/expectations/compiler/compiler/integers/u16/eq.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/eq.leo.out
@@ -1,4 +1,28 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 65
+      num_constraints: 65
+      at: 8c8b795ef4142f2651625b90b3624d24de5138c3fb0981288a8cc5e12bf31f82
+      bt: eba2113bdda3d667d9e8c87f545fe4e2a0143b18a3fff0c1aaa46dd376ed1735
+      ct: f037d279ccea3ca689e05801ec3ba0053b5ce66a1763d4620262ea9b69873008
+    output:
+      - input_file: u16_e.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+      - input_file: u16_n.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: b45f803365a72727350696859672c162fa18a9b2b97b3c155a03cb1bf74f9e68
+    imports_resolved_ast: b45f803365a72727350696859672c162fa18a9b2b97b3c155a03cb1bf74f9e68
+    canonicalized_ast: b45f803365a72727350696859672c162fa18a9b2b97b3c155a03cb1bf74f9e68
+    type_inferenced_ast: d34a794b0695b41198003b21773b5abd4b4aa044de22a346301158aabb005d8e
diff --git a/tests/expectations/compiler/compiler/integers/u16/ge.leo.out b/tests/expectations/compiler/compiler/integers/u16/ge.leo.out
index ef090731fb..a72469e83e 100644
--- a/tests/expectations/compiler/compiler/integers/u16/ge.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/ge.leo.out
@@ -1,4 +1,34 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 113
+      num_constraints: 113
+      at: c3a94f401722187113083aa4cc5bf90ec46ae91b4ac1d0ba51d765590fe51410
+      bt: 43d500d0bdcdf8461bd9605a2665bc17410cb0c7b1c743142aad3a41e74fcbe5
+      ct: 92784334fb47e5a53eb972ec42d95f97470117bb6839cf2d46e8fcbd38a662f9
+    output:
+      - input_file: u16_g.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+      - input_file: u16_e.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+      - input_file: u16_f.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 05e8b0ca21ae27026fec7897079a23f522be4ecca74009c42a7d820dbf3b37dc
+    imports_resolved_ast: 05e8b0ca21ae27026fec7897079a23f522be4ecca74009c42a7d820dbf3b37dc
+    canonicalized_ast: 05e8b0ca21ae27026fec7897079a23f522be4ecca74009c42a7d820dbf3b37dc
+    type_inferenced_ast: f79fa9920321f18c258cdbe99fcd37b7de5ebd943bdf1a6091954c9c8501c4c0
diff --git a/tests/expectations/compiler/compiler/integers/u16/gt.leo.out b/tests/expectations/compiler/compiler/integers/u16/gt.leo.out
index ef090731fb..3effd84987 100644
--- a/tests/expectations/compiler/compiler/integers/u16/gt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/gt.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 113
+      num_constraints: 113
+      at: 800702d0776e95fee2689e79fcfe570db9fbd128310fc88565e72d322bea0407
+      bt: 417dc25c14bf36db410808a30f2263083728f1158cbf74a81bd8d8b5cba878d9
+      ct: 92784334fb47e5a53eb972ec42d95f97470117bb6839cf2d46e8fcbd38a662f9
+    output:
+      - input_file: u16_g.in
+        output:
+          registers: {}
+      - input_file: u16_f.in
+        output:
+          registers: {}
+    initial_ast: 07aa194712e885c67e73bd8ce425b09aa0b11a0597fd28e2b6b861c2890a7dbf
+    imports_resolved_ast: 07aa194712e885c67e73bd8ce425b09aa0b11a0597fd28e2b6b861c2890a7dbf
+    canonicalized_ast: 585b9eb84b4794b44a491f3a20919aa03b1defb10b34ff0c1ccaf16943c95498
+    type_inferenced_ast: f58d2c30292c5b7066145cc1f9f103c347c69bcfd103f68a11870d436d93034c
diff --git a/tests/expectations/compiler/compiler/integers/u16/input.leo.out b/tests/expectations/compiler/compiler/integers/u16/input.leo.out
index ef090731fb..bb56c37ebc 100644
--- a/tests/expectations/compiler/compiler/integers/u16/input.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/input.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 63
+      num_constraints: 63
+      at: 781fbf42db29f7fa9c21d99e21d8f011ec22b33ad26d3f80438687aafd462285
+      bt: abee7b67c55170fc3341444203a9a70e68690dce751aa36d3e91f1cf7ceef73d
+      ct: 51c18ee4216feeb01d0b0d661dfeb294e7e100873586edf79be89c8b54d9e168
+    output:
+      - input_file: u16_g.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: ce84d1a90125776ce0b144842cfdc4722338fc48bddbf027a6684704f02e71c5
+    imports_resolved_ast: ce84d1a90125776ce0b144842cfdc4722338fc48bddbf027a6684704f02e71c5
+    canonicalized_ast: ce84d1a90125776ce0b144842cfdc4722338fc48bddbf027a6684704f02e71c5
+    type_inferenced_ast: 4f28676ebd5a0be24690d37c2625b5f5080a5ae41368bff213d41b96377d9ee0
diff --git a/tests/expectations/compiler/compiler/integers/u16/le.leo.out b/tests/expectations/compiler/compiler/integers/u16/le.leo.out
index ef090731fb..765ed6181f 100644
--- a/tests/expectations/compiler/compiler/integers/u16/le.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/le.leo.out
@@ -1,4 +1,34 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 113
+      num_constraints: 113
+      at: ae8d8223fa654f971c969e68e926621d014e80b200e28a3bcb53f7e0760af811
+      bt: 7549aaa9e0eaa389b14dbf7a0c15122a1cd9707f492b8bedee98ae8f09bd9142
+      ct: 92784334fb47e5a53eb972ec42d95f97470117bb6839cf2d46e8fcbd38a662f9
+    output:
+      - input_file: u16_f.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "false"
+      - input_file: u16_e.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+      - input_file: u16_l.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "false"
+    initial_ast: 4cec9681367670442f9db73b42d312321bff0f30aeec0160b5c25c3e2dd33829
+    imports_resolved_ast: 4cec9681367670442f9db73b42d312321bff0f30aeec0160b5c25c3e2dd33829
+    canonicalized_ast: 4cec9681367670442f9db73b42d312321bff0f30aeec0160b5c25c3e2dd33829
+    type_inferenced_ast: 7cd703e68f80f112a3d93757cb906045e316616c15f781773028a4d1b4793551
diff --git a/tests/expectations/compiler/compiler/integers/u16/lt.leo.out b/tests/expectations/compiler/compiler/integers/u16/lt.leo.out
index ef090731fb..851f22fa65 100644
--- a/tests/expectations/compiler/compiler/integers/u16/lt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/lt.leo.out
@@ -1,4 +1,28 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 113
+      num_constraints: 113
+      at: f7f35cbd164c83cc4421fe89d14a349b70962c362186e237daff824054459d17
+      bt: 1bbe7b7f496597bd94e86ea0452146e8360ba0b2b2d922a81cfc51b4b5fa4fda
+      ct: 92784334fb47e5a53eb972ec42d95f97470117bb6839cf2d46e8fcbd38a662f9
+    output:
+      - input_file: u16_f.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "false"
+      - input_file: u16_g.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "false"
+    initial_ast: 68a12590c757f5286e98808d5a22bb707166828f74d4b89716553328b57867f3
+    imports_resolved_ast: 68a12590c757f5286e98808d5a22bb707166828f74d4b89716553328b57867f3
+    canonicalized_ast: 68a12590c757f5286e98808d5a22bb707166828f74d4b89716553328b57867f3
+    type_inferenced_ast: d1c19b097acf638840cadcbc81cc6e51fc750c2c49b84bcf36abc467d36e51f4
diff --git a/tests/expectations/compiler/compiler/integers/u16/max.leo.out b/tests/expectations/compiler/compiler/integers/u16/max.leo.out
index ef090731fb..f9c3c2d5b2 100644
--- a/tests/expectations/compiler/compiler/integers/u16/max.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/max.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: "../input/dummy.in"
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 6a13120d649e7db047df9453464a4a88965409a39257b56ad8466f397ab61217
+    imports_resolved_ast: 6a13120d649e7db047df9453464a4a88965409a39257b56ad8466f397ab61217
+    canonicalized_ast: 6a13120d649e7db047df9453464a4a88965409a39257b56ad8466f397ab61217
+    type_inferenced_ast: a08685b22ab2a58652759e3657a8246bd65e23d18fe895a0987e3567926eddc2
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 3f519cf1b5..5589174d2d 100644
--- a/tests/expectations/compiler/compiler/integers/u16/max_fail.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/max_fail.leo.out
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EASG0373030]: failed to parse int value '65536'\n    --> compiler-test:4:20\n     |\n   4 |     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 ef090731fb..a5a6aadb9d 100644
--- a/tests/expectations/compiler/compiler/integers/u16/min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/min.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: "../input/dummy.in"
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 10bca9f23d35f0a354948dafb069860d71618205c9e0efb483c465c5794ee83a
+    imports_resolved_ast: 10bca9f23d35f0a354948dafb069860d71618205c9e0efb483c465c5794ee83a
+    canonicalized_ast: 10bca9f23d35f0a354948dafb069860d71618205c9e0efb483c465c5794ee83a
+    type_inferenced_ast: b7673715a9b643f97ea30652defed51f23f6ba79ae9ef39c81d25fd7d3bb815e
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 3f519cf1b5..6d7454bc9e 100644
--- a/tests/expectations/compiler/compiler/integers/u16/min_fail.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/min_fail.leo.out
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EASG0373030]: failed to parse int value '-1'\n    --> compiler-test:4:20\n     |\n   4 |     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 ef090731fb..b84d167f1d 100644
--- a/tests/expectations/compiler/compiler/integers/u16/mul.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/mul.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 899
+      num_constraints: 1172
+      at: 26bd7cae34fa05bfe268e134e02dad80d3978fdbcf60cecc47f41102c659c539
+      bt: f660e7fad189d6e454e78216e0128e07d47145da1eeb6b53ed5a73cdf4fe9888
+      ct: 267549c071634baac2f681f050ede9777ca6d302d8a0ca04c60f6f60e497d64e
+    output:
+      - input_file: mul.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "false"
+    initial_ast: 9b02c262401b83f83f76f3dd22aceaa0bdb1bdd196faf68bdd71e4105bd3b143
+    imports_resolved_ast: 9b02c262401b83f83f76f3dd22aceaa0bdb1bdd196faf68bdd71e4105bd3b143
+    canonicalized_ast: 9b02c262401b83f83f76f3dd22aceaa0bdb1bdd196faf68bdd71e4105bd3b143
+    type_inferenced_ast: b5b3e21e917355dbbb35d62ee33a1f565b592dee2c62e4a56eb7521ea168c7d7
diff --git a/tests/expectations/compiler/compiler/integers/u16/ne.leo.out b/tests/expectations/compiler/compiler/integers/u16/ne.leo.out
index ef090731fb..978b1e07e8 100644
--- a/tests/expectations/compiler/compiler/integers/u16/ne.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/ne.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 65
+      num_constraints: 65
+      at: 83a4d089927a9811a9d4ed5b3ee2e50e395cd598de865653be04a2c51904b072
+      bt: 30bc7cfbc53a2e928ca0310b6041f1f1548ad7c1197ffc9301b46522122e5561
+      ct: f037d279ccea3ca689e05801ec3ba0053b5ce66a1763d4620262ea9b69873008
+    output:
+      - input_file: ne.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 30ee8bc862393f3ffec75051160d88c703e24711dc4a742369fd824485792a44
+    imports_resolved_ast: 30ee8bc862393f3ffec75051160d88c703e24711dc4a742369fd824485792a44
+    canonicalized_ast: 30ee8bc862393f3ffec75051160d88c703e24711dc4a742369fd824485792a44
+    type_inferenced_ast: e0f90d2b1c766550e9d7fe202705709a93771f8fce9debf3c119d0f1bf2ff19e
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 3f519cf1b5..55d679debc 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
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [ECMP0376089]: failed to parse `-2` as expected integer type\n    --> compiler-test:3:15\n     |\n   3 | 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 3f519cf1b5..852084492c 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
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EPAR0370004]: Unexpected white space between terms 1 and u16\n    --> compiler-test:4:15\n     |\n   4 |     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 ef090731fb..c330ad2612 100644
--- a/tests/expectations/compiler/compiler/integers/u16/sub.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/sub.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 96
+      num_constraints: 97
+      at: 370387ad947bfe3a763fa62847b00f95580ec1c1b754cf600e06b313a84044ec
+      bt: c404ca4ebed24418ea98c0994a710e335e65d373114e9e1be5ba5354ced20806
+      ct: 81a951fd0bc0072abf02978c9c6547c090936985ea19b50e3c148595d4870599
+    output:
+      - input_file: u16_f.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 63558d4f64eb9c248b6391254bc279f1ae53c08602a35e86b73d8876ae5cbff7
+    imports_resolved_ast: 63558d4f64eb9c248b6391254bc279f1ae53c08602a35e86b73d8876ae5cbff7
+    canonicalized_ast: 63558d4f64eb9c248b6391254bc279f1ae53c08602a35e86b73d8876ae5cbff7
+    type_inferenced_ast: f272cb2627650262ddfa289e945abddb91525bb8899c8d4d7853d9e5a398aa56
diff --git a/tests/expectations/compiler/compiler/integers/u16/ternary.leo.out b/tests/expectations/compiler/compiler/integers/u16/ternary.leo.out
index ef090731fb..31197445ef 100644
--- a/tests/expectations/compiler/compiler/integers/u16/ternary.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/ternary.leo.out
@@ -1,4 +1,28 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 112
+      num_constraints: 128
+      at: b0a107f586de648c8446ae3246117de3b20ba9c0249d261f234106809d112f0a
+      bt: 0e5faacb5d80488eeda9e7fa79ddd96e54c010e0e98571449f79cad816cc18a2
+      ct: 2b3428d7c7335edc32ab219fe11c92e215d70a52c89434de349f4951561d5795
+    output:
+      - input_file: u16_t.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+      - input_file: u16_f.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: a5453842c01ff883e970a8acbc0c0164e21ab8ee9667e7d198fd02b44e4cdf56
+    imports_resolved_ast: a5453842c01ff883e970a8acbc0c0164e21ab8ee9667e7d198fd02b44e4cdf56
+    canonicalized_ast: a5453842c01ff883e970a8acbc0c0164e21ab8ee9667e7d198fd02b44e4cdf56
+    type_inferenced_ast: 486a1e2a5f9e3eb3704f6ea039a832bfdad7a436464140933e978cee5dd42466
diff --git a/tests/expectations/compiler/compiler/integers/u32/add.leo.out b/tests/expectations/compiler/compiler/integers/u32/add.leo.out
index ef090731fb..e4810ab1e5 100644
--- a/tests/expectations/compiler/compiler/integers/u32/add.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/add.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 192
+      num_constraints: 193
+      at: 6cb7221b25d9868ec3dfc97292d22e7b9b7e7571ffd39a14523c2dcd6ee63c60
+      bt: db97ec2b7f2b40889263b26fc6f01de19f78a4b007371ad2f54869e9a31d21db
+      ct: 2773a172ee849b2e45b68f0c367651fc5a0715e9415d2d97601d41e540d713d0
+    output:
+      - input_file: u32.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 3ca20068a4f2cc3ce017686240c82a7320f94700e9068448d7bbcaa6c8d11afd
+    imports_resolved_ast: 3ca20068a4f2cc3ce017686240c82a7320f94700e9068448d7bbcaa6c8d11afd
+    canonicalized_ast: 3ca20068a4f2cc3ce017686240c82a7320f94700e9068448d7bbcaa6c8d11afd
+    type_inferenced_ast: 6f31cebf6905062ec9c55324ee499173987eb04820414eeda3a6696a9a4df4e5
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 ef090731fb..3990b9d39e 100644
--- a/tests/expectations/compiler/compiler/integers/u32/console_assert.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/console_assert.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 190
+      num_constraints: 190
+      at: a1a80b7c355e1fa32c2136c4dc7a0fd0670affbdda869a9161a3a69f396c6b9a
+      bt: fbf306d0d13bf3d40926ad7adc07f122cb8d065e7e5d55f3416ac30d7ebe7a7c
+      ct: 97e2acff1b76912c52107342393ec04a09af81353a25f7ce330b8492f41381cf
+    output:
+      - input_file: u32.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 00f676e0063c85f5caa851dd5e1e9061cbdf79c85da857d6e5d89d42cda9651b
+    imports_resolved_ast: 00f676e0063c85f5caa851dd5e1e9061cbdf79c85da857d6e5d89d42cda9651b
+    canonicalized_ast: 00f676e0063c85f5caa851dd5e1e9061cbdf79c85da857d6e5d89d42cda9651b
+    type_inferenced_ast: 20a848a26a90c695b25384daf05ebc98716ec0951992087dfc4370e15920b805
diff --git a/tests/expectations/compiler/compiler/integers/u32/div.leo.out b/tests/expectations/compiler/compiler/integers/u32/div.leo.out
index ef090731fb..ec1450b695 100644
--- a/tests/expectations/compiler/compiler/integers/u32/div.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/div.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 16572
+      num_constraints: 20795
+      at: 4f6450d5e7991f179adb08e1b026e453c4c6abd66f38ea4a175a888b3c1bdbf1
+      bt: 3f6fd055b4a8dacc1138d93848e7ea7424a5bc64af98ad3ee1e6e5ff4719e3c3
+      ct: a5941a2d70ce52e20004890f9a7198b0f22c93803e9d159824e716ff2ed2d223
+    output:
+      - input_file: u32.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 3edfc10e7ea7c05f9f42f2f22b673431820a526c5c6bd0729d98c48ba3c8e8aa
+    imports_resolved_ast: 3edfc10e7ea7c05f9f42f2f22b673431820a526c5c6bd0729d98c48ba3c8e8aa
+    canonicalized_ast: 3edfc10e7ea7c05f9f42f2f22b673431820a526c5c6bd0729d98c48ba3c8e8aa
+    type_inferenced_ast: 90e585dbd2a3e0d8d2d9bec6aeb443d2d3276826e18f3ce39e7cc0b4b9edad8a
diff --git a/tests/expectations/compiler/compiler/integers/u32/eq.leo.out b/tests/expectations/compiler/compiler/integers/u32/eq.leo.out
index ef090731fb..34082bd47f 100644
--- a/tests/expectations/compiler/compiler/integers/u32/eq.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/eq.leo.out
@@ -1,4 +1,28 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 129
+      num_constraints: 129
+      at: 4ce4f2bf481c4f7e47396527999e129066d1f157413884f91ced3d2b525a3187
+      bt: e63628fc48d1e71ea44830c010e442f577239e29f7ffada0d8df34c28e67f107
+      ct: 9f4c72431c0c7c03e216195a071c971c53deed8e3bfce450bffb3a6fad7418d5
+    output:
+      - input_file: u32_e.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+      - input_file: u32_n.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 0064b1991c2086b76844f10afc932e912382ca46ce87a491fa698112c647da7b
+    imports_resolved_ast: 0064b1991c2086b76844f10afc932e912382ca46ce87a491fa698112c647da7b
+    canonicalized_ast: 0064b1991c2086b76844f10afc932e912382ca46ce87a491fa698112c647da7b
+    type_inferenced_ast: e3aa9184fea93463cfc41a487e3cc59a9dd21846d201926424bf94eb0bd1ec04
diff --git a/tests/expectations/compiler/compiler/integers/u32/ge.leo.out b/tests/expectations/compiler/compiler/integers/u32/ge.leo.out
index ef090731fb..6a162f8cfe 100644
--- a/tests/expectations/compiler/compiler/integers/u32/ge.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/ge.leo.out
@@ -1,4 +1,34 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 225
+      num_constraints: 225
+      at: b09f4d28fdd36c49a340f1d95f86886acc00f8e584a50dd3c98bf6adc63bb13d
+      bt: 37e95d209b9ca56b6ed5debe1d21d2c72e48d6a0898a59833bdf3daf2ce1c96b
+      ct: d7067f500143a40e015fd1f4447a4ea5b9ee6ebdf007e08be51772a8a2b672c3
+    output:
+      - input_file: u32_g.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+      - input_file: u32_e.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+      - input_file: u32_f.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 5cf54eb75aca0534ecdcebdfcd29487598ac2bfbff4ccd94e1f8372cc66647f2
+    imports_resolved_ast: 5cf54eb75aca0534ecdcebdfcd29487598ac2bfbff4ccd94e1f8372cc66647f2
+    canonicalized_ast: 5cf54eb75aca0534ecdcebdfcd29487598ac2bfbff4ccd94e1f8372cc66647f2
+    type_inferenced_ast: fb2ff53ccf82f2b41a3c9db523623d42b49beca8a2cf2ed50743bd17c748a75c
diff --git a/tests/expectations/compiler/compiler/integers/u32/gt.leo.out b/tests/expectations/compiler/compiler/integers/u32/gt.leo.out
index ef090731fb..5c1b7b51ca 100644
--- a/tests/expectations/compiler/compiler/integers/u32/gt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/gt.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 225
+      num_constraints: 225
+      at: 63019ae9d78e708c481c3ed306a9fb7e5a4ddc8db20d1a2a48e2e161aca53542
+      bt: 3a99f6fa32ac0358a66ac53d0cef7af442097730b5f56ec8f8d9974108f25215
+      ct: d7067f500143a40e015fd1f4447a4ea5b9ee6ebdf007e08be51772a8a2b672c3
+    output:
+      - input_file: u32_g.in
+        output:
+          registers: {}
+      - input_file: u32_f.in
+        output:
+          registers: {}
+    initial_ast: ce24730aad7178331b88c496a8acbb95da355169193369d49801fc9eac092371
+    imports_resolved_ast: ce24730aad7178331b88c496a8acbb95da355169193369d49801fc9eac092371
+    canonicalized_ast: 21cd67ad1094e56f7cbcc6bc839d9b20c25e8d15e2017d64c4672da2233385e4
+    type_inferenced_ast: 532bef95e9c6d5432f89a08f207e25e30b61b862f7a1fd225603cb89f0b203b5
diff --git a/tests/expectations/compiler/compiler/integers/u32/input.leo.out b/tests/expectations/compiler/compiler/integers/u32/input.leo.out
index ef090731fb..f2190b9b36 100644
--- a/tests/expectations/compiler/compiler/integers/u32/input.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/input.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 127
+      num_constraints: 127
+      at: 051151c1ab89f2c0ff0fe5d336668c3fcd6dc4744d1f5b8e135dcb7bf6a6195c
+      bt: 6b92443726163ac0fc32f7c9edace0ec8369e793d24105d93d121cb0bd5c3128
+      ct: 7cb2d3f0ccfb9a2e747c6a05bdb52812c4539c836ff62c4e555fac13ef2084d4
+    output:
+      - input_file: u32_g.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: b6d84a8bb303dcb914251907999a4c4747f2f1ba76547f9b6bf42cf964b8c173
+    imports_resolved_ast: b6d84a8bb303dcb914251907999a4c4747f2f1ba76547f9b6bf42cf964b8c173
+    canonicalized_ast: b6d84a8bb303dcb914251907999a4c4747f2f1ba76547f9b6bf42cf964b8c173
+    type_inferenced_ast: 20de2c6d503d1dd20412d2f689fc34a0965994743221604b2e83dfb62ea1b76c
diff --git a/tests/expectations/compiler/compiler/integers/u32/le.leo.out b/tests/expectations/compiler/compiler/integers/u32/le.leo.out
index ef090731fb..d54beb1abb 100644
--- a/tests/expectations/compiler/compiler/integers/u32/le.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/le.leo.out
@@ -1,4 +1,34 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 225
+      num_constraints: 225
+      at: be1f0e82bb31df7cf90717f08c3dc7f68f997c41433d5971d2d0f250faff6847
+      bt: 6e596324acc04a48f980f6248f44cbf54a25671a41051bbffc087505edbf031f
+      ct: d7067f500143a40e015fd1f4447a4ea5b9ee6ebdf007e08be51772a8a2b672c3
+    output:
+      - input_file: u32_f.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "false"
+      - input_file: u32_e.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+      - input_file: u32_l.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "false"
+    initial_ast: 609c549354bf45d203924554785e66eaa4506fc72cab880da747d87be55fb687
+    imports_resolved_ast: 609c549354bf45d203924554785e66eaa4506fc72cab880da747d87be55fb687
+    canonicalized_ast: 609c549354bf45d203924554785e66eaa4506fc72cab880da747d87be55fb687
+    type_inferenced_ast: deba08692c955e042da5d13a1209eb8fc84398362e51d95c8866b18332034706
diff --git a/tests/expectations/compiler/compiler/integers/u32/lt.leo.out b/tests/expectations/compiler/compiler/integers/u32/lt.leo.out
index ef090731fb..14201458e4 100644
--- a/tests/expectations/compiler/compiler/integers/u32/lt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/lt.leo.out
@@ -1,4 +1,28 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 225
+      num_constraints: 225
+      at: aa2fc0bfe167bccae6c9eca820227eb4b981007c89579a32d3b5ec4a8268f30d
+      bt: 953b00df7ba097904b71a60403e38d69eece1a6e0b6791b13214cb6ea803fbb3
+      ct: d7067f500143a40e015fd1f4447a4ea5b9ee6ebdf007e08be51772a8a2b672c3
+    output:
+      - input_file: u32_f.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "false"
+      - input_file: u32_g.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "false"
+    initial_ast: 62a00f0678c643a199718696e42d0acb438f78f1cf5c6dbcd4ecb45b7a8a7100
+    imports_resolved_ast: 62a00f0678c643a199718696e42d0acb438f78f1cf5c6dbcd4ecb45b7a8a7100
+    canonicalized_ast: 62a00f0678c643a199718696e42d0acb438f78f1cf5c6dbcd4ecb45b7a8a7100
+    type_inferenced_ast: eb21e43b5fb6fd7fe7b7fe35af69df697aa5fc8ca94325a0b6f957c55828b46e
diff --git a/tests/expectations/compiler/compiler/integers/u32/max.leo.out b/tests/expectations/compiler/compiler/integers/u32/max.leo.out
index ef090731fb..6894c507e7 100644
--- a/tests/expectations/compiler/compiler/integers/u32/max.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/max.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: "../input/dummy.in"
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: e39345598cb3fb70a83082c7996f36d8c30ba9414fe7f6b9cc982bba85ec0a6a
+    imports_resolved_ast: e39345598cb3fb70a83082c7996f36d8c30ba9414fe7f6b9cc982bba85ec0a6a
+    canonicalized_ast: e39345598cb3fb70a83082c7996f36d8c30ba9414fe7f6b9cc982bba85ec0a6a
+    type_inferenced_ast: bca1eb2f17887930dfabe774271b8455b15536e4f835deb9961e1668ad405c3c
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 3f519cf1b5..b7d67e21c2 100644
--- a/tests/expectations/compiler/compiler/integers/u32/max_fail.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/max_fail.leo.out
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EASG0373030]: failed to parse int value '4294967296'\n    --> compiler-test:4:20\n     |\n   4 |     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 ef090731fb..ced1a702ef 100644
--- a/tests/expectations/compiler/compiler/integers/u32/min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/min.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: "../input/dummy.in"
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 9ca4ca8404f1fc0d16a652b741f3e57d3483d8cdb05304a58f6b1ee3580886c1
+    imports_resolved_ast: 9ca4ca8404f1fc0d16a652b741f3e57d3483d8cdb05304a58f6b1ee3580886c1
+    canonicalized_ast: 9ca4ca8404f1fc0d16a652b741f3e57d3483d8cdb05304a58f6b1ee3580886c1
+    type_inferenced_ast: 156bc2c711d9666d42cff2bb99582ff06ad6a13a49ee529a59242e729d71f7dc
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 3f519cf1b5..b7e23834bd 100644
--- a/tests/expectations/compiler/compiler/integers/u32/min_fail.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/min_fail.leo.out
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EASG0373030]: failed to parse int value '-1'\n    --> compiler-test:4:20\n     |\n   4 |     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 ef090731fb..cf8fdc3da5 100644
--- a/tests/expectations/compiler/compiler/integers/u32/mul.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/mul.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 3332
+      num_constraints: 4389
+      at: 2edbd98e47b4ed8cd7d7c761594353aa4ae9ca443e4d1e1f43c1e89e61955a13
+      bt: 127cc198f6c432cd8add8297902708b759e48ff05fb8c042a356cb5bd81524a8
+      ct: e4cb5fbafce0c6aae444c1ddf3f1883ca3df62c790a4baa8a3755bd75bb42f49
+    output:
+      - input_file: mul.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "false"
+    initial_ast: 64377d0d7fdebe1312a8b11a1e0e45b2664cbf51042de5ffddfd56a1b2c49c35
+    imports_resolved_ast: 64377d0d7fdebe1312a8b11a1e0e45b2664cbf51042de5ffddfd56a1b2c49c35
+    canonicalized_ast: 64377d0d7fdebe1312a8b11a1e0e45b2664cbf51042de5ffddfd56a1b2c49c35
+    type_inferenced_ast: 4e218b33b3b57390e30f068e49f5ed008626b4ebb22615fdd29929bf36ec2ed0
diff --git a/tests/expectations/compiler/compiler/integers/u32/ne.leo.out b/tests/expectations/compiler/compiler/integers/u32/ne.leo.out
index ef090731fb..730c529f30 100644
--- a/tests/expectations/compiler/compiler/integers/u32/ne.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/ne.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 129
+      num_constraints: 129
+      at: 6cde17fb079861287679ad93d9ed9125cfc21000431bfeaf5a2054360ce51ef7
+      bt: 1178e67ab79eac96592f17313168c4300d53e89ab571025054d53d19dfdfd1b8
+      ct: 9f4c72431c0c7c03e216195a071c971c53deed8e3bfce450bffb3a6fad7418d5
+    output:
+      - input_file: ne.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 0857646d1f6fdb13fc94c7fea7f0d91fcb1fdccb4841661a170b00c3091f5691
+    imports_resolved_ast: 0857646d1f6fdb13fc94c7fea7f0d91fcb1fdccb4841661a170b00c3091f5691
+    canonicalized_ast: 0857646d1f6fdb13fc94c7fea7f0d91fcb1fdccb4841661a170b00c3091f5691
+    type_inferenced_ast: 85905a294e0eea013e6f7c4fe93858e935258f5001d1bb6aa082325ec90df1fe
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 3f519cf1b5..122639ac74 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
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [ECMP0376089]: failed to parse `-2` as expected integer type\n    --> compiler-test:3:15\n     |\n   3 | 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 3f519cf1b5..4974811270 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
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EPAR0370004]: Unexpected white space between terms 1 and u32\n    --> compiler-test:4:15\n     |\n   4 |     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 ef090731fb..9a4a91c185 100644
--- a/tests/expectations/compiler/compiler/integers/u32/sub.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/sub.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 192
+      num_constraints: 193
+      at: 6cb7221b25d9868ec3dfc97292d22e7b9b7e7571ffd39a14523c2dcd6ee63c60
+      bt: db97ec2b7f2b40889263b26fc6f01de19f78a4b007371ad2f54869e9a31d21db
+      ct: 0a2d17cb1ee78051a702abbb771d34100ff951ae893e69981ee2507b5aba6671
+    output:
+      - input_file: u32_f.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 5ad8be6dc638e835e2f7b4e9dd26f9ae282dbe59d9853db13ce09f38d3e43b1f
+    imports_resolved_ast: 5ad8be6dc638e835e2f7b4e9dd26f9ae282dbe59d9853db13ce09f38d3e43b1f
+    canonicalized_ast: 5ad8be6dc638e835e2f7b4e9dd26f9ae282dbe59d9853db13ce09f38d3e43b1f
+    type_inferenced_ast: e7b074bd40b37ada9a90999b35fdbcd56886e2f98949a4093ba8c495661a75d1
diff --git a/tests/expectations/compiler/compiler/integers/u32/ternary.leo.out b/tests/expectations/compiler/compiler/integers/u32/ternary.leo.out
index ef090731fb..b22494cd5e 100644
--- a/tests/expectations/compiler/compiler/integers/u32/ternary.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/ternary.leo.out
@@ -1,4 +1,28 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 224
+      num_constraints: 256
+      at: 45301188494f0c65b2e88eac9117ba7367e772ea34e9b8f34bf3d49dbd1dd067
+      bt: 35d9c47cfd4fc137760d0ee411c0b097541cab7aae2b0a9ea83b368328fe5c23
+      ct: 032da4c7df957d9ca89b5395be6e1c84cab7d19a78abe1b02bb37b26ca65b0e4
+    output:
+      - input_file: u32_t.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+      - input_file: u32_f.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: c5b7d8bd3863f44039ab510def2034acb99362b39a5428e6fc117483353f4afe
+    imports_resolved_ast: c5b7d8bd3863f44039ab510def2034acb99362b39a5428e6fc117483353f4afe
+    canonicalized_ast: c5b7d8bd3863f44039ab510def2034acb99362b39a5428e6fc117483353f4afe
+    type_inferenced_ast: dc3eaf97d5cb489ebffb01f14ba974027562ca17f438301c26167aa3471ddc52
diff --git a/tests/expectations/compiler/compiler/integers/u64/add.leo.out b/tests/expectations/compiler/compiler/integers/u64/add.leo.out
index ef090731fb..788d42dcc1 100644
--- a/tests/expectations/compiler/compiler/integers/u64/add.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/add.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 384
+      num_constraints: 385
+      at: 03f552addf49f5f1c8402d8af8dd733983efa7fd3436d677d89d74a1c6548962
+      bt: 8cbfb6559664a4d73354d718f19247484a98da79ddf83350c1a070cb14fda399
+      ct: 0715661d18c8621f5c33eee669d8d659ee3a767d6ef515102191cdc19577ac02
+    output:
+      - input_file: u64.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 0ef0459ce0ac2ba8a9c2272d6c4f67f7dd9cd7d36c557c65339d2ef8d2c5b187
+    imports_resolved_ast: 0ef0459ce0ac2ba8a9c2272d6c4f67f7dd9cd7d36c557c65339d2ef8d2c5b187
+    canonicalized_ast: 0ef0459ce0ac2ba8a9c2272d6c4f67f7dd9cd7d36c557c65339d2ef8d2c5b187
+    type_inferenced_ast: 248f3c601e2a40da8679d72f7b7316b939d60cf137c4b51cbb45fa17f7707f6e
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 ef090731fb..dc696c5d5e 100644
--- a/tests/expectations/compiler/compiler/integers/u64/console_assert.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/console_assert.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 382
+      num_constraints: 382
+      at: 9d064db37e95194967d924cd23aecd5ddd20a17c31a48470f0b624f5937ff750
+      bt: 21d30b45426d69b866ddb826df03348580bcd064b2586cd615e3c270d7b85397
+      ct: bd9112f8b3135d07d5b5a2491f17add20c7ca9d7881df20e3ff47918d208e75d
+    output:
+      - input_file: u64.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: d2f3122d85fa05ee19f871887e18aa6efabad907605cea1f15450ef959b2879a
+    imports_resolved_ast: d2f3122d85fa05ee19f871887e18aa6efabad907605cea1f15450ef959b2879a
+    canonicalized_ast: d2f3122d85fa05ee19f871887e18aa6efabad907605cea1f15450ef959b2879a
+    type_inferenced_ast: f815e8620acc120dd2d65879e28cb0454628ce35522a1c2ff767fa01035bdf58
diff --git a/tests/expectations/compiler/compiler/integers/u64/div.leo.out b/tests/expectations/compiler/compiler/integers/u64/div.leo.out
index ef090731fb..001652407f 100644
--- a/tests/expectations/compiler/compiler/integers/u64/div.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/div.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 65916
+      num_constraints: 82555
+      at: 071831a1f073f5ba74377785488634267645562682b9dbeaafd1f65e39bf17d3
+      bt: bcde87dd40262305d4c32a5949fa939d1b83f6ae51143eba7c147eab61314987
+      ct: 7c81f1ec1d5e9746863df8f4128342df3b6ad3abe2397c2274a0c3fc45750094
+    output:
+      - input_file: u64.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 2fdc5cbc880c5460481529ab25107dd0aca1981e62799cbc2b2493aa09118a48
+    imports_resolved_ast: 2fdc5cbc880c5460481529ab25107dd0aca1981e62799cbc2b2493aa09118a48
+    canonicalized_ast: 2fdc5cbc880c5460481529ab25107dd0aca1981e62799cbc2b2493aa09118a48
+    type_inferenced_ast: 961438f46e01229747be641eee9975d6368894da0e8a6b34339bd6268dd8afa6
diff --git a/tests/expectations/compiler/compiler/integers/u64/eq.leo.out b/tests/expectations/compiler/compiler/integers/u64/eq.leo.out
index ef090731fb..769418bc71 100644
--- a/tests/expectations/compiler/compiler/integers/u64/eq.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/eq.leo.out
@@ -1,4 +1,28 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 257
+      num_constraints: 257
+      at: 30dc67aa22cadc6e5ec8c73e0096443263121e29adf46bb33ed310b07765ff6e
+      bt: 1aaee32179419b6185d75c5745bd13c7c8ba869bad0132405ef1b28915bfe5d9
+      ct: 8edd5528a862bbd5590cfbd0d52871e395cf73e3a22c70839571b36506fbe3a7
+    output:
+      - input_file: u64_e.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+      - input_file: u64_n.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: ad4f42340cbf53046e609f62504385802398d608ada37e91f60134edf598ba59
+    imports_resolved_ast: ad4f42340cbf53046e609f62504385802398d608ada37e91f60134edf598ba59
+    canonicalized_ast: ad4f42340cbf53046e609f62504385802398d608ada37e91f60134edf598ba59
+    type_inferenced_ast: 4cf9af4071478957995abe43c2e193df18a860eaa82449a0952b732ec7be9a9c
diff --git a/tests/expectations/compiler/compiler/integers/u64/ge.leo.out b/tests/expectations/compiler/compiler/integers/u64/ge.leo.out
index ef090731fb..085d10a1f8 100644
--- a/tests/expectations/compiler/compiler/integers/u64/ge.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/ge.leo.out
@@ -1,4 +1,34 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 449
+      num_constraints: 449
+      at: 43b83eacdd7b17b700c040da76128375494a8f013882c2cd401cf5c9ceeef74a
+      bt: bd9dd7ede35a39f80c5b4b97dca300dcd37110f2270cb25d8935d964db04e2ab
+      ct: 7b765314986bd8a51a62dabdef866c5fe05ad9bf392fb0e25b7ce3b9969f81e1
+    output:
+      - input_file: u64_g.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+      - input_file: u64_e.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+      - input_file: u64_f.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 98a856a767ee58ea53ec7a6f489d6db69a9e828b76e7b8b26c0222b89b4be3d3
+    imports_resolved_ast: 98a856a767ee58ea53ec7a6f489d6db69a9e828b76e7b8b26c0222b89b4be3d3
+    canonicalized_ast: 98a856a767ee58ea53ec7a6f489d6db69a9e828b76e7b8b26c0222b89b4be3d3
+    type_inferenced_ast: 2d3be362efd6a4a97dc1b06eff92c06facd649dab585f3ad681d5ce49e4e37cf
diff --git a/tests/expectations/compiler/compiler/integers/u64/gt.leo.out b/tests/expectations/compiler/compiler/integers/u64/gt.leo.out
index ef090731fb..ceb14c1bab 100644
--- a/tests/expectations/compiler/compiler/integers/u64/gt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/gt.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 449
+      num_constraints: 449
+      at: 961c527f11c9cd68f1dff327e550127f82fc974a4b92c1dedc47a2f7426590a9
+      bt: fcf7dc96d2a270e2f93cf6e19151e06c10a1b5361d5ac92a8cb2a2ba36c19067
+      ct: 7b765314986bd8a51a62dabdef866c5fe05ad9bf392fb0e25b7ce3b9969f81e1
+    output:
+      - input_file: u64_g.in
+        output:
+          registers: {}
+      - input_file: u64_f.in
+        output:
+          registers: {}
+    initial_ast: c667f170b175a4c3991b2df81c0605d3980cab1ae01ae4c66c71f3a311d711c2
+    imports_resolved_ast: c667f170b175a4c3991b2df81c0605d3980cab1ae01ae4c66c71f3a311d711c2
+    canonicalized_ast: 173da56c6c9a8cd27a1181d9fe1197db4168f4f25129dbd02ef474e5c77c110f
+    type_inferenced_ast: 4618a65899c633510140b465505d8f767d890f40bc24535513f73d04e187a884
diff --git a/tests/expectations/compiler/compiler/integers/u64/input.leo.out b/tests/expectations/compiler/compiler/integers/u64/input.leo.out
index ef090731fb..ba72baf0a0 100644
--- a/tests/expectations/compiler/compiler/integers/u64/input.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/input.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 255
+      num_constraints: 255
+      at: 68080cb19b62be7f91ee2118affb7b55ea272e15e17581869385053a5c6d3623
+      bt: 2c1d031e57e285b1277f2c37853fc7fdff23711e1147d7b26ed74d3acd28ceff
+      ct: 0b136215b60005ed17aa4eea76bc4e2b0349c0fecf57dc06f5dba31981f270d0
+    output:
+      - input_file: u64_g.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 2f1b1bd0b33a99d4962b01003146df394ef6b0ba913080a4a905ad393ae5ad44
+    imports_resolved_ast: 2f1b1bd0b33a99d4962b01003146df394ef6b0ba913080a4a905ad393ae5ad44
+    canonicalized_ast: 2f1b1bd0b33a99d4962b01003146df394ef6b0ba913080a4a905ad393ae5ad44
+    type_inferenced_ast: 4b97d8527b94d514fa342714f89595dd6384f95d21ead2b6f52ca4141e54b2b4
diff --git a/tests/expectations/compiler/compiler/integers/u64/le.leo.out b/tests/expectations/compiler/compiler/integers/u64/le.leo.out
index ef090731fb..4404e32632 100644
--- a/tests/expectations/compiler/compiler/integers/u64/le.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/le.leo.out
@@ -1,4 +1,34 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 449
+      num_constraints: 449
+      at: d8041c17d69554c3c06ad3d72f58df129a6df56184fd121c815b1ddfe0951d52
+      bt: 20b7ff1d5fb8aeb0ff37cde558c4da0c1949885789a23bdf21a415cefb159e16
+      ct: 7b765314986bd8a51a62dabdef866c5fe05ad9bf392fb0e25b7ce3b9969f81e1
+    output:
+      - input_file: u64_f.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "false"
+      - input_file: u64_e.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+      - input_file: u64_l.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "false"
+    initial_ast: 254f1e1190e4badc566cf6325a2204b54c3862730fd1927f940bed7fc59661ef
+    imports_resolved_ast: 254f1e1190e4badc566cf6325a2204b54c3862730fd1927f940bed7fc59661ef
+    canonicalized_ast: 254f1e1190e4badc566cf6325a2204b54c3862730fd1927f940bed7fc59661ef
+    type_inferenced_ast: d0f1f32a7cfddb8fdeb6d3c8d1dc671e360e6da220cc027d96ba9af05a89c9ee
diff --git a/tests/expectations/compiler/compiler/integers/u64/lt.leo.out b/tests/expectations/compiler/compiler/integers/u64/lt.leo.out
index ef090731fb..e5858787e1 100644
--- a/tests/expectations/compiler/compiler/integers/u64/lt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/lt.leo.out
@@ -1,4 +1,28 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 449
+      num_constraints: 449
+      at: 6fad339784c0e41ffb56fc6d4b5949563cf1a7e53e91cf1c643df2dd798c9cf8
+      bt: ac1a1706eaf7c384375eebf95d38ab272e9c27745c6a9f5feed56e6ecbe28e8b
+      ct: 7b765314986bd8a51a62dabdef866c5fe05ad9bf392fb0e25b7ce3b9969f81e1
+    output:
+      - input_file: u64_f.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "false"
+      - input_file: u64_g.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "false"
+    initial_ast: 78e1412b1d5489da7cc5748403694f48facede592b307e53b8ff81c88706aaba
+    imports_resolved_ast: 78e1412b1d5489da7cc5748403694f48facede592b307e53b8ff81c88706aaba
+    canonicalized_ast: 78e1412b1d5489da7cc5748403694f48facede592b307e53b8ff81c88706aaba
+    type_inferenced_ast: de8ae920138c080d121776efa9920dc1b51108aaf7e18e75c61fcd4436bfdbdb
diff --git a/tests/expectations/compiler/compiler/integers/u64/max.leo.out b/tests/expectations/compiler/compiler/integers/u64/max.leo.out
index ef090731fb..2740bb1a85 100644
--- a/tests/expectations/compiler/compiler/integers/u64/max.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/max.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: "../input/dummy.in"
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: b683fad49d2ee3cf8e2c08db1994d40178fd8620ed5b2a1aa84a222a2db4d466
+    imports_resolved_ast: b683fad49d2ee3cf8e2c08db1994d40178fd8620ed5b2a1aa84a222a2db4d466
+    canonicalized_ast: b683fad49d2ee3cf8e2c08db1994d40178fd8620ed5b2a1aa84a222a2db4d466
+    type_inferenced_ast: 58e6327fa6d926a54bf437c8b3368b1bb2a62c9f86c372139b0952de56b94d78
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 3f519cf1b5..55b5108fa8 100644
--- a/tests/expectations/compiler/compiler/integers/u64/max_fail.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/max_fail.leo.out
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EASG0373030]: failed to parse int value '18446744073709551616'\n    --> compiler-test:4:20\n     |\n   4 |     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 ef090731fb..8668160ca6 100644
--- a/tests/expectations/compiler/compiler/integers/u64/min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/min.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: "../input/dummy.in"
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 2ab7dc6aeaa06191668ce218bf971a797d818d82d57e5c5238571ac7d51b3e1a
+    imports_resolved_ast: 2ab7dc6aeaa06191668ce218bf971a797d818d82d57e5c5238571ac7d51b3e1a
+    canonicalized_ast: 2ab7dc6aeaa06191668ce218bf971a797d818d82d57e5c5238571ac7d51b3e1a
+    type_inferenced_ast: 9b04ce3a661bfcbc23b9066b315b48ca4cc51c10364dc3f2aa6196efd1633056
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 3f519cf1b5..f0d007ea6c 100644
--- a/tests/expectations/compiler/compiler/integers/u64/min_fail.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/min_fail.leo.out
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EASG0373030]: failed to parse int value '-1'\n    --> compiler-test:4:20\n     |\n   4 |     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 ef090731fb..ea52e75d85 100644
--- a/tests/expectations/compiler/compiler/integers/u64/mul.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/mul.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 12805
+      num_constraints: 16966
+      at: 94607d20548e2b4a046e0f3eb55624da27ec73bcaeee0e8258b3d2e2e607b2fd
+      bt: 8063dc2ec3957d32cb243785803b1fe280885ae5bbb7b50ae5dd71b4a5b404dd
+      ct: 5c2a423f5d488da02561837d1ae9e5b86ede29cd64555ebc88229ab4ef9d8fa2
+    output:
+      - input_file: mul.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "false"
+    initial_ast: 234cebde72559d83c7ca897456c95a46345a67de7fd6b82aa9fb3a0ce5cd9d6d
+    imports_resolved_ast: 234cebde72559d83c7ca897456c95a46345a67de7fd6b82aa9fb3a0ce5cd9d6d
+    canonicalized_ast: 234cebde72559d83c7ca897456c95a46345a67de7fd6b82aa9fb3a0ce5cd9d6d
+    type_inferenced_ast: 41a3dae72352f43712f3cc0cb507ab92031b48cfdb7fcb06f959b6060758d17b
diff --git a/tests/expectations/compiler/compiler/integers/u64/ne.leo.out b/tests/expectations/compiler/compiler/integers/u64/ne.leo.out
index ef090731fb..28e0fa8284 100644
--- a/tests/expectations/compiler/compiler/integers/u64/ne.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/ne.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 257
+      num_constraints: 257
+      at: 2ba8d0827cc16bb5d0076549483425de1dd0da9b3fb06fd790c256ec8d1df36b
+      bt: 7abc1550aed02405fe1d0951da294ee11583b4215ddc3889429f16ac75604766
+      ct: 8edd5528a862bbd5590cfbd0d52871e395cf73e3a22c70839571b36506fbe3a7
+    output:
+      - input_file: ne.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: d4062e73e7e24af37d9e4d1770d18e008d47f5df0dbc2de56a1089496e53ea1b
+    imports_resolved_ast: d4062e73e7e24af37d9e4d1770d18e008d47f5df0dbc2de56a1089496e53ea1b
+    canonicalized_ast: d4062e73e7e24af37d9e4d1770d18e008d47f5df0dbc2de56a1089496e53ea1b
+    type_inferenced_ast: 0b9394287626c1cbe2240d34740fc8cd3202690de88d4dae3b1062ed519415e9
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 3f519cf1b5..b160ff699c 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
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [ECMP0376089]: failed to parse `-2` as expected integer type\n    --> compiler-test:3:15\n     |\n   3 | 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 3f519cf1b5..69aa25a324 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
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EPAR0370004]: Unexpected white space between terms 1 and u64\n    --> compiler-test:4:15\n     |\n   4 |     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 ef090731fb..2d4c78d409 100644
--- a/tests/expectations/compiler/compiler/integers/u64/sub.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/sub.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 384
+      num_constraints: 385
+      at: 03f552addf49f5f1c8402d8af8dd733983efa7fd3436d677d89d74a1c6548962
+      bt: 8cbfb6559664a4d73354d718f19247484a98da79ddf83350c1a070cb14fda399
+      ct: 4906d35acd2d4c5fda24a10932dbccfb9c814de0b6160b29fa57540935c864ee
+    output:
+      - input_file: u64_f.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 9776d9311c67fd4c0a402d7b62623d78090a7c548e25841d2629d503bfe185ff
+    imports_resolved_ast: 9776d9311c67fd4c0a402d7b62623d78090a7c548e25841d2629d503bfe185ff
+    canonicalized_ast: 9776d9311c67fd4c0a402d7b62623d78090a7c548e25841d2629d503bfe185ff
+    type_inferenced_ast: 0ca6841975de33f74979b293de56ac993cdaa92fedfe1932bec2ffaf847d43fc
diff --git a/tests/expectations/compiler/compiler/integers/u64/ternary.leo.out b/tests/expectations/compiler/compiler/integers/u64/ternary.leo.out
index ef090731fb..41f8fede4f 100644
--- a/tests/expectations/compiler/compiler/integers/u64/ternary.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/ternary.leo.out
@@ -1,4 +1,28 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 448
+      num_constraints: 512
+      at: e36c9bfd01fbf30c1f31d53e2b19d1a83989e86701ba58838688174b9ad804d7
+      bt: edadcd06780bd97cb60d245565ce94697ee12b4d71ce9148f1546f1c4390b668
+      ct: f1bb709127145aae7603feda04afbc3e401fdf290c1d549be8d2d4b21ece9b58
+    output:
+      - input_file: u64_t.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+      - input_file: u64_f.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 3295b9a5f343261562befdfbf3a7ee33326d6316a1101c00c909cc79747f5bb4
+    imports_resolved_ast: 3295b9a5f343261562befdfbf3a7ee33326d6316a1101c00c909cc79747f5bb4
+    canonicalized_ast: 3295b9a5f343261562befdfbf3a7ee33326d6316a1101c00c909cc79747f5bb4
+    type_inferenced_ast: a17c197c6672681826a04859b8fbe7e007401aa62fa8feed14ebefc81f958793
diff --git a/tests/expectations/compiler/compiler/integers/u8/add.leo.out b/tests/expectations/compiler/compiler/integers/u8/add.leo.out
index ef090731fb..6ca74c3a29 100644
--- a/tests/expectations/compiler/compiler/integers/u8/add.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/add.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 48
+      num_constraints: 49
+      at: 69fb3c4168c95acd03a37f194310a3c4650940b98570ed2354b4cf40a46c3cdc
+      bt: 0864b812eb8b0fd3cb3173bde347790cd9975d1117accb115141afe0444cea3c
+      ct: 463f6e3dc8e5ed795eb81d0b200c7f8d7ee4294ef49dc7469646067364331ccf
+    output:
+      - input_file: u8.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 9dea438cfe465dadf7fdeed3bbddd7e382f583f3f6ba99e9402fede4ba47a442
+    imports_resolved_ast: 9dea438cfe465dadf7fdeed3bbddd7e382f583f3f6ba99e9402fede4ba47a442
+    canonicalized_ast: 9dea438cfe465dadf7fdeed3bbddd7e382f583f3f6ba99e9402fede4ba47a442
+    type_inferenced_ast: 6a607b10a9897d5b69b303c7f1640af33ddaae750077e18a29e0c6c24dfb581d
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 ef090731fb..e40fc7da91 100644
--- a/tests/expectations/compiler/compiler/integers/u8/console_assert.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/console_assert.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 46
+      num_constraints: 46
+      at: 829f4510ef3fb07e4ffecffe519507a8c6790309f86f349e2b8c5c42cc09e1c9
+      bt: 10f68596bcedd566b8eecf0bd255093865e9652e35d141d868fcba35ed67b24a
+      ct: 547830d9a13714ce4f3490f83aeafb5faa68aac46614867b7c19beb99eb908ff
+    output:
+      - input_file: u8.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 836bd0b470cd210052613fd9b13c5e420cc52b5da5f05a1dbbbdabbda9e35d5e
+    imports_resolved_ast: 836bd0b470cd210052613fd9b13c5e420cc52b5da5f05a1dbbbdabbda9e35d5e
+    canonicalized_ast: 836bd0b470cd210052613fd9b13c5e420cc52b5da5f05a1dbbbdabbda9e35d5e
+    type_inferenced_ast: 65e7b6fd34672f4f4d0f09df9e2d1d3a3d6c2c632128eb8f8a2c6f0c95d28a3b
diff --git a/tests/expectations/compiler/compiler/integers/u8/div.leo.out b/tests/expectations/compiler/compiler/integers/u8/div.leo.out
index ef090731fb..07d963bfdf 100644
--- a/tests/expectations/compiler/compiler/integers/u8/div.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/div.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1068
+      num_constraints: 1355
+      at: 8ed58147507a99812dafb5a57a6c403d92d4454ea232cc7ee8b7f387a1435aa4
+      bt: 9e0ee614664ff1c133eff0a1bdb47f8521967aacb928ff34195d0639aec895d6
+      ct: 0b81ff43876b3dbc83461a76cfd1c6ff5513f2a5597441d526a472bd74b66ad1
+    output:
+      - input_file: u8.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 5e159a778450deb8e7a193f93700d4f70f356b414c4acf927d31117d6f4c6246
+    imports_resolved_ast: 5e159a778450deb8e7a193f93700d4f70f356b414c4acf927d31117d6f4c6246
+    canonicalized_ast: 5e159a778450deb8e7a193f93700d4f70f356b414c4acf927d31117d6f4c6246
+    type_inferenced_ast: 1b9a06f4b0a525f5e8a678fed6eedfd9227fa5d416c578711a4b61b37ebefbc5
diff --git a/tests/expectations/compiler/compiler/integers/u8/eq.leo.out b/tests/expectations/compiler/compiler/integers/u8/eq.leo.out
index ef090731fb..60854938a0 100644
--- a/tests/expectations/compiler/compiler/integers/u8/eq.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/eq.leo.out
@@ -1,4 +1,28 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 33
+      num_constraints: 33
+      at: 424965aff58c62dd2bf38daa6426a3edcc19aa86bff3842fe4e73f743d37e1cb
+      bt: 03d1b6a8fdf9f73f595cf97261f1bae81000c89364c7af58f4f7f04aba7bac30
+      ct: 2aae7d6631260dcaafbfe9709ade84e75f5172a9baad48e108e7264d5fc17cf6
+    output:
+      - input_file: u8_e.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+      - input_file: u8_n.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: e3e4dc868de4fdf770bb339ab8e7dfb54e4d0786c58f892d1bca34a28403ed1f
+    imports_resolved_ast: e3e4dc868de4fdf770bb339ab8e7dfb54e4d0786c58f892d1bca34a28403ed1f
+    canonicalized_ast: e3e4dc868de4fdf770bb339ab8e7dfb54e4d0786c58f892d1bca34a28403ed1f
+    type_inferenced_ast: 3e57ddf8d981040924b7eb460f3627fe35eee8dfe7a54c7cbf4a48f609e408cb
diff --git a/tests/expectations/compiler/compiler/integers/u8/ge.leo.out b/tests/expectations/compiler/compiler/integers/u8/ge.leo.out
index ef090731fb..b65b35b985 100644
--- a/tests/expectations/compiler/compiler/integers/u8/ge.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/ge.leo.out
@@ -1,4 +1,34 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 57
+      num_constraints: 57
+      at: bc8380502907fbf4dc375e6ffc6ff09063dfb74d4bf1deb5c0a822f892e73acb
+      bt: 6af90ba76909462a3da873fbb2276b4020df6b3318671bd44aef4572df6326fc
+      ct: 5a4c4f077603c1f7c4b31cf17fee281ab3cb7d2a9571be40a2f3a88577759477
+    output:
+      - input_file: u8_g.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+      - input_file: u8_e.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+      - input_file: u8_f.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 6695ac31b2462e549a79a622e8cb11eae73c20503e727b9f50fbab4c572c785d
+    imports_resolved_ast: 6695ac31b2462e549a79a622e8cb11eae73c20503e727b9f50fbab4c572c785d
+    canonicalized_ast: 6695ac31b2462e549a79a622e8cb11eae73c20503e727b9f50fbab4c572c785d
+    type_inferenced_ast: 5f6c660c11b7fc64e7947923a77f30cddb93ab223f59cb322a29876b04f7c9a8
diff --git a/tests/expectations/compiler/compiler/integers/u8/gt.leo.out b/tests/expectations/compiler/compiler/integers/u8/gt.leo.out
index ef090731fb..fac5211983 100644
--- a/tests/expectations/compiler/compiler/integers/u8/gt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/gt.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 57
+      num_constraints: 57
+      at: 38f7f88206d5c28524fd286b4d4eff928bc29bf167f9ccdb1459377fcdee677f
+      bt: 0edd7a2aa1dabdeb3cd270d78086cb74dfc5f4c957e6f2ce7546daed614a3579
+      ct: 5a4c4f077603c1f7c4b31cf17fee281ab3cb7d2a9571be40a2f3a88577759477
+    output:
+      - input_file: u8_g.in
+        output:
+          registers: {}
+      - input_file: u8_f.in
+        output:
+          registers: {}
+    initial_ast: 4a99a7af4e976c85ed87114d8a267a1d047b17f60fda4030e793fd5f66cf2c53
+    imports_resolved_ast: 4a99a7af4e976c85ed87114d8a267a1d047b17f60fda4030e793fd5f66cf2c53
+    canonicalized_ast: 5df377575d61a53ae6c1cd898ef1ab739660a9716eaeebee9c8a767c8d05ec60
+    type_inferenced_ast: e69731b76d3e389f51f854eac84befd1d7e1c61180ca46a150f07b2aa768f2d8
diff --git a/tests/expectations/compiler/compiler/integers/u8/input.leo.out b/tests/expectations/compiler/compiler/integers/u8/input.leo.out
index ef090731fb..0747f5d164 100644
--- a/tests/expectations/compiler/compiler/integers/u8/input.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/input.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 31
+      num_constraints: 31
+      at: 8111e478f64beb722ec96fbd80076cb73b735813b20e8f2ed6e3c21febceaae7
+      bt: c2cfac5aa6e125cb6cde720b0598fef7933c4aa62926fe99405bf1c2829dd4ce
+      ct: a3fa97a403ebea95a47d7ded7c01cee45af74afbfa876c203e4e96f6054b8815
+    output:
+      - input_file: u8_g.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 35b67dd962ab49f7cda88997fbd0028a30d591229b5a7e9ad8d062b1b31d4565
+    imports_resolved_ast: 35b67dd962ab49f7cda88997fbd0028a30d591229b5a7e9ad8d062b1b31d4565
+    canonicalized_ast: 35b67dd962ab49f7cda88997fbd0028a30d591229b5a7e9ad8d062b1b31d4565
+    type_inferenced_ast: e8966ad1d14fd288b6dbda6b1de78f01048e73d231122e997f11c08b5b6c404d
diff --git a/tests/expectations/compiler/compiler/integers/u8/le.leo.out b/tests/expectations/compiler/compiler/integers/u8/le.leo.out
index ef090731fb..e93f6fb6dd 100644
--- a/tests/expectations/compiler/compiler/integers/u8/le.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/le.leo.out
@@ -1,4 +1,34 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 57
+      num_constraints: 57
+      at: 4f2c1500ec12fc38d3a05a67cab6066e0bedda66bdd2a9b81b58189a4e2efb44
+      bt: 7166372193964d2e6e881f4178c1a8fd80afe2c60584af277e73e606f4ac4efd
+      ct: 5a4c4f077603c1f7c4b31cf17fee281ab3cb7d2a9571be40a2f3a88577759477
+    output:
+      - input_file: u8_f.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "false"
+      - input_file: u8_e.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+      - input_file: u8_l.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "false"
+    initial_ast: 72590f8b2a5ac7c0a4e663ce39009c0032ee66011f7fa1d5d61b34bd313e0e86
+    imports_resolved_ast: 72590f8b2a5ac7c0a4e663ce39009c0032ee66011f7fa1d5d61b34bd313e0e86
+    canonicalized_ast: 72590f8b2a5ac7c0a4e663ce39009c0032ee66011f7fa1d5d61b34bd313e0e86
+    type_inferenced_ast: eda186febeb1927b5f0427f36ecaf1f6fc6c5201d8d0ddbf7399a31b0a181c0b
diff --git a/tests/expectations/compiler/compiler/integers/u8/lt.leo.out b/tests/expectations/compiler/compiler/integers/u8/lt.leo.out
index ef090731fb..82ef830edf 100644
--- a/tests/expectations/compiler/compiler/integers/u8/lt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/lt.leo.out
@@ -1,4 +1,28 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 57
+      num_constraints: 57
+      at: 6a0450b269677ab3f038f68befed6b3dd7e4471cba20c9b3cbb1987d11623de2
+      bt: 1c92f5790ff308be2d3a812b0b14b7445192b9b9fb271cabd8a18dc925deb34d
+      ct: 5a4c4f077603c1f7c4b31cf17fee281ab3cb7d2a9571be40a2f3a88577759477
+    output:
+      - input_file: u8_f.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "false"
+      - input_file: u8_g.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "false"
+    initial_ast: 57691c69dc440d8028e25c3e4487c52a89c5b23ff2976faa8dac057b29170945
+    imports_resolved_ast: 57691c69dc440d8028e25c3e4487c52a89c5b23ff2976faa8dac057b29170945
+    canonicalized_ast: 57691c69dc440d8028e25c3e4487c52a89c5b23ff2976faa8dac057b29170945
+    type_inferenced_ast: eced084868377db05c2cde7dc441f0d657610891ceec6df4445debef18ee1804
diff --git a/tests/expectations/compiler/compiler/integers/u8/max.leo.out b/tests/expectations/compiler/compiler/integers/u8/max.leo.out
index ef090731fb..5265fe397a 100644
--- a/tests/expectations/compiler/compiler/integers/u8/max.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/max.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: "../input/dummy.in"
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 1e5b1da2899876d937c9ecdf22665be02e309b6ec9fd6fa7473ffebb48a9e19b
+    imports_resolved_ast: 1e5b1da2899876d937c9ecdf22665be02e309b6ec9fd6fa7473ffebb48a9e19b
+    canonicalized_ast: 1e5b1da2899876d937c9ecdf22665be02e309b6ec9fd6fa7473ffebb48a9e19b
+    type_inferenced_ast: 042f053591ca529430101b4412ca9de1d0ea595d332b5ee73ea9aae0774fff7e
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 3f519cf1b5..2c635d7168 100644
--- a/tests/expectations/compiler/compiler/integers/u8/max_fail.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/max_fail.leo.out
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EASG0373030]: failed to parse int value '256'\n    --> compiler-test:4:19\n     |\n   4 |     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 ef090731fb..850285bf40 100644
--- a/tests/expectations/compiler/compiler/integers/u8/min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/min.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: "../input/dummy.in"
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 0ad4671e3a0aaf948a2ccafb0030bd29f77ebe358d8bc309e24a76691adbc15d
+    imports_resolved_ast: 0ad4671e3a0aaf948a2ccafb0030bd29f77ebe358d8bc309e24a76691adbc15d
+    canonicalized_ast: 0ad4671e3a0aaf948a2ccafb0030bd29f77ebe358d8bc309e24a76691adbc15d
+    type_inferenced_ast: dcf3b29842bb4b58aec3edc927f4df1373b82497624fd480af3b2c995f973a1e
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 3f519cf1b5..4f759d7ea2 100644
--- a/tests/expectations/compiler/compiler/integers/u8/min_fail.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/min_fail.leo.out
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EASG0373030]: failed to parse int value '-1'\n    --> compiler-test:4:19\n     |\n   4 |     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 ef090731fb..96ad005f3f 100644
--- a/tests/expectations/compiler/compiler/integers/u8/mul.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/mul.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 258
+      num_constraints: 331
+      at: 9db6e7fa73b98bf7623bed5997bf61d51f348aaf43d9249b629a866a9085f08b
+      bt: a9bb86254052a3c5b275213180e89108aea721369a9d32cbd837a1cb974d76b3
+      ct: 4dc6b4ca7c3bcedbbe8abbaee96615345e08b304dd65b217319ece1224721b57
+    output:
+      - input_file: mul.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "false"
+    initial_ast: 8db1872b44d014eca2e66c5de1be6ae902623a1548ca53b6146de18dced3d409
+    imports_resolved_ast: 8db1872b44d014eca2e66c5de1be6ae902623a1548ca53b6146de18dced3d409
+    canonicalized_ast: 8db1872b44d014eca2e66c5de1be6ae902623a1548ca53b6146de18dced3d409
+    type_inferenced_ast: c838cd4e5527762edc4fc43355c05b68085c39fd5a338f68caafc0160c68a574
diff --git a/tests/expectations/compiler/compiler/integers/u8/ne.leo.out b/tests/expectations/compiler/compiler/integers/u8/ne.leo.out
index ef090731fb..cda424ec4f 100644
--- a/tests/expectations/compiler/compiler/integers/u8/ne.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/ne.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 33
+      num_constraints: 33
+      at: 5e88cd940df2c48a53e64a9b8589045ef766371daa5cc885df982902d9fcc754
+      bt: 10b52342f8c44eb9b3335b4df9ca4136de3ad35d5b580b2ab32ae5e10bcdf3b4
+      ct: 2aae7d6631260dcaafbfe9709ade84e75f5172a9baad48e108e7264d5fc17cf6
+    output:
+      - input_file: ne.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: f74da59a77c90926a1d926b1c35fd5a18e44de0f8cb6aba39fa176d431f4f965
+    imports_resolved_ast: f74da59a77c90926a1d926b1c35fd5a18e44de0f8cb6aba39fa176d431f4f965
+    canonicalized_ast: f74da59a77c90926a1d926b1c35fd5a18e44de0f8cb6aba39fa176d431f4f965
+    type_inferenced_ast: 474128f7bfe69e7ea64a76c57e729dc85520425fc36ef88c123aebdc670176a3
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 3f519cf1b5..f4d484c12b 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
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [ECMP0376089]: failed to parse `-2` as expected integer type\n    --> compiler-test:3:15\n     |\n   3 | 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 3f519cf1b5..4f1333e8cc 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
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EPAR0370004]: Unexpected white space between terms 1 and u8\n    --> compiler-test:4:15\n     |\n   4 |     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 ef090731fb..65468f7374 100644
--- a/tests/expectations/compiler/compiler/integers/u8/sub.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/sub.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 48
+      num_constraints: 49
+      at: 69fb3c4168c95acd03a37f194310a3c4650940b98570ed2354b4cf40a46c3cdc
+      bt: 0864b812eb8b0fd3cb3173bde347790cd9975d1117accb115141afe0444cea3c
+      ct: a09cd762cf1db927d99cef196452f092d030aa05851fe466816535ac34c6188f
+    output:
+      - input_file: u8_f.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 4ad8780e5c0a3128317266059864223beac927b6d00745353114baaf5261fbca
+    imports_resolved_ast: 4ad8780e5c0a3128317266059864223beac927b6d00745353114baaf5261fbca
+    canonicalized_ast: 4ad8780e5c0a3128317266059864223beac927b6d00745353114baaf5261fbca
+    type_inferenced_ast: c26b34ca605ac96edbd443f0f4015493d509054c3e7b749fc9ee31ef1800d6c8
diff --git a/tests/expectations/compiler/compiler/integers/u8/ternary.leo.out b/tests/expectations/compiler/compiler/integers/u8/ternary.leo.out
index ef090731fb..99d682ebbc 100644
--- a/tests/expectations/compiler/compiler/integers/u8/ternary.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/ternary.leo.out
@@ -1,4 +1,28 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 56
+      num_constraints: 64
+      at: a15ec92a38acf1a47952df144e5299f49dbde96fbe1a3f3b2af4bbca483d65aa
+      bt: 90a2489533355ee3e27d5cf485612441ec10e21923eb78e6be21633ce11fa8f1
+      ct: 4c2d67fc6e1c4ad44f323c1b958ed94313153573aa72a3c0f0d25b17b54e63bc
+    output:
+      - input_file: u8_t.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+      - input_file: u8_f.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 74e87cd14415c4e1c4d2d89bbe56ee8ca5fc988df4cc894381b4a087fa409095
+    imports_resolved_ast: 74e87cd14415c4e1c4d2d89bbe56ee8ca5fc988df4cc894381b4a087fa409095
+    canonicalized_ast: 74e87cd14415c4e1c4d2d89bbe56ee8ca5fc988df4cc894381b4a087fa409095
+    type_inferenced_ast: f5ae3a29090e07ccd418d3ab78fd24161fe26cc6a365ff71861f4d6ad5e8a0b4
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 ef090731fb..01784c8694 100644
--- a/tests/expectations/compiler/compiler/mutability/array_dyn_mut.leo.out
+++ b/tests/expectations/compiler/compiler/mutability/array_dyn_mut.leo.out
@@ -1,4 +1,28 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1277
+      num_constraints: 1604
+      at: c5d2d5bbb85d0f7ba48170fdb652aff057db6d1babf378d8a548af874e0734ff
+      bt: 726f3c39d11da5bc8487b8b7228a55cb7819a47a9b674d41f9c756c6927fb55a
+      ct: 7c4917152b59cb9caa30bad7d5119a3e36c40f7a783fdb8ff602dd5447573cc7
+    output:
+      - input_file: input/index1.in
+        output:
+          registers:
+            r0:
+              type: "[u32; 3]"
+              value: "\"303\""
+      - input_file: input/index2.in
+        output:
+          registers:
+            r0:
+              type: "[u32; 3]"
+              value: "\"150\""
+    initial_ast: b56c67d410c98a75c5f742d382e223355d214484d198ccaefe65296421c6854b
+    imports_resolved_ast: b56c67d410c98a75c5f742d382e223355d214484d198ccaefe65296421c6854b
+    canonicalized_ast: 7217fa688744caee18ab779ab9c43deac2d70a8d0b989873fe720d3f46a5e366
+    type_inferenced_ast: 6d673f91cd5c98cd1ae69777a317cf2b2ee50fd291996c8ae70d036705e76062
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 ef090731fb..79439395c7 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
@@ -1,4 +1,28 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 924
+      num_constraints: 1310
+      at: f4c2d999e3cfce5433bbde762d8c826c8df8764b9223dd5d7147cd09810f25b7
+      bt: fa02e90dd0bde30bc5feab46c3ea4fae0493dc6808d56bc6a1d937eb17297981
+      ct: 8f6f484310918a186286820e4efd1e7494774c314e9e5c6f78bb60bdeae948f4
+    output:
+      - input_file: input/index1_tuple.in
+        output:
+          registers:
+            r0:
+              type: "[(u32, u32); 3]"
+              value: "\"(1, 1)(0, 1)(3, 3)\""
+      - input_file: input/index2_tuple.in
+        output:
+          registers:
+            r0:
+              type: "[(u32, u32); 3]"
+              value: "\"(1, 1)(2, 2)(0, 1)\""
+    initial_ast: 7ca87cb79f11b6342bc6db56d6b051c68bcedb798ba9eb88992dcfe0873ce139
+    imports_resolved_ast: 7ca87cb79f11b6342bc6db56d6b051c68bcedb798ba9eb88992dcfe0873ce139
+    canonicalized_ast: 7ca87cb79f11b6342bc6db56d6b051c68bcedb798ba9eb88992dcfe0873ce139
+    type_inferenced_ast: 26f6c295a4ab2515eadf95855c66e3fa29d158a43765baa87895fea42bb379d1
diff --git a/tests/expectations/compiler/compiler/mutability/array_fail.leo.out b/tests/expectations/compiler/compiler/mutability/array_fail.leo.out
index 3f519cf1b5..fb91d0943d 100644
--- a/tests/expectations/compiler/compiler/mutability/array_fail.leo.out
+++ b/tests/expectations/compiler/compiler/mutability/array_fail.leo.out
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EASG0373032]: illegal assignment to immutable variable 'a'\n    --> compiler-test:5:5\n     |\n   5 |     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 ef090731fb..4f64a7778a 100644
--- a/tests/expectations/compiler/compiler/mutability/array_mut.leo.out
+++ b/tests/expectations/compiler/compiler/mutability/array_mut.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: input/dummy.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 3ba284ff6893de7ffb6f90092f7c39cefd51c61022e827842fc7d4be7ed72dcd
+    imports_resolved_ast: 3ba284ff6893de7ffb6f90092f7c39cefd51c61022e827842fc7d4be7ed72dcd
+    canonicalized_ast: 3ba284ff6893de7ffb6f90092f7c39cefd51c61022e827842fc7d4be7ed72dcd
+    type_inferenced_ast: 75acbd9ccfb46be0f54046274dc1c200ad7b244bc8e98789d5d7e80fd2d15518
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 ef090731fb..b876f414f1 100644
--- a/tests/expectations/compiler/compiler/mutability/array_splice_mut.leo.out
+++ b/tests/expectations/compiler/compiler/mutability/array_splice_mut.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: input/dummy.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 7d636b2e99784c858ee66e66497caaf184f7a9fa9340d0dd1d6618e6e4b6592e
+    imports_resolved_ast: 7d636b2e99784c858ee66e66497caaf184f7a9fa9340d0dd1d6618e6e4b6592e
+    canonicalized_ast: 7d636b2e99784c858ee66e66497caaf184f7a9fa9340d0dd1d6618e6e4b6592e
+    type_inferenced_ast: 796ceba3c23358c37039eb3484c761a7a5d605ad09877ba006090928be814458
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 ef090731fb..82e3d7f297 100644
--- a/tests/expectations/compiler/compiler/mutability/array_tuple_mut.leo.out
+++ b/tests/expectations/compiler/compiler/mutability/array_tuple_mut.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: input/dummy.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 2a6e7d5838f323e53cb753dc3bae3a6e379ef0deeb0172c1c7df231cd700a5b6
+    imports_resolved_ast: 2a6e7d5838f323e53cb753dc3bae3a6e379ef0deeb0172c1c7df231cd700a5b6
+    canonicalized_ast: 2a6e7d5838f323e53cb753dc3bae3a6e379ef0deeb0172c1c7df231cd700a5b6
+    type_inferenced_ast: d5eafbcdb2a34278a296ff9b217aa63f8baab298450533f42ace506d0df031d6
diff --git a/tests/expectations/compiler/compiler/mutability/circuit_fail.leo.out b/tests/expectations/compiler/compiler/mutability/circuit_fail.leo.out
index 3f519cf1b5..7da40fbd62 100644
--- a/tests/expectations/compiler/compiler/mutability/circuit_fail.leo.out
+++ b/tests/expectations/compiler/compiler/mutability/circuit_fail.leo.out
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EASG0373032]: illegal assignment to immutable variable 'a'\n    --> compiler-test:10:5\n     |\n  10 |     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 3f519cf1b5..60c212a3e6 100644
--- a/tests/expectations/compiler/compiler/mutability/circuit_function_const.leo.out
+++ b/tests/expectations/compiler/compiler/mutability/circuit_function_const.leo.out
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EASG0373009]: cannot call mutable member function 'foo' of circuit 'Foo' from immutable context\n    --> compiler-test:15:5\n     |\n  15 |     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 ef090731fb..42baf76272 100644
--- a/tests/expectations/compiler/compiler/mutability/circuit_function_mut.leo.out
+++ b/tests/expectations/compiler/compiler/mutability/circuit_function_mut.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: input/dummy.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 71448f3f5387cd67a8d8c0b974fa93cf81cdfb72ae0d8f9499c9c5e478a0d15b
+    imports_resolved_ast: 71448f3f5387cd67a8d8c0b974fa93cf81cdfb72ae0d8f9499c9c5e478a0d15b
+    canonicalized_ast: 16d4030e454d8c83d2073afaaa7e8fa1eb40d36026909144db29d311ab005f46
+    type_inferenced_ast: a446d016451281bab9b21f8a86250b4a3fd8a9b6f917e855e5dae816362c8925
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 3f519cf1b5..1c73aff5da 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
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EASG0373005]: 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     |                   ^"
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 ef090731fb..643f7e5a5d 100644
--- a/tests/expectations/compiler/compiler/mutability/circuit_variable_mut.leo.out
+++ b/tests/expectations/compiler/compiler/mutability/circuit_variable_mut.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: input/dummy.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 83da7a1bf2887678937835ac77b33a0e21dd3b04d5739146f16a559b8dc3c6ab
+    imports_resolved_ast: 83da7a1bf2887678937835ac77b33a0e21dd3b04d5739146f16a559b8dc3c6ab
+    canonicalized_ast: 83da7a1bf2887678937835ac77b33a0e21dd3b04d5739146f16a559b8dc3c6ab
+    type_inferenced_ast: bd7710479d2a5bb2da060358fc13379dc1d7e334ead42519315bce0cd0db30c0
diff --git a/tests/expectations/compiler/compiler/mutability/cond_mut.leo.out b/tests/expectations/compiler/compiler/mutability/cond_mut.leo.out
index ef090731fb..f3092ce949 100644
--- a/tests/expectations/compiler/compiler/mutability/cond_mut.leo.out
+++ b/tests/expectations/compiler/compiler/mutability/cond_mut.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: input/dummy.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 384eb00d7e551705537f37e10e28eb35f88175f77351c6add02de4b896630ca6
+    imports_resolved_ast: 384eb00d7e551705537f37e10e28eb35f88175f77351c6add02de4b896630ca6
+    canonicalized_ast: 40b13bb543186c6f032ca6fca8144acbfa5cfcc4e691ed1f79c5120be2db8809
+    type_inferenced_ast: 49d93167578fd99537e1895963545e6e95f2c55162f42f2bb9ee8b4d014152ee
diff --git a/tests/expectations/compiler/compiler/mutability/const.leo.out b/tests/expectations/compiler/compiler/mutability/const.leo.out
index 3f519cf1b5..4a957ebc26 100644
--- a/tests/expectations/compiler/compiler/mutability/const.leo.out
+++ b/tests/expectations/compiler/compiler/mutability/const.leo.out
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EASG0373032]: illegal assignment to immutable variable 'a'\n    --> compiler-test:6:5\n     |\n   6 |     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 3f519cf1b5..3c818f62f7 100644
--- a/tests/expectations/compiler/compiler/mutability/function_input.leo.out
+++ b/tests/expectations/compiler/compiler/mutability/function_input.leo.out
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EASG0373027]: failed to resolve variable reference 'a'\n    --> compiler-test:5:5\n     |\n   5 |     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 ef090731fb..6ffeaf479f 100644
--- a/tests/expectations/compiler/compiler/mutability/function_input_mut.leo.out
+++ b/tests/expectations/compiler/compiler/mutability/function_input_mut.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: input/dummy.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 77803f27d711c6b4c7f51dd846bb82dee64dadc3627e9cedcc0c125a734c5b7c
+    imports_resolved_ast: 77803f27d711c6b4c7f51dd846bb82dee64dadc3627e9cedcc0c125a734c5b7c
+    canonicalized_ast: 77803f27d711c6b4c7f51dd846bb82dee64dadc3627e9cedcc0c125a734c5b7c
+    type_inferenced_ast: 9cc5c0db46856226084812857f8982677ed5688259a4deb0d189c9b92eba1756
diff --git a/tests/expectations/compiler/compiler/mutability/let_fail.leo.out b/tests/expectations/compiler/compiler/mutability/let_fail.leo.out
index 3f519cf1b5..4a957ebc26 100644
--- a/tests/expectations/compiler/compiler/mutability/let_fail.leo.out
+++ b/tests/expectations/compiler/compiler/mutability/let_fail.leo.out
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EASG0373032]: illegal assignment to immutable variable 'a'\n    --> compiler-test:6:5\n     |\n   6 |     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 ef090731fb..303c236de1 100644
--- a/tests/expectations/compiler/compiler/mutability/let_mut.leo.out
+++ b/tests/expectations/compiler/compiler/mutability/let_mut.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: input/dummy.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 561fab3e5b172eb73713783c43b079b77ab5ce1ee799526bd9c3dee51c6e15d8
+    imports_resolved_ast: 561fab3e5b172eb73713783c43b079b77ab5ce1ee799526bd9c3dee51c6e15d8
+    canonicalized_ast: 561fab3e5b172eb73713783c43b079b77ab5ce1ee799526bd9c3dee51c6e15d8
+    type_inferenced_ast: 3715f38b2b0a49f93133616eb252d1067ef1abec8d0895cf9c7de588fcf9e6d8
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 ef090731fb..a0711af408 100644
--- a/tests/expectations/compiler/compiler/mutability/let_mut_nested.leo.out
+++ b/tests/expectations/compiler/compiler/mutability/let_mut_nested.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: input/dummy.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 4de7e4f24434d5a611566054ce5e1cff1edf0e9a76fa77ab5b121bd412eceb91
+    imports_resolved_ast: 4de7e4f24434d5a611566054ce5e1cff1edf0e9a76fa77ab5b121bd412eceb91
+    canonicalized_ast: 4de7e4f24434d5a611566054ce5e1cff1edf0e9a76fa77ab5b121bd412eceb91
+    type_inferenced_ast: 65d3153d31e7f29f65b4896eddab3fc8bb78ff919921e77a05d51b50180320d6
diff --git a/tests/expectations/compiler/compiler/mutability/swap.leo.out b/tests/expectations/compiler/compiler/mutability/swap.leo.out
index ef090731fb..6a67168d5f 100644
--- a/tests/expectations/compiler/compiler/mutability/swap.leo.out
+++ b/tests/expectations/compiler/compiler/mutability/swap.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 127
+      num_constraints: 127
+      at: e89e71bb78cba20472e8ebfaeb36e6a9564861cf2b14846eb695a5937149dbfb
+      bt: 16d04f802c27d778734e07a0126cae3f096bc4e2e0b4362fe5687a338f1dece5
+      ct: acfbc6fdb7a3696d43be3cd62939a9731cb8b11c215564c52b3c67343cbda41f
+    output:
+      - input_file: input/dummy.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "false"
+    initial_ast: abe0177ae796b70cfdd8c6d30fcd5a9d713e3d16fccfdf63853ea6f0a8a9df54
+    imports_resolved_ast: abe0177ae796b70cfdd8c6d30fcd5a9d713e3d16fccfdf63853ea6f0a8a9df54
+    canonicalized_ast: abe0177ae796b70cfdd8c6d30fcd5a9d713e3d16fccfdf63853ea6f0a8a9df54
+    type_inferenced_ast: 43109986d2643a72bb5300c298952755f692cdd10e7071fb40b2b006412606d9
diff --git a/tests/expectations/compiler/compiler/statements/all_loops.leo.out b/tests/expectations/compiler/compiler/statements/all_loops.leo.out
index ef090731fb..9876a424fc 100644
--- a/tests/expectations/compiler/compiler/statements/all_loops.leo.out
+++ b/tests/expectations/compiler/compiler/statements/all_loops.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: inputs/dummy.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: d94b77f7891ca44d554f59cc07370505a1dec9cc1a5133674faf8797bddcfb4b
+    imports_resolved_ast: d94b77f7891ca44d554f59cc07370505a1dec9cc1a5133674faf8797bddcfb4b
+    canonicalized_ast: 10fb59963f44b2261fc0dd0aca8a57bf3c6c6252d9da82717fd13fbb57760ad3
+    type_inferenced_ast: 833d4e649f0e3cebfddcaccd9abde073ea29a9262a93fa233e0a5dcada33b46a
diff --git a/tests/expectations/compiler/compiler/statements/assign_ternary.leo.out b/tests/expectations/compiler/compiler/statements/assign_ternary.leo.out
index 3f519cf1b5..fa0d9f6a95 100644
--- a/tests/expectations/compiler/compiler/statements/assign_ternary.leo.out
+++ b/tests/expectations/compiler/compiler/statements/assign_ternary.leo.out
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EASG0373025]: unexpected type, expected: 'u32', received: 'bool'\n    --> compiler-test:4:23\n     |\n   4 |     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 ef090731fb..e6d2d81ac5 100644
--- a/tests/expectations/compiler/compiler/statements/block.leo.out
+++ b/tests/expectations/compiler/compiler/statements/block.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 96
+      num_constraints: 97
+      at: 82703e2aa614d0f54a1c321e06edd2e79a9574a91d0984d6f5e98926710962f2
+      bt: 54bbc6eb42c38f8bbb12360c98b483e782f47c2875d6b88b6ae2b7cd70220cf8
+      ct: 52022ccbdc5119e02384f852f21e0ed0b6d729cb1cd18aea031f73037e467755
+    output:
+      - input_file: inputs/u32_3.in
+        output:
+          registers:
+            a:
+              type: bool
+              value: "true"
+    initial_ast: e83bec8b595276da8d5fee23a1aae15ca08ce2f369c3a47cfb5732b90b020e1f
+    imports_resolved_ast: e83bec8b595276da8d5fee23a1aae15ca08ce2f369c3a47cfb5732b90b020e1f
+    canonicalized_ast: d84f3bd449f9a10b2bf8de7e284c1764dee5650840a82e38518906448f7f0457
+    type_inferenced_ast: 10d48e474c04c96d7754f41070ec3a406a2a3ef3ee6938185953ff52eaba5c87
diff --git a/tests/expectations/compiler/compiler/statements/chain.leo.out b/tests/expectations/compiler/compiler/statements/chain.leo.out
index ef090731fb..602b31525c 100644
--- a/tests/expectations/compiler/compiler/statements/chain.leo.out
+++ b/tests/expectations/compiler/compiler/statements/chain.leo.out
@@ -1,4 +1,34 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 319
+      num_constraints: 415
+      at: 910d51dc69b7ed7e2dfe1a786fad9b226b2ff30c7678f397cb8d8850fd76442e
+      bt: 3ae01a0af5534bca6ad67bd2609a5370a4982c7f6d17fb8c285054c3d08f9c4f
+      ct: 67836f65a02c595fcbf6d6a6d223a15e138d99a542390693ac4f582d073869e6
+    output:
+      - input_file: inputs/u32_3.in
+        output:
+          registers:
+            a:
+              type: bool
+              value: "true"
+      - input_file: inputs/u32_5.in
+        output:
+          registers:
+            a:
+              type: bool
+              value: "false"
+      - input_file: inputs/u32_6.in
+        output:
+          registers:
+            a:
+              type: bool
+              value: "false"
+    initial_ast: 51f43c865b5082a79df9bba465629cc4d9cc9f3a472e35d0301ae1dc6ef37039
+    imports_resolved_ast: 51f43c865b5082a79df9bba465629cc4d9cc9f3a472e35d0301ae1dc6ef37039
+    canonicalized_ast: 51f43c865b5082a79df9bba465629cc4d9cc9f3a472e35d0301ae1dc6ef37039
+    type_inferenced_ast: 6198dfeacc891f4e22635060fa58a476fcae08cb6cfa74b6e8d80c07adc6c36d
diff --git a/tests/expectations/compiler/compiler/statements/compound_assignment.leo.out b/tests/expectations/compiler/compiler/statements/compound_assignment.leo.out
index ef090731fb..200e0e0e5c 100644
--- a/tests/expectations/compiler/compiler/statements/compound_assignment.leo.out
+++ b/tests/expectations/compiler/compiler/statements/compound_assignment.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 9
+      num_constraints: 9
+      at: cfc27ce5fe57455170b7873e5ff2eb5f8f997fc5fc62faad746879e0b78608b0
+      bt: 6fde8d6341a34a59e776a14fd2071105f796edd8743b718e9d4d7eeab31f5eea
+      ct: 95d15e75300129c5b4dd7f324bec76f91976db7c7b6075f942e9ea82b243e0b3
+    output:
+      - input_file: inputs/dummy.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 108be85422345d78a93d2e36e633c3a15a1465e7c868f65e2925a47e0b5f691a
+    imports_resolved_ast: 108be85422345d78a93d2e36e633c3a15a1465e7c868f65e2925a47e0b5f691a
+    canonicalized_ast: d986fa603a5031dbd5034507d05df038fe99f60f603f7ca4b2d2c8ac2b409e7a
+    type_inferenced_ast: c95a6049c552c5b018f423fc1999b433cf94429c6edc32e2b55d326b78e36812
diff --git a/tests/expectations/compiler/compiler/statements/duplicate_variable.leo.out b/tests/expectations/compiler/compiler/statements/duplicate_variable.leo.out
index 3f519cf1b5..e975210ed2 100644
--- a/tests/expectations/compiler/compiler/statements/duplicate_variable.leo.out
+++ b/tests/expectations/compiler/compiler/statements/duplicate_variable.leo.out
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EASG0373016]: a variable named \"x\" already exists in this scope\n    --> compiler-test:5:3\n     |\n   5 |   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 ef090731fb..57be45f90b 100644
--- a/tests/expectations/compiler/compiler/statements/for_loop.leo.out
+++ b/tests/expectations/compiler/compiler/statements/for_loop.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 512
+      num_constraints: 675
+      at: 5d537a7963ae43ff2b7b0222c18a237015c858d7203554574a785cd56d4d24c5
+      bt: 192ca0dd8a20d69b443b952a7226e8c82936fedd2c9735d2b792883a01e46e3b
+      ct: 04609638ad65317edb75529646b34f10a846b39b3ddb783e4aeceddde17b79f9
+    output:
+      - input_file: inputs/u32_3.in
+        output:
+          registers:
+            a:
+              type: bool
+              value: "true"
+    initial_ast: a8e737bf2fcc5b5096dae768b52c04d56891a4eedd47640a0e1aea5fa4b5da1a
+    imports_resolved_ast: a8e737bf2fcc5b5096dae768b52c04d56891a4eedd47640a0e1aea5fa4b5da1a
+    canonicalized_ast: cb2eb0272a5a1730cebeaab7a63578ae0f366615af0687a83772fdcbab8b4a93
+    type_inferenced_ast: 4d4e9f8fa02ed1c33893ee0f05737a8fc22062039bf2c6a69c8a95c09ba3c6d4
diff --git a/tests/expectations/compiler/compiler/statements/iteration_basic.leo.out b/tests/expectations/compiler/compiler/statements/iteration_basic.leo.out
index ef090731fb..c5e803d5c2 100644
--- a/tests/expectations/compiler/compiler/statements/iteration_basic.leo.out
+++ b/tests/expectations/compiler/compiler/statements/iteration_basic.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 162
+      num_constraints: 165
+      at: 5b2ee97bca1c978a9cb40345a5358b6da05b06c94ef08ade726f32a8d0840c4e
+      bt: 9dc810c17c3ede695558cbade305db754bfc9de90c983ab114557f2cc9bb3631
+      ct: 16ed7b0c9d703be9a60d4b2e0da9a52403de8b03c35a545db7c05b698eddcdfd
+    output:
+      - input_file: inputs/u32_3.in
+        output:
+          registers:
+            a:
+              type: bool
+              value: "true"
+    initial_ast: 416faf733ca084378ca66e5900ab7ffdbb057312e358d6652d6260eff3670fc6
+    imports_resolved_ast: 416faf733ca084378ca66e5900ab7ffdbb057312e358d6652d6260eff3670fc6
+    canonicalized_ast: 2ec69f397b7c48bc222d812fe4afae7ea375048ceb798e17063f08ea9ccdd040
+    type_inferenced_ast: 8062f011312fc76f0f1d73a628292f38deb179974e1edd18af52ee7084279ab2
diff --git a/tests/expectations/compiler/compiler/statements/iteration_variable.leo.out b/tests/expectations/compiler/compiler/statements/iteration_variable.leo.out
index ef090731fb..502d9d29f0 100644
--- a/tests/expectations/compiler/compiler/statements/iteration_variable.leo.out
+++ b/tests/expectations/compiler/compiler/statements/iteration_variable.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 129
+      num_constraints: 131
+      at: 3ce06ba8c0b8ed0af6941d5d0a487cfb836053b5f7098525dbc159dbbca3508a
+      bt: d0528d867b40b0642b9b93a6b7f6d64ceb8d7e97799848ccd6b7fecfb86e2889
+      ct: 638bf6e71b08cf88ff8fc38ff7594880102164a51a452dec39b42c10f6f36c35
+    output:
+      - input_file: inputs/u32_3.in
+        output:
+          registers:
+            a:
+              type: bool
+              value: "true"
+    initial_ast: 038e16c427982d50e1f29bfb1ef4b9b5809592d431a167809641d2816255fe70
+    imports_resolved_ast: 038e16c427982d50e1f29bfb1ef4b9b5809592d431a167809641d2816255fe70
+    canonicalized_ast: 1d600ee2250660418ea73d55518937eac92695b6441fc2656de4568c4e7bed8c
+    type_inferenced_ast: 4f070f1df9bc5c1c7a5b4932b3348504b0a0b07df862e6ca027ee272208a5f79
diff --git a/tests/expectations/compiler/compiler/statements/multiple_returns.leo.out b/tests/expectations/compiler/compiler/statements/multiple_returns.leo.out
index ef090731fb..aa199caf4a 100644
--- a/tests/expectations/compiler/compiler/statements/multiple_returns.leo.out
+++ b/tests/expectations/compiler/compiler/statements/multiple_returns.leo.out
@@ -1,4 +1,28 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 63
+      num_constraints: 63
+      at: 37a483a8d794b0cd2f37b20c69eb00e2d9a3d950319dd18ead861dd505d84ce9
+      bt: 6c9fd7d4b3947c363bdb576b2c2c827c3ebfe4c3b56eda2abb8a37e436b69638
+      ct: c0d39de2b3b1c321288b265a4f0e72c13da3b07b0f5d61d14b66215440c56a42
+    output:
+      - input_file: inputs/u32_3.in
+        output:
+          registers:
+            a:
+              type: bool
+              value: "true"
+      - input_file: inputs/u32_5.in
+        output:
+          registers:
+            a:
+              type: bool
+              value: "false"
+    initial_ast: f842a0668ac2fa61ee1f4c693c5159b1395527ee355e8d1d54da9e1ed63ac3ca
+    imports_resolved_ast: f842a0668ac2fa61ee1f4c693c5159b1395527ee355e8d1d54da9e1ed63ac3ca
+    canonicalized_ast: f842a0668ac2fa61ee1f4c693c5159b1395527ee355e8d1d54da9e1ed63ac3ca
+    type_inferenced_ast: 5adf5966c1fdb8a72af941b5b706d7a24b732441b7f56fb3de1319035ade46ec
diff --git a/tests/expectations/compiler/compiler/statements/mutate.leo.out b/tests/expectations/compiler/compiler/statements/mutate.leo.out
index ef090731fb..88e5c52e5d 100644
--- a/tests/expectations/compiler/compiler/statements/mutate.leo.out
+++ b/tests/expectations/compiler/compiler/statements/mutate.leo.out
@@ -1,4 +1,28 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 253
+      num_constraints: 317
+      at: 30a9d7ef92bc14334cf2058df46dd513d99b7d21712c6c8bedfce9c48bc0f402
+      bt: eaddc0804e3047ae886466758455accba906f9ae990696f12c17a3237a9c9688
+      ct: e60851ccedd572c63dbcec5e0d84ddf45d76423dcf08fe0c9761fe17ce2bdd4e
+    output:
+      - input_file: inputs/u32_3.in
+        output:
+          registers:
+            a:
+              type: bool
+              value: "true"
+      - input_file: inputs/u32_5.in
+        output:
+          registers:
+            a:
+              type: bool
+              value: "true"
+    initial_ast: 1939d0c4720ac464347a680666fee91d1db59acfd36c8e7f6ea1255b4787b39b
+    imports_resolved_ast: 1939d0c4720ac464347a680666fee91d1db59acfd36c8e7f6ea1255b4787b39b
+    canonicalized_ast: 1939d0c4720ac464347a680666fee91d1db59acfd36c8e7f6ea1255b4787b39b
+    type_inferenced_ast: 662b43067b1ddf0db1b7f5d71a07eb84ff79074c187398d4367b8694f066726b
diff --git a/tests/expectations/compiler/compiler/statements/nested_mutate.leo.out b/tests/expectations/compiler/compiler/statements/nested_mutate.leo.out
index ef090731fb..22e2fa0227 100644
--- a/tests/expectations/compiler/compiler/statements/nested_mutate.leo.out
+++ b/tests/expectations/compiler/compiler/statements/nested_mutate.leo.out
@@ -1,4 +1,34 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 481
+      num_constraints: 547
+      at: 2f636d0f9b9af543c900753ff89b3eb0bd5cc4f81f8afc19c5cb0901b4b51b0a
+      bt: 86e567b4b178b61f7a2ae29ac78c6f60fc1b6c9cdfdbb6c896c8b059b68a90b6
+      ct: eb4c6eaa123567ee0a5b12a2812f90b4f532e657b59249aaad97092bd32cdbe9
+    output:
+      - input_file: inputs/u32_3.in
+        output:
+          registers:
+            a:
+              type: bool
+              value: "true"
+      - input_file: inputs/u32_5.in
+        output:
+          registers:
+            a:
+              type: bool
+              value: "true"
+      - input_file: inputs/u32_6.in
+        output:
+          registers:
+            a:
+              type: bool
+              value: "false"
+    initial_ast: ebf32d52f9b74643177b087221c52f994e439347407c948643b7261e107007ed
+    imports_resolved_ast: ebf32d52f9b74643177b087221c52f994e439347407c948643b7261e107007ed
+    canonicalized_ast: 2a2f30c10bc808923ae1f7fedc3debd765be612cfa1d100a853d0a2dfb65f58b
+    type_inferenced_ast: 628f6316908cc79ef0740fdd8baf179e9e969d19d82786f51e78a4d11bd6dab8
diff --git a/tests/expectations/compiler/compiler/statements/reverse_loops.leo.out b/tests/expectations/compiler/compiler/statements/reverse_loops.leo.out
index ef090731fb..44d14de590 100644
--- a/tests/expectations/compiler/compiler/statements/reverse_loops.leo.out
+++ b/tests/expectations/compiler/compiler/statements/reverse_loops.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: inputs/dummy.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: f64afadac31c349e9c03da12d924241f36316181323adf5bd8d64b01198747f6
+    imports_resolved_ast: f64afadac31c349e9c03da12d924241f36316181323adf5bd8d64b01198747f6
+    canonicalized_ast: feee8d1b761c72c684f8b6a7cb985357fa8897cbc229e69302df68655669a77e
+    type_inferenced_ast: c8d365cde5e39faabbea291d537590c08423e4dd281327d67f3a6994a5492e53
diff --git a/tests/expectations/compiler/compiler/statements/reverse_one.leo.out b/tests/expectations/compiler/compiler/statements/reverse_one.leo.out
index ef090731fb..a95ee39d2c 100644
--- a/tests/expectations/compiler/compiler/statements/reverse_one.leo.out
+++ b/tests/expectations/compiler/compiler/statements/reverse_one.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: inputs/dummy.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: e999f088de99a6223d147bd686fac839d98f2d6ba2a9abb38b6d234f8c90231d
+    imports_resolved_ast: e999f088de99a6223d147bd686fac839d98f2d6ba2a9abb38b6d234f8c90231d
+    canonicalized_ast: bb02f855d59f2f551f3248cca61b12a53c28977f0ec41cf9bed9d1434c88b9ab
+    type_inferenced_ast: 1be9b8e6dc45ea9bd2bfd6888d1538563b532e57f180a8cbbf0dd6036ee2bf56
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 ef090731fb..285509211b 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
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 25
+      num_constraints: 33
+      at: 00318b0f80b01b9e2d5a8154a536deb1545f04abd493a84071ef13dce1a9d92d
+      bt: 799ee4dc07f6320b8c3dcbd5ebdf6de8a4cf5af8b1edc45dbe5621c8a34fa38d
+      ct: 7b6ec9eacd65cfa47dfe7e73eb7c8fa4be804a9fb878fddf59fe5d06e7c04489
+    output:
+      - input_file: inputs/ternary_explicit_and_implicit.in
+        output:
+          registers:
+            a:
+              type: u8
+              value: "3"
+    initial_ast: 8eb489d084203ff568db699a97d68cb7be586b99269cd3caa5ed075735a89430
+    imports_resolved_ast: 8eb489d084203ff568db699a97d68cb7be586b99269cd3caa5ed075735a89430
+    canonicalized_ast: 8eb489d084203ff568db699a97d68cb7be586b99269cd3caa5ed075735a89430
+    type_inferenced_ast: 9599e37cdf0cbd702e3ee2e025996cd72d6df4c173ce591f713b685dc19d4d0f
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 3f519cf1b5..384fa46cc2 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
@@ -1,4 +1,5 @@
 ---
 namespace: Compile
 expectation: Fail
-outputs: []
+outputs:
+  - "Error [EASG0373014]: 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     |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^"
diff --git a/tests/expectations/compiler/compiler/string/equality.leo.out b/tests/expectations/compiler/compiler/string/equality.leo.out
index ef090731fb..ab5b54b3ff 100644
--- a/tests/expectations/compiler/compiler/string/equality.leo.out
+++ b/tests/expectations/compiler/compiler/string/equality.leo.out
@@ -1,4 +1,28 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 92
+      num_constraints: 75
+      at: c03384068dd2b9bd528c65e301960d5c4f61bf94949c9080f28a4bc57f81e856
+      bt: 7f653d4004b13eee112bbefcf900b0c8201524129423cdda82799c18fdcfb3f7
+      ct: bce0d8a64cf530613e693412358d17d231ec8516108ab4ee5a47ddf185a471fa
+    output:
+      - input_file: inputs/string.in
+        output:
+          registers:
+            out:
+              type: bool
+              value: "true"
+      - input_file: inputs/weird.in
+        output:
+          registers:
+            out:
+              type: bool
+              value: "false"
+    initial_ast: 18cc23be73fed22f06b3bfdb93c1b92688131d4bbeb0d68ed8dc691c97f0c415
+    imports_resolved_ast: 18cc23be73fed22f06b3bfdb93c1b92688131d4bbeb0d68ed8dc691c97f0c415
+    canonicalized_ast: 63331696106397640ace1c15d354979b8a05f25dd650465954cd1fd72124bae6
+    type_inferenced_ast: 83e3cba193c50f19049cdf4296d75187cfd9d6d9fa5276fd328c2e3acf0936e2
diff --git a/tests/expectations/compiler/compiler/string/replace.leo.out b/tests/expectations/compiler/compiler/string/replace.leo.out
index ef090731fb..3fb95cb985 100644
--- a/tests/expectations/compiler/compiler/string/replace.leo.out
+++ b/tests/expectations/compiler/compiler/string/replace.leo.out
@@ -1,4 +1,28 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 68
+      num_constraints: 51
+      at: 45fa182371664010950da6ec3fa6360de34dda5cb814b3c8bd119a09e86b5c77
+      bt: 4da3499799890924c2910625e052c6757e7cfd857ebbd18afd3d16b5bd0e9a73
+      ct: 183c15a7bf0d7c109b082a55e696874797e7ce685096881ce803f6bfa453a875
+    output:
+      - input_file: inputs/string.in
+        output:
+          registers:
+            out:
+              type: bool
+              value: "true"
+      - input_file: inputs/weird.in
+        output:
+          registers:
+            out:
+              type: bool
+              value: "true"
+    initial_ast: f3c204e48bcf159d84b551a7af01a54b49a9cd6b0ba35ab8c3e68d50caf215e6
+    imports_resolved_ast: f3c204e48bcf159d84b551a7af01a54b49a9cd6b0ba35ab8c3e68d50caf215e6
+    canonicalized_ast: 91c83cb469e2c9d1b4f6835dd2d503d330c9cfdc7ee4693490cced2835caa4e7
+    type_inferenced_ast: d7f4ab6acb5c9569c42367d28c8af286c07147cb68a6ec31146b844ec257d2ac
diff --git a/tests/expectations/compiler/compiler/string/string_transformation.leo.out b/tests/expectations/compiler/compiler/string/string_transformation.leo.out
index ef090731fb..b8352f44e2 100644
--- a/tests/expectations/compiler/compiler/string/string_transformation.leo.out
+++ b/tests/expectations/compiler/compiler/string/string_transformation.leo.out
@@ -1,4 +1,22 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 9
+      num_constraints: 7
+      at: 5f4cfa276f9e316a42c9292a4f149fcf3c301a4ca3dc14112b7d59e8ef1e002c
+      bt: c728f18e4b654023c5189f382573af92682099ed5c7c08e706604e6f1cb7d72d
+      ct: 74aca434b2a72f7215a0dbe138b708fb2c2857d95dc3bc4776903c90d5f47bb9
+    output:
+      - input_file: inputs/two.in
+        output:
+          registers:
+            out:
+              type: bool
+              value: "true"
+    initial_ast: cb6caa7598139ad4bdf20a4ace3eb443f83932c91606214227c192684efa2c33
+    imports_resolved_ast: cb6caa7598139ad4bdf20a4ace3eb443f83932c91606214227c192684efa2c33
+    canonicalized_ast: ef8938160ef517c3856d42b1c651877de6baaa791409cd92ea0552b8c82b228a
+    type_inferenced_ast: 313f5120e880583f9cced569d3afcfe7b893a8b9c58f521680037df4202e6d8c
diff --git a/tests/expectations/compiler/compiler/tuples/access.leo.out b/tests/expectations/compiler/compiler/tuples/access.leo.out
index ef090731fb..7611a6cff7 100644
--- a/tests/expectations/compiler/compiler/tuples/access.leo.out
+++ b/tests/expectations/compiler/compiler/tuples/access.leo.out
@@ -1,4 +1,25 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 2
+      num_constraints: 2
+      at: 401937c524c61a28b4fab76d7a1f85bb628850012af62362a0922610372faf92
+      bt: cdf9a9cee4f2edf55111a95ae60bde9801080f6bde638a5c79273a39a2f9f7f5
+      ct: 643d5437104296e21d906ecb15b2c96ad278f20cfc4af53b12bb6069bd853726
+    output:
+      - input_file: inputs/true_true.in
+        output:
+          registers:
+            b:
+              type: bool
+              value: "true"
+            c:
+              type: bool
+              value: "false"
+    initial_ast: 1398434e8180a7aba868bc9caa21b5d226a4c8216e0086a6f48d6c503e41c263
+    imports_resolved_ast: 1398434e8180a7aba868bc9caa21b5d226a4c8216e0086a6f48d6c503e41c263
+    canonicalized_ast: 1398434e8180a7aba868bc9caa21b5d226a4c8216e0086a6f48d6c503e41c263
+    type_inferenced_ast: fed99174e3afb30da68a430b96242d63b45bb1ce58028d5c7352cc64dcbd98b7
diff --git a/tests/expectations/compiler/compiler/tuples/basic.leo.out b/tests/expectations/compiler/compiler/tuples/basic.leo.out
index ef090731fb..3841846e9d 100644
--- a/tests/expectations/compiler/compiler/tuples/basic.leo.out
+++ b/tests/expectations/compiler/compiler/tuples/basic.leo.out
@@ -1,4 +1,25 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 2
+      num_constraints: 2
+      at: 401937c524c61a28b4fab76d7a1f85bb628850012af62362a0922610372faf92
+      bt: cdf9a9cee4f2edf55111a95ae60bde9801080f6bde638a5c79273a39a2f9f7f5
+      ct: 643d5437104296e21d906ecb15b2c96ad278f20cfc4af53b12bb6069bd853726
+    output:
+      - input_file: inputs/true_true.in
+        output:
+          registers:
+            b:
+              type: bool
+              value: "true"
+            c:
+              type: bool
+              value: "false"
+    initial_ast: 51cc6c9ff08fa4320783cf8b6683f784a6325a0e371c7d93049c30eb9d04cf72
+    imports_resolved_ast: 51cc6c9ff08fa4320783cf8b6683f784a6325a0e371c7d93049c30eb9d04cf72
+    canonicalized_ast: 51cc6c9ff08fa4320783cf8b6683f784a6325a0e371c7d93049c30eb9d04cf72
+    type_inferenced_ast: a1e55a4a926b0d9c8d0f611136c7f9ba8ed5c6156a85d1d04adc9faaadf1a611
diff --git a/tests/expectations/compiler/compiler/tuples/dependent.leo.out b/tests/expectations/compiler/compiler/tuples/dependent.leo.out
index ef090731fb..8b49eeab86 100644
--- a/tests/expectations/compiler/compiler/tuples/dependent.leo.out
+++ b/tests/expectations/compiler/compiler/tuples/dependent.leo.out
@@ -1,4 +1,25 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 2
+      num_constraints: 2
+      at: 401937c524c61a28b4fab76d7a1f85bb628850012af62362a0922610372faf92
+      bt: cdf9a9cee4f2edf55111a95ae60bde9801080f6bde638a5c79273a39a2f9f7f5
+      ct: 643d5437104296e21d906ecb15b2c96ad278f20cfc4af53b12bb6069bd853726
+    output:
+      - input_file: inputs/true_true.in
+        output:
+          registers:
+            b:
+              type: bool
+              value: "true"
+            c:
+              type: bool
+              value: "false"
+    initial_ast: 6692e9d94d784dd3cd11dbf48ac13b0b54f61d83ba0d85bf038e9bf84590851f
+    imports_resolved_ast: 6692e9d94d784dd3cd11dbf48ac13b0b54f61d83ba0d85bf038e9bf84590851f
+    canonicalized_ast: 6692e9d94d784dd3cd11dbf48ac13b0b54f61d83ba0d85bf038e9bf84590851f
+    type_inferenced_ast: 0d8c2b2b77762cfb957d5d6247366317b8fbe4ac7cb985df1b4d3511accf13b8
diff --git a/tests/expectations/compiler/compiler/tuples/destructured.leo.out b/tests/expectations/compiler/compiler/tuples/destructured.leo.out
index ef090731fb..774c7fdf01 100644
--- a/tests/expectations/compiler/compiler/tuples/destructured.leo.out
+++ b/tests/expectations/compiler/compiler/tuples/destructured.leo.out
@@ -1,4 +1,25 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 2
+      num_constraints: 2
+      at: 401937c524c61a28b4fab76d7a1f85bb628850012af62362a0922610372faf92
+      bt: cdf9a9cee4f2edf55111a95ae60bde9801080f6bde638a5c79273a39a2f9f7f5
+      ct: 643d5437104296e21d906ecb15b2c96ad278f20cfc4af53b12bb6069bd853726
+    output:
+      - input_file: inputs/true_true.in
+        output:
+          registers:
+            b:
+              type: bool
+              value: "false"
+            c:
+              type: bool
+              value: "true"
+    initial_ast: 531df9191a6ee867da7a9c5aa5120a9ab93eec5d4d29bdc78aa965fce0f52c8d
+    imports_resolved_ast: 531df9191a6ee867da7a9c5aa5120a9ab93eec5d4d29bdc78aa965fce0f52c8d
+    canonicalized_ast: 531df9191a6ee867da7a9c5aa5120a9ab93eec5d4d29bdc78aa965fce0f52c8d
+    type_inferenced_ast: b841d6651b93193e0bbd24df8b667bd16066ee77481dd3b8b0187c37968ca1c1
diff --git a/tests/expectations/compiler/compiler/tuples/nested_access.leo.out b/tests/expectations/compiler/compiler/tuples/nested_access.leo.out
index ef090731fb..f88364c476 100644
--- a/tests/expectations/compiler/compiler/tuples/nested_access.leo.out
+++ b/tests/expectations/compiler/compiler/tuples/nested_access.leo.out
@@ -1,4 +1,25 @@
 ---
 namespace: Compile
 expectation: Pass
-outputs: []
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 2
+      num_constraints: 2
+      at: 401937c524c61a28b4fab76d7a1f85bb628850012af62362a0922610372faf92
+      bt: cdf9a9cee4f2edf55111a95ae60bde9801080f6bde638a5c79273a39a2f9f7f5
+      ct: 643d5437104296e21d906ecb15b2c96ad278f20cfc4af53b12bb6069bd853726
+    output:
+      - input_file: inputs/true_true.in
+        output:
+          registers:
+            b:
+              type: bool
+              value: "false"
+            c:
+              type: bool
+              value: "false"
+    initial_ast: fbd413171641a048b40bf3141ee1ae3218a205e4679721ce61e0e114bb2e340b
+    imports_resolved_ast: fbd413171641a048b40bf3141ee1ae3218a205e4679721ce61e0e114bb2e340b
+    canonicalized_ast: fbd413171641a048b40bf3141ee1ae3218a205e4679721ce61e0e114bb2e340b
+    type_inferenced_ast: 8dcc217ea727817113ac27684c71b3b8914a9f621952b8555d5fc4843a79967f

From 8827bcdf05c04da0b3a8be2fc8c3b17830fc1c3f Mon Sep 17 00:00:00 2001
From: gluaxspeed <jonathan.t.pavlik@gmail.com>
Date: Fri, 27 Aug 2021 22:08:48 -0700
Subject: [PATCH 12/23] add a inputfile so possible no constraints error
 doesn't happen

---
 tests/compiler/aliases/duplicate_name_fail.leo | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/compiler/aliases/duplicate_name_fail.leo b/tests/compiler/aliases/duplicate_name_fail.leo
index a76706b1c0..d281d8d6b0 100644
--- a/tests/compiler/aliases/duplicate_name_fail.leo
+++ b/tests/compiler/aliases/duplicate_name_fail.leo
@@ -1,6 +1,8 @@
 /*
 namespace: Compile
 expectation: Fail
+input_file:
+ - inputs/dummy.in
 */
 
 type int = u32;

From 09d60932eb5295bbeda7a1998917ce9d6a1c5266 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 30 Aug 2021 10:17:53 +0000
Subject: [PATCH 13/23] Bump thiserror from 1.0.26 to 1.0.28

Bumps [thiserror](https://github.com/dtolnay/thiserror) from 1.0.26 to 1.0.28.
- [Release notes](https://github.com/dtolnay/thiserror/releases)
- [Commits](https://github.com/dtolnay/thiserror/compare/1.0.26...1.0.28)

---
updated-dependencies:
- dependency-name: thiserror
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Cargo.lock        | 8 ++++----
 errors/Cargo.toml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6114fe711a..78a76870ce 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2864,18 +2864,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.26"
+version = "1.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93119e4feac1cbe6c798c34d3a53ea0026b0b1de6a120deef895137c0529bfe2"
+checksum = "283d5230e63df9608ac7d9691adc1dfb6e701225436eb64d0b9a7f0a5a04f6ec"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.26"
+version = "1.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "060d69a0afe7796bf42e9e2ff91f5ee691fb15c53d38b4b62a9a53eb23164745"
+checksum = "fa3884228611f5cd3608e2d409bf7dce832e4eb3135e3f11addbd7e41bd68e71"
 dependencies = [
  "proc-macro2 1.0.27",
  "quote 1.0.9",
diff --git a/errors/Cargo.toml b/errors/Cargo.toml
index 79da65dc14..b55e379acd 100644
--- a/errors/Cargo.toml
+++ b/errors/Cargo.toml
@@ -48,4 +48,4 @@ features = [ "derive", "rc" ]
 version = "0.4.2"
 
 [dependencies.thiserror]
-version = "1.0.26"
+version = "1.0.28"

From 3b72441230fea53428dd9517805b47bf2ad93c83 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 30 Aug 2021 10:18:14 +0000
Subject: [PATCH 14/23] Bump sha2 from 0.9.5 to 0.9.6

Bumps [sha2](https://github.com/RustCrypto/hashes) from 0.9.5 to 0.9.6.
- [Release notes](https://github.com/RustCrypto/hashes/releases)
- [Commits](https://github.com/RustCrypto/hashes/compare/sha2-v0.9.5...sha2-v0.9.6)

---
updated-dependencies:
- dependency-name: sha2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Cargo.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6114fe711a..f577ad378e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -395,9 +395,9 @@ checksum = "ea221b5284a47e40033bf9b66f35f984ec0ea2931eb03505246cd27a963f981b"
 
 [[package]]
 name = "cpufeatures"
-version = "0.1.5"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66c99696f6c9dd7f35d486b9d04d7e6e202aa3e8c40d553f2fdf5e7e0c6a71ef"
+checksum = "95059428f66df56b63431fdb4e1947ed2190586af5c5a8a8b71122bdf5a7f469"
 dependencies = [
  "libc",
 ]
@@ -1464,9 +1464,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.98"
+version = "0.2.101"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "320cfe77175da3a483efed4bc0adc1968ca050b098ce4f2f1c13a56626128790"
+checksum = "3cb00336871be5ed2c8ed44b60ae9959dc5b9f08539422ed43f09e34ecaeba21"
 
 [[package]]
 name = "libz-sys"
@@ -2451,9 +2451,9 @@ dependencies = [
 
 [[package]]
 name = "sha2"
-version = "0.9.5"
+version = "0.9.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b362ae5752fd2137731f9fa25fd4d9058af34666ca1966fb969119cc35719f12"
+checksum = "9204c41a1597a8c5af23c82d1c921cb01ec0a4c59e07a9c7306062829a3903f3"
 dependencies = [
  "block-buffer 0.9.0",
  "cfg-if 1.0.0",

From bd23781a94c459cadffcd6d458a4703970589d5f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 30 Aug 2021 10:18:22 +0000
Subject: [PATCH 15/23] Bump num-bigint from 0.4.0 to 0.4.1

Bumps [num-bigint](https://github.com/rust-num/num-bigint) from 0.4.0 to 0.4.1.
- [Release notes](https://github.com/rust-num/num-bigint/releases)
- [Changelog](https://github.com/rust-num/num-bigint/blob/master/RELEASES.md)
- [Commits](https://github.com/rust-num/num-bigint/compare/num-bigint-0.4.0...num-bigint-0.4.1)

---
updated-dependencies:
- dependency-name: num-bigint
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6114fe711a..934d3fdf81 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1709,9 +1709,9 @@ dependencies = [
 
 [[package]]
 name = "num-bigint"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e0d047c1062aa51e256408c560894e5251f08925980e53cf1aa5bd00eec6512"
+checksum = "76e97c412795abf6c24ba30055a8f20642ea57ca12875220b854cfa501bf1e48"
 dependencies = [
  "autocfg",
  "num-integer",

From 87cc6edfc979def1d3bd4491a94560f85993385b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 30 Aug 2021 20:46:33 +0000
Subject: [PATCH 16/23] Bump serde from 1.0.128 to 1.0.130

Bumps [serde](https://github.com/serde-rs/serde) from 1.0.128 to 1.0.130.
- [Release notes](https://github.com/serde-rs/serde/releases)
- [Commits](https://github.com/serde-rs/serde/compare/v1.0.128...v1.0.130)

---
updated-dependencies:
- dependency-name: serde
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Cargo.lock        | 8 ++++----
 errors/Cargo.toml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index bf1e7aa61f..535b90baca 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2374,9 +2374,9 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.128"
+version = "1.0.130"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1056a0db1978e9dbf0f6e4fca677f6f9143dc1c19de346f22cac23e422196834"
+checksum = "f12d06de37cf59146fbdecab66aa99f9fe4f78722e3607577a5375d66bd0c913"
 dependencies = [
  "serde_derive",
 ]
@@ -2393,9 +2393,9 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.128"
+version = "1.0.130"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13af2fbb8b60a8950d6c72a56d2095c28870367cc8e10c55e9745bac4995a2c4"
+checksum = "d7bc1a1ab1961464eae040d96713baa5a724a8152c1222492465b54322ec508b"
 dependencies = [
  "proc-macro2 1.0.27",
  "quote 1.0.9",
diff --git a/errors/Cargo.toml b/errors/Cargo.toml
index b55e379acd..710c0733b6 100644
--- a/errors/Cargo.toml
+++ b/errors/Cargo.toml
@@ -41,7 +41,7 @@ version = "0.3.61"
 version = "2.0"
 
 [dependencies.serde]
-version = "1.0.128"
+version = "1.0.130"
 features = [ "derive", "rc" ]
 
 [dependencies.tendril]

From 80a5028afa0cd7e8769231462d3b893f64cf354f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 31 Aug 2021 10:18:27 +0000
Subject: [PATCH 17/23] Bump structopt from 0.3.22 to 0.3.23

Bumps [structopt](https://github.com/TeXitoi/structopt) from 0.3.22 to 0.3.23.
- [Release notes](https://github.com/TeXitoi/structopt/releases)
- [Changelog](https://github.com/TeXitoi/structopt/blob/master/CHANGELOG.md)
- [Commits](https://github.com/TeXitoi/structopt/compare/v0.3.22...v0.3.23)

---
updated-dependencies:
- dependency-name: structopt
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Cargo.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 535b90baca..fc933cfd1f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2732,9 +2732,9 @@ checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
 
 [[package]]
 name = "structopt"
-version = "0.3.22"
+version = "0.3.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69b041cdcb67226aca307e6e7be44c8806423d83e018bd662360a93dabce4d71"
+checksum = "bf9d950ef167e25e0bdb073cf1d68e9ad2795ac826f2f3f59647817cf23c0bfa"
 dependencies = [
  "clap",
  "lazy_static",
@@ -2743,9 +2743,9 @@ dependencies = [
 
 [[package]]
 name = "structopt-derive"
-version = "0.4.15"
+version = "0.4.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7813934aecf5f51a54775e00068c237de98489463968231a51746bbbc03f9c10"
+checksum = "134d838a2c9943ac3125cf6df165eda53493451b719f3255b2a26b85f772d0ba"
 dependencies = [
  "heck",
  "proc-macro-error",

From 9951627c8c6428063cdd03e196c949abe0eccba8 Mon Sep 17 00:00:00 2001
From: damirka <damirka.ru@gmail.com>
Date: Tue, 31 Aug 2021 19:18:31 +0300
Subject: [PATCH 18/23] pulling parser changes from prev branch

---
 parser/src/parser/expression.rs | 4 +++-
 parser/src/parser/type_.rs      | 8 +++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/parser/src/parser/expression.rs b/parser/src/parser/expression.rs
index d9ebcfc944..2f9cf4929f 100644
--- a/parser/src/parser/expression.rs
+++ b/parser/src/parser/expression.rs
@@ -604,7 +604,9 @@ impl ParserContext {
         }
         let first = self.parse_spread_or_expression()?;
         if self.eat(Token::Semicolon).is_some() {
-            let dimensions = self.parse_array_dimensions()?;
+            let dimensions = self
+                .parse_array_dimensions()?
+                .ok_or_else(|| ParserError::unable_to_parse_array_dimensions(span))?;
             let end = self.expect(Token::RightSquare)?;
             let first = match first {
                 SpreadOrExpression::Spread(first) => {
diff --git a/parser/src/parser/type_.rs b/parser/src/parser/type_.rs
index 60d5b01d05..65eb3d3dd4 100644
--- a/parser/src/parser/type_.rs
+++ b/parser/src/parser/type_.rs
@@ -58,9 +58,11 @@ impl ParserContext {
     ///
     /// Returns an [`ArrayDimensions`] AST node if the next tokens represent dimensions for an array type.
     ///
-    pub fn parse_array_dimensions(&mut self) -> Result<ArrayDimensions> {
+    pub fn parse_array_dimensions(&mut self) -> Result<Option<ArrayDimensions>> {
         Ok(if let Some((int, _)) = self.eat_int() {
-            ArrayDimensions(vec![int])
+            Some(ArrayDimensions(vec![int]))
+        } else if self.eat(Token::Underscore).is_some() {
+            None
         } else {
             self.expect(Token::LeftParen)?;
             let mut dimensions = Vec::new();
@@ -76,7 +78,7 @@ impl ParserContext {
                 }
             }
             self.expect(Token::RightParen)?;
-            ArrayDimensions(dimensions)
+            Some(ArrayDimensions(dimensions))
         })
     }
 

From e03d5c23b8ec3c97053703aba6ad2c57fa16c37c Mon Sep 17 00:00:00 2001
From: damirka <damirka.ru@gmail.com>
Date: Tue, 31 Aug 2021 20:18:21 +0300
Subject: [PATCH 19/23] includes ast and asg changes

---
 asg/src/scope.rs                              | 19 ++++++---
 asg/src/type_.rs                              |  4 +-
 .../src/canonicalization/canonicalizer.rs     | 37 +++++++++-------
 ast/src/types/type_.rs                        | 27 +++++++++---
 compiler/src/phases/reducing_director.rs      |  4 +-
 errors/src/parser/parser_errors.rs            | 42 +++++++++++--------
 6 files changed, 85 insertions(+), 48 deletions(-)

diff --git a/asg/src/scope.rs b/asg/src/scope.rs
index 26687a495d..781afb6557 100644
--- a/asg/src/scope.rs
+++ b/asg/src/scope.rs
@@ -183,13 +183,20 @@ impl<'a> Scope<'a> {
             IntegerType(int_type) => Type::Integer(int_type.clone()),
             Array(sub_type, dimensions) => {
                 let mut item = Box::new(self.resolve_ast_type(&*sub_type, span)?);
-                for dimension in dimensions.0.iter().rev() {
-                    let dimension = dimension
-                        .value
-                        .parse::<usize>()
-                        .map_err(|_| AsgError::parse_index_error(span))?;
-                    item = Box::new(Type::Array(item, dimension));
+
+                if let Some(dimensions) = dimensions {
+                    for dimension in dimensions.0.iter().rev() {
+                        let dimension = dimension
+                            .value
+                            .parse::<usize>()
+                            .map_err(|_| AsgError::parse_index_error(span))?;
+                        item = Box::new(Type::Array(item, dimension));
+                    }
                 }
+                // } else {
+                //     return AsgError::parse_index_error(span);
+                // }
+
                 *item
             }
             Tuple(sub_types) => Type::Tuple(
diff --git a/asg/src/type_.rs b/asg/src/type_.rs
index 74543b2555..e4947fd38d 100644
--- a/asg/src/type_.rs
+++ b/asg/src/type_.rs
@@ -207,9 +207,9 @@ impl<'a> Into<leo_ast::Type> for &Type<'a> {
             Integer(int_type) => leo_ast::Type::IntegerType(int_type.clone()),
             Array(type_, len) => leo_ast::Type::Array(
                 Box::new(type_.as_ref().into()),
-                leo_ast::ArrayDimensions(vec![leo_ast::PositiveNumber {
+                Some(leo_ast::ArrayDimensions(vec![leo_ast::PositiveNumber {
                     value: len.to_string().into(),
-                }]),
+                }])),
             ),
             Tuple(subtypes) => leo_ast::Type::Tuple(subtypes.iter().map(Into::into).collect()),
             Circuit(circuit) => leo_ast::Type::CircuitOrAlias(circuit.name.borrow().clone()),
diff --git a/ast-passes/src/canonicalization/canonicalizer.rs b/ast-passes/src/canonicalization/canonicalizer.rs
index 353e284584..410b2610e6 100644
--- a/ast-passes/src/canonicalization/canonicalizer.rs
+++ b/ast-passes/src/canonicalization/canonicalizer.rs
@@ -481,24 +481,31 @@ impl ReconstructingReducer for Canonicalizer {
 
     fn reduce_type(&mut self, _type_: &Type, new: Type, span: &Span) -> Result<Type> {
         match new {
-            Type::Array(type_, mut dimensions) => {
-                if dimensions.is_zero() {
-                    return Err(AstError::invalid_array_dimension_size(span).into());
-                }
-
-                let mut next = Type::Array(type_, ArrayDimensions(vec![dimensions.remove_last().unwrap()]));
-                let mut array = next.clone();
-
-                loop {
-                    if dimensions.is_empty() {
-                        break;
+            Type::Array(type_, dimensions) => {
+                if let Some(mut dimensions) = dimensions {
+                    if dimensions.is_zero() {
+                        return Err(AstError::invalid_array_dimension_size(span).into());
                     }
 
-                    array = Type::Array(Box::new(next), ArrayDimensions(vec![dimensions.remove_last().unwrap()]));
-                    next = array.clone();
-                }
+                    let mut next = Type::Array(type_, Some(ArrayDimensions(vec![dimensions.remove_last().unwrap()])));
+                    let mut array = next.clone();
 
-                Ok(array)
+                    loop {
+                        if dimensions.is_empty() {
+                            break;
+                        }
+
+                        array = Type::Array(
+                            Box::new(next),
+                            Some(ArrayDimensions(vec![dimensions.remove_last().unwrap()])),
+                        );
+                        next = array.clone();
+                    }
+
+                    Ok(array)
+                } else {
+                    Ok(Type::Array(type_, None))
+                }
             }
             Type::SelfType if !self.in_circuit => Err(AstError::big_self_outside_of_circuit(span).into()),
             _ => Ok(new.clone()),
diff --git a/ast/src/types/type_.rs b/ast/src/types/type_.rs
index b26e09c644..1b060514f6 100644
--- a/ast/src/types/type_.rs
+++ b/ast/src/types/type_.rs
@@ -34,7 +34,7 @@ pub enum Type {
     IntegerType(IntegerType),
 
     // Data type wrappers
-    Array(Box<Type>, ArrayDimensions),
+    Array(Box<Type>, Option<ArrayDimensions>),
     Tuple(Vec<Type>),
     CircuitOrAlias(Identifier),
     SelfType,
@@ -72,8 +72,17 @@ impl Type {
             (Type::SelfType, Type::SelfType) => true,
             (Type::Array(left_type, left_dim), Type::Array(right_type, right_dim)) => {
                 // Convert array dimensions to owned.
-                let mut left_dim_owned = left_dim.to_owned();
-                let mut right_dim_owned = right_dim.to_owned();
+                let left_dim_owned = left_dim.to_owned();
+                let right_dim_owned = right_dim.to_owned();
+
+                // Unable to compare arrays with unspecified sizes.
+                if left_dim_owned.is_none() || right_dim_owned.is_none() {
+                    return false;
+                }
+
+                // We know that values are Some, safe to unwrap.
+                let mut left_dim_owned = left_dim_owned.unwrap();
+                let mut right_dim_owned = right_dim_owned.unwrap();
 
                 // Remove the first element from both dimensions.
                 let left_first = left_dim_owned.remove_first();
@@ -120,7 +129,7 @@ impl<'ast> From<InputArrayType<'ast>> for Type {
         let element_type = Box::new(Type::from(*array_type.type_));
         let dimensions = ArrayDimensions::from(array_type.dimensions);
 
-        Type::Array(element_type, dimensions)
+        Type::Array(element_type, Some(dimensions))
     }
 }
 
@@ -153,7 +162,13 @@ impl fmt::Display for Type {
             Type::IntegerType(ref integer_type) => write!(f, "{}", integer_type),
             Type::CircuitOrAlias(ref variable) => write!(f, "circuit {}", variable),
             Type::SelfType => write!(f, "SelfType"),
-            Type::Array(ref array, ref dimensions) => write!(f, "[{}; {}]", *array, dimensions),
+            Type::Array(ref array, ref dimensions) => {
+                if let Some(dimensions) = dimensions {
+                    write!(f, "[{}; {}]", *array, dimensions)
+                } else {
+                    write!(f, "[{}; _]", *array)
+                }
+            }
             Type::Tuple(ref tuple) => {
                 let types = tuple.iter().map(|x| x.to_string()).collect::<Vec<_>>().join(", ");
 
@@ -179,6 +194,6 @@ pub fn inner_array_type(element_type: Type, dimensions: ArrayDimensions) -> Type
         element_type
     } else {
         // The array has multiple dimensions.
-        Type::Array(Box::new(element_type), dimensions)
+        Type::Array(Box::new(element_type), Some(dimensions))
     }
 }
diff --git a/compiler/src/phases/reducing_director.rs b/compiler/src/phases/reducing_director.rs
index 56e7ba565b..9071635b6d 100644
--- a/compiler/src/phases/reducing_director.rs
+++ b/compiler/src/phases/reducing_director.rs
@@ -76,9 +76,9 @@ impl<R: ReconstructingReducer, O: CombinerOptions> CombineAstAsgDirector<R, O> {
                 if self.options.type_inference_enabled() {
                     AstType::Array(
                         Box::new(self.reduce_type(ast_type, asg_type, span)?),
-                        ArrayDimensions(vec![PositiveNumber {
+                        Some(ArrayDimensions(vec![PositiveNumber {
                             value: StrTendril::from(format!("{}", asg_dimensions)),
-                        }]),
+                        }])),
                     )
                 } else {
                     AstType::Array(
diff --git a/errors/src/parser/parser_errors.rs b/errors/src/parser/parser_errors.rs
index 7728a65750..5a4a4db54d 100644
--- a/errors/src/parser/parser_errors.rs
+++ b/errors/src/parser/parser_errors.rs
@@ -32,7 +32,7 @@ create_errors!(
         help: None,
     }
 
-    /// For when the parser encoutnered an invalid address literal.
+    /// For when the parser encountered an invalid address literal.
     @formatted
     invalid_address_lit {
         args: (token: impl Display),
@@ -40,7 +40,7 @@ create_errors!(
         help: None,
     }
 
-    /// For when the parser encoutnered an empty import list.
+    /// For when the parser encountered an empty import list.
     @formatted
     invalid_import_list {
         args: (),
@@ -48,7 +48,7 @@ create_errors!(
         help: None,
     }
 
-    /// For when the parser encoutnered an unexpected End of File.
+    /// For when the parser encountered an unexpected End of File.
     @formatted
     unexpected_eof {
         args: (),
@@ -56,7 +56,7 @@ create_errors!(
         help: None,
     }
 
-    /// For when the parser encoutnered an unexpected whitespace.
+    /// For when the parser encountered an unexpected whitespace.
     @formatted
     unexpected_whitespace {
         args: (left: impl Display, right: impl Display),
@@ -64,7 +64,7 @@ create_errors!(
         help: None,
     }
 
-    /// For when the parser encoutnered an unexpected list of tokens.
+    /// For when the parser encountered an unexpected list of tokens.
     @formatted
     unexpected {
         args: (got: impl Display, expected: impl Display),
@@ -72,7 +72,7 @@ create_errors!(
         help: None,
     }
 
-    /// For when the parser encoutnered a mix of commas and semi-colons in circuit member variables.
+    /// For when the parser encountered a mix of commas and semi-colons in circuit member variables.
     @formatted
     mixed_commas_and_semicolons {
         args: (),
@@ -80,7 +80,7 @@ create_errors!(
         help: None,
     }
 
-    /// For when the parser encoutnered an unexpected identifier.
+    /// For when the parser encountered an unexpected identifier.
     @formatted
     unexpected_ident {
         args: (got: impl Display, expected: &[impl Display]),
@@ -96,7 +96,7 @@ create_errors!(
         help: None,
     }
 
-    /// For when the parser encoutnered an unexpected statement.
+    /// For when the parser encountered an unexpected statement.
     @formatted
     unexpected_statement {
         args: (got: impl Display, expected: impl Display),
@@ -104,7 +104,7 @@ create_errors!(
         help: None,
     }
 
-    /// For when the parser encoutnered an unexpected string.
+    /// For when the parser encountered an unexpected string.
     @formatted
     unexpected_str {
         args: (got: impl Display, expected: impl Display),
@@ -112,7 +112,7 @@ create_errors!(
         help: None,
     }
 
-    /// For when the parser encoutnered an unexpected spread in an array init expression.
+    /// For when the parser encountered an unexpected spread in an array init expression.
     @formatted
     spread_in_array_init {
         args: (),
@@ -120,7 +120,7 @@ create_errors!(
         help: None,
     }
 
-    /// For when the parser encoutnered an invalid assignment target.
+    /// For when the parser encountered an invalid assignment target.
     @formatted
     invalid_assignment_target {
         args: (),
@@ -128,7 +128,7 @@ create_errors!(
         help: None,
     }
 
-    /// For when the parser encoutnered an invalid package name.
+    /// For when the parser encountered an invalid package name.
     @formatted
     invalid_package_name {
         args: (),
@@ -136,7 +136,7 @@ create_errors!(
         help: None,
     }
 
-    /// For when the parser encoutnered an illegal `const self` argument.
+    /// For when the parser encountered an illegal `const self` argument.
     @formatted
     illegal_self_const {
         args: (),
@@ -144,7 +144,7 @@ create_errors!(
         help: None,
     }
 
-    /// For when the parser encoutnered a deprecated `mut` argument in a function.
+    /// For when the parser encountered a deprecated `mut` argument in a function.
     @formatted
     mut_function_input {
         args: (),
@@ -152,7 +152,7 @@ create_errors!(
         help: None,
     }
 
-    /// For when the parser encoutnered a deprecated `mut` argument in a let statement.
+    /// For when the parser encountered a deprecated `mut` argument in a let statement.
     @formatted
     let_mut_statement {
         args: (),
@@ -160,7 +160,7 @@ create_errors!(
         help: None,
     }
 
-    /// For when the parser encoutnered a deprecated `test function`.
+    /// For when the parser encountered a deprecated `test function`.
     @formatted
     test_function {
         args: (),
@@ -168,11 +168,19 @@ create_errors!(
         help: None,
     }
 
-    /// For when the parser encoutnered a deprecated `@context(...)` annotation.
+    /// For when the parser encountered a deprecated `@context(...)` annotation.
     @formatted
     context_annotation {
         args: (),
         msg: "\"@context(...)\" is deprecated. Did you mean @test annotation?",
         help: None,
     }
+
+    /// For when the parser failed to parse array dimensions.
+    @formatted
+    unable_to_parse_array_dimensions {
+        args: (),
+        msg: "unable to parse array dimensions",
+        help: None,
+    }
 );

From 97981b43f453043135828409cdae887988383076 Mon Sep 17 00:00:00 2001
From: damirka <damirka.ru@gmail.com>
Date: Tue, 31 Aug 2021 21:01:41 +0300
Subject: [PATCH 20/23] adds arraywithoutsize type

---
 asg/src/expression/array_access.rs | 15 ++++++++++-----
 asg/src/expression/array_inline.rs |  1 +
 asg/src/scope.rs                   |  5 ++---
 asg/src/type_.rs                   | 11 +++++++++++
 4 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/asg/src/expression/array_access.rs b/asg/src/expression/array_access.rs
index 5987a48fd9..d25c1e7bdf 100644
--- a/asg/src/expression/array_access.rs
+++ b/asg/src/expression/array_access.rs
@@ -91,7 +91,8 @@ impl<'a> FromAst<'a, leo_ast::ArrayAccessExpression> for ArrayAccessExpression<'
             Some(PartialType::Array(expected_type.map(Box::new), None)),
         )?;
         let array_len = match array.get_type() {
-            Some(Type::Array(_, len)) => len,
+            Some(Type::Array(_, len)) => Some(len),
+            Some(Type::ArrayWithoutSize(_)) => None,
             type_ => {
                 return Err(AsgError::unexpected_type(
                     "array",
@@ -113,10 +114,14 @@ impl<'a> FromAst<'a, leo_ast::ArrayAccessExpression> for ArrayAccessExpression<'
             .map(|x| x.int().map(|x| x.to_usize()).flatten())
             .flatten()
         {
-            if index >= array_len {
-                return Err(
-                    AsgError::array_index_out_of_bounds(index, &array.span().cloned().unwrap_or_default()).into(),
-                );
+            // Only check index if array size is known.
+            // Array out of bounds will be caught later if it really happens.
+            if let Some(array_len) = array_len {
+                if index >= array_len {
+                    return Err(
+                        AsgError::array_index_out_of_bounds(index, &array.span().cloned().unwrap_or_default()).into(),
+                    );
+                }
             }
         }
 
diff --git a/asg/src/expression/array_inline.rs b/asg/src/expression/array_inline.rs
index 56bd7d8987..9d79c50f95 100644
--- a/asg/src/expression/array_inline.rs
+++ b/asg/src/expression/array_inline.rs
@@ -107,6 +107,7 @@ impl<'a> FromAst<'a, leo_ast::ArrayInlineExpression> for ArrayInlineExpression<'
     ) -> Result<ArrayInlineExpression<'a>> {
         let (mut expected_item, expected_len) = match expected_type {
             Some(PartialType::Array(item, dims)) => (item.map(|x| *x), dims),
+            Some(PartialType::Type(Type::ArrayWithoutSize(item))) => (Some(item.partial()), None),
             None => (None, None),
             Some(type_) => {
                 return Err(AsgError::unexpected_type(type_, "array", &value.span).into());
diff --git a/asg/src/scope.rs b/asg/src/scope.rs
index 781afb6557..6a35ad2672 100644
--- a/asg/src/scope.rs
+++ b/asg/src/scope.rs
@@ -192,10 +192,9 @@ impl<'a> Scope<'a> {
                             .map_err(|_| AsgError::parse_index_error(span))?;
                         item = Box::new(Type::Array(item, dimension));
                     }
+                } else {
+                    item = Box::new(Type::ArrayWithoutSize(item));
                 }
-                // } else {
-                //     return AsgError::parse_index_error(span);
-                // }
 
                 *item
             }
diff --git a/asg/src/type_.rs b/asg/src/type_.rs
index e4947fd38d..c87c3e80ff 100644
--- a/asg/src/type_.rs
+++ b/asg/src/type_.rs
@@ -32,6 +32,7 @@ pub enum Type<'a> {
 
     // Data type wrappers
     Array(Box<Type<'a>>, usize),
+    ArrayWithoutSize(Box<Type<'a>>),
     Tuple(Vec<Type<'a>>),
     Circuit(&'a Circuit<'a>),
 }
@@ -71,6 +72,14 @@ impl<'a> PartialType<'a> {
             (PartialType::Integer(self_sub_type, _), Type::Integer(sub_type)) => {
                 self_sub_type.as_ref().map(|x| x == sub_type).unwrap_or(true)
             }
+            (PartialType::Array(element, _len), Type::ArrayWithoutSize(other_element)) => {
+                if let Some(element) = element {
+                    if !element.matches(&*other_element) {
+                        return false;
+                    }
+                }
+                true
+            }
             (PartialType::Array(element, len), Type::Array(other_element, other_len)) => {
                 if let Some(element) = element {
                     if !element.matches(&*other_element) {
@@ -140,6 +149,7 @@ impl<'a> fmt::Display for Type<'a> {
             Type::Group => write!(f, "group"),
             Type::Integer(sub_type) => sub_type.fmt(f),
             Type::Array(sub_type, len) => write!(f, "[{}; {}]", sub_type, len),
+            Type::ArrayWithoutSize(sub_type) => write!(f, "[{}; _]", sub_type),
             Type::Tuple(sub_types) => {
                 write!(f, "(")?;
                 for (i, sub_type) in sub_types.iter().enumerate() {
@@ -211,6 +221,7 @@ impl<'a> Into<leo_ast::Type> for &Type<'a> {
                     value: len.to_string().into(),
                 }])),
             ),
+            ArrayWithoutSize(type_) => leo_ast::Type::Array(Box::new(type_.as_ref().into()), None),
             Tuple(subtypes) => leo_ast::Type::Tuple(subtypes.iter().map(Into::into).collect()),
             Circuit(circuit) => leo_ast::Type::CircuitOrAlias(circuit.name.borrow().clone()),
         }

From 041faa28dbd0a6fa3fb0cd296b1a0f6d6bd946a7 Mon Sep 17 00:00:00 2001
From: damirka <damirka.ru@gmail.com>
Date: Thu, 2 Sep 2021 15:53:54 +0300
Subject: [PATCH 21/23] adds tests

---
 asg/src/type_.rs                              |  6 ++++-
 tests/compiler/aliases/fn_return.leo          |  2 +-
 .../array_without_size/definition.leo         | 11 ++++++++++
 .../array_without_size/function_input.leo     | 13 +++++++++++
 .../array_without_size/input/dummy.in         |  6 +++++
 .../array_without_size/type_alias.leo         | 16 ++++++++++++++
 .../array_without_size/definition.leo.out     | 22 +++++++++++++++++++
 .../array_without_size/function_input.leo.out | 22 +++++++++++++++++++
 .../array_without_size/type_alias.leo.out     | 22 +++++++++++++++++++
 9 files changed, 118 insertions(+), 2 deletions(-)
 create mode 100644 tests/compiler/array_without_size/definition.leo
 create mode 100644 tests/compiler/array_without_size/function_input.leo
 create mode 100644 tests/compiler/array_without_size/input/dummy.in
 create mode 100644 tests/compiler/array_without_size/type_alias.leo
 create mode 100644 tests/expectations/compiler/compiler/array_without_size/definition.leo.out
 create mode 100644 tests/expectations/compiler/compiler/array_without_size/function_input.leo.out
 create mode 100644 tests/expectations/compiler/compiler/array_without_size/type_alias.leo.out

diff --git a/asg/src/type_.rs b/asg/src/type_.rs
index c87c3e80ff..43d788124e 100644
--- a/asg/src/type_.rs
+++ b/asg/src/type_.rs
@@ -123,7 +123,11 @@ impl<'a> Into<PartialType<'a>> for Type<'a> {
 
 impl<'a> Type<'a> {
     pub fn is_assignable_from(&self, from: &Type<'a>) -> bool {
-        self == from
+        match (self, from) {
+            (Type::Array(_, _), Type::ArrayWithoutSize(_)) => true,
+            (Type::ArrayWithoutSize(_), Type::Array(_, _)) => true,
+            _ => self == from,
+        }
     }
 
     pub fn partial(self) -> PartialType<'a> {
diff --git a/tests/compiler/aliases/fn_return.leo b/tests/compiler/aliases/fn_return.leo
index 8ad0c01ffc..6c29561e09 100644
--- a/tests/compiler/aliases/fn_return.leo
+++ b/tests/compiler/aliases/fn_return.leo
@@ -20,4 +20,4 @@ function main(y: bool) -> bool {
     let b: [int; 3] = return_int_array();
   
 	return y;
-}
\ No newline at end of file
+}
diff --git a/tests/compiler/array_without_size/definition.leo b/tests/compiler/array_without_size/definition.leo
new file mode 100644
index 0000000000..f6896c6f01
--- /dev/null
+++ b/tests/compiler/array_without_size/definition.leo
@@ -0,0 +1,11 @@
+/*
+namespace: Compile
+expectation: Pass
+input_file: input/dummy.in
+*/
+
+function main(y: bool) -> bool {
+    let d: [u8; _] = [1,2,3,4];
+    return d == [1,2,3,4];
+}
+
diff --git a/tests/compiler/array_without_size/function_input.leo b/tests/compiler/array_without_size/function_input.leo
new file mode 100644
index 0000000000..3255356367
--- /dev/null
+++ b/tests/compiler/array_without_size/function_input.leo
@@ -0,0 +1,13 @@
+/*
+namespace: Compile
+expectation: Pass
+input_file: input/dummy.in
+*/
+
+function main(y: bool) -> bool {
+    return (first_el([1,2,3,4]) == 1) == y;
+}
+
+function first_el(arr: [u8; _]) -> u8 {
+    return arr[0];
+}
diff --git a/tests/compiler/array_without_size/input/dummy.in b/tests/compiler/array_without_size/input/dummy.in
new file mode 100644
index 0000000000..6e43b49ecc
--- /dev/null
+++ b/tests/compiler/array_without_size/input/dummy.in
@@ -0,0 +1,6 @@
+[main]
+y: bool = true;
+n: bool = false;
+
+[registers]
+r0: bool = false;
diff --git a/tests/compiler/array_without_size/type_alias.leo b/tests/compiler/array_without_size/type_alias.leo
new file mode 100644
index 0000000000..a48bb32ef6
--- /dev/null
+++ b/tests/compiler/array_without_size/type_alias.leo
@@ -0,0 +1,16 @@
+/*
+namespace: Compile
+expectation: Pass
+input_file: input/dummy.in
+*/
+
+type str = [char; _];
+
+function main(y: bool) -> bool {
+    let s = "abc";
+    return (first_el(s) == 'a') == y;
+}
+
+function first_el(s: str) -> char {
+    return s[0];
+}
diff --git a/tests/expectations/compiler/compiler/array_without_size/definition.leo.out b/tests/expectations/compiler/compiler/array_without_size/definition.leo.out
new file mode 100644
index 0000000000..c5828379b9
--- /dev/null
+++ b/tests/expectations/compiler/compiler/array_without_size/definition.leo.out
@@ -0,0 +1,22 @@
+---
+namespace: Compile
+expectation: Pass
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: input/dummy.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 5ef136cadd1330fb09fa0a4c27630bea068d1801edadb0d6073cfd23fab043e7
+    imports_resolved_ast: 5ef136cadd1330fb09fa0a4c27630bea068d1801edadb0d6073cfd23fab043e7
+    canonicalized_ast: 5ef136cadd1330fb09fa0a4c27630bea068d1801edadb0d6073cfd23fab043e7
+    type_inferenced_ast: cdaf744ea99aa80bb5bf2e541084b1a51692b98c5815d807377db94d0b292dc2
diff --git a/tests/expectations/compiler/compiler/array_without_size/function_input.leo.out b/tests/expectations/compiler/compiler/array_without_size/function_input.leo.out
new file mode 100644
index 0000000000..e0a971d975
--- /dev/null
+++ b/tests/expectations/compiler/compiler/array_without_size/function_input.leo.out
@@ -0,0 +1,22 @@
+---
+namespace: Compile
+expectation: Pass
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: input/dummy.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: 3871f9d6b5a028658777a540523dbeb2159dd0e47b11aefc4ec64d1b3aabd537
+    imports_resolved_ast: 3871f9d6b5a028658777a540523dbeb2159dd0e47b11aefc4ec64d1b3aabd537
+    canonicalized_ast: 3871f9d6b5a028658777a540523dbeb2159dd0e47b11aefc4ec64d1b3aabd537
+    type_inferenced_ast: a25984c359654334f71221546da1ccd4da2cabeb6c8aeae72113bbaba622b440
diff --git a/tests/expectations/compiler/compiler/array_without_size/type_alias.leo.out b/tests/expectations/compiler/compiler/array_without_size/type_alias.leo.out
new file mode 100644
index 0000000000..fda337a3b5
--- /dev/null
+++ b/tests/expectations/compiler/compiler/array_without_size/type_alias.leo.out
@@ -0,0 +1,22 @@
+---
+namespace: Compile
+expectation: Pass
+outputs:
+  - circuit:
+      num_public_variables: 0
+      num_private_variables: 1
+      num_constraints: 1
+      at: 042610d0fd1fe6d6ac112138f8755752f44c7d2a00f1b5960574d6da5cda393f
+      bt: e97756698880ab7555a959a5fb5c6b4e15bd64612aa677adbfe2d0bd91f0a83c
+      ct: cf1cbb66a638b4860a516671fb74850e6ccf787fe6c4c8d29e9c04efe880bd05
+    output:
+      - input_file: input/dummy.in
+        output:
+          registers:
+            r0:
+              type: bool
+              value: "true"
+    initial_ast: d6744be96fc8dbd32abfd290fa276a60c6a36d86ac991605af75f84d38bd913a
+    imports_resolved_ast: d6744be96fc8dbd32abfd290fa276a60c6a36d86ac991605af75f84d38bd913a
+    canonicalized_ast: e0c42db11f31a32f3ec40b4f6bd0109519408c530878ced2f7ce2e3729aefb8f
+    type_inferenced_ast: e4e14be0f8a9521b81f30d83e0258f8d84b5acf93563659f14da8f6aeefefc2a

From 9bef8611e8a3ed74dc5cd291bb3d0e257eec6c01 Mon Sep 17 00:00:00 2001
From: damirka <damirka.ru@gmail.com>
Date: Thu, 2 Sep 2021 18:27:20 +0300
Subject: [PATCH 22/23] custom serializer for Type::Array

---
 ast/src/types/type_.rs                        | 24 +++++++++++++++++--
 .../array_without_size/definition.leo.out     |  8 +++----
 .../array_without_size/function_input.leo.out |  8 +++----
 .../array_without_size/type_alias.leo.out     |  8 +++----
 4 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/ast/src/types/type_.rs b/ast/src/types/type_.rs
index 1b060514f6..6120fe8315 100644
--- a/ast/src/types/type_.rs
+++ b/ast/src/types/type_.rs
@@ -14,12 +14,12 @@
 // 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 crate::{ArrayDimensions, Identifier, IntegerType};
+use crate::{ArrayDimensions, Identifier, IntegerType, PositiveNumber};
 use leo_input::types::{
     ArrayType as InputArrayType, DataType as InputDataType, TupleType as InputTupleType, Type as InputType,
 };
 
-use serde::{Deserialize, Serialize};
+use serde::{ser::SerializeSeq, Deserialize, Serialize, Serializer};
 use std::fmt;
 
 /// Explicit type used for defining a variable or expression type
@@ -34,6 +34,7 @@ pub enum Type {
     IntegerType(IntegerType),
 
     // Data type wrappers
+    #[serde(serialize_with = "serialize_array")]
     Array(Box<Type>, Option<ArrayDimensions>),
     Tuple(Vec<Type>),
     CircuitOrAlias(Identifier),
@@ -197,3 +198,22 @@ pub fn inner_array_type(element_type: Type, dimensions: ArrayDimensions) -> Type
         Type::Array(Box::new(element_type), Some(dimensions))
     }
 }
+
+///
+/// Custom Serializer for Type::Array. Handles the case when ArrayDimensions are None and turns it into
+/// a Vec<PositiveNumber>, where the only element is "0".
+///
+fn serialize_array<S>(type_: &Type, dimensions: &Option<ArrayDimensions>, serializer: S) -> Result<S::Ok, S::Error>
+where
+    S: Serializer,
+{
+    let mut seq = serializer.serialize_seq(Some(2))?;
+    seq.serialize_element(type_)?;
+    // seq.serialize_element(dimensions)?;
+    if let Some(dimensions) = dimensions {
+        seq.serialize_element(&dimensions)?;
+    } else {
+        seq.serialize_element(&ArrayDimensions(vec![PositiveNumber { value: "0".into() }]))?;
+    }
+    seq.end()
+}
diff --git a/tests/expectations/compiler/compiler/array_without_size/definition.leo.out b/tests/expectations/compiler/compiler/array_without_size/definition.leo.out
index c5828379b9..ce18b13169 100644
--- a/tests/expectations/compiler/compiler/array_without_size/definition.leo.out
+++ b/tests/expectations/compiler/compiler/array_without_size/definition.leo.out
@@ -16,7 +16,7 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 5ef136cadd1330fb09fa0a4c27630bea068d1801edadb0d6073cfd23fab043e7
-    imports_resolved_ast: 5ef136cadd1330fb09fa0a4c27630bea068d1801edadb0d6073cfd23fab043e7
-    canonicalized_ast: 5ef136cadd1330fb09fa0a4c27630bea068d1801edadb0d6073cfd23fab043e7
-    type_inferenced_ast: cdaf744ea99aa80bb5bf2e541084b1a51692b98c5815d807377db94d0b292dc2
+    initial_ast: edf8a3b7372af353b99830752d41d8c04d1863a4d03c754f41aac3545649c644
+    imports_resolved_ast: edf8a3b7372af353b99830752d41d8c04d1863a4d03c754f41aac3545649c644
+    canonicalized_ast: edf8a3b7372af353b99830752d41d8c04d1863a4d03c754f41aac3545649c644
+    type_inferenced_ast: 5479f110a1cbd68040560f64a09663207e756630aa2621a4bb424c48a3cab64d
diff --git a/tests/expectations/compiler/compiler/array_without_size/function_input.leo.out b/tests/expectations/compiler/compiler/array_without_size/function_input.leo.out
index e0a971d975..17c396727b 100644
--- a/tests/expectations/compiler/compiler/array_without_size/function_input.leo.out
+++ b/tests/expectations/compiler/compiler/array_without_size/function_input.leo.out
@@ -16,7 +16,7 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 3871f9d6b5a028658777a540523dbeb2159dd0e47b11aefc4ec64d1b3aabd537
-    imports_resolved_ast: 3871f9d6b5a028658777a540523dbeb2159dd0e47b11aefc4ec64d1b3aabd537
-    canonicalized_ast: 3871f9d6b5a028658777a540523dbeb2159dd0e47b11aefc4ec64d1b3aabd537
-    type_inferenced_ast: a25984c359654334f71221546da1ccd4da2cabeb6c8aeae72113bbaba622b440
+    initial_ast: 5ae730ffb3671acde08944aaa8450a54bb9ce436c92d5c21e7a2a7b9c8d404a7
+    imports_resolved_ast: 5ae730ffb3671acde08944aaa8450a54bb9ce436c92d5c21e7a2a7b9c8d404a7
+    canonicalized_ast: 5ae730ffb3671acde08944aaa8450a54bb9ce436c92d5c21e7a2a7b9c8d404a7
+    type_inferenced_ast: c2b15c1e0644a4af597019f7a56d1c8485723e43089ff0aa8951e3ec31729f1f
diff --git a/tests/expectations/compiler/compiler/array_without_size/type_alias.leo.out b/tests/expectations/compiler/compiler/array_without_size/type_alias.leo.out
index fda337a3b5..5e0c6d6871 100644
--- a/tests/expectations/compiler/compiler/array_without_size/type_alias.leo.out
+++ b/tests/expectations/compiler/compiler/array_without_size/type_alias.leo.out
@@ -16,7 +16,7 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: d6744be96fc8dbd32abfd290fa276a60c6a36d86ac991605af75f84d38bd913a
-    imports_resolved_ast: d6744be96fc8dbd32abfd290fa276a60c6a36d86ac991605af75f84d38bd913a
-    canonicalized_ast: e0c42db11f31a32f3ec40b4f6bd0109519408c530878ced2f7ce2e3729aefb8f
-    type_inferenced_ast: e4e14be0f8a9521b81f30d83e0258f8d84b5acf93563659f14da8f6aeefefc2a
+    initial_ast: 1695abb58931812bfe65ffdb967c9e8e36abbab771bfd8a20e289e3e1b102b5a
+    imports_resolved_ast: 1695abb58931812bfe65ffdb967c9e8e36abbab771bfd8a20e289e3e1b102b5a
+    canonicalized_ast: 637eaabe62c318b0c9f9d6d26936c11aa8804022866ce356e14dc02e29a34251
+    type_inferenced_ast: 1540899195a176d1b1d0e1d886a671f07f063dd10fea15f853e67ffcfc0ae9ce

From ab50d814733f7afb4dacaae8327a07aaaea37d55 Mon Sep 17 00:00:00 2001
From: damirka <damirka.ru@gmail.com>
Date: Fri, 3 Sep 2021 14:36:55 +0300
Subject: [PATCH 23/23] changes abnf grammar

---
 grammar/abnf-grammar.txt | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/grammar/abnf-grammar.txt b/grammar/abnf-grammar.txt
index 3786d3906a..fdca71e60c 100644
--- a/grammar/abnf-grammar.txt
+++ b/grammar/abnf-grammar.txt
@@ -678,8 +678,10 @@ tuple-type = "(" [ type 1*( "," type ) ] ")"
 
 array-type = "[" type ";" array-dimensions "]"
 
-array-dimensions = natural
-                 / "(" natural *( "," natural ) ")"
+array-dimension = natural / "_"
+
+array-dimensions = array-dimension
+                 / "(" array-dimension *( "," array-dimension ) ")"
 
 ; Scalar and the remaining types form all the types.