From 18bd03318f3c4649de0422adc3228b83642f1956 Mon Sep 17 00:00:00 2001
From: gluax <16431709+gluax@users.noreply.github.com>
Date: Mon, 2 May 2022 20:34:37 -0700
Subject: [PATCH] use input_file for each, as now inline input content is
 ignored

---
 tests/compiler/integers/i128/add.leo          | 10 +------
 .../compiler/integers/i128/console_assert.leo |  6 +---
 tests/compiler/integers/i128/div.leo          | 10 +------
 tests/compiler/integers/i128/eq.leo           | 10 +------
 tests/compiler/integers/i128/ge.leo           | 20 ++-----------
 tests/compiler/integers/i128/gt.leo           | 20 ++-----------
 tests/compiler/integers/i128/inputs/add.in    |  7 +++++
 tests/compiler/integers/i128/inputs/div.in    |  7 +++++
 tests/compiler/integers/i128/inputs/eq.in     |  7 +++++
 tests/compiler/integers/i128/inputs/ge.in     |  7 +++++
 tests/compiler/integers/i128/inputs/gt.in     |  7 +++++
 tests/compiler/integers/i128/inputs/le.in     |  7 +++++
 tests/compiler/integers/i128/inputs/lt.in     |  7 +++++
 tests/compiler/integers/i128/inputs/mul.in    |  7 +++++
 tests/compiler/integers/i128/inputs/ne.in     |  7 +++++
 tests/compiler/integers/i128/inputs/neg.in    |  6 ++++
 .../compiler/integers/i128/inputs/neg_rev.in  |  6 ++++
 tests/compiler/integers/i128/inputs/sub.in    |  7 +++++
 tests/compiler/integers/i128/inputs/tern.in   |  8 ++++++
 .../compiler/integers/i128/inputs/tern_rev.in |  8 ++++++
 tests/compiler/integers/i128/le.leo           | 20 ++-----------
 tests/compiler/integers/i128/lt.leo           | 20 ++-----------
 tests/compiler/integers/i128/mul.leo          | 10 ++-----
 tests/compiler/integers/i128/ne.leo           | 20 ++-----------
 tests/compiler/integers/i128/negate.leo       | 18 ++----------
 tests/compiler/integers/i128/negate_zero.leo  |  9 ++----
 tests/compiler/integers/i128/sub.leo          | 11 ++------
 tests/compiler/integers/i128/ternary.leo      | 22 ++-------------
 tests/compiler/integers/i16/add.leo           | 10 +------
 .../compiler/integers/i16/console_assert.leo  |  6 +---
 tests/compiler/integers/i16/div.leo           | 10 +------
 tests/compiler/integers/i16/eq.leo            | 10 +------
 tests/compiler/integers/i16/ge.leo            | 20 ++-----------
 tests/compiler/integers/i16/gt.leo            | 20 ++-----------
 tests/compiler/integers/i16/inputs/add.in     |  7 +++++
 tests/compiler/integers/i16/inputs/div.in     |  7 +++++
 tests/compiler/integers/i16/inputs/eq.in      |  7 +++++
 tests/compiler/integers/i16/inputs/ge.in      |  7 +++++
 tests/compiler/integers/i16/inputs/gt.in      |  7 +++++
 tests/compiler/integers/i16/inputs/le.in      |  7 +++++
 tests/compiler/integers/i16/inputs/lt.in      |  7 +++++
 tests/compiler/integers/i16/inputs/mul.in     |  7 +++++
 tests/compiler/integers/i16/inputs/ne.in      |  7 +++++
 tests/compiler/integers/i16/inputs/neg.in     |  6 ++++
 tests/compiler/integers/i16/inputs/neg_rev.in |  6 ++++
 tests/compiler/integers/i16/inputs/pow.in     |  7 +++++
 tests/compiler/integers/i16/inputs/sub.in     |  7 +++++
 tests/compiler/integers/i16/inputs/tern.in    |  8 ++++++
 .../compiler/integers/i16/inputs/tern_rev.in  |  8 ++++++
 tests/compiler/integers/i16/le.leo            | 20 ++-----------
 tests/compiler/integers/i16/lt.leo            | 20 ++-----------
 tests/compiler/integers/i16/mul.leo           | 10 ++-----
 tests/compiler/integers/i16/ne.leo            | 20 ++-----------
 tests/compiler/integers/i16/negate.leo        | 18 ++----------
 tests/compiler/integers/i16/negate_zero.leo   |  9 ++----
 tests/compiler/integers/i16/pow.leo           | 16 ++++-------
 tests/compiler/integers/i16/sub.leo           | 11 ++------
 tests/compiler/integers/i16/ternary.leo       | 22 ++-------------
 tests/compiler/integers/i32/add.leo           | 10 +------
 .../compiler/integers/i32/console_assert.leo  |  8 ++----
 tests/compiler/integers/i32/div.leo           | 10 +------
 tests/compiler/integers/i32/eq.leo            | 10 +------
 tests/compiler/integers/i32/ge.leo            | 20 ++-----------
 tests/compiler/integers/i32/gt.leo            | 20 ++-----------
 tests/compiler/integers/i32/inputs/add.in     |  7 +++++
 tests/compiler/integers/i32/inputs/div.in     |  7 +++++
 tests/compiler/integers/i32/inputs/eq.in      |  7 +++++
 tests/compiler/integers/i32/inputs/ge.in      |  7 +++++
 tests/compiler/integers/i32/inputs/gt.in      |  7 +++++
 tests/compiler/integers/i32/inputs/le.in      |  7 +++++
 tests/compiler/integers/i32/inputs/lt.in      |  7 +++++
 tests/compiler/integers/i32/inputs/mul.in     |  7 +++++
 tests/compiler/integers/i32/inputs/ne.in      |  7 +++++
 tests/compiler/integers/i32/inputs/neg.in     |  6 ++++
 tests/compiler/integers/i32/inputs/neg_rev.in |  6 ++++
 tests/compiler/integers/i32/inputs/sub.in     |  7 +++++
 tests/compiler/integers/i32/inputs/tern.in    |  8 ++++++
 .../compiler/integers/i32/inputs/tern_rev.in  |  8 ++++++
 tests/compiler/integers/i32/le.leo            | 20 ++-----------
 tests/compiler/integers/i32/lt.leo            | 20 ++-----------
 tests/compiler/integers/i32/mul.leo           | 10 ++-----
 tests/compiler/integers/i32/ne.leo            | 20 ++-----------
 tests/compiler/integers/i32/negate.leo        | 18 ++----------
 tests/compiler/integers/i32/negate_zero.leo   |  9 ++----
 tests/compiler/integers/i32/sub.leo           | 11 ++------
 tests/compiler/integers/i32/ternary.leo       | 22 ++-------------
 tests/compiler/integers/i64/add.leo           | 10 +------
 .../compiler/integers/i64/console_assert.leo  |  6 +---
 tests/compiler/integers/i64/div.leo           | 10 +------
 tests/compiler/integers/i64/eq.leo            | 10 +------
 tests/compiler/integers/i64/ge.leo            | 20 ++-----------
 tests/compiler/integers/i64/gt.leo            | 20 ++-----------
 tests/compiler/integers/i64/inputs/add.in     |  7 +++++
 tests/compiler/integers/i64/inputs/div.in     |  7 +++++
 tests/compiler/integers/i64/inputs/eq.in      |  7 +++++
 tests/compiler/integers/i64/inputs/ge.in      |  7 +++++
 tests/compiler/integers/i64/inputs/gt.in      |  7 +++++
 tests/compiler/integers/i64/inputs/le.in      |  7 +++++
 tests/compiler/integers/i64/inputs/lt.in      |  7 +++++
 tests/compiler/integers/i64/inputs/mul.in     |  7 +++++
 tests/compiler/integers/i64/inputs/ne.in      |  7 +++++
 tests/compiler/integers/i64/inputs/neg.in     |  6 ++++
 tests/compiler/integers/i64/inputs/neg_rev.in |  6 ++++
 tests/compiler/integers/i64/inputs/sub.in     |  7 +++++
 tests/compiler/integers/i64/inputs/tern.in    |  8 ++++++
 .../compiler/integers/i64/inputs/tern_rev.in  |  8 ++++++
 tests/compiler/integers/i64/le.leo            | 20 ++-----------
 tests/compiler/integers/i64/lt.leo            | 20 ++-----------
 tests/compiler/integers/i64/mul.leo           | 10 ++-----
 tests/compiler/integers/i64/ne.leo            | 20 ++-----------
 tests/compiler/integers/i64/negate.leo        | 18 ++----------
 tests/compiler/integers/i64/negate_zero.leo   |  9 ++----
 tests/compiler/integers/i64/sub.leo           | 11 ++------
 tests/compiler/integers/i64/ternary.leo       | 22 ++-------------
 tests/compiler/integers/i8/add.leo            | 10 +------
 tests/compiler/integers/i8/console_assert.leo |  8 ++----
 tests/compiler/integers/i8/div.leo            | 10 +------
 tests/compiler/integers/i8/eq.leo             | 10 +------
 tests/compiler/integers/i8/ge.leo             | 20 ++-----------
 tests/compiler/integers/i8/gt.leo             | 20 ++-----------
 tests/compiler/integers/i8/inputs/add.in      |  7 +++++
 tests/compiler/integers/i8/inputs/div.in      |  7 +++++
 tests/compiler/integers/i8/inputs/eq.in       |  7 +++++
 tests/compiler/integers/i8/inputs/ge.in       |  7 +++++
 tests/compiler/integers/i8/inputs/gt.in       |  7 +++++
 tests/compiler/integers/i8/inputs/le.in       |  7 +++++
 tests/compiler/integers/i8/inputs/lt.in       |  7 +++++
 tests/compiler/integers/i8/inputs/mul.in      |  7 +++++
 tests/compiler/integers/i8/inputs/ne.in       |  7 +++++
 tests/compiler/integers/i8/inputs/neg.in      |  6 ++++
 tests/compiler/integers/i8/inputs/neg_rev.in  |  6 ++++
 tests/compiler/integers/i8/inputs/pow.in      |  7 +++++
 tests/compiler/integers/i8/inputs/sub.in      |  7 +++++
 tests/compiler/integers/i8/inputs/tern.in     |  8 ++++++
 tests/compiler/integers/i8/inputs/tern_rev.in |  8 ++++++
 tests/compiler/integers/i8/le.leo             | 20 ++-----------
 tests/compiler/integers/i8/lt.leo             | 20 ++-----------
 tests/compiler/integers/i8/mul.leo            | 10 ++-----
 tests/compiler/integers/i8/ne.leo             | 20 ++-----------
 tests/compiler/integers/i8/negate.leo         | 18 ++----------
 tests/compiler/integers/i8/negate_zero.leo    |  9 ++----
 tests/compiler/integers/i8/pow.leo            | 16 ++++-------
 tests/compiler/integers/i8/sub.leo            | 11 ++------
 tests/compiler/integers/i8/ternary.leo        | 22 ++-------------
 tests/compiler/integers/u128/add.leo          | 10 +------
 .../compiler/integers/u128/console_assert.leo | 14 +++-------
 tests/compiler/integers/u128/div.leo          | 10 +------
 tests/compiler/integers/u128/eq.leo           | 18 +-----------
 tests/compiler/integers/u128/ge.leo           | 28 ++-----------------
 tests/compiler/integers/u128/gt.leo           | 24 +++-------------
 tests/compiler/integers/u128/input.leo        | 16 -----------
 tests/compiler/integers/u128/inputs/add.in    |  7 +++++
 tests/compiler/integers/u128/inputs/div.in    |  7 +++++
 tests/compiler/integers/u128/inputs/eq.in     |  7 +++++
 tests/compiler/integers/u128/inputs/ge.in     |  7 +++++
 tests/compiler/integers/u128/inputs/gt.in     |  7 +++++
 tests/compiler/integers/u128/inputs/le.in     |  7 +++++
 tests/compiler/integers/u128/inputs/lt.in     |  7 +++++
 tests/compiler/integers/u128/inputs/mul.in    |  7 +++++
 tests/compiler/integers/u128/inputs/ne.in     |  7 +++++
 tests/compiler/integers/u128/inputs/sub.in    |  7 +++++
 tests/compiler/integers/u128/inputs/tern.in   |  8 ++++++
 .../compiler/integers/u128/inputs/tern_rev.in |  8 ++++++
 tests/compiler/integers/u128/le.leo           | 28 ++-----------------
 tests/compiler/integers/u128/lt.leo           | 22 +++------------
 tests/compiler/integers/u128/mul.leo          | 12 ++------
 tests/compiler/integers/u128/ne.leo           | 14 +++-------
 tests/compiler/integers/u128/sub.leo          | 11 ++------
 tests/compiler/integers/u128/ternary.leo      | 22 ++-------------
 tests/compiler/integers/u16/add.leo           | 10 +------
 .../compiler/integers/u16/console_assert.leo  | 14 +++-------
 tests/compiler/integers/u16/div.leo           | 10 +------
 tests/compiler/integers/u16/eq.leo            | 18 +-----------
 tests/compiler/integers/u16/ge.leo            | 28 ++-----------------
 tests/compiler/integers/u16/gt.leo            | 24 +++-------------
 tests/compiler/integers/u16/input.leo         | 16 -----------
 tests/compiler/integers/u16/inputs/add.in     |  7 +++++
 tests/compiler/integers/u16/inputs/div.in     |  7 +++++
 tests/compiler/integers/u16/inputs/eq.in      |  7 +++++
 tests/compiler/integers/u16/inputs/ge.in      |  7 +++++
 tests/compiler/integers/u16/inputs/gt.in      |  7 +++++
 tests/compiler/integers/u16/inputs/le.in      |  7 +++++
 tests/compiler/integers/u16/inputs/lt.in      |  7 +++++
 tests/compiler/integers/u16/inputs/mul.in     |  7 +++++
 tests/compiler/integers/u16/inputs/ne.in      |  7 +++++
 tests/compiler/integers/u16/inputs/pow.in     |  7 +++++
 tests/compiler/integers/u16/inputs/sub.in     |  7 +++++
 tests/compiler/integers/u16/inputs/tern.in    |  8 ++++++
 .../compiler/integers/u16/inputs/tern_rev.in  |  8 ++++++
 tests/compiler/integers/u16/le.leo            | 28 ++-----------------
 tests/compiler/integers/u16/lt.leo            | 22 +++------------
 tests/compiler/integers/u16/mul.leo           | 12 ++------
 tests/compiler/integers/u16/ne.leo            | 14 +++-------
 tests/compiler/integers/u16/pow.leo           | 16 ++++-------
 tests/compiler/integers/u16/sub.leo           | 11 ++------
 tests/compiler/integers/u16/ternary.leo       | 22 ++-------------
 tests/compiler/integers/u32/add.leo           | 10 +------
 .../compiler/integers/u32/console_assert.leo  | 14 +++-------
 tests/compiler/integers/u32/div.leo           | 10 +------
 tests/compiler/integers/u32/eq.leo            | 18 +-----------
 tests/compiler/integers/u32/ge.leo            | 28 ++-----------------
 tests/compiler/integers/u32/gt.leo            | 24 +++-------------
 tests/compiler/integers/u32/input.leo         | 16 -----------
 tests/compiler/integers/u32/inputs/add.in     |  7 +++++
 tests/compiler/integers/u32/inputs/div.in     |  7 +++++
 tests/compiler/integers/u32/inputs/eq.in      |  7 +++++
 tests/compiler/integers/u32/inputs/ge.in      |  7 +++++
 tests/compiler/integers/u32/inputs/gt.in      |  7 +++++
 tests/compiler/integers/u32/inputs/le.in      |  7 +++++
 tests/compiler/integers/u32/inputs/lt.in      |  7 +++++
 tests/compiler/integers/u32/inputs/mul.in     |  7 +++++
 tests/compiler/integers/u32/inputs/ne.in      |  7 +++++
 tests/compiler/integers/u32/inputs/sub.in     |  7 +++++
 tests/compiler/integers/u32/inputs/tern.in    |  8 ++++++
 .../compiler/integers/u32/inputs/tern_rev.in  |  8 ++++++
 tests/compiler/integers/u32/le.leo            | 28 ++-----------------
 tests/compiler/integers/u32/lt.leo            | 22 +++------------
 tests/compiler/integers/u32/mul.leo           | 12 ++------
 tests/compiler/integers/u32/ne.leo            | 14 +++-------
 tests/compiler/integers/u32/sub.leo           | 11 ++------
 tests/compiler/integers/u32/ternary.leo       | 22 ++-------------
 tests/compiler/integers/u64/add.leo           | 10 +------
 .../compiler/integers/u64/console_assert.leo  | 14 +++-------
 tests/compiler/integers/u64/div.leo           | 10 +------
 tests/compiler/integers/u64/eq.leo            | 18 +-----------
 tests/compiler/integers/u64/ge.leo            | 28 ++-----------------
 tests/compiler/integers/u64/gt.leo            | 24 +++-------------
 tests/compiler/integers/u64/input.leo         | 16 -----------
 tests/compiler/integers/u64/inputs/add.in     |  7 +++++
 tests/compiler/integers/u64/inputs/div.in     |  7 +++++
 tests/compiler/integers/u64/inputs/eq.in      |  7 +++++
 tests/compiler/integers/u64/inputs/ge.in      |  7 +++++
 tests/compiler/integers/u64/inputs/gt.in      |  7 +++++
 tests/compiler/integers/u64/inputs/le.in      |  7 +++++
 tests/compiler/integers/u64/inputs/lt.in      |  7 +++++
 tests/compiler/integers/u64/inputs/mul.in     |  7 +++++
 tests/compiler/integers/u64/inputs/ne.in      |  7 +++++
 tests/compiler/integers/u64/inputs/sub.in     |  7 +++++
 tests/compiler/integers/u64/inputs/tern.in    |  8 ++++++
 .../compiler/integers/u64/inputs/tern_rev.in  |  8 ++++++
 tests/compiler/integers/u64/le.leo            | 28 ++-----------------
 tests/compiler/integers/u64/lt.leo            | 22 +++------------
 tests/compiler/integers/u64/mul.leo           | 12 ++------
 tests/compiler/integers/u64/ne.leo            | 14 +++-------
 tests/compiler/integers/u64/sub.leo           | 11 ++------
 tests/compiler/integers/u64/ternary.leo       | 22 ++-------------
 tests/compiler/integers/u8/add.leo            | 10 +------
 tests/compiler/integers/u8/console_assert.leo | 14 +++-------
 tests/compiler/integers/u8/div.leo            | 10 +------
 tests/compiler/integers/u8/eq.leo             | 18 +-----------
 tests/compiler/integers/u8/ge.leo             | 28 ++-----------------
 tests/compiler/integers/u8/gt.leo             | 24 +++-------------
 tests/compiler/integers/u8/input.leo          | 16 -----------
 tests/compiler/integers/u8/inputs/add.in      |  7 +++++
 tests/compiler/integers/u8/inputs/div.in      |  7 +++++
 tests/compiler/integers/u8/inputs/eq.in       |  7 +++++
 tests/compiler/integers/u8/inputs/ge.in       |  7 +++++
 tests/compiler/integers/u8/inputs/gt.in       |  7 +++++
 tests/compiler/integers/u8/inputs/le.in       |  7 +++++
 tests/compiler/integers/u8/inputs/lt.in       |  7 +++++
 tests/compiler/integers/u8/inputs/mul.in      |  7 +++++
 tests/compiler/integers/u8/inputs/ne.in       |  7 +++++
 tests/compiler/integers/u8/inputs/pow.in      |  7 +++++
 tests/compiler/integers/u8/inputs/sub.in      |  7 +++++
 tests/compiler/integers/u8/inputs/tern.in     |  8 ++++++
 tests/compiler/integers/u8/inputs/tern_rev.in |  8 ++++++
 tests/compiler/integers/u8/le.leo             | 28 ++-----------------
 tests/compiler/integers/u8/lt.leo             | 22 +++------------
 tests/compiler/integers/u8/mul.leo            | 12 ++------
 tests/compiler/integers/u8/ne.leo             | 14 +++-------
 tests/compiler/integers/u8/pow.leo            | 16 ++++-------
 tests/compiler/integers/u8/sub.leo            | 11 ++------
 tests/compiler/integers/u8/ternary.leo        | 22 ++-------------
 .../compiler/integers/i128/add.leo.out        |  4 ++-
 .../integers/i128/console_assert.leo.out      |  4 ++-
 .../compiler/integers/i128/div.leo.out        |  4 ++-
 .../compiler/integers/i128/eq.leo.out         |  4 ++-
 .../compiler/integers/i16/add.leo.out         |  4 ++-
 .../integers/i16/console_assert.leo.out       |  4 ++-
 .../compiler/integers/i16/div.leo.out         |  4 ++-
 .../compiler/compiler/integers/i16/eq.leo.out |  4 ++-
 .../compiler/integers/i16/pow.leo.out         |  8 ++++++
 .../compiler/integers/i32/add.leo.out         |  4 ++-
 .../integers/i32/console_assert.leo.out       |  6 ++--
 .../compiler/integers/i32/div.leo.out         |  4 ++-
 .../compiler/compiler/integers/i32/eq.leo.out |  4 ++-
 .../compiler/integers/i64/add.leo.out         |  4 ++-
 .../integers/i64/console_assert.leo.out       |  4 ++-
 .../compiler/integers/i64/div.leo.out         |  4 ++-
 .../compiler/compiler/integers/i64/eq.leo.out |  4 ++-
 .../compiler/compiler/integers/i8/add.leo.out |  4 ++-
 .../integers/i8/console_assert.leo.out        |  4 ++-
 .../compiler/compiler/integers/i8/div.leo.out |  4 ++-
 .../compiler/compiler/integers/i8/eq.leo.out  |  4 ++-
 .../compiler/compiler/integers/i8/pow.leo.out |  8 ++++++
 .../compiler/integers/u128/add.leo.out        |  4 ++-
 .../integers/u128/console_assert.leo.out      |  6 ++--
 .../compiler/integers/u128/div.leo.out        |  4 ++-
 .../compiler/integers/u128/eq.leo.out         |  4 ++-
 .../compiler/integers/u128/gt.leo.out         |  2 +-
 .../compiler/integers/u128/input.leo.out      |  6 ----
 .../compiler/integers/u128/lt.leo.out         |  2 +-
 .../compiler/integers/u128/ne.leo.out         |  2 +-
 .../compiler/integers/u16/add.leo.out         |  4 ++-
 .../integers/u16/console_assert.leo.out       |  6 ++--
 .../compiler/integers/u16/div.leo.out         |  4 ++-
 .../compiler/compiler/integers/u16/eq.leo.out |  4 ++-
 .../compiler/compiler/integers/u16/gt.leo.out |  2 +-
 .../compiler/integers/u16/input.leo.out       |  6 ----
 .../compiler/compiler/integers/u16/lt.leo.out |  2 +-
 .../compiler/compiler/integers/u16/ne.leo.out |  2 +-
 .../compiler/integers/u16/pow.leo.out         |  8 ++++++
 .../compiler/integers/u32/add.leo.out         |  4 ++-
 .../integers/u32/console_assert.leo.out       |  6 ++--
 .../compiler/integers/u32/div.leo.out         |  4 ++-
 .../compiler/compiler/integers/u32/eq.leo.out |  4 ++-
 .../compiler/compiler/integers/u32/gt.leo.out |  2 +-
 .../compiler/integers/u32/input.leo.out       |  6 ----
 .../compiler/compiler/integers/u32/lt.leo.out |  2 +-
 .../compiler/compiler/integers/u32/ne.leo.out |  2 +-
 .../compiler/integers/u64/add.leo.out         |  4 ++-
 .../integers/u64/console_assert.leo.out       |  6 ++--
 .../compiler/integers/u64/div.leo.out         |  4 ++-
 .../compiler/compiler/integers/u64/eq.leo.out |  4 ++-
 .../compiler/compiler/integers/u64/gt.leo.out |  2 +-
 .../compiler/integers/u64/input.leo.out       |  6 ----
 .../compiler/compiler/integers/u64/lt.leo.out |  2 +-
 .../compiler/compiler/integers/u64/ne.leo.out |  2 +-
 .../compiler/compiler/integers/u8/add.leo.out |  4 ++-
 .../integers/u8/console_assert.leo.out        |  6 ++--
 .../compiler/compiler/integers/u8/div.leo.out |  4 ++-
 .../compiler/compiler/integers/u8/eq.leo.out  |  4 ++-
 .../compiler/compiler/integers/u8/gt.leo.out  |  2 +-
 .../compiler/integers/u8/input.leo.out        |  6 ----
 .../compiler/compiler/integers/u8/lt.leo.out  |  2 +-
 .../compiler/compiler/integers/u8/ne.leo.out  |  2 +-
 .../compiler/compiler/integers/u8/pow.leo.out |  8 ++++++
 337 files changed, 1463 insertions(+), 1992 deletions(-)
 create mode 100644 tests/compiler/integers/i128/inputs/add.in
 create mode 100644 tests/compiler/integers/i128/inputs/div.in
 create mode 100644 tests/compiler/integers/i128/inputs/eq.in
 create mode 100644 tests/compiler/integers/i128/inputs/ge.in
 create mode 100644 tests/compiler/integers/i128/inputs/gt.in
 create mode 100644 tests/compiler/integers/i128/inputs/le.in
 create mode 100644 tests/compiler/integers/i128/inputs/lt.in
 create mode 100644 tests/compiler/integers/i128/inputs/mul.in
 create mode 100644 tests/compiler/integers/i128/inputs/ne.in
 create mode 100644 tests/compiler/integers/i128/inputs/neg.in
 create mode 100644 tests/compiler/integers/i128/inputs/neg_rev.in
 create mode 100644 tests/compiler/integers/i128/inputs/sub.in
 create mode 100644 tests/compiler/integers/i128/inputs/tern.in
 create mode 100644 tests/compiler/integers/i128/inputs/tern_rev.in
 create mode 100644 tests/compiler/integers/i16/inputs/add.in
 create mode 100644 tests/compiler/integers/i16/inputs/div.in
 create mode 100644 tests/compiler/integers/i16/inputs/eq.in
 create mode 100644 tests/compiler/integers/i16/inputs/ge.in
 create mode 100644 tests/compiler/integers/i16/inputs/gt.in
 create mode 100644 tests/compiler/integers/i16/inputs/le.in
 create mode 100644 tests/compiler/integers/i16/inputs/lt.in
 create mode 100644 tests/compiler/integers/i16/inputs/mul.in
 create mode 100644 tests/compiler/integers/i16/inputs/ne.in
 create mode 100644 tests/compiler/integers/i16/inputs/neg.in
 create mode 100644 tests/compiler/integers/i16/inputs/neg_rev.in
 create mode 100644 tests/compiler/integers/i16/inputs/pow.in
 create mode 100644 tests/compiler/integers/i16/inputs/sub.in
 create mode 100644 tests/compiler/integers/i16/inputs/tern.in
 create mode 100644 tests/compiler/integers/i16/inputs/tern_rev.in
 create mode 100644 tests/compiler/integers/i32/inputs/add.in
 create mode 100644 tests/compiler/integers/i32/inputs/div.in
 create mode 100644 tests/compiler/integers/i32/inputs/eq.in
 create mode 100644 tests/compiler/integers/i32/inputs/ge.in
 create mode 100644 tests/compiler/integers/i32/inputs/gt.in
 create mode 100644 tests/compiler/integers/i32/inputs/le.in
 create mode 100644 tests/compiler/integers/i32/inputs/lt.in
 create mode 100644 tests/compiler/integers/i32/inputs/mul.in
 create mode 100644 tests/compiler/integers/i32/inputs/ne.in
 create mode 100644 tests/compiler/integers/i32/inputs/neg.in
 create mode 100644 tests/compiler/integers/i32/inputs/neg_rev.in
 create mode 100644 tests/compiler/integers/i32/inputs/sub.in
 create mode 100644 tests/compiler/integers/i32/inputs/tern.in
 create mode 100644 tests/compiler/integers/i32/inputs/tern_rev.in
 create mode 100644 tests/compiler/integers/i64/inputs/add.in
 create mode 100644 tests/compiler/integers/i64/inputs/div.in
 create mode 100644 tests/compiler/integers/i64/inputs/eq.in
 create mode 100644 tests/compiler/integers/i64/inputs/ge.in
 create mode 100644 tests/compiler/integers/i64/inputs/gt.in
 create mode 100644 tests/compiler/integers/i64/inputs/le.in
 create mode 100644 tests/compiler/integers/i64/inputs/lt.in
 create mode 100644 tests/compiler/integers/i64/inputs/mul.in
 create mode 100644 tests/compiler/integers/i64/inputs/ne.in
 create mode 100644 tests/compiler/integers/i64/inputs/neg.in
 create mode 100644 tests/compiler/integers/i64/inputs/neg_rev.in
 create mode 100644 tests/compiler/integers/i64/inputs/sub.in
 create mode 100644 tests/compiler/integers/i64/inputs/tern.in
 create mode 100644 tests/compiler/integers/i64/inputs/tern_rev.in
 create mode 100644 tests/compiler/integers/i8/inputs/add.in
 create mode 100644 tests/compiler/integers/i8/inputs/div.in
 create mode 100644 tests/compiler/integers/i8/inputs/eq.in
 create mode 100644 tests/compiler/integers/i8/inputs/ge.in
 create mode 100644 tests/compiler/integers/i8/inputs/gt.in
 create mode 100644 tests/compiler/integers/i8/inputs/le.in
 create mode 100644 tests/compiler/integers/i8/inputs/lt.in
 create mode 100644 tests/compiler/integers/i8/inputs/mul.in
 create mode 100644 tests/compiler/integers/i8/inputs/ne.in
 create mode 100644 tests/compiler/integers/i8/inputs/neg.in
 create mode 100644 tests/compiler/integers/i8/inputs/neg_rev.in
 create mode 100644 tests/compiler/integers/i8/inputs/pow.in
 create mode 100644 tests/compiler/integers/i8/inputs/sub.in
 create mode 100644 tests/compiler/integers/i8/inputs/tern.in
 create mode 100644 tests/compiler/integers/i8/inputs/tern_rev.in
 delete mode 100644 tests/compiler/integers/u128/input.leo
 create mode 100644 tests/compiler/integers/u128/inputs/add.in
 create mode 100644 tests/compiler/integers/u128/inputs/div.in
 create mode 100644 tests/compiler/integers/u128/inputs/eq.in
 create mode 100644 tests/compiler/integers/u128/inputs/ge.in
 create mode 100644 tests/compiler/integers/u128/inputs/gt.in
 create mode 100644 tests/compiler/integers/u128/inputs/le.in
 create mode 100644 tests/compiler/integers/u128/inputs/lt.in
 create mode 100644 tests/compiler/integers/u128/inputs/mul.in
 create mode 100644 tests/compiler/integers/u128/inputs/ne.in
 create mode 100644 tests/compiler/integers/u128/inputs/sub.in
 create mode 100644 tests/compiler/integers/u128/inputs/tern.in
 create mode 100644 tests/compiler/integers/u128/inputs/tern_rev.in
 delete mode 100644 tests/compiler/integers/u16/input.leo
 create mode 100644 tests/compiler/integers/u16/inputs/add.in
 create mode 100644 tests/compiler/integers/u16/inputs/div.in
 create mode 100644 tests/compiler/integers/u16/inputs/eq.in
 create mode 100644 tests/compiler/integers/u16/inputs/ge.in
 create mode 100644 tests/compiler/integers/u16/inputs/gt.in
 create mode 100644 tests/compiler/integers/u16/inputs/le.in
 create mode 100644 tests/compiler/integers/u16/inputs/lt.in
 create mode 100644 tests/compiler/integers/u16/inputs/mul.in
 create mode 100644 tests/compiler/integers/u16/inputs/ne.in
 create mode 100644 tests/compiler/integers/u16/inputs/pow.in
 create mode 100644 tests/compiler/integers/u16/inputs/sub.in
 create mode 100644 tests/compiler/integers/u16/inputs/tern.in
 create mode 100644 tests/compiler/integers/u16/inputs/tern_rev.in
 delete mode 100644 tests/compiler/integers/u32/input.leo
 create mode 100644 tests/compiler/integers/u32/inputs/add.in
 create mode 100644 tests/compiler/integers/u32/inputs/div.in
 create mode 100644 tests/compiler/integers/u32/inputs/eq.in
 create mode 100644 tests/compiler/integers/u32/inputs/ge.in
 create mode 100644 tests/compiler/integers/u32/inputs/gt.in
 create mode 100644 tests/compiler/integers/u32/inputs/le.in
 create mode 100644 tests/compiler/integers/u32/inputs/lt.in
 create mode 100644 tests/compiler/integers/u32/inputs/mul.in
 create mode 100644 tests/compiler/integers/u32/inputs/ne.in
 create mode 100644 tests/compiler/integers/u32/inputs/sub.in
 create mode 100644 tests/compiler/integers/u32/inputs/tern.in
 create mode 100644 tests/compiler/integers/u32/inputs/tern_rev.in
 delete mode 100644 tests/compiler/integers/u64/input.leo
 create mode 100644 tests/compiler/integers/u64/inputs/add.in
 create mode 100644 tests/compiler/integers/u64/inputs/div.in
 create mode 100644 tests/compiler/integers/u64/inputs/eq.in
 create mode 100644 tests/compiler/integers/u64/inputs/ge.in
 create mode 100644 tests/compiler/integers/u64/inputs/gt.in
 create mode 100644 tests/compiler/integers/u64/inputs/le.in
 create mode 100644 tests/compiler/integers/u64/inputs/lt.in
 create mode 100644 tests/compiler/integers/u64/inputs/mul.in
 create mode 100644 tests/compiler/integers/u64/inputs/ne.in
 create mode 100644 tests/compiler/integers/u64/inputs/sub.in
 create mode 100644 tests/compiler/integers/u64/inputs/tern.in
 create mode 100644 tests/compiler/integers/u64/inputs/tern_rev.in
 delete mode 100644 tests/compiler/integers/u8/input.leo
 create mode 100644 tests/compiler/integers/u8/inputs/add.in
 create mode 100644 tests/compiler/integers/u8/inputs/div.in
 create mode 100644 tests/compiler/integers/u8/inputs/eq.in
 create mode 100644 tests/compiler/integers/u8/inputs/ge.in
 create mode 100644 tests/compiler/integers/u8/inputs/gt.in
 create mode 100644 tests/compiler/integers/u8/inputs/le.in
 create mode 100644 tests/compiler/integers/u8/inputs/lt.in
 create mode 100644 tests/compiler/integers/u8/inputs/mul.in
 create mode 100644 tests/compiler/integers/u8/inputs/ne.in
 create mode 100644 tests/compiler/integers/u8/inputs/pow.in
 create mode 100644 tests/compiler/integers/u8/inputs/sub.in
 create mode 100644 tests/compiler/integers/u8/inputs/tern.in
 create mode 100644 tests/compiler/integers/u8/inputs/tern_rev.in
 create mode 100644 tests/expectations/compiler/compiler/integers/i16/pow.leo.out
 create mode 100644 tests/expectations/compiler/compiler/integers/i8/pow.leo.out
 delete mode 100644 tests/expectations/compiler/compiler/integers/u128/input.leo.out
 delete mode 100644 tests/expectations/compiler/compiler/integers/u16/input.leo.out
 create mode 100644 tests/expectations/compiler/compiler/integers/u16/pow.leo.out
 delete mode 100644 tests/expectations/compiler/compiler/integers/u32/input.leo.out
 delete mode 100644 tests/expectations/compiler/compiler/integers/u64/input.leo.out
 delete mode 100644 tests/expectations/compiler/compiler/integers/u8/input.leo.out
 create mode 100644 tests/expectations/compiler/compiler/integers/u8/pow.leo.out

