diff --git a/src/base/Gas.ml b/src/base/Gas.ml
index dfa5014ab..7747390be 100644
--- a/src/base/Gas.ml
+++ b/src/base/Gas.ml
@@ -220,9 +220,13 @@ module ScillaGas (SR : Rep) (ER : Rep) = struct
           | Iterate (l, _) ->
               let g = GasStmt (GasCharge.LengthOf (GI.get_id l)) in
               pure @@ [ (g, srep); (s, srep) ]
-          | Throw _ ->
-              (* TODO: Throw should charge same as event and send. *)
-              pure @@ [ (s, srep) ]
+          | Throw eopt ->
+              let g =
+                match eopt with
+                | Some e -> GasCharge.SizeOf (GI.get_id e)
+                | None -> GasCharge.StaticCost 1
+              in
+              pure @@ [ (GasStmt g, srep); (s, srep) ]
           | GasStmt _ -> fail0 "Unexpected gas charge"
         in
 
diff --git a/src/eval/Eval.ml b/src/eval/Eval.ml
index 6cccad64b..6638d844e 100644
--- a/src/eval/Eval.ml
+++ b/src/eval/Eval.ml
@@ -49,15 +49,12 @@ let reserved_names =
     RecursionPrinciples.recursion_principles
 
 (* Printing result *)
-let pp_result r exclude_names =
+let pp_result (e, env) exclude_names gas_remaining =
   let enames = List.append exclude_names reserved_names in
-  match r with
-  | Error (s, _) -> sprint_scilla_error_list s
-  | Ok ((e, env), _) ->
-      let filter_prelude (k, _) =
-        not @@ List.mem enames k ~equal:String.( = )
-      in
-      sprintf "%s,\n%s" (Env.pp_value e) (Env.pp ~f:filter_prelude env)
+  let filter_prelude (k, _) = not @@ List.mem enames k ~equal:String.( = ) in
+  sprintf "%s,\n%s\nGas remaining: %s" (Env.pp_value e)
+    (Env.pp ~f:filter_prelude env)
+    (Stdint.Uint64.to_string gas_remaining)
 
 (* Makes sure that the literal has no closures in it *)
 (* TODO: Augment with deep checking *)
diff --git a/src/runners/eval_runner.ml b/src/runners/eval_runner.ml
index 88a175977..8764560ef 100644
--- a/src/runners/eval_runner.ml
+++ b/src/runners/eval_runner.ml
@@ -64,7 +64,8 @@ let run () =
       let lib_fnames = List.map ~f:(fun (name, _) -> name) env in
       let res = Eval.(exp_eval e env init_gas_kont gas_remaining) in
       match res with
-      | Ok _ -> printf "%s\n" (Eval.pp_result res lib_fnames)
+      | Ok (res', gas_remaining) ->
+          printf "%s\n" (Eval.pp_result res' lib_fnames gas_remaining)
       | Error (el, gas_remaining) -> fatal_error_gas el gas_remaining )
   | Error e -> fatal_error e
 
diff --git a/tests/checker/good/gold/UintParam.scilla.gold b/tests/checker/good/gold/UintParam.scilla.gold
index 7aacf4fb0..d0061e9ae 100644
--- a/tests/checker/good/gold/UintParam.scilla.gold
+++ b/tests/checker/good/gold/UintParam.scilla.gold
@@ -67,4 +67,5 @@
     }
   ],
   "gas_remaining": "7999"
-}
\ No newline at end of file
+}
+
diff --git a/tests/eval/good/gold/ackermann.scilexp.gold b/tests/eval/good/gold/ackermann.scilexp.gold
index 127f90e09..98d7bdbf4 100644
--- a/tests/eval/good/gold/ackermann.scilexp.gold
+++ b/tests/eval/good/gold/ackermann.scilexp.gold
@@ -51,3 +51,4 @@
   [ackermann -> <closure>],
   [nat_iter -> <type_closure>],
   [nat_succ -> <closure>] }
+Gas remaining: 3930184
diff --git a/tests/eval/good/gold/addr.scilexp.gold b/tests/eval/good/gold/addr.scilexp.gold
index 1f3edf545..a548651a5 100644
--- a/tests/eval/good/gold/addr.scilexp.gold
+++ b/tests/eval/good/gold/addr.scilexp.gold
@@ -1,3 +1,4 @@
 (False),
 { [b -> (ByStr20 0xafcdeabcde123456789012345678901234567890)],
   [a -> (ByStr20 0xffcdeabcde123456789012345678901234567890)] }
+Gas remaining: 4001733
diff --git a/tests/eval/good/gold/app.scilexp.gold b/tests/eval/good/gold/app.scilexp.gold
index 05b16b188..45c709c6f 100644
--- a/tests/eval/good/gold/app.scilexp.gold
+++ b/tests/eval/good/gold/app.scilexp.gold
@@ -3,3 +3,4 @@
   [a -> (Int64 1)],
   [f -> <closure>],
   [x -> (Int64 42)] }
+Gas remaining: 4001744
diff --git a/tests/eval/good/gold/app2.scilexp.gold b/tests/eval/good/gold/app2.scilexp.gold
index 1b28229e2..4c81628b0 100644
--- a/tests/eval/good/gold/app2.scilexp.gold
+++ b/tests/eval/good/gold/app2.scilexp.gold
@@ -3,3 +3,4 @@
   [a -> (Int32 1)],
   [f -> <closure>],
   [x -> (Int32 42)] }
+Gas remaining: 4001744
diff --git a/tests/eval/good/gold/app3.scilexp.gold b/tests/eval/good/gold/app3.scilexp.gold
index 1682efea2..c6870f693 100644
--- a/tests/eval/good/gold/app3.scilexp.gold
+++ b/tests/eval/good/gold/app3.scilexp.gold
@@ -3,3 +3,4 @@
   [a -> (Int32 1)],
   [f -> <closure>],
   [x -> (Int32 42)] }
+Gas remaining: 4001745
diff --git a/tests/eval/good/gold/app4.scilexp.gold b/tests/eval/good/gold/app4.scilexp.gold
index 2ae952bd3..6c30a81bf 100644
--- a/tests/eval/good/gold/app4.scilexp.gold
+++ b/tests/eval/good/gold/app4.scilexp.gold
@@ -4,3 +4,4 @@
   [a -> (Int32 1)],
   [f -> <closure>],
   [x -> (Int32 42)] }
+Gas remaining: 4001742
diff --git a/tests/eval/good/gold/app5.scilexp.gold b/tests/eval/good/gold/app5.scilexp.gold
index b0505b5bc..b0cc513ba 100644
--- a/tests/eval/good/gold/app5.scilexp.gold
+++ b/tests/eval/good/gold/app5.scilexp.gold
@@ -7,3 +7,4 @@
   [a -> (ByStr20 0x1234567890123456789012345678901234abcdef)],
   [bs -> (Map ByStr20 Int32 [])],
   [check_update -> <closure>] }
+Gas remaining: 4001731
diff --git a/tests/eval/good/gold/builtin-alt-bn128.scilexp.gold b/tests/eval/good/gold/builtin-alt-bn128.scilexp.gold
index 77fde656b..63c1c03bc 100644
--- a/tests/eval/good/gold/builtin-alt-bn128.scilexp.gold
+++ b/tests/eval/good/gold/builtin-alt-bn128.scilexp.gold
@@ -42,3 +42,4 @@
   [sum_x -> (ByStr32 0x2243525c5efd4b9c3d3c45ac0ca3fe4dd85e830a4ce6b65fa1eeaee202839703)],
   [p1y -> (ByStr32 0x063c909c4720840cb5134cb9f59fa749755796819658d32efc0d288198f37266)],
   [p1x -> (ByStr32 0x18b18acfb4c2c30276db5411368e7185b311dd124691610c5d3b74034e093dc9)] }