diff --git a/tests/compiler/integers/i128/add.leo b/tests/compiler/integers/i128/add.leo
index 591661dbb9..b851405a65 100644
--- a/tests/compiler/integers/i128/add.leo
+++ b/tests/compiler/integers/i128/add.leo
@@ -1,15 +1,7 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - i128.in: |
-    [main]
-    a: i128 = 1;
-    b: i128 = 2;
-    c: i128 = 3;
-    
-    [registers]
-    r0: bool = true;
+input_file: inputs/add.in
 */
 
 function main(a: i128, b: i128, c: i128) -> bool {
diff --git a/tests/compiler/integers/i128/console_assert.leo b/tests/compiler/integers/i128/console_assert.leo
index effa1974cd..d4ff8be862 100644
--- a/tests/compiler/integers/i128/console_assert.leo
+++ b/tests/compiler/integers/i128/console_assert.leo
@@ -1,11 +1,7 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - i128.in: |
-    [main]
-    a: i128 = 1;
-    b: i128 = 1;
+input_file: inputs/eq.in
 */
 
 function main(a: i128, b: i128) -> bool {
diff --git a/tests/compiler/integers/i128/div.leo b/tests/compiler/integers/i128/div.leo
index d7055f3eda..beb98b14d5 100644
--- a/tests/compiler/integers/i128/div.leo
+++ b/tests/compiler/integers/i128/div.leo
@@ -1,15 +1,7 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - i128.in: |
-    [main]
-    a: i128 = 4;
-    b: i128 = 2;
-    c: i128 = 2;
-    
-    [registers]
-    r0: bool = true;
+input_file: inputs/div.in
 */
 
 function main(a: i128, b: i128, c: i128) -> bool {
diff --git a/tests/compiler/integers/i128/eq.leo b/tests/compiler/integers/i128/eq.leo
index 22cc373cca..476eee9391 100644
--- a/tests/compiler/integers/i128/eq.leo
+++ b/tests/compiler/integers/i128/eq.leo
@@ -1,15 +1,7 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - i128.in: |
-    [main]
-    a: i128 = 2;
-    b: i128 = 2;
-    c: bool = true;
-
-    [registers]
-    r0: bool = true;
+input_file: inputs/eq.in
 */
 
 function main(a: i128, b: i128, c: bool) -> bool {
diff --git a/tests/compiler/integers/i128/ge.leo b/tests/compiler/integers/i128/ge.leo
index ae5c4aeb0f..4ca888e060 100644
--- a/tests/compiler/integers/i128/ge.leo
+++ b/tests/compiler/integers/i128/ge.leo
@@ -1,23 +1,9 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - i128_e.in: |
-    [main]
-    a: i128 = 4;
-    b: i128 = 4;
-    c: bool = true;
-    
-    [registers]
-    r0: bool = true;
- - i128_g.in: |
-    [main]
-    a: i128 = 5;
-    b: i128 = 4;
-    c: bool = true;
-    
-    [registers]
-    r0: bool = true;
+input_file:
+ - inputs/eq.in
+ - inputs/ge.in
 */
 
 function main(a: i128, b: i128, c: bool) -> bool {
diff --git a/tests/compiler/integers/i128/gt.leo b/tests/compiler/integers/i128/gt.leo
index 8c862646d2..27e5f97f34 100644
--- a/tests/compiler/integers/i128/gt.leo
+++ b/tests/compiler/integers/i128/gt.leo
@@ -1,23 +1,9 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - i128_g.in: |
-    [main]
-    a: i128 = 4;
-    b: i128 = 2;
-    c: bool = true;
-
-    [registers]
-    r0: bool = true;
- - i128_e.in: |
-    [main]
-    a: i128 = 4;
-    b: i128 = 4;
-    c: bool = false;
-    
-    [registers]
-    r0: bool = false;
+input_file:
+ - inputs/eq.in
+ - inputs/gt.in
 */
 
 function main(a: i128, b: i128, c: bool) -> bool {
diff --git a/tests/compiler/integers/i128/inputs/add.in b/tests/compiler/integers/i128/inputs/add.in
new file mode 100644
index 0000000000..471af05763
--- /dev/null
+++ b/tests/compiler/integers/i128/inputs/add.in
@@ -0,0 +1,7 @@
+[main]
+a: i128 = 1i128;
+b: i128 = 2i128;
+c: i128 = 3i128;
+
+[registers]
+r0: bool = true;
\ No newline at end of file
diff --git a/tests/compiler/integers/i128/inputs/div.in b/tests/compiler/integers/i128/inputs/div.in
new file mode 100644
index 0000000000..a55d640616
--- /dev/null
+++ b/tests/compiler/integers/i128/inputs/div.in
@@ -0,0 +1,7 @@
+[main]
+a: i128 = 4i128;
+b: i128 = 2i128;
+c: i128 = 2i128;
+
+[registers]
+r0: bool = true;
\ No newline at end of file
diff --git a/tests/compiler/integers/i128/inputs/eq.in b/tests/compiler/integers/i128/inputs/eq.in
new file mode 100644
index 0000000000..0623ceb397
--- /dev/null
+++ b/tests/compiler/integers/i128/inputs/eq.in
@@ -0,0 +1,7 @@
+[main]
+a: i128 = 2i128;
+b: i128 = 2i128;
+c: bool = true;
+
+[registers]
+r0: bool = true;
\ No newline at end of file
diff --git a/tests/compiler/integers/i128/inputs/ge.in b/tests/compiler/integers/i128/inputs/ge.in
new file mode 100644
index 0000000000..0218ea7d2f
--- /dev/null
+++ b/tests/compiler/integers/i128/inputs/ge.in
@@ -0,0 +1,7 @@
+[main]
+a: i128 = 5i128;
+b: i128 = 4i128;
+c: bool = true;
+
+[registers]
+r0: bool = true;
\ No newline at end of file
diff --git a/tests/compiler/integers/i128/inputs/gt.in b/tests/compiler/integers/i128/inputs/gt.in
new file mode 100644
index 0000000000..facb1f9f6c
--- /dev/null
+++ b/tests/compiler/integers/i128/inputs/gt.in
@@ -0,0 +1,7 @@
+[main]
+a: i128 = 4i128;
+b: i128 = 2i128;
+c: bool = true;
+
+[registers]
+r0: bool = true;
\ No newline at end of file
diff --git a/tests/compiler/integers/i128/inputs/le.in b/tests/compiler/integers/i128/inputs/le.in
new file mode 100644
index 0000000000..018f78ecdb
--- /dev/null
+++ b/tests/compiler/integers/i128/inputs/le.in
@@ -0,0 +1,7 @@
+[main]
+a: i128 = 1i128;
+b: i128 = 100i128;
+c: bool = true;
+
+[registers]
+r0: bool = true;
\ No newline at end of file
diff --git a/tests/compiler/integers/i128/inputs/lt.in b/tests/compiler/integers/i128/inputs/lt.in
new file mode 100644
index 0000000000..80f050fa82
--- /dev/null
+++ b/tests/compiler/integers/i128/inputs/lt.in
@@ -0,0 +1,7 @@
+[main]
+a: i128 = 2i128;
+b: i128 = 4i128;
+c: bool = true;
+
+[registers]
+r0: bool = false;
\ No newline at end of file
diff --git a/tests/compiler/integers/i128/inputs/mul.in b/tests/compiler/integers/i128/inputs/mul.in
new file mode 100644
index 0000000000..d9ff754a7b
--- /dev/null
+++ b/tests/compiler/integers/i128/inputs/mul.in
@@ -0,0 +1,7 @@
+[main]
+a: i128 = 2i128;
+b: i128 = 5i128;
+c: i128 = 10i128;
+
+[registers]
+r0: bool = false;
\ No newline at end of file
diff --git a/tests/compiler/integers/i128/inputs/ne.in b/tests/compiler/integers/i128/inputs/ne.in
new file mode 100644
index 0000000000..366c740a10
--- /dev/null
+++ b/tests/compiler/integers/i128/inputs/ne.in
@@ -0,0 +1,7 @@
+[main]
+a: i128 = 2i128;
+b: i128 = 5i128;
+c: bool = true;
+
+[registers]
+r0: bool = false;
\ No newline at end of file
diff --git a/tests/compiler/integers/i128/inputs/neg.in b/tests/compiler/integers/i128/inputs/neg.in
new file mode 100644
index 0000000000..60679b7e38
--- /dev/null
+++ b/tests/compiler/integers/i128/inputs/neg.in
@@ -0,0 +1,6 @@
+[main]
+a: i128 = 5i128;
+b: i128 = -5i128;
+
+[registers]
+r0: bool = false;
\ No newline at end of file
diff --git a/tests/compiler/integers/i128/inputs/neg_rev.in b/tests/compiler/integers/i128/inputs/neg_rev.in
new file mode 100644
index 0000000000..9a17bfb3f9
--- /dev/null
+++ b/tests/compiler/integers/i128/inputs/neg_rev.in
@@ -0,0 +1,6 @@
+[main]
+a: i128 = -5i128;
+b: i128 = 5i128;
+
+[registers]
+r0: bool = false;
\ No newline at end of file
diff --git a/tests/compiler/integers/i128/inputs/sub.in b/tests/compiler/integers/i128/inputs/sub.in
new file mode 100644
index 0000000000..4beec323cd
--- /dev/null
+++ b/tests/compiler/integers/i128/inputs/sub.in
@@ -0,0 +1,7 @@
+[main]
+a: i128 = 100i128;
+b: i128 = 50i128;
+c: i128 = 50i128;
+
+[registers]
+r0: bool = false;
\ No newline at end of file
diff --git a/tests/compiler/integers/i128/inputs/tern.in b/tests/compiler/integers/i128/inputs/tern.in
new file mode 100644
index 0000000000..72d3959830
--- /dev/null
+++ b/tests/compiler/integers/i128/inputs/tern.in
@@ -0,0 +1,8 @@
+[main]
+s: bool = true;
+a: i128 = 10i128;
+b: i128 = 5i128;
+c: i128 = 10i128;
+
+[registers]
+r0: bool = false;
\ No newline at end of file
diff --git a/tests/compiler/integers/i128/inputs/tern_rev.in b/tests/compiler/integers/i128/inputs/tern_rev.in
new file mode 100644
index 0000000000..a91ef9b11e
--- /dev/null
+++ b/tests/compiler/integers/i128/inputs/tern_rev.in
@@ -0,0 +1,8 @@
+[main]
+s: bool = false;
+a: i128 = 10i128;
+b: i128 = 5i128;
+c: i128 = 5i128;
+
+[registers]
+r0: bool = false;
\ No newline at end of file
diff --git a/tests/compiler/integers/i128/le.leo b/tests/compiler/integers/i128/le.leo
index 5fec5c1b8d..78213537b6 100644
--- a/tests/compiler/integers/i128/le.leo
+++ b/tests/compiler/integers/i128/le.leo
@@ -1,23 +1,9 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - i128_l.in: |
-    [main]
-    a: i128 = 1;
-    b: i128 = 100;
-    c: bool = true;
-    
-    [registers]
-    r0: bool = true;
- - i128_e.in: |
-    [main]
-    a: i128 = 2;
-    b: i128 = 2;
-    c: bool = true;
-    
-    [registers]
-    r0: bool = true;
+input_file:
+ - inputs/eq.in
+ - inputs/le.in
 */
 
 function main(a: i128, b: i128, c: bool) -> bool {
diff --git a/tests/compiler/integers/i128/lt.leo b/tests/compiler/integers/i128/lt.leo
index 2ee95b0d29..655bc448f6 100644
--- a/tests/compiler/integers/i128/lt.leo
+++ b/tests/compiler/integers/i128/lt.leo
@@ -1,23 +1,9 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - i128_l.in: |
-    [main]
-    a: i128 = 2;
-    b: i128 = 4;
-    c: bool = true;
-
-    [registers]
-    r0: bool = false;
- - i128_e.in: |
-    [main]
-    a: i128 = 2;
-    b: i128 = 2;
-    c: bool = false;
-
-    [registers]
-    r0: bool = false;
+input_file:
+ - inputs/eq.in
+ - inputs/lt.in
 */
 
 function main(a: i128, b: i128, c: bool) -> bool{
diff --git a/tests/compiler/integers/i128/mul.leo b/tests/compiler/integers/i128/mul.leo
index 1626521ed0..4727a76304 100644
--- a/tests/compiler/integers/i128/mul.leo
+++ b/tests/compiler/integers/i128/mul.leo
@@ -1,15 +1,9 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - i128.in: |
-    [main]
-    a: i128 = 2;
-    b: i128 = 5;
-    c: i128 = 10;
+input_file:
+ - inputs/mul.in
     
-    [registers]
-    r0: bool = false;
 */
 
 function main(a: i128, b: i128, c: i128) -> bool {
diff --git a/tests/compiler/integers/i128/ne.leo b/tests/compiler/integers/i128/ne.leo
index 626cb7dc27..d5a07672a9 100644
--- a/tests/compiler/integers/i128/ne.leo
+++ b/tests/compiler/integers/i128/ne.leo
@@ -1,23 +1,9 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - i128_ne.in: |
-    [main]
-    a: i128 = 2;
-    b: i128 = 5;
-    c: bool = true;
-
-    [registers]
-    r0: bool = false;
- - i128_e.in: |
-    [main]
-    a: i128 = 5;
-    b: i128 = 5;
-    c: bool = false;
-
-    [registers]
-    r0: bool = false;
+input_file:
+ - inputs/eq.in
+ - inputs/ne.in
 */
 
 function main(a: i128, b: i128, c: bool) -> bool{
diff --git a/tests/compiler/integers/i128/negate.leo b/tests/compiler/integers/i128/negate.leo
index b336b8df32..b7691a900d 100644
--- a/tests/compiler/integers/i128/negate.leo
+++ b/tests/compiler/integers/i128/negate.leo
@@ -1,21 +1,9 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - i128.in: |
-    [main]
-    a: i128 = 5;
-    b: i128 = -5;
-
-    [registers]
-    r0: bool = false;
- - i128.in: |
-    [main]
-    a: i128 = -5;
-    b: i128 = 5;
-
-    [registers]
-    r0: bool = false;
+input_file:
+ - inputs/neg.in
+ - inputs/neg_rev.in
 */
 
 function main(a: i128, b: i128) -> bool {
diff --git a/tests/compiler/integers/i128/negate_zero.leo b/tests/compiler/integers/i128/negate_zero.leo
index 99e197db07..2141798012 100644
--- a/tests/compiler/integers/i128/negate_zero.leo
+++ b/tests/compiler/integers/i128/negate_zero.leo
@@ -1,13 +1,8 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - dummy.in: |
-    [main]
-    y: bool = true;
-
-    [registers]
-    r0: bool = false;
+input_file:
+ - ../input/dummy.in
 */
 
 function main(y: bool) -> bool {
diff --git a/tests/compiler/integers/i128/sub.leo b/tests/compiler/integers/i128/sub.leo
index 8254d82fa8..e11db1e927 100644
--- a/tests/compiler/integers/i128/sub.leo
+++ b/tests/compiler/integers/i128/sub.leo
@@ -1,15 +1,8 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - i128.in: |
-    [main]
-    a: i128 = 100;
-    b: i128 = 50;
-    c: i128 = 50;
-    
-    [registers]
-    r0: bool = false;
+input_file:
+ - inputs/sub.in
 */
 
 function main(a: i128, b: i128, c: i128) -> bool {
diff --git a/tests/compiler/integers/i128/ternary.leo b/tests/compiler/integers/i128/ternary.leo
index f85c6475ee..859c665f4d 100644
--- a/tests/compiler/integers/i128/ternary.leo
+++ b/tests/compiler/integers/i128/ternary.leo
@@ -1,25 +1,9 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - i128.in: |
-    [main]
-    s: bool = true;
-    a: i128 = 10i128;
-    b: i128 = 5i128;
-    c: i128 = 10i128;
-
-    [registers]
-    r0: bool = false;
- - i128_rev.in: |
-    [main]
-    s: bool = false;
-    a: i128 = 10i128;
-    b: i128 = 5i128;
-    c: i128 = 5i128;
-
-    [registers]
-    r0: bool = false;
+input_file:
+ - inputs/tern.in
+ - inputs/tern_rev.in
 */
 
 function main(s: bool, a: i128, b: i128, c: i128) -> bool {
diff --git a/tests/compiler/integers/i16/add.leo b/tests/compiler/integers/i16/add.leo
index 361d2c4fb8..f7a9800b13 100644
--- a/tests/compiler/integers/i16/add.leo
+++ b/tests/compiler/integers/i16/add.leo
@@ -1,15 +1,7 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - i16.in: |
-    [main]
-    a: i16 = 1;
-    b: i16 = 2;
-    c: i16 = 3;
-    
-    [registers]
-    r0: bool = true;
+input_file: inputs/add.in
 */
 
 function main(a: i16, b: i16, c: i16) -> bool {
diff --git a/tests/compiler/integers/i16/console_assert.leo b/tests/compiler/integers/i16/console_assert.leo
index 932a76be92..a5d407d88f 100644
--- a/tests/compiler/integers/i16/console_assert.leo
+++ b/tests/compiler/integers/i16/console_assert.leo
@@ -1,11 +1,7 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - i16.in: |
-    [main]
-    a: i16 = 1i16;
-    b: i16 = 1i16;
+input_file: inputs/eq.in
 */
 
 function main(a: i16, b: i16) -> bool {
diff --git a/tests/compiler/integers/i16/div.leo b/tests/compiler/integers/i16/div.leo
index 3cd78a3967..73bfdb362f 100644
--- a/tests/compiler/integers/i16/div.leo
+++ b/tests/compiler/integers/i16/div.leo
@@ -1,15 +1,7 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - i16.in: |
-    [main]
-    a: i16 = 4;
-    b: i16 = 2;
-    c: i16 = 2;
-    
-    [registers]
-    r0: bool = true;
+input_file: inputs/div.in
 */
 
 function main(a: i16, b: i16, c: i16) -> bool {
diff --git a/tests/compiler/integers/i16/eq.leo b/tests/compiler/integers/i16/eq.leo
index 32fd8636f4..34666793ef 100644
--- a/tests/compiler/integers/i16/eq.leo
+++ b/tests/compiler/integers/i16/eq.leo
@@ -1,15 +1,7 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - i16.in: |
-    [main]
-    a: i16 = 2;
-    b: i16 = 2;
-    c: bool = true;
-
-    [registers]
-    r0: bool = true;
+input_file: inputs/eq.in
 */
 
 function main(a: i16, b: i16, c: bool) -> bool {
diff --git a/tests/compiler/integers/i16/ge.leo b/tests/compiler/integers/i16/ge.leo
index f9864e3183..af397e4ae4 100644
--- a/tests/compiler/integers/i16/ge.leo
+++ b/tests/compiler/integers/i16/ge.leo
@@ -1,23 +1,9 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - i16_e.in: |
-    [main]
-    a: i16 = 4;
-    b: i16 = 4;
-    c: bool = true;
-    
-    [registers]
-    r0: bool = true;
- - i16_g.in: |
-    [main]
-    a: i16 = 5;
-    b: i16 = 4;
-    c: bool = true;
-    
-    [registers]
-    r0: bool = true;
+input_file:
+ - inputs/eq.in
+ - inputs/ge.in
 */
 
 function main(a: i16, b: i16, c: bool) -> bool {
diff --git a/tests/compiler/integers/i16/gt.leo b/tests/compiler/integers/i16/gt.leo
index 05959cf697..04828fa68c 100644
--- a/tests/compiler/integers/i16/gt.leo
+++ b/tests/compiler/integers/i16/gt.leo
@@ -1,23 +1,9 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - i16_g.in: |
-    [main]
-    a: i16 = 4;
-    b: i16 = 2;
-    c: bool = true;
-
-    [registers]
-    r0: bool = true;
- - i16_e.in: |
-    [main]
-    a: i16 = 4;
-    b: i16 = 4;
-    c: bool = false;
-    
-    [registers]
-    r0: bool = false;
+input_file:
+ - inputs/eq.in
+ - inputs/gt.in
 */
 
 function main(a: i16, b: i16, c: bool) -> bool {
diff --git a/tests/compiler/integers/i16/inputs/add.in b/tests/compiler/integers/i16/inputs/add.in
new file mode 100644
index 0000000000..6359d36d08
--- /dev/null
+++ b/tests/compiler/integers/i16/inputs/add.in
@@ -0,0 +1,7 @@
+[main]
+a: i16 = 1i16;
+b: i16 = 2i16;
+c: i16 = 3i16;
+
+[registers]
+r0: bool = true;
\ No newline at end of file
diff --git a/tests/compiler/integers/i16/inputs/div.in b/tests/compiler/integers/i16/inputs/div.in
new file mode 100644
index 0000000000..c30368d509
--- /dev/null
+++ b/tests/compiler/integers/i16/inputs/div.in
@@ -0,0 +1,7 @@
+[main]
+a: i16 = 4i16;
+b: i16 = 2i16;
+c: i16 = 2i16;
+
+[registers]
+r0: bool = true;
\ No newline at end of file
diff --git a/tests/compiler/integers/i16/inputs/eq.in b/tests/compiler/integers/i16/inputs/eq.in
new file mode 100644
index 0000000000..4914f2865c
--- /dev/null
+++ b/tests/compiler/integers/i16/inputs/eq.in
@@ -0,0 +1,7 @@
+[main]
+a: i16 = 2i16;
+b: i16 = 2i16;
+c: bool = true;
+
+[registers]
+r0: bool = true;
\ No newline at end of file
diff --git a/tests/compiler/integers/i16/inputs/ge.in b/tests/compiler/integers/i16/inputs/ge.in
new file mode 100644
index 0000000000..bb9216847c
--- /dev/null
+++ b/tests/compiler/integers/i16/inputs/ge.in
@@ -0,0 +1,7 @@
+[main]
+a: i16 = 5i16;
+b: i16 = 4i16;
+c: bool = true;
+
+[registers]
+r0: bool = true;
\ No newline at end of file
diff --git a/tests/compiler/integers/i16/inputs/gt.in b/tests/compiler/integers/i16/inputs/gt.in
new file mode 100644
index 0000000000..0578308125
--- /dev/null
+++ b/tests/compiler/integers/i16/inputs/gt.in
@@ -0,0 +1,7 @@
+[main]
+a: i16 = 4i16;
+b: i16 = 2i16;
+c: bool = true;
+
+[registers]
+r0: bool = true;
\ No newline at end of file
diff --git a/tests/compiler/integers/i16/inputs/le.in b/tests/compiler/integers/i16/inputs/le.in
new file mode 100644
index 0000000000..3c11438b08
--- /dev/null
+++ b/tests/compiler/integers/i16/inputs/le.in
@@ -0,0 +1,7 @@
+[main]
+a: i16 = 1i16;
+b: i16 = 100i16;
+c: bool = true;
+
+[registers]
+r0: bool = true;
\ No newline at end of file
diff --git a/tests/compiler/integers/i16/inputs/lt.in b/tests/compiler/integers/i16/inputs/lt.in
new file mode 100644
index 0000000000..aea74445ff
--- /dev/null
+++ b/tests/compiler/integers/i16/inputs/lt.in
@@ -0,0 +1,7 @@
+[main]
+a: i16 = 2i16;
+b: i16 = 4i16;
+c: bool = true;
+
+[registers]
+r0: bool = false;
\ No newline at end of file
diff --git a/tests/compiler/integers/i16/inputs/mul.in b/tests/compiler/integers/i16/inputs/mul.in
new file mode 100644
index 0000000000..c5006e82b3
--- /dev/null
+++ b/tests/compiler/integers/i16/inputs/mul.in
@@ -0,0 +1,7 @@
+[main]
+a: i16 = 2i16;
+b: i16 = 5i16;
+c: i16 = 10i16;
+
+[registers]
+r0: bool = false;
\ No newline at end of file
diff --git a/tests/compiler/integers/i16/inputs/ne.in b/tests/compiler/integers/i16/inputs/ne.in
new file mode 100644
index 0000000000..85764e23a1
--- /dev/null
+++ b/tests/compiler/integers/i16/inputs/ne.in
@@ -0,0 +1,7 @@
+[main]
+a: i16 = 2i16;
+b: i16 = 5i16;
+c: bool = true;
+
+[registers]
+r0: bool = false;
\ No newline at end of file
diff --git a/tests/compiler/integers/i16/inputs/neg.in b/tests/compiler/integers/i16/inputs/neg.in
new file mode 100644
index 0000000000..1d981b12c6
--- /dev/null
+++ b/tests/compiler/integers/i16/inputs/neg.in
@@ -0,0 +1,6 @@
+[main]
+a: i16 = 5i16;
+b: i16 = -5i16;
+
+[registers]
+r0: bool = false;
\ No newline at end of file
diff --git a/tests/compiler/integers/i16/inputs/neg_rev.in b/tests/compiler/integers/i16/inputs/neg_rev.in
new file mode 100644
index 0000000000..4d86943ed1
--- /dev/null
+++ b/tests/compiler/integers/i16/inputs/neg_rev.in
@@ -0,0 +1,6 @@
+[main]
+a: i16 = -5i16;
+b: i16 = 5i16;
+
+[registers]
+r0: bool = false;
\ No newline at end of file
diff --git a/tests/compiler/integers/i16/inputs/pow.in b/tests/compiler/integers/i16/inputs/pow.in
new file mode 100644
index 0000000000..74cca2abe8
--- /dev/null
+++ b/tests/compiler/integers/i16/inputs/pow.in
@@ -0,0 +1,7 @@
+[main]
+a: i16 = 2i16;
+b: i16 = 2i16;
+c: i16 = 4i16;
+
+[registers]
+r0: bool = true;
\ No newline at end of file
diff --git a/tests/compiler/integers/i16/inputs/sub.in b/tests/compiler/integers/i16/inputs/sub.in
new file mode 100644
index 0000000000..06e976f009
--- /dev/null
+++ b/tests/compiler/integers/i16/inputs/sub.in
@@ -0,0 +1,7 @@
+[main]
+a: i16 = 100i16;
+b: i16 = 50i16;
+c: i16 = 50i16;
+
+[registers]
+r0: bool = false;
\ No newline at end of file
diff --git a/tests/compiler/integers/i16/inputs/tern.in b/tests/compiler/integers/i16/inputs/tern.in
new file mode 100644
index 0000000000..2ae4f59474
--- /dev/null
+++ b/tests/compiler/integers/i16/inputs/tern.in
@@ -0,0 +1,8 @@
+[main]
+s: bool = true;
+a: i16 = 10i16;
+b: i16 = 5i16;
+c: i16 = 10i16;
+
+[registers]
+r0: bool = false;
\ No newline at end of file
diff --git a/tests/compiler/integers/i16/inputs/tern_rev.in b/tests/compiler/integers/i16/inputs/tern_rev.in
new file mode 100644
index 0000000000..727b2be6a3
--- /dev/null
+++ b/tests/compiler/integers/i16/inputs/tern_rev.in
@@ -0,0 +1,8 @@
+[main]
+s: bool = false;
+a: i16 = 10i16;
+b: i16 = 5i16;
+c: i16 = 5i16;
+
+[registers]
+r0: bool = false;
\ No newline at end of file
diff --git a/tests/compiler/integers/i16/le.leo b/tests/compiler/integers/i16/le.leo
index e6a5bb20e7..1112aa898c 100644
--- a/tests/compiler/integers/i16/le.leo
+++ b/tests/compiler/integers/i16/le.leo
@@ -1,23 +1,9 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - i16_l.in: |
-    [main]
-    a: i16 = 1;
-    b: i16 = 100;
-    c: bool = true;
-    
-    [registers]
-    r0: bool = true;
- - i16_e.in: |
-    [main]
-    a: i16 = 2;
-    b: i16 = 2;
-    c: bool = true;
-    
-    [registers]
-    r0: bool = true;
+input_file:
+ - inputs/eq.in
+ - inputs/le.in
 */
 
 function main(a: i16, b: i16, c: bool) -> bool {
diff --git a/tests/compiler/integers/i16/lt.leo b/tests/compiler/integers/i16/lt.leo
index 93955f1e70..6173828a9b 100644
--- a/tests/compiler/integers/i16/lt.leo
+++ b/tests/compiler/integers/i16/lt.leo
@@ -1,23 +1,9 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - i16_l.in: |
-    [main]
-    a: i16 = 2;
-    b: i16 = 4;
-    c: bool = true;
-
-    [registers]
-    r0: bool = false;
- - i16_e.in: |
-    [main]
-    a: i16 = 2;
-    b: i16 = 2;
-    c: bool = false;
-
-    [registers]
-    r0: bool = false;
+input_file:
+ - inputs/eq.in
+ - inputs/lt.in
 */
 
 function main(a: i16, b: i16, c: bool) -> bool{
diff --git a/tests/compiler/integers/i16/mul.leo b/tests/compiler/integers/i16/mul.leo
index a5f551040d..0659e685d5 100644
--- a/tests/compiler/integers/i16/mul.leo
+++ b/tests/compiler/integers/i16/mul.leo
@@ -1,15 +1,9 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - i16.in: |
-    [main]
-    a: i16 = 2;
-    b: i16 = 5;
-    c: i16 = 10;
+input_file:
+ - inputs/mul.in
     
-    [registers]
-    r0: bool = false;
 */
 
 function main(a: i16, b: i16, c: i16) -> bool {
diff --git a/tests/compiler/integers/i16/ne.leo b/tests/compiler/integers/i16/ne.leo
index 9d1d3ed5b4..f3807e3c41 100644
--- a/tests/compiler/integers/i16/ne.leo
+++ b/tests/compiler/integers/i16/ne.leo
@@ -1,23 +1,9 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - i16_ne.in: |
-    [main]
-    a: i16 = 2;
-    b: i16 = 5;
-    c: bool = true;
-
-    [registers]
-    r0: bool = false;
- - i16_e.in: |
-    [main]
-    a: i16 = 5;
-    b: i16 = 5;
-    c: bool = false;
-
-    [registers]
-    r0: bool = false;
+input_file:
+ - inputs/eq.in
+ - inputs/ne.in
 */
 
 function main(a: i16, b: i16, c: bool) -> bool{
diff --git a/tests/compiler/integers/i16/negate.leo b/tests/compiler/integers/i16/negate.leo
index c7af1058e8..0eb30b9ae7 100644
--- a/tests/compiler/integers/i16/negate.leo
+++ b/tests/compiler/integers/i16/negate.leo
@@ -1,21 +1,9 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - i16.in: |
-    [main]
-    a: i16 = 5;
-    b: i16 = -5;
-
-    [registers]
-    r0: bool = false;
- - i16.in: |
-    [main]
-    a: i16 = -5;
-    b: i16 = 5;
-
-    [registers]
-    r0: bool = false;
+input_file:
+ - inputs/neg.in
+ - inputs/neg_rev.in
 */
 
 function main(a: i16, b: i16) -> bool {
diff --git a/tests/compiler/integers/i16/negate_zero.leo b/tests/compiler/integers/i16/negate_zero.leo
index 48c6e805d6..eb13d912be 100644
--- a/tests/compiler/integers/i16/negate_zero.leo
+++ b/tests/compiler/integers/i16/negate_zero.leo
@@ -1,13 +1,8 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - dummy.in: |
-    [main]
-    y: bool = true;
-
-    [registers]
-    r0: bool = false;
+input_file:
+ - ../input/dummy.in
 */
 
 function main(y: bool) -> bool {
diff --git a/tests/compiler/integers/i16/pow.leo b/tests/compiler/integers/i16/pow.leo
index 7ba70d87a1..6076e64601 100644
--- a/tests/compiler/integers/i16/pow.leo
+++ b/tests/compiler/integers/i16/pow.leo
@@ -1,14 +1,8 @@
-// namespace: Compile
-// expectation: Pass
-// inputs:
-//  - i16.in: |
-//     [main]
-//     a: i16 = 2;
-//     b: i16 = 2;
-//     c: i16 = 4;
-    
-//     [registers]
-//     r0: bool = true;
+/*
+namespace: Compile
+expectation: Pass
+input_file: inputs/pow.in
+*/
 
 function main(a: i16, b: i16, c: i16) -> bool {
     return a ** b == c;
diff --git a/tests/compiler/integers/i16/sub.leo b/tests/compiler/integers/i16/sub.leo
index db6b3f1aab..963df05ddb 100644
--- a/tests/compiler/integers/i16/sub.leo
+++ b/tests/compiler/integers/i16/sub.leo
@@ -1,15 +1,8 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - i16.in: |
-    [main]
-    a: i16 = 100;
-    b: i16 = 50;
-    c: i16 = 50;
-    
-    [registers]
-    r0: bool = false;
+input_file:
+ - inputs/sub.in
 */
 
 function main(a: i16, b: i16, c: i16) -> bool {
diff --git a/tests/compiler/integers/i16/ternary.leo b/tests/compiler/integers/i16/ternary.leo
index c6db2258ed..5ba2cabf35 100644
--- a/tests/compiler/integers/i16/ternary.leo
+++ b/tests/compiler/integers/i16/ternary.leo
@@ -1,25 +1,9 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - i16.in: |
-    [main]
-    s: bool = true;
-    a: i16 = 10i16;
-    b: i16 = 5i16;
-    c: i16 = 10i16;
-
-    [registers]
-    r0: bool = false;
- - i16_rev.in: |
-    [main]
-    s: bool = false;
-    a: i16 = 10i16;
-    b: i16 = 5i16;
-    c: i16 = 5i16;
-
-    [registers]
-    r0: bool = false;
+input_file:
+ - inputs/tern.in
+ - inputs/tern_rev.in
 */
 
 function main(s: bool, a: i16, b: i16, c: i16) -> bool {
diff --git a/tests/compiler/integers/i32/add.leo b/tests/compiler/integers/i32/add.leo
index f824f1cf08..4368f2e64a 100644
--- a/tests/compiler/integers/i32/add.leo
+++ b/tests/compiler/integers/i32/add.leo
@@ -1,15 +1,7 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - i32.in: |
-    [main]
-    a: i32 = 1;
-    b: i32 = 2;
-    c: i32 = 3;
-    
-    [registers]
-    r0: bool = true;
+input_file: inputs/add.in
 */
 
 function main(a: i32, b: i32, c: i32) -> bool {
diff --git a/tests/compiler/integers/i32/console_assert.leo b/tests/compiler/integers/i32/console_assert.leo
index baccef6758..46ff9acd94 100644
--- a/tests/compiler/integers/i32/console_assert.leo
+++ b/tests/compiler/integers/i32/console_assert.leo
@@ -1,14 +1,10 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - i32.in: |
-    [main]
-    a: i32 = 1i32;
-    b: i32 = 1i32;
+input_file: inputs/eq.in
 */
 
-function main(a: i32, b: i32) -> i32 {
+function main(a: i32, b: i32) -> bool {
     let ret: bool = a == b;
     console.assert(ret);
     return ret;
diff --git a/tests/compiler/integers/i32/div.leo b/tests/compiler/integers/i32/div.leo
index 2ad70c95f8..a9876eaa5c 100644
--- a/tests/compiler/integers/i32/div.leo
+++ b/tests/compiler/integers/i32/div.leo
@@ -1,15 +1,7 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - i32.in: |
-    [main]
-    a: i32 = 4;
-    b: i32 = 2;
-    c: i32 = 2;
-    
-    [registers]
-    r0: bool = true;
+input_file: inputs/div.in
 */
 
 function main(a: i32, b: i32, c: i32) -> bool {
diff --git a/tests/compiler/integers/i32/eq.leo b/tests/compiler/integers/i32/eq.leo
index 7f5b36d261..0e88dd635d 100644
--- a/tests/compiler/integers/i32/eq.leo
+++ b/tests/compiler/integers/i32/eq.leo
@@ -1,15 +1,7 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - i32.in: |
-    [main]
-    a: i32 = 2;
-    b: i32 = 2;
-    c: bool = true;
-
-    [registers]
-    r0: bool = true;
+input_file: inputs/eq.in
 */
 
 function main(a: i32, b: i32, c: bool) -> bool {
diff --git a/tests/compiler/integers/i32/ge.leo b/tests/compiler/integers/i32/ge.leo
index 39843f508e..5763dcf6f5 100644
--- a/tests/compiler/integers/i32/ge.leo
+++ b/tests/compiler/integers/i32/ge.leo
@@ -1,23 +1,9 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - i32_e.in: |
-    [main]
-    a: i32 = 4;
-    b: i32 = 4;
-    c: bool = true;
-    
-    [registers]
-    r0: bool = true;
- - i32_g.in: |
-    [main]
-    a: i32 = 5;
-    b: i32 = 4;
-    c: bool = true;
-    
-    [registers]
-    r0: bool = true;
+input_file:
+ - inputs/eq.in
+ - inputs/ge.in
 */
 
 function main(a: i32, b: i32, c: bool) -> bool {
diff --git a/tests/compiler/integers/i32/gt.leo b/tests/compiler/integers/i32/gt.leo
index c27c45b393..a2142b04bd 100644
--- a/tests/compiler/integers/i32/gt.leo
+++ b/tests/compiler/integers/i32/gt.leo
@@ -1,23 +1,9 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - i32_g.in: |
-    [main]
-    a: i32 = 4;
-    b: i32 = 2;
-    c: bool = true;
-
-    [registers]
-    r0: bool = true;
- - i32_e.in: |
-    [main]
-    a: i32 = 4;
-    b: i32 = 4;
-    c: bool = false;
-    
-    [registers]
-    r0: bool = false;
+input_file:
+ - inputs/eq.in
+ - inputs/gt.in
 */
 
 function main(a: i32, b: i32, c: bool) -> bool {
diff --git a/tests/compiler/integers/i32/inputs/add.in b/tests/compiler/integers/i32/inputs/add.in
new file mode 100644
index 0000000000..45118ad443
--- /dev/null
+++ b/tests/compiler/integers/i32/inputs/add.in
@@ -0,0 +1,7 @@
+[main]
+a: i32 = 1i32;
+b: i32 = 2i32;
+c: i32 = 3i32;
+
+[registers]
+r0: bool = true;
\ No newline at end of file
diff --git a/tests/compiler/integers/i32/inputs/div.in b/tests/compiler/integers/i32/inputs/div.in
new file mode 100644
index 0000000000..b9061d49c2
--- /dev/null
+++ b/tests/compiler/integers/i32/inputs/div.in
@@ -0,0 +1,7 @@
+[main]
+a: i32 = 4i32;
+b: i32 = 2i32;
+c: i32 = 2i32;
+
+[registers]
+r0: bool = true;
\ No newline at end of file
diff --git a/tests/compiler/integers/i32/inputs/eq.in b/tests/compiler/integers/i32/inputs/eq.in
new file mode 100644
index 0000000000..201437f19f
--- /dev/null
+++ b/tests/compiler/integers/i32/inputs/eq.in
@@ -0,0 +1,7 @@
+[main]
+a: i32 = 2i32;
+b: i32 = 2i32;
+c: bool = true;
+
+[registers]
+r0: bool = true;
\ No newline at end of file
diff --git a/tests/compiler/integers/i32/inputs/ge.in b/tests/compiler/integers/i32/inputs/ge.in
new file mode 100644
index 0000000000..fc111215ae
--- /dev/null
+++ b/tests/compiler/integers/i32/inputs/ge.in
@@ -0,0 +1,7 @@
+[main]
+a: i32 = 5i32;
+b: i32 = 4i32;
+c: bool = true;
+
+[registers]
+r0: bool = true;
\ No newline at end of file
diff --git a/tests/compiler/integers/i32/inputs/gt.in b/tests/compiler/integers/i32/inputs/gt.in
new file mode 100644
index 0000000000..afec89ba23
--- /dev/null
+++ b/tests/compiler/integers/i32/inputs/gt.in
@@ -0,0 +1,7 @@
+[main]
+a: i32 = 4i32;
+b: i32 = 2i32;
+c: bool = true;
+
+[registers]
+r0: bool = true;
\ No newline at end of file
diff --git a/tests/compiler/integers/i32/inputs/le.in b/tests/compiler/integers/i32/inputs/le.in
new file mode 100644
index 0000000000..871b461bcb
--- /dev/null
+++ b/tests/compiler/integers/i32/inputs/le.in
@@ -0,0 +1,7 @@
+[main]
+a: i32 = 1i32;
+b: i32 = 100i32;
+c: bool = true;
+
+[registers]
+r0: bool = true;
\ No newline at end of file
diff --git a/tests/compiler/integers/i32/inputs/lt.in b/tests/compiler/integers/i32/inputs/lt.in
new file mode 100644
index 0000000000..48200532e4
--- /dev/null
+++ b/tests/compiler/integers/i32/inputs/lt.in
@@ -0,0 +1,7 @@
+[main]
+a: i32 = 2i32;
+b: i32 = 4i32;
+c: bool = true;
+
+[registers]
+r0: bool = false;
\ No newline at end of file
diff --git a/tests/compiler/integers/i32/inputs/mul.in b/tests/compiler/integers/i32/inputs/mul.in
new file mode 100644
index 0000000000..5193b9550f
--- /dev/null
+++ b/tests/compiler/integers/i32/inputs/mul.in
@@ -0,0 +1,7 @@
+[main]
+a: i32 = 2i32;
+b: i32 = 5i32;
+c: i32 = 10i32;
+
+[registers]
+r0: bool = false;
\ No newline at end of file
diff --git a/tests/compiler/integers/i32/inputs/ne.in b/tests/compiler/integers/i32/inputs/ne.in
new file mode 100644
index 0000000000..4fd8ff862a
--- /dev/null
+++ b/tests/compiler/integers/i32/inputs/ne.in
@@ -0,0 +1,7 @@
+[main]
+a: i32 = 2i32;
+b: i32 = 5i32;
+c: bool = true;
+
+[registers]
+r0: bool = false;
\ No newline at end of file
diff --git a/tests/compiler/integers/i32/inputs/neg.in b/tests/compiler/integers/i32/inputs/neg.in
new file mode 100644
index 0000000000..4dcbfb7823
--- /dev/null
+++ b/tests/compiler/integers/i32/inputs/neg.in
@@ -0,0 +1,6 @@
+[main]
+a: i32 = 5i32;
+b: i32 = -5i32;
+
+[registers]
+r0: bool = false;
\ No newline at end of file
diff --git a/tests/compiler/integers/i32/inputs/neg_rev.in b/tests/compiler/integers/i32/inputs/neg_rev.in
new file mode 100644
index 0000000000..332cf30b1c
--- /dev/null
+++ b/tests/compiler/integers/i32/inputs/neg_rev.in
@@ -0,0 +1,6 @@
+[main]
+a: i32 = -5i32;
+b: i32 = 5i32;
+
+[registers]
+r0: bool = false;
\ No newline at end of file
diff --git a/tests/compiler/integers/i32/inputs/sub.in b/tests/compiler/integers/i32/inputs/sub.in
new file mode 100644
index 0000000000..1af7b9c836
--- /dev/null
+++ b/tests/compiler/integers/i32/inputs/sub.in
@@ -0,0 +1,7 @@
+[main]
+a: i32 = 100i32;
+b: i32 = 50i32;
+c: i32 = 50i32;
+
+[registers]
+r0: bool = false;
\ No newline at end of file
diff --git a/tests/compiler/integers/i32/inputs/tern.in b/tests/compiler/integers/i32/inputs/tern.in
new file mode 100644
index 0000000000..d5a3655551
--- /dev/null
+++ b/tests/compiler/integers/i32/inputs/tern.in
@@ -0,0 +1,8 @@
+[main]
+s: bool = true;
+a: i32 = 10i32;
+b: i32 = 5i32;
+c: i32 = 10i32;
+
+[registers]
+r0: bool = false;
\ No newline at end of file
diff --git a/tests/compiler/integers/i32/inputs/tern_rev.in b/tests/compiler/integers/i32/inputs/tern_rev.in
new file mode 100644
index 0000000000..ac63093274
--- /dev/null
+++ b/tests/compiler/integers/i32/inputs/tern_rev.in
@@ -0,0 +1,8 @@
+[main]
+s: bool = false;
+a: i32 = 10i32;
+b: i32 = 5i32;
+c: i32 = 5i32;
+
+[registers]
+r0: bool = false;
\ No newline at end of file
diff --git a/tests/compiler/integers/i32/le.leo b/tests/compiler/integers/i32/le.leo
index 4c3fd6b6e0..094e183d4c 100644
--- a/tests/compiler/integers/i32/le.leo
+++ b/tests/compiler/integers/i32/le.leo
@@ -1,23 +1,9 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - i32_l.in: |
-    [main]
-    a: i32 = 1;
-    b: i32 = 100;
-    c: bool = true;
-    
-    [registers]
-    r0: bool = true;
- - i32_e.in: |
-    [main]
-    a: i32 = 2;
-    b: i32 = 2;
-    c: bool = true;
-    
-    [registers]
-    r0: bool = true;
+input_file:
+ - inputs/eq.in
+ - inputs/le.in
 */
 
 function main(a: i32, b: i32, c: bool) -> bool {
diff --git a/tests/compiler/integers/i32/lt.leo b/tests/compiler/integers/i32/lt.leo
index 16a2e8383d..2a6aac3e1f 100644
--- a/tests/compiler/integers/i32/lt.leo
+++ b/tests/compiler/integers/i32/lt.leo
@@ -1,23 +1,9 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - i32_l.in: |
-    [main]
-    a: i32 = 2;
-    b: i32 = 4;
-    c: bool = true;
-
-    [registers]
-    r0: bool = false;
- - i32_e.in: |
-    [main]
-    a: i32 = 2;
-    b: i32 = 2;
-    c: bool = false;
-
-    [registers]
-    r0: bool = false;
+input_file:
+ - inputs/eq.in
+ - inputs/lt.in
 */
 
 function main(a: i32, b: i32, c: bool) -> bool{
diff --git a/tests/compiler/integers/i32/mul.leo b/tests/compiler/integers/i32/mul.leo
index ce66848f09..aef850eb45 100644
--- a/tests/compiler/integers/i32/mul.leo
+++ b/tests/compiler/integers/i32/mul.leo
@@ -1,15 +1,9 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - i32.in: |
-    [main]
-    a: i32 = 2;
-    b: i32 = 5;
-    c: i32 = 10;
+input_file:
+ - inputs/mul.in
     
-    [registers]
-    r0: bool = false;
 */
 
 function main(a: i32, b: i32, c: i32) -> bool {
diff --git a/tests/compiler/integers/i32/ne.leo b/tests/compiler/integers/i32/ne.leo
index 502ca22281..d2cb170af7 100644
--- a/tests/compiler/integers/i32/ne.leo
+++ b/tests/compiler/integers/i32/ne.leo
@@ -1,23 +1,9 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - i32_ne.in: |
-    [main]
-    a: i32 = 2;
-    b: i32 = 5;
-    c: bool = true;
-
-    [registers]
-    r0: bool = false;
- - i32_e.in: |
-    [main]
-    a: i32 = 5;
-    b: i32 = 5;
-    c: bool = false;
-
-    [registers]
-    r0: bool = false;
+input_file:
+ - inputs/eq.in
+ - inputs/ne.in
 */
 
 function main(a: i32, b: i32, c: bool) -> bool{
diff --git a/tests/compiler/integers/i32/negate.leo b/tests/compiler/integers/i32/negate.leo
index 2aee276336..783777d3c5 100644
--- a/tests/compiler/integers/i32/negate.leo
+++ b/tests/compiler/integers/i32/negate.leo
@@ -1,21 +1,9 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - i32.in: |
-    [main]
-    a: i32 = 5;
-    b: i32 = -5;
-
-    [registers]
-    r0: bool = false;
- - i32.in: |
-    [main]
-    a: i32 = -5;
-    b: i32 = 5;
-
-    [registers]
-    r0: bool = false;
+input_file:
+ - inputs/neg.in
+ - inputs/neg_rev.in
 */
 
 function main(a: i32, b: i32) -> bool {
diff --git a/tests/compiler/integers/i32/negate_zero.leo b/tests/compiler/integers/i32/negate_zero.leo
index 1cff56e904..df505768d8 100644
--- a/tests/compiler/integers/i32/negate_zero.leo
+++ b/tests/compiler/integers/i32/negate_zero.leo
@@ -1,13 +1,8 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - dummy.in: |
-    [main]
-    y: bool = true;
-
-    [registers]
-    r0: bool = false;
+input_file:
+ - ../input/dummy.in
 */
 
 function main(y: bool) -> bool {
diff --git a/tests/compiler/integers/i32/sub.leo b/tests/compiler/integers/i32/sub.leo
index cf554eba72..f3ba6e1d20 100644
--- a/tests/compiler/integers/i32/sub.leo
+++ b/tests/compiler/integers/i32/sub.leo
@@ -1,15 +1,8 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - i32.in: |
-    [main]
-    a: i32 = 100;
-    b: i32 = 50;
-    c: i32 = 50;
-    
-    [registers]
-    r0: bool = false;
+input_file:
+ - inputs/sub.in
 */
 
 function main(a: i32, b: i32, c: i32) -> bool {
diff --git a/tests/compiler/integers/i32/ternary.leo b/tests/compiler/integers/i32/ternary.leo
index 4334d7077e..ef3a93e2d3 100644
--- a/tests/compiler/integers/i32/ternary.leo
+++ b/tests/compiler/integers/i32/ternary.leo
@@ -1,25 +1,9 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - i32.in: |
-    [main]
-    s: bool = true;
-    a: i32 = 10i32;
-    b: i32 = 5i32;
-    c: i32 = 10i32;
-
-    [registers]
-    r0: bool = false;
- - i32_rev.in: |
-    [main]
-    s: bool = false;
-    a: i32 = 10i32;
-    b: i32 = 5i32;
-    c: i32 = 5i32;
-
-    [registers]
-    r0: bool = false;
+input_file:
+ - inputs/tern.in
+ - inputs/tern_rev.in
 */
 
 function main(s: bool, a: i32, b: i32, c: i32) -> bool {
diff --git a/tests/compiler/integers/i64/add.leo b/tests/compiler/integers/i64/add.leo
index beee775605..c418a1a544 100644
--- a/tests/compiler/integers/i64/add.leo
+++ b/tests/compiler/integers/i64/add.leo
@@ -1,15 +1,7 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - i64.in: |
-    [main]
-    a: i64 = 1;
-    b: i64 = 2;
-    c: i64 = 3;
-    
-    [registers]
-    r0: bool = true;
+input_file: inputs/add.in
 */
 
 function main(a: i64, b: i64, c: i64) -> bool {
diff --git a/tests/compiler/integers/i64/console_assert.leo b/tests/compiler/integers/i64/console_assert.leo
index 27a251a855..1aa2cb7a7e 100644
--- a/tests/compiler/integers/i64/console_assert.leo
+++ b/tests/compiler/integers/i64/console_assert.leo
@@ -1,11 +1,7 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - i64.in: |
-    [main]
-    a: i64 = 1i64;
-    b: i64 = 1i64;
+input_file: inputs/eq.in
 */
 
 function main(a: i64, b: i64) -> bool {
diff --git a/tests/compiler/integers/i64/div.leo b/tests/compiler/integers/i64/div.leo
index a1d4c44fc9..6995cdc9a0 100644
--- a/tests/compiler/integers/i64/div.leo
+++ b/tests/compiler/integers/i64/div.leo
@@ -1,15 +1,7 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - i64.in: |
-    [main]
-    a: i64 = 4;
-    b: i64 = 2;
-    c: i64 = 2;
-    
-    [registers]
-    r0: bool = true;
+input_file: inputs/div.in
 */
 
 function main(a: i64, b: i64, c: i64) -> bool {
diff --git a/tests/compiler/integers/i64/eq.leo b/tests/compiler/integers/i64/eq.leo
index b317353fef..2b93006693 100644
--- a/tests/compiler/integers/i64/eq.leo
+++ b/tests/compiler/integers/i64/eq.leo
@@ -1,15 +1,7 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - i64.in: |
-    [main]
-    a: i64 = 2;
-    b: i64 = 2;
-    c: bool = true;
-
-    [registers]
-    r0: bool = true;
+input_file: inputs/eq.in
 */
 
 function main(a: i64, b: i64, c: bool) -> bool {
diff --git a/tests/compiler/integers/i64/ge.leo b/tests/compiler/integers/i64/ge.leo
index deb4e8aae6..66f8d487eb 100644
--- a/tests/compiler/integers/i64/ge.leo
+++ b/tests/compiler/integers/i64/ge.leo
@@ -1,23 +1,9 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - i64_e.in: |
-    [main]
-    a: i64 = 4;
-    b: i64 = 4;
-    c: bool = true;
-    
-    [registers]
-    r0: bool = true;
- - i64_g.in: |
-    [main]
-    a: i64 = 5;
-    b: i64 = 4;
-    c: bool = true;
-    
-    [registers]
-    r0: bool = true;
+input_file:
+ - inputs/eq.in
+ - inputs/ge.in
 */
 
 function main(a: i64, b: i64, c: bool) -> bool {
diff --git a/tests/compiler/integers/i64/gt.leo b/tests/compiler/integers/i64/gt.leo
index e4c6f17db7..8729e97d8c 100644
--- a/tests/compiler/integers/i64/gt.leo
+++ b/tests/compiler/integers/i64/gt.leo
@@ -1,23 +1,9 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - i64_g.in: |
-    [main]
-    a: i64 = 4;
-    b: i64 = 2;
-    c: bool = true;
-
-    [registers]
-    r0: bool = true;
- - i64_e.in: |
-    [main]
-    a: i64 = 4;
-    b: i64 = 4;
-    c: bool = false;
-    
-    [registers]
-    r0: bool = false;
+input_file:
+ - inputs/eq.in
+ - inputs/gt.in
 */
 
 function main(a: i64, b: i64, c: bool) -> bool {
diff --git a/tests/compiler/integers/i64/inputs/add.in b/tests/compiler/integers/i64/inputs/add.in
new file mode 100644
index 0000000000..49d8094147
--- /dev/null
+++ b/tests/compiler/integers/i64/inputs/add.in
@@ -0,0 +1,7 @@
+[main]
+a: i64 = 1i64;
+b: i64 = 2i64;
+c: i64 = 3i64;
+
+[registers]
+r0: bool = true;
\ No newline at end of file
diff --git a/tests/compiler/integers/i64/inputs/div.in b/tests/compiler/integers/i64/inputs/div.in
new file mode 100644
index 0000000000..fb5f3dbe14
--- /dev/null
+++ b/tests/compiler/integers/i64/inputs/div.in
@@ -0,0 +1,7 @@
+[main]
+a: i64 = 4i64;
+b: i64 = 2i64;
+c: i64 = 2i64;
+
+[registers]
+r0: bool = true;
\ No newline at end of file
diff --git a/tests/compiler/integers/i64/inputs/eq.in b/tests/compiler/integers/i64/inputs/eq.in
new file mode 100644
index 0000000000..7cb76e6b2a
--- /dev/null
+++ b/tests/compiler/integers/i64/inputs/eq.in
@@ -0,0 +1,7 @@
+[main]
+a: i64 = 2i64;
+b: i64 = 2i64;
+c: bool = true;
+
+[registers]
+r0: bool = true;
\ No newline at end of file
diff --git a/tests/compiler/integers/i64/inputs/ge.in b/tests/compiler/integers/i64/inputs/ge.in
new file mode 100644
index 0000000000..b6eba8c67d
--- /dev/null
+++ b/tests/compiler/integers/i64/inputs/ge.in
@@ -0,0 +1,7 @@
+[main]
+a: i64 = 5i64;
+b: i64 = 4i64;
+c: bool = true;
+
+[registers]
+r0: bool = true;
\ No newline at end of file
diff --git a/tests/compiler/integers/i64/inputs/gt.in b/tests/compiler/integers/i64/inputs/gt.in
new file mode 100644
index 0000000000..344a750bd9
--- /dev/null
+++ b/tests/compiler/integers/i64/inputs/gt.in
@@ -0,0 +1,7 @@
+[main]
+a: i64 = 4i64;
+b: i64 = 2i64;
+c: bool = true;
+
+[registers]
+r0: bool = true;
\ No newline at end of file
diff --git a/tests/compiler/integers/i64/inputs/le.in b/tests/compiler/integers/i64/inputs/le.in
new file mode 100644
index 0000000000..55ddee79c9
--- /dev/null
+++ b/tests/compiler/integers/i64/inputs/le.in
@@ -0,0 +1,7 @@
+[main]
+a: i64 = 1i64;
+b: i64 = 100i64;
+c: bool = true;
+
+[registers]
+r0: bool = true;
\ No newline at end of file
diff --git a/tests/compiler/integers/i64/inputs/lt.in b/tests/compiler/integers/i64/inputs/lt.in
new file mode 100644
index 0000000000..15382a621b
--- /dev/null
+++ b/tests/compiler/integers/i64/inputs/lt.in
@@ -0,0 +1,7 @@
+[main]
+a: i64 = 2i64;
+b: i64 = 4i64;
+c: bool = true;
+
+[registers]
+r0: bool = false;
\ No newline at end of file
diff --git a/tests/compiler/integers/i64/inputs/mul.in b/tests/compiler/integers/i64/inputs/mul.in
new file mode 100644
index 0000000000..8be13cefe7
--- /dev/null
+++ b/tests/compiler/integers/i64/inputs/mul.in
@@ -0,0 +1,7 @@
+[main]
+a: i64 = 2i64;
+b: i64 = 5i64;
+c: i64 = 10i64;
+
+[registers]
+r0: bool = false;
\ No newline at end of file
diff --git a/tests/compiler/integers/i64/inputs/ne.in b/tests/compiler/integers/i64/inputs/ne.in
new file mode 100644
index 0000000000..c307be224f
--- /dev/null
+++ b/tests/compiler/integers/i64/inputs/ne.in
@@ -0,0 +1,7 @@
+[main]
+a: i64 = 2i64;
+b: i64 = 5i64;
+c: bool = true;
+
+[registers]
+r0: bool = false;
\ No newline at end of file
diff --git a/tests/compiler/integers/i64/inputs/neg.in b/tests/compiler/integers/i64/inputs/neg.in
new file mode 100644
index 0000000000..4ae460f5de
--- /dev/null
+++ b/tests/compiler/integers/i64/inputs/neg.in
@@ -0,0 +1,6 @@
+[main]
+a: i64 = 5i64;
+b: i64 = -5i64;
+
+[registers]
+r0: bool = false;
\ No newline at end of file
diff --git a/tests/compiler/integers/i64/inputs/neg_rev.in b/tests/compiler/integers/i64/inputs/neg_rev.in
new file mode 100644
index 0000000000..3de3be13c1
--- /dev/null
+++ b/tests/compiler/integers/i64/inputs/neg_rev.in
@@ -0,0 +1,6 @@
+[main]
+a: i64 = -5i64;
+b: i64 = 5i64;
+
+[registers]
+r0: bool = false;
\ No newline at end of file
diff --git a/tests/compiler/integers/i64/inputs/sub.in b/tests/compiler/integers/i64/inputs/sub.in
new file mode 100644
index 0000000000..5d2820d385
--- /dev/null
+++ b/tests/compiler/integers/i64/inputs/sub.in
@@ -0,0 +1,7 @@
+[main]
+a: i64 = 100i64;
+b: i64 = 50i64;
+c: i64 = 50i64;
+
+[registers]
+r0: bool = false;
\ No newline at end of file
diff --git a/tests/compiler/integers/i64/inputs/tern.in b/tests/compiler/integers/i64/inputs/tern.in
new file mode 100644
index 0000000000..d9639cc2bc
--- /dev/null
+++ b/tests/compiler/integers/i64/inputs/tern.in
@@ -0,0 +1,8 @@
+[main]
+s: bool = true;
+a: i64 = 10i64;
+b: i64 = 5i64;
+c: i64 = 10i64;
+
+[registers]
+r0: bool = false;
\ No newline at end of file
diff --git a/tests/compiler/integers/i64/inputs/tern_rev.in b/tests/compiler/integers/i64/inputs/tern_rev.in
new file mode 100644
index 0000000000..9679ef582a
--- /dev/null
+++ b/tests/compiler/integers/i64/inputs/tern_rev.in
@@ -0,0 +1,8 @@
+[main]
+s: bool = false;
+a: i64 = 10i64;
+b: i64 = 5i64;
+c: i64 = 5i64;
+
+[registers]
+r0: bool = false;
\ No newline at end of file
diff --git a/tests/compiler/integers/i64/le.leo b/tests/compiler/integers/i64/le.leo
index 6906fc2672..f41459258b 100644
--- a/tests/compiler/integers/i64/le.leo
+++ b/tests/compiler/integers/i64/le.leo
@@ -1,23 +1,9 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - i64_l.in: |
-    [main]
-    a: i64 = 1;
-    b: i64 = 100;
-    c: bool = true;
-    
-    [registers]
-    r0: bool = true;
- - i64_e.in: |
-    [main]
-    a: i64 = 2;
-    b: i64 = 2;
-    c: bool = true;
-    
-    [registers]
-    r0: bool = true;
+input_file:
+ - inputs/eq.in
+ - inputs/le.in
 */
 
 function main(a: i64, b: i64, c: bool) -> bool {
diff --git a/tests/compiler/integers/i64/lt.leo b/tests/compiler/integers/i64/lt.leo
index 9debb01ea5..c2ae1c45c0 100644
--- a/tests/compiler/integers/i64/lt.leo
+++ b/tests/compiler/integers/i64/lt.leo
@@ -1,23 +1,9 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - i64_l.in: |
-    [main]
-    a: i64 = 2;
-    b: i64 = 4;
-    c: bool = true;
-
-    [registers]
-    r0: bool = false;
- - i64_e.in: |
-    [main]
-    a: i64 = 2;
-    b: i64 = 2;
-    c: bool = false;
-
-    [registers]
-    r0: bool = false;
+input_file:
+ - inputs/eq.in
+ - inputs/lt.in
 */
 
 function main(a: i64, b: i64, c: bool) -> bool{
diff --git a/tests/compiler/integers/i64/mul.leo b/tests/compiler/integers/i64/mul.leo
index 9338236078..bf4573712c 100644
--- a/tests/compiler/integers/i64/mul.leo
+++ b/tests/compiler/integers/i64/mul.leo
@@ -1,15 +1,9 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - i64.in: |
-    [main]
-    a: i64 = 2;
-    b: i64 = 5;
-    c: i64 = 10;
+input_file:
+ - inputs/mul.in
     
-    [registers]
-    r0: bool = false;
 */
 
 function main(a: i64, b: i64, c: i64) -> bool {
diff --git a/tests/compiler/integers/i64/ne.leo b/tests/compiler/integers/i64/ne.leo
index 18bbce98ac..794dad8cc0 100644
--- a/tests/compiler/integers/i64/ne.leo
+++ b/tests/compiler/integers/i64/ne.leo
@@ -1,23 +1,9 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - i64_ne.in: |
-    [main]
-    a: i64 = 2;
-    b: i64 = 5;
-    c: bool = true;
-
-    [registers]
-    r0: bool = false;
- - i64_e.in: |
-    [main]
-    a: i64 = 5;
-    b: i64 = 5;
-    c: bool = false;
-
-    [registers]
-    r0: bool = false;
+input_file:
+ - inputs/eq.in
+ - inputs/ne.in
 */
 
 function main(a: i64, b: i64, c: bool) -> bool{
diff --git a/tests/compiler/integers/i64/negate.leo b/tests/compiler/integers/i64/negate.leo
index 0353f579a7..ae2dea584e 100644
--- a/tests/compiler/integers/i64/negate.leo
+++ b/tests/compiler/integers/i64/negate.leo
@@ -1,21 +1,9 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - i64.in: |
-    [main]
-    a: i64 = 5;
-    b: i64 = -5;
-
-    [registers]
-    r0: bool = false;
- - i64.in: |
-    [main]
-    a: i64 = -5;
-    b: i64 = 5;
-
-    [registers]
-    r0: bool = false;
+input_file:
+ - inputs/neg.in
+ - inputs/neg_rev.in
 */
 
 function main(a: i64, b: i64) -> bool {
diff --git a/tests/compiler/integers/i64/negate_zero.leo b/tests/compiler/integers/i64/negate_zero.leo
index 72700fafac..955e5f954d 100644
--- a/tests/compiler/integers/i64/negate_zero.leo
+++ b/tests/compiler/integers/i64/negate_zero.leo
@@ -1,13 +1,8 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - dummy.in: |
-    [main]
-    y: bool = true;
-
-    [registers]
-    r0: bool = false;
+input_file:
+ - ../input/dummy.in
 */
 
 function main(y: bool) -> bool {
diff --git a/tests/compiler/integers/i64/sub.leo b/tests/compiler/integers/i64/sub.leo
index 7afe8e6c2e..6623a8220c 100644
--- a/tests/compiler/integers/i64/sub.leo
+++ b/tests/compiler/integers/i64/sub.leo
@@ -1,15 +1,8 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - i64.in: |
-    [main]
-    a: i64 = 100;
-    b: i64 = 50;
-    c: i64 = 50;
-    
-    [registers]
-    r0: bool = false;
+input_file:
+ - inputs/sub.in
 */
 
 function main(a: i64, b: i64, c: i64) -> bool {
diff --git a/tests/compiler/integers/i64/ternary.leo b/tests/compiler/integers/i64/ternary.leo
index 3b61a83e30..1bc3f8e359 100644
--- a/tests/compiler/integers/i64/ternary.leo
+++ b/tests/compiler/integers/i64/ternary.leo
@@ -1,25 +1,9 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - i64.in: |
-    [main]
-    s: bool = true;
-    a: i64 = 10i64;
-    b: i64 = 5i64;
-    c: i64 = 10i64;
-
-    [registers]
-    r0: bool = false;
- - i64_rev.in: |
-    [main]
-    s: bool = false;
-    a: i64 = 10i64;
-    b: i64 = 5i64;
-    c: i64 = 5i64;
-
-    [registers]
-    r0: bool = false;
+input_file:
+ - inputs/tern.in
+ - inputs/tern_rev.in
 */
 
 function main(s: bool, a: i64, b: i64, c: i64) -> bool {
diff --git a/tests/compiler/integers/i8/add.leo b/tests/compiler/integers/i8/add.leo
index b14e877e39..3e09005012 100644
--- a/tests/compiler/integers/i8/add.leo
+++ b/tests/compiler/integers/i8/add.leo
@@ -1,15 +1,7 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - i8.in: |
-    [main]
-    a: i8 = 1;
-    b: i8 = 2;
-    c: i8 = 3;
-    
-    [registers]
-    r0: bool = true;
+input_file: inputs/add.in
 */
 
 function main(a: i8, b: i8, c: i8) -> bool {
diff --git a/tests/compiler/integers/i8/console_assert.leo b/tests/compiler/integers/i8/console_assert.leo
index 238f2035cc..afcdea734e 100644
--- a/tests/compiler/integers/i8/console_assert.leo
+++ b/tests/compiler/integers/i8/console_assert.leo
@@ -1,15 +1,11 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - i8.in: |
-    [main]
-    a: i8 = 1i8;
-    b: i8 = 1i8;
+input_file: inputs/eq.in
 */
 
 function main(a: i8, b: i8) -> bool {
     let ret: bool = a == b;
     console.assert(ret);
     return ret;
-}
\ No newline at end of file
+}
diff --git a/tests/compiler/integers/i8/div.leo b/tests/compiler/integers/i8/div.leo
index 9c77d98cc2..f91ad25d8d 100644
--- a/tests/compiler/integers/i8/div.leo
+++ b/tests/compiler/integers/i8/div.leo
@@ -1,15 +1,7 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - i8.in: |
-    [main]
-    a: i8 = 4;
-    b: i8 = 2;
-    c: i8 = 2;
-    
-    [registers]
-    r0: bool = true;
+input_file: inputs/div.in
 */
 
 function main(a: i8, b: i8, c: i8) -> bool {
diff --git a/tests/compiler/integers/i8/eq.leo b/tests/compiler/integers/i8/eq.leo
index bf39311411..54879baabd 100644
--- a/tests/compiler/integers/i8/eq.leo
+++ b/tests/compiler/integers/i8/eq.leo
@@ -1,15 +1,7 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - i8.in: |
-    [main]
-    a: i8 = 2;
-    b: i8 = 2;
-    c: bool = true;
-
-    [registers]
-    r0: bool = true;
+input_file: inputs/eq.in
 */
 
 function main(a: i8, b: i8, c: bool) -> bool {
diff --git a/tests/compiler/integers/i8/ge.leo b/tests/compiler/integers/i8/ge.leo
index 9d34f0eaa3..880400d11f 100644
--- a/tests/compiler/integers/i8/ge.leo
+++ b/tests/compiler/integers/i8/ge.leo
@@ -1,23 +1,9 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - i8_e.in: |
-    [main]
-    a: i8 = 4;
-    b: i8 = 4;
-    c: bool = true;
-    
-    [registers]
-    r0: bool = true;
- - i8_g.in: |
-    [main]
-    a: i8 = 5;
-    b: i8 = 4;
-    c: bool = true;
-    
-    [registers]
-    r0: bool = true;
+input_file:
+ - inputs/eq.in
+ - inputs/ge.in
 */
 
 function main(a: i8, b: i8, c: bool) -> bool {
diff --git a/tests/compiler/integers/i8/gt.leo b/tests/compiler/integers/i8/gt.leo
index c37e2b4d9f..ef68a78274 100644
--- a/tests/compiler/integers/i8/gt.leo
+++ b/tests/compiler/integers/i8/gt.leo
@@ -1,23 +1,9 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - i8_g.in: |
-    [main]
-    a: i8 = 4;
-    b: i8 = 2;
-    c: bool = true;
-
-    [registers]
-    r0: bool = true;
- - i8_e.in: |
-    [main]
-    a: i8 = 4;
-    b: i8 = 4;
-    c: bool = false;
-    
-    [registers]
-    r0: bool = false;
+input_file:
+ - inputs/eq.in
+ - inputs/gt.in
 */
 
 function main(a: i8, b: i8, c: bool) -> bool {
diff --git a/tests/compiler/integers/i8/inputs/add.in b/tests/compiler/integers/i8/inputs/add.in
new file mode 100644
index 0000000000..907861e439
--- /dev/null
+++ b/tests/compiler/integers/i8/inputs/add.in
@@ -0,0 +1,7 @@
+[main]
+a: i8 = 1i8;
+b: i8 = 2i8;
+c: i8 = 3i8;
+
+[registers]
+r0: bool = true;
\ No newline at end of file
diff --git a/tests/compiler/integers/i8/inputs/div.in b/tests/compiler/integers/i8/inputs/div.in
new file mode 100644
index 0000000000..749c96ca62
--- /dev/null
+++ b/tests/compiler/integers/i8/inputs/div.in
@@ -0,0 +1,7 @@
+[main]
+a: i8 = 4i8;
+b: i8 = 2i8;
+c: i8 = 2i8;
+
+[registers]
+r0: bool = true;
\ No newline at end of file
diff --git a/tests/compiler/integers/i8/inputs/eq.in b/tests/compiler/integers/i8/inputs/eq.in
new file mode 100644
index 0000000000..ca56b8c511
--- /dev/null
+++ b/tests/compiler/integers/i8/inputs/eq.in
@@ -0,0 +1,7 @@
+[main]
+a: i8 = 2i8;
+b: i8 = 2i8;
+c: bool = true;
+
+[registers]
+r0: bool = true;
\ No newline at end of file
diff --git a/tests/compiler/integers/i8/inputs/ge.in b/tests/compiler/integers/i8/inputs/ge.in
new file mode 100644
index 0000000000..fd847dad22
--- /dev/null
+++ b/tests/compiler/integers/i8/inputs/ge.in
@@ -0,0 +1,7 @@
+[main]
+a: i8 = 5i8;
+b: i8 = 4i8;
+c: bool = true;
+
+[registers]
+r0: bool = true;
\ No newline at end of file
diff --git a/tests/compiler/integers/i8/inputs/gt.in b/tests/compiler/integers/i8/inputs/gt.in
new file mode 100644
index 0000000000..b147517c72
--- /dev/null
+++ b/tests/compiler/integers/i8/inputs/gt.in
@@ -0,0 +1,7 @@
+[main]
+a: i8 = 4i8;
+b: i8 = 2i8;
+c: bool = true;
+
+[registers]
+r0: bool = true;
\ No newline at end of file
diff --git a/tests/compiler/integers/i8/inputs/le.in b/tests/compiler/integers/i8/inputs/le.in
new file mode 100644
index 0000000000..7d712ef970
--- /dev/null
+++ b/tests/compiler/integers/i8/inputs/le.in
@@ -0,0 +1,7 @@
+[main]
+a: i8 = 1i8;
+b: i8 = 100i8;
+c: bool = true;
+
+[registers]
+r0: bool = true;
\ No newline at end of file
diff --git a/tests/compiler/integers/i8/inputs/lt.in b/tests/compiler/integers/i8/inputs/lt.in
new file mode 100644
index 0000000000..4cbb605a5f
--- /dev/null
+++ b/tests/compiler/integers/i8/inputs/lt.in
@@ -0,0 +1,7 @@
+[main]
+a: i8 = 2i8;
+b: i8 = 4i8;
+c: bool = true;
+
+[registers]
+r0: bool = false;
\ No newline at end of file
diff --git a/tests/compiler/integers/i8/inputs/mul.in b/tests/compiler/integers/i8/inputs/mul.in
new file mode 100644
index 0000000000..bb714ce5a1
--- /dev/null
+++ b/tests/compiler/integers/i8/inputs/mul.in
@@ -0,0 +1,7 @@
+[main]
+a: i8 = 2i8;
+b: i8 = 5i8;
+c: i8 = 10i8;
+
+[registers]
+r0: bool = false;
\ No newline at end of file
diff --git a/tests/compiler/integers/i8/inputs/ne.in b/tests/compiler/integers/i8/inputs/ne.in
new file mode 100644
index 0000000000..a2777987c3
--- /dev/null
+++ b/tests/compiler/integers/i8/inputs/ne.in
@@ -0,0 +1,7 @@
+[main]
+a: i8 = 2i8;
+b: i8 = 5i8;
+c: bool = true;
+
+[registers]
+r0: bool = false;
\ No newline at end of file
diff --git a/tests/compiler/integers/i8/inputs/neg.in b/tests/compiler/integers/i8/inputs/neg.in
new file mode 100644
index 0000000000..e78f2f8ffc
--- /dev/null
+++ b/tests/compiler/integers/i8/inputs/neg.in
@@ -0,0 +1,6 @@
+[main]
+a: i8 = 5i8;
+b: i8 = -5i8;
+
+[registers]
+r0: bool = false;
\ No newline at end of file
diff --git a/tests/compiler/integers/i8/inputs/neg_rev.in b/tests/compiler/integers/i8/inputs/neg_rev.in
new file mode 100644
index 0000000000..203296788e
--- /dev/null
+++ b/tests/compiler/integers/i8/inputs/neg_rev.in
@@ -0,0 +1,6 @@
+[main]
+a: i8 = -5i8;
+b: i8 = 5i8;
+
+[registers]
+r0: bool = false;
\ No newline at end of file
diff --git a/tests/compiler/integers/i8/inputs/pow.in b/tests/compiler/integers/i8/inputs/pow.in
new file mode 100644
index 0000000000..13d3580c17
--- /dev/null
+++ b/tests/compiler/integers/i8/inputs/pow.in
@@ -0,0 +1,7 @@
+[main]
+a: i8 = 2i8;
+b: i8 = 2i8;
+c: i8 = 4i8;
+
+[registers]
+r0: bool = true;
\ No newline at end of file
diff --git a/tests/compiler/integers/i8/inputs/sub.in b/tests/compiler/integers/i8/inputs/sub.in
new file mode 100644
index 0000000000..2cddaeaeb4
--- /dev/null
+++ b/tests/compiler/integers/i8/inputs/sub.in
@@ -0,0 +1,7 @@
+[main]
+a: i8 = 100i8;
+b: i8 = 50i8;
+c: i8 = 50i8;
+
+[registers]
+r0: bool = false;
\ No newline at end of file
diff --git a/tests/compiler/integers/i8/inputs/tern.in b/tests/compiler/integers/i8/inputs/tern.in
new file mode 100644
index 0000000000..905e4f33a5
--- /dev/null
+++ b/tests/compiler/integers/i8/inputs/tern.in
@@ -0,0 +1,8 @@
+[main]
+s: bool = true;
+a: i8 = 10i8;
+b: i8 = 5i8;
+c: i8 = 10i8;
+
+[registers]
+r0: bool = false;
\ No newline at end of file
diff --git a/tests/compiler/integers/i8/inputs/tern_rev.in b/tests/compiler/integers/i8/inputs/tern_rev.in
new file mode 100644
index 0000000000..88e2314d3b
--- /dev/null
+++ b/tests/compiler/integers/i8/inputs/tern_rev.in
@@ -0,0 +1,8 @@
+[main]
+s: bool = false;
+a: i8 = 10i8;
+b: i8 = 5i8;
+c: i8 = 5i8;
+
+[registers]
+r0: bool = false;
\ No newline at end of file
diff --git a/tests/compiler/integers/i8/le.leo b/tests/compiler/integers/i8/le.leo
index d8b79df2d9..2599345a7d 100644
--- a/tests/compiler/integers/i8/le.leo
+++ b/tests/compiler/integers/i8/le.leo
@@ -1,23 +1,9 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - i8_l.in: |
-    [main]
-    a: i8 = 1;
-    b: i8 = 100;
-    c: bool = true;
-    
-    [registers]
-    r0: bool = true;
- - i8_e.in: |
-    [main]
-    a: i8 = 2;
-    b: i8 = 2;
-    c: bool = true;
-    
-    [registers]
-    r0: bool = true;
+input_file:
+ - inputs/eq.in
+ - inputs/le.in
 */
 
 function main(a: i8, b: i8, c: bool) -> bool {
diff --git a/tests/compiler/integers/i8/lt.leo b/tests/compiler/integers/i8/lt.leo
index 8e21f5634c..36ee077d7f 100644
--- a/tests/compiler/integers/i8/lt.leo
+++ b/tests/compiler/integers/i8/lt.leo
@@ -1,23 +1,9 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - i8_l.in: |
-    [main]
-    a: i8 = 2;
-    b: i8 = 4;
-    c: bool = true;
-
-    [registers]
-    r0: bool = false;
- - i8_e.in: |
-    [main]
-    a: i8 = 2;
-    b: i8 = 2;
-    c: bool = false;
-
-    [registers]
-    r0: bool = false;
+input_file:
+ - inputs/eq.in
+ - inputs/lt.in
 */
 
 function main(a: i8, b: i8, c: bool) -> bool{
diff --git a/tests/compiler/integers/i8/mul.leo b/tests/compiler/integers/i8/mul.leo
index 0cbbc85bfb..1eb7ec547e 100644
--- a/tests/compiler/integers/i8/mul.leo
+++ b/tests/compiler/integers/i8/mul.leo
@@ -1,15 +1,9 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - i8.in: |
-    [main]
-    a: i8 = 2;
-    b: i8 = 5;
-    c: i8 = 10;
+input_file:
+ - inputs/mul.in
     
-    [registers]
-    r0: bool = false;
 */
 
 function main(a: i8, b: i8, c: i8) -> bool {
diff --git a/tests/compiler/integers/i8/ne.leo b/tests/compiler/integers/i8/ne.leo
index cdb4519a43..042e03d9ac 100644
--- a/tests/compiler/integers/i8/ne.leo
+++ b/tests/compiler/integers/i8/ne.leo
@@ -1,23 +1,9 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - i8_ne.in: |
-    [main]
-    a: i8 = 2;
-    b: i8 = 5;
-    c: bool = true;
-
-    [registers]
-    r0: bool = false;
- - i8_e.in: |
-    [main]
-    a: i8 = 5;
-    b: i8 = 5;
-    c: bool = false;
-
-    [registers]
-    r0: bool = false;
+input_file:
+ - inputs/eq.in
+ - inputs/ne.in
 */
 
 function main(a: i8, b: i8, c: bool) -> bool{
diff --git a/tests/compiler/integers/i8/negate.leo b/tests/compiler/integers/i8/negate.leo
index 1811fa650b..fc71467ac1 100644
--- a/tests/compiler/integers/i8/negate.leo
+++ b/tests/compiler/integers/i8/negate.leo
@@ -1,21 +1,9 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - i8.in: |
-    [main]
-    a: i8 = 5;
-    b: i8 = -5;
-
-    [registers]
-    r0: bool = false;
- - i8.in: |
-    [main]
-    a: i8 = -5;
-    b: i8 = 5;
-
-    [registers]
-    r0: bool = false;
+input_file:
+ - inputs/neg.in
+ - inputs/neg_rev.in
 */
 
 function main(a: i8, b: i8) -> bool {
diff --git a/tests/compiler/integers/i8/negate_zero.leo b/tests/compiler/integers/i8/negate_zero.leo
index b8f1b35385..70ed6da011 100644
--- a/tests/compiler/integers/i8/negate_zero.leo
+++ b/tests/compiler/integers/i8/negate_zero.leo
@@ -1,13 +1,8 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - dummy.in: |
-    [main]
-    y: bool = true;
-
-    [registers]
-    r0: bool = false;
+input_file:
+ - ../input/dummy.in
 */
 
 function main(y: bool) -> bool {
diff --git a/tests/compiler/integers/i8/pow.leo b/tests/compiler/integers/i8/pow.leo
index 9487d0aff7..912199885c 100644
--- a/tests/compiler/integers/i8/pow.leo
+++ b/tests/compiler/integers/i8/pow.leo
@@ -1,14 +1,8 @@
-// namespace: Compile
-// expectation: Pass
-// inputs:
-//  - i8.in: |
-//     [main]
-//     a: i8 = 2;
-//     b: i8 = 2;
-//     c: i8 = 4;
-    
-//     [registers]
-//     r0: bool = true;
+/*
+namespace: Compile
+expectation: Pass
+input_file: inputs/pow.in
+*/
 
 function main(a: i8, b: i8, c: i8) -> bool {
     return a ** b == c;
diff --git a/tests/compiler/integers/i8/sub.leo b/tests/compiler/integers/i8/sub.leo
index 1d8f879391..4d7d0ae412 100644
--- a/tests/compiler/integers/i8/sub.leo
+++ b/tests/compiler/integers/i8/sub.leo
@@ -1,15 +1,8 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - i8.in: |
-    [main]
-    a: i8 = 100;
-    b: i8 = 50;
-    c: i8 = 50;
-    
-    [registers]
-    r0: bool = false;
+input_file:
+ - inputs/sub.in
 */
 
 function main(a: i8, b: i8, c: i8) -> bool {
diff --git a/tests/compiler/integers/i8/ternary.leo b/tests/compiler/integers/i8/ternary.leo
index 939febc55d..1228239bf4 100644
--- a/tests/compiler/integers/i8/ternary.leo
+++ b/tests/compiler/integers/i8/ternary.leo
@@ -1,25 +1,9 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - i8.in: |
-    [main]
-    s: bool = true;
-    a: i8 = 10i8;
-    b: i8 = 5i8;
-    c: i8 = 10i8;
-
-    [registers]
-    r0: bool = false;
- - i8_rev.in: |
-    [main]
-    s: bool = false;
-    a: i8 = 10i8;
-    b: i8 = 5i8;
-    c: i8 = 5i8;
-
-    [registers]
-    r0: bool = false;
+input_file:
+ - inputs/tern.in
+ - inputs/tern_rev.in
 */
 
 function main(s: bool, a: i8, b: i8, c: i8) -> bool {
diff --git a/tests/compiler/integers/u128/add.leo b/tests/compiler/integers/u128/add.leo
index 66b6e5a41d..4c6a1f1b4b 100644
--- a/tests/compiler/integers/u128/add.leo
+++ b/tests/compiler/integers/u128/add.leo
@@ -1,15 +1,7 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - u128.in: |
-    [main]
-    a: u128 = 2;
-    b: u128 = 4;
-    c: u128 = 6;
-
-    [registers]
-    r0: bool = true;
+input_file: inputs/add.in
 */
 
 function main(a: u128, b: u128, c: u128) -> bool {
diff --git a/tests/compiler/integers/u128/console_assert.leo b/tests/compiler/integers/u128/console_assert.leo
index ef51461445..f8e15a0f65 100644
--- a/tests/compiler/integers/u128/console_assert.leo
+++ b/tests/compiler/integers/u128/console_assert.leo
@@ -1,17 +1,11 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - u128.in: |
-    [main]
-    a: u128 = 2;
-    b: u128 = 2;
-
-    [registers]
-    r0: bool = true;
+input_file: inputs/eq.in
 */
 
 function main(a: u128, b: u128) -> bool {
-    console.assert(a == b);
-    return a == b;
+    let ret: bool = a == b;
+    console.assert(ret);
+    return ret;
 }
diff --git a/tests/compiler/integers/u128/div.leo b/tests/compiler/integers/u128/div.leo
index d228e360c3..616fa0e771 100644
--- a/tests/compiler/integers/u128/div.leo
+++ b/tests/compiler/integers/u128/div.leo
@@ -1,15 +1,7 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - u128.in: |
-    [main]
-    a: u128 = 4;
-    b: u128 = 2;
-    c: u128 = 2;
-
-    [registers]
-    r0: bool = true;
+input_file: inputs/div.in
 */
 
 function main(a: u128, b: u128, c: u128) -> bool {
diff --git a/tests/compiler/integers/u128/eq.leo b/tests/compiler/integers/u128/eq.leo
index 60a2e3bc10..dc1b24c359 100644
--- a/tests/compiler/integers/u128/eq.leo
+++ b/tests/compiler/integers/u128/eq.leo
@@ -1,23 +1,7 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - u128_e.in: |
-    [main]
-    a: u128 = 2;
-    b: u128 = 2;
-    c: bool = true;
-
-    [registers]
-    r0: bool = true;
- - u128_n.in: |
-    [main]
-    a: u128 = 3;
-    b: u128 = 2;
-    c: bool = false;
-
-    [registers]
-    r0: bool = true;
+input_file: inputs/eq.in
 */
 
 function main(a: u128, b: u128, c: bool) -> bool {
diff --git a/tests/compiler/integers/u128/ge.leo b/tests/compiler/integers/u128/ge.leo
index cc6b3650ef..362c7462d7 100644
--- a/tests/compiler/integers/u128/ge.leo
+++ b/tests/compiler/integers/u128/ge.leo
@@ -1,31 +1,9 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - u128_g.in: |
-    [main]
-    a: u128 = 3;
-    b: u128 = 2;
-    c: bool = true;
-
-    [registers]
-    r0: bool = true;
- - u128_e.in: |
-    [main]
-    a: u128 = 2;
-    b: u128 = 2;
-    c: bool = true;
-
-    [registers]
-    r0: bool = true;
- - u128_f.in: |
-    [main]
-    a: u128 = 1;
-    b: u128 = 2;
-    c: bool = false;
-
-    [registers]
-    r0: bool = true;
+input_file:
+ - inputs/eq.in
+ - inputs/ge.in
 */
 
 function main(a: u128, b: u128, c: bool) -> bool {
diff --git a/tests/compiler/integers/u128/gt.leo b/tests/compiler/integers/u128/gt.leo
index 98d4bb98e3..8a2ac735c5 100644
--- a/tests/compiler/integers/u128/gt.leo
+++ b/tests/compiler/integers/u128/gt.leo
@@ -1,27 +1,11 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - u128_g.in: |
-    [main]
-    a: u128 = 3u128;
-    b: u128 = 2u128;
-    c: bool = true;
-
-    [registers]
-    r0: bool = true;
- - u128_f.in: |
-    [main]
-    a: u128 = 1u128;
-    b: u128 = 2u128;
-    c: bool = false;
-
-    [registers]
-    r0: bool = true;
+input_file:
+ - inputs/eq.in
+ - inputs/gt.in
 */
 
 function main(a: u128, b: u128, c: bool) -> bool {
-    let ret: bool = a > b == c;
-    console.assert(ret);
-    return ret;
+    return a > b == c;
 }
diff --git a/tests/compiler/integers/u128/input.leo b/tests/compiler/integers/u128/input.leo
deleted file mode 100644
index 1c4e813734..0000000000
--- a/tests/compiler/integers/u128/input.leo
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
-namespace: Compile
-expectation: Pass
-inputs:
- - u128_g.in: |
-    [main]
-    a: u128 = 2;
-    b: u128 = 2;
-
-    [registers]
-    r0: bool = true;
-*/
-
-function main(a: u128, b: u128) -> bool {
-    return a == b;
-}
diff --git a/tests/compiler/integers/u128/inputs/add.in b/tests/compiler/integers/u128/inputs/add.in
new file mode 100644
index 0000000000..43c9f8995c
--- /dev/null
+++ b/tests/compiler/integers/u128/inputs/add.in
@@ -0,0 +1,7 @@
+[main]
+a: u128 = 1u128;
+b: u128 = 2u128;
+c: u128 = 3u128;
+
+[registers]
+r0: bool = true;
\ No newline at end of file
diff --git a/tests/compiler/integers/u128/inputs/div.in b/tests/compiler/integers/u128/inputs/div.in
new file mode 100644
index 0000000000..1d39fa989d
--- /dev/null
+++ b/tests/compiler/integers/u128/inputs/div.in
@@ -0,0 +1,7 @@
+[main]
+a: u128 = 4u128;
+b: u128 = 2u128;
+c: u128 = 2u128;
+
+[registers]
+r0: bool = true;
\ No newline at end of file
diff --git a/tests/compiler/integers/u128/inputs/eq.in b/tests/compiler/integers/u128/inputs/eq.in
new file mode 100644
index 0000000000..81e564db47
--- /dev/null
+++ b/tests/compiler/integers/u128/inputs/eq.in
@@ -0,0 +1,7 @@
+[main]
+a: u128 = 2u128;
+b: u128 = 2u128;
+c: bool = true;
+
+[registers]
+r0: bool = true;
\ No newline at end of file
diff --git a/tests/compiler/integers/u128/inputs/ge.in b/tests/compiler/integers/u128/inputs/ge.in
new file mode 100644
index 0000000000..35a3847ac5
--- /dev/null
+++ b/tests/compiler/integers/u128/inputs/ge.in
@@ -0,0 +1,7 @@
+[main]
+a: u128 = 5u128;
+b: u128 = 4u128;
+c: bool = true;
+
+[registers]
+r0: bool = true;
\ No newline at end of file
diff --git a/tests/compiler/integers/u128/inputs/gt.in b/tests/compiler/integers/u128/inputs/gt.in
new file mode 100644
index 0000000000..5babf9fab9
--- /dev/null
+++ b/tests/compiler/integers/u128/inputs/gt.in
@@ -0,0 +1,7 @@
+[main]
+a: u128 = 4u128;
+b: u128 = 2u128;
+c: bool = true;
+
+[registers]
+r0: bool = true;
\ No newline at end of file
diff --git a/tests/compiler/integers/u128/inputs/le.in b/tests/compiler/integers/u128/inputs/le.in
new file mode 100644
index 0000000000..ffa0d0bc28
--- /dev/null
+++ b/tests/compiler/integers/u128/inputs/le.in
@@ -0,0 +1,7 @@
+[main]
+a: u128 = 1u128;
+b: u128 = 100u128;
+c: bool = true;
+
+[registers]
+r0: bool = true;
\ No newline at end of file
diff --git a/tests/compiler/integers/u128/inputs/lt.in b/tests/compiler/integers/u128/inputs/lt.in
new file mode 100644
index 0000000000..263a70c174
--- /dev/null
+++ b/tests/compiler/integers/u128/inputs/lt.in
@@ -0,0 +1,7 @@
+[main]
+a: u128 = 2u128;
+b: u128 = 4u128;
+c: bool = true;
+
+[registers]
+r0: bool = false;
\ No newline at end of file
diff --git a/tests/compiler/integers/u128/inputs/mul.in b/tests/compiler/integers/u128/inputs/mul.in
new file mode 100644
index 0000000000..08552928cd
--- /dev/null
+++ b/tests/compiler/integers/u128/inputs/mul.in
@@ -0,0 +1,7 @@
+[main]
+a: u128 = 2u128;
+b: u128 = 5u128;
+c: u128 = 10u128;
+
+[registers]
+r0: bool = false;
\ No newline at end of file
diff --git a/tests/compiler/integers/u128/inputs/ne.in b/tests/compiler/integers/u128/inputs/ne.in
new file mode 100644
index 0000000000..ccca2463f0
--- /dev/null
+++ b/tests/compiler/integers/u128/inputs/ne.in
@@ -0,0 +1,7 @@
+[main]
+a: u128 = 2u128;
+b: u128 = 5u128;
+c: bool = true;
+
+[registers]
+r0: bool = false;
\ No newline at end of file
diff --git a/tests/compiler/integers/u128/inputs/sub.in b/tests/compiler/integers/u128/inputs/sub.in
new file mode 100644
index 0000000000..2c58963ead
--- /dev/null
+++ b/tests/compiler/integers/u128/inputs/sub.in
@@ -0,0 +1,7 @@
+[main]
+a: u128 = 100u128;
+b: u128 = 50u128;
+c: u128 = 50u128;
+
+[registers]
+r0: bool = false;
\ No newline at end of file
diff --git a/tests/compiler/integers/u128/inputs/tern.in b/tests/compiler/integers/u128/inputs/tern.in
new file mode 100644
index 0000000000..cc3056f85c
--- /dev/null
+++ b/tests/compiler/integers/u128/inputs/tern.in
@@ -0,0 +1,8 @@
+[main]
+s: bool = true;
+a: u128 = 10u128;
+b: u128 = 5u128;
+c: u128 = 10u128;
+
+[registers]
+r0: bool = false;
\ No newline at end of file
diff --git a/tests/compiler/integers/u128/inputs/tern_rev.in b/tests/compiler/integers/u128/inputs/tern_rev.in
new file mode 100644
index 0000000000..550c95771c
--- /dev/null
+++ b/tests/compiler/integers/u128/inputs/tern_rev.in
@@ -0,0 +1,8 @@
+[main]
+s: bool = false;
+a: u128 = 10u128;
+b: u128 = 5u128;
+c: u128 = 5u128;
+
+[registers]
+r0: bool = false;
\ No newline at end of file
diff --git a/tests/compiler/integers/u128/le.leo b/tests/compiler/integers/u128/le.leo
index afb2197734..62024276b7 100644
--- a/tests/compiler/integers/u128/le.leo
+++ b/tests/compiler/integers/u128/le.leo
@@ -1,31 +1,9 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - u128_f.in: |
-    [main]
-    a: u128 = 3;
-    b: u128 = 2;
-    c: bool = true;
-
-    [registers]
-    r0: bool = true;
- - u128_e.in: |
-    [main]
-    a: u128 = 2;
-    b: u128 = 2;
-    c: bool = true;
-
-    [registers]
-    r0: bool = true;
- - u128_l.in: |
-    [main]
-    a: u128 = 1;
-    b: u128 = 2;
-    c: bool = false;
-
-    [registers]
-    r0: bool = true;
+input_file:
+ - inputs/eq.in
+ - inputs/le.in
 */
 
 function main(a: u128, b: u128, c: bool) -> bool {
diff --git a/tests/compiler/integers/u128/lt.leo b/tests/compiler/integers/u128/lt.leo
index b9d74af6c9..03f35b6914 100644
--- a/tests/compiler/integers/u128/lt.leo
+++ b/tests/compiler/integers/u128/lt.leo
@@ -1,25 +1,11 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - u128_f.in: |
-    [main]
-    a: u128 = 3;
-    b: u128 = 2;
-    c: bool = true;
-
-    [registers]
-    r0: bool = true;
- - u128_g.in: |
-    [main]
-    a: u128 = 1;
-    b: u128 = 2;
-    c: bool = false;
-
-    [registers]
-    r0: bool = true;
+input_file:
+ - inputs/eq.in
+ - inputs/lt.in
 */
 
-function main(a: u128, b: u128, c: bool) -> bool {
+function main(a: u128, b: u128, c: bool) -> bool{
     return a < b == c;
 }
diff --git a/tests/compiler/integers/u128/mul.leo b/tests/compiler/integers/u128/mul.leo
index dc74761701..32caffe569 100644
--- a/tests/compiler/integers/u128/mul.leo
+++ b/tests/compiler/integers/u128/mul.leo
@@ -1,15 +1,9 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - mul.in: |
-    [main]
-    a: u128 = 10;
-    b: u128 = 20;
-    c: u128 = 30;
-
-    [registers]
-    r0: bool = true;
+input_file:
+ - inputs/mul.in
+    
 */
 
 function main(a: u128, b: u128, c: u128) -> bool {
diff --git a/tests/compiler/integers/u128/ne.leo b/tests/compiler/integers/u128/ne.leo
index cc23e5c55b..f84247e900 100644
--- a/tests/compiler/integers/u128/ne.leo
+++ b/tests/compiler/integers/u128/ne.leo
@@ -1,17 +1,11 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - ne.in: |
-    [main]
-    a: u128 = 10;
-    b: u128 = 20;
-    c: bool = true;
-
-    [registers]
-    r0: bool = true;
+input_file:
+ - inputs/eq.in
+ - inputs/ne.in
 */
 
-function main(a: u128, b: u128, c: bool) -> bool {
+function main(a: u128, b: u128, c: bool) -> bool{
     return (a != b) == c;
 }
diff --git a/tests/compiler/integers/u128/sub.leo b/tests/compiler/integers/u128/sub.leo
index fbb08ad176..1c399300fa 100644
--- a/tests/compiler/integers/u128/sub.leo
+++ b/tests/compiler/integers/u128/sub.leo
@@ -1,15 +1,8 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - u128_f.in: |
-    [main]
-    a: u128 = 4;
-    b: u128 = 2;
-    c: u128 = 2;
-
-    [registers]
-    r0: bool = true;
+input_file:
+ - inputs/sub.in
 */
 
 function main(a: u128, b: u128, c: u128) -> bool {
diff --git a/tests/compiler/integers/u128/ternary.leo b/tests/compiler/integers/u128/ternary.leo
index 9db37a6c39..1c9465edf4 100644
--- a/tests/compiler/integers/u128/ternary.leo
+++ b/tests/compiler/integers/u128/ternary.leo
@@ -1,25 +1,9 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - u128_t.in: |
-    [main]
-    s: bool = true;
-    a: u128 = 4u128;
-    b: u128 = 2u128;
-    c: u128 = 4u128;
-
-    [registers]
-    r0: bool = true;
- - u128_f.in: |
-    [main]
-    s: bool = false;
-    a: u128 = 4u128;
-    b: u128 = 2u128;
-    c: u128 = 2u128;
-
-    [registers]
-    r0: bool = true;
+input_file:
+ - inputs/tern.in
+ - inputs/tern_rev.in
 */
 
 function main(s: bool, a: u128, b: u128, c: u128) -> bool {
diff --git a/tests/compiler/integers/u16/add.leo b/tests/compiler/integers/u16/add.leo
index 44f0b1ba5a..09419ecbe0 100644
--- a/tests/compiler/integers/u16/add.leo
+++ b/tests/compiler/integers/u16/add.leo
@@ -1,15 +1,7 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - u16.in: |
-    [main]
-    a: u16 = 2;
-    b: u16 = 4;
-    c: u16 = 6;
-
-    [registers]
-    r0: bool = true;
+input_file: inputs/add.in
 */
 
 function main(a: u16, b: u16, c: u16) -> bool {
diff --git a/tests/compiler/integers/u16/console_assert.leo b/tests/compiler/integers/u16/console_assert.leo
index 51c091dff0..4a4849ba3d 100644
--- a/tests/compiler/integers/u16/console_assert.leo
+++ b/tests/compiler/integers/u16/console_assert.leo
@@ -1,17 +1,11 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - u16.in: |
-    [main]
-    a: u16 = 2;
-    b: u16 = 2;
-
-    [registers]
-    r0: bool = true;
+input_file: inputs/eq.in
 */
 
 function main(a: u16, b: u16) -> bool {
-    console.assert(a == b);
-    return a == b;
+    let ret: bool = a == b;
+    console.assert(ret);
+    return ret;
 }
diff --git a/tests/compiler/integers/u16/div.leo b/tests/compiler/integers/u16/div.leo
index 728135715d..9b029dd423 100644
--- a/tests/compiler/integers/u16/div.leo
+++ b/tests/compiler/integers/u16/div.leo
@@ -1,15 +1,7 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - u16.in: |
-    [main]
-    a: u16 = 4;
-    b: u16 = 2;
-    c: u16 = 2;
-
-    [registers]
-    r0: bool = true;
+input_file: inputs/div.in
 */
 
 function main(a: u16, b: u16, c: u16) -> bool {
diff --git a/tests/compiler/integers/u16/eq.leo b/tests/compiler/integers/u16/eq.leo
index ab93a79602..4ba5421c6e 100644
--- a/tests/compiler/integers/u16/eq.leo
+++ b/tests/compiler/integers/u16/eq.leo
@@ -1,23 +1,7 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - u16_e.in: |
-    [main]
-    a: u16 = 2;
-    b: u16 = 2;
-    c: bool = true;
-
-    [registers]
-    r0: bool = true;
- - u16_n.in: |
-    [main]
-    a: u16 = 3;
-    b: u16 = 2;
-    c: bool = false;
-
-    [registers]
-    r0: bool = true;
+input_file: inputs/eq.in
 */
 
 function main(a: u16, b: u16, c: bool) -> bool {
diff --git a/tests/compiler/integers/u16/ge.leo b/tests/compiler/integers/u16/ge.leo
index faaa70bd3d..f81e067c82 100644
--- a/tests/compiler/integers/u16/ge.leo
+++ b/tests/compiler/integers/u16/ge.leo
@@ -1,31 +1,9 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - u16_g.in: |
-    [main]
-    a: u16 = 3;
-    b: u16 = 2;
-    c: bool = true;
-
-    [registers]
-    r0: bool = true;
- - u16_e.in: |
-    [main]
-    a: u16 = 2;
-    b: u16 = 2;
-    c: bool = true;
-
-    [registers]
-    r0: bool = true;
- - u16_f.in: |
-    [main]
-    a: u16 = 1;
-    b: u16 = 2;
-    c: bool = false;
-
-    [registers]
-    r0: bool = true;
+input_file:
+ - inputs/eq.in
+ - inputs/ge.in
 */
 
 function main(a: u16, b: u16, c: bool) -> bool {
diff --git a/tests/compiler/integers/u16/gt.leo b/tests/compiler/integers/u16/gt.leo
index 8f671b3307..9dd1cd2d79 100644
--- a/tests/compiler/integers/u16/gt.leo
+++ b/tests/compiler/integers/u16/gt.leo
@@ -1,27 +1,11 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - u16_g.in: |
-    [main]
-    a: u16 = 3u16;
-    b: u16 = 2u16;
-    c: bool = true;
-
-    [registers]
-    r0: bool = true;
- - u16_f.in: |
-    [main]
-    a: u16 = 1u16;
-    b: u16 = 2u16;
-    c: bool = false;
-
-    [registers]
-    r0: bool = true;
+input_file:
+ - inputs/eq.in
+ - inputs/gt.in
 */
 
 function main(a: u16, b: u16, c: bool) -> bool {
-    let ret: bool = a > b == c;
-    console.assert(ret);
-    return ret;
+    return a > b == c;
 }
diff --git a/tests/compiler/integers/u16/input.leo b/tests/compiler/integers/u16/input.leo
deleted file mode 100644
index 81f52cc41a..0000000000
--- a/tests/compiler/integers/u16/input.leo
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
-namespace: Compile
-expectation: Pass
-inputs:
- - u16_g.in: |
-    [main]
-    a: u16 = 2;
-    b: u16 = 2;
-
-    [registers]
-    r0: bool = true;
-*/
-
-function main(a: u16, b: u16) -> bool {
-    return a == b;
-}
diff --git a/tests/compiler/integers/u16/inputs/add.in b/tests/compiler/integers/u16/inputs/add.in
new file mode 100644
index 0000000000..37d19ac4db
--- /dev/null
+++ b/tests/compiler/integers/u16/inputs/add.in
@@ -0,0 +1,7 @@
+[main]
+a: u16 = 1u16;
+b: u16 = 2u16;
+c: u16 = 3u16;
+
+[registers]
+r0: bool = true;
\ No newline at end of file
diff --git a/tests/compiler/integers/u16/inputs/div.in b/tests/compiler/integers/u16/inputs/div.in
new file mode 100644
index 0000000000..c39bec0240
--- /dev/null
+++ b/tests/compiler/integers/u16/inputs/div.in
@@ -0,0 +1,7 @@
+[main]
+a: u16 = 4u16;
+b: u16 = 2u16;
+c: u16 = 2u16;
+
+[registers]
+r0: bool = true;
\ No newline at end of file
diff --git a/tests/compiler/integers/u16/inputs/eq.in b/tests/compiler/integers/u16/inputs/eq.in
new file mode 100644
index 0000000000..db5061b76b
--- /dev/null
+++ b/tests/compiler/integers/u16/inputs/eq.in
@@ -0,0 +1,7 @@
+[main]
+a: u16 = 2u16;
+b: u16 = 2u16;
+c: bool = true;
+
+[registers]
+r0: bool = true;
\ No newline at end of file
diff --git a/tests/compiler/integers/u16/inputs/ge.in b/tests/compiler/integers/u16/inputs/ge.in
new file mode 100644
index 0000000000..10bcb8d0c5
--- /dev/null
+++ b/tests/compiler/integers/u16/inputs/ge.in
@@ -0,0 +1,7 @@
+[main]
+a: u16 = 5u16;
+b: u16 = 4u16;
+c: bool = true;
+
+[registers]
+r0: bool = true;
\ No newline at end of file
diff --git a/tests/compiler/integers/u16/inputs/gt.in b/tests/compiler/integers/u16/inputs/gt.in
new file mode 100644
index 0000000000..2b70659fa8
--- /dev/null
+++ b/tests/compiler/integers/u16/inputs/gt.in
@@ -0,0 +1,7 @@
+[main]
+a: u16 = 4u16;
+b: u16 = 2u16;
+c: bool = true;
+
+[registers]
+r0: bool = true;
\ No newline at end of file
diff --git a/tests/compiler/integers/u16/inputs/le.in b/tests/compiler/integers/u16/inputs/le.in
new file mode 100644
index 0000000000..5eec3ec224
--- /dev/null
+++ b/tests/compiler/integers/u16/inputs/le.in
@@ -0,0 +1,7 @@
+[main]
+a: u16 = 1u16;
+b: u16 = 100u16;
+c: bool = true;
+
+[registers]
+r0: bool = true;
\ No newline at end of file
diff --git a/tests/compiler/integers/u16/inputs/lt.in b/tests/compiler/integers/u16/inputs/lt.in
new file mode 100644
index 0000000000..f3ee01a012
--- /dev/null
+++ b/tests/compiler/integers/u16/inputs/lt.in
@@ -0,0 +1,7 @@
+[main]
+a: u16 = 2u16;
+b: u16 = 4u16;
+c: bool = true;
+
+[registers]
+r0: bool = false;
\ No newline at end of file
diff --git a/tests/compiler/integers/u16/inputs/mul.in b/tests/compiler/integers/u16/inputs/mul.in
new file mode 100644
index 0000000000..93fc600bd9
--- /dev/null
+++ b/tests/compiler/integers/u16/inputs/mul.in
@@ -0,0 +1,7 @@
+[main]
+a: u16 = 2u16;
+b: u16 = 5u16;
+c: u16 = 10u16;
+
+[registers]
+r0: bool = false;
\ No newline at end of file
diff --git a/tests/compiler/integers/u16/inputs/ne.in b/tests/compiler/integers/u16/inputs/ne.in
new file mode 100644
index 0000000000..58629b41d1
--- /dev/null
+++ b/tests/compiler/integers/u16/inputs/ne.in
@@ -0,0 +1,7 @@
+[main]
+a: u16 = 2u16;
+b: u16 = 5u16;
+c: bool = true;
+
+[registers]
+r0: bool = false;
\ No newline at end of file
diff --git a/tests/compiler/integers/u16/inputs/pow.in b/tests/compiler/integers/u16/inputs/pow.in
new file mode 100644
index 0000000000..1c76781f71
--- /dev/null
+++ b/tests/compiler/integers/u16/inputs/pow.in
@@ -0,0 +1,7 @@
+[main]
+a: u16 = 2u16;
+b: u16 = 2u16;
+c: u16 = 4u16;
+
+[registers]
+r0: bool = true;
\ No newline at end of file
diff --git a/tests/compiler/integers/u16/inputs/sub.in b/tests/compiler/integers/u16/inputs/sub.in
new file mode 100644
index 0000000000..432c571c9e
--- /dev/null
+++ b/tests/compiler/integers/u16/inputs/sub.in
@@ -0,0 +1,7 @@
+[main]
+a: u16 = 100u16;
+b: u16 = 50u16;
+c: u16 = 50u16;
+
+[registers]
+r0: bool = false;
\ No newline at end of file
diff --git a/tests/compiler/integers/u16/inputs/tern.in b/tests/compiler/integers/u16/inputs/tern.in
new file mode 100644
index 0000000000..09f1593ca2
--- /dev/null
+++ b/tests/compiler/integers/u16/inputs/tern.in
@@ -0,0 +1,8 @@
+[main]
+s: bool = true;
+a: u16 = 10u16;
+b: u16 = 5u16;
+c: u16 = 10u16;
+
+[registers]
+r0: bool = false;
\ No newline at end of file
diff --git a/tests/compiler/integers/u16/inputs/tern_rev.in b/tests/compiler/integers/u16/inputs/tern_rev.in
new file mode 100644
index 0000000000..cb63c9c0a1
--- /dev/null
+++ b/tests/compiler/integers/u16/inputs/tern_rev.in
@@ -0,0 +1,8 @@
+[main]
+s: bool = false;
+a: u16 = 10u16;
+b: u16 = 5u16;
+c: u16 = 5u16;
+
+[registers]
+r0: bool = false;
\ No newline at end of file
diff --git a/tests/compiler/integers/u16/le.leo b/tests/compiler/integers/u16/le.leo
index 4e02c11e05..c0344f743f 100644
--- a/tests/compiler/integers/u16/le.leo
+++ b/tests/compiler/integers/u16/le.leo
@@ -1,31 +1,9 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - u16_f.in: |
-    [main]
-    a: u16 = 3;
-    b: u16 = 2;
-    c: bool = true;
-
-    [registers]
-    r0: bool = true;
- - u16_e.in: |
-    [main]
-    a: u16 = 2;
-    b: u16 = 2;
-    c: bool = true;
-
-    [registers]
-    r0: bool = true;
- - u16_l.in: |
-    [main]
-    a: u16 = 1;
-    b: u16 = 2;
-    c: bool = false;
-
-    [registers]
-    r0: bool = true;
+input_file:
+ - inputs/eq.in
+ - inputs/le.in
 */
 
 function main(a: u16, b: u16, c: bool) -> bool {
diff --git a/tests/compiler/integers/u16/lt.leo b/tests/compiler/integers/u16/lt.leo
index c00278a984..4651414e2b 100644
--- a/tests/compiler/integers/u16/lt.leo
+++ b/tests/compiler/integers/u16/lt.leo
@@ -1,25 +1,11 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - u16_f.in: |
-    [main]
-    a: u16 = 3;
-    b: u16 = 2;
-    c: bool = true;
-
-    [registers]
-    r0: bool = true;
- - u16_g.in: |
-    [main]
-    a: u16 = 1;
-    b: u16 = 2;
-    c: bool = false;
-
-    [registers]
-    r0: bool = true;
+input_file:
+ - inputs/eq.in
+ - inputs/lt.in
 */
 
-function main(a: u16, b: u16, c: bool) -> bool {
+function main(a: u16, b: u16, c: bool) -> bool{
     return a < b == c;
 }
diff --git a/tests/compiler/integers/u16/mul.leo b/tests/compiler/integers/u16/mul.leo
index f729004f42..7971007f8b 100644
--- a/tests/compiler/integers/u16/mul.leo
+++ b/tests/compiler/integers/u16/mul.leo
@@ -1,15 +1,9 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - mul.in: |
-    [main]
-    a: u16 = 10;
-    b: u16 = 20;
-    c: u16 = 30;
-
-    [registers]
-    r0: bool = true;
+input_file:
+ - inputs/mul.in
+    
 */
 
 function main(a: u16, b: u16, c: u16) -> bool {
diff --git a/tests/compiler/integers/u16/ne.leo b/tests/compiler/integers/u16/ne.leo
index 93a762eaf1..ad75d0db1e 100644
--- a/tests/compiler/integers/u16/ne.leo
+++ b/tests/compiler/integers/u16/ne.leo
@@ -1,17 +1,11 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - ne.in: |
-    [main]
-    a: u16 = 10;
-    b: u16 = 20;
-    c: bool = true;
-
-    [registers]
-    r0: bool = true;
+input_file:
+ - inputs/eq.in
+ - inputs/ne.in
 */
 
-function main(a: u16, b: u16, c: bool) -> bool {
+function main(a: u16, b: u16, c: bool) -> bool{
     return (a != b) == c;
 }
diff --git a/tests/compiler/integers/u16/pow.leo b/tests/compiler/integers/u16/pow.leo
index 95ca149755..2613958578 100644
--- a/tests/compiler/integers/u16/pow.leo
+++ b/tests/compiler/integers/u16/pow.leo
@@ -1,14 +1,8 @@
-// namespace: Compile
-// expectation: Pass
-// inputs:
-//  - u16_f.in: |
-//     [main]
-//     a: u16 = 2;
-//     b: u16 = 2;
-//     c: u16 = 4;
-
-//     [registers]
-//     r0: bool = true;
+/*
+namespace: Compile
+expectation: Pass
+input_file: inputs/pow.in
+*/
 
 function main(a: u16, b: u16, c: u16) -> bool {
     return a ** b == c;
diff --git a/tests/compiler/integers/u16/sub.leo b/tests/compiler/integers/u16/sub.leo
index dfdc9e772b..aab87a217c 100644
--- a/tests/compiler/integers/u16/sub.leo
+++ b/tests/compiler/integers/u16/sub.leo
@@ -1,15 +1,8 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - u16_f.in: |
-    [main]
-    a: u16 = 4;
-    b: u16 = 2;
-    c: u16 = 2;
-
-    [registers]
-    r0: bool = true;
+input_file:
+ - inputs/sub.in
 */
 
 function main(a: u16, b: u16, c: u16) -> bool {
diff --git a/tests/compiler/integers/u16/ternary.leo b/tests/compiler/integers/u16/ternary.leo
index 35fe713eb9..ea63b3daea 100644
--- a/tests/compiler/integers/u16/ternary.leo
+++ b/tests/compiler/integers/u16/ternary.leo
@@ -1,25 +1,9 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - u16_t.in: |
-    [main]
-    s: bool = true;
-    a: u16 = 4u16;
-    b: u16 = 2u16;
-    c: u16 = 4u16;
-
-    [registers]
-    r0: bool = true;
- - u16_f.in: |
-    [main]
-    s: bool = false;
-    a: u16 = 4u16;
-    b: u16 = 2u16;
-    c: u16 = 2u16;
-
-    [registers]
-    r0: bool = true;
+input_file:
+ - inputs/tern.in
+ - inputs/tern_rev.in
 */
 
 function main(s: bool, a: u16, b: u16, c: u16) -> bool {
diff --git a/tests/compiler/integers/u32/add.leo b/tests/compiler/integers/u32/add.leo
index 176de60a1c..0be1f7c2cb 100644
--- a/tests/compiler/integers/u32/add.leo
+++ b/tests/compiler/integers/u32/add.leo
@@ -1,15 +1,7 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - u32.in: |
-    [main]
-    a: u32 = 2;
-    b: u32 = 4;
-    c: u32 = 6;
-
-    [registers]
-    r0: bool = true;
+input_file: inputs/add.in
 */
 
 function main(a: u32, b: u32, c: u32) -> bool {
diff --git a/tests/compiler/integers/u32/console_assert.leo b/tests/compiler/integers/u32/console_assert.leo
index ce81cedf30..a4f22e620e 100644
--- a/tests/compiler/integers/u32/console_assert.leo
+++ b/tests/compiler/integers/u32/console_assert.leo
@@ -1,17 +1,11 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - u32.in: |
-    [main]
-    a: u32 = 2;
-    b: u32 = 2;
-
-    [registers]
-    r0: bool = true;
+input_file: inputs/eq.in
 */
 
 function main(a: u32, b: u32) -> bool {
-    console.assert(a == b);
-    return a == b;
+    let ret: bool = a == b;
+    console.assert(ret);
+    return ret;
 }
diff --git a/tests/compiler/integers/u32/div.leo b/tests/compiler/integers/u32/div.leo
index 70e3cdd526..761c4f22e9 100644
--- a/tests/compiler/integers/u32/div.leo
+++ b/tests/compiler/integers/u32/div.leo
@@ -1,15 +1,7 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - u32.in: |
-    [main]
-    a: u32 = 4;
-    b: u32 = 2;
-    c: u32 = 2;
-
-    [registers]
-    r0: bool = true;
+input_file: inputs/div.in
 */
 
 function main(a: u32, b: u32, c: u32) -> bool {
diff --git a/tests/compiler/integers/u32/eq.leo b/tests/compiler/integers/u32/eq.leo
index 8edb4b5093..fb55b6cc4f 100644
--- a/tests/compiler/integers/u32/eq.leo
+++ b/tests/compiler/integers/u32/eq.leo
@@ -1,23 +1,7 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - u32_e.in: |
-    [main]
-    a: u32 = 2;
-    b: u32 = 2;
-    c: bool = true;
-
-    [registers]
-    r0: bool = true;
- - u32_n.in: |
-    [main]
-    a: u32 = 3;
-    b: u32 = 2;
-    c: bool = false;
-
-    [registers]
-    r0: bool = true;
+input_file: inputs/eq.in
 */
 
 function main(a: u32, b: u32, c: bool) -> bool {
diff --git a/tests/compiler/integers/u32/ge.leo b/tests/compiler/integers/u32/ge.leo
index e10409cf8c..80dffba71c 100644
--- a/tests/compiler/integers/u32/ge.leo
+++ b/tests/compiler/integers/u32/ge.leo
@@ -1,31 +1,9 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - u32_g.in: |
-    [main]
-    a: u32 = 3;
-    b: u32 = 2;
-    c: bool = true;
-
-    [registers]
-    r0: bool = true;
- - u32_e.in: |
-    [main]
-    a: u32 = 2;
-    b: u32 = 2;
-    c: bool = true;
-
-    [registers]
-    r0: bool = true;
- - u32_f.in: |
-    [main]
-    a: u32 = 1;
-    b: u32 = 2;
-    c: bool = false;
-
-    [registers]
-    r0: bool = true;
+input_file:
+ - inputs/eq.in
+ - inputs/ge.in
 */
 
 function main(a: u32, b: u32, c: bool) -> bool {
diff --git a/tests/compiler/integers/u32/gt.leo b/tests/compiler/integers/u32/gt.leo
index 741b845ef4..876f546ec9 100644
--- a/tests/compiler/integers/u32/gt.leo
+++ b/tests/compiler/integers/u32/gt.leo
@@ -1,27 +1,11 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - u32_g.in: |
-    [main]
-    a: u32 = 3;
-    b: u32 = 2;
-    c: bool = true;
-
-    [registers]
-    r0: bool = true;
- - u32_f.in: |
-    [main]
-    a: u32 = 1;
-    b: u32 = 2;
-    c: bool = false;
-
-    [registers]
-    r0: bool = true;
+input_file:
+ - inputs/eq.in
+ - inputs/gt.in
 */
 
 function main(a: u32, b: u32, c: bool) -> bool {
-    let ret: bool = a > b == c;
-    console.assert(ret);
-    return ret;
+    return a > b == c;
 }
diff --git a/tests/compiler/integers/u32/input.leo b/tests/compiler/integers/u32/input.leo
deleted file mode 100644
index c411a34e9e..0000000000
--- a/tests/compiler/integers/u32/input.leo
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
-namespace: Compile
-expectation: Pass
-inputs:
- - u32_g.in: |
-    [main]
-    a: u32 = 2;
-    b: u32 = 2;
-
-    [registers]
-    r0: bool = true;
-*/
-
-function main(a: u32, b: u32) -> bool {
-    return a == b;
-}
diff --git a/tests/compiler/integers/u32/inputs/add.in b/tests/compiler/integers/u32/inputs/add.in
new file mode 100644
index 0000000000..26b2cb8d60
--- /dev/null
+++ b/tests/compiler/integers/u32/inputs/add.in
@@ -0,0 +1,7 @@
+[main]
+a: u32 = 1u32;
+b: u32 = 2u32;
+c: u32 = 3u32;
+
+[registers]
+r0: bool = true;
\ No newline at end of file
diff --git a/tests/compiler/integers/u32/inputs/div.in b/tests/compiler/integers/u32/inputs/div.in
new file mode 100644
index 0000000000..597213a182
--- /dev/null
+++ b/tests/compiler/integers/u32/inputs/div.in
@@ -0,0 +1,7 @@
+[main]
+a: u32 = 4u32;
+b: u32 = 2u32;
+c: u32 = 2u32;
+
+[registers]
+r0: bool = true;
\ No newline at end of file
diff --git a/tests/compiler/integers/u32/inputs/eq.in b/tests/compiler/integers/u32/inputs/eq.in
new file mode 100644
index 0000000000..787d8783fa
--- /dev/null
+++ b/tests/compiler/integers/u32/inputs/eq.in
@@ -0,0 +1,7 @@
+[main]
+a: u32 = 2u32;
+b: u32 = 2u32;
+c: bool = true;
+
+[registers]
+r0: bool = true;
\ No newline at end of file
diff --git a/tests/compiler/integers/u32/inputs/ge.in b/tests/compiler/integers/u32/inputs/ge.in
new file mode 100644
index 0000000000..60b1d0649b
--- /dev/null
+++ b/tests/compiler/integers/u32/inputs/ge.in
@@ -0,0 +1,7 @@
+[main]
+a: u32 = 5u32;
+b: u32 = 4u32;
+c: bool = true;
+
+[registers]
+r0: bool = true;
\ No newline at end of file
diff --git a/tests/compiler/integers/u32/inputs/gt.in b/tests/compiler/integers/u32/inputs/gt.in
new file mode 100644
index 0000000000..9f08e6694e
--- /dev/null
+++ b/tests/compiler/integers/u32/inputs/gt.in
@@ -0,0 +1,7 @@
+[main]
+a: u32 = 4u32;
+b: u32 = 2u32;
+c: bool = true;
+
+[registers]
+r0: bool = true;
\ No newline at end of file
diff --git a/tests/compiler/integers/u32/inputs/le.in b/tests/compiler/integers/u32/inputs/le.in
new file mode 100644
index 0000000000..8cfd1a5568
--- /dev/null
+++ b/tests/compiler/integers/u32/inputs/le.in
@@ -0,0 +1,7 @@
+[main]
+a: u32 = 1u32;
+b: u32 = 100u32;
+c: bool = true;
+
+[registers]
+r0: bool = true;
\ No newline at end of file
diff --git a/tests/compiler/integers/u32/inputs/lt.in b/tests/compiler/integers/u32/inputs/lt.in
new file mode 100644
index 0000000000..89110d2345
--- /dev/null
+++ b/tests/compiler/integers/u32/inputs/lt.in
@@ -0,0 +1,7 @@
+[main]
+a: u32 = 2u32;
+b: u32 = 4u32;
+c: bool = true;
+
+[registers]
+r0: bool = false;
\ No newline at end of file
diff --git a/tests/compiler/integers/u32/inputs/mul.in b/tests/compiler/integers/u32/inputs/mul.in
new file mode 100644
index 0000000000..e92115ef0c
--- /dev/null
+++ b/tests/compiler/integers/u32/inputs/mul.in
@@ -0,0 +1,7 @@
+[main]
+a: u32 = 2u32;
+b: u32 = 5u32;
+c: u32 = 10u32;
+
+[registers]
+r0: bool = false;
\ No newline at end of file
diff --git a/tests/compiler/integers/u32/inputs/ne.in b/tests/compiler/integers/u32/inputs/ne.in
new file mode 100644
index 0000000000..47ca378ed3
--- /dev/null
+++ b/tests/compiler/integers/u32/inputs/ne.in
@@ -0,0 +1,7 @@
+[main]
+a: u32 = 2u32;
+b: u32 = 5u32;
+c: bool = true;
+
+[registers]
+r0: bool = false;
\ No newline at end of file
diff --git a/tests/compiler/integers/u32/inputs/sub.in b/tests/compiler/integers/u32/inputs/sub.in
new file mode 100644
index 0000000000..5b9cd1ea6e
--- /dev/null
+++ b/tests/compiler/integers/u32/inputs/sub.in
@@ -0,0 +1,7 @@
+[main]
+a: u32 = 100u32;
+b: u32 = 50u32;
+c: u32 = 50u32;
+
+[registers]
+r0: bool = false;
\ No newline at end of file
diff --git a/tests/compiler/integers/u32/inputs/tern.in b/tests/compiler/integers/u32/inputs/tern.in
new file mode 100644
index 0000000000..44b43741ae
--- /dev/null
+++ b/tests/compiler/integers/u32/inputs/tern.in
@@ -0,0 +1,8 @@
+[main]
+s: bool = true;
+a: u32 = 10u32;
+b: u32 = 5u32;
+c: u32 = 10u32;
+
+[registers]
+r0: bool = false;
\ No newline at end of file
diff --git a/tests/compiler/integers/u32/inputs/tern_rev.in b/tests/compiler/integers/u32/inputs/tern_rev.in
new file mode 100644
index 0000000000..e7f7b4d82f
--- /dev/null
+++ b/tests/compiler/integers/u32/inputs/tern_rev.in
@@ -0,0 +1,8 @@
+[main]
+s: bool = false;
+a: u32 = 10u32;
+b: u32 = 5u32;
+c: u32 = 5u32;
+
+[registers]
+r0: bool = false;
\ No newline at end of file
diff --git a/tests/compiler/integers/u32/le.leo b/tests/compiler/integers/u32/le.leo
index a26f621974..6ea09abd6d 100644
--- a/tests/compiler/integers/u32/le.leo
+++ b/tests/compiler/integers/u32/le.leo
@@ -1,31 +1,9 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - u32_f.in: |
-    [main]
-    a: u32 = 3;
-    b: u32 = 2;
-    c: bool = true;
-
-    [registers]
-    r0: bool = true;
- - u32_e.in: |
-    [main]
-    a: u32 = 2;
-    b: u32 = 2;
-    c: bool = true;
-
-    [registers]
-    r0: bool = true;
- - u32_l.in: |
-    [main]
-    a: u32 = 1;
-    b: u32 = 2;
-    c: bool = false;
-
-    [registers]
-    r0: bool = true;
+input_file:
+ - inputs/eq.in
+ - inputs/le.in
 */
 
 function main(a: u32, b: u32, c: bool) -> bool {
diff --git a/tests/compiler/integers/u32/lt.leo b/tests/compiler/integers/u32/lt.leo
index ba504c02ff..24be6fea36 100644
--- a/tests/compiler/integers/u32/lt.leo
+++ b/tests/compiler/integers/u32/lt.leo
@@ -1,25 +1,11 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - u32_f.in: |
-    [main]
-    a: u32 = 3;
-    b: u32 = 2;
-    c: bool = true;
-
-    [registers]
-    r0: bool = true;
- - u32_g.in: |
-    [main]
-    a: u32 = 1;
-    b: u32 = 2;
-    c: bool = false;
-
-    [registers]
-    r0: bool = true;
+input_file:
+ - inputs/eq.in
+ - inputs/lt.in
 */
 
-function main(a: u32, b: u32, c: bool) -> bool {
+function main(a: u32, b: u32, c: bool) -> bool{
     return a < b == c;
 }
diff --git a/tests/compiler/integers/u32/mul.leo b/tests/compiler/integers/u32/mul.leo
index b0b6e0f73f..3d2bc23acf 100644
--- a/tests/compiler/integers/u32/mul.leo
+++ b/tests/compiler/integers/u32/mul.leo
@@ -1,15 +1,9 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - mul.in: |
-    [main]
-    a: u32 = 10;
-    b: u32 = 20;
-    c: u32 = 30;
-
-    [registers]
-    r0: bool = true;
+input_file:
+ - inputs/mul.in
+    
 */
 
 function main(a: u32, b: u32, c: u32) -> bool {
diff --git a/tests/compiler/integers/u32/ne.leo b/tests/compiler/integers/u32/ne.leo
index e8b2124338..e83f27b8cc 100644
--- a/tests/compiler/integers/u32/ne.leo
+++ b/tests/compiler/integers/u32/ne.leo
@@ -1,17 +1,11 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - ne.in: |
-    [main]
-    a: u32 = 10;
-    b: u32 = 20;
-    c: bool = true;
-
-    [registers]
-    r0: bool = true;
+input_file:
+ - inputs/eq.in
+ - inputs/ne.in
 */
 
-function main(a: u32, b: u32, c: bool) -> bool {
+function main(a: u32, b: u32, c: bool) -> bool{
     return (a != b) == c;
 }
diff --git a/tests/compiler/integers/u32/sub.leo b/tests/compiler/integers/u32/sub.leo
index c8548a1e63..a9397e79df 100644
--- a/tests/compiler/integers/u32/sub.leo
+++ b/tests/compiler/integers/u32/sub.leo
@@ -1,15 +1,8 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - u32_f.in: |
-    [main]
-    a: u32 = 4;
-    b: u32 = 2;
-    c: u32 = 2;
-
-    [registers]
-    r0: bool = true;
+input_file:
+ - inputs/sub.in
 */
 
 function main(a: u32, b: u32, c: u32) -> bool {
diff --git a/tests/compiler/integers/u32/ternary.leo b/tests/compiler/integers/u32/ternary.leo
index f4250293c4..78afca0e16 100644
--- a/tests/compiler/integers/u32/ternary.leo
+++ b/tests/compiler/integers/u32/ternary.leo
@@ -1,25 +1,9 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - u32_t.in: |
-    [main]
-    s: bool = true;
-    a: u32 = 4u32;
-    b: u32 = 2u32;
-    c: u32 = 4u32;
-
-    [registers]
-    r0: bool = true;
- - u32_f.in: |
-    [main]
-    s: bool = false;
-    a: u32 = 4u32;
-    b: u32 = 2u32;
-    c: u32 = 2u32;
-
-    [registers]
-    r0: bool = true;
+input_file:
+ - inputs/tern.in
+ - inputs/tern_rev.in
 */
 
 function main(s: bool, a: u32, b: u32, c: u32) -> bool {
diff --git a/tests/compiler/integers/u64/add.leo b/tests/compiler/integers/u64/add.leo
index 9478bb1010..48466dec2c 100644
--- a/tests/compiler/integers/u64/add.leo
+++ b/tests/compiler/integers/u64/add.leo
@@ -1,15 +1,7 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - u64.in: |
-    [main]
-    a: u64 = 2;
-    b: u64 = 4;
-    c: u64 = 6;
-
-    [registers]
-    r0: bool = true;
+input_file: inputs/add.in
 */
 
 function main(a: u64, b: u64, c: u64) -> bool {
diff --git a/tests/compiler/integers/u64/console_assert.leo b/tests/compiler/integers/u64/console_assert.leo
index e9e732a268..b44d87c06a 100644
--- a/tests/compiler/integers/u64/console_assert.leo
+++ b/tests/compiler/integers/u64/console_assert.leo
@@ -1,17 +1,11 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - u64.in: |
-    [main]
-    a: u64 = 2;
-    b: u64 = 2;
-
-    [registers]
-    r0: bool = true;
+input_file: inputs/eq.in
 */
 
 function main(a: u64, b: u64) -> bool {
-    console.assert(a == b);
-    return a == b;
+    let ret: bool = a == b;
+    console.assert(ret);
+    return ret;
 }
diff --git a/tests/compiler/integers/u64/div.leo b/tests/compiler/integers/u64/div.leo
index 1cd7321331..4c3c4a5db1 100644
--- a/tests/compiler/integers/u64/div.leo
+++ b/tests/compiler/integers/u64/div.leo
@@ -1,15 +1,7 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - u64.in: |
-    [main]
-    a: u64 = 4;
-    b: u64 = 2;
-    c: u64 = 2;
-
-    [registers]
-    r0: bool = true;
+input_file: inputs/div.in
 */
 
 function main(a: u64, b: u64, c: u64) -> bool {
diff --git a/tests/compiler/integers/u64/eq.leo b/tests/compiler/integers/u64/eq.leo
index ea7747beaa..20ed07a90e 100644
--- a/tests/compiler/integers/u64/eq.leo
+++ b/tests/compiler/integers/u64/eq.leo
@@ -1,23 +1,7 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - u64_e.in: |
-    [main]
-    a: u64 = 2;
-    b: u64 = 2;
-    c: bool = true;
-
-    [registers]
-    r0: bool = true;
- - u64_n.in: |
-    [main]
-    a: u64 = 3;
-    b: u64 = 2;
-    c: bool = false;
-
-    [registers]
-    r0: bool = true;
+input_file: inputs/eq.in
 */
 
 function main(a: u64, b: u64, c: bool) -> bool {
diff --git a/tests/compiler/integers/u64/ge.leo b/tests/compiler/integers/u64/ge.leo
index b6bda683a3..846cd6faa3 100644
--- a/tests/compiler/integers/u64/ge.leo
+++ b/tests/compiler/integers/u64/ge.leo
@@ -1,31 +1,9 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - u64_g.in: |
-    [main]
-    a: u64 = 3;
-    b: u64 = 2;
-    c: bool = true;
-
-    [registers]
-    r0: bool = true;
- - u64_e.in: |
-    [main]
-    a: u64 = 2;
-    b: u64 = 2;
-    c: bool = true;
-
-    [registers]
-    r0: bool = true;
- - u64_f.in: |
-    [main]
-    a: u64 = 1;
-    b: u64 = 2;
-    c: bool = false;
-
-    [registers]
-    r0: bool = true;
+input_file:
+ - inputs/eq.in
+ - inputs/ge.in
 */
 
 function main(a: u64, b: u64, c: bool) -> bool {
diff --git a/tests/compiler/integers/u64/gt.leo b/tests/compiler/integers/u64/gt.leo
index 4d88c31fa4..cb634e5e91 100644
--- a/tests/compiler/integers/u64/gt.leo
+++ b/tests/compiler/integers/u64/gt.leo
@@ -1,27 +1,11 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - u64_g.in: |
-    [main]
-    a: u64 = 3;
-    b: u64 = 2;
-    c: bool = true;
-
-    [registers]
-    r0: bool = true;
- - u64_f.in: |
-    [main]
-    a: u64 = 1;
-    b: u64 = 2;
-    c: bool = false;
-
-    [registers]
-    r0: bool = true;
+input_file:
+ - inputs/eq.in
+ - inputs/gt.in
 */
 
 function main(a: u64, b: u64, c: bool) -> bool {
-    let ret: bool = a > b == c;
-    console.assert(ret);
-    return ret;
+    return a > b == c;
 }
diff --git a/tests/compiler/integers/u64/input.leo b/tests/compiler/integers/u64/input.leo
deleted file mode 100644
index 460f4d508a..0000000000
--- a/tests/compiler/integers/u64/input.leo
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
-namespace: Compile
-expectation: Pass
-inputs:
- - u64_g.in: |
-    [main]
-    a: u64 = 2;
-    b: u64 = 2;
-
-    [registers]
-    r0: bool = true;
-*/
-
-function main(a: u64, b: u64) -> bool {
-    return a == b;
-}
diff --git a/tests/compiler/integers/u64/inputs/add.in b/tests/compiler/integers/u64/inputs/add.in
new file mode 100644
index 0000000000..748484ae02
--- /dev/null
+++ b/tests/compiler/integers/u64/inputs/add.in
@@ -0,0 +1,7 @@
+[main]
+a: u64 = 1u64;
+b: u64 = 2u64;
+c: u64 = 3u64;
+
+[registers]
+r0: bool = true;
\ No newline at end of file
diff --git a/tests/compiler/integers/u64/inputs/div.in b/tests/compiler/integers/u64/inputs/div.in
new file mode 100644
index 0000000000..fbf2421ad6
--- /dev/null
+++ b/tests/compiler/integers/u64/inputs/div.in
@@ -0,0 +1,7 @@
+[main]
+a: u64 = 4u64;
+b: u64 = 2u64;
+c: u64 = 2u64;
+
+[registers]
+r0: bool = true;
\ No newline at end of file
diff --git a/tests/compiler/integers/u64/inputs/eq.in b/tests/compiler/integers/u64/inputs/eq.in
new file mode 100644
index 0000000000..c91003ec8e
--- /dev/null
+++ b/tests/compiler/integers/u64/inputs/eq.in
@@ -0,0 +1,7 @@
+[main]
+a: u64 = 2u64;
+b: u64 = 2u64;
+c: bool = true;
+
+[registers]
+r0: bool = true;
\ No newline at end of file
diff --git a/tests/compiler/integers/u64/inputs/ge.in b/tests/compiler/integers/u64/inputs/ge.in
new file mode 100644
index 0000000000..74f0c7c49a
--- /dev/null
+++ b/tests/compiler/integers/u64/inputs/ge.in
@@ -0,0 +1,7 @@
+[main]
+a: u64 = 5u64;
+b: u64 = 4u64;
+c: bool = true;
+
+[registers]
+r0: bool = true;
\ No newline at end of file
diff --git a/tests/compiler/integers/u64/inputs/gt.in b/tests/compiler/integers/u64/inputs/gt.in
new file mode 100644
index 0000000000..2bb99fe4d4
--- /dev/null
+++ b/tests/compiler/integers/u64/inputs/gt.in
@@ -0,0 +1,7 @@
+[main]
+a: u64 = 4u64;
+b: u64 = 2u64;
+c: bool = true;
+
+[registers]
+r0: bool = true;
\ No newline at end of file
diff --git a/tests/compiler/integers/u64/inputs/le.in b/tests/compiler/integers/u64/inputs/le.in
new file mode 100644
index 0000000000..b2fbc6e705
--- /dev/null
+++ b/tests/compiler/integers/u64/inputs/le.in
@@ -0,0 +1,7 @@
+[main]
+a: u64 = 1u64;
+b: u64 = 100u64;
+c: bool = true;
+
+[registers]
+r0: bool = true;
\ No newline at end of file
diff --git a/tests/compiler/integers/u64/inputs/lt.in b/tests/compiler/integers/u64/inputs/lt.in
new file mode 100644
index 0000000000..5a37c0db3a
--- /dev/null
+++ b/tests/compiler/integers/u64/inputs/lt.in
@@ -0,0 +1,7 @@
+[main]
+a: u64 = 2u64;
+b: u64 = 4u64;
+c: bool = true;
+
+[registers]
+r0: bool = false;
\ No newline at end of file
diff --git a/tests/compiler/integers/u64/inputs/mul.in b/tests/compiler/integers/u64/inputs/mul.in
new file mode 100644
index 0000000000..22d5adbf83
--- /dev/null
+++ b/tests/compiler/integers/u64/inputs/mul.in
@@ -0,0 +1,7 @@
+[main]
+a: u64 = 2u64;
+b: u64 = 5u64;
+c: u64 = 10u64;
+
+[registers]
+r0: bool = false;
\ No newline at end of file
diff --git a/tests/compiler/integers/u64/inputs/ne.in b/tests/compiler/integers/u64/inputs/ne.in
new file mode 100644
index 0000000000..ded1c9394c
--- /dev/null
+++ b/tests/compiler/integers/u64/inputs/ne.in
@@ -0,0 +1,7 @@
+[main]
+a: u64 = 2u64;
+b: u64 = 5u64;
+c: bool = true;
+
+[registers]
+r0: bool = false;
\ No newline at end of file
diff --git a/tests/compiler/integers/u64/inputs/sub.in b/tests/compiler/integers/u64/inputs/sub.in
new file mode 100644
index 0000000000..6507a778d7
--- /dev/null
+++ b/tests/compiler/integers/u64/inputs/sub.in
@@ -0,0 +1,7 @@
+[main]
+a: u64 = 100u64;
+b: u64 = 50u64;
+c: u64 = 50u64;
+
+[registers]
+r0: bool = false;
\ No newline at end of file
diff --git a/tests/compiler/integers/u64/inputs/tern.in b/tests/compiler/integers/u64/inputs/tern.in
new file mode 100644
index 0000000000..91e8bb9f47
--- /dev/null
+++ b/tests/compiler/integers/u64/inputs/tern.in
@@ -0,0 +1,8 @@
+[main]
+s: bool = true;
+a: u64 = 10u64;
+b: u64 = 5u64;
+c: u64 = 10u64;
+
+[registers]
+r0: bool = false;
\ No newline at end of file
diff --git a/tests/compiler/integers/u64/inputs/tern_rev.in b/tests/compiler/integers/u64/inputs/tern_rev.in
new file mode 100644
index 0000000000..19aec893db
--- /dev/null
+++ b/tests/compiler/integers/u64/inputs/tern_rev.in
@@ -0,0 +1,8 @@
+[main]
+s: bool = false;
+a: u64 = 10u64;
+b: u64 = 5u64;
+c: u64 = 5u64;
+
+[registers]
+r0: bool = false;
\ No newline at end of file
diff --git a/tests/compiler/integers/u64/le.leo b/tests/compiler/integers/u64/le.leo
index b83333882b..b753c46ba6 100644
--- a/tests/compiler/integers/u64/le.leo
+++ b/tests/compiler/integers/u64/le.leo
@@ -1,31 +1,9 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - u64_f.in: |
-    [main]
-    a: u64 = 3;
-    b: u64 = 2;
-    c: bool = true;
-
-    [registers]
-    r0: bool = true;
- - u64_e.in: |
-    [main]
-    a: u64 = 2;
-    b: u64 = 2;
-    c: bool = true;
-
-    [registers]
-    r0: bool = true;
- - u64_l.in: |
-    [main]
-    a: u64 = 1;
-    b: u64 = 2;
-    c: bool = false;
-
-    [registers]
-    r0: bool = true;
+input_file:
+ - inputs/eq.in
+ - inputs/le.in
 */
 
 function main(a: u64, b: u64, c: bool) -> bool {
diff --git a/tests/compiler/integers/u64/lt.leo b/tests/compiler/integers/u64/lt.leo
index 4e30c8d848..db91c9aac6 100644
--- a/tests/compiler/integers/u64/lt.leo
+++ b/tests/compiler/integers/u64/lt.leo
@@ -1,25 +1,11 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - u64_f.in: |
-    [main]
-    a: u64 = 3;
-    b: u64 = 2;
-    c: bool = true;
-
-    [registers]
-    r0: bool = true;
- - u64_g.in: |
-    [main]
-    a: u64 = 1;
-    b: u64 = 2;
-    c: bool = false;
-
-    [registers]
-    r0: bool = true;
+input_file:
+ - inputs/eq.in
+ - inputs/lt.in
 */
 
-function main(a: u64, b: u64, c: bool) -> bool {
+function main(a: u64, b: u64, c: bool) -> bool{
     return a < b == c;
 }
diff --git a/tests/compiler/integers/u64/mul.leo b/tests/compiler/integers/u64/mul.leo
index 483e440823..01cd775f4f 100644
--- a/tests/compiler/integers/u64/mul.leo
+++ b/tests/compiler/integers/u64/mul.leo
@@ -1,15 +1,9 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - mul.in: |
-    [main]
-    a: u64 = 10;
-    b: u64 = 20;
-    c: u64 = 30;
-
-    [registers]
-    r0: bool = true;
+input_file:
+ - inputs/mul.in
+    
 */
 
 function main(a: u64, b: u64, c: u64) -> bool {
diff --git a/tests/compiler/integers/u64/ne.leo b/tests/compiler/integers/u64/ne.leo
index 3c3d8c7461..b8ddfe6f60 100644
--- a/tests/compiler/integers/u64/ne.leo
+++ b/tests/compiler/integers/u64/ne.leo
@@ -1,17 +1,11 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - ne.in: |
-    [main]
-    a: u64 = 10;
-    b: u64 = 20;
-    c: bool = true;
-
-    [registers]
-    r0: bool = true;
+input_file:
+ - inputs/eq.in
+ - inputs/ne.in
 */
 
-function main(a: u64, b: u64, c: bool) -> bool {
+function main(a: u64, b: u64, c: bool) -> bool{
     return (a != b) == c;
 }
diff --git a/tests/compiler/integers/u64/sub.leo b/tests/compiler/integers/u64/sub.leo
index c5aa32b477..c00e63daa5 100644
--- a/tests/compiler/integers/u64/sub.leo
+++ b/tests/compiler/integers/u64/sub.leo
@@ -1,15 +1,8 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - u64_f.in: |
-    [main]
-    a: u64 = 4;
-    b: u64 = 2;
-    c: u64 = 2;
-
-    [registers]
-    r0: bool = true;
+input_file:
+ - inputs/sub.in
 */
 
 function main(a: u64, b: u64, c: u64) -> bool {
diff --git a/tests/compiler/integers/u64/ternary.leo b/tests/compiler/integers/u64/ternary.leo
index 9e36495596..d70691a558 100644
--- a/tests/compiler/integers/u64/ternary.leo
+++ b/tests/compiler/integers/u64/ternary.leo
@@ -1,25 +1,9 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - u64_t.in: |
-    [main]
-    s: bool = true;
-    a: u64 = 4u64;
-    b: u64 = 2u64;
-    c: u64 = 4u64;
-
-    [registers]
-    r0: bool = true;
- - u64_f.in: |
-    [main]
-    s: bool = false;
-    a: u64 = 4u64;
-    b: u64 = 2u64;
-    c: u64 = 2u64;
-
-    [registers]
-    r0: bool = true;
+input_file:
+ - inputs/tern.in
+ - inputs/tern_rev.in
 */
 
 function main(s: bool, a: u64, b: u64, c: u64) -> bool {
diff --git a/tests/compiler/integers/u8/add.leo b/tests/compiler/integers/u8/add.leo
index aca4a0366d..864aa73907 100644
--- a/tests/compiler/integers/u8/add.leo
+++ b/tests/compiler/integers/u8/add.leo
@@ -1,15 +1,7 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - u8.in: |
-    [main]
-    a: u8 = 2;
-    b: u8 = 4;
-    c: u8 = 6;
-
-    [registers]
-    r0: bool = true;
+input_file: inputs/add.in
 */
 
 function main(a: u8, b: u8, c: u8) -> bool {
diff --git a/tests/compiler/integers/u8/console_assert.leo b/tests/compiler/integers/u8/console_assert.leo
index 710787e4f9..bdcb469c13 100644
--- a/tests/compiler/integers/u8/console_assert.leo
+++ b/tests/compiler/integers/u8/console_assert.leo
@@ -1,17 +1,11 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - u8.in: |
-    [main]
-    a: u8 = 2;
-    b: u8 = 2;
-
-    [registers]
-    r0: bool = true;
+input_file: inputs/eq.in
 */
 
 function main(a: u8, b: u8) -> bool {
-    console.assert(a == b);
-    return a == b;
+    let ret: bool = a == b;
+    console.assert(ret);
+    return ret;
 }
diff --git a/tests/compiler/integers/u8/div.leo b/tests/compiler/integers/u8/div.leo
index b6a8ff68ec..e61d8e9cb7 100644
--- a/tests/compiler/integers/u8/div.leo
+++ b/tests/compiler/integers/u8/div.leo
@@ -1,15 +1,7 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - u8.in: |
-    [main]
-    a: u8 = 4;
-    b: u8 = 2;
-    c: u8 = 2;
-
-    [registers]
-    r0: bool = true;
+input_file: inputs/div.in
 */
 
 function main(a: u8, b: u8, c: u8) -> bool {
diff --git a/tests/compiler/integers/u8/eq.leo b/tests/compiler/integers/u8/eq.leo
index 71a24c69fc..fbeb033efd 100644
--- a/tests/compiler/integers/u8/eq.leo
+++ b/tests/compiler/integers/u8/eq.leo
@@ -1,23 +1,7 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - u8_e.in: |
-    [main]
-    a: u8 = 2;
-    b: u8 = 2;
-    c: bool = true;
-
-    [registers]
-    r0: bool = true;
- - u8_n.in: |
-    [main]
-    a: u8 = 3;
-    b: u8 = 2;
-    c: bool = false;
-
-    [registers]
-    r0: bool = true;
+input_file: inputs/eq.in
 */
 
 function main(a: u8, b: u8, c: bool) -> bool {
diff --git a/tests/compiler/integers/u8/ge.leo b/tests/compiler/integers/u8/ge.leo
index f51243237f..4a76db6b1e 100644
--- a/tests/compiler/integers/u8/ge.leo
+++ b/tests/compiler/integers/u8/ge.leo
@@ -1,31 +1,9 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - u8_g.in: |
-    [main]
-    a: u8 = 3;
-    b: u8 = 2;
-    c: bool = true;
-
-    [registers]
-    r0: bool = true;
- - u8_e.in: |
-    [main]
-    a: u8 = 2;
-    b: u8 = 2;
-    c: bool = true;
-
-    [registers]
-    r0: bool = true;
- - u8_f.in: |
-    [main]
-    a: u8 = 1;
-    b: u8 = 2;
-    c: bool = false;
-
-    [registers]
-    r0: bool = true;
+input_file:
+ - inputs/eq.in
+ - inputs/ge.in
 */
 
 function main(a: u8, b: u8, c: bool) -> bool {
diff --git a/tests/compiler/integers/u8/gt.leo b/tests/compiler/integers/u8/gt.leo
index 0223b7f66b..4b49214e14 100644
--- a/tests/compiler/integers/u8/gt.leo
+++ b/tests/compiler/integers/u8/gt.leo
@@ -1,27 +1,11 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - u8_g.in: |
-    [main]
-    a: u8 = 3u8;
-    b: u8 = 2u8;
-    c: bool = true;
-
-    [registers]
-    r0: bool = true;
- - u8_f.in: |
-    [main]
-    a: u8 = 1u8;
-    b: u8 = 2u8;
-    c: bool = false;
-
-    [registers]
-    r0: bool = true;
+input_file:
+ - inputs/eq.in
+ - inputs/gt.in
 */
 
 function main(a: u8, b: u8, c: bool) -> bool {
-    let ret: bool = a > b == c;
-    console.assert(ret);
-    return ret;
+    return a > b == c;
 }
diff --git a/tests/compiler/integers/u8/input.leo b/tests/compiler/integers/u8/input.leo
deleted file mode 100644
index 06e53ef670..0000000000
--- a/tests/compiler/integers/u8/input.leo
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
-namespace: Compile
-expectation: Pass
-inputs:
- - u8_g.in: |
-    [main]
-    a: u8 = 2;
-    b: u8 = 2;
-
-    [registers]
-    r0: bool = true;
-*/
-
-function main(a: u8, b: u8) -> bool {
-    return a == b;
-}
diff --git a/tests/compiler/integers/u8/inputs/add.in b/tests/compiler/integers/u8/inputs/add.in
new file mode 100644
index 0000000000..e359a13198
--- /dev/null
+++ b/tests/compiler/integers/u8/inputs/add.in
@@ -0,0 +1,7 @@
+[main]
+a: u8 = 1u8;
+b: u8 = 2u8;
+c: u8 = 3u8;
+
+[registers]
+r0: bool = true;
\ No newline at end of file
diff --git a/tests/compiler/integers/u8/inputs/div.in b/tests/compiler/integers/u8/inputs/div.in
new file mode 100644
index 0000000000..d9a954a9c5
--- /dev/null
+++ b/tests/compiler/integers/u8/inputs/div.in
@@ -0,0 +1,7 @@
+[main]
+a: u8 = 4u8;
+b: u8 = 2u8;
+c: u8 = 2u8;
+
+[registers]
+r0: bool = true;
\ No newline at end of file
diff --git a/tests/compiler/integers/u8/inputs/eq.in b/tests/compiler/integers/u8/inputs/eq.in
new file mode 100644
index 0000000000..7752f0574a
--- /dev/null
+++ b/tests/compiler/integers/u8/inputs/eq.in
@@ -0,0 +1,7 @@
+[main]
+a: u8 = 2u8;
+b: u8 = 2u8;
+c: bool = true;
+
+[registers]
+r0: bool = true;
\ No newline at end of file
diff --git a/tests/compiler/integers/u8/inputs/ge.in b/tests/compiler/integers/u8/inputs/ge.in
new file mode 100644
index 0000000000..3412334ad4
--- /dev/null
+++ b/tests/compiler/integers/u8/inputs/ge.in
@@ -0,0 +1,7 @@
+[main]
+a: u8 = 5u8;
+b: u8 = 4u8;
+c: bool = true;
+
+[registers]
+r0: bool = true;
\ No newline at end of file
diff --git a/tests/compiler/integers/u8/inputs/gt.in b/tests/compiler/integers/u8/inputs/gt.in
new file mode 100644
index 0000000000..57d34ef43d
--- /dev/null
+++ b/tests/compiler/integers/u8/inputs/gt.in
@@ -0,0 +1,7 @@
+[main]
+a: u8 = 4u8;
+b: u8 = 2u8;
+c: bool = true;
+
+[registers]
+r0: bool = true;
\ No newline at end of file
diff --git a/tests/compiler/integers/u8/inputs/le.in b/tests/compiler/integers/u8/inputs/le.in
new file mode 100644
index 0000000000..6db41a6930
--- /dev/null
+++ b/tests/compiler/integers/u8/inputs/le.in
@@ -0,0 +1,7 @@
+[main]
+a: u8 = 1u8;
+b: u8 = 100u8;
+c: bool = true;
+
+[registers]
+r0: bool = true;
\ No newline at end of file
diff --git a/tests/compiler/integers/u8/inputs/lt.in b/tests/compiler/integers/u8/inputs/lt.in
new file mode 100644
index 0000000000..61370dfc10
--- /dev/null
+++ b/tests/compiler/integers/u8/inputs/lt.in
@@ -0,0 +1,7 @@
+[main]
+a: u8 = 2u8;
+b: u8 = 4u8;
+c: bool = true;
+
+[registers]
+r0: bool = false;
\ No newline at end of file
diff --git a/tests/compiler/integers/u8/inputs/mul.in b/tests/compiler/integers/u8/inputs/mul.in
new file mode 100644
index 0000000000..5e403b2d31
--- /dev/null
+++ b/tests/compiler/integers/u8/inputs/mul.in
@@ -0,0 +1,7 @@
+[main]
+a: u8 = 2u8;
+b: u8 = 5u8;
+c: u8 = 10u8;
+
+[registers]
+r0: bool = false;
\ No newline at end of file
diff --git a/tests/compiler/integers/u8/inputs/ne.in b/tests/compiler/integers/u8/inputs/ne.in
new file mode 100644
index 0000000000..eb8fc0e5f6
--- /dev/null
+++ b/tests/compiler/integers/u8/inputs/ne.in
@@ -0,0 +1,7 @@
+[main]
+a: u8 = 2u8;
+b: u8 = 5u8;
+c: bool = true;
+
+[registers]
+r0: bool = false;
\ No newline at end of file
diff --git a/tests/compiler/integers/u8/inputs/pow.in b/tests/compiler/integers/u8/inputs/pow.in
new file mode 100644
index 0000000000..100f45172f
--- /dev/null
+++ b/tests/compiler/integers/u8/inputs/pow.in
@@ -0,0 +1,7 @@
+[main]
+a: u8 = 2u8;
+b: u8 = 2u8;
+c: u8 = 4u8;
+
+[registers]
+r0: bool = true;
\ No newline at end of file
diff --git a/tests/compiler/integers/u8/inputs/sub.in b/tests/compiler/integers/u8/inputs/sub.in
new file mode 100644
index 0000000000..83936a5047
--- /dev/null
+++ b/tests/compiler/integers/u8/inputs/sub.in
@@ -0,0 +1,7 @@
+[main]
+a: u8 = 100u8;
+b: u8 = 50u8;
+c: u8 = 50u8;
+
+[registers]
+r0: bool = false;
\ No newline at end of file
diff --git a/tests/compiler/integers/u8/inputs/tern.in b/tests/compiler/integers/u8/inputs/tern.in
new file mode 100644
index 0000000000..d84e6b6647
--- /dev/null
+++ b/tests/compiler/integers/u8/inputs/tern.in
@@ -0,0 +1,8 @@
+[main]
+s: bool = true;
+a: u8 = 10u8;
+b: u8 = 5u8;
+c: u8 = 10u8;
+
+[registers]
+r0: bool = false;
\ No newline at end of file
diff --git a/tests/compiler/integers/u8/inputs/tern_rev.in b/tests/compiler/integers/u8/inputs/tern_rev.in
new file mode 100644
index 0000000000..fd939f1186
--- /dev/null
+++ b/tests/compiler/integers/u8/inputs/tern_rev.in
@@ -0,0 +1,8 @@
+[main]
+s: bool = false;
+a: u8 = 10u8;
+b: u8 = 5u8;
+c: u8 = 5u8;
+
+[registers]
+r0: bool = false;
\ No newline at end of file
diff --git a/tests/compiler/integers/u8/le.leo b/tests/compiler/integers/u8/le.leo
index f2a66ab074..94675a5a78 100644
--- a/tests/compiler/integers/u8/le.leo
+++ b/tests/compiler/integers/u8/le.leo
@@ -1,31 +1,9 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - u8_f.in: |
-    [main]
-    a: u8 = 3;
-    b: u8 = 2;
-    c: bool = true;
-
-    [registers]
-    r0: bool = true;
- - u8_e.in: |
-    [main]
-    a: u8 = 2;
-    b: u8 = 2;
-    c: bool = true;
-
-    [registers]
-    r0: bool = true;
- - u8_l.in: |
-    [main]
-    a: u8 = 1;
-    b: u8 = 2;
-    c: bool = false;
-
-    [registers]
-    r0: bool = true;
+input_file:
+ - inputs/eq.in
+ - inputs/le.in
 */
 
 function main(a: u8, b: u8, c: bool) -> bool {
diff --git a/tests/compiler/integers/u8/lt.leo b/tests/compiler/integers/u8/lt.leo
index d47a4b411d..4b655045da 100644
--- a/tests/compiler/integers/u8/lt.leo
+++ b/tests/compiler/integers/u8/lt.leo
@@ -1,25 +1,11 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - u8_f.in: |
-    [main]
-    a: u8 = 3;
-    b: u8 = 2;
-    c: bool = true;
-
-    [registers]
-    r0: bool = true;
- - u8_g.in: |
-    [main]
-    a: u8 = 1;
-    b: u8 = 2;
-    c: bool = false;
-
-    [registers]
-    r0: bool = true;
+input_file:
+ - inputs/eq.in
+ - inputs/lt.in
 */
 
-function main(a: u8, b: u8, c: bool) -> bool {
+function main(a: u8, b: u8, c: bool) -> bool{
     return a < b == c;
 }
diff --git a/tests/compiler/integers/u8/mul.leo b/tests/compiler/integers/u8/mul.leo
index 93b95c601f..116e07834f 100644
--- a/tests/compiler/integers/u8/mul.leo
+++ b/tests/compiler/integers/u8/mul.leo
@@ -1,15 +1,9 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - mul.in: |
-    [main]
-    a: u8 = 10;
-    b: u8 = 20;
-    c: u8 = 30;
-
-    [registers]
-    r0: bool = true;
+input_file:
+ - inputs/mul.in
+    
 */
 
 function main(a: u8, b: u8, c: u8) -> bool {
diff --git a/tests/compiler/integers/u8/ne.leo b/tests/compiler/integers/u8/ne.leo
index 8c41c9a611..ba6b1fbfa9 100644
--- a/tests/compiler/integers/u8/ne.leo
+++ b/tests/compiler/integers/u8/ne.leo
@@ -1,17 +1,11 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - ne.in: |
-    [main]
-    a: u8 = 10;
-    b: u8 = 20;
-    c: bool = true;
-
-    [registers]
-    r0: bool = true;
+input_file:
+ - inputs/eq.in
+ - inputs/ne.in
 */
 
-function main(a: u8, b: u8, c: bool) -> bool {
+function main(a: u8, b: u8, c: bool) -> bool{
     return (a != b) == c;
 }
diff --git a/tests/compiler/integers/u8/pow.leo b/tests/compiler/integers/u8/pow.leo
index 2c59776540..20581cb74e 100644
--- a/tests/compiler/integers/u8/pow.leo
+++ b/tests/compiler/integers/u8/pow.leo
@@ -1,14 +1,8 @@
-// namespace: Compile
-// expectation: Pass
-// inputs:
-//  - u8_f.in: |
-//     [main]
-//     a: u8 = 2;
-//     b: u8 = 2;
-//     c: u8 = 4;
-
-//     [registers]
-//     r0: bool = true;
+/*
+namespace: Compile
+expectation: Pass
+input_file: inputs/pow.in
+*/
 
 function main(a: u8, b: u8, c: u8) -> bool {
     return a ** b == c;
diff --git a/tests/compiler/integers/u8/sub.leo b/tests/compiler/integers/u8/sub.leo
index 421a47cbbb..121510fe81 100644
--- a/tests/compiler/integers/u8/sub.leo
+++ b/tests/compiler/integers/u8/sub.leo
@@ -1,15 +1,8 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - u8_f.in: |
-    [main]
-    a: u8 = 4;
-    b: u8 = 2;
-    c: u8 = 2;
-
-    [registers]
-    r0: bool = true;
+input_file:
+ - inputs/sub.in
 */
 
 function main(a: u8, b: u8, c: u8) -> bool {
diff --git a/tests/compiler/integers/u8/ternary.leo b/tests/compiler/integers/u8/ternary.leo
index c12b042128..f296b0bae2 100644
--- a/tests/compiler/integers/u8/ternary.leo
+++ b/tests/compiler/integers/u8/ternary.leo
@@ -1,25 +1,9 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
- - u8_t.in: |
-    [main]
-    s: bool = true;
-    a: u8 = 4u8;
-    b: u8 = 2u8;
-    c: u8 = 4u8;
-
-    [registers]
-    r0: bool = true;
- - u8_f.in: |
-    [main]
-    s: bool = false;
-    b: u8 = 2u8;
-    c: u8 = 2u8;
-    a: u8 = 4u8;
-
-    [registers]
-    r0: bool = true;
+input_file:
+ - inputs/tern.in
+ - inputs/tern_rev.in
 */
 
 function main(s: bool, a: u8, b: u8, c: u8) -> bool {
diff --git a/tests/expectations/compiler/compiler/integers/i128/add.leo.out b/tests/expectations/compiler/compiler/integers/i128/add.leo.out
index c83e1d2ec8..5974025612 100644
--- a/tests/expectations/compiler/compiler/integers/i128/add.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/add.leo.out
@@ -2,5 +2,7 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - output: []
+  - output:
+      - initial_input_ast: 0eb1ad9d13a2a11ba96f8ae311f1f91922abd5316ec123f92be78864c33464b4
+        symbol_table: 54846553d446c2927d5ecb9ee1011ad792d4d1c40ea844401f2426b10715a680
     initial_ast: 4ba3f688a429a73f874a1c391a591e7155a4722ff99c339d0814eb903b3265db
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 c083b1dfb1..39487d44c1 100644
--- a/tests/expectations/compiler/compiler/integers/i128/console_assert.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/console_assert.leo.out
@@ -2,5 +2,7 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - output: []
+  - output:
+      - initial_input_ast: 2b35d182059f5f8aea05705b54c7446011ee78919bbda9f163927613f924f100
+        symbol_table: 9c9e7151463a523fd4410f3bd700725a01f6a80c8c8dc3f1c993966c0de98c09
     initial_ast: 48e5e86ca0706ef02b3889899d4a0f4b8f33f95a4b93a1eef6f86c1e0a7699d7
diff --git a/tests/expectations/compiler/compiler/integers/i128/div.leo.out b/tests/expectations/compiler/compiler/integers/i128/div.leo.out
index 55ff9cf3ab..2f5d6c8ae6 100644
--- a/tests/expectations/compiler/compiler/integers/i128/div.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/div.leo.out
@@ -2,5 +2,7 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - output: []
+  - output:
+      - initial_input_ast: a8d3b28b557b2c19b8bb0083c015f5f217971e856d0a5c2462e956bf55b68126
+        symbol_table: 261fff42cc71579a58e904653d48ba00de0882492824bceba53de8f7088f0022
     initial_ast: 22d811ec372bfcfa643f49485200451dc5fe2b928483cb9801cd10461100e3b1
diff --git a/tests/expectations/compiler/compiler/integers/i128/eq.leo.out b/tests/expectations/compiler/compiler/integers/i128/eq.leo.out
index ef00d86cd3..da2702b948 100644
--- a/tests/expectations/compiler/compiler/integers/i128/eq.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/eq.leo.out
@@ -2,5 +2,7 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - output: []
+  - output:
+      - initial_input_ast: 2b35d182059f5f8aea05705b54c7446011ee78919bbda9f163927613f924f100
+        symbol_table: 7742acd8e7ea62cf83f6f958bdff8ee3c97b8217e496ae97abb297a97e922ece
     initial_ast: da2b5ade996589a255e02d69a67f76814bb7ac0b0e685bf7e9776ceb4e0b9a7c
diff --git a/tests/expectations/compiler/compiler/integers/i16/add.leo.out b/tests/expectations/compiler/compiler/integers/i16/add.leo.out
index 39aec1774a..51cd886f1a 100644
--- a/tests/expectations/compiler/compiler/integers/i16/add.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/add.leo.out
@@ -2,5 +2,7 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - output: []
+  - output:
+      - initial_input_ast: 52a0e922c0ada1f3302f3d4d7feb758ff3937a8615a2fd23325cffcb0c50cf45
+        symbol_table: 96a506d25fe727e53530eacbd3682793addcb7a84023076157685efc7b361094
     initial_ast: 9ebcf93a3a1c925cbda80ad0a4f715a975500a8a08698ef25e8c980bc5c074fc
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 f17a26fb3b..1a449abba0 100644
--- a/tests/expectations/compiler/compiler/integers/i16/console_assert.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/console_assert.leo.out
@@ -2,5 +2,7 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - output: []
+  - output:
+      - initial_input_ast: b12ba1759e7600fe50376c2dc04f2cc908cae643be6693583c167493b8b5064e
+        symbol_table: 8148993a56b823d1c3ed2b0091421bed32de7ee8e06e4675a634df7f26c11ed6
     initial_ast: f8796fe09d11eab12fb3fd4de7daff8179e542873a689874fcc85f61fe6f52eb
diff --git a/tests/expectations/compiler/compiler/integers/i16/div.leo.out b/tests/expectations/compiler/compiler/integers/i16/div.leo.out
index 30398ca36c..89b46a36c6 100644
--- a/tests/expectations/compiler/compiler/integers/i16/div.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/div.leo.out
@@ -2,5 +2,7 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - output: []
+  - output:
+      - initial_input_ast: d60a59011ffd9b722482df1f60fecf4035905e7991faf3509dc956204e26dbdb
+        symbol_table: 8145a65338e36b50928ebf9b2abe5188f1c463bc8c7d3e81e32af1455dfab6c2
     initial_ast: 69e960fb1923255efda2ba99dc07c01cd2e8d38cbf63363f7112f9c4e9efc768
diff --git a/tests/expectations/compiler/compiler/integers/i16/eq.leo.out b/tests/expectations/compiler/compiler/integers/i16/eq.leo.out
index 3dba06bbf8..d64b132606 100644
--- a/tests/expectations/compiler/compiler/integers/i16/eq.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/eq.leo.out
@@ -2,5 +2,7 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - output: []
+  - output:
+      - initial_input_ast: b12ba1759e7600fe50376c2dc04f2cc908cae643be6693583c167493b8b5064e
+        symbol_table: 30b68abf213d0d951d5a152ffd42ea17a71908f6d9b33cefed8bfe51545e351c
     initial_ast: a6cb462814fae8bb80601fdc772c4ba3831c35b069b235e01f1ad8fe857d879d
diff --git a/tests/expectations/compiler/compiler/integers/i16/pow.leo.out b/tests/expectations/compiler/compiler/integers/i16/pow.leo.out
new file mode 100644
index 0000000000..268961109d
--- /dev/null
+++ b/tests/expectations/compiler/compiler/integers/i16/pow.leo.out
@@ -0,0 +1,8 @@
+---
+namespace: Compile
+expectation: Pass
+outputs:
+  - output:
+      - initial_input_ast: 0846c83f3770a2b34da6bc8d91e3d268865a2ff10396b6abd4e4d39e4de26d0f
+        symbol_table: 882de3f5872a9974f1f9de1ee1b889521e42d711b18823d5e2913f4203e9a3f1
+    initial_ast: a08275f81f9cc40bb4949c7d0799e2ee0f2831e6947ea6008842f4567bfa9639
diff --git a/tests/expectations/compiler/compiler/integers/i32/add.leo.out b/tests/expectations/compiler/compiler/integers/i32/add.leo.out
index 918782d562..c529517352 100644
--- a/tests/expectations/compiler/compiler/integers/i32/add.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/add.leo.out
@@ -2,5 +2,7 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - output: []
+  - output:
+      - initial_input_ast: 187821d38d4d6bee83ad16df121b4cd61453c250259cc88b5224cde2cb0f81bd
+        symbol_table: 456cb5f3b7f9a73ee28c016d041b322f5e72d5b8bdaf6eb6ead7799b3d6b3435
     initial_ast: cf9129f53ff9903788b6c1dc51f1068af87f29e6ba40694f24648ef5c5e147b6
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 d63f2d3567..1ac0afb6a7 100644
--- a/tests/expectations/compiler/compiler/integers/i32/console_assert.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/console_assert.leo.out
@@ -2,5 +2,7 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - output: []
-    initial_ast: 76ec9e41cef6c51df4d6f773879a63141cb4a18c1a1cae319346a8b288f37080
+  - output:
+      - initial_input_ast: a139a8bae62ab18b9235331f7dde3acb349c1445e807293c71235fd149b12c7a
+        symbol_table: 02813ad8615c1b4d489af2d0302fa220060d45ba5938d8fa5226f8d6c859e824
+    initial_ast: af1f895a3ffd3c6b09bf785a7ba78085a828a7d267db27e39ceb0b5ebe6f1a98
diff --git a/tests/expectations/compiler/compiler/integers/i32/div.leo.out b/tests/expectations/compiler/compiler/integers/i32/div.leo.out
index 6827442baa..9cade3a791 100644
--- a/tests/expectations/compiler/compiler/integers/i32/div.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/div.leo.out
@@ -2,5 +2,7 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - output: []
+  - output:
+      - initial_input_ast: 5c4c17182ebea3e67d0b4f30c4c5541f039ff6d44914806b5358ae789fde1576
+        symbol_table: e07c9c8414f7a348d9b78f47e2c74e889afcded8c8ec4cc062e9cde4790021ff
     initial_ast: a163bed0fb5969ce86f5ee3f27097c710163519a79148e06354a7ae52f598687
diff --git a/tests/expectations/compiler/compiler/integers/i32/eq.leo.out b/tests/expectations/compiler/compiler/integers/i32/eq.leo.out
index abede25243..16eafa4302 100644
--- a/tests/expectations/compiler/compiler/integers/i32/eq.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/eq.leo.out
@@ -2,5 +2,7 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - output: []
+  - output:
+      - initial_input_ast: a139a8bae62ab18b9235331f7dde3acb349c1445e807293c71235fd149b12c7a
+        symbol_table: bf48d3e21defc5b5e17968032fa47e3381d4dae35473bbaa9f0f548a31f5df50
     initial_ast: ba62f96d9796deebf5cb8c68abe3265e0a0352a6ba500b3197a43ebc19436606
diff --git a/tests/expectations/compiler/compiler/integers/i64/add.leo.out b/tests/expectations/compiler/compiler/integers/i64/add.leo.out
index 1d6f0ffb46..15fdc4611f 100644
--- a/tests/expectations/compiler/compiler/integers/i64/add.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/add.leo.out
@@ -2,5 +2,7 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - output: []
+  - output:
+      - initial_input_ast: 4487891a65166322700df8b88e062dd55ba1ba1eab41086faeecb89866ce6353
+        symbol_table: cc01117c31fe70222e5dd9db208832e0f80f925b010474edca6c9d4e5ea377a6
     initial_ast: 4c8ecc77fb85464f37ed6510270912bab6d7f59d34c906a47eee5eba72e18b84
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 0842eb1251..37a6ca9e95 100644
--- a/tests/expectations/compiler/compiler/integers/i64/console_assert.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/console_assert.leo.out
@@ -2,5 +2,7 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - output: []
+  - output:
+      - initial_input_ast: 9ac72a16994c4f4145cf0eaa23f0d58de951926f8b9cb500bc33644cc242d288
+        symbol_table: 3e3de362ea1f800858c664f4243266429d9bd8aae01e94365461312b195fa687
     initial_ast: 88f1001604765bde373b06ffb83c2d46bbc16548296178fc9ccb47eb49e0212b
diff --git a/tests/expectations/compiler/compiler/integers/i64/div.leo.out b/tests/expectations/compiler/compiler/integers/i64/div.leo.out
index f9acf5f796..703c29dc83 100644
--- a/tests/expectations/compiler/compiler/integers/i64/div.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/div.leo.out
@@ -2,5 +2,7 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - output: []
+  - output:
+      - initial_input_ast: 0a764dba657d55d3997cad318c763d1bc29b3bd68e720c29bdb329e31544cfa2
+        symbol_table: 0723f77e60787bcbe32ff2b04e6c27188e455bc24962c67faecff9c6de960fb0
     initial_ast: 1ac553449dbba81518d78f57a0728f69efc8040ac83ee09516a99b52812d0ce5
diff --git a/tests/expectations/compiler/compiler/integers/i64/eq.leo.out b/tests/expectations/compiler/compiler/integers/i64/eq.leo.out
index 58c5c14d0b..3031703cc4 100644
--- a/tests/expectations/compiler/compiler/integers/i64/eq.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/eq.leo.out
@@ -2,5 +2,7 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - output: []
+  - output:
+      - initial_input_ast: 9ac72a16994c4f4145cf0eaa23f0d58de951926f8b9cb500bc33644cc242d288
+        symbol_table: fa044d414491ad830416830c60667d80173594ff31bbb53a1cf2dc2d0b516ab7
     initial_ast: 9d96dab7f2cf21a2358200798a2689f722d388fe23c58bc00f13feefc05328e0
diff --git a/tests/expectations/compiler/compiler/integers/i8/add.leo.out b/tests/expectations/compiler/compiler/integers/i8/add.leo.out
index e4e801e389..bfc6212d60 100644
--- a/tests/expectations/compiler/compiler/integers/i8/add.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/add.leo.out
@@ -2,5 +2,7 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - output: []
+  - output:
+      - initial_input_ast: a4cac5c153aca7bfef6dabb6cbf703d96938699bebce6f063d39011de78a5bd4
+        symbol_table: ebda3c79c3cef5c180c423066cfe7afb72f559e295b3b0650192b4b41acf97ab
     initial_ast: e5b43164c337c686cc881208115e1bbadd1926c5fb388cb0d0592dd26c40bbb3
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 0fc8473812..387f0ad109 100644
--- a/tests/expectations/compiler/compiler/integers/i8/console_assert.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/console_assert.leo.out
@@ -2,5 +2,7 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - output: []
+  - output:
+      - initial_input_ast: 387087e4e03168d09782d693bd8b288dd097f978e8470bf2d0fae6a18b0a5dba
+        symbol_table: ffefcd9198ba11e15d017d24ed65f0ff46563f3049221d37343c4698a85df0f9
     initial_ast: 7057b25d4c10f2cfb35c7c7897e1ce77eaf0ea00c5f13d5fe61be2db93f33e2d
diff --git a/tests/expectations/compiler/compiler/integers/i8/div.leo.out b/tests/expectations/compiler/compiler/integers/i8/div.leo.out
index c2a11c4c3f..0f3cfb0e7f 100644
--- a/tests/expectations/compiler/compiler/integers/i8/div.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/div.leo.out
@@ -2,5 +2,7 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - output: []
+  - output:
+      - initial_input_ast: 2bb926ee08666d2f770b02d22884fb353d718b57ffd34c156dd70431c16b713c
+        symbol_table: ebcfabb92de4aca10e7fc6d1356b31611062fca8d9feb5b8a18c5bb9d20ba662
     initial_ast: df29046329d8b12827f7885dfafee8a88abb17450a6fef94f5c192d582c170a9
diff --git a/tests/expectations/compiler/compiler/integers/i8/eq.leo.out b/tests/expectations/compiler/compiler/integers/i8/eq.leo.out
index 3e1f5189a4..6ef3a1af93 100644
--- a/tests/expectations/compiler/compiler/integers/i8/eq.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/eq.leo.out
@@ -2,5 +2,7 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - output: []
+  - output:
+      - initial_input_ast: 387087e4e03168d09782d693bd8b288dd097f978e8470bf2d0fae6a18b0a5dba
+        symbol_table: 9e8afe87541faf262a089029805a31c5377d0d9610c1e8e221ba386ea6c7b078
     initial_ast: cb0fef3c670b24effcfe01867ad5997394daf09593f2e90f721070dcd88dbd6a
diff --git a/tests/expectations/compiler/compiler/integers/i8/pow.leo.out b/tests/expectations/compiler/compiler/integers/i8/pow.leo.out
new file mode 100644
index 0000000000..b0c561cbce
--- /dev/null
+++ b/tests/expectations/compiler/compiler/integers/i8/pow.leo.out
@@ -0,0 +1,8 @@
+---
+namespace: Compile
+expectation: Pass
+outputs:
+  - output:
+      - initial_input_ast: e38dda583b1fc68a8ac1481db534ee1d14b91a96f6b2bdc08a6dc4f2e0b96253
+        symbol_table: af53e99b6d1d203f2dc9333d02c05ee6e36be1eee3c143be3f2121d807620ffe
+    initial_ast: c585f1fc1d0af61d56ecc47f94105ddc6e386f22c176b50893573a4b8fffa4cb
diff --git a/tests/expectations/compiler/compiler/integers/u128/add.leo.out b/tests/expectations/compiler/compiler/integers/u128/add.leo.out
index 0a5a032c8d..79357fd6ac 100644
--- a/tests/expectations/compiler/compiler/integers/u128/add.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/add.leo.out
@@ -2,5 +2,7 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - output: []
+  - output:
+      - initial_input_ast: d3082b5edd6d814cd5eba97f5cfee8cd6ac7c859b0bd6345152d07ff71c77704
+        symbol_table: d57b055bb6df31b13110ac1a7ca039216c5bea705df0258140cc5d840853c662
     initial_ast: e4e1d70546dfe483ecf16d57945e3febbd19da7fc3f64c2d158e8c70b887c0b2
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 58526f9682..d3b1f648e9 100644
--- a/tests/expectations/compiler/compiler/integers/u128/console_assert.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/console_assert.leo.out
@@ -2,5 +2,7 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - output: []
-    initial_ast: 4fd6da0d06eb2982da519d0b662e08662158d637ce21ef6982d05612570734ad
+  - output:
+      - initial_input_ast: b5c6120ae963f4518dfbcf01566c85e1414ed347b18ca65dcbc03ff3addfb8ea
+        symbol_table: 861bca327e9df1f188d2e6da784fd0bb468999c721457d55b418642eaad37b76
+    initial_ast: ecbc8484a3548fc10ab2e25aae6bca7b24b5010b972a161fb385ec0d7fbaca41
diff --git a/tests/expectations/compiler/compiler/integers/u128/div.leo.out b/tests/expectations/compiler/compiler/integers/u128/div.leo.out
index 45d55405c9..90a0ec038f 100644
--- a/tests/expectations/compiler/compiler/integers/u128/div.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/div.leo.out
@@ -2,5 +2,7 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - output: []
+  - output:
+      - initial_input_ast: 55766cfb9cd3036356494aed386f6369a46eaa459e732b4b125adc71cc9487de
+        symbol_table: c3657fefe6f9a6c177da5817cb1eb47ba94b1a0cd2dc89838dfb0434d32da7ad
     initial_ast: 6d70edf319a5036a4004d3c3c6e8b01608b7e882d91f335b7c0dec725185641a
diff --git a/tests/expectations/compiler/compiler/integers/u128/eq.leo.out b/tests/expectations/compiler/compiler/integers/u128/eq.leo.out
index 220192867c..f8aea6143c 100644
--- a/tests/expectations/compiler/compiler/integers/u128/eq.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/eq.leo.out
@@ -2,5 +2,7 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - output: []
+  - output:
+      - initial_input_ast: b5c6120ae963f4518dfbcf01566c85e1414ed347b18ca65dcbc03ff3addfb8ea
+        symbol_table: cd54572eeca90e6ebc795ff0f682c1edf27af71422545ded66f72026443ec213
     initial_ast: e47f3796c64fdda060e19aa678de8af0a2956d41b9c88efc95276749bdb40c74
diff --git a/tests/expectations/compiler/compiler/integers/u128/gt.leo.out b/tests/expectations/compiler/compiler/integers/u128/gt.leo.out
index 5c9cb7678f..51e6c65c6b 100644
--- a/tests/expectations/compiler/compiler/integers/u128/gt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/gt.leo.out
@@ -3,4 +3,4 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output: []
-    initial_ast: fb53e82957f197d8232ffb013b8034b81060f8079eff6782c0fdcbe1e2b93d0e
+    initial_ast: df9cd79c49062dde86e08031f53043d93799404903d97f68e1148198f4988548
diff --git a/tests/expectations/compiler/compiler/integers/u128/input.leo.out b/tests/expectations/compiler/compiler/integers/u128/input.leo.out
deleted file mode 100644
index 180d58de1e..0000000000
--- a/tests/expectations/compiler/compiler/integers/u128/input.leo.out
+++ /dev/null
@@ -1,6 +0,0 @@
----
-namespace: Compile
-expectation: Pass
-outputs:
-  - output: []
-    initial_ast: 8328bcf07884bc33ed6c05c740859f6d6e9b86ff3a195509e11dbd6efc629c7c
diff --git a/tests/expectations/compiler/compiler/integers/u128/lt.leo.out b/tests/expectations/compiler/compiler/integers/u128/lt.leo.out
index 75cbcba481..b3e81a7cf9 100644
--- a/tests/expectations/compiler/compiler/integers/u128/lt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/lt.leo.out
@@ -3,4 +3,4 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output: []
-    initial_ast: 34662c2875224a405b09632db583066629a6340e32362b6c149a2daec519f181
+    initial_ast: 119abb498a0b5214fa88b20b83c621728b722325c311a4b9095ee292a70fb94e
diff --git a/tests/expectations/compiler/compiler/integers/u128/ne.leo.out b/tests/expectations/compiler/compiler/integers/u128/ne.leo.out
index 8a04d21735..406602524b 100644
--- a/tests/expectations/compiler/compiler/integers/u128/ne.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/ne.leo.out
@@ -3,4 +3,4 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output: []
-    initial_ast: 6b1eb3a25cf39d2a2288f937298c6e57ae65f58b8e957afc1d65bb8c0f9896fd
+    initial_ast: 92df27cfda59130731bad66eeb592251d7e664bb2fa86b1dd59dc8dd7623673b
diff --git a/tests/expectations/compiler/compiler/integers/u16/add.leo.out b/tests/expectations/compiler/compiler/integers/u16/add.leo.out
index deddb513b5..7d71ef15bc 100644
--- a/tests/expectations/compiler/compiler/integers/u16/add.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/add.leo.out
@@ -2,5 +2,7 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - output: []
+  - output:
+      - initial_input_ast: 6f6d6764c925433e3966deefe74381d0fdd560c52a5cc48713e3c4dfb1c6c3a1
+        symbol_table: 25f1d9fe9e4fc26868f1edad4c25d613f4814d7b51fbc6bbf602c364a2df7389
     initial_ast: 20246e906b0724847c1f313e849ca183da6f2cb8f327ad52f6cad54eb612d9cb
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 9221d3a27d..b03ca1fdb2 100644
--- a/tests/expectations/compiler/compiler/integers/u16/console_assert.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/console_assert.leo.out
@@ -2,5 +2,7 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - output: []
-    initial_ast: 7a6de12e3bdc5a4d52aa194c98be269e6e0f00f46d8bac6de4837bc236ac806a
+  - output:
+      - initial_input_ast: cb0e4f51087e3221ca9d60ad25194233446b1827dcbd3af17206be357599915b
+        symbol_table: 52f1f76db8301f361bc2511178f18d8269c20e7ee2a5e41350c7cd4b4294a9dd
+    initial_ast: 129c0fd5a3df9124a00f91abc2ddcf228b5bd01b6ea2ac277a3cfc3e5c517021
diff --git a/tests/expectations/compiler/compiler/integers/u16/div.leo.out b/tests/expectations/compiler/compiler/integers/u16/div.leo.out
index 3d6b662389..1e55e2a80e 100644
--- a/tests/expectations/compiler/compiler/integers/u16/div.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/div.leo.out
@@ -2,5 +2,7 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - output: []
+  - output:
+      - initial_input_ast: 366c095f1dc13d5327fec0236867df3dd4efed80fefc990b402455be221ae3ae
+        symbol_table: d3bb974805db7c028da81baa4afcb0a24c1b9b05fae97c60aeb0c27680bb9267
     initial_ast: c7f8663c2e35a240f8cd40af952012e44860be93cf691e97c2720cab99e29944
diff --git a/tests/expectations/compiler/compiler/integers/u16/eq.leo.out b/tests/expectations/compiler/compiler/integers/u16/eq.leo.out
index 4c84cde633..873b4718f0 100644
--- a/tests/expectations/compiler/compiler/integers/u16/eq.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/eq.leo.out
@@ -2,5 +2,7 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - output: []
+  - output:
+      - initial_input_ast: cb0e4f51087e3221ca9d60ad25194233446b1827dcbd3af17206be357599915b
+        symbol_table: ad01930069124344e81b3d2104a8d65eff211c9d4cccfefdd0c8d81fc3bdd276
     initial_ast: 3bba994afe74ff41813d814792c6bea23ce00b52eaf9c24f999d2a97d6333a63
diff --git a/tests/expectations/compiler/compiler/integers/u16/gt.leo.out b/tests/expectations/compiler/compiler/integers/u16/gt.leo.out
index 63d81711d3..1cd9296fca 100644
--- a/tests/expectations/compiler/compiler/integers/u16/gt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/gt.leo.out
@@ -3,4 +3,4 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output: []
-    initial_ast: d68e063b6521b9e3bed81a9595e08659d3ca052f40baee075115d4dcddb9b8a8
+    initial_ast: b973b26e654b6b561094b5d80fc17ffb8afe773a6f338a36eb19a91a74210e6b
diff --git a/tests/expectations/compiler/compiler/integers/u16/input.leo.out b/tests/expectations/compiler/compiler/integers/u16/input.leo.out
deleted file mode 100644
index efc04f0d2c..0000000000
--- a/tests/expectations/compiler/compiler/integers/u16/input.leo.out
+++ /dev/null
@@ -1,6 +0,0 @@
----
-namespace: Compile
-expectation: Pass
-outputs:
-  - output: []
-    initial_ast: 96295fc5f93b5bc0744f6bf8f780c117a2391e75572a78233b19dd35bef7d599
diff --git a/tests/expectations/compiler/compiler/integers/u16/lt.leo.out b/tests/expectations/compiler/compiler/integers/u16/lt.leo.out
index 88381d678c..5c23eea345 100644
--- a/tests/expectations/compiler/compiler/integers/u16/lt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/lt.leo.out
@@ -3,4 +3,4 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output: []
-    initial_ast: af24f294c4659e6cf55e60715a623d72cb16bf207bcd18f6adf42f5cde4e9cf3
+    initial_ast: 8010e3d578a0a42f4e1165e51e46041c6f9039aaa526c72165a72ed2cea4c577
diff --git a/tests/expectations/compiler/compiler/integers/u16/ne.leo.out b/tests/expectations/compiler/compiler/integers/u16/ne.leo.out
index 555f937eae..5542180680 100644
--- a/tests/expectations/compiler/compiler/integers/u16/ne.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/ne.leo.out
@@ -3,4 +3,4 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output: []
-    initial_ast: 5eac340764ff835dd1b4aa7aec32faaf2ce37e2c0edf799575b206ccaa9eb667
+    initial_ast: e655135bbc414f50662dc8964849795a14e3c1fbf110ed0d93f428256e20337f
diff --git a/tests/expectations/compiler/compiler/integers/u16/pow.leo.out b/tests/expectations/compiler/compiler/integers/u16/pow.leo.out
new file mode 100644
index 0000000000..f5c99c0054
--- /dev/null
+++ b/tests/expectations/compiler/compiler/integers/u16/pow.leo.out
@@ -0,0 +1,8 @@
+---
+namespace: Compile
+expectation: Pass
+outputs:
+  - output:
+      - initial_input_ast: 3454670db4ae2ae2274a879a456ea7b2ff6b89d119686417577495d5bc7a2d1a
+        symbol_table: 00785eb0f002a244cc196d4394fec5b0071d5ed7e4b6702e14938456b72cbb5f
+    initial_ast: e50a17ea461e6bf067a2b2728f73104065b911e47766a959d444b4a5d50dcf9a
diff --git a/tests/expectations/compiler/compiler/integers/u32/add.leo.out b/tests/expectations/compiler/compiler/integers/u32/add.leo.out
index fe74d4c4b4..317ad375ea 100644
--- a/tests/expectations/compiler/compiler/integers/u32/add.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/add.leo.out
@@ -2,5 +2,7 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - output: []
+  - output:
+      - initial_input_ast: 7900982a0b59b180658c9c973f14c0f43f64e6c26ccf3dc72ccabbe97e6f7c1c
+        symbol_table: 0d39fc8fb24c3a5abbf3196c391cd23590eab1dddbe670dff1ad3d7953e45d4a
     initial_ast: 6f17e86164961b0f5dd63f426dfe5a1c7097b7042ce9c80d9cd3e2b3c7918ab2
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 5f89074d30..4b967b0fab 100644
--- a/tests/expectations/compiler/compiler/integers/u32/console_assert.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/console_assert.leo.out
@@ -2,5 +2,7 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - output: []
-    initial_ast: d7cb42b47e5175b91dc490ff52a54d4275d984418ea0d516c648ce5357b224ed
+  - output:
+      - initial_input_ast: 0d8bd4140882c8076fc6f31339195bd136210fa8468de7232564be89d208c570
+        symbol_table: e1e1412dbb433d0f7456b6d00d7702d4487bc9e837abd1b6503aedbd71573310
+    initial_ast: 910eb749b9f449162c71e28c281111b11a0eddd0b51a5c3ac925217620257d56
diff --git a/tests/expectations/compiler/compiler/integers/u32/div.leo.out b/tests/expectations/compiler/compiler/integers/u32/div.leo.out
index 8e5b46b637..1db95754b9 100644
--- a/tests/expectations/compiler/compiler/integers/u32/div.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/div.leo.out
@@ -2,5 +2,7 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - output: []
+  - output:
+      - initial_input_ast: 1899a411753778ecc51ee4565405c95f5dc93e7dfc084268332a034da1a4e22a
+        symbol_table: 5de00fad1a2c72b4dcc1abadc1b1cb0f494f94f5a4b8241759ec69856ad1e61d
     initial_ast: f0756849f355e001af5182cb5b788cc796745499258548e421e5187e177f275f
diff --git a/tests/expectations/compiler/compiler/integers/u32/eq.leo.out b/tests/expectations/compiler/compiler/integers/u32/eq.leo.out
index 51b1f3ba60..ba20b94cf7 100644
--- a/tests/expectations/compiler/compiler/integers/u32/eq.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/eq.leo.out
@@ -2,5 +2,7 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - output: []
+  - output:
+      - initial_input_ast: 0d8bd4140882c8076fc6f31339195bd136210fa8468de7232564be89d208c570
+        symbol_table: 9cef6bc5907dc9578a6d19e2f9b56ccc4e06b522efc4a2277c4ed418a9985e72
     initial_ast: 727e4ea81a78093866181fe291c97cc7dd006287a09f808402cb6c79d5ce1654
diff --git a/tests/expectations/compiler/compiler/integers/u32/gt.leo.out b/tests/expectations/compiler/compiler/integers/u32/gt.leo.out
index b241c4ff23..6f408330ff 100644
--- a/tests/expectations/compiler/compiler/integers/u32/gt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/gt.leo.out
@@ -3,4 +3,4 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output: []
-    initial_ast: 53c7d2487e286468461540a200f11681a8828d5fa61c4594ff4f63c91b289f7b
+    initial_ast: 85dd004fda33533c3622967dd7943343582f3904892b17a97620b98818ed18b9
diff --git a/tests/expectations/compiler/compiler/integers/u32/input.leo.out b/tests/expectations/compiler/compiler/integers/u32/input.leo.out
deleted file mode 100644
index feee9a1647..0000000000
--- a/tests/expectations/compiler/compiler/integers/u32/input.leo.out
+++ /dev/null
@@ -1,6 +0,0 @@
----
-namespace: Compile
-expectation: Pass
-outputs:
-  - output: []
-    initial_ast: 193c6dd893f78d99cfba6afa37e9c868ff428135498e5879725ba40b6d71d156
diff --git a/tests/expectations/compiler/compiler/integers/u32/lt.leo.out b/tests/expectations/compiler/compiler/integers/u32/lt.leo.out
index a3c8ed8417..ab3ce9781d 100644
--- a/tests/expectations/compiler/compiler/integers/u32/lt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/lt.leo.out
@@ -3,4 +3,4 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output: []
-    initial_ast: e92898b452586210d8301fa2ce92916f7aa93799b591cc47dac0dc800b71107b
+    initial_ast: b05b37054191d71799f0e1f5acbf281d12a8e25bf7cd9c81fe4af2ba66bb85e2
diff --git a/tests/expectations/compiler/compiler/integers/u32/ne.leo.out b/tests/expectations/compiler/compiler/integers/u32/ne.leo.out
index 3b4489fbf1..e1a588f0c4 100644
--- a/tests/expectations/compiler/compiler/integers/u32/ne.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/ne.leo.out
@@ -3,4 +3,4 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output: []
-    initial_ast: ad34b77b28d1ce6696e7696d14bb8c5ebb6bb194d67a7006b405e8566ff5aa2d
+    initial_ast: 37f1d76e799523048b115f8189834f2e678305837b67fe13b5f5e605c03e9f6c
diff --git a/tests/expectations/compiler/compiler/integers/u64/add.leo.out b/tests/expectations/compiler/compiler/integers/u64/add.leo.out
index 600d8ca010..503beaabba 100644
--- a/tests/expectations/compiler/compiler/integers/u64/add.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/add.leo.out
@@ -2,5 +2,7 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - output: []
+  - output:
+      - initial_input_ast: e716ba579037b58227d1e433d4304f99f2b2eef51f88fdc8b3086a482ee7771e
+        symbol_table: 48a3b99e31105bcac10e57226f098c9b3462b6288683cc1ab1c86d6cf9d037ac
     initial_ast: 437ed1d3a2f85fc715a4094f9336df301ee7fe1ba9d63e06a1662c97c3f07345
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 93b9c8f2f1..2185ca4e64 100644
--- a/tests/expectations/compiler/compiler/integers/u64/console_assert.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/console_assert.leo.out
@@ -2,5 +2,7 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - output: []
-    initial_ast: 893b3eed927bec646c1eb8add5aae68a13ece875ae1869d404281e73f5358c2c
+  - output:
+      - initial_input_ast: 0293b081f0efa060d6d6be2a41792af71a74b1a894832aef14166c5bbd242e2e
+        symbol_table: 2710b3b28bf4eb04445f205b07f4f573370c745cb858c2ffd82711d6a2422f47
+    initial_ast: cc17de8b54b55ee1cd6dfe70cd0e4635899e1313611a73251266b81fe1d1f959
diff --git a/tests/expectations/compiler/compiler/integers/u64/div.leo.out b/tests/expectations/compiler/compiler/integers/u64/div.leo.out
index b0b681f7f7..0720047aef 100644
--- a/tests/expectations/compiler/compiler/integers/u64/div.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/div.leo.out
@@ -2,5 +2,7 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - output: []
+  - output:
+      - initial_input_ast: 9f6987350c5148b7587ed453e96e575bb967b5115a1f0648764bce5b4d977c46
+        symbol_table: 642ee9396286a65734b8b0ab826706fca67bdf5ac1d39903a7d398182f27e715
     initial_ast: b1506f24dec921f4767cad398fb94c42ad773be1a034427e8377a4ffca6fd5cd
diff --git a/tests/expectations/compiler/compiler/integers/u64/eq.leo.out b/tests/expectations/compiler/compiler/integers/u64/eq.leo.out
index 1f57096b72..6cf5eea937 100644
--- a/tests/expectations/compiler/compiler/integers/u64/eq.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/eq.leo.out
@@ -2,5 +2,7 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - output: []
+  - output:
+      - initial_input_ast: 0293b081f0efa060d6d6be2a41792af71a74b1a894832aef14166c5bbd242e2e
+        symbol_table: 91b81bbb60572c2ab26ca90a2008ec67795620c4eded2c865f552ca26826a8da
     initial_ast: 0895f12f7a9102ae711b05156078d0c06db88469c1134f1afaae1571f6d55dd6
diff --git a/tests/expectations/compiler/compiler/integers/u64/gt.leo.out b/tests/expectations/compiler/compiler/integers/u64/gt.leo.out
index bd6bb7b24a..9a60d873ec 100644
--- a/tests/expectations/compiler/compiler/integers/u64/gt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/gt.leo.out
@@ -3,4 +3,4 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output: []
-    initial_ast: 0520ba6a48280d0bdda56c0bfc57a807aaba9d692f25441a1239cf514e9dafb2
+    initial_ast: 6b7a4afc593bb8518e8f8353d7da7c33fc20d07e1c1e45cc52d5a8762410fb3c
diff --git a/tests/expectations/compiler/compiler/integers/u64/input.leo.out b/tests/expectations/compiler/compiler/integers/u64/input.leo.out
deleted file mode 100644
index 7de46a4581..0000000000
--- a/tests/expectations/compiler/compiler/integers/u64/input.leo.out
+++ /dev/null
@@ -1,6 +0,0 @@
----
-namespace: Compile
-expectation: Pass
-outputs:
-  - output: []
-    initial_ast: 5fd45f994936c606f15040d148732ec079b8cbc63e6aea0bbb27c31a366708c0
diff --git a/tests/expectations/compiler/compiler/integers/u64/lt.leo.out b/tests/expectations/compiler/compiler/integers/u64/lt.leo.out
index 99539ac262..5f4c00d9be 100644
--- a/tests/expectations/compiler/compiler/integers/u64/lt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/lt.leo.out
@@ -3,4 +3,4 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output: []
-    initial_ast: 78b9ceb15f3ef12d2be77b98a7a9a2ed83227e1f739560f6a368a5f0b71e34dc
+    initial_ast: 1d70859881833b2980e1f98a742003e40af8e8ae6080fbf33866ef7c12a3e64a
diff --git a/tests/expectations/compiler/compiler/integers/u64/ne.leo.out b/tests/expectations/compiler/compiler/integers/u64/ne.leo.out
index 482d6b8418..a3a4a3d966 100644
--- a/tests/expectations/compiler/compiler/integers/u64/ne.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/ne.leo.out
@@ -3,4 +3,4 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output: []
-    initial_ast: 44322879e83f008bdf3d9b98a5f6ed1341760c49175bf7670ef826b6057100a3
+    initial_ast: 36730570b95346a3c5bbd2f7bba8d9ea8c0a0f27f999cf47bdaac8fb4e2944f1
diff --git a/tests/expectations/compiler/compiler/integers/u8/add.leo.out b/tests/expectations/compiler/compiler/integers/u8/add.leo.out
index 0be1ac6dc9..7d4bb179db 100644
--- a/tests/expectations/compiler/compiler/integers/u8/add.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/add.leo.out
@@ -2,5 +2,7 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - output: []
+  - output:
+      - initial_input_ast: bec6adce6675e69f58bd54bfd2d89ed483f5e6bb722ba9ba3889f200aaf830d1
+        symbol_table: 7c9d2537c4dfee02096129a884b7f7e811c8834ad7d1b11c35027eb8caab39c7
     initial_ast: b7dd798a6c169b0e90da360b86a56644bca050365f6d3f59f20f6b58df88b336
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 fb1f8c811d..85914a7783 100644
--- a/tests/expectations/compiler/compiler/integers/u8/console_assert.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/console_assert.leo.out
@@ -2,5 +2,7 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - output: []
-    initial_ast: 76a1c4602ef15ad8772a327096699610368d8084a893eaa598eb29ac09e5333a
+  - output:
+      - initial_input_ast: 3e4fef1af04fd43972dc710e4b0e67e1b5f3b03cf0e8d1373cedfb0426b5adb7
+        symbol_table: 8aca3b9422a6097b27e54c6d205754032eb01b325bf5febc689cb0a1dfd9c93c
+    initial_ast: 0e5b41d2d779d29056c60c35f03c863883fb4ff50cf3833b2f40960757b6adda
diff --git a/tests/expectations/compiler/compiler/integers/u8/div.leo.out b/tests/expectations/compiler/compiler/integers/u8/div.leo.out
index 9ecedb4f94..5c58083e00 100644
--- a/tests/expectations/compiler/compiler/integers/u8/div.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/div.leo.out
@@ -2,5 +2,7 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - output: []
+  - output:
+      - initial_input_ast: e03a50836125b20c3b6f5c0616054b65a694fb183a135db8c600cc84a4e07636
+        symbol_table: 5df47e489214d269e01b424fbccba97be8c1f81d3918c81cdf626ed9ec609d32
     initial_ast: 01ffcd880e5569626d16ac43de9db56cd4ee17a01e570d45815277b003fbb01e
diff --git a/tests/expectations/compiler/compiler/integers/u8/eq.leo.out b/tests/expectations/compiler/compiler/integers/u8/eq.leo.out
index e047bc0c7b..5cdde740d6 100644
--- a/tests/expectations/compiler/compiler/integers/u8/eq.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/eq.leo.out
@@ -2,5 +2,7 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - output: []
+  - output:
+      - initial_input_ast: 3e4fef1af04fd43972dc710e4b0e67e1b5f3b03cf0e8d1373cedfb0426b5adb7
+        symbol_table: 2c9ef296994a78746d48dfda0b631c806f27e373e6b7f87d118b845167131738
     initial_ast: 8a55d90966d19eae8d35e12c03868d2fb2331b36c799253cd225c3dd92db3fd0
diff --git a/tests/expectations/compiler/compiler/integers/u8/gt.leo.out b/tests/expectations/compiler/compiler/integers/u8/gt.leo.out
index 94c976d487..f765f4e7e5 100644
--- a/tests/expectations/compiler/compiler/integers/u8/gt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/gt.leo.out
@@ -3,4 +3,4 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output: []
-    initial_ast: d681a38964fa73230e6e680acf7d4fc201e9eb0b74ba16d979be72e6f4567b32
+    initial_ast: a101c00dbf562bb0f5092240492f57859d481f66709fa7de9d694b5a7ffe99d9
diff --git a/tests/expectations/compiler/compiler/integers/u8/input.leo.out b/tests/expectations/compiler/compiler/integers/u8/input.leo.out
deleted file mode 100644
index 49d31f48a8..0000000000
--- a/tests/expectations/compiler/compiler/integers/u8/input.leo.out
+++ /dev/null
@@ -1,6 +0,0 @@
----
-namespace: Compile
-expectation: Pass
-outputs:
-  - output: []
-    initial_ast: 2971694636a287d6a66a187f42999757c51581a6f843b036c03b6b9850dbdcf2
diff --git a/tests/expectations/compiler/compiler/integers/u8/lt.leo.out b/tests/expectations/compiler/compiler/integers/u8/lt.leo.out
index 503be04dcd..2a55b25416 100644
--- a/tests/expectations/compiler/compiler/integers/u8/lt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/lt.leo.out
@@ -3,4 +3,4 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output: []
-    initial_ast: b3cb8023026edca17fbbf197d6c795cbf54f0d800402160764fc62299eb5a861
+    initial_ast: a972ae2f70671860f9806aeb16f18ca23c4c1f9cbb8c7dcf7b780919802f58b0
diff --git a/tests/expectations/compiler/compiler/integers/u8/ne.leo.out b/tests/expectations/compiler/compiler/integers/u8/ne.leo.out
index f515f0ca04..802c29365b 100644
--- a/tests/expectations/compiler/compiler/integers/u8/ne.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/ne.leo.out
@@ -3,4 +3,4 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output: []
-    initial_ast: d4fd7ef16af8dab231510e78cba7be176f619f7646ce5867211fc0982e7c245a
+    initial_ast: 3c4023f1a4fb93b562ee7202c6350b73e352a75deaf4a5e74648d904e7a32cac
diff --git a/tests/expectations/compiler/compiler/integers/u8/pow.leo.out b/tests/expectations/compiler/compiler/integers/u8/pow.leo.out
new file mode 100644
index 0000000000..014fe94ff2
--- /dev/null
+++ b/tests/expectations/compiler/compiler/integers/u8/pow.leo.out
@@ -0,0 +1,8 @@
+---
+namespace: Compile
+expectation: Pass
+outputs:
+  - output:
+      - initial_input_ast: ec515007a1c2cbe83aff0029932fe56e397a4ca82f99095abcc7fc25f4e0723f
+        symbol_table: 66ec3fbee8f9a937771f0042e29c84ed1a546bf89135019880eab7b3905f3a8a
+    initial_ast: 32f692f5afbbadfcd3255f61ce5d63e102d570529ed6bab0c00250f824ff01dd