+Gas remaining: 3997822
diff --git a/tests/eval/good/gold/builtin-badd.scilexp.gold b/tests/eval/good/gold/builtin-badd.scilexp.gold
index 564c76449..775881b5f 100644
--- a/tests/eval/good/gold/builtin-badd.scilexp.gold
+++ b/tests/eval/good/gold/builtin-badd.scilexp.gold
@@ -1,3 +1,4 @@
 (BNum 23224456),
 { [b -> (Uint32 1)],
   [a -> (BNum 23224455)] }
+Gas remaining: 4001721
diff --git a/tests/eval/good/gold/builtin-bech32-1.scilexp.gold b/tests/eval/good/gold/builtin-bech32-1.scilexp.gold
index 615fbf340..97bb57667 100644
--- a/tests/eval/good/gold/builtin-bech32-1.scilexp.gold
+++ b/tests/eval/good/gold/builtin-bech32-1.scilexp.gold
@@ -1,3 +1,4 @@
 (Some (ByStr20 0x7aa7ea9f4534d8d70224b9c2fb165242f321f12b)),
 { [prefix -> (String "zil")],
   [bech32str -> (String "zil102n74869xnvdwq3yh8p0k9jjgtejruft268tg8")] }
+Gas remaining: 4001505
diff --git a/tests/eval/good/gold/builtin-bech32-2.scilexp.gold b/tests/eval/good/gold/builtin-bech32-2.scilexp.gold
index b59795fcf..c2c817247 100644
--- a/tests/eval/good/gold/builtin-bech32-2.scilexp.gold
+++ b/tests/eval/good/gold/builtin-bech32-2.scilexp.gold
@@ -1,3 +1,4 @@
 (Some (String "zil102n74869xnvdwq3yh8p0k9jjgtejruft268tg8")),
 { [prefix -> (String "zil")],
   [bystr20_addr -> (ByStr20 0x7aa7ea9f4534d8d70224b9c2fb165242f321f12b)] }
+Gas remaining: 4001593
diff --git a/tests/eval/good/gold/builtin-bsub.scilexp.gold b/tests/eval/good/gold/builtin-bsub.scilexp.gold
index 3ba9b0a0e..a5f28a5b8 100644
--- a/tests/eval/good/gold/builtin-bsub.scilexp.gold
+++ b/tests/eval/good/gold/builtin-bsub.scilexp.gold
@@ -1,3 +1,4 @@
 (Int256 1002233),
 { [b -> (BNum 22222222)],
   [a -> (BNum 23224455)] }
+Gas remaining: 4001721
diff --git a/tests/eval/good/gold/builtin-div.scilexp.gold b/tests/eval/good/gold/builtin-div.scilexp.gold
index 341937582..89d172ea6 100644
--- a/tests/eval/good/gold/builtin-div.scilexp.gold
+++ b/tests/eval/good/gold/builtin-div.scilexp.gold
@@ -8,3 +8,4 @@
   [b -> (Int32 2)],
   [a -> (Int32 100)],
   [f -> <closure>] }
+Gas remaining: 4001672
diff --git a/tests/eval/good/gold/builtin-div2.scilexp.gold b/tests/eval/good/gold/builtin-div2.scilexp.gold
index afb843e25..32fde9f9b 100644
--- a/tests/eval/good/gold/builtin-div2.scilexp.gold
+++ b/tests/eval/good/gold/builtin-div2.scilexp.gold
@@ -2,3 +2,4 @@
 { [b -> (Int256 2)],
   [a -> (Int256 9999999999990)],
   [f -> <closure>] }
+Gas remaining: 4001650
diff --git a/tests/eval/good/gold/builtin-div3.scilexp.gold b/tests/eval/good/gold/builtin-div3.scilexp.gold
index 300e5587b..e26cccd86 100644
--- a/tests/eval/good/gold/builtin-div3.scilexp.gold
+++ b/tests/eval/good/gold/builtin-div3.scilexp.gold
@@ -2,3 +2,4 @@
 { [b -> (Int32 101)],
   [a -> (Int32 100)],
   [f -> <closure>] }
+Gas remaining: 4001722
diff --git a/tests/eval/good/gold/builtin-div4.scilexp.gold b/tests/eval/good/gold/builtin-div4.scilexp.gold
index bdc5cbd06..7073afec5 100644
--- a/tests/eval/good/gold/builtin-div4.scilexp.gold
+++ b/tests/eval/good/gold/builtin-div4.scilexp.gold
@@ -2,3 +2,4 @@
 { [b -> (Uint256 2)],
   [a -> (Uint256 9999999999990)],
   [f -> <closure>] }
+Gas remaining: 4001650
diff --git a/tests/eval/good/gold/builtin-eq-bystr.scilexp.gold b/tests/eval/good/gold/builtin-eq-bystr.scilexp.gold
index d1866e1a2..292a832f5 100644
--- a/tests/eval/good/gold/builtin-eq-bystr.scilexp.gold
+++ b/tests/eval/good/gold/builtin-eq-bystr.scilexp.gold
@@ -8,3 +8,4 @@
   [c -> (ByStr2 0x0f0f)],
   [b -> (ByStr2 0xbfbf)],
   [a -> (ByStr2 0x0f0f)] }
+Gas remaining: 4001726
diff --git a/tests/eval/good/gold/builtin-isqrt.scilexp.gold b/tests/eval/good/gold/builtin-isqrt.scilexp.gold
index 622617a44..9b46b45da 100644
--- a/tests/eval/good/gold/builtin-isqrt.scilexp.gold
+++ b/tests/eval/good/gold/builtin-isqrt.scilexp.gold
@@ -19,3 +19,4 @@
   [two -> (Uint64 2)],
   [one -> (Uint32 1)],
   [zero -> (Uint32 0)] }
+Gas remaining: 3998130
diff --git a/tests/eval/good/gold/builtin-pow.scilexp.gold b/tests/eval/good/gold/builtin-pow.scilexp.gold
index 287e8f612..98a61810f 100644
--- a/tests/eval/good/gold/builtin-pow.scilexp.gold
+++ b/tests/eval/good/gold/builtin-pow.scilexp.gold
@@ -3,3 +3,4 @@
   [x -> (Int32 10000)],
   [b -> (Uint32 2)],
   [a -> (Int32 100)] }
+Gas remaining: 4001670
diff --git a/tests/eval/good/gold/builtin-rem.scilexp.gold b/tests/eval/good/gold/builtin-rem.scilexp.gold
index 8bc200faf..b589b6db4 100644
--- a/tests/eval/good/gold/builtin-rem.scilexp.gold
+++ b/tests/eval/good/gold/builtin-rem.scilexp.gold
@@ -2,3 +2,4 @@
 { [b -> (Int32 2)],
   [a -> (Int32 100)],
   [f -> <closure>] }
+Gas remaining: 4001722
diff --git a/tests/eval/good/gold/builtin-rem2.scilexp.gold b/tests/eval/good/gold/builtin-rem2.scilexp.gold
index 214fb8194..9ac9ac110 100644
--- a/tests/eval/good/gold/builtin-rem2.scilexp.gold
+++ b/tests/eval/good/gold/builtin-rem2.scilexp.gold
@@ -2,3 +2,4 @@
 { [b -> (Int32 23)],
   [a -> (Int32 100)],
   [f -> <closure>] }
+Gas remaining: 4001722
diff --git a/tests/eval/good/gold/builtin-rem3.scilexp.gold b/tests/eval/good/gold/builtin-rem3.scilexp.gold
index b9f0a23ed..80045f8b0 100644
--- a/tests/eval/good/gold/builtin-rem3.scilexp.gold
+++ b/tests/eval/good/gold/builtin-rem3.scilexp.gold
@@ -2,3 +2,4 @@
 { [b -> (Uint32 23)],
   [a -> (Uint32 100)],
   [f -> <closure>] }
+Gas remaining: 4001722
diff --git a/tests/eval/good/gold/builtin-schnorr_get_address.scilexp.gold b/tests/eval/good/gold/builtin-schnorr_get_address.scilexp.gold
index f615dbc55..15078047a 100644
--- a/tests/eval/good/gold/builtin-schnorr_get_address.scilexp.gold
+++ b/tests/eval/good/gold/builtin-schnorr_get_address.scilexp.gold
@@ -35,3 +35,4 @@
   [a1_gen -> (ByStr20 0x4baf5fada8e5db92c3d3242618c5b47133ae003c)],
   [a1 -> (ByStr20 0x4baf5fada8e5db92c3d3242618c5b47133ae003c)],
   [p1 -> (ByStr33 0x0314738163b9bb67ad11aa464fe69a1147df263e8970d7dcfd8f993ddd39e81bd9)] }
+Gas remaining: 4001513
diff --git a/tests/eval/good/gold/builtin-strings.scilexp.gold b/tests/eval/good/gold/builtin-strings.scilexp.gold
index ba7248d4c..4eff6d2d2 100644
--- a/tests/eval/good/gold/builtin-strings.scilexp.gold
+++ b/tests/eval/good/gold/builtin-strings.scilexp.gold
@@ -28,3 +28,4 @@
   [fsubstr -> <closure>],
   [fconcat -> <closure>],
   [feq -> <closure>] }
+Gas remaining: 4001486
diff --git a/tests/eval/good/gold/builtin1.scilexp.gold b/tests/eval/good/gold/builtin1.scilexp.gold
index a95319e02..1d8196157 100644
--- a/tests/eval/good/gold/builtin1.scilexp.gold
+++ b/tests/eval/good/gold/builtin1.scilexp.gold
@@ -2,3 +2,4 @@
 { [b -> (Int32 2)],
   [a -> (Int32 100)],
   [f -> <closure>] }
+Gas remaining: 4001738
diff --git a/tests/eval/good/gold/builtin2.scilexp.gold b/tests/eval/good/gold/builtin2.scilexp.gold
index 3b2f7c1f4..d975bf17f 100644
--- a/tests/eval/good/gold/builtin2.scilexp.gold
+++ b/tests/eval/good/gold/builtin2.scilexp.gold
@@ -4,3 +4,4 @@
   [two -> (Int64 2)],
   [b -> (Int64 44)],
   [a -> (Int64 42)] }
+Gas remaining: 4001738
diff --git a/tests/eval/good/gold/builtin3.scilexp.gold b/tests/eval/good/gold/builtin3.scilexp.gold
index e798278dd..d5e174137 100644
--- a/tests/eval/good/gold/builtin3.scilexp.gold
+++ b/tests/eval/good/gold/builtin3.scilexp.gold
@@ -4,3 +4,4 @@
   [two -> (Int128 2)],
   [b -> (Int128 44)],
   [a -> (Int128 42)] }
+Gas remaining: 4001723
diff --git a/tests/eval/good/gold/builtin5.scilexp.gold b/tests/eval/good/gold/builtin5.scilexp.gold
index ddabd95a4..22e631631 100644
--- a/tests/eval/good/gold/builtin5.scilexp.gold
+++ b/tests/eval/good/gold/builtin5.scilexp.gold
@@ -2,3 +2,4 @@
 { [b -> (Int256 2)],
   [a -> (Int256 100)],
   [f -> <closure>] }
+Gas remaining: 4001714
diff --git a/tests/eval/good/gold/builtin6.scilexp.gold b/tests/eval/good/gold/builtin6.scilexp.gold
index efc35544f..b2fe28a64 100644
--- a/tests/eval/good/gold/builtin6.scilexp.gold
+++ b/tests/eval/good/gold/builtin6.scilexp.gold
@@ -71,3 +71,4 @@
   [c -> (Int32 40)],
   [b -> (Int32 2)],
   [a -> (Int32 100)] }
+Gas remaining: 4000820
diff --git a/tests/eval/good/gold/cons.scilexp.gold b/tests/eval/good/gold/cons.scilexp.gold
index 5ed911dea..e0465792a 100644
--- a/tests/eval/good/gold/cons.scilexp.gold
+++ b/tests/eval/good/gold/cons.scilexp.gold
@@ -4,3 +4,4 @@
   [msg -> (Message [(tag : (String "Main")) ; (value : (Int32 5))])],
   [one_msg -> <closure>],
   [nil_msg -> (Nil)] }
+Gas remaining: 4001745
diff --git a/tests/eval/good/gold/fib.scilexp.gold b/tests/eval/good/gold/fib.scilexp.gold
index 4b65500fa..15b21d90b 100644
--- a/tests/eval/good/gold/fib.scilexp.gold
+++ b/tests/eval/good/gold/fib.scilexp.gold
@@ -8,3 +8,4 @@
   [two -> (Nat 2)],
   [one -> (Nat 1)],
   [zero -> (Nat 0)] }
+Gas remaining: 4001610
diff --git a/tests/eval/good/gold/func_pair.scilexp.gold b/tests/eval/good/gold/func_pair.scilexp.gold
index ca724dbcd..013d9cdb5 100644
--- a/tests/eval/good/gold/func_pair.scilexp.gold
+++ b/tests/eval/good/gold/func_pair.scilexp.gold
@@ -3,3 +3,4 @@
   [s -> (String "abc")],
   [p -> (Pair <closure> <closure>)],
   [f -> <closure>] }
+Gas remaining: 4001705
diff --git a/tests/eval/good/gold/hash1.scilexp.gold b/tests/eval/good/gold/hash1.scilexp.gold
index e25e714ca..66003a0b3 100644
--- a/tests/eval/good/gold/hash1.scilexp.gold
+++ b/tests/eval/good/gold/hash1.scilexp.gold
@@ -8,3 +8,4 @@
   [v1 -> (Int32 42)],
   [k2 -> (Int32 2)],
   [k1 -> (Int32 1)] }
+Gas remaining: 4001674
diff --git a/tests/eval/good/gold/hash2.scilexp.gold b/tests/eval/good/gold/hash2.scilexp.gold
index 7f1e8e29e..f3cd1eacf 100644
--- a/tests/eval/good/gold/hash2.scilexp.gold
+++ b/tests/eval/good/gold/hash2.scilexp.gold
@@ -8,3 +8,4 @@
   [v1 -> (Int64 42)],
   [k2 -> (Int64 2)],
   [k1 -> (Int64 1)] }
+Gas remaining: 4001737
diff --git a/tests/eval/good/gold/hash3.scilexp.gold b/tests/eval/good/gold/hash3.scilexp.gold
index ed8a0210c..a2d22829e 100644
--- a/tests/eval/good/gold/hash3.scilexp.gold
+++ b/tests/eval/good/gold/hash3.scilexp.gold
@@ -14,3 +14,4 @@
   [k2 -> (Int128 2)],
   [k1 -> (Int128 1)],
   [hash_dist -> <closure>] }
+Gas remaining: 4001405
diff --git a/tests/eval/good/gold/hash4.scilexp.gold b/tests/eval/good/gold/hash4.scilexp.gold
index 41aee5988..73d16472b 100644
--- a/tests/eval/good/gold/hash4.scilexp.gold
+++ b/tests/eval/good/gold/hash4.scilexp.gold
@@ -14,3 +14,4 @@
   [k2 -> (Int32 2)],
   [k1 -> (Int32 1)],
   [hash_dist -> <closure>] }
+Gas remaining: 4001405
diff --git a/tests/eval/good/gold/hash5.scilexp.gold b/tests/eval/good/gold/hash5.scilexp.gold
index bac03d0f6..5cd05ee2e 100644
--- a/tests/eval/good/gold/hash5.scilexp.gold
+++ b/tests/eval/good/gold/hash5.scilexp.gold
@@ -19,3 +19,4 @@
   [v3 -> (Int128 43)],
   [v2 -> (Int64 2)],
   [v1 -> (Int32 1)] }
+Gas remaining: 4001716
diff --git a/tests/eval/good/gold/hash_map_stable1.scilexp.gold b/tests/eval/good/gold/hash_map_stable1.scilexp.gold
index e5bca88d7..a3c73de28 100644
--- a/tests/eval/good/gold/hash_map_stable1.scilexp.gold
+++ b/tests/eval/good/gold/hash_map_stable1.scilexp.gold
@@ -10,3 +10,4 @@
   [k2 -> (Int64 2)],
   [v1 -> (Int64 48)],
   [k1 -> (Int64 1)] }
+Gas remaining: 4001701
diff --git a/tests/eval/good/gold/hash_map_stable2.scilexp.gold b/tests/eval/good/gold/hash_map_stable2.scilexp.gold
index e5bca88d7..4d6776190 100644
--- a/tests/eval/good/gold/hash_map_stable2.scilexp.gold
+++ b/tests/eval/good/gold/hash_map_stable2.scilexp.gold
@@ -10,3 +10,4 @@
   [k2 -> (Int64 2)],
   [v1 -> (Int64 48)],
   [k1 -> (Int64 1)] }
+Gas remaining: 4001697
diff --git a/tests/eval/good/gold/hash_map_stable3.scilexp.gold b/tests/eval/good/gold/hash_map_stable3.scilexp.gold
index aa64db7a2..c967d87ff 100644
--- a/tests/eval/good/gold/hash_map_stable3.scilexp.gold
+++ b/tests/eval/good/gold/hash_map_stable3.scilexp.gold
@@ -9,3 +9,4 @@
   [k2 -> (Int64 2)],
   [v1 -> (Int64 48)],
   [k1 -> (Int64 1)] }
+Gas remaining: 4001702
diff --git a/tests/eval/good/gold/hof.scilexp.gold b/tests/eval/good/gold/hof.scilexp.gold
index 4c5b7e2df..19888e0b7 100644
--- a/tests/eval/good/gold/hof.scilexp.gold
+++ b/tests/eval/good/gold/hof.scilexp.gold
@@ -1,2 +1,3 @@
 <type_closure>,
 { [g -> <type_closure>] }
+Gas remaining: 4001754
diff --git a/tests/eval/good/gold/hof2.scilexp.gold b/tests/eval/good/gold/hof2.scilexp.gold
index 37111d048..be995d7a3 100644
--- a/tests/eval/good/gold/hof2.scilexp.gold
+++ b/tests/eval/good/gold/hof2.scilexp.gold
@@ -1,2 +1,3 @@
 <closure>,
 { [g -> <closure>] }
+Gas remaining: 4001754
diff --git a/tests/eval/good/gold/hof3.scilexp.gold b/tests/eval/good/gold/hof3.scilexp.gold
index 37111d048..be995d7a3 100644
--- a/tests/eval/good/gold/hof3.scilexp.gold
+++ b/tests/eval/good/gold/hof3.scilexp.gold
@@ -1,2 +1,3 @@
 <closure>,
 { [g -> <closure>] }
+Gas remaining: 4001754
diff --git a/tests/eval/good/gold/id.scilexp.gold b/tests/eval/good/gold/id.scilexp.gold
index 300f49945..32f55c858 100644
--- a/tests/eval/good/gold/id.scilexp.gold
+++ b/tests/eval/good/gold/id.scilexp.gold
@@ -2,3 +2,4 @@
 { [n -> (Int32 42)],
   [id_int -> <closure>],
   [id -> <type_closure>] }
+Gas remaining: 4001748
diff --git a/tests/eval/good/gold/int_conversions.scilexp.gold b/tests/eval/good/gold/int_conversions.scilexp.gold
index d8054afc0..923b7a15e 100644
--- a/tests/eval/good/gold/int_conversions.scilexp.gold
+++ b/tests/eval/good/gold/int_conversions.scilexp.gold
@@ -22,3 +22,4 @@
   [minus_one -> (Int32 -1)],
   [one -> (Uint32 1)],
   [zero -> (Uint32 0)] }
+Gas remaining: 4001577
diff --git a/tests/eval/good/gold/int_to_nat.scilexp.gold b/tests/eval/good/gold/int_to_nat.scilexp.gold
index 80e01623e..6c8c0423e 100644
--- a/tests/eval/good/gold/int_to_nat.scilexp.gold
+++ b/tests/eval/good/gold/int_to_nat.scilexp.gold
@@ -17,3 +17,4 @@
   [zero_nat2 -> (Nat 0)],
   [zero_nat1 -> (Nat 0)],
   [zero_uint -> (Uint32 0)] }
+Gas remaining: 3001595
diff --git a/tests/eval/good/gold/keccak256_1.scilexp.gold b/tests/eval/good/gold/keccak256_1.scilexp.gold
index 9f5daada2..0792bb83e 100644
--- a/tests/eval/good/gold/keccak256_1.scilexp.gold
+++ b/tests/eval/good/gold/keccak256_1.scilexp.gold
@@ -6,3 +6,4 @@
   [v1 -> (Int32 42)],
   [k2 -> (Int32 2)],
   [k1 -> (Int32 1)] }
+Gas remaining: 4001741
diff --git a/tests/eval/good/gold/keccak256_2.scilexp.gold b/tests/eval/good/gold/keccak256_2.scilexp.gold
index ac224603b..c83bdcef0 100644
--- a/tests/eval/good/gold/keccak256_2.scilexp.gold
+++ b/tests/eval/good/gold/keccak256_2.scilexp.gold
@@ -8,3 +8,4 @@
   [v1 -> (Int64 42)],
   [k2 -> (Int64 2)],
   [k1 -> (Int64 1)] }
+Gas remaining: 4001737
diff --git a/tests/eval/good/gold/keccak256_3.scilexp.gold b/tests/eval/good/gold/keccak256_3.scilexp.gold
index 9d95dc7a2..00d060430 100644
--- a/tests/eval/good/gold/keccak256_3.scilexp.gold
+++ b/tests/eval/good/gold/keccak256_3.scilexp.gold
@@ -14,3 +14,4 @@
   [k2 -> (Int128 2)],
   [k1 -> (Int128 1)],
   [hash_dist -> <closure>] }
+Gas remaining: 4001405
diff --git a/tests/eval/good/gold/keccak256_4.scilexp.gold b/tests/eval/good/gold/keccak256_4.scilexp.gold
index 8c4dcdf99..00f484ba9 100644
--- a/tests/eval/good/gold/keccak256_4.scilexp.gold
+++ b/tests/eval/good/gold/keccak256_4.scilexp.gold
@@ -14,3 +14,4 @@
   [k2 -> (Int32 2)],
   [k1 -> (Int32 1)],
   [hash_dist -> <closure>] }
+Gas remaining: 4001405
diff --git a/tests/eval/good/gold/keccak256_5.scilexp.gold b/tests/eval/good/gold/keccak256_5.scilexp.gold
index 8561aed9a..daaeb6b89 100644
--- a/tests/eval/good/gold/keccak256_5.scilexp.gold
+++ b/tests/eval/good/gold/keccak256_5.scilexp.gold
@@ -19,3 +19,4 @@
   [v3 -> (Int128 43)],
   [v2 -> (Int64 2)],
   [v1 -> (Int32 1)] }
+Gas remaining: 4001716
diff --git a/tests/eval/good/gold/let-builtin.scilexp.gold b/tests/eval/good/gold/let-builtin.scilexp.gold
index 26ffcec42..572543b16 100644
--- a/tests/eval/good/gold/let-builtin.scilexp.gold
+++ b/tests/eval/good/gold/let-builtin.scilexp.gold
@@ -3,3 +3,4 @@
   [y -> (Int32 84)],
   [f -> <closure>],
   [x -> (Int32 42)] }
+Gas remaining: 4001744
diff --git a/tests/eval/good/gold/let.scilexp.gold b/tests/eval/good/gold/let.scilexp.gold
index c73686312..5168fead8 100644
--- a/tests/eval/good/gold/let.scilexp.gold
+++ b/tests/eval/good/gold/let.scilexp.gold
@@ -3,3 +3,4 @@
   [y -> (Int32 42)],
   [f -> <closure>],
   [x -> (Int32 42)] }
+Gas remaining: 4001748
diff --git a/tests/eval/good/gold/let_in_let_in.scilexp.gold b/tests/eval/good/gold/let_in_let_in.scilexp.gold
index 1c9936976..2a3b9a09f 100644
--- a/tests/eval/good/gold/let_in_let_in.scilexp.gold
+++ b/tests/eval/good/gold/let_in_let_in.scilexp.gold
@@ -1,2 +1,3 @@
 (Uint32 1),
 { [f -> (Uint32 1)] }
+Gas remaining: 4001752
diff --git a/tests/eval/good/gold/list_append.scilexp.gold b/tests/eval/good/gold/list_append.scilexp.gold
index 3c6b5b3ed..2546ab46e 100644
--- a/tests/eval/good/gold/list_append.scilexp.gold
+++ b/tests/eval/good/gold/list_append.scilexp.gold
@@ -9,3 +9,4 @@
   [two -> (Int32 2)],
   [one -> (Int32 1)],
   [int_append -> <closure>] }
+Gas remaining: 4001685
diff --git a/tests/eval/good/gold/list_eq.scilexp.gold b/tests/eval/good/gold/list_eq.scilexp.gold
index 35e71e21a..995fb3210 100644
--- a/tests/eval/good/gold/list_eq.scilexp.gold
+++ b/tests/eval/good/gold/list_eq.scilexp.gold
@@ -21,3 +21,4 @@
   [two -> (Int64 2)],
   [one -> (Int64 1)],
   [int_list_eq -> <closure>] }
+Gas remaining: 4001295
diff --git a/tests/eval/good/gold/list_exists.scilexp.gold b/tests/eval/good/gold/list_exists.scilexp.gold
index d61e3c40c..5cdd3449a 100644
--- a/tests/eval/good/gold/list_exists.scilexp.gold
+++ b/tests/eval/good/gold/list_exists.scilexp.gold
@@ -13,3 +13,4 @@
   [g -> <closure>],
   [f -> <closure>],
   [int_exists -> <closure>] }
+Gas remaining: 4001560
diff --git a/tests/eval/good/gold/list_filter.scilexp.gold b/tests/eval/good/gold/list_filter.scilexp.gold
index 4559b0a6e..9322ce837 100644
--- a/tests/eval/good/gold/list_filter.scilexp.gold
+++ b/tests/eval/good/gold/list_filter.scilexp.gold
@@ -10,3 +10,4 @@
   [one -> (Int32 1)],
   [f -> <closure>],
   [int_filter -> <closure>] }
+Gas remaining: 4001642
diff --git a/tests/eval/good/gold/list_find.scilexp.gold b/tests/eval/good/gold/list_find.scilexp.gold
index 80f7dbc0e..9fba2dbcd 100644
--- a/tests/eval/good/gold/list_find.scilexp.gold
+++ b/tests/eval/good/gold/list_find.scilexp.gold
@@ -13,3 +13,4 @@
   [one -> (Int64 1)],
   [f -> <closure>],
   [int_find -> <closure>] }
+Gas remaining: 4001598
diff --git a/tests/eval/good/gold/list_flatten.scilexp.gold b/tests/eval/good/gold/list_flatten.scilexp.gold
index 39d89a7fe..0401e8ef0 100644
--- a/tests/eval/good/gold/list_flatten.scilexp.gold
+++ b/tests/eval/good/gold/list_flatten.scilexp.gold
@@ -16,3 +16,4 @@
   [two -> (Int128 2)],
   [one -> (Int128 1)],
   [int_flatten -> <closure>] }
+Gas remaining: 4001604
diff --git a/tests/eval/good/gold/list_foldl.scilexp.gold b/tests/eval/good/gold/list_foldl.scilexp.gold
index 67f78d221..dff5d32d6 100644
--- a/tests/eval/good/gold/list_foldl.scilexp.gold
+++ b/tests/eval/good/gold/list_foldl.scilexp.gold
@@ -8,3 +8,4 @@
   [two -> (Int32 2)],
   [one -> (Int32 1)],
   [zero -> (Int32 0)] }
+Gas remaining: 4001660
diff --git a/tests/eval/good/gold/list_foldl_while.scilexp.gold b/tests/eval/good/gold/list_foldl_while.scilexp.gold
index 7f7c6b666..72a0e6055 100644
--- a/tests/eval/good/gold/list_foldl_while.scilexp.gold
+++ b/tests/eval/good/gold/list_foldl_while.scilexp.gold
@@ -11,3 +11,4 @@
   [two -> (Int32 2)],
   [one -> (Int32 1)],
   [zero -> (Int32 0)] }
+Gas remaining: 4001637
diff --git a/tests/eval/good/gold/list_foldr.scilexp.gold b/tests/eval/good/gold/list_foldr.scilexp.gold
index 9a5421b4e..cb827f846 100644
--- a/tests/eval/good/gold/list_foldr.scilexp.gold
+++ b/tests/eval/good/gold/list_foldr.scilexp.gold
@@ -8,3 +8,4 @@
   [two -> (Int32 2)],
   [one -> (Int32 1)],
   [zero -> (Int32 0)] }
+Gas remaining: 4001660
diff --git a/tests/eval/good/gold/list_forall.scilexp.gold b/tests/eval/good/gold/list_forall.scilexp.gold
index e71e23878..136d74a20 100644
--- a/tests/eval/good/gold/list_forall.scilexp.gold
+++ b/tests/eval/good/gold/list_forall.scilexp.gold
@@ -14,3 +14,4 @@
   [three -> (Int32 3)],
   [two -> (Int32 2)],
   [one -> (Int32 1)] }
+Gas remaining: 4001553
diff --git a/tests/eval/good/gold/list_head.scilexp.gold b/tests/eval/good/gold/list_head.scilexp.gold
index 0bacba514..9c5fe9b81 100644
--- a/tests/eval/good/gold/list_head.scilexp.gold
+++ b/tests/eval/good/gold/list_head.scilexp.gold
@@ -7,3 +7,4 @@
   [two -> (Int32 2)],
   [one -> (Int32 1)],
   [int_head -> <closure>] }
+Gas remaining: 4001736
diff --git a/tests/eval/good/gold/list_length.scilexp.gold b/tests/eval/good/gold/list_length.scilexp.gold
index eab12ed35..34a5501f7 100644
--- a/tests/eval/good/gold/list_length.scilexp.gold
+++ b/tests/eval/good/gold/list_length.scilexp.gold
@@ -11,3 +11,4 @@
   [two -> (Int32 2)],
   [one -> (Int32 1)],
   [int_length -> <closure>] }
+Gas remaining: 4001649
diff --git a/tests/eval/good/gold/list_map.scilexp.gold b/tests/eval/good/gold/list_map.scilexp.gold
index 109a8a999..66d6c7377 100644
--- a/tests/eval/good/gold/list_map.scilexp.gold
+++ b/tests/eval/good/gold/list_map.scilexp.gold
@@ -9,3 +9,4 @@
   [one -> (Uint32 1)],
   [f -> <closure>],
   [int_map -> <closure>] }
+Gas remaining: 4001587
diff --git a/tests/eval/good/gold/list_mem.scilexp.gold b/tests/eval/good/gold/list_mem.scilexp.gold
index 4ead5cff1..b4c68ef96 100644
--- a/tests/eval/good/gold/list_mem.scilexp.gold
+++ b/tests/eval/good/gold/list_mem.scilexp.gold
@@ -15,3 +15,4 @@
   [zero -> (Int32 0)],
   [f -> <closure>],
   [int_mem -> <closure>] }
+Gas remaining: 4001379
diff --git a/tests/eval/good/gold/list_nth.scilexp.gold b/tests/eval/good/gold/list_nth.scilexp.gold
index 9ed1f23db..d30429f4d 100644
--- a/tests/eval/good/gold/list_nth.scilexp.gold
+++ b/tests/eval/good/gold/list_nth.scilexp.gold
@@ -15,3 +15,4 @@
   [one -> (Uint32 1)],
   [zero -> (Uint32 0)],
   [int_nth -> <closure>] }
+Gas remaining: 4001278
diff --git a/tests/eval/good/gold/list_product.scilexp.gold b/tests/eval/good/gold/list_product.scilexp.gold
index c60039379..b26be2206 100644
--- a/tests/eval/good/gold/list_product.scilexp.gold
+++ b/tests/eval/good/gold/list_product.scilexp.gold
@@ -7,3 +7,4 @@
   [two -> (Int32 2)],
   [one -> (Int32 1)],
   [list_product -> <closure>] }
+Gas remaining: 4001615
diff --git a/tests/eval/good/gold/list_reverse.scilexp.gold b/tests/eval/good/gold/list_reverse.scilexp.gold
index bb7aeed04..8e4f3dafe 100644
--- a/tests/eval/good/gold/list_reverse.scilexp.gold
+++ b/tests/eval/good/gold/list_reverse.scilexp.gold
@@ -9,3 +9,4 @@
   [two -> (Int32 2)],
   [one -> (Int32 1)],
   [int_reverse -> <closure>] }
+Gas remaining: 4001685
diff --git a/tests/eval/good/gold/list_sort.scilexp.gold b/tests/eval/good/gold/list_sort.scilexp.gold
index d92494d3e..b4b89282a 100644
--- a/tests/eval/good/gold/list_sort.scilexp.gold
+++ b/tests/eval/good/gold/list_sort.scilexp.gold
@@ -22,3 +22,4 @@
   [zero -> (Uint64 0)],
   [flt -> <closure>],
   [int_sort -> <closure>] }
+Gas remaining: 4000768
diff --git a/tests/eval/good/gold/list_sort_eq.scilexp.gold b/tests/eval/good/gold/list_sort_eq.scilexp.gold
index 67909cacd..8ed8a6c43 100644
--- a/tests/eval/good/gold/list_sort_eq.scilexp.gold
+++ b/tests/eval/good/gold/list_sort_eq.scilexp.gold
@@ -18,3 +18,4 @@
   [int_sort_t -> <closure>],
   [list_int_eq -> <closure>],
   [list_int_eq_t -> <closure>] }
+Gas remaining: 4001384
diff --git a/tests/eval/good/gold/list_tail.scilexp.gold b/tests/eval/good/gold/list_tail.scilexp.gold
index 9437eb805..6ca95a165 100644
--- a/tests/eval/good/gold/list_tail.scilexp.gold
+++ b/tests/eval/good/gold/list_tail.scilexp.gold
@@ -7,3 +7,4 @@
   [two -> (Int32 2)],
   [one -> (Int32 1)],
   [int_rest -> <closure>] }
+Gas remaining: 4001736
diff --git a/tests/eval/good/gold/list_tail1.scilexp.gold b/tests/eval/good/gold/list_tail1.scilexp.gold
index 271f65021..4aa96533c 100644
--- a/tests/eval/good/gold/list_tail1.scilexp.gold
+++ b/tests/eval/good/gold/list_tail1.scilexp.gold
@@ -6,3 +6,4 @@
   [two -> (Int64 2)],
   [one -> (Int64 1)],
   [int_rest -> <closure>] }
+Gas remaining: 4001738
diff --git a/tests/eval/good/gold/list_tail2.scilexp.gold b/tests/eval/good/gold/list_tail2.scilexp.gold
index c7a727ada..e0d0a222a 100644
--- a/tests/eval/good/gold/list_tail2.scilexp.gold
+++ b/tests/eval/good/gold/list_tail2.scilexp.gold
@@ -5,3 +5,4 @@
   [two -> (Int64 2)],
   [one -> (Int64 1)],
   [int_rest -> <closure>] }
+Gas remaining: 4001740
diff --git a/tests/eval/good/gold/list_unzip.scilexp.gold b/tests/eval/good/gold/list_unzip.scilexp.gold
index 42ecb8c4a..90191cf4c 100644
--- a/tests/eval/good/gold/list_unzip.scilexp.gold
+++ b/tests/eval/good/gold/list_unzip.scilexp.gold
@@ -13,3 +13,4 @@
   [two -> (Int128 2)],
   [one -> (Int128 1)],
   [int_unzip -> <closure>] }
+Gas remaining: 4001648
diff --git a/tests/eval/good/gold/list_zip.scilexp.gold b/tests/eval/good/gold/list_zip.scilexp.gold
index f9d07dfd1..c35a7e2fe 100644
--- a/tests/eval/good/gold/list_zip.scilexp.gold
+++ b/tests/eval/good/gold/list_zip.scilexp.gold
@@ -11,3 +11,4 @@
   [two -> (Uint32 2)],
   [one -> (Uint32 1)],
   [int_zip -> <closure>] }
+Gas remaining: 4001203
diff --git a/tests/eval/good/gold/list_zip_with.scilexp.gold b/tests/eval/good/gold/list_zip_with.scilexp.gold
index 35ea40d29..62ea78893 100644
--- a/tests/eval/good/gold/list_zip_with.scilexp.gold
+++ b/tests/eval/good/gold/list_zip_with.scilexp.gold
@@ -12,3 +12,4 @@
   [one -> (Uint128 1)],
   [f -> <closure>],
   [int_zip -> <closure>] }
+Gas remaining: 4001129
diff --git a/tests/eval/good/gold/map1.scilexp.gold b/tests/eval/good/gold/map1.scilexp.gold
index c9bcc5466..aa6b0aa47 100644
--- a/tests/eval/good/gold/map1.scilexp.gold
+++ b/tests/eval/good/gold/map1.scilexp.gold
@@ -6,3 +6,4 @@
   [v1 -> (Uint64 42)],
   [k2 -> (Uint64 2)],
   [k1 -> (Uint64 1)] }
+Gas remaining: 4001741
diff --git a/tests/eval/good/gold/map2.scilexp.gold b/tests/eval/good/gold/map2.scilexp.gold
index 5ce8d0a03..4e0078703 100644
--- a/tests/eval/good/gold/map2.scilexp.gold
+++ b/tests/eval/good/gold/map2.scilexp.gold
@@ -8,3 +8,4 @@
   [v1 -> (Int32 42)],
   [k2 -> (Int32 2)],
   [k1 -> (Int32 1)] }
+Gas remaining: 4001735
diff --git a/tests/eval/good/gold/map3.scilexp.gold b/tests/eval/good/gold/map3.scilexp.gold
index 4cbab2da1..1d7a91417 100644
--- a/tests/eval/good/gold/map3.scilexp.gold
+++ b/tests/eval/good/gold/map3.scilexp.gold
@@ -9,3 +9,4 @@
   [k3 -> (Int32 3)],
   [k2 -> (Int32 2)],
   [k1 -> (Int32 1)] }
+Gas remaining: 4001733
diff --git a/tests/eval/good/gold/map4.scilexp.gold b/tests/eval/good/gold/map4.scilexp.gold
index 7a3a99cf1..8217c4987 100644
--- a/tests/eval/good/gold/map4.scilexp.gold
+++ b/tests/eval/good/gold/map4.scilexp.gold
@@ -9,3 +9,4 @@
   [k3 -> (Int32 3)],
   [k2 -> (Int32 2)],
   [k1 -> (Int32 1)] }
+Gas remaining: 4001731
diff --git a/tests/eval/good/gold/map5.scilexp.gold b/tests/eval/good/gold/map5.scilexp.gold
index aff686de3..d1541c7b8 100644
--- a/tests/eval/good/gold/map5.scilexp.gold
+++ b/tests/eval/good/gold/map5.scilexp.gold
@@ -9,3 +9,4 @@
   [k3 -> (Int32 3)],
   [k2 -> (Int32 2)],
   [k1 -> (Int32 1)] }
+Gas remaining: 4001733
diff --git a/tests/eval/good/gold/map6.scilexp.gold b/tests/eval/good/gold/map6.scilexp.gold
index fe7d11c71..097235f9b 100644
--- a/tests/eval/good/gold/map6.scilexp.gold
+++ b/tests/eval/good/gold/map6.scilexp.gold
@@ -9,3 +9,4 @@
   [k3 -> (Int32 3)],
   [k2 -> (Int32 2)],
   [k1 -> (Int32 1)] }
+Gas remaining: 4001733
diff --git a/tests/eval/good/gold/map_no_keeping_old_bindings.scilexp.gold b/tests/eval/good/gold/map_no_keeping_old_bindings.scilexp.gold
index 6f0dcd21d..11a26db28 100644
--- a/tests/eval/good/gold/map_no_keeping_old_bindings.scilexp.gold
+++ b/tests/eval/good/gold/map_no_keeping_old_bindings.scilexp.gold
@@ -7,3 +7,4 @@
   [v2 -> (Int32 239)],
   [v1 -> (Int32 57)],
   [k -> (Int32 1)] }
+Gas remaining: 4001736
diff --git a/tests/eval/good/gold/map_remove_no_exception.scilexp.gold b/tests/eval/good/gold/map_remove_no_exception.scilexp.gold
index 7e9c25a12..b627f14a6 100644
--- a/tests/eval/good/gold/map_remove_no_exception.scilexp.gold
+++ b/tests/eval/good/gold/map_remove_no_exception.scilexp.gold
@@ -1,3 +1,4 @@
 (Map Int32 Int32 []),
 { [m -> (Map Int32 Int32 [])],
   [k -> (Int32 1)] }
+Gas remaining: 4001752
diff --git a/tests/eval/good/gold/map_to_list.scilexp.gold b/tests/eval/good/gold/map_to_list.scilexp.gold
index 7b5b01e70..096fdfde3 100644
--- a/tests/eval/good/gold/map_to_list.scilexp.gold
+++ b/tests/eval/good/gold/map_to_list.scilexp.gold
@@ -9,3 +9,4 @@
   [k3 -> (Int32 3)],
   [k2 -> (Int32 2)],
   [k1 -> (Int32 1)] }
+Gas remaining: 4001730
diff --git a/tests/eval/good/gold/msg.scilexp.gold b/tests/eval/good/gold/msg.scilexp.gold
index 6cd64e37a..375e16e03 100644
--- a/tests/eval/good/gold/msg.scilexp.gold
+++ b/tests/eval/good/gold/msg.scilexp.gold
@@ -4,3 +4,4 @@
   [y -> (Int32 42)],
   [f -> <closure>],
   [x -> (Int32 42)] }
+Gas remaining: 4001746
diff --git a/tests/eval/good/gold/nat_eq_false.scilexp.gold b/tests/eval/good/gold/nat_eq_false.scilexp.gold
index f06276708..e3360e7e6 100644
--- a/tests/eval/good/gold/nat_eq_false.scilexp.gold
+++ b/tests/eval/good/gold/nat_eq_false.scilexp.gold
@@ -7,3 +7,4 @@
   [two -> (Nat 2)],
   [one -> (Nat 1)],
   [zero -> (Nat 0)] }
+Gas remaining: 4001580
diff --git a/tests/eval/good/gold/nat_eq_foldl.scilexp.gold b/tests/eval/good/gold/nat_eq_foldl.scilexp.gold
index e994dcc64..e1588a23a 100644
--- a/tests/eval/good/gold/nat_eq_foldl.scilexp.gold
+++ b/tests/eval/good/gold/nat_eq_foldl.scilexp.gold
@@ -4,3 +4,4 @@
   [two -> (Nat 2)],
   [one -> (Nat 1)],
   [zero -> (Nat 0)] }
+Gas remaining: 4001677
diff --git a/tests/eval/good/gold/nat_fold_stress.scilexp.gold b/tests/eval/good/gold/nat_fold_stress.scilexp.gold
index 62e132f54..d9e713f31 100644
--- a/tests/eval/good/gold/nat_fold_stress.scilexp.gold
+++ b/tests/eval/good/gold/nat_fold_stress.scilexp.gold
@@ -1,3 +1,4 @@
 (Uint32 0),
 { [large_n -> (Uint32 80000)],
   [silly_zero -> <closure>] }
+Gas remaining: 3201737
diff --git a/tests/eval/good/gold/nat_to_int.scilexp.gold b/tests/eval/good/gold/nat_to_int.scilexp.gold
index e738ee66e..dc8c62b2e 100644
--- a/tests/eval/good/gold/nat_to_int.scilexp.gold
+++ b/tests/eval/good/gold/nat_to_int.scilexp.gold
@@ -4,3 +4,4 @@
   [two -> (Nat 2)],
   [one -> (Nat 1)],
   [zero -> (Nat 0)] }
+Gas remaining: 4001678
diff --git a/tests/eval/good/gold/option.scilexp.gold b/tests/eval/good/gold/option.scilexp.gold
index c513c23ab..8821ef73e 100644
--- a/tests/eval/good/gold/option.scilexp.gold
+++ b/tests/eval/good/gold/option.scilexp.gold
@@ -3,3 +3,4 @@
   [t -> (True)],
   [x -> (Int32 12)],
   [a -> (Int32 12)] }
+Gas remaining: 4001748
diff --git a/tests/eval/good/gold/pair1.scilexp.gold b/tests/eval/good/gold/pair1.scilexp.gold
index 0fa7d92c1..184361ef7 100644
--- a/tests/eval/good/gold/pair1.scilexp.gold
+++ b/tests/eval/good/gold/pair1.scilexp.gold
@@ -9,3 +9,4 @@
   [n -> (None)],
   [b -> (Int32 2)],
   [a -> (Int32 1)] }
+Gas remaining: 4001735
diff --git a/tests/eval/good/gold/pair2.scilexp.gold b/tests/eval/good/gold/pair2.scilexp.gold
index 880cb802f..b39c299e5 100644
--- a/tests/eval/good/gold/pair2.scilexp.gold
+++ b/tests/eval/good/gold/pair2.scilexp.gold
@@ -8,3 +8,4 @@
   [n -> (None)],
   [b -> (Int32 2)],
   [a -> (Int32 1)] }
+Gas remaining: 4001737
diff --git a/tests/eval/good/gold/pair3.scilexp.gold b/tests/eval/good/gold/pair3.scilexp.gold
index a9474a81f..75ea33e22 100644
--- a/tests/eval/good/gold/pair3.scilexp.gold
+++ b/tests/eval/good/gold/pair3.scilexp.gold
@@ -7,3 +7,4 @@
   [n -> (None)],
   [b -> (Int32 2)],
   [a -> (Int32 1)] }
+Gas remaining: 4001736
diff --git a/tests/eval/good/gold/pm1.scilexp.gold b/tests/eval/good/gold/pm1.scilexp.gold
index a57b133a3..6145f92ef 100644
--- a/tests/eval/good/gold/pm1.scilexp.gold
+++ b/tests/eval/good/gold/pm1.scilexp.gold
@@ -1,3 +1,4 @@
 (Int32 2),
 { [c -> (False)],
   [b -> (True)] }
+Gas remaining: 4001748
diff --git a/tests/eval/good/gold/pm2.scilexp.gold b/tests/eval/good/gold/pm2.scilexp.gold
index 3068bd184..7e3e0ba90 100644
--- a/tests/eval/good/gold/pm2.scilexp.gold
+++ b/tests/eval/good/gold/pm2.scilexp.gold
@@ -2,3 +2,4 @@
 { [c -> (True)],
   [b -> (True)],
   [z -> (Int32 3)] }
+Gas remaining: 4001746
diff --git a/tests/eval/good/gold/pm3.scilexp.gold b/tests/eval/good/gold/pm3.scilexp.gold
index a4f76994f..1e9d5a517 100644
--- a/tests/eval/good/gold/pm3.scilexp.gold
+++ b/tests/eval/good/gold/pm3.scilexp.gold
@@ -5,3 +5,4 @@
   [z -> (Int32 3)],
   [y -> (Some (Int32 42))],
   [v -> (Int32 42)] }
+Gas remaining: 4001742
diff --git a/tests/eval/good/gold/pm_app.scilexp.gold b/tests/eval/good/gold/pm_app.scilexp.gold
index b84244eea..39f0e64b4 100644
--- a/tests/eval/good/gold/pm_app.scilexp.gold
+++ b/tests/eval/good/gold/pm_app.scilexp.gold
@@ -1,3 +1,4 @@
 (False),
 { [y -> (False)],
   [x -> (True)] }
+Gas remaining: 4001744
diff --git a/tests/eval/good/gold/pm_nesting.scilexp.gold b/tests/eval/good/gold/pm_nesting.scilexp.gold
index b4cce0a42..5fdd1e812 100644
--- a/tests/eval/good/gold/pm_nesting.scilexp.gold
+++ b/tests/eval/good/gold/pm_nesting.scilexp.gold
@@ -4,3 +4,4 @@
   [y -> (Some (Int32 42))],
   [x -> (True)],
   [v -> (Int32 42)] }
+Gas remaining: 4001747
diff --git a/tests/eval/good/gold/ripemd160_1.scilexp.gold b/tests/eval/good/gold/ripemd160_1.scilexp.gold
index 20a5508c0..904f3c542 100644
--- a/tests/eval/good/gold/ripemd160_1.scilexp.gold
+++ b/tests/eval/good/gold/ripemd160_1.scilexp.gold
@@ -6,3 +6,4 @@
   [v1 -> (Int32 42)],
   [k2 -> (Int32 2)],
   [k1 -> (Int32 1)] }
+Gas remaining: 4001741
diff --git a/tests/eval/good/gold/ripemd160_2.scilexp.gold b/tests/eval/good/gold/ripemd160_2.scilexp.gold
index 2ac5bf0de..1fbb2caba 100644
--- a/tests/eval/good/gold/ripemd160_2.scilexp.gold
+++ b/tests/eval/good/gold/ripemd160_2.scilexp.gold
@@ -8,3 +8,4 @@
   [v1 -> (Int64 42)],
   [k2 -> (Int64 2)],
   [k1 -> (Int64 1)] }
+Gas remaining: 4001737
diff --git a/tests/eval/good/gold/ripemd160_5.scilexp.gold b/tests/eval/good/gold/ripemd160_5.scilexp.gold
index ad683dc16..4d14fc456 100644
--- a/tests/eval/good/gold/ripemd160_5.scilexp.gold
+++ b/tests/eval/good/gold/ripemd160_5.scilexp.gold
@@ -19,3 +19,4 @@
   [v3 -> (Int128 43)],
   [v2 -> (Int64 2)],
   [v1 -> (Int32 1)] }
+Gas remaining: 4001716
diff --git a/tests/eval/good/gold/str-char-1.scilexp.gold b/tests/eval/good/gold/str-char-1.scilexp.gold
index 8d36ff410..eb7e403a7 100644
--- a/tests/eval/good/gold/str-char-1.scilexp.gold
+++ b/tests/eval/good/gold/str-char-1.scilexp.gold
@@ -2,3 +2,4 @@
 "),
 { [s1 -> (String "hi
 ")] }
+Gas remaining: 4001754
diff --git a/tests/eval/good/gold/string1.scilexp.gold b/tests/eval/good/gold/string1.scilexp.gold
index 2c2b870ac..710bdd6f9 100644
--- a/tests/eval/good/gold/string1.scilexp.gold
+++ b/tests/eval/good/gold/string1.scilexp.gold
@@ -6,3 +6,4 @@
   [s -> (String "abc")],
   [k2 -> (Int32 2)],
   [k1 -> (Int32 1)] }
+Gas remaining: 4001741
diff --git a/tests/eval/good/gold/string2.scilexp.gold b/tests/eval/good/gold/string2.scilexp.gold
index 02b522bdc..ded4f13ae 100644
--- a/tests/eval/good/gold/string2.scilexp.gold
+++ b/tests/eval/good/gold/string2.scilexp.gold
@@ -2,3 +2,4 @@
 { [t -> (String "def	")],
   [s -> (String "abc
 ")] }
+Gas remaining: 4001752
diff --git a/tests/eval/good/gold/times_two.scilexp.gold b/tests/eval/good/gold/times_two.scilexp.gold
index 09731a7ab..5683416e3 100644
--- a/tests/eval/good/gold/times_two.scilexp.gold
+++ b/tests/eval/good/gold/times_two.scilexp.gold
@@ -6,3 +6,4 @@
   [two -> (Nat 2)],
   [one -> (Nat 1)],
   [zero -> (Nat 0)] }
+Gas remaining: 4001645
diff --git a/tests/eval/good/gold/to_bystr.scilexp.gold b/tests/eval/good/gold/to_bystr.scilexp.gold
index 45b57ff20..4337dfd71 100644
--- a/tests/eval/good/gold/to_bystr.scilexp.gold
+++ b/tests/eval/good/gold/to_bystr.scilexp.gold
@@ -1,2 +1,3 @@
 (ByStr 0xfb19),
 { [x -> (ByStr2 0xfb19)] }
+Gas remaining: 4001753
diff --git a/tests/eval/good/gold/type_subst1.scilexp.gold b/tests/eval/good/gold/type_subst1.scilexp.gold
index 260e49b59..5180733c5 100644
--- a/tests/eval/good/gold/type_subst1.scilexp.gold
+++ b/tests/eval/good/gold/type_subst1.scilexp.gold
@@ -1,3 +1,4 @@
 <closure>,
 { [tf_applied -> <closure>],
   [tf -> <type_closure>] }
+Gas remaining: 4001750
diff --git a/tests/eval/good/gold/type_subst2.scilexp.gold b/tests/eval/good/gold/type_subst2.scilexp.gold
index 050b6e307..d20a0c4f0 100644
--- a/tests/eval/good/gold/type_subst2.scilexp.gold
+++ b/tests/eval/good/gold/type_subst2.scilexp.gold
@@ -1,3 +1,4 @@
 (None),
 { [tf_applied -> (None)],
   [tf -> <type_closure>] }
+Gas remaining: 4001751
diff --git a/tests/eval/good/gold/uint_conversions.scilexp.gold b/tests/eval/good/gold/uint_conversions.scilexp.gold
index b14864f57..071c569d8 100644
--- a/tests/eval/good/gold/uint_conversions.scilexp.gold
+++ b/tests/eval/good/gold/uint_conversions.scilexp.gold
@@ -10,3 +10,4 @@
   [minus_one -> (Int32 -1)],
   [one -> (Int32 1)],
   [zero -> (Int32 0)] }
+Gas remaining: 4001716
diff --git a/tests/runner/UintParam/output_1.json b/tests/runner/UintParam/output_1.json
index 41a45f996..b32907d4c 100644
--- a/tests/runner/UintParam/output_1.json
+++ b/tests/runner/UintParam/output_1.json
@@ -14,4 +14,4 @@
     }
   ],
   "warnings": []
-} 
+}
\ No newline at end of file
diff --git a/tests/runner/UintParam/output_2.json b/tests/runner/UintParam/output_2.json
index 7ad8edf3e..e32ebe329 100644
--- a/tests/runner/UintParam/output_2.json
+++ b/tests/runner/UintParam/output_2.json
@@ -14,4 +14,4 @@
     }
   ],
   "warnings": []
-} 
+}
\ No newline at end of file
diff --git a/tests/runner/UintParam/output_3.json b/tests/runner/UintParam/output_3.json
index f3304b041..bba7ab4f6 100644
--- a/tests/runner/UintParam/output_3.json
+++ b/tests/runner/UintParam/output_3.json
@@ -14,4 +14,4 @@
     }
   ],
   "warnings": []
-} 
+}
\ No newline at end of file
diff --git a/tests/runner/exception-example/output_1.json b/tests/runner/exception-example/output_1.json
index 8fbd2b1b9..53b5b9c2d 100644
--- a/tests/runner/exception-example/output_1.json
+++ b/tests/runner/exception-example/output_1.json
@@ -1,5 +1,5 @@
 {
-  "gas_remaining": "7967",
+  "gas_remaining": "7957",
   "errors": [
     {
       "error_message":