diff --git a/src/proto_alpha/lib_protocol/carbonated_map_costs.ml b/src/proto_alpha/lib_protocol/carbonated_map_costs.ml
index edb970793ae6118c6fca6df8083e83a78b02a075..5f94d49b9f1e37d0aae91606d6e3a59b0bdc5059 100644
--- a/src/proto_alpha/lib_protocol/carbonated_map_costs.ml
+++ b/src/proto_alpha/lib_protocol/carbonated_map_costs.ml
@@ -28,9 +28,7 @@ module S = Saturation_repr
 (** This is a good enough approximation *)
 let log2 x = S.safe_int (1 + S.numbits x)
 
-(** TODO: https://gitlab.com/tezos/tezos/-/issues/2062
-    Plugin benchmarked gas.
-    Collect benchmark from [Carbonated_map_benchmarks.Find_benchmark].
+(** Collect benchmark from [Carbonated_map_benchmarks.Find_benchmark].
 
     The model is similar to the gas model as from [Michelson_v1_gas.map_get].
     The user is responsible for providing the [compare_key_cost] which depends
@@ -43,10 +41,10 @@ let log2 x = S.safe_int (1 + S.numbits x)
  *)
 let find_cost ~compare_key_cost ~size =
   let open Gas in
-  let intercept = S.safe_int 80 in
+  let intercept = S.safe_int 50 in
   let size = S.safe_int size in
   let compare_cost = log2 size *@ compare_key_cost in
-  let traversal_overhead = log2 size *@ S.safe_int 10 in
+  let traversal_overhead = log2 size *@ S.safe_int 2 in
   intercept +@ compare_cost +@ traversal_overhead
 
 (**
@@ -62,11 +60,9 @@ let find_cost ~compare_key_cost ~size =
 let update_cost ~compare_key_cost ~size =
   Gas.(S.safe_int 2 *@ find_cost ~compare_key_cost ~size)
 
-(** TODO: https://gitlab.com/tezos/tezos/-/issues/2062
-    Plugin benchmarked gas.
-    Collect benchmark from [Carbonated_map_benchmarks.Fold_benchmark].
+(** Collect benchmark from [Carbonated_map_benchmarks.Fold_benchmark].
 
     The cost of producing a list of elements is linear in the size of the map
     and does not depend on the size of the elements nor keys.
 *)
-let fold_cost ~size = Gas.(S.safe_int 100 *@ S.safe_int size)
+let fold_cost ~size = Gas.(S.safe_int 50 +@ (S.safe_int 24 *@ S.safe_int size))
diff --git a/src/proto_alpha/lib_protocol/michelson_v1_gas.ml b/src/proto_alpha/lib_protocol/michelson_v1_gas.ml
index 624f3e235363e24846cc5ddca9d0d11899a50ae9..e90457877268c13573b43ce0bb7ba6e2956f4c02 100644
--- a/src/proto_alpha/lib_protocol/michelson_v1_gas.ml
+++ b/src/proto_alpha/lib_protocol/michelson_v1_gas.ml
@@ -55,24 +55,24 @@ module Cost_of = struct
 
     (* model N_IAbs_int *)
     (* Approximating 0.065045 x term *)
-    let cost_N_IAbs_int size = S.safe_int (25 + (size lsr 4))
+    let cost_N_IAbs_int size = S.safe_int (20 + (size lsr 4))
 
     (* model N_IAdd_bls12_381_fr *)
     (* when benchmarking, compile bls12-381 without ADX *)
-    let cost_N_IAdd_bls12_381_fr = S.safe_int 45
+    let cost_N_IAdd_bls12_381_fr = S.safe_int 30
 
     (* model N_IAdd_bls12_381_g1 *)
     (* when benchmarking, compile bls12-381 without ADX *)
-    let cost_N_IAdd_bls12_381_g1 = S.safe_int 925
+    let cost_N_IAdd_bls12_381_g1 = S.safe_int 900
 
     (* model N_IAdd_bls12_381_g2 *)
     (* when benchmarking, compile bls12-381 without ADX *)
-    let cost_N_IAdd_bls12_381_g2 = S.safe_int 2_520
+    let cost_N_IAdd_bls12_381_g2 = S.safe_int 2_470
 
     let cost_linear_op_int size1 size2 =
       let open S_syntax in
       let v0 = S.safe_int (Compare.Int.max size1 size2) in
-      S.safe_int 55 + ((v0 lsr 4) + (v0 lsr 7))
+      S.safe_int 35 + ((v0 lsr 4) + (v0 lsr 7))
 
     (* model N_IAdd_int *)
     (* Approximating 0.078154 x term *)
@@ -97,17 +97,17 @@ module Cost_of = struct
     let cost_N_IAddress = S.safe_int 10
 
     (* model N_IAmount *)
-    let cost_N_IAmount = S.safe_int 15
+    let cost_N_IAmount = S.safe_int 10
 
     (* model N_IAnd *)
-    let cost_N_IAnd = S.safe_int 20
+    let cost_N_IAnd = S.safe_int 10
 
     (* model N_IAnd_int_nat *)
     (* Approximating 0.076804 x 2 x term *)
     let cost_N_IAnd_int_nat size1 size2 =
       let open S_syntax in
       let v0 = S.safe_int (Compare.Int.min size1 size2) in
-      S.safe_int 50 + ((v0 lsr 3) + (v0 lsr 6))
+      S.safe_int 35 + ((v0 lsr 3) + (v0 lsr 6))
 
     (* model N_IAnd_nat *)
     (* Approximating 0.076804 x term *)
@@ -116,10 +116,10 @@ module Cost_of = struct
     let cost_N_IAnd_nat size1 size2 =
       let open S_syntax in
       let v0 = S.safe_int (Compare.Int.min size1 size2) in
-      S.safe_int 50 + ((v0 lsr 4) + (v0 lsr 7))
+      S.safe_int 35 + ((v0 lsr 4) + (v0 lsr 7))
 
     (* model N_IApply *)
-    let cost_N_IApply = S.safe_int 160
+    let cost_N_IApply = S.safe_int 140
 
     (* model N_IBlake2b *)
     (* Approximating 1.120804 x term *)
@@ -129,7 +129,7 @@ module Cost_of = struct
       S.safe_int 430 + v0 + (v0 lsr 3)
 
     (* model N_IBytes_size *)
-    let cost_N_IBytes_size = S.safe_int 15
+    let cost_N_IBytes_size = S.safe_int 10
 
     (* model N_ICar *)
     let cost_N_ICar = S.safe_int 10
@@ -174,14 +174,14 @@ module Cost_of = struct
     let cost_N_IComb_get size =
       let open S_syntax in
       let v0 = S.safe_int size in
-      S.safe_int 30 + (v0 lsr 1) + (v0 lsr 4)
+      S.safe_int 20 + (v0 lsr 1) + (v0 lsr 4)
 
     (* model N_IComb_set *)
     (* Approximating 1.287531 x term *)
     let cost_N_IComb_set size =
       let open S_syntax in
       let v0 = S.safe_int size in
-      S.safe_int 40 + (v0 + (v0 lsr 2) + (v0 lsr 5))
+      S.safe_int 20 + (v0 + (v0 lsr 2) + (v0 lsr 5))
 
     (* Model N_ICompare *)
     (* Approximating 0.024413 x term *)
@@ -195,26 +195,26 @@ module Cost_of = struct
     let cost_N_IConcat_bytes_pair size1 size2 =
       let open S_syntax in
       let v0 = S.safe_int size1 + S.safe_int size2 in
-      S.safe_int 65 + (v0 lsr 4)
+      S.safe_int 45 + (v0 lsr 4)
 
     (* model N_IConcat_string_pair *)
     (* Approximating 0.061402 x term *)
     let cost_N_IConcat_string_pair size1 size2 =
       let open S_syntax in
       let v0 = S.safe_int size1 + S.safe_int size2 in
-      S.safe_int 65 + (v0 lsr 4)
+      S.safe_int 45 + (v0 lsr 4)
 
     (* model N_ICons_list *)
-    let cost_N_ICons_list = S.safe_int 15
+    let cost_N_ICons_list = S.safe_int 10
 
     (* model N_ICons_none *)
-    let cost_N_ICons_none = S.safe_int 15
+    let cost_N_ICons_none = S.safe_int 10
 
     (* model N_ICons_pair *)
-    let cost_N_ICons_pair = S.safe_int 15
+    let cost_N_ICons_pair = S.safe_int 10
 
     (* model N_ICons_some *)
-    let cost_N_ICons_some = S.safe_int 15
+    let cost_N_ICons_some = S.safe_int 10
 
     (* model N_IConst *)
     let cost_N_IConst = S.safe_int 10
@@ -234,17 +234,17 @@ module Cost_of = struct
     let cost_N_IDig size =
       let open S_syntax in
       let v0 = S.safe_int size in
-      S.safe_int 60 + ((S.safe_int 6 * v0) + (v0 lsr 1) + (v0 lsr 2))
+      S.safe_int 30 + ((S.safe_int 6 * v0) + (v0 lsr 1) + (v0 lsr 2))
 
     (* model N_IDip *)
-    let cost_N_IDip = S.safe_int 15
+    let cost_N_IDip = S.safe_int 10
 
     (* model N_IDipN *)
-    (* Approximating 1.708122 x term *)
+    (* Approximating 2.740571 x term *)
     let cost_N_IDipN size =
       let open S_syntax in
       let v0 = S.safe_int size in
-      S.safe_int 45 + (v0 + (v0 lsr 1) + (v0 lsr 3))
+      S.safe_int 30 + ((S.safe_int 2 * v0) + (v0 lsr 1) + (v0 lsr 3))
 
     (* model N_IView *)
     let cost_N_IView = S.safe_int 1460
@@ -257,14 +257,14 @@ module Cost_of = struct
     let cost_N_IDropN size =
       let open S_syntax in
       let v0 = S.safe_int size in
-      S.safe_int 60 + (S.safe_int 2 * v0) + (v0 lsr 1) + (v0 lsr 3)
+      S.safe_int 30 + (S.safe_int 2 * v0) + (v0 lsr 1) + (v0 lsr 3)
 
     (* model N_IDug *)
     (* Approximating 6.718396 x term *)
     let cost_N_IDug size =
       let open S_syntax in
       let v0 = S.safe_int size in
-      S.safe_int 60 + ((S.safe_int 6 * v0) + (v0 lsr 1) + (v0 lsr 2))
+      S.safe_int 35 + ((S.safe_int 6 * v0) + (v0 lsr 1) + (v0 lsr 2))
 
     (* model N_IDup *)
     let cost_N_IDup = S.safe_int 10
@@ -278,11 +278,11 @@ module Cost_of = struct
 
     let cost_div_int size1 size2 =
       let q = size1 - size2 in
-      if Compare.Int.(q < 0) then S.safe_int 140
+      if Compare.Int.(q < 0) then S.safe_int 105
       else
         let open S_syntax in
         let v0 = S.safe_int q * S.safe_int size2 in
-        S.safe_int 140 + (v0 lsr 10) + (v0 lsr 11) + (v0 lsr 13)
+        S.safe_int 105 + (v0 lsr 10) + (v0 lsr 11) + (v0 lsr 13)
 
     (* model N_IEdiv_int *)
     (* Approximating 0.001591 x term *)
@@ -293,13 +293,13 @@ module Cost_of = struct
     let cost_N_IEdiv_nat = cost_div_int
 
     (* model N_IEdiv_tez *)
-    let cost_N_IEdiv_tez = S.safe_int 140
+    let cost_N_IEdiv_tez = S.safe_int 80
 
     (* model N_IEdiv_teznat *)
-    let cost_N_IEdiv_teznat = S.safe_int 140
+    let cost_N_IEdiv_teznat = S.safe_int 70
 
     (* model N_IEmpty_big_map *)
-    let cost_N_IEmpty_big_map = S.safe_int 15
+    let cost_N_IEmpty_big_map = S.safe_int 10
 
     (* model N_IEmpty_map *)
     let cost_N_IEmpty_map = S.safe_int 220
@@ -308,25 +308,25 @@ module Cost_of = struct
     let cost_N_IEmpty_set = S.safe_int 220
 
     (* model N_IEq *)
-    let cost_N_IEq = S.safe_int 15
+    let cost_N_IEq = S.safe_int 10
 
     (* model N_IExec *)
-    let cost_N_IExec = S.safe_int 15
+    let cost_N_IExec = S.safe_int 10
 
     (* model N_IFailwith *)
     (* let cost_N_IFailwith = S.safe_int 105 *)
 
     (* model N_IGe *)
-    let cost_N_IGe = S.safe_int 15
+    let cost_N_IGe = S.safe_int 10
 
     (* model N_IGt *)
-    let cost_N_IGt = S.safe_int 15
+    let cost_N_IGt = S.safe_int 10
 
     (* model N_IHalt *)
-    let cost_N_IHalt = S.safe_int 15
+    let cost_N_IHalt = S.safe_int 10
 
     (* model N_IHash_key *)
-    let cost_N_IHash_key = S.safe_int 655
+    let cost_N_IHash_key = S.safe_int 605
 
     (* model N_IIf *)
     let cost_N_IIf = S.safe_int 10
@@ -341,20 +341,20 @@ module Cost_of = struct
     let cost_N_IIf_none = S.safe_int 10
 
     (* model N_IOpt_map *)
-    let cost_opt_map = S.safe_int 15
+    let cost_opt_map = S.safe_int 10
 
     (* model N_IImplicit_account *)
     let cost_N_IImplicit_account = S.safe_int 10
 
     (* model N_IInt_bls12_381_z_fr *)
     (* when benchmarking, compile bls12-381 without ADX *)
-    let cost_N_IInt_bls12_381_z_fr = S.safe_int 125
+    let cost_N_IInt_bls12_381_z_fr = S.safe_int 115
 
     (* model N_IInt_nat *)
-    let cost_N_IInt_nat = S.safe_int 15
+    let cost_N_IInt_nat = S.safe_int 10
 
     (* model N_IIs_nat *)
-    let cost_N_IIs_nat = S.safe_int 15
+    let cost_N_IIs_nat = S.safe_int 10
 
     (* model N_IKeccak *)
     (* Approximating 8.276352 x term *)
@@ -367,22 +367,22 @@ module Cost_of = struct
     let cost_N_ILambda = S.safe_int 10
 
     (* model N_ILe *)
-    let cost_N_ILe = S.safe_int 15
+    let cost_N_ILe = S.safe_int 10
 
     (* model N_ILeft *)
-    let cost_N_ILeft = S.safe_int 15
+    let cost_N_ILeft = S.safe_int 10
 
     (* model N_ILevel *)
-    let cost_N_ILevel = S.safe_int 15
+    let cost_N_ILevel = S.safe_int 10
 
     (* model N_IList_iter *)
-    let cost_N_IList_iter _ = S.safe_int 25
+    let cost_N_IList_iter _ = S.safe_int 20
 
     (* model N_IList_map *)
-    let cost_N_IList_map _ = S.safe_int 25
+    let cost_N_IList_map _ = S.safe_int 20
 
     (* model N_IList_size *)
-    let cost_N_IList_size = S.safe_int 15
+    let cost_N_IList_size = S.safe_int 10
 
     (* model N_ILoop *)
     let cost_N_ILoop = S.safe_int 10
@@ -395,66 +395,66 @@ module Cost_of = struct
     let cost_N_ILsl_nat size =
       let open S_syntax in
       let v0 = S.safe_int size in
-      S.safe_int 60 + ((v0 lsr 4) + (v0 lsr 5) + (v0 lsr 6))
+      S.safe_int 40 + ((v0 lsr 4) + (v0 lsr 5) + (v0 lsr 6))
 
     (* model N_ILsr_nat *)
     (* Approximating 0.115565 x term *)
     let cost_N_ILsr_nat size =
       let open S_syntax in
       let v0 = S.safe_int size in
-      S.safe_int 60 + ((v0 lsr 4) + (v0 lsr 5) + (v0 lsr 6))
+      S.safe_int 45 + ((v0 lsr 4) + (v0 lsr 5) + (v0 lsr 6))
 
     (* model N_ILt *)
-    let cost_N_ILt = S.safe_int 15
+    let cost_N_ILt = S.safe_int 10
 
     (* model N_IMap_get *)
     (* Approximating 0.048359 x term *)
     let cost_N_IMap_get size1 size2 =
       let open S_syntax in
       let v0 = size1 * log2 size2 in
-      S.safe_int 110 + (v0 lsr 5) + (v0 lsr 6)
+      S.safe_int 45 + (v0 lsr 5) + (v0 lsr 6)
 
     (* model N_IMap_get_and_update *)
     (* Approximating 0.145661 x term *)
     let cost_N_IMap_get_and_update size1 size2 =
       let open S_syntax in
       let v0 = size1 * log2 size2 in
-      S.safe_int 135 + (v0 lsr 3) + (v0 lsr 6)
+      S.safe_int 75 + (v0 lsr 3) + (v0 lsr 6)
 
     (* model N_IMap_iter *)
     (* Approximating 7.621331 x term *)
     let cost_N_IMap_iter size =
       let open S_syntax in
       let v0 = S.safe_int size in
-      S.safe_int 70 + (S.safe_int 7 * v0) + (v0 lsr 1) + (v0 lsr 3)
+      S.safe_int 50 + (S.safe_int 7 * v0) + (v0 lsr 1) + (v0 lsr 3)
 
     (* model N_IMap_map *)
     (* Approximating 7.46280485884 x term *)
     let cost_N_IMap_map size =
       let open S_syntax in
       let v0 = S.safe_int size in
-      S.safe_int 265 + ((S.safe_int 7 * v0) + (v0 lsr 1))
+      S.safe_int 50 + ((S.safe_int 7 * v0) + (v0 lsr 1))
 
     (* model N_IMap_mem *)
     (* Approximating 0.048446 x term *)
     let cost_N_IMap_mem size1 size2 =
       let open S_syntax in
       let v0 = size1 * log2 size2 in
-      S.safe_int 110 + (v0 lsr 5) + (v0 lsr 6)
+      S.safe_int 45 + (v0 lsr 5) + (v0 lsr 6)
 
     (* model N_IMap_size *)
-    let cost_N_IMap_size = S.safe_int 15
+    let cost_N_IMap_size = S.safe_int 10
 
     (* model N_IMap_update *)
     (* Approximating 0.097072 x term *)
     let cost_N_IMap_update size1 size2 =
       let open S_syntax in
       let v0 = size1 * log2 size2 in
-      S.safe_int 130 + (v0 lsr 4) + (v0 lsr 5)
+      S.safe_int 55 + (v0 lsr 4) + (v0 lsr 5)
 
     (* model N_IMul_bls12_381_fr *)
     (* when benchmarking, compile bls12-381 without ADX *)
-    let cost_N_IMul_bls12_381_fr = S.safe_int 65
+    let cost_N_IMul_bls12_381_fr = S.safe_int 45
 
     (* model N_IMul_bls12_381_fr_z *)
     (* Approximating 1.059386 x term *)
@@ -462,7 +462,7 @@ module Cost_of = struct
     let cost_N_IMul_bls12_381_fr_z size1 =
       let open S_syntax in
       let v0 = S.safe_int size1 in
-      S.safe_int 330 + v0 + (v0 lsr 4)
+      S.safe_int 265 + v0 + (v0 lsr 4)
 
     (* model N_IMul_bls12_381_g1 *)
     (* when benchmarking, compile bls12-381 without ADX *)
@@ -478,13 +478,13 @@ module Cost_of = struct
     let cost_N_IMul_bls12_381_z_fr size1 =
       let open S_syntax in
       let v0 = S.safe_int size1 in
-      S.safe_int 330 + v0 + (v0 lsr 4)
+      S.safe_int 265 + v0 + (v0 lsr 4)
 
     let cost_mul size1 size2 =
       let open S_syntax in
       let a = S.add (S.safe_int size1) (S.safe_int size2) in
       let v0 = a * log2 a in
-      S.safe_int 100 + (v0 lsr 1) + (v0 lsr 2) + (v0 lsr 4)
+      S.safe_int 55 + (v0 lsr 1) + (v0 lsr 2) + (v0 lsr 4)
 
     (* model N_IMul_int *)
     (* Approximating 0.857931 x term *)
@@ -502,27 +502,27 @@ module Cost_of = struct
 
     (* model N_INeg_bls12_381_fr *)
     (* when benchmarking, compile bls12-381 without ADX *)
-    let cost_N_INeg_bls12_381_fr = S.safe_int 45
+    let cost_N_INeg_bls12_381_fr = S.safe_int 25
 
     (* model N_INeg_bls12_381_g1 *)
     (* when benchmarking, compile bls12-381 without ADX *)
-    let cost_N_INeg_bls12_381_g1 = S.safe_int 60
+    let cost_N_INeg_bls12_381_g1 = S.safe_int 50
 
     (* model N_INeg_bls12_381_g2 *)
     (* when benchmarking, compile bls12-381 without ADX *)
-    let cost_N_INeg_bls12_381_g2 = S.safe_int 85
+    let cost_N_INeg_bls12_381_g2 = S.safe_int 70
 
     (* model N_INeg *)
     (* Approximating 0.066076 x term *)
     let cost_N_INeg size =
       let open S_syntax in
-      S.safe_int 40 + (S.safe_int size lsr 4)
+      S.safe_int 25 + (S.safe_int size lsr 4)
 
     (* model N_INeq *)
-    let cost_N_INeq = S.safe_int 15
+    let cost_N_INeq = S.safe_int 10
 
     (* model N_INil *)
-    let cost_N_INil = S.safe_int 15
+    let cost_N_INil = S.safe_int 10
 
     (* model N_INot *)
     let cost_N_INot = S.safe_int 10
@@ -532,17 +532,13 @@ module Cost_of = struct
     let cost_N_INot_int size =
       let open S_syntax in
       let v0 = S.safe_int size in
-      S.safe_int 50 + ((v0 lsr 4) + (v0 lsr 7))
+      S.safe_int 25 + ((v0 lsr 4) + (v0 lsr 7))
 
     (* model N_INow *)
-    let cost_N_INow = S.safe_int 15
+    let cost_N_INow = S.safe_int 10
 
     (* model N_IMin_block_time *)
-    let cost_N_IMin_block_time =
-      (* TODO: #2504
-         Benchmark MIN_BLOCK_TIME instruction to get an accurate Gas cost.
-      *)
-      S.safe_int 30
+    let cost_N_IMin_block_time = S.safe_int 20
 
     (* model N_IOpen_chest *)
     (* 612000 + chest * 19 + time * 19050 *)
@@ -553,7 +549,7 @@ module Cost_of = struct
       S.safe_int 612_000 + (S.safe_int 19 * v0) + (S.safe_int 19050 * v1)
 
     (* model N_IOr *)
-    let cost_N_IOr = S.safe_int 15
+    let cost_N_IOr = S.safe_int 10
 
     (* model N_IOr_nat *)
     (* Approximating 0.075758 x term *)
@@ -565,45 +561,44 @@ module Cost_of = struct
       S.add (S.safe_int 450_000) (S.mul (S.safe_int 342_500) (S.safe_int size))
 
     (* model N_IRead_ticket *)
-    let cost_N_IRead_ticket = S.safe_int 15
+    let cost_N_IRead_ticket = S.safe_int 10
 
     (* model N_IRight *)
-    let cost_N_IRight = S.safe_int 15
+    let cost_N_IRight = S.safe_int 10
 
     (* model N_ISapling_empty_state *)
-    let cost_N_ISapling_empty_state = S.safe_int 15
+    let cost_N_ISapling_empty_state = S.safe_int 10
 
     (* model N_ISapling_verify_update *)
-    (* Approximating 1.27167 x term *)
-    (* Approximating 38.72115 x term *)
     let cost_N_ISapling_verify_update size1 size2 bound_data =
       let open S_syntax in
       let v1 = S.safe_int size1 in
-      let v0 = S.safe_int size2 in
-      let bd = S.safe_int bound_data in
-      S.safe_int 84_050 + (v1 + (v1 lsr 2)) + (S.safe_int 39 * v0) + (bd lsr 2)
+      let v2 = S.safe_int size2 in
+      cost_N_IBlake2b bound_data + S.safe_int 310_000
+      + (S.safe_int 5_575_000 * v1)
+      + (S.safe_int 5_075_000 * v2)
 
     (* model N_ISelf_address *)
-    let cost_N_ISelf_address = S.safe_int 15
+    let cost_N_ISelf_address = S.safe_int 10
 
     (* model N_ISelf *)
-    let cost_N_ISelf = S.safe_int 15
+    let cost_N_ISelf = S.safe_int 10
 
     (* model N_ISender *)
-    let cost_N_ISender = S.safe_int 15
+    let cost_N_ISender = S.safe_int 10
 
     (* model N_ISet_delegate *)
-    let cost_N_ISet_delegate = S.safe_int 40
+    let cost_N_ISet_delegate = S.safe_int 30
 
     (* model N_ISet_iter *)
     (* Approximating 7.633555 x term *)
     let cost_N_ISet_iter size =
       let open S_syntax in
       let v0 = S.safe_int size in
-      S.safe_int 70 + (S.safe_int 7 * v0) + (v0 lsr 1) + (v0 lsr 3)
+      S.safe_int 50 + (S.safe_int 7 * v0) + (v0 lsr 1) + (v0 lsr 3)
 
     (* model N_ISet_size *)
-    let cost_N_ISet_size = S.safe_int 15
+    let cost_N_ISet_size = S.safe_int 10
 
     (* model N_ISha256 *)
     (* Approximating 4.763264 x term *)
@@ -627,23 +622,23 @@ module Cost_of = struct
     (* Approximating 0.065752 x term *)
     let cost_N_ISlice_bytes size =
       let open S_syntax in
-      S.safe_int 40 + (S.safe_int size lsr 4)
+      S.safe_int 25 + (S.safe_int size lsr 4)
 
     (* model N_ISlice_string *)
     (* Approximating 0.065688 x term *)
     let cost_N_ISlice_string size =
       let open S_syntax in
-      S.safe_int 40 + (S.safe_int size lsr 4)
+      S.safe_int 25 + (S.safe_int size lsr 4)
 
     (* model N_ISource *)
-    let cost_N_ISource = S.safe_int 15
+    let cost_N_ISource = S.safe_int 10
 
     (* model N_ISplit_ticket *)
     (* Approximating 0.132362 x term *)
     let cost_N_ISplit_ticket size1 size2 =
       let open S_syntax in
       let v1 = S.safe_int (Compare.Int.max size1 size2) in
-      S.safe_int 55 + (v1 lsr 3)
+      S.safe_int 40 + (v1 lsr 3)
 
     (* model N_IString_size *)
     let cost_N_IString_size = S.safe_int 15
@@ -653,7 +648,7 @@ module Cost_of = struct
     let cost_N_ISub_int = cost_linear_op_int
 
     (* model N_ISub_tez *)
-    let cost_N_ISub_tez = S.safe_int 20
+    let cost_N_ISub_tez = S.safe_int 15
 
     (* model N_ISub_tez_legacy *)
     let cost_N_ISub_tez_legacy = S.safe_int 20
@@ -666,7 +661,7 @@ module Cost_of = struct
     let cost_N_ISwap = S.safe_int 10
 
     (* model N_ITicket *)
-    let cost_N_ITicket = S.safe_int 15
+    let cost_N_ITicket = S.safe_int 10
 
     (* model N_ITotal_voting_power *)
     let cost_N_ITotal_voting_power = S.safe_int 370
@@ -688,17 +683,17 @@ module Cost_of = struct
     let cost_N_IVoting_power = S.safe_int 530
 
     (* model N_IXor *)
-    let cost_N_IXor = S.safe_int 20
+    let cost_N_IXor = S.safe_int 15
 
     (* model N_IXor_nat *)
     (* Approximating 0.075601 x term *)
     let cost_N_IXor_nat = cost_linear_op_int
 
     (* model N_KCons *)
-    let cost_N_KCons = S.safe_int 15
+    let cost_N_KCons = S.safe_int 10
 
     (* model N_KIter *)
-    let cost_N_KIter = S.safe_int 20
+    let cost_N_KIter = S.safe_int 10
 
     (* model N_KList_enter_body *)
     (* Approximating 1.672196 x term *)
@@ -707,49 +702,49 @@ module Cost_of = struct
       | [] ->
           let open S_syntax in
           let v0 = S.safe_int size_ys in
-          S.safe_int 40 + (v0 + (v0 lsr 1) + (v0 lsr 3))
-      | _ :: _ -> S.safe_int 70
+          S.safe_int 25 + (v0 + (v0 lsr 1) + (v0 lsr 3))
+      | _ :: _ -> S.safe_int 25
 
     (* model N_KList_exit_body *)
-    let cost_N_KList_exit_body = S.safe_int 30
+    let cost_N_KList_exit_body = S.safe_int 10
 
     (* model N_KLoop_in *)
-    let cost_N_KLoop_in = S.safe_int 15
+    let cost_N_KLoop_in = S.safe_int 10
 
     (* model N_KLoop_in_left *)
-    let cost_N_KLoop_in_left = S.safe_int 15
+    let cost_N_KLoop_in_left = S.safe_int 10
 
     (* model N_KMap_enter_body *)
-    let cost_N_KMap_enter_body = S.safe_int 165
+    let cost_N_KMap_enter_body = S.safe_int 80
 
     (* model N_KNil *)
-    let cost_N_KNil = S.safe_int 20
+    let cost_N_KNil = S.safe_int 10
 
     (* model N_KReturn *)
-    let cost_N_KReturn = S.safe_int 15
+    let cost_N_KReturn = S.safe_int 10
 
     (* model N_KView_exit *)
     let cost_N_KView_exit = S.safe_int 20
 
     (* model N_KMap_head *)
-    let const_N_KMap_head = S.safe_int 20
+    let cost_N_KMap_head = S.safe_int 20
 
     (* model N_KUndip *)
-    let cost_N_KUndip = S.safe_int 15
+    let cost_N_KUndip = S.safe_int 10
 
     (* model DECODING_BLS_FR *)
     (* when benchmarking, compile bls12-381 without ADX, see
        https://gitlab.com/dannywillems/ocaml-bls12-381/-/blob/71d0b4d467fbfaa6452d702fcc408d7a70916a80/README.md#install
     *)
-    let cost_DECODING_BLS_FR = S.safe_int 150
+    let cost_DECODING_BLS_FR = S.safe_int 120
 
     (* model DECODING_BLS_G1 *)
     (* when benchmarking, compile bls12-381 without ADX *)
-    let cost_DECODING_BLS_G1 = S.safe_int 65_300
+    let cost_DECODING_BLS_G1 = S.safe_int 54_600
 
     (* model DECODING_BLS_G2 *)
     (* when benchmarking, compile bls12-381 without ADX *)
-    let cost_DECODING_BLS_G2 = S.safe_int 73_300
+    let cost_DECODING_BLS_G2 = S.safe_int 69_000
 
     (* model B58CHECK_DECODING_CHAIN_ID *)
     let cost_B58CHECK_DECODING_CHAIN_ID = S.safe_int 1_600
@@ -901,26 +896,27 @@ module Cost_of = struct
       S.safe_int 16630 + (v0 lsr 3)
 
     (* model TIMESTAMP_READABLE_DECODING *)
-    let cost_TIMESTAMP_READABLE_DECODING = S.safe_int 100
+    (* Approximating 0.354278 x term *)
+    let cost_TIMESTAMP_READABLE_DECODING ~bytes =
+      let open S_syntax in
+      let b = S.safe_int bytes in
+      let v0 = S.mul (S.sqrt b) b in
+      S.safe_int 800 + ((v0 lsr 2) + (v0 lsr 3))
 
     (* model TIMESTAMP_READABLE_ENCODING *)
-    let cost_TIMESTAMP_READABLE_ENCODING = S.safe_int 820
+    let cost_TIMESTAMP_READABLE_ENCODING = S.safe_int 100
 
     (* model CHECK_PRINTABLE *)
     let cost_CHECK_PRINTABLE size =
       let open S_syntax in
       S.safe_int 14 + (S.safe_int 10 * S.safe_int size)
 
-    (* TODO: https://gitlab.com/tezos/tezos/-/issues/2264
-       Rerun benchmarks due to faster gas monad.
-       With the the redesign of the gas-monad this needs to be benchmarked again.
-    *)
     (* model TY_EQ
        This is the estimated cost of one iteration of ty_eq, extracted
        and copied manually from the parameter fit for the TY_EQ benchmark
        (the model is parametric on the size of the type, which we don't have
        access to in O(1)). *)
-    let cost_TY_EQ = S.safe_int 220
+    let cost_TY_EQ = S.safe_int 60
 
     (* model TYPECHECKING_CODE
        This is the cost of one iteration of parse_instr, extracted by hand from the
@@ -1526,7 +1522,7 @@ module Cost_of = struct
 
       let view_exit = atomic_step_cost cost_N_KView_exit
 
-      let map_head = atomic_step_cost const_N_KMap_head
+      let map_head = atomic_step_cost cost_N_KMap_head
 
       let undip = atomic_step_cost cost_N_KUndip
 
@@ -1664,7 +1660,7 @@ module Cost_of = struct
     let contract_optimized = key_hash_optimized
 
     (* Reasonable approximation *)
-    let contract_readable = key_hash_readable
+    let contract_readable = Gas.(S.safe_int 2 *@ key_hash_readable)
 
     let bls12_381_g1 = atomic_step_cost cost_DECODING_BLS_G1
 
@@ -1695,10 +1691,9 @@ module Cost_of = struct
 
     let unit = free
 
-    let timestamp_readable = atomic_step_cost cost_TIMESTAMP_READABLE_DECODING
-
-    (* Reasonable estimate. *)
-    let contract = Gas.(S.safe_int 2 *@ public_key_readable)
+    let timestamp_readable s =
+      atomic_step_cost
+        (cost_TIMESTAMP_READABLE_DECODING ~bytes:(String.length s))
 
     (** TODO: https://gitlab.com/tezos/tezos/-/issues/2340
         Refine the gas model *)
@@ -1811,9 +1806,6 @@ module Cost_of = struct
 
     let unit = Gas.free
 
-    (* Reasonable estimate. *)
-    let contract = Gas.(S.safe_int 2 *@ public_key_readable)
-
     (** TODO: https://gitlab.com/tezos/tezos/-/issues/2340
         Refine the gas model *)
     let tx_rollup_l2_address = bls12_381_g1
diff --git a/src/proto_alpha/lib_protocol/michelson_v1_gas.mli b/src/proto_alpha/lib_protocol/michelson_v1_gas.mli
index 4628d23b3650852b00e18c4e95ab28054a2d262b..bfad3e7b770b49803e51a581bfb7807735b30cf1 100644
--- a/src/proto_alpha/lib_protocol/michelson_v1_gas.mli
+++ b/src/proto_alpha/lib_protocol/michelson_v1_gas.mli
@@ -441,9 +441,7 @@ module Cost_of : sig
 
     val unit : Gas.cost
 
-    val timestamp_readable : Gas.cost
-
-    val contract : Gas.cost
+    val timestamp_readable : string -> Gas.cost
 
     val tx_rollup_l2_address : Gas.cost
 
@@ -497,8 +495,6 @@ module Cost_of : sig
 
     val unit : Gas.cost
 
-    val contract : Gas.cost
-
     val tx_rollup_l2_address : Gas.cost
 
     val operation : bytes -> Gas.cost
diff --git a/src/proto_alpha/lib_protocol/saturation_repr.ml b/src/proto_alpha/lib_protocol/saturation_repr.ml
index abdbb379d3e2e59adc42a6ddf31062fbd0b45d13..4494c9c45ef50d0aba7d5c88835ba881d68042dd 100644
--- a/src/proto_alpha/lib_protocol/saturation_repr.ml
+++ b/src/proto_alpha/lib_protocol/saturation_repr.ml
@@ -157,6 +157,11 @@ let erem x y = x mod y
 
 let ediv x y = x / y
 
+let sqrt x =
+  of_int_opt x
+  |> Option.map (fun x -> Z.of_int x |> Z.sqrt |> Z.to_int)
+  |> saturate_if_undef
+
 let t_to_z_exn z =
   match of_z_opt z with
   | None ->
diff --git a/src/proto_alpha/lib_protocol/saturation_repr.mli b/src/proto_alpha/lib_protocol/saturation_repr.mli
index d937abc2981348e9c923f2658aee5118591baff8..b95399d5f4faf2fe4332667296d176b5b9f09468 100644
--- a/src/proto_alpha/lib_protocol/saturation_repr.mli
+++ b/src/proto_alpha/lib_protocol/saturation_repr.mli
@@ -162,6 +162,9 @@ val ediv : 'a t -> _ t -> 'a t
    [Division_by_zero]. *)
 val erem : _ t -> 'b t -> 'b t
 
+(** [sqrt x] returns the square root of x, rounded down. *)
+val sqrt : _ t -> 'a t
+
 (** [of_int_opt x] returns [Some x] if [x >= 0] and [x < saturated],
     and [None] otherwise. *)
 val of_int_opt : int -> may_saturate t option
diff --git a/src/proto_alpha/lib_protocol/script_interpreter_defs.ml b/src/proto_alpha/lib_protocol/script_interpreter_defs.ml
index ef27d1cf277377769781f2c60d2c1b308ab21955..12fc3baf22489125f9d8582eb2e6251517385b3a 100644
--- a/src/proto_alpha/lib_protocol/script_interpreter_defs.ml
+++ b/src/proto_alpha/lib_protocol/script_interpreter_defs.ml
@@ -563,10 +563,10 @@ let transfer (ctxt, sc) gas amount location parameters_ty parameters destination
   >>=? fun (parameters, lazy_storage_diff, ctxt) ->
   unparse_data ctxt Optimized parameters_ty parameters
   >>=? fun (unparsed_parameters, ctxt) ->
-  Gas.consume ctxt (Script.strip_locations_cost unparsed_parameters)
-  >>?= fun ctxt ->
   craft_transfer_parameters ctxt parameters_ty unparsed_parameters destination
   >>?= fun (unparsed_parameters, ctxt) ->
+  Gas.consume ctxt (Script.strip_locations_cost unparsed_parameters)
+  >>?= fun ctxt ->
   let transaction =
     let parameters =
       Script.lazy_expr (Micheline.strip_locations unparsed_parameters)
diff --git a/src/proto_alpha/lib_protocol/script_ir_translator.ml b/src/proto_alpha/lib_protocol/script_ir_translator.ml
index 68fd39b62595464f77f034e74b1d38ea14e03c8b..ef520d06b763bee693db8fc2c48afcb86213da3e 100644
--- a/src/proto_alpha/lib_protocol/script_ir_translator.ml
+++ b/src/proto_alpha/lib_protocol/script_ir_translator.ml
@@ -414,9 +414,9 @@ let unparse_timestamp ~loc ctxt mode t =
       | Some s -> ok (String (loc, s), ctxt))
 
 let unparse_address ~loc ctxt mode {destination; entrypoint} =
-  Gas.consume ctxt Unparse_costs.contract >|? fun ctxt ->
   match mode with
   | Optimized | Optimized_legacy ->
+      Gas.consume ctxt Unparse_costs.contract_optimized >|? fun ctxt ->
       let bytes =
         Data_encoding.Binary.to_bytes_exn
           Data_encoding.(tup2 Destination.encoding Entrypoint.value_encoding)
@@ -424,6 +424,7 @@ let unparse_address ~loc ctxt mode {destination; entrypoint} =
       in
       (Bytes (loc, bytes), ctxt)
   | Readable ->
+      Gas.consume ctxt Unparse_costs.contract_readable >|? fun ctxt ->
       let notation =
         Destination.to_b58check destination
         ^ Entrypoint.to_address_suffix entrypoint
@@ -432,10 +433,10 @@ let unparse_address ~loc ctxt mode {destination; entrypoint} =
 
 let unparse_tx_rollup_l2_address ~loc ctxt mode
     (tx_address : tx_rollup_l2_address) =
-  Gas.consume ctxt Unparse_costs.contract >|? fun ctxt ->
   let tx_address = Indexable.to_value tx_address in
   match mode with
   | Optimized | Optimized_legacy ->
+      Gas.consume ctxt Unparse_costs.contract_optimized >|? fun ctxt ->
       let bytes =
         Data_encoding.Binary.to_bytes_exn
           Tx_rollup_l2_address.encoding
@@ -443,6 +444,7 @@ let unparse_tx_rollup_l2_address ~loc ctxt mode
       in
       (Bytes (loc, bytes), ctxt)
   | Readable ->
+      Gas.consume ctxt Unparse_costs.contract_readable >|? fun ctxt ->
       let b58check = Tx_rollup_l2_address.to_b58check tx_address in
       (String (loc, b58check), ctxt)
 
@@ -2187,7 +2189,7 @@ let parse_timestamp ctxt :
     ->
       ok (Script_timestamp.of_zint v, ctxt)
   | String (loc, s) as expr (* As unparsed with [Readable]. *) -> (
-      Gas.consume ctxt Typecheck_costs.timestamp_readable >>? fun ctxt ->
+      Gas.consume ctxt (Typecheck_costs.timestamp_readable s) >>? fun ctxt ->
       match Script_timestamp.of_string s with
       | Some v -> ok (v, ctxt)
       | None ->
@@ -2305,7 +2307,7 @@ let parse_address ctxt : Script.node -> (address * context) tzresult =
   in
   function
   | Bytes (loc, bytes) as expr (* As unparsed with [Optimized]. *) -> (
-      Gas.consume ctxt Typecheck_costs.contract >>? fun ctxt ->
+      Gas.consume ctxt Typecheck_costs.contract_optimized >>? fun ctxt ->
       match
         Data_encoding.Binary.of_bytes_opt
           Data_encoding.(tup2 Destination.encoding Entrypoint.value_encoding)
@@ -2318,7 +2320,7 @@ let parse_address ctxt : Script.node -> (address * context) tzresult =
           @@ Invalid_syntactic_constant
                (loc, strip_locations expr, "a valid address"))
   | String (loc, s) (* As unparsed with [Readable]. *) ->
-      Gas.consume ctxt Typecheck_costs.contract >>? fun ctxt ->
+      Gas.consume ctxt Typecheck_costs.contract_readable >>? fun ctxt ->
       (match String.index_opt s '%' with
       | None -> ok (s, Entrypoint.default)
       | Some pos ->
diff --git a/src/proto_alpha/lib_protocol/storage_functors.ml b/src/proto_alpha/lib_protocol/storage_functors.ml
index 658e8702eceed442e8dc07dfac9ff37918ba4483..3c4d9bd4c3643b614039c5d337e7d31c52521042 100644
--- a/src/proto_alpha/lib_protocol/storage_functors.ml
+++ b/src/proto_alpha/lib_protocol/storage_functors.ml
@@ -377,9 +377,8 @@ module Make_indexed_carbonated_data_storage_INTERNAL
   let len_key i = I.to_path i [len_name]
 
   let consume_mem_gas c key =
-    C.consume_gas
-      c
-      (Storage_costs.read_access ~path_length:(List.length key) ~read_bytes:0)
+    let path_length = List.length @@ C.absolute_key c key in
+    C.consume_gas c (Storage_costs.read_access ~path_length ~read_bytes:0)
 
   let existing_size c i =
     C.find c (len_key i) >|= function
@@ -389,13 +388,10 @@ module Make_indexed_carbonated_data_storage_INTERNAL
   let consume_read_gas get c i =
     let len_key = len_key i in
     get c len_key >>=? fun len ->
+    let path_length = List.length @@ C.absolute_key c len_key in
     Lwt.return
       ( decode_len_value len_key len >>? fun read_bytes ->
-        let cost =
-          Storage_costs.read_access
-            ~path_length:(List.length len_key)
-            ~read_bytes
-        in
+        let cost = Storage_costs.read_access ~path_length ~read_bytes in
         C.consume_gas c cost )
 
   (* For the future: here, we bill a generic cost for encoding the value
@@ -992,9 +988,8 @@ module Make_indexed_subcontext (C : Raw_context.T) (I : INDEX) :
 
     let data_name = data_name :: N.name
 
-    let path_length = List.length N.name + 1
-
     let consume_mem_gas c =
+      let path_length = List.length (Raw_context.absolute_key c N.name) + 1 in
       Raw_context.consume_gas
         c
         (Storage_costs.read_access ~path_length ~read_bytes:0)
@@ -1005,6 +1000,7 @@ module Make_indexed_subcontext (C : Raw_context.T) (I : INDEX) :
       | Some len -> decode_len_value len_name len >|? fun len -> (len, true)
 
     let consume_read_gas get c =
+      let path_length = List.length (Raw_context.absolute_key c N.name) + 1 in
       get c len_name >>=? fun len ->
       Lwt.return
         ( decode_len_value len_name len >>? fun read_bytes ->
diff --git a/src/proto_alpha/lib_protocol/test/integration/gas/test_gas_costs.ml b/src/proto_alpha/lib_protocol/test/integration/gas/test_gas_costs.ml
index ec6da065c02ce26cb93897987ce0a273f6204f7b..1998bc4e5b1313928968fb9195d1d3aa91214354 100644
--- a/src/proto_alpha/lib_protocol/test/integration/gas/test_gas_costs.ml
+++ b/src/proto_alpha/lib_protocol/test/integration/gas/test_gas_costs.ml
@@ -198,8 +198,7 @@ let all_parsing_costs =
     ("parse_data_cycle", parse_data_cycle);
     ("bool", bool);
     ("parsing_unit", unit);
-    ("timestamp_readable", timestamp_readable);
-    ("contract", contract);
+    ("timestamp_readable", timestamp_readable "dummy");
     ("contract_exists", contract_exists);
     ("proof_argument", proof_argument 42);
   ]
@@ -224,7 +223,6 @@ let all_unparsing_costs =
     ("unparse_instr_cycle", unparse_instr_cycle);
     ("unparse_data_cycle", unparse_data_cycle);
     ("unparsing_unit", unit);
-    ("contract", contract);
     ("operation", operation dummy_bytes);
   ]
 
diff --git a/src/proto_alpha/lib_protocol/test/pbt/saturation_fuzzing.ml b/src/proto_alpha/lib_protocol/test/pbt/saturation_fuzzing.ml
index 7629a9ec642d7b8a451338dad67a6a8fc30bab73..f44a036ab5f93593ccf86ed2bed4b93feae6f1f3 100644
--- a/src/proto_alpha/lib_protocol/test/pbt/saturation_fuzzing.ml
+++ b/src/proto_alpha/lib_protocol/test/pbt/saturation_fuzzing.ml
@@ -162,6 +162,20 @@ let test_leq_saturated =
  *)
 let test_geq_zero = QCheck.Test.make ~name:"t >= 0" t_arb (fun t -> zero <= t)
 
+(* Test.
+ * Tests that [sqrt (t * t) = t]
+ *)
+let test_squared_sqrt =
+  QCheck.Test.make ~name:"sqrt t² = t" t_arb (fun t ->
+      mul t t = saturated || sqrt (mul t t) = t)
+
+(* Test.
+ * Tests that [(sqrt t) * (sqrt t) <= t]
+ *)
+let test_sqrt_squared =
+  QCheck.Test.make ~name:"(sqrt t)² <= t <= (succ (sqrt t))²" t_arb (fun t ->
+      mul (sqrt t) (sqrt t) <= t && t <= mul (succ (sqrt t)) (succ (sqrt t)))
+
 let tests_add = [test_add_commutes; test_add_zero; test_add_neq]
 
 let tests_mul = [test_mul_commutes; test_mul_one; test_mul_zero]
@@ -172,6 +186,8 @@ let tests_add_sub = [test_add_sub; test_sub_add]
 
 let tests_boundaries = [test_leq_saturated; test_geq_zero]
 
+let tests_sqrt = [test_sqrt_squared; test_squared_sqrt]
+
 let () =
   Alcotest.run
     "protocol > pbt > saturation"
@@ -180,5 +196,6 @@ let () =
       ("mul", qcheck_wrap tests_mul);
       ("sub", qcheck_wrap tests_sub);
       ("add and sub", qcheck_wrap tests_add_sub);
+      ("sqrt", qcheck_wrap tests_sqrt);
       ("<= and >=", qcheck_wrap tests_boundaries);
     ]
diff --git a/src/proto_alpha/lib_protocol/test/unit/test_saturation.ml b/src/proto_alpha/lib_protocol/test/unit/test_saturation.ml
index afce1f84dd36041b20a2537f02844657a079e368..f0d2898d75226c3ffca960304492e54bd1b077fa 100644
--- a/src/proto_alpha/lib_protocol/test/unit/test_saturation.ml
+++ b/src/proto_alpha/lib_protocol/test/unit/test_saturation.ml
@@ -160,6 +160,23 @@ let shift_left () =
         (ok_int ((1 lsl 62) - 2), 0);
       ])
 
+let sqrt () =
+  Saturation_repr.(
+    fail_unless (sqrt saturated = saturated) (err "sqrt saturated <> saturated")
+    >>=? fun () ->
+    fail_unless (sqrt zero = zero) (err "sqrt zero <> zero") >>=? fun () ->
+    fail_unless (sqrt one = one) (err "sqrt one <> one") >>=? fun () ->
+    fail_unless (sqrt (ok_int 4) = ok_int 2) (err "sqrt 4 <> 2") >>=? fun () ->
+    fail_unless
+      (sqrt (ok_int 5) = ok_int 2)
+      (err "sqrt 5 <> 2 (sqrt should round down)")
+    >>=? fun () ->
+    let safe_squared = ok_int ((1 lsl 31) - 1) in
+    let r = mul safe_squared safe_squared in
+    fail_unless
+      (sqrt r = safe_squared)
+      (err "sqrt (2 ^ 31 - 1) * (2 ^ 31 - 1) <> (2 ^ 31 - 1)"))
+
 let of_z_opt () =
   fail_unless
     (Saturation_repr.(of_z_opt (Z.succ (Z.of_int max_int))) = None)
@@ -206,6 +223,7 @@ let tests =
     Tztest.tztest "Multiplication (fast version)" `Quick mul_fast;
     Tztest.tztest "Shift left" `Quick shift_left;
     Tztest.tztest "Scale fast" `Quick scale_fast;
+    Tztest.tztest "Square root" `Quick sqrt;
     Tztest.tztest "Conversion from Z" `Quick of_z_opt;
     Tztest.tztest
       "Encoding through z"
diff --git a/src/proto_alpha/lib_protocol/ticket_costs.ml b/src/proto_alpha/lib_protocol/ticket_costs.ml
index 0e3fccf94b899de61ba00a2693da4d7ccdb20b8f..ec9693adb1e5e972913f380c740c12848e917b65 100644
--- a/src/proto_alpha/lib_protocol/ticket_costs.ml
+++ b/src/proto_alpha/lib_protocol/ticket_costs.ml
@@ -27,29 +27,14 @@ open Alpha_context
 module S = Saturation_repr
 
 module Constants = struct
-  (* TODO: #2508
-     Fill in real benchmarked values.
-     Need to create benchmark and fill in values.
-  *)
-  let cost_collect_tickets_step = S.safe_int 360
+  let cost_collect_tickets_step = S.safe_int 60
 
-  (* TODO: #2499
-     Fill in real benchmarked values.
-     Need to create benchmark and fill in values.
-  *)
-  let cost_has_tickets_of_ty type_size = S.mul (S.safe_int 20) type_size
+  let cost_has_tickets_of_ty type_size =
+    S.add (S.safe_int 10) (S.mul (S.safe_int 6) type_size)
 
-  (* TODO: #2498
-     Fill in real benchmarked values.
-     Need to create benchmark and fill in values.
-  *)
-  let cost_compare_ticket_hash = S.safe_int 100
+  let cost_compare_ticket_hash = S.safe_int 10
 
-  (* TODO: #2520
-     Fill in real benchmarked values.
-     Need to create benchmark and fill in values.
-  *)
-  let cost_compare_key_contract = S.safe_int 100
+  let cost_compare_key_contract = S.safe_int 10
 end
 
 let consume_gas_steps ctxt ~step_cost ~num_steps =
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestOriginateContractFromContract::test_originate_contract_from_contract_origination.out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestOriginateContractFromContract::test_originate_contract_from_contract_origination.out
index c90bd64b8f822cacc74099dcfbe61ab6d7ffaa50..aca108d8d6ea1c65f908c08070a786c35887f50e 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestOriginateContractFromContract::test_originate_contract_from_contract_origination.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestOriginateContractFromContract::test_originate_contract_from_contract_origination.out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestOriginateContractFromContract::test_originate_contract_from_contract_origination
 
 Node is bootstrapped.
-Estimated gas: 1428.262 units (will add 100 for safety)
+Estimated gas: 1425.542 units (will add 100 for safety)
 Estimated storage: 350 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -14,7 +14,7 @@ This sequence of operations was run:
     From: [CONTRACT_HASH]
     Fee to the baker: ꜩ0.000476
     Expected counter: [EXPECTED_COUNTER]
-    Gas limit: 1529
+    Gas limit: 1526
     Storage limit: 370 bytes
     Balance updates:
       [CONTRACT_HASH] ... -ꜩ0.000476
@@ -41,7 +41,7 @@ This sequence of operations was run:
           [CONTRACT_HASH]
         Storage size: 93 bytes
         Paid storage size diff: 93 bytes
-        Consumed gas: 1428.262
+        Consumed gas: 1425.542
         Balance updates:
           [CONTRACT_HASH] ... -ꜩ0.02325
           storage fees ........................... +ꜩ0.02325
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestOriginateContractFromContract::test_originate_contract_from_contract_transfer.out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestOriginateContractFromContract::test_originate_contract_from_contract_transfer.out
index 4de97de5291d1b272343108c71f0d171f68ffaf6..cd7e57f8065debe1b428cb25bb48567f0cb45f40 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestOriginateContractFromContract::test_originate_contract_from_contract_transfer.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestOriginateContractFromContract::test_originate_contract_from_contract_transfer.out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestOriginateContractFromContract::test_originate_contract_from_contract_transfer
 
 Node is bootstrapped.
-Estimated gas: 3468.749 units (will add 100 for safety)
+Estimated gas: 3525.107 units (will add 100 for safety)
 Estimated storage: 295 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -12,13 +12,13 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [CONTRACT_HASH]
-    Fee to the baker: ꜩ0.000606
+    Fee to the baker: ꜩ0.000612
     Expected counter: [EXPECTED_COUNTER]
-    Gas limit: 3569
+    Gas limit: 3626
     Storage limit: 315 bytes
     Balance updates:
-      [CONTRACT_HASH] ... -ꜩ0.000606
-      payload fees(the block proposer) ....... +ꜩ0.000606
+      [CONTRACT_HASH] ... -ꜩ0.000612
+      payload fees(the block proposer) ....... +ꜩ0.000612
     Transaction:
       Amount: ꜩ0
       From: [CONTRACT_HASH]
@@ -26,7 +26,7 @@ This sequence of operations was run:
       This transaction was successfully applied
       Updated storage: Unit
       Storage size: 93 bytes
-      Consumed gas: 2064.682
+      Consumed gas: 2121.040
     Internal operations:
       Origination:
         From: [CONTRACT_HASH]
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestSelfAddressTransfer::test_self_address_originate_receiver.out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestSelfAddressTransfer::test_self_address_originate_receiver.out
index aa1af02e69067c3565f5f6974ee7d3d0783758b8..95cea9146f6bbe6ef2b6900c6bc67762073dd177 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestSelfAddressTransfer::test_self_address_originate_receiver.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestSelfAddressTransfer::test_self_address_originate_receiver.out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestSelfAddressTransfer::test_self_address_originate_receiver
 
 Node is bootstrapped.
-Estimated gas: 1421.376 units (will add 100 for safety)
+Estimated gas: 1420.416 units (will add 100 for safety)
 Estimated storage: 340 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -14,7 +14,7 @@ This sequence of operations was run:
     From: [CONTRACT_HASH]
     Fee to the baker: ꜩ0.000463
     Expected counter: [EXPECTED_COUNTER]
-    Gas limit: 1522
+    Gas limit: 1521
     Storage limit: 360 bytes
     Balance updates:
       [CONTRACT_HASH] ... -ꜩ0.000463
@@ -39,7 +39,7 @@ This sequence of operations was run:
           [CONTRACT_HASH]
         Storage size: 83 bytes
         Paid storage size diff: 83 bytes
-        Consumed gas: 1421.376
+        Consumed gas: 1420.416
         Balance updates:
           [CONTRACT_HASH] ... -ꜩ0.02075
           storage fees ........................... +ꜩ0.02075
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestSelfAddressTransfer::test_self_address_originate_sender.out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestSelfAddressTransfer::test_self_address_originate_sender.out
index 09b8f93a9b5c85d1cfcfd79e28c7e40936c60dcc..faa5414123bc928424e3357565f5574260b1d68e 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestSelfAddressTransfer::test_self_address_originate_sender.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestSelfAddressTransfer::test_self_address_originate_sender.out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestSelfAddressTransfer::test_self_address_originate_sender
 
 Node is bootstrapped.
-Estimated gas: 1421.372 units (will add 100 for safety)
+Estimated gas: 1419.932 units (will add 100 for safety)
 Estimated storage: 339 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -12,13 +12,13 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [CONTRACT_HASH]
-    Fee to the baker: ꜩ0.000462
+    Fee to the baker: ꜩ0.000461
     Expected counter: [EXPECTED_COUNTER]
-    Gas limit: 1522
+    Gas limit: 1520
     Storage limit: 359 bytes
     Balance updates:
-      [CONTRACT_HASH] ... -ꜩ0.000462
-      payload fees(the block proposer) ....... +ꜩ0.000462
+      [CONTRACT_HASH] ... -ꜩ0.000461
+      payload fees(the block proposer) ....... +ꜩ0.000461
     Origination:
       From: [CONTRACT_HASH]
       Credit: ꜩ0
@@ -39,7 +39,7 @@ This sequence of operations was run:
           [CONTRACT_HASH]
         Storage size: 82 bytes
         Paid storage size diff: 82 bytes
-        Consumed gas: 1421.372
+        Consumed gas: 1419.932
         Balance updates:
           [CONTRACT_HASH] ... -ꜩ0.0205
           storage fees ........................... +ꜩ0.0205
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestSelfAddressTransfer::test_send_self_address.out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestSelfAddressTransfer::test_send_self_address.out
index ba446f3e7d4a2b709cef42fdd048b43737a00c4b..5a003102117de10877dee0989e12571bd3741a19 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestSelfAddressTransfer::test_send_self_address.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestSelfAddressTransfer::test_send_self_address.out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestSelfAddressTransfer::test_send_self_address
 
 Node is bootstrapped.
-Estimated gas: 5195.785 units (will add 100 for safety)
+Estimated gas: 4696.907 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -12,13 +12,13 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [CONTRACT_HASH]
-    Fee to the baker: ꜩ0.000824
+    Fee to the baker: ꜩ0.000774
     Expected counter: [EXPECTED_COUNTER]
-    Gas limit: 5296
+    Gas limit: 4797
     Storage limit: 0 bytes
     Balance updates:
-      [CONTRACT_HASH] ... -ꜩ0.000824
-      payload fees(the block proposer) ....... +ꜩ0.000824
+      [CONTRACT_HASH] ... -ꜩ0.000774
+      payload fees(the block proposer) ....... +ꜩ0.000774
     Transaction:
       Amount: ꜩ0
       From: [CONTRACT_HASH]
@@ -27,7 +27,7 @@ This sequence of operations was run:
       This transaction was successfully applied
       Updated storage: Unit
       Storage size: 82 bytes
-      Consumed gas: 3991.559
+      Consumed gas: 3493.817
     Internal operations:
       Transaction:
         Amount: ꜩ0
@@ -37,6 +37,6 @@ This sequence of operations was run:
         This transaction was successfully applied
         Updated storage: Unit
         Storage size: 83 bytes
-        Consumed gas: 1204.226
+        Consumed gas: 1203.090
 
 Injected block at minimal timestamp
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--accounts.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--accounts.tz].out
index 78d3fffbf7be413e716f9bb78e2e9eb86363ce68..efadeeacdb0c806d284ac3a5b85d46aee484ee3d 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--accounts.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--accounts.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[attic/accounts.tz]
 
 Well typed
-Gas remaining: 1039925.145 units remaining
+Gas remaining: 1039932.345 units remaining
 { parameter
     (or (key_hash %Initialize)
         (pair %Withdraw (key %from) (pair (mutez %withdraw_amount) (signature %sig)))) ;
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--add1.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--add1.tz].out
index 69764ae7d11d08df4d71260b6d435c6be71647ff..222978e61737ecb2aa3c70e03ba9d52d5c997ede 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--add1.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--add1.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[attic/add1.tz]
 
 Well typed
-Gas remaining: 1039996.134 units remaining
+Gas remaining: 1039996.774 units remaining
 { parameter int ;
   storage int ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--add1_list.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--add1_list.tz].out
index 6f603286efc74b0d5a505f3f3411370b5b3aa80f..daaa2778764ce38f94a7e1fb82651076a710f1cd 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--add1_list.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--add1_list.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[attic/add1_list.tz]
 
 Well typed
-Gas remaining: 1039995.173 units remaining
+Gas remaining: 1039995.973 units remaining
 { parameter (list int) ;
   storage (list int) ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--after_strategy.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--after_strategy.tz].out
index f13f72ec5d7c0ec9b8f500fbedcbd99b56481c39..1745652f1a791ece1dfcb628064b2d308da8227e 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--after_strategy.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--after_strategy.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[attic/after_strategy.tz]
 
 Well typed
-Gas remaining: 1039989.643 units remaining
+Gas remaining: 1039991.083 units remaining
 { parameter nat ;
   storage (pair (pair nat bool) timestamp) ;
   code { DUP
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--always.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--always.tz].out
index 74eb39855ad421eac68a78b0f05efdd1b1aae955..36959d0b9bec1a2f12b17c0ce91ac941a0f2e91c 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--always.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--always.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[attic/always.tz]
 
 Well typed
-Gas remaining: 1039994.981 units remaining
+Gas remaining: 1039995.941 units remaining
 { parameter nat ;
   storage (pair nat bool) ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--append.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--append.tz].out
index 48da5f09628900e9e4e5a40667e0c68eaa9719dc..fc9ad53fe2001a254a9ee0b2409373642dcac89c 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--append.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--append.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[attic/append.tz]
 
 Well typed
-Gas remaining: 1039991.379 units remaining
+Gas remaining: 1039993.459 units remaining
 { parameter (pair (list int) (list int)) ;
   storage (list int) ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--at_least.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--at_least.tz].out
index 1edabcf2fee50158c677d69c841c4754773f6129..a5f50ffee07d8492fccde92f0c8a4199872a9aa3 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--at_least.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--at_least.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[attic/at_least.tz]
 
 Well typed
-Gas remaining: 1039992.950 units remaining
+Gas remaining: 1039993.750 units remaining
 { parameter unit ;
   storage mutez ;
   code { CDR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--auction.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--auction.tz].out
index 1593cd1d0ff3510da467a82f323e7212c353b370..e068ac17c6e3cee25545683cf0a7a49cabff978b 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--auction.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--auction.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[attic/auction.tz]
 
 Well typed
-Gas remaining: 1039972.258 units remaining
+Gas remaining: 1039974.178 units remaining
 { parameter key_hash ;
   storage (pair timestamp (pair mutez key_hash)) ;
   code { DUP
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--bad_lockup.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--bad_lockup.tz].out
index 26cf173756504e4a8361d6637bf42bd91af6409b..3ef3297da4fb80bcc4d439ebe0000b1f1ce5c7da 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--bad_lockup.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--bad_lockup.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[attic/bad_lockup.tz]
 
 Well typed
-Gas remaining: 1039972.793 units remaining
+Gas remaining: 1039974.873 units remaining
 { parameter unit ;
   storage (pair timestamp (pair address address)) ;
   code { CDR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--big_map_union.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--big_map_union.tz].out
index 40cc293d5a61fd32cad631326006cc671a737990..34f4ccc0a6a5295d36c44998379f41a01538b450 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--big_map_union.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--big_map_union.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[attic/big_map_union.tz]
 
 Well typed
-Gas remaining: 1039983.939 units remaining
+Gas remaining: 1039987.459 units remaining
 { parameter (list (pair string int)) ;
   storage (pair (big_map string int) unit) ;
   code { UNPAPAIR ;
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--cadr_annotation.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--cadr_annotation.tz].out
index dac6731e01edc345a6b3f43408458a3e1a69a262..f2e67ba31334ae81201dfff5345c28260905c717 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--cadr_annotation.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--cadr_annotation.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[attic/cadr_annotation.tz]
 
 Well typed
-Gas remaining: 1039994.745 units remaining
+Gas remaining: 1039995.385 units remaining
 { parameter (pair (pair %p1 unit (string %no_name)) bool) ;
   storage unit ;
   code { CAR @param
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--concat.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--concat.tz].out
index 6a9d4a3facb1bd92509a65f86a11225709291e53..73dc09633c715dcfe1f00248acae651306354b33 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--concat.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--concat.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[attic/concat.tz]
 
 Well typed
-Gas remaining: 1039992.618 units remaining
+Gas remaining: 1039993.578 units remaining
 { parameter string ;
   storage string ;
   code { DUP
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--conditionals.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--conditionals.tz].out
index e010c993068f9f7f273d3915e14d5fa4f8e5b65a..182eab40c6fdd2f6f075ac0e54d8a0dcb085ce76 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--conditionals.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--conditionals.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[attic/conditionals.tz]
 
 Well typed
-Gas remaining: 1039989.496 units remaining
+Gas remaining: 1039990.456 units remaining
 { parameter (or string (option int)) ;
   storage string ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--cons_twice.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--cons_twice.tz].out
index 61910b17a8679d9adb33ab3b9c39d53d5327a8b4..a6c2095f31d59408445760cecc11951d7094e5bb 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--cons_twice.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--cons_twice.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[attic/cons_twice.tz]
 
 Well typed
-Gas remaining: 1039992.638 units remaining
+Gas remaining: 1039993.758 units remaining
 { parameter nat ;
   storage (list nat) ;
   code { DUP
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--cps_fact.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--cps_fact.tz].out
index 7a05c513e419f5bf25ecd6facb5da00ccad196bb..6ba3681d54797ca1768d277bfe8455abc7c96e0c 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--cps_fact.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--cps_fact.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[attic/cps_fact.tz]
 
 Well typed
-Gas remaining: 1039973.149 units remaining
+Gas remaining: 1039975.869 units remaining
 { storage nat ;
   parameter nat ;
   code { UNPAIR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--create_add1_lists.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--create_add1_lists.tz].out
index 7e31cd0adc57b854b35b018e0f47818ea1ad4c68..9f96a6db9d53d124050b132a245204488d34c844 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--create_add1_lists.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--create_add1_lists.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[attic/create_add1_lists.tz]
 
 Well typed
-Gas remaining: 1039986.470 units remaining
+Gas remaining: 1039989.990 units remaining
 { parameter unit ;
   storage address ;
   code { DROP
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--data_publisher.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--data_publisher.tz].out
index 5f21c0a53776c5a3ac7c1152f05c045fac923599..a22f6514ba1f122432c85e240b50afab118f6f08 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--data_publisher.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--data_publisher.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[attic/data_publisher.tz]
 
 Well typed
-Gas remaining: 1039974.524 units remaining
+Gas remaining: 1039975.804 units remaining
 { parameter (pair signature (pair string nat)) ;
   storage (pair (pair key nat) string) ;
   code { DUP
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--dispatch.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--dispatch.tz].out
index a02e29dd8d1e568bd871eaadb49209491c08791f..6b1191e60bf00b8fc9c590b2c337294291cbf569 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--dispatch.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--dispatch.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[attic/dispatch.tz]
 
 Well typed
-Gas remaining: 1039979.486 units remaining
+Gas remaining: 1039983.006 units remaining
 { parameter (or string (pair string (lambda unit string))) ;
   storage (pair string (map string (lambda unit string))) ;
   code { DUP
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--empty.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--empty.tz].out
index a85b93fa0f521042cc82d2ed24705d913396af2d..6af222cd59dfce9ed4988fd135f3240e61d5d5e1 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--empty.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--empty.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[attic/empty.tz]
 
 Well typed
-Gas remaining: 1039997.267 units remaining
+Gas remaining: 1039997.907 units remaining
 { parameter unit ;
   storage unit ;
   code { CDR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--fail_amount.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--fail_amount.tz].out
index 6a87e49d2f4d643828ad7b4582d2c191f54cddb8..8dfef0ca8dc7dddf79a1d4d9f968fcecae17a733 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--fail_amount.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--fail_amount.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[attic/fail_amount.tz]
 
 Well typed
-Gas remaining: 1039992.147 units remaining
+Gas remaining: 1039992.947 units remaining
 { parameter unit ;
   storage unit ;
   code { DROP
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--faucet.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--faucet.tz].out
index 5ad05a7ce276ab325db0a9c8d64d111722f1fd11..aba6a67382d1adc88350e4c7deec0aecbae3f61f 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--faucet.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--faucet.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[attic/faucet.tz]
 
 Well typed
-Gas remaining: 1039986.830 units remaining
+Gas remaining: 1039987.950 units remaining
 { parameter key_hash ;
   storage timestamp ;
   code { UNPAIR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--forward.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--forward.tz].out
index 3d717bb246abfac514f7b894894fe9317ef7dfc8..4bb7efc84781524e354c794edce50d556680ae2b 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--forward.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--forward.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[attic/forward.tz]
 
 Well typed
-Gas remaining: 1039634.172 units remaining
+Gas remaining: 1039668.732 units remaining
 { parameter (or string nat) ;
   storage
     (pair (pair nat (pair mutez mutez))
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--id.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--id.tz].out
index e16eb48f7116f8dcaea64bb1a2029e36196b588f..c91d66d981050f87e6e29faf14ff5e5bdd4d89be 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--id.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--id.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[attic/id.tz]
 
 Well typed
-Gas remaining: 1039997.267 units remaining
+Gas remaining: 1039997.907 units remaining
 { parameter string ;
   storage string ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--infinite_loop.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--infinite_loop.tz].out
index 3cadca40c3404911385ac6224e29b7d13648ac7a..4cfc7a5e1aa35157d1062d230c6e90b515589bb9 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--infinite_loop.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--infinite_loop.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[attic/infinite_loop.tz]
 
 Well typed
-Gas remaining: 1039994.665 units remaining
+Gas remaining: 1039995.465 units remaining
 { parameter unit ;
   storage unit ;
   code { DROP
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--insertion_sort.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--insertion_sort.tz].out
index 7dd48a160061c1d67519b1231c03519754f9765d..23e757328d44194acb993f18fca5bcbc3a9bac0a 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--insertion_sort.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--insertion_sort.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[attic/insertion_sort.tz]
 
 Well typed
-Gas remaining: 1039971.505 units remaining
+Gas remaining: 1039976.625 units remaining
 { parameter (list int) ;
   storage (list int) ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--int_publisher.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--int_publisher.tz].out
index be420737b5f1dda57df377292d2f4583a89a09f0..c7cef3aebac92e5c861c84474c85e6f198e83e23 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--int_publisher.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--int_publisher.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[attic/int_publisher.tz]
 
 Well typed
-Gas remaining: 1039967.523 units remaining
+Gas remaining: 1039969.923 units remaining
 { parameter (option (pair signature int)) ;
   storage (pair key int) ;
   code { DUP
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--king_of_tez.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--king_of_tez.tz].out
index ef5a0759ec4191893191e8f567c1bb99fe554cc7..0ab50667f22a0bd838f262ceb700c05a7ece426a 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--king_of_tez.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--king_of_tez.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[attic/king_of_tez.tz]
 
 Well typed
-Gas remaining: 1039971.047 units remaining
+Gas remaining: 1039974.087 units remaining
 { parameter key_hash ;
   storage (pair timestamp (pair mutez key_hash)) ;
   code { DUP
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--list_of_transactions.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--list_of_transactions.tz].out
index 192b717db2407d0a1f265e0913d997252ae7950d..9f7a77b1b9a4c413687ba029e07dbfec3e866916 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--list_of_transactions.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--list_of_transactions.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[attic/list_of_transactions.tz]
 
 Well typed
-Gas remaining: 1039982.122 units remaining
+Gas remaining: 1039985.482 units remaining
 { parameter unit ;
   storage (list address) ;
   code { CDR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--queue.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--queue.tz].out
index ffce16bbaaced5259e83d5a943d89091fe2be512..2bfb2caef50f05682127f49c85d252c21bfb87c9 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--queue.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--queue.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[attic/queue.tz]
 
 Well typed
-Gas remaining: 1039952.504 units remaining
+Gas remaining: 1039958.584 units remaining
 { parameter (option string) ;
   storage (pair (option string) (pair (pair nat nat) (map nat string))) ;
   code { DUP
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--reduce_map.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--reduce_map.tz].out
index b12810ef5d26d0d4748605eb8ddc7fe9ec61acc2..aeedbf70fdb151329af5d7477c09abbcea4b35fb 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--reduce_map.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--reduce_map.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[attic/reduce_map.tz]
 
 Well typed
-Gas remaining: 1039975.926 units remaining
+Gas remaining: 1039978.486 units remaining
 { parameter (pair (lambda int int) (list int)) ;
   storage (list int) ;
   code { DIP { NIL int /* [ list int ] */ }
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--reentrancy.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--reentrancy.tz].out
index 26d95bc92b92556da4015787a527f4994545a360..cbf13b4362980a6748630ea2e5cf06a6b9588027 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--reentrancy.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--reentrancy.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[attic/reentrancy.tz]
 
 Well typed
-Gas remaining: 1039981.752 units remaining
+Gas remaining: 1039983.352 units remaining
 { parameter unit ;
   storage (pair address address) ;
   code { CDR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--reservoir.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--reservoir.tz].out
index 07f1f10d3eae31f7f16c441a055bf5370e5619c9..eea9dbd5ed1635080c7655c31957d537052cf7af 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--reservoir.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--reservoir.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[attic/reservoir.tz]
 
 Well typed
-Gas remaining: 1039963.237 units remaining
+Gas remaining: 1039968.997 units remaining
 { parameter unit ;
   storage (pair (pair (timestamp %T) (mutez %N)) (pair (address %A) (address %B))) ;
   code { CDR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--scrutable_reservoir.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--scrutable_reservoir.tz].out
index 50c6a40c70d982f4b870ec8c0e2926b62b1464d5..1c9d26c06466a53eb857ac948a790773eeb7ad56 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--scrutable_reservoir.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--scrutable_reservoir.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[attic/scrutable_reservoir.tz]
 
 Well typed
-Gas remaining: 1039876.691 units remaining
+Gas remaining: 1039888.691 units remaining
 { parameter unit ;
   storage
     (pair string
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--spawn_identities.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--spawn_identities.tz].out
index 9f477fa3dd56a9e50aa74c60b51a185b400ee08b..253fa1e6a8815e0fea6532051b78167dd5165383 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--spawn_identities.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[attic--spawn_identities.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[attic/spawn_identities.tz]
 
 Well typed
-Gas remaining: 1039971.200 units remaining
+Gas remaining: 1039976.320 units remaining
 { parameter nat ;
   storage (list address) ;
   code { /* [ pair string string ] */
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert.tz].out
index aa15244dcd2e01a0fd62dc5fea542538c8fdd9eb..e491eaf22aa4e81c9d3ae147fc3e1a807e3cf21d 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[macros/assert.tz]
 
 Well typed
-Gas remaining: 1039994.573 units remaining
+Gas remaining: 1039995.213 units remaining
 { parameter bool ;
   storage unit ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_cmpeq.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_cmpeq.tz].out
index 846bae98a2661a02108693cec7ee1774c0a81699..cd510499c1e24ddadde01a97617edc0473aa8c4e 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_cmpeq.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_cmpeq.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[macros/assert_cmpeq.tz]
 
 Well typed
-Gas remaining: 1039990.676 units remaining
+Gas remaining: 1039991.476 units remaining
 { parameter (pair int int) ;
   storage unit ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_cmpge.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_cmpge.tz].out
index 2b3cea6f1c6c5ced4b1782ccee758ae253ed9a1e..2626723bacc44ab96572e358dd76e1c06a72a9c9 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_cmpge.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_cmpge.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[macros/assert_cmpge.tz]
 
 Well typed
-Gas remaining: 1039990.676 units remaining
+Gas remaining: 1039991.476 units remaining
 { parameter (pair int int) ;
   storage unit ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_cmpgt.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_cmpgt.tz].out
index ad6bb1ac9649de437d5f4828b753ae69debb6b57..d65962c62404bdbc163b7022be28956a8e327f61 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_cmpgt.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_cmpgt.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[macros/assert_cmpgt.tz]
 
 Well typed
-Gas remaining: 1039990.676 units remaining
+Gas remaining: 1039991.476 units remaining
 { parameter (pair int int) ;
   storage unit ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_cmple.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_cmple.tz].out
index 36ad2136d548f4b0e84a241a80a97c5e03b903f9..5d505268f7a86e8100ab511e413f83db1b85ef86 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_cmple.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_cmple.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[macros/assert_cmple.tz]
 
 Well typed
-Gas remaining: 1039990.676 units remaining
+Gas remaining: 1039991.476 units remaining
 { parameter (pair int int) ;
   storage unit ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_cmplt.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_cmplt.tz].out
index 6f118050fbd7f0c44f849f766e892a4ab21ee097..617bd22773bf0c1056f0def5a26ba3e67478a7dc 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_cmplt.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_cmplt.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[macros/assert_cmplt.tz]
 
 Well typed
-Gas remaining: 1039990.676 units remaining
+Gas remaining: 1039991.476 units remaining
 { parameter (pair int int) ;
   storage unit ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_cmpneq.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_cmpneq.tz].out
index 1074fab56ea5b0d7662737d52529d17a5734dc60..d3019e3550cd50781a0fcc438f44c8d571ae3d32 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_cmpneq.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_cmpneq.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[macros/assert_cmpneq.tz]
 
 Well typed
-Gas remaining: 1039990.676 units remaining
+Gas remaining: 1039991.476 units remaining
 { parameter (pair int int) ;
   storage unit ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_eq.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_eq.tz].out
index f50cda99d2406cd39b9de70c1f1de86362ddeb94..fcdee496bcc52b6a71cc61b0a709cd3e35c501a0 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_eq.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_eq.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[macros/assert_eq.tz]
 
 Well typed
-Gas remaining: 1039990.923 units remaining
+Gas remaining: 1039991.723 units remaining
 { parameter (pair int int) ;
   storage unit ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_ge.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_ge.tz].out
index c830756ba187e946d2f52d57387eac9ac437519d..ae365373f1e39eea7e710a3c02f112143c2f4361 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_ge.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_ge.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[macros/assert_ge.tz]
 
 Well typed
-Gas remaining: 1039990.923 units remaining
+Gas remaining: 1039991.723 units remaining
 { parameter (pair int int) ;
   storage unit ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_gt.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_gt.tz].out
index d1ef6bd676ddac965e3edfd013cb82dc40cabd43..93c98feb607eaf5d8570e90e5c967ee5c5c248e1 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_gt.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_gt.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[macros/assert_gt.tz]
 
 Well typed
-Gas remaining: 1039990.923 units remaining
+Gas remaining: 1039991.723 units remaining
 { parameter (pair int int) ;
   storage unit ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_le.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_le.tz].out
index 5c9142933c802bd9c8eb3734d9610cf9d114e322..50e829fa322a958460c9fdb6c9007f9f6134b69d 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_le.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_le.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[macros/assert_le.tz]
 
 Well typed
-Gas remaining: 1039990.923 units remaining
+Gas remaining: 1039991.723 units remaining
 { parameter (pair int int) ;
   storage unit ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_lt.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_lt.tz].out
index cd7132002fd3aebd5dead0711e3dab4a5ca2f67f..d2db3c4ffe44e626d7b2cd2b855295bd19bf569d 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_lt.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_lt.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[macros/assert_lt.tz]
 
 Well typed
-Gas remaining: 1039990.923 units remaining
+Gas remaining: 1039991.723 units remaining
 { parameter (pair int int) ;
   storage unit ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_neq.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_neq.tz].out
index ee74f643533cfb0d6de4f67c3cd271e700376caa..afe1cbd811f8b1cfed84d8879c6b8174c5ea34b2 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_neq.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--assert_neq.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[macros/assert_neq.tz]
 
 Well typed
-Gas remaining: 1039990.923 units remaining
+Gas remaining: 1039991.723 units remaining
 { parameter (pair int int) ;
   storage unit ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--big_map_get_add.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--big_map_get_add.tz].out
index b267e0d74607e72bad890989639cc6765c541ad5..cc3d2597640448adf65f703916bfc751b47ea3ae 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--big_map_get_add.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--big_map_get_add.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[macros/big_map_get_add.tz]
 
 Well typed
-Gas remaining: 1039968.666 units remaining
+Gas remaining: 1039971.066 units remaining
 { parameter (pair (pair %set_pair int (option int)) (pair %check_pair int (option int))) ;
   storage (pair (big_map int int) unit) ;
   code { DUP
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--big_map_mem.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--big_map_mem.tz].out
index 5e0952d8f8ac9dfd5876f99dcb4a07f4764d322f..c5248e74e6998faac028137d705ee740afd5d476 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--big_map_mem.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--big_map_mem.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[macros/big_map_mem.tz]
 
 Well typed
-Gas remaining: 1039982.471 units remaining
+Gas remaining: 1039984.071 units remaining
 { parameter (pair int bool) ;
   storage (pair (big_map int unit) unit) ;
   code { DUP
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--build_list.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--build_list.tz].out
index ae6c0ea324e7e5b79afd13c4087d6461848920ef..444d537869b3e91351663df4e7e19cb4952e1cf9 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--build_list.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--build_list.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[macros/build_list.tz]
 
 Well typed
-Gas remaining: 1039982.791 units remaining
+Gas remaining: 1039984.871 units remaining
 { parameter nat ;
   storage (list nat) ;
   code { CAR @counter
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--carn_and_cdrn.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--carn_and_cdrn.tz].out
index 8c1238fd9eaee38721d79a7e751d057a754e376a..e08752a58a5d7255b76f2749ac0795c8ea87ef2d 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--carn_and_cdrn.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--carn_and_cdrn.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[macros/carn_and_cdrn.tz]
 
 Well typed
-Gas remaining: 1039963.184 units remaining
+Gas remaining: 1039964.624 units remaining
 { parameter (pair nat nat nat unit) ;
   storage unit ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--compare.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--compare.tz].out
index a237a39ff280534776c993b0caf60ee940bda59f..a7a4b0775e728e4a02041be1c30568bb6eee2451 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--compare.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--compare.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[macros/compare.tz]
 
 Well typed
-Gas remaining: 1039968.322 units remaining
+Gas remaining: 1039970.722 units remaining
 { parameter (pair mutez mutez) ;
   storage (list bool) ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--compare_bytes.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--compare_bytes.tz].out
index 8978929af90843c651a34e326f02c1221267294b..cd6233b882176db31134707c627c1204f42a4486 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--compare_bytes.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--compare_bytes.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[macros/compare_bytes.tz]
 
 Well typed
-Gas remaining: 1039968.322 units remaining
+Gas remaining: 1039970.722 units remaining
 { parameter (pair bytes bytes) ;
   storage (list bool) ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--guestbook.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--guestbook.tz].out
index 1c111b04fdd0c5bc3148a34b6db3702395136ac3..8b85a68338aa6d91474e8f9cacc0cc0f2af9b88f 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--guestbook.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--guestbook.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[macros/guestbook.tz]
 
 Well typed
-Gas remaining: 1039986.383 units remaining
+Gas remaining: 1039988.143 units remaining
 { parameter string ;
   storage (map address (option string)) ;
   code { UNPAIR @message @guestbook
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--macro_annotations.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--macro_annotations.tz].out
index c6896b36a7dc0be57ec64accc7781b71bcf020be..b8a11069aba5187c2a447220fb8736eb4dab17a3 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--macro_annotations.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--macro_annotations.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[macros/macro_annotations.tz]
 
 Well typed
-Gas remaining: 1039992.402 units remaining
+Gas remaining: 1039993.362 units remaining
 { parameter unit ;
   storage (pair (unit %truc) unit) ;
   code { DROP
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--map_caddaadr.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--map_caddaadr.tz].out
index a83c3b51b238a9eed224a5d298388a47ea9f31e5..2cfb52f9d84e04fd5468de9be0a43d76624faafa 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--map_caddaadr.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--map_caddaadr.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[macros/map_caddaadr.tz]
 
 Well typed
-Gas remaining: 1039964.206 units remaining
+Gas remaining: 1039966.766 units remaining
 { parameter unit ;
   storage (pair (pair nat (pair nat (pair (pair (pair (nat %p) (mutez %value)) nat) nat))) nat) ;
   code { MAP_CDADDAADR @new_storage %value
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--max_in_list.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--max_in_list.tz].out
index 27893a7e2524c88417b63c1f29fdc6a351695ae4..3d1e8efa4b55db64e455030aac6522b74a07ffd8 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--max_in_list.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--max_in_list.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[macros/max_in_list.tz]
 
 Well typed
-Gas remaining: 1039985.981 units remaining
+Gas remaining: 1039987.741 units remaining
 { parameter (list int) ;
   storage (option int) ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--min.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--min.tz].out
index 962d0fa3738e95b3a69b7624d48ffcc77fe3b767..60e727d196f2445ae1bd3bccf9173c278e88a79e 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--min.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--min.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[macros/min.tz]
 
 Well typed
-Gas remaining: 1039990.871 units remaining
+Gas remaining: 1039991.831 units remaining
 { parameter (pair int int) ;
   storage int ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--pair_macro.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--pair_macro.tz].out
index 4cbabdcb2ecfe1989af76adfd0e1dc37a950b945..30ce0dba4fa921d41eb66c6eb1d727b0891728bf 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--pair_macro.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--pair_macro.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[macros/pair_macro.tz]
 
 Well typed
-Gas remaining: 1039988.218 units remaining
+Gas remaining: 1039988.858 units remaining
 { parameter unit ;
   storage unit ;
   code { UNIT
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--set_caddaadr.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--set_caddaadr.tz].out
index 62a65bc59f8efe59fa35323728cfd717d94e0673..51ddc75b17992c3acba70bf2373953857da39f51 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--set_caddaadr.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--set_caddaadr.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[macros/set_caddaadr.tz]
 
 Well typed
-Gas remaining: 1039968.110 units remaining
+Gas remaining: 1039970.670 units remaining
 { parameter mutez ;
   storage (pair (pair nat (pair nat (pair (pair (pair (nat %p) (mutez %value)) nat) nat))) nat) ;
   code { DUP
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--take_my_money.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--take_my_money.tz].out
index f90685682e423b2950b58d46f0c91772a71f58a6..a6c6daa011ac637a61c3375696b1b6ec81cabf98 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--take_my_money.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--take_my_money.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[macros/take_my_money.tz]
 
 Well typed
-Gas remaining: 1039992.790 units remaining
+Gas remaining: 1039993.750 units remaining
 { parameter key_hash ;
   storage unit ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--unpair_macro.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--unpair_macro.tz].out
index 1d2fe26c5b2439369b027c0b57d3d5e6d9914437..9a2a0a68596453663f93ac1dcfefe34d3710d9a2 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--unpair_macro.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[macros--unpair_macro.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[macros/unpair_macro.tz]
 
 Well typed
-Gas remaining: 1039976.490 units remaining
+Gas remaining: 1039977.130 units remaining
 { parameter (unit :param_unit) ;
   storage (unit :u1) ;
   code { DROP
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--authentication.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--authentication.tz].out
index 84f7a47c8a73d2d7ebbcf6168db6311a15337538..8c4d7c57c49eed26ed44d61c38647ce4381dbe87 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--authentication.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--authentication.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[mini_scenarios/authentication.tz]
 
 Well typed
-Gas remaining: 1039978.716 units remaining
+Gas remaining: 1039979.836 units remaining
 { parameter (pair (lambda unit (list operation)) signature) ;
   storage (pair (nat %counter) key) ;
   code { UNPPAIPAIR ;
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--big_map_entrypoints.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--big_map_entrypoints.tz].out
index 249a76bdf2606e0450103ab6b3f2a4dac1555f2b..f9e978d8a2531411ad5157c13d9bfa5d68909103 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--big_map_entrypoints.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--big_map_entrypoints.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[mini_scenarios/big_map_entrypoints.tz]
 
 Well typed
-Gas remaining: 1039940.196 units remaining
+Gas remaining: 1039953.156 units remaining
 { storage (pair (big_map string nat) (big_map string nat)) ;
   parameter
     (or (unit %default
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--big_map_magic.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--big_map_magic.tz].out
index 0e204390f2180ec31ae3017f16a8d311d20cb3cb..68896cac20ac63a5d4e6107b9d37f852e31cc5e2 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--big_map_magic.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--big_map_magic.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[mini_scenarios/big_map_magic.tz]
 
 Well typed
-Gas remaining: 1039941.750 units remaining
+Gas remaining: 1039954.710 units remaining
 { storage (or (pair (big_map string string) (big_map string string)) unit) ;
   parameter
     (or (unit %swap)
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--big_map_read.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--big_map_read.tz].out
index fb6af71493cc84e1121393675d89f7cccc9cec3b..ec6db73a18576f08766b4e6a7704427ebe7c7dc4 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--big_map_read.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--big_map_read.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[mini_scenarios/big_map_read.tz]
 
 Well typed
-Gas remaining: 1039993.434 units remaining
+Gas remaining: 1039994.234 units remaining
 { storage nat ;
   parameter (big_map nat nat) ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--big_map_store.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--big_map_store.tz].out
index 6360722435d984b6232a18ee486786e154552720..03a288add64c10aa49e11671153df636c014ac85 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--big_map_store.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--big_map_store.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[mini_scenarios/big_map_store.tz]
 
 Well typed
-Gas remaining: 1039995.896 units remaining
+Gas remaining: 1039996.856 units remaining
 { storage (big_map nat nat) ;
   parameter unit ;
   code { DROP
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--big_map_write.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--big_map_write.tz].out
index 2314efe7a47b1754b3c0bb4ce2363f3b693528d7..bbde2d802194d93d2a25ef04fb810dd786eaf86c 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--big_map_write.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--big_map_write.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[mini_scenarios/big_map_write.tz]
 
 Well typed
-Gas remaining: 1039994.022 units remaining
+Gas remaining: 1039994.982 units remaining
 { storage unit ;
   parameter (big_map nat nat) ;
   code { UNPAIR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--create_contract.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--create_contract.tz].out
index 54b58211665fa3144e4c45858c0780bb73d20a0f..0bbfef0a5409694618c96eb015d80a43e78c271d 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--create_contract.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--create_contract.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[mini_scenarios/create_contract.tz]
 
 Well typed
-Gas remaining: 1039968.837 units remaining
+Gas remaining: 1039973.157 units remaining
 { parameter (option address) ;
   storage unit ;
   code { /* [ pair string string ] */
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--create_contract_simple.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--create_contract_simple.tz].out
index 6a09a9aed8c5ed07509b78e5081f3bb951a27bb6..98008905cba88b2acdcf76218f2e864762280259 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--create_contract_simple.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--create_contract_simple.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[mini_scenarios/create_contract_simple.tz]
 
 Well typed
-Gas remaining: 1039989.249 units remaining
+Gas remaining: 1039991.809 units remaining
 { parameter unit ;
   storage unit ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--default_account.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--default_account.tz].out
index 6bae2d8ba1a27ee35a69aba52d8dae33bc11ec88..ad621ed13f2af5965474576aaf935d23b6eea863 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--default_account.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--default_account.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[mini_scenarios/default_account.tz]
 
 Well typed
-Gas remaining: 1039992.790 units remaining
+Gas remaining: 1039993.750 units remaining
 { parameter key_hash ;
   storage unit ;
   code { DIP { UNIT /* [ unit ] */ }
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--execution_order_appender.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--execution_order_appender.tz].out
index 621174989a079150d3984dba283acc6436c7f257..feeae3bafa24971ea3fd2df4664fa9ce3f4d179d 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--execution_order_appender.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--execution_order_appender.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[mini_scenarios/execution_order_appender.tz]
 
 Well typed
-Gas remaining: 1039989.364 units remaining
+Gas remaining: 1039990.644 units remaining
 { parameter unit ;
   storage (pair address string) ;
   code { CDR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--execution_order_caller.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--execution_order_caller.tz].out
index 435c3e2e782ea0d438b5adb04c21c4a0e4aaa48a..6919564b00edf4a57dbb4779d0282fdfadcd80e7 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--execution_order_caller.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--execution_order_caller.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[mini_scenarios/execution_order_caller.tz]
 
 Well typed
-Gas remaining: 1039991.291 units remaining
+Gas remaining: 1039992.571 units remaining
 { parameter unit ;
   storage (list address) ;
   code { CDR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--execution_order_storer.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--execution_order_storer.tz].out
index 48c6bb61f7577998ab2c1bf5f69da3a59a744b5d..0c361e6bbf93808e4c9100c083072377b416d937 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--execution_order_storer.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--execution_order_storer.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[mini_scenarios/execution_order_storer.tz]
 
 Well typed
-Gas remaining: 1039996.340 units remaining
+Gas remaining: 1039996.980 units remaining
 { parameter string ;
   storage string ;
   code { UNPAIR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--fa12_reference.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--fa12_reference.tz].out
index f7704cda2314779e25fe9899b663aa1a540c2b0d..1e2c2ecd86f51908447d38df7bbc0d156af0eae4 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--fa12_reference.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--fa12_reference.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[mini_scenarios/fa12_reference.tz]
 
 Well typed
-Gas remaining: 1039229.258 units remaining
+Gas remaining: 1039348.458 units remaining
 { parameter
     (or (or (or (pair %transfer (address :from) (pair (address :to) (nat :value)))
                 (pair %approve (address :spender) (nat :value)))
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--generic_multisig.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--generic_multisig.tz].out
index fb816429240a7c479f2ff8580a35bb73ce022158..09b4d94d9d2ebd2656358481f7e89d337cbcf618 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--generic_multisig.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--generic_multisig.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[mini_scenarios/generic_multisig.tz]
 
 Well typed
-Gas remaining: 1039928.351 units remaining
+Gas remaining: 1039939.551 units remaining
 { parameter
     (or (unit %default)
         (pair %main
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--groth16.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--groth16.tz].out
index c49ca5e6fe9e10d58e2b1d587fb0df25ebcbdac6..26ffe844b246ca0ff281ace5f359ef36d9986bc7 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--groth16.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--groth16.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[mini_scenarios/groth16.tz]
 
 Well typed
-Gas remaining: 1039478.027 units remaining
+Gas remaining: 1039536.287 units remaining
 { storage unit ;
   parameter
     (pair (pair (bls12_381_fr %input_x) (bls12_381_fr %input_y))
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--hardlimit.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--hardlimit.tz].out
index 249282a0a2c75e16f7bb577ca62861b9e35fd38e..e0fad67b90cb03d8ac6557826d7138a1999dc4a4 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--hardlimit.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--hardlimit.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[mini_scenarios/hardlimit.tz]
 
 Well typed
-Gas remaining: 1039991.583 units remaining
+Gas remaining: 1039992.383 units remaining
 { parameter unit ;
   storage int ;
   code { CDR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--legacy_multisig.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--legacy_multisig.tz].out
index 3bbcd5e4a08b73ebc89fb3427935b4e551bb193d..ca405ddaf2d1d48b211de8bc5e8501328ea015c8 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--legacy_multisig.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--legacy_multisig.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[mini_scenarios/legacy_multisig.tz]
 
 Well typed
-Gas remaining: 1039930.991 units remaining
+Gas remaining: 1039943.151 units remaining
 { parameter
     (pair (pair :payload
              (nat %counter)
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--lockup.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--lockup.tz].out
index c9137027d4df8c451167ee2acc42d5834ccf3a6d..f3a7dc23bdedc27c7d1a789f4389795e4a0e2979 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--lockup.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--lockup.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[mini_scenarios/lockup.tz]
 
 Well typed
-Gas remaining: 1039981.235 units remaining
+Gas remaining: 1039982.995 units remaining
 { parameter unit ;
   storage (pair timestamp (pair mutez address)) ;
   code { CDR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--lqt_fa12.mligo.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--lqt_fa12.mligo.tz].out
index 83fdc99cac3b163e6a20c77770d2fb1c37867929..c7f25c1ef006830ddd0cb96867c37a69017a1c56 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--lqt_fa12.mligo.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--lqt_fa12.mligo.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[mini_scenarios/lqt_fa12.mligo.tz]
 
 Well typed
-Gas remaining: 1039662.882 units remaining
+Gas remaining: 1039737.442 units remaining
 { parameter
     (or (or (or (pair %approve (address %spender) (nat %value))
                 (pair %getAllowance
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--multiple_en2.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--multiple_en2.tz].out
index c2c13dbeca6523f9240ff3b960ba2bf51d412fc0..f8d0cb1b86fa76897a13fbd2cd0773b6fc49f167 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--multiple_en2.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--multiple_en2.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[mini_scenarios/multiple_en2.tz]
 
 Well typed
-Gas remaining: 1039921.252 units remaining
+Gas remaining: 1039927.812 units remaining
 { parameter unit ;
   storage (option address) ;
   code { SENDER
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--multiple_entrypoints_counter.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--multiple_entrypoints_counter.tz].out
index 0b3e3c204bbb26f63a1d8b54da8eb84946d22ea3..a3c307014ce038458154b96ab4ae9f54fec85008 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--multiple_entrypoints_counter.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--multiple_entrypoints_counter.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[mini_scenarios/multiple_entrypoints_counter.tz]
 
 Well typed
-Gas remaining: 1039923.962 units remaining
+Gas remaining: 1039930.522 units remaining
 { parameter unit ;
   storage (option address) ;
   code { SENDER
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--originate_contract.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--originate_contract.tz].out
index 8f13a37b1f775a2b9065f02e5c5f5beab1662330..66fe903450c841eedcfc8687ffdd6c5787e22953 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--originate_contract.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--originate_contract.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[mini_scenarios/originate_contract.tz]
 
 Well typed
-Gas remaining: 1039988.320 units remaining
+Gas remaining: 1039991.040 units remaining
 { parameter unit ;
   storage unit ;
   code { DROP
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--parameterized_multisig.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--parameterized_multisig.tz].out
index a64f06f06be80ec841b2d218dd3ac33b84e47a8a..b0d17439bd1d3350bd3537e8f66b96b9b70242e6 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--parameterized_multisig.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--parameterized_multisig.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[mini_scenarios/parameterized_multisig.tz]
 
 Well typed
-Gas remaining: 1039928.103 units remaining
+Gas remaining: 1039940.583 units remaining
 { storage (pair bool (pair (map nat (pair bool bool)) (pair key key))) ;
   parameter (or nat (pair signature nat)) ;
   code { DUP
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--replay.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--replay.tz].out
index 902e300c2c57c8191a46322a6d57bf8678c419df..d46c2729c873bba669051cd95eae29d8d4e3e305 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--replay.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--replay.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[mini_scenarios/replay.tz]
 
 Well typed
-Gas remaining: 1039989.740 units remaining
+Gas remaining: 1039990.860 units remaining
 { parameter unit ;
   storage unit ;
   code { CDR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--reveal_signed_preimage.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--reveal_signed_preimage.tz].out
index 75ddcc06dedf0c7a34c9a6440adc8fa0ba1d7d39..2493d8930f42bc3998ad7d1e3b7726573b70e3c7 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--reveal_signed_preimage.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--reveal_signed_preimage.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[mini_scenarios/reveal_signed_preimage.tz]
 
 Well typed
-Gas remaining: 1039977.336 units remaining
+Gas remaining: 1039978.776 units remaining
 { parameter (pair bytes signature) ;
   storage (pair bytes key) ;
   code { DUP
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--self_address_receiver.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--self_address_receiver.tz].out
index f00cbadabca520112257a224a582017690359483..42eea3e3c5518e6b86616494de9392011497f314 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--self_address_receiver.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--self_address_receiver.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[mini_scenarios/self_address_receiver.tz]
 
 Well typed
-Gas remaining: 1039991.719 units remaining
+Gas remaining: 1039992.679 units remaining
 { parameter (lambda unit address) ;
   storage unit ;
   code { UNPAIR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--self_address_sender.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--self_address_sender.tz].out
index 14a58732171f5d9eed3aa72180e6c69e79d1c39d..ac66182f1794a7f1742484922b506f88a13422c1 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--self_address_sender.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--self_address_sender.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[mini_scenarios/self_address_sender.tz]
 
 Well typed
-Gas remaining: 1039991.879 units remaining
+Gas remaining: 1039993.319 units remaining
 { parameter (contract (lambda unit address)) ;
   storage unit ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--ticket_builder_fungible.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--ticket_builder_fungible.tz].out
index 7b30f749d9438fadbbbc612d74b1c5f144c6273a..f141ec01c1c4fd500bcb7d86c0042d270417973b 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--ticket_builder_fungible.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--ticket_builder_fungible.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[mini_scenarios/ticket_builder_fungible.tz]
 
 Well typed
-Gas remaining: 1039973.685 units remaining
+Gas remaining: 1039975.765 units remaining
 { parameter
     (or (ticket %burn unit)
         (pair %mint (contract %destination (ticket unit)) (nat %amount))) ;
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--ticket_builder_non_fungible.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--ticket_builder_non_fungible.tz].out
index 18e09368f4c2f6c2edd3c918d5ba9d25ef1b5815..667656f928445293728be67393a7708551d01593 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--ticket_builder_non_fungible.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--ticket_builder_non_fungible.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[mini_scenarios/ticket_builder_non_fungible.tz]
 
 Well typed
-Gas remaining: 1039970.718 units remaining
+Gas remaining: 1039973.278 units remaining
 { parameter (or (ticket %burn nat) (contract %mint_destination (ticket nat))) ;
   storage (pair (address %manager) (nat %counter)) ;
   code { AMOUNT
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--ticket_wallet_fungible.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--ticket_wallet_fungible.tz].out
index a67566db44fa221c9171e7990a0c00507cbe90a7..2b052116193d1357bffb5e5fbf020f64024fa9e7 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--ticket_wallet_fungible.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--ticket_wallet_fungible.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[mini_scenarios/ticket_wallet_fungible.tz]
 
 Well typed
-Gas remaining: 1039936.026 units remaining
+Gas remaining: 1039942.906 units remaining
 { parameter
     (or (ticket %receive unit)
         (pair %send (contract %destination (ticket unit)) (nat %amount) (address %ticketer))) ;
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--ticket_wallet_non_fungible.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--ticket_wallet_non_fungible.tz].out
index ab9cea0b9396635a51ad86cbe5d197d9aad7f30b..71bc639ba991f7f886b81763bf4138a74f9bab4b 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--ticket_wallet_non_fungible.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--ticket_wallet_non_fungible.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[mini_scenarios/ticket_wallet_non_fungible.tz]
 
 Well typed
-Gas remaining: 1039952.622 units remaining
+Gas remaining: 1039959.342 units remaining
 { parameter
     (or (ticket %receive nat)
         (pair %send (contract %destination (ticket nat)) (address %ticketer) (nat %id))) ;
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--tzip4_view.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--tzip4_view.tz].out
index 28c899865c48a7c64bdef4227a9a8fdad308f537..0d4f3112d8931a8bccc8f4dcc489dcf8a1ea3836 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--tzip4_view.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--tzip4_view.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[mini_scenarios/tzip4_view.tz]
 
 Well typed
-Gas remaining: 1039984.179 units remaining
+Gas remaining: 1039986.099 units remaining
 { parameter
     (or (pair %view_const unit (contract nat))
         (pair %view_add (pair int int) (contract int))) ;
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--vote_for_delegate.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--vote_for_delegate.tz].out
index c645ea6f7bd7f02c0dce15f2fab0340741088547..b61c8e53a5292d33249a81d06799657b81f43eff 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--vote_for_delegate.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--vote_for_delegate.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[mini_scenarios/vote_for_delegate.tz]
 
 Well typed
-Gas remaining: 1039933.671 units remaining
+Gas remaining: 1039944.871 units remaining
 { parameter (option key_hash) ;
   storage
     (pair (pair %mgr1 (address %addr) (option %key key_hash))
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--weather_insurance.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--weather_insurance.tz].out
index 38f9e1b140e5f9bb0526eba9cb7cfa8ff26494f3..32b0beb3b5e4028c7c29cc8c5d331efe5a6c33d6 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--weather_insurance.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--weather_insurance.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[mini_scenarios/weather_insurance.tz]
 
 Well typed
-Gas remaining: 1039960.200 units remaining
+Gas remaining: 1039963.560 units remaining
 { parameter (pair (signature %signed_weather_data) (nat :rain %actual_level)) ;
   storage
     (pair (pair (address %under_key) (address %over_key))
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--xcat.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--xcat.tz].out
index de37fea144a09fe5e425baae031783f031f6c1f3..2895e770cbe9b58398872fc45588ae22b0f67ece 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--xcat.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--xcat.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[mini_scenarios/xcat.tz]
 
 Well typed
-Gas remaining: 1039965.793 units remaining
+Gas remaining: 1039966.823 units remaining
 { parameter bytes ;
   storage unit ;
   code { CAR @preimage
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--xcat_dapp.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--xcat_dapp.tz].out
index 904ec5a78968a86852bd977c408a5a6a2f8afcc7..9cf5e12fc1ccc0dd90d50e06cf98854918e31b5a 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--xcat_dapp.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[mini_scenarios--xcat_dapp.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[mini_scenarios/xcat_dapp.tz]
 
 Well typed
-Gas remaining: 1039911.852 units remaining
+Gas remaining: 1039922.572 units remaining
 { parameter
     (or (pair %fund
            (address %dest)
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[non_regression--bug_262.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[non_regression--bug_262.tz].out
index 3d406c545a7c06080cc9bfd6cd3b19561bbab44b..4720c1f26eab0e0015b956d0c45b17027fa824f3 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[non_regression--bug_262.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[non_regression--bug_262.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[non_regression/bug_262.tz]
 
 Well typed
-Gas remaining: 1039994.949 units remaining
+Gas remaining: 1039995.909 units remaining
 { parameter unit ;
   storage unit ;
   code { DROP
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[non_regression--bug_843.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[non_regression--bug_843.tz].out
index f54adc8db41dc4b2aa62f0d83ceceec4af2858f0..093a84cd4ba57c3323b4ac2a55cea9e93880ae8b 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[non_regression--bug_843.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[non_regression--bug_843.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[non_regression/bug_843.tz]
 
 Well typed
-Gas remaining: 1039347.149 units remaining
+Gas remaining: 1039990.549 units remaining
 { parameter never ;
   storage (pair address (lambda unit unit)) ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[non_regression--pairk_annot.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[non_regression--pairk_annot.tz].out
index b569215ee0303a3ffc9faf755223874b88019fe1..9b427b2445b1986b21dc46e86750649d237ea5b3 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[non_regression--pairk_annot.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[non_regression--pairk_annot.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[non_regression/pairk_annot.tz]
 
 Well typed
-Gas remaining: 1039992.198 units remaining
+Gas remaining: 1039993.318 units remaining
 { parameter unit ;
   storage unit ;
   code { SENDER
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--abs.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--abs.tz].out
index a112b754b8d00172bdd8faa3a1ad8d628762eed8..4b5929e0386d74ca4b2dec43dab647943d7d851f 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--abs.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--abs.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/abs.tz]
 
 Well typed
-Gas remaining: 1039991.794 units remaining
+Gas remaining: 1039992.594 units remaining
 { parameter nat ;
   storage unit ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--add.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--add.tz].out
index 96ae56d4b8420ca2589c39679bbe883c6279860f..f231872624780433a86a28a1a7ac3159951b191f 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--add.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--add.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/add.tz]
 
 Well typed
-Gas remaining: 1039944.723 units remaining
+Gas remaining: 1039943.723 units remaining
 { parameter unit ;
   storage unit ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--add_bls12_381_fr.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--add_bls12_381_fr.tz].out
index 57132f0aa12cdf15c72dc4a4faf2455a2602eba2..c58a7575dac14cb6ef9eb291f326a162d82d2750 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--add_bls12_381_fr.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--add_bls12_381_fr.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/add_bls12_381_fr.tz]
 
 Well typed
-Gas remaining: 1039995.329 units remaining
+Gas remaining: 1039996.129 units remaining
 { parameter (pair bls12_381_fr bls12_381_fr) ;
   storage (option bls12_381_fr) ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--add_bls12_381_g1.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--add_bls12_381_g1.tz].out
index 2a9525014b37cfca84aff35acc1f31d66013ee71..6c48c0c0a57504bf3124bd7d21d025d33223b041 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--add_bls12_381_g1.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--add_bls12_381_g1.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/add_bls12_381_g1.tz]
 
 Well typed
-Gas remaining: 1039995.329 units remaining
+Gas remaining: 1039996.129 units remaining
 { parameter (pair bls12_381_g1 bls12_381_g1) ;
   storage (option bls12_381_g1) ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--add_bls12_381_g2.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--add_bls12_381_g2.tz].out
index 6c61074094fc8b2aa12f2f80c8d2596b5e68c291..fb086bee9f5e61e348906ef3ae6e985d742b1020 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--add_bls12_381_g2.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--add_bls12_381_g2.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/add_bls12_381_g2.tz]
 
 Well typed
-Gas remaining: 1039995.329 units remaining
+Gas remaining: 1039996.129 units remaining
 { parameter (pair bls12_381_g2 bls12_381_g2) ;
   storage (option bls12_381_g2) ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--add_delta_timestamp.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--add_delta_timestamp.tz].out
index 97c142b4a3ca7904c63ac3108aeae9c52437e719..e0ee4f21b7b71f9c5ffb371ff90337c9ece24e7c 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--add_delta_timestamp.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--add_delta_timestamp.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/add_delta_timestamp.tz]
 
 Well typed
-Gas remaining: 1039993.598 units remaining
+Gas remaining: 1039994.398 units remaining
 { parameter (pair int timestamp) ;
   storage (option timestamp) ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--add_timestamp_delta.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--add_timestamp_delta.tz].out
index 3bad19cb989b2a405cc2ac79fab759fba6b526f0..9e67f070de408b63c477532b41ac6522137d372f 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--add_timestamp_delta.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--add_timestamp_delta.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/add_timestamp_delta.tz]
 
 Well typed
-Gas remaining: 1039993.598 units remaining
+Gas remaining: 1039994.398 units remaining
 { parameter (pair timestamp int) ;
   storage (option timestamp) ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--address.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--address.tz].out
index 9037cc408cd8ad0932dd0248aed2717637d5746d..6dafccd3b4c26b4fe3de6a4c98fb2d7cc948e761 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--address.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--address.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/address.tz]
 
 Well typed
-Gas remaining: 1039995.954 units remaining
+Gas remaining: 1039996.754 units remaining
 { parameter (contract unit) ;
   storage (option address) ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--amount_after_fib_view.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--amount_after_fib_view.tz].out
index 6dab0575031f228381919c5a35babde8c9a79aaa..bab889e7fccc745d59a78f4d2d8204549291889e 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--amount_after_fib_view.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--amount_after_fib_view.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/amount_after_fib_view.tz]
 
 Well typed
-Gas remaining: 1039985.607 units remaining
+Gas remaining: 1039986.567 units remaining
 { parameter address ;
   storage mutez ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--amount_after_nonexistent_view.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--amount_after_nonexistent_view.tz].out
index 2ee88f7fe0219bdee830a9700c0176f4661fe823..2da78b9c572b6ca9a73e3978395791cdb3cc7c33 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--amount_after_nonexistent_view.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--amount_after_nonexistent_view.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/amount_after_nonexistent_view.tz]
 
 Well typed
-Gas remaining: 1039985.815 units remaining
+Gas remaining: 1039986.775 units remaining
 { parameter address ;
   storage mutez ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--amount_after_view.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--amount_after_view.tz].out
index 4a525f9baadf50f2fb17e4426846949a59436be5..1c7c62137e83321792d35022f1546dc09d436a7c 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--amount_after_view.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--amount_after_view.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/amount_after_view.tz]
 
 Well typed
-Gas remaining: 1039985.432 units remaining
+Gas remaining: 1039986.392 units remaining
 { parameter address ;
   storage mutez ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--and.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--and.tz].out
index 12f4855827ca810bf54a6bed86a5597033426139..17928dded762a27bfc5c743c6d042e8fcebbd7a4 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--and.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--and.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/and.tz]
 
 Well typed
-Gas remaining: 1039994.393 units remaining
+Gas remaining: 1039995.193 units remaining
 { parameter (pair :param (bool %first) (bool %second)) ;
   storage (option bool) ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--and_binary.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--and_binary.tz].out
index e55d20d732c6a3647f42e833e92e36ede2bf5b83..23fb473c1a2fcf28f2afddf1d7653cc47df5da50 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--and_binary.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--and_binary.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/and_binary.tz]
 
 Well typed
-Gas remaining: 1039971.036 units remaining
+Gas remaining: 1039972.316 units remaining
 { parameter unit ;
   storage unit ;
   code { DROP
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--and_logical_1.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--and_logical_1.tz].out
index 73fe19cce803359d6c75c9153eb798a1daac98b6..f32d466a259923a4adea7b3b52393b08d2bc5da9 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--and_logical_1.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--and_logical_1.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/and_logical_1.tz]
 
 Well typed
-Gas remaining: 1039996.174 units remaining
+Gas remaining: 1039996.814 units remaining
 { parameter (pair bool bool) ;
   storage bool ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--balance.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--balance.tz].out
index 54bc171a1755559f8abd264108e14436b5deff95..8fc0f466e49756b3522a6870959abdf250ea2fb4 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--balance.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--balance.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/balance.tz]
 
 Well typed
-Gas remaining: 1039996.803 units remaining
+Gas remaining: 1039997.443 units remaining
 { parameter unit ;
   storage mutez ;
   code { DROP
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--balance_after_fib_view.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--balance_after_fib_view.tz].out
index 0ec9c49abe007b299212edd38cdceadb9a9c6521..02bbe5aa50e38c91a019ef44320fda36e86e43f4 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--balance_after_fib_view.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--balance_after_fib_view.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/balance_after_fib_view.tz]
 
 Well typed
-Gas remaining: 1039985.607 units remaining
+Gas remaining: 1039986.567 units remaining
 { parameter address ;
   storage mutez ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--balance_after_nonexistent_view.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--balance_after_nonexistent_view.tz].out
index 3642c58517bfdd06c9df4a6912dad677d04187cc..3fc7feb1ae8fdbeaea9fcbe4f38b761933faa6e9 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--balance_after_nonexistent_view.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--balance_after_nonexistent_view.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/balance_after_nonexistent_view.tz]
 
 Well typed
-Gas remaining: 1039985.815 units remaining
+Gas remaining: 1039986.775 units remaining
 { parameter address ;
   storage mutez ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--balance_after_view.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--balance_after_view.tz].out
index be6fdfb5fc91d62ff7c3e5f7c08d0c0304bbb60c..0782043d9961b7ec59d115d3004ceb7cba2a5139 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--balance_after_view.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--balance_after_view.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/balance_after_view.tz]
 
 Well typed
-Gas remaining: 1039985.432 units remaining
+Gas remaining: 1039986.392 units remaining
 { parameter address ;
   storage mutez ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--big_map_mem_nat.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--big_map_mem_nat.tz].out
index b5b64d9fe3369cff0218dcb644891b68c6bfd125..1e27896c771d1b9a8b02bf949977021e839e5993 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--big_map_mem_nat.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--big_map_mem_nat.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/big_map_mem_nat.tz]
 
 Well typed
-Gas remaining: 1039991.894 units remaining
+Gas remaining: 1039993.494 units remaining
 { parameter nat ;
   storage (pair (big_map nat nat) (option bool)) ;
   code { UNPAIR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--big_map_mem_string.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--big_map_mem_string.tz].out
index 8c673b81b3fc805f7b26a8a85d60d5c8722d78f6..680fe2920f8cddc6dac837304fa8f7d837299018 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--big_map_mem_string.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--big_map_mem_string.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/big_map_mem_string.tz]
 
 Well typed
-Gas remaining: 1039991.894 units remaining
+Gas remaining: 1039993.494 units remaining
 { parameter string ;
   storage (pair (big_map string nat) (option bool)) ;
   code { UNPAIR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--big_map_to_self.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--big_map_to_self.tz].out
index bed9ce3261bcc4c7635a4b5dadb646f5455a587d..1ba9473d0aebd5e0669b7c4e0a7e7497444b7d4f 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--big_map_to_self.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--big_map_to_self.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/big_map_to_self.tz]
 
 Well typed
-Gas remaining: 1039984.347 units remaining
+Gas remaining: 1039987.387 units remaining
 { parameter (or (pair %have_fun (big_map string nat) unit) (unit %default)) ;
   storage (big_map string nat) ;
   code { UNPAIR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--bls12_381_fr_push_bytes_not_padded.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--bls12_381_fr_push_bytes_not_padded.tz].out
index f15d0e9baaa98cad26740e2f184b7ada5dc9171d..29ee7d2426033df29603ccc41523d2bc11a6a2cd 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--bls12_381_fr_push_bytes_not_padded.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--bls12_381_fr_push_bytes_not_padded.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/bls12_381_fr_push_bytes_not_padded.tz]
 
 Well typed
-Gas remaining: 1039995.606 units remaining
+Gas remaining: 1039996.436 units remaining
 { parameter unit ;
   storage (option bls12_381_fr) ;
   code { DROP
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--bls12_381_fr_push_nat.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--bls12_381_fr_push_nat.tz].out
index 598d1fdf43d528031cc80dd7467bf1b1a8204e2d..157f317a63776a051117e4b0407a3c004ff289f8 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--bls12_381_fr_push_nat.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--bls12_381_fr_push_nat.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/bls12_381_fr_push_nat.tz]
 
 Well typed
-Gas remaining: 1039995.606 units remaining
+Gas remaining: 1039996.436 units remaining
 { parameter unit ;
   storage (option bls12_381_fr) ;
   code { DROP
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--bls12_381_fr_to_int.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--bls12_381_fr_to_int.tz].out
index dd14b051ce8d15209e216dccdcd5c13c93e80d83..a674efcf3429461ff8bd0bf3983d84af40609fcb 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--bls12_381_fr_to_int.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--bls12_381_fr_to_int.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/bls12_381_fr_to_int.tz]
 
 Well typed
-Gas remaining: 1039996.803 units remaining
+Gas remaining: 1039997.443 units remaining
 { parameter bls12_381_fr ;
   storage int ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--bls12_381_fr_to_mutez.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--bls12_381_fr_to_mutez.tz].out
index 0c345677e378205a738c17fb7ee37c6d68a64ece..c5b28f8c640cab015d37eca29970c10248b39325 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--bls12_381_fr_to_mutez.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--bls12_381_fr_to_mutez.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/bls12_381_fr_to_mutez.tz]
 
 Well typed
-Gas remaining: 1039992.954 units remaining
+Gas remaining: 1039993.594 units remaining
 { parameter bls12_381_fr ;
   storage mutez ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--bls12_381_fr_z_int.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--bls12_381_fr_z_int.tz].out
index a8ea2adf58a29f7d45572bb48756495628c72071..88107da091e9d8cec666f6d82dc792d441cf499c 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--bls12_381_fr_z_int.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--bls12_381_fr_z_int.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/bls12_381_fr_z_int.tz]
 
 Well typed
-Gas remaining: 1039996.803 units remaining
+Gas remaining: 1039997.443 units remaining
 { parameter int ;
   storage bls12_381_fr ;
   code { UNPAIR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--bls12_381_fr_z_nat.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--bls12_381_fr_z_nat.tz].out
index b5556ae1c34c9df6f6f58b2deb0b306a06c107e8..ff016e1bf008ecc92ac708318dfa00b0d2cc68a6 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--bls12_381_fr_z_nat.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--bls12_381_fr_z_nat.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/bls12_381_fr_z_nat.tz]
 
 Well typed
-Gas remaining: 1039996.803 units remaining
+Gas remaining: 1039997.443 units remaining
 { parameter nat ;
   storage bls12_381_fr ;
   code { UNPAIR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--bls12_381_z_fr_int.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--bls12_381_z_fr_int.tz].out
index 0481a27c264db258e8afd2ea4054f1ded6418066..39858d8e0ef7c7e04590a16101682a34b4298ba6 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--bls12_381_z_fr_int.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--bls12_381_z_fr_int.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/bls12_381_z_fr_int.tz]
 
 Well typed
-Gas remaining: 1039996.340 units remaining
+Gas remaining: 1039996.980 units remaining
 { parameter int ;
   storage bls12_381_fr ;
   code { UNPAIR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--bls12_381_z_fr_nat.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--bls12_381_z_fr_nat.tz].out
index cdc8bcc73a9a5b9971370d06ba4a0f7a36e6e3c4..4c7c327425f36dcf3618e312a507e3ee620ed326 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--bls12_381_z_fr_nat.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--bls12_381_z_fr_nat.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/bls12_381_z_fr_nat.tz]
 
 Well typed
-Gas remaining: 1039996.340 units remaining
+Gas remaining: 1039996.980 units remaining
 { parameter nat ;
   storage bls12_381_fr ;
   code { UNPAIR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--bytes.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--bytes.tz].out
index c0bee3c0729ce7162f1fc34ee04784db1379cbc0..9cbb80e8d0b0b368edc3151a34e2ab82a4b60bba 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--bytes.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--bytes.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/bytes.tz]
 
 Well typed
-Gas remaining: 1039997.267 units remaining
+Gas remaining: 1039997.907 units remaining
 { parameter bytes ;
   storage unit ;
   code { CDR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--car.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--car.tz].out
index 320069d54a279341d4bd68d9976eae9e413a44d6..a80fcc1e17d70e4956b4255aab2411620fb6abcb 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--car.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--car.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/car.tz]
 
 Well typed
-Gas remaining: 1039996.637 units remaining
+Gas remaining: 1039997.277 units remaining
 { parameter (pair (nat :l) (nat :r)) ;
   storage nat ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--cdr.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--cdr.tz].out
index 410cd3fc86992c9f2a31ec90845ac60f3ed4644b..72a54fce4f4dadaf84a2149119aabbdb2ddb2c49 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--cdr.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--cdr.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/cdr.tz]
 
 Well typed
-Gas remaining: 1039996.637 units remaining
+Gas remaining: 1039997.277 units remaining
 { parameter (pair (nat :l) (nat :r)) ;
   storage nat ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--chain_id.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--chain_id.tz].out
index 326a438aa6d766566cb8913b85ff507f11b73ae6..2257bd15562b03d85e41f797c94753c7c22b65e0 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--chain_id.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--chain_id.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/chain_id.tz]
 
 Well typed
-Gas remaining: 1039996.340 units remaining
+Gas remaining: 1039996.980 units remaining
 { parameter unit ;
   storage unit ;
   code { CHAIN_ID
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--chain_id_store.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--chain_id_store.tz].out
index ad2141b907320d811d8a1be2675c219f6cb58d6d..52cba52c7af7bccbeb780e72b8f3a3e8cb82e567 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--chain_id_store.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--chain_id_store.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/chain_id_store.tz]
 
 Well typed
-Gas remaining: 1039996.037 units remaining
+Gas remaining: 1039996.837 units remaining
 { parameter unit ;
   storage (option chain_id) ;
   code { DROP
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--check_signature.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--check_signature.tz].out
index 945f42bbcd9acd368079a3320f09eeaf2a8313d6..b3cea351c8a03dd3f9954ec6582a0edf324c2aea 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--check_signature.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--check_signature.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/check_signature.tz]
 
 Well typed
-Gas remaining: 1039988.024 units remaining
+Gas remaining: 1039988.984 units remaining
 { parameter key ;
   storage (pair signature string) ;
   code { DUP
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--comb-get.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--comb-get.tz].out
index 1e47e5749e8687a6bf86e0b775ab94ea4e1c1a97..d643521b5e267a3682aa91ca767fce94f4b15443 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--comb-get.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--comb-get.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/comb-get.tz]
 
 Well typed
-Gas remaining: 1039964.212 units remaining
+Gas remaining: 1039965.652 units remaining
 { parameter (pair nat nat nat unit) ;
   storage unit ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--comb-literals.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--comb-literals.tz].out
index 7f5e7840944617837fa63c4b767f09cfd6c6026d..da32ffc239774111f9a9debca8668605c39dc235 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--comb-literals.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--comb-literals.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/comb-literals.tz]
 
 Well typed
-Gas remaining: 1039992.630 units remaining
+Gas remaining: 1039993.270 units remaining
 { parameter unit ;
   storage unit ;
   code { PUSH (list (pair nat nat nat nat))
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--comb-set-2.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--comb-set-2.tz].out
index df7efb635d7d44c017134b44eb4f4dc8d653f305..6437940e01ea902b9994a9af88b1604230463d7e 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--comb-set-2.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--comb-set-2.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/comb-set-2.tz]
 
 Well typed
-Gas remaining: 1039989.821 units remaining
+Gas remaining: 1039991.581 units remaining
 { parameter (pair nat nat nat unit) ;
   storage (option (pair int nat string bytes)) ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--comb-set.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--comb-set.tz].out
index 973309367c3bf7c0e51124c208c9a74d2f1b36e8..621bc67410b070dee9b8af7a397496f8b4fa6059 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--comb-set.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--comb-set.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/comb-set.tz]
 
 Well typed
-Gas remaining: 1039990.023 units remaining
+Gas remaining: 1039991.623 units remaining
 { parameter unit ;
   storage (pair nat nat nat unit) ;
   code { CDR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--comb.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--comb.tz].out
index 043e92b3f557bd31fc8f066fda13a85dbbe984a1..33a614d10559e4cf063e57f09655731f68fab40d 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--comb.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--comb.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/comb.tz]
 
 Well typed
-Gas remaining: 1039993.734 units remaining
+Gas remaining: 1039995.014 units remaining
 { parameter unit ;
   storage (pair nat nat nat) ;
   code { DROP
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--compare.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--compare.tz].out
index 5903bc5bbb366ceeeeb64331973ec3a2bb3ea8e4..2fba21f3dfc2ad595173f0a08f5beda9c2155c6d 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--compare.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--compare.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/compare.tz]
 
 Well typed
-Gas remaining: 1039832.943 units remaining
+Gas remaining: 1039834.573 units remaining
 { parameter unit ;
   storage unit ;
   code { DROP
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--compare_big_type.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--compare_big_type.tz].out
index 7ad9cbf20a52643d50ca9218c395e77932ae468b..0675e7a6c41af7fc304cca6d497beb8375c7608e 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--compare_big_type.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--compare_big_type.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/compare_big_type.tz]
 
 Well typed
-Gas remaining: 1038270.787 units remaining
+Gas remaining: 1038761.987 units remaining
 { parameter unit ;
   storage unit ;
   code { DROP
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--compare_big_type2.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--compare_big_type2.tz].out
index f21bdcefdb4d04d09469743c1a374e5074ba5b00..de0a5938a66010e22820f98f6bc5915ef5babc37 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--compare_big_type2.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--compare_big_type2.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/compare_big_type2.tz]
 
 Well typed
-Gas remaining: 1037992.958 units remaining
+Gas remaining: 1038565.918 units remaining
 { parameter unit ;
   storage unit ;
   code { DROP
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--comparisons.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--comparisons.tz].out
index 93155db081a00406ef32cd1b354e6d81b289cd55..44dec393dbedfca0fa2ba26d36868ae2dbd8b59d 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--comparisons.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--comparisons.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/comparisons.tz]
 
 Well typed
-Gas remaining: 1039972.732 units remaining
+Gas remaining: 1039977.212 units remaining
 { parameter (list int) ;
   storage (list (list bool)) ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--concat_hello.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--concat_hello.tz].out
index e63917515ef66151e4044f0c6816a6e36ed69b67..bae595c675f0e890849e8ccdec156f1672e06e7e 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--concat_hello.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--concat_hello.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/concat_hello.tz]
 
 Well typed
-Gas remaining: 1039995.099 units remaining
+Gas remaining: 1039995.899 units remaining
 { parameter (list string) ;
   storage (list string) ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--concat_hello_bytes.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--concat_hello_bytes.tz].out
index 6aff3cefe2226aa502c3326ed20a4ec7023c017c..374e345a0901a4716125d40e659c8e5ce43edee3 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--concat_hello_bytes.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--concat_hello_bytes.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/concat_hello_bytes.tz]
 
 Well typed
-Gas remaining: 1039995.173 units remaining
+Gas remaining: 1039995.973 units remaining
 { parameter (list bytes) ;
   storage (list bytes) ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--concat_list.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--concat_list.tz].out
index eaae9a64bc62f38953bc7431ffb2d1d536d535a1..6631b345ac05e989291991663b0fc6643c919a91 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--concat_list.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--concat_list.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/concat_list.tz]
 
 Well typed
-Gas remaining: 1039991.417 units remaining
+Gas remaining: 1039992.537 units remaining
 { parameter (list string) ;
   storage string ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--cons.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--cons.tz].out
index 4d5b4200cb0cd422e449ab9d760695c2d51ab518..634b39c02ff2d5cb2f07acd53517840ba2e84b4a 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--cons.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--cons.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/cons.tz]
 
 Well typed
-Gas remaining: 1039996.280 units remaining
+Gas remaining: 1039997.240 units remaining
 { parameter int ;
   storage (list int) ;
   code { UNPAIR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--contains_all.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--contains_all.tz].out
index 4597157387c8125be0e3250231ba56e5977b8dc1..b02e5d9d8740127eeafbae645cf35cbb2e59e984 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--contains_all.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--contains_all.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/contains_all.tz]
 
 Well typed
-Gas remaining: 1039972.367 units remaining
+Gas remaining: 1039974.767 units remaining
 { parameter (pair (list string) (list string)) ;
   storage (option bool) ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--contract.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--contract.tz].out
index 9b1a354a4d2944828a6bfad085bc7156270956fd..3c1118a535fb863a8946bdaaa35f7afb3361f229 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--contract.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--contract.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/contract.tz]
 
 Well typed
-Gas remaining: 1039993.550 units remaining
+Gas remaining: 1039994.190 units remaining
 { parameter address ;
   storage unit ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--create_contract.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--create_contract.tz].out
index 3d022a4fb79e1f4b612ee353bdaa4d23c1cc4f4a..479a2c109ba3d10feaffa906903648c991bbc48b 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--create_contract.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--create_contract.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/create_contract.tz]
 
 Well typed
-Gas remaining: 1039988.704 units remaining
+Gas remaining: 1039991.584 units remaining
 { parameter unit ;
   storage (option address) ;
   code { /* [ pair unit unit ] */
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--create_contract_rootname.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--create_contract_rootname.tz].out
index fef637c9b41a05be999b96e194b36df28d368c60..e73ce156d14a27a4a3e3f2566ba244ed49b77227 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--create_contract_rootname.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--create_contract_rootname.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/create_contract_rootname.tz]
 
 Well typed
-Gas remaining: 1039988.704 units remaining
+Gas remaining: 1039991.584 units remaining
 { parameter unit ;
   storage (option address) ;
   code { /* [ pair unit unit ] */
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--create_contract_rootname_alt.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--create_contract_rootname_alt.tz].out
index 450cfd2bca40857f9a8bdbe8959f7d231f046ae9..a7491c7452cc80363c82d18fcbea1d082e7903c4 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--create_contract_rootname_alt.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--create_contract_rootname_alt.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/create_contract_rootname_alt.tz]
 
 Well typed
-Gas remaining: 1039988.704 units remaining
+Gas remaining: 1039991.584 units remaining
 { parameter unit ;
   storage (option address) ;
   code { /* [ pair unit unit ] */
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--create_contract_with_view.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--create_contract_with_view.tz].out
index ab29a0f8fe7b784a9dea27ae542dda27994e508b..c5047af5fab79f4e4c0146f7cd3347e29721fd3f 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--create_contract_with_view.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--create_contract_with_view.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/create_contract_with_view.tz]
 
 Well typed
-Gas remaining: 1039987.576 units remaining
+Gas remaining: 1039990.616 units remaining
 { parameter unit ;
   storage (option address) ;
   code { /* [ pair unit unit ] */
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--diff_timestamps.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--diff_timestamps.tz].out
index ff4b824e48a4a6e441d09a1513ded0bf3aa6cd81..9a1ae97964bf26a9a4a46079d42ac736fb0271ed 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--diff_timestamps.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--diff_timestamps.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/diff_timestamps.tz]
 
 Well typed
-Gas remaining: 1039994.373 units remaining
+Gas remaining: 1039995.013 units remaining
 { parameter (pair timestamp timestamp) ;
   storage int ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--dig_eq.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--dig_eq.tz].out
index e0c28a15aa2b8cd8741d389aca355dd0cec2e54b..4f6cc983204c56ec469e8ff30a8e3f623744b8d4 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--dig_eq.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--dig_eq.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/dig_eq.tz]
 
 Well typed
-Gas remaining: 1039899.367 units remaining
+Gas remaining: 1039905.287 units remaining
 { parameter
     (pair nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat nat) ;
   storage unit ;
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--dign.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--dign.tz].out
index 7eb0edf56ceac893411b530d8a643727339df3b3..8e7603635c8b47d2543ba20c9ce07c1bab0cd27f 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--dign.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--dign.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/dign.tz]
 
 Well typed
-Gas remaining: 1039991.580 units remaining
+Gas remaining: 1039992.220 units remaining
 { parameter (pair (pair (pair (pair nat nat) nat) nat) nat) ;
   storage nat ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--dip.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--dip.tz].out
index 7333f45ae023c95c928f94b27b8496ccb07a8736..78dad8a4dced181066ab1330a3bf0d78c870dfba 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--dip.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--dip.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/dip.tz]
 
 Well typed
-Gas remaining: 1039993.958 units remaining
+Gas remaining: 1039994.918 units remaining
 { parameter (pair nat nat) ;
   storage (pair nat nat) ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--dipn.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--dipn.tz].out
index d6d5a4a444119febbaa5a0501b8d3ba5d98fafac..bfb77247f1bf4030f8fbc2dcd5ce00253abd1410 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--dipn.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--dipn.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/dipn.tz]
 
 Well typed
-Gas remaining: 1039990.690 units remaining
+Gas remaining: 1039991.330 units remaining
 { parameter (pair (pair (pair (pair nat nat) nat) nat) nat) ;
   storage nat ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--dropn.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--dropn.tz].out
index 866acca93dea770c91e9729390628f89810ca98f..98f625ea044d23f6dcbfb3f1362e8b1ebc5b12ba 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--dropn.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--dropn.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/dropn.tz]
 
 Well typed
-Gas remaining: 1039993.947 units remaining
+Gas remaining: 1039994.587 units remaining
 { parameter (pair (pair (pair (pair nat nat) nat) nat) nat) ;
   storage nat ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--dugn.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--dugn.tz].out
index be823b7e5a1ab1b2b7c05c78253745e27250ec67..ff31b23389186156d922c47051bb849ae3ed05b7 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--dugn.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--dugn.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/dugn.tz]
 
 Well typed
-Gas remaining: 1039992.076 units remaining
+Gas remaining: 1039992.716 units remaining
 { parameter (pair (pair (pair (pair nat nat) nat) nat) nat) ;
   storage nat ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--dup-n.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--dup-n.tz].out
index 5a0cf931252f902e146dffff5918a9d6ad789958..e4e550d05a57084ec3e344d5c8be42d8164c7c6a 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--dup-n.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--dup-n.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/dup-n.tz]
 
 Well typed
-Gas remaining: 1039965.992 units remaining
+Gas remaining: 1039967.432 units remaining
 { parameter unit ;
   storage unit ;
   code { DROP
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ediv.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ediv.tz].out
index 22bc94ccf54947908f91f5fbe13fdbc7f7b0ddf7..00118a23766d8cab096cc849d36a5abf5000b200 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ediv.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ediv.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/ediv.tz]
 
 Well typed
-Gas remaining: 1039978.198 units remaining
+Gas remaining: 1039981.718 units remaining
 { parameter (pair int int) ;
   storage
     (pair (option (pair int nat))
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ediv_mutez.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ediv_mutez.tz].out
index 3eb9d8ee8e5fed520fae7c1a6bc68aba68ed64ae..e839b8df7655fc16f08caa04034892c6314e1c7b 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ediv_mutez.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ediv_mutez.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/ediv_mutez.tz]
 
 Well typed
-Gas remaining: 1039987.261 units remaining
+Gas remaining: 1039990.621 units remaining
 { parameter (pair mutez (or mutez nat)) ;
   storage (or (option (pair nat mutez)) (option (pair mutez mutez))) ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--empty_map.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--empty_map.tz].out
index fa5519822e3a02fe34d23f28df2f8687d2fbf884..a97bd198689a24a6d9fcea73212dcd493c03eaf4 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--empty_map.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--empty_map.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/empty_map.tz]
 
 Well typed
-Gas remaining: 1039993.086 units remaining
+Gas remaining: 1039994.366 units remaining
 { storage (map string string) ;
   parameter unit ;
   code { DROP
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--exec_concat.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--exec_concat.tz].out
index e1136e251fb531b6cf319b3c2e977584eb8664b6..39d0f8fd16756a12b307b9cd316b7f8327bf2696 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--exec_concat.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--exec_concat.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/exec_concat.tz]
 
 Well typed
-Gas remaining: 1039991.097 units remaining
+Gas remaining: 1039992.377 units remaining
 { parameter string ;
   storage string ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--first.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--first.tz].out
index b870c0049f204ff6d5b872b5367d4371295bbc72..585f84ab47cb01c4d31e6949d1aff3be2eb6accf 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--first.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--first.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/first.tz]
 
 Well typed
-Gas remaining: 1039994.458 units remaining
+Gas remaining: 1039995.098 units remaining
 { parameter (list nat) ;
   storage nat ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--get_and_update_big_map.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--get_and_update_big_map.tz].out
index 64cbd74dce0dffaa1e04ae9187c86370495a43ad..4f92f78bbcfe6453baa6e363fc4ce077bda9c8bf 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--get_and_update_big_map.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--get_and_update_big_map.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/get_and_update_big_map.tz]
 
 Well typed
-Gas remaining: 1039993.030 units remaining
+Gas remaining: 1039994.790 units remaining
 { parameter string ;
   storage (pair (option nat) (big_map string nat)) ;
   code { UNPAPAIR ;
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--get_and_update_map.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--get_and_update_map.tz].out
index a399201374c903b3bdee797997788054339dd703..bbd675998228f1ba1fd7c3a68c004729c24c3d45 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--get_and_update_map.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--get_and_update_map.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/get_and_update_map.tz]
 
 Well typed
-Gas remaining: 1039993.090 units remaining
+Gas remaining: 1039994.850 units remaining
 { parameter string ;
   storage (pair (option nat) (map string nat)) ;
   code { UNPAPAIR ;
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--get_big_map_value.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--get_big_map_value.tz].out
index f7e442486c196c9bd75723fb698e1ed8f6a537da..af58b25cf25431d1b5bc26618aa8742e9a2baa07 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--get_big_map_value.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--get_big_map_value.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/get_big_map_value.tz]
 
 Well typed
-Gas remaining: 1039990.479 units remaining
+Gas remaining: 1039992.079 units remaining
 { parameter string ;
   storage (pair (big_map string string) (option string)) ;
   code { DUP
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--get_map_value.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--get_map_value.tz].out
index 738252442ed137432c2125b050d00e21fe25f4ae..4b3125f532a5e9326cdfbd37caf10c23c82993d3 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--get_map_value.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--get_map_value.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/get_map_value.tz]
 
 Well typed
-Gas remaining: 1039991.007 units remaining
+Gas remaining: 1039992.607 units remaining
 { parameter string ;
   storage (pair (option string) (map string string)) ;
   code { DUP
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--hash_consistency_checker.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--hash_consistency_checker.tz].out
index 708e74488eafd302f373a8f18ee7188aac0eafcf..7d0d0412dbb64fbe37164263afcb21efa00cbcc8 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--hash_consistency_checker.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--hash_consistency_checker.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/hash_consistency_checker.tz]
 
 Well typed
-Gas remaining: 1039995.929 units remaining
+Gas remaining: 1039996.569 units remaining
 { parameter (pair mutez (pair timestamp int)) ;
   storage bytes ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--hash_key.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--hash_key.tz].out
index a264bbc85ae48507704a5c1b6c78fd686ff64808..5c3ab8bc544558c04d8ab850c0c1fe1a16a731cf 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--hash_key.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--hash_key.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/hash_key.tz]
 
 Well typed
-Gas remaining: 1039996.037 units remaining
+Gas remaining: 1039996.837 units remaining
 { parameter key ;
   storage (option key_hash) ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--hash_string.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--hash_string.tz].out
index 1d1de3f9d3d56c354227f26cc9284ee5fa5b33ff..c41a88c4a551c10bca4d41f39119a0301decc1e5 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--hash_string.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--hash_string.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/hash_string.tz]
 
 Well typed
-Gas remaining: 1039996.340 units remaining
+Gas remaining: 1039996.980 units remaining
 { parameter string ;
   storage bytes ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--if.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--if.tz].out
index 98bfeff38a3ff6c13f16cc89f442f878bb0bdc91..57d41c27b5d1e02f6db49d0c5e6797f734667077 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--if.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--if.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/if.tz]
 
 Well typed
-Gas remaining: 1039994.330 units remaining
+Gas remaining: 1039995.290 units remaining
 { parameter bool ;
   storage (option bool) ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--if_some.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--if_some.tz].out
index 8b08a2d5ec5e23b9b492f091f9d8deec489281b0..d71c9e92b968aadb6b00e2ceb2474ab06d123237 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--if_some.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--if_some.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/if_some.tz]
 
 Well typed
-Gas remaining: 1039995.219 units remaining
+Gas remaining: 1039996.019 units remaining
 { parameter (option string) ;
   storage string ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--int.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--int.tz].out
index f15c4ec76ccef662d80dd6c135e9398e80ef6972..44b4d7e7976d5b5550b04ba7b3b655d787d35b18 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--int.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--int.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/int.tz]
 
 Well typed
-Gas remaining: 1039996.037 units remaining
+Gas remaining: 1039996.837 units remaining
 { parameter nat ;
   storage (option int) ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--iter_fail.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--iter_fail.tz].out
index 1908b7dacd7ce1f70120546cfd068358fc39f0af..34a1afe6b463f2f58c237827f1127f7950830b55 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--iter_fail.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--iter_fail.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/iter_fail.tz]
 
 Well typed
-Gas remaining: 1039996.234 units remaining
+Gas remaining: 1039996.874 units remaining
 { parameter (set nat) ;
   storage unit ;
   code { UNPAIR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--keccak.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--keccak.tz].out
index 4acc9ec37267a89482c2050beac10ba91210dac4..9113c9eb14f75f2c85be76ff95e39ae6944eb009 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--keccak.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--keccak.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/keccak.tz]
 
 Well typed
-Gas remaining: 1039996.037 units remaining
+Gas remaining: 1039996.837 units remaining
 { storage (option bytes) ;
   parameter bytes ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--left_right.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--left_right.tz].out
index fc31ac5a8cf8d36a3f8e3e2402fca5cf50f37eea..a557ee99aadd724fd1d86797ce1023d6053c5f20 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--left_right.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--left_right.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/left_right.tz]
 
 Well typed
-Gas remaining: 1039994.130 units remaining
+Gas remaining: 1039995.570 units remaining
 { parameter (or bool string) ;
   storage (or string bool) ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--level.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--level.tz].out
index fb05172d33b8514b820650f9fb8bee732d2ac86f..b4b0f256924fdfb4d99677d010c9b2e1dd39c3dc 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--level.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--level.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/level.tz]
 
 Well typed
-Gas remaining: 1039996.803 units remaining
+Gas remaining: 1039997.443 units remaining
 { parameter unit ;
   storage nat ;
   code { DROP
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--list_concat.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--list_concat.tz].out
index 4dcfe2d8542f06d21597c4c9c27a7cdfe6ffcf3c..ca9b80ec030a1f4d8c464c4a164c59faf918d2ff 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--list_concat.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--list_concat.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/list_concat.tz]
 
 Well typed
-Gas remaining: 1039995.574 units remaining
+Gas remaining: 1039996.374 units remaining
 { parameter (list string) ;
   storage string ;
   code { UNPAIR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--list_concat_bytes.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--list_concat_bytes.tz].out
index 70cfda9b4464ab61b02ef570e1826b36160dde13..d4b6edf5adec29706b18b35a5bd07ca160a50441 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--list_concat_bytes.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--list_concat_bytes.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/list_concat_bytes.tz]
 
 Well typed
-Gas remaining: 1039995.574 units remaining
+Gas remaining: 1039996.374 units remaining
 { parameter (list bytes) ;
   storage bytes ;
   code { UNPAIR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--list_id.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--list_id.tz].out
index f6a546b1ab77d2de1f34f2122bc7913d06d24650..11c0c0620474a8ffcc4a3f72b887dd36c54bf9aa 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--list_id.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--list_id.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/list_id.tz]
 
 Well typed
-Gas remaining: 1039996.880 units remaining
+Gas remaining: 1039997.680 units remaining
 { parameter (list string) ;
   storage (list string) ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--list_id_map.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--list_id_map.tz].out
index accc65e203af7f82d43063cd6a72fc4530da191a..891c713b0dc2d2d9866b886e43efa6b6d3ee7cac 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--list_id_map.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--list_id_map.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/list_id_map.tz]
 
 Well typed
-Gas remaining: 1039996.174 units remaining
+Gas remaining: 1039996.974 units remaining
 { parameter (list string) ;
   storage (list string) ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--list_iter.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--list_iter.tz].out
index a4f4c5f7d417c31b249426fa4ed17aed88028551..0eb0de09882adae7a00c4c17dc8005f096a89c2b 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--list_iter.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--list_iter.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/list_iter.tz]
 
 Well typed
-Gas remaining: 1039994.793 units remaining
+Gas remaining: 1039995.593 units remaining
 { parameter (list int) ;
   storage int ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--list_map_block.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--list_map_block.tz].out
index 4ba9faa600c8c92409cd985fa22199f393820176..b1f437f73b06fa6103d0748ed3234433f2b0fd5e 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--list_map_block.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--list_map_block.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/list_map_block.tz]
 
 Well typed
-Gas remaining: 1039990.664 units remaining
+Gas remaining: 1039991.624 units remaining
 { parameter (list int) ;
   storage (list int) ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--list_size.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--list_size.tz].out
index d93117b2c73d73af269888140d02d18d9901eff8..eb8820d7da09c18da82516700dc5a1315a10fc08 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--list_size.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--list_size.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/list_size.tz]
 
 Well typed
-Gas remaining: 1039996.720 units remaining
+Gas remaining: 1039997.360 units remaining
 { parameter (list int) ;
   storage nat ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--loop_failwith.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--loop_failwith.tz].out
index 9cf5eef021587575b897ec6c97af4a98f5d483cb..7a66b1a96320dbdf67eff9e1bb8a96ec88eae35a 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--loop_failwith.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--loop_failwith.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/loop_failwith.tz]
 
 Well typed
-Gas remaining: 1039996.317 units remaining
+Gas remaining: 1039996.957 units remaining
 { parameter bool ;
   storage unit ;
   code { UNPAIR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--loop_left.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--loop_left.tz].out
index 9e1ec7ab5b9735d72782a445bbeff2543ecc73c3..8c49d980f7432b20dde4a482bd08d5dd64d90b7a 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--loop_left.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--loop_left.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/loop_left.tz]
 
 Well typed
-Gas remaining: 1039983.876 units remaining
+Gas remaining: 1039987.396 units remaining
 { parameter (list string) ;
   storage (list string) ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--loop_left_failwith.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--loop_left_failwith.tz].out
index 7182ae06996f58f9551cd13ac3907e7fc1e4036e..ebcc0c45d0c4a2912454f7799e64f992660aa8b4 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--loop_left_failwith.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--loop_left_failwith.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/loop_left_failwith.tz]
 
 Well typed
-Gas remaining: 1039996.076 units remaining
+Gas remaining: 1039996.716 units remaining
 { parameter (or string nat) ;
   storage nat ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--map_car.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--map_car.tz].out
index 0840adf76dfc9ca9acfcc3a5c8a1ddd349cff752..5d56e3456ef2ca324c78db0808343d87b38d326f 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--map_car.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--map_car.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/map_car.tz]
 
 Well typed
-Gas remaining: 1039990.103 units remaining
+Gas remaining: 1039991.063 units remaining
 { parameter bool ;
   storage (pair (bool %b) (nat %n)) ;
   code { DUP
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--map_id.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--map_id.tz].out
index d467decad1cc48541db4d46e24662a05cf034c42..6029321d9b3f8180e730d493cb36cd7d266b429b 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--map_id.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--map_id.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/map_id.tz]
 
 Well typed
-Gas remaining: 1039996.494 units remaining
+Gas remaining: 1039997.454 units remaining
 { parameter (map nat nat) ;
   storage (map nat nat) ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--map_iter.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--map_iter.tz].out
index 3220e4b1e0b70620434e6dd2cfb8ab0636c987ca..ab812eb070b622bb00fb7736a03932e3283e8315 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--map_iter.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--map_iter.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/map_iter.tz]
 
 Well typed
-Gas remaining: 1039985.509 units remaining
+Gas remaining: 1039986.949 units remaining
 { parameter (map (int :k) (int :e)) ;
   storage (pair (int :k) (int :e)) ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--map_map.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--map_map.tz].out
index e88ae3f05146e7f992b70709fe9106b400912f44..855ac0c93f929641f539ed2c6614371ec6e9330c 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--map_map.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--map_map.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/map_map.tz]
 
 Well typed
-Gas remaining: 1039992.454 units remaining
+Gas remaining: 1039993.574 units remaining
 { parameter nat ;
   storage (map string nat) ;
   code { UNPAIR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--map_map_sideeffect.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--map_map_sideeffect.tz].out
index b0bfcafecea7a4904b6b61b483602e690a56a0d8..161ee34517a48c9bd0d9960e6d1834864c2f3c81 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--map_map_sideeffect.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--map_map_sideeffect.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/map_map_sideeffect.tz]
 
 Well typed
-Gas remaining: 1039986.934 units remaining
+Gas remaining: 1039988.534 units remaining
 { parameter nat ;
   storage (pair (map string nat) nat) ;
   code { UNPAIR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--map_mem_nat.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--map_mem_nat.tz].out
index c7b7f76e84b61696811ef0c0b781895e84142464..2c1c31465fd319358bbd9b1bd9ff3a793fbc0a13 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--map_mem_nat.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--map_mem_nat.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/map_mem_nat.tz]
 
 Well typed
-Gas remaining: 1039991.954 units remaining
+Gas remaining: 1039993.554 units remaining
 { parameter nat ;
   storage (pair (map nat nat) (option bool)) ;
   code { UNPAIR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--map_mem_string.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--map_mem_string.tz].out
index e741df944cef06fe9e2c0808740c1173b07868b7..45dfee8ce6b308d75ef8f6dc3a2e9cd1deeaa492 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--map_mem_string.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--map_mem_string.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/map_mem_string.tz]
 
 Well typed
-Gas remaining: 1039991.954 units remaining
+Gas remaining: 1039993.554 units remaining
 { parameter string ;
   storage (pair (map string nat) (option bool)) ;
   code { UNPAIR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--map_size.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--map_size.tz].out
index 4e5ff13c44ebb7d56ab01dfbd2c223b921c7b0d5..7dd28059de1173a8c593918b0c0b8a72a1de63b8 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--map_size.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--map_size.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/map_size.tz]
 
 Well typed
-Gas remaining: 1039996.637 units remaining
+Gas remaining: 1039997.277 units remaining
 { parameter (map string nat) ;
   storage nat ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--merge_comparable_pairs.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--merge_comparable_pairs.tz].out
index e2ae68ec761377bb402272100eb1333f9c2bb900..4f6b611188f2d78354e19f88183560c5aa07665e 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--merge_comparable_pairs.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--merge_comparable_pairs.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/merge_comparable_pairs.tz]
 
 Well typed
-Gas remaining: 1039990.293 units remaining
+Gas remaining: 1039992.053 units remaining
 { parameter (set (pair (nat %n) (pair %p (string %s) (int %i)))) ;
   storage nat ;
   code { UNPAIR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--mul.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--mul.tz].out
index 30f48b2b3301db6b9318fae56992168c01fb9f04..aeeb040d83a183596ec0773a8fe72c5b5398168c 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--mul.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--mul.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/mul.tz]
 
 Well typed
-Gas remaining: 1039959.301 units remaining
+Gas remaining: 1039960.901 units remaining
 { parameter unit ;
   storage unit ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--mul_bls12_381_fr.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--mul_bls12_381_fr.tz].out
index 934d44cc7f5be6f49b1b0939a31190792a8aec2c..fb1a454780c202d58a13159f94b2ba9da9fe57d9 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--mul_bls12_381_fr.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--mul_bls12_381_fr.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/mul_bls12_381_fr.tz]
 
 Well typed
-Gas remaining: 1039995.329 units remaining
+Gas remaining: 1039996.129 units remaining
 { parameter (pair bls12_381_fr bls12_381_fr) ;
   storage (option bls12_381_fr) ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--mul_bls12_381_g1.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--mul_bls12_381_g1.tz].out
index e4c03bde34222a4de8d50d63967f4d643c580ef3..f834391d86b47e2c0bcd2ead622d06661e97bf4a 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--mul_bls12_381_g1.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--mul_bls12_381_g1.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/mul_bls12_381_g1.tz]
 
 Well typed
-Gas remaining: 1039995.329 units remaining
+Gas remaining: 1039996.129 units remaining
 { parameter (pair bls12_381_g1 bls12_381_fr) ;
   storage (option bls12_381_g1) ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--mul_bls12_381_g2.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--mul_bls12_381_g2.tz].out
index 2aa5b65aa2c118dfa9c3ac575f6d552495ca3e33..7343005496c01b644ab48da19f251ce41059ee89 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--mul_bls12_381_g2.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--mul_bls12_381_g2.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/mul_bls12_381_g2.tz]
 
 Well typed
-Gas remaining: 1039995.329 units remaining
+Gas remaining: 1039996.129 units remaining
 { parameter (pair bls12_381_g2 bls12_381_fr) ;
   storage (option bls12_381_g2) ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--mul_overflow.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--mul_overflow.tz].out
index 928f99a937c67685e3912dfdd60dfdff247b5a16..7f4b85955de0f24becc407fe0306fe02e05d3149 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--mul_overflow.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--mul_overflow.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/mul_overflow.tz]
 
 Well typed
-Gas remaining: 1039991.544 units remaining
+Gas remaining: 1039992.344 units remaining
 { parameter (or unit unit) ;
   storage unit ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--munch.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--munch.tz].out
index 408c777022919ce30e4971c9e59bce086e45c6a5..7d21e9a6ae9c992806bb5a8542a4e9bc458ad784 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--munch.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--munch.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/munch.tz]
 
 Well typed
-Gas remaining: 1039996.425 units remaining
+Gas remaining: 1039997.065 units remaining
 { parameter
     (or (bytes %bytes) (or (lambda %lambda unit unit) (or (nat %nat) (list %list_nat nat)))) ;
   storage unit ;
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--mutez_to_bls12_381_fr.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--mutez_to_bls12_381_fr.tz].out
index 37edec9875bc082853a598dc4b1a75ebf4ead502..50a8bbfa37f8b10bcf4b6a2a72c8f23b69920b0a 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--mutez_to_bls12_381_fr.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--mutez_to_bls12_381_fr.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/mutez_to_bls12_381_fr.tz]
 
 Well typed
-Gas remaining: 1039991.653 units remaining
+Gas remaining: 1039992.323 units remaining
 { parameter mutez ;
   storage bls12_381_fr ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--neg.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--neg.tz].out
index f6165c43af149a0cf361b77871efc7a9ecce2bf1..a3637885e066ce0dd5ca8e152e1485731bd0c8ff 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--neg.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--neg.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/neg.tz]
 
 Well typed
-Gas remaining: 1039995.361 units remaining
+Gas remaining: 1039996.161 units remaining
 { parameter (or int nat) ;
   storage int ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--neg_bls12_381_fr.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--neg_bls12_381_fr.tz].out
index 2b4b2cd34c4ab63f00f172f8cd711d4b9fb45a6f..a9348050d70b1d975a91a4867366e5581f229244 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--neg_bls12_381_fr.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--neg_bls12_381_fr.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/neg_bls12_381_fr.tz]
 
 Well typed
-Gas remaining: 1039996.037 units remaining
+Gas remaining: 1039996.837 units remaining
 { parameter bls12_381_fr ;
   storage (option bls12_381_fr) ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--neg_bls12_381_g1.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--neg_bls12_381_g1.tz].out
index 6731ef3233626d08975f12cfc6843935d2346ba1..5ee7c4f37b28d4883c6b3ac1094194c403ff7a23 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--neg_bls12_381_g1.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--neg_bls12_381_g1.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/neg_bls12_381_g1.tz]
 
 Well typed
-Gas remaining: 1039996.037 units remaining
+Gas remaining: 1039996.837 units remaining
 { parameter bls12_381_g1 ;
   storage (option bls12_381_g1) ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--neg_bls12_381_g2.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--neg_bls12_381_g2.tz].out
index 7d143177dd8238ccc51b1c6f810192ebf618d9d7..1c223992c659167ad88dbaf182233bc9b2b4bba8 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--neg_bls12_381_g2.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--neg_bls12_381_g2.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/neg_bls12_381_g2.tz]
 
 Well typed
-Gas remaining: 1039996.037 units remaining
+Gas remaining: 1039996.837 units remaining
 { parameter bls12_381_g2 ;
   storage (option bls12_381_g2) ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--none.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--none.tz].out
index ee7c3d95717fbfd459d1de5e632cc5aa2e543da5..70a1a20bdf5902e1ae6ee0d914f519c2ba1931dc 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--none.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--none.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/none.tz]
 
 Well typed
-Gas remaining: 1039996.417 units remaining
+Gas remaining: 1039997.217 units remaining
 { parameter unit ;
   storage (option nat) ;
   code { DROP
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--noop.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--noop.tz].out
index 9b6744eac46199160407fcd78309fd1c96516814..5926b862fafbeae85527dff6752fdc0c1c5a75fe 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--noop.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--noop.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/noop.tz]
 
 Well typed
-Gas remaining: 1039997.267 units remaining
+Gas remaining: 1039997.907 units remaining
 { parameter unit ;
   storage unit ;
   code { CDR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--not.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--not.tz].out
index 736a7ad2f66e5ad12bf84c92bee6d4c0e730dd7e..7be3b252952ffb63ab779e5b2dc1e701bdcf2c11 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--not.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--not.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/not.tz]
 
 Well typed
-Gas remaining: 1039996.037 units remaining
+Gas remaining: 1039996.837 units remaining
 { parameter bool ;
   storage (option bool) ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--not_binary.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--not_binary.tz].out
index 3fd8b510e4be3f32b1e97e1756e1e34f8a8c9a87..5e7b499cd7e6a90de26a2e3c773bb78c5dff7de1 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--not_binary.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--not_binary.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/not_binary.tz]
 
 Well typed
-Gas remaining: 1039994.585 units remaining
+Gas remaining: 1039995.545 units remaining
 { parameter (or int nat) ;
   storage (option int) ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--or.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--or.tz].out
index 7cf3920c62811495a6b36dc9469589d8b4d82dd6..5cd48794dfdf18bb3d464a1457636cbb5890c72b 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--or.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--or.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/or.tz]
 
 Well typed
-Gas remaining: 1039993.625 units remaining
+Gas remaining: 1039994.425 units remaining
 { parameter (pair bool bool) ;
   storage (option bool) ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--or_binary.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--or_binary.tz].out
index d678551abb595d8141b2fad876c6ad444ec4e052..694082cb02957ba203184c502553d6747eea0aa3 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--or_binary.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--or_binary.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/or_binary.tz]
 
 Well typed
-Gas remaining: 1039995.329 units remaining
+Gas remaining: 1039996.129 units remaining
 { parameter (pair nat nat) ;
   storage (option nat) ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--originate_big_map.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--originate_big_map.tz].out
index 24196000717d5681b118a4c1f52dad2ea86d02ba..d6735214e84a3a47e0c45ecc8962b8cb41c06984 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--originate_big_map.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--originate_big_map.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/originate_big_map.tz]
 
 Well typed
-Gas remaining: 1039996.374 units remaining
+Gas remaining: 1039997.334 units remaining
 { parameter (big_map int int) ;
   storage (big_map int int) ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--packunpack.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--packunpack.tz].out
index af9e0fa761fc1582622aa5bd5c3bb6e9b2a9b24a..d13fbcf20a7bdaa3b87c86043c263641f8b98bab 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--packunpack.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--packunpack.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/packunpack.tz]
 
 Well typed
-Gas remaining: 1039986.390 units remaining
+Gas remaining: 1039987.190 units remaining
 { parameter (pair (pair (pair string (list int)) (set nat)) bytes) ;
   storage unit ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--packunpack_rev.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--packunpack_rev.tz].out
index 9656d1b931884402889f83ef638c1251b9080c12..0c4909b2e2c7a9fe76e49d73d00cc50df142e005 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--packunpack_rev.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--packunpack_rev.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/packunpack_rev.tz]
 
 Well typed
-Gas remaining: 1039885.614 units remaining
+Gas remaining: 1039887.694 units remaining
 { parameter (pair int nat string bytes mutez bool key_hash timestamp address) ;
   storage unit ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--packunpack_rev_cty.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--packunpack_rev_cty.tz].out
index fa8d73ac9b5c69160f65e3093186f9fbf0e9c17e..10334fe4f70cf03a1bf9fc8fef95d357094bf599 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--packunpack_rev_cty.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--packunpack_rev_cty.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/packunpack_rev_cty.tz]
 
 Well typed
-Gas remaining: 1039871.738 units remaining
+Gas remaining: 1039873.978 units remaining
 { parameter
     (pair key
           unit
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--pair_id.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--pair_id.tz].out
index 94da0387de940f56563b4198d09504d1f886961f..1703886d84eb600750c384d0b9081c46a7d4a45a 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--pair_id.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--pair_id.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/pair_id.tz]
 
 Well typed
-Gas remaining: 1039995.649 units remaining
+Gas remaining: 1039996.769 units remaining
 { parameter (pair bool bool) ;
   storage (option (pair bool bool)) ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--pairing_check.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--pairing_check.tz].out
index 9e3d820ae3096e278c78f5c0eee225b12b2cbbd0..fe0facaac8904603345d3a367ae3025b5b342738 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--pairing_check.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--pairing_check.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/pairing_check.tz]
 
 Well typed
-Gas remaining: 1039995.709 units remaining
+Gas remaining: 1039996.509 units remaining
 { parameter (list (pair bls12_381_g1 bls12_381_g2)) ;
   storage (option bool) ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--pexec.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--pexec.tz].out
index ca033fd489d27a70211eeb8dd4c2b85f0e05b87e..43eb45c3ac22983e5b689d6dd41f2815bad0c430 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--pexec.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--pexec.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/pexec.tz]
 
 Well typed
-Gas remaining: 1039992.874 units remaining
+Gas remaining: 1039993.994 units remaining
 { parameter nat ;
   storage nat ;
   code { LAMBDA
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--pexec_2.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--pexec_2.tz].out
index d5bee849665fcf56138fce85b7e5e77b5351fd8c..55f78459d49753b2322ef8ffce4137906e1d822c 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--pexec_2.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--pexec_2.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/pexec_2.tz]
 
 Well typed
-Gas remaining: 1039986.241 units remaining
+Gas remaining: 1039988.161 units remaining
 { parameter int ;
   storage (list int) ;
   code { UNPAIR @p @s
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--proxy.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--proxy.tz].out
index 13484ffe93f8c53483ed9b7b4b0ad34ee472027c..bd02073df421e8b7a38fb73e735551567a61ceb0 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--proxy.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--proxy.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/proxy.tz]
 
 Well typed
-Gas remaining: 1039994.321 units remaining
+Gas remaining: 1039995.281 units remaining
 { parameter (contract unit) ;
   storage unit ;
   code { UNPAIR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ret_int.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ret_int.tz].out
index 374afe8533fc3f5fe8b95c56f21a9b8fe183ec00..9ab07fdafd01715d01c9c476be4fb147866af089 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ret_int.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ret_int.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/ret_int.tz]
 
 Well typed
-Gas remaining: 1039995.756 units remaining
+Gas remaining: 1039996.556 units remaining
 { parameter unit ;
   storage (option nat) ;
   code { DROP
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--reverse.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--reverse.tz].out
index b981ed5fd1643e3c863a46c868260eda23ebc4cd..8b678753353125f5cba0cad7cf3ebb40a07edcac 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--reverse.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--reverse.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/reverse.tz]
 
 Well typed
-Gas remaining: 1039994.173 units remaining
+Gas remaining: 1039995.453 units remaining
 { parameter (list string) ;
   storage (list string) ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--reverse_loop.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--reverse_loop.tz].out
index 90deb8d0ee62d2abe36dcc1eb1fee37072462a5a..a2597ad1eb595b4a446ee5498543d6b654cbc625 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--reverse_loop.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--reverse_loop.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/reverse_loop.tz]
 
 Well typed
-Gas remaining: 1039987.683 units remaining
+Gas remaining: 1039990.243 units remaining
 { parameter (list string) ;
   storage (list string) ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--sapling_empty_state.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--sapling_empty_state.tz].out
index 4c086d8ba2f0712f9be812178ce5b40f3a8875aa..5ae52e2a6e85c22d79c9d46e1206713e3e5781b9 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--sapling_empty_state.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--sapling_empty_state.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/sapling_empty_state.tz]
 
 Well typed
-Gas remaining: 1039996.757 units remaining
+Gas remaining: 1039997.397 units remaining
 { parameter unit ;
   storage (sapling_state 8) ;
   code { DROP
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self.tz].out
index a29b4743e526d54cfa2af0284952d8d537d78c5a..10340384aa8e5acfa7fc2717ac154f4929347ab3 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/self.tz]
 
 Well typed
-Gas remaining: 1039996.305 units remaining
+Gas remaining: 1039996.945 units remaining
 { parameter unit ;
   storage address ;
   code { DROP
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_address.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_address.tz].out
index 717a13df2cb7031d8b1ab7691922da45540784f7..3581748013b26d43f3891bf021362143d8e04bd5 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_address.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_address.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/self_address.tz]
 
 Well typed
-Gas remaining: 1039988.949 units remaining
+Gas remaining: 1039990.069 units remaining
 { parameter unit ;
   storage unit ;
   code { DROP
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_address_after_fib_view.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_address_after_fib_view.tz].out
index cd5019522f129286ee9f6ec2374438a01cfbaa25..c7482aa4e2a15a312cf20cfc0651b79a4a0dafba 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_address_after_fib_view.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_address_after_fib_view.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/self_address_after_fib_view.tz]
 
 Well typed
-Gas remaining: 1039985.607 units remaining
+Gas remaining: 1039986.567 units remaining
 { parameter address ;
   storage address ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_address_after_nonexistent_view.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_address_after_nonexistent_view.tz].out
index 74601898026680801e67a630ce45a6c59bed381d..8ade68532e411950b21bf4a0c4deb74ac51f67f1 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_address_after_nonexistent_view.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_address_after_nonexistent_view.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/self_address_after_nonexistent_view.tz]
 
 Well typed
-Gas remaining: 1039986.090 units remaining
+Gas remaining: 1039987.050 units remaining
 { parameter address ;
   storage address ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_address_after_view.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_address_after_view.tz].out
index 617936b48252e599ca4467f511d01c9f0c4d0a3f..ca0689305c1c010bde0f9712d417435bbc47e32d 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_address_after_view.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_address_after_view.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/self_address_after_view.tz]
 
 Well typed
-Gas remaining: 1039985.432 units remaining
+Gas remaining: 1039986.392 units remaining
 { parameter address ;
   storage address ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_after_fib_view.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_after_fib_view.tz].out
index 50e71453dcfd5606ced1f821f9ffd49af42b81a1..a421d64e9a20b464a7930955d7cd9c11e05df917 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_after_fib_view.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_after_fib_view.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/self_after_fib_view.tz]
 
 Well typed
-Gas remaining: 1039985.100 units remaining
+Gas remaining: 1039986.060 units remaining
 { parameter address ;
   storage address ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_after_nonexistent_view.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_after_nonexistent_view.tz].out
index f9c758e8fca9615edf23c1f5079257642fcd942e..27aa64ccecbe21b00fe54b7f2a0d7ba0dcb455db 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_after_nonexistent_view.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_after_nonexistent_view.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/self_after_nonexistent_view.tz]
 
 Well typed
-Gas remaining: 1039985.492 units remaining
+Gas remaining: 1039986.452 units remaining
 { parameter address ;
   storage address ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_after_view.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_after_view.tz].out
index bdb76a06c34f896d15054719ee759ffc01c5aa67..8e241af750e0b1c0a11876124cac2e5817c06842 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_after_view.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_after_view.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/self_after_view.tz]
 
 Well typed
-Gas remaining: 1039984.926 units remaining
+Gas remaining: 1039985.886 units remaining
 { parameter address ;
   storage address ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_with_default_entrypoint.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_with_default_entrypoint.tz].out
index 21d88f835dd55bbba919ed0c39a8c5baeb0498ed..7a1a17350934457f9d245ca73d21a9db03e85e6b 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_with_default_entrypoint.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_with_default_entrypoint.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/self_with_default_entrypoint.tz]
 
 Well typed
-Gas remaining: 1039987.880 units remaining
+Gas remaining: 1039988.680 units remaining
 { parameter (or (or (nat %A) (bool %B)) (or %maybe_C (unit %default) (string %C))) ;
   storage unit ;
   code { DROP
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_with_entrypoint.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_with_entrypoint.tz].out
index 4c3ee75544bf033503c9f070414f46937ade241a..5eb502d5589645b6d5d2403db3cb3d7a1665bb41 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_with_entrypoint.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--self_with_entrypoint.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/self_with_entrypoint.tz]
 
 Well typed
-Gas remaining: 1039965.501 units remaining
+Gas remaining: 1039970.621 units remaining
 { parameter (or (or (nat %A) (bool %B)) (or %maybe_C (unit %Z) (string %C))) ;
   storage unit ;
   code { DROP
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--sender.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--sender.tz].out
index f266979f0d2e5f24bc4d51a96ff508d5e925b8e6..e4dbed4dcfad8493dfc16529f4bb2a2fd2eb95ba 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--sender.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--sender.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/sender.tz]
 
 Well typed
-Gas remaining: 1039996.803 units remaining
+Gas remaining: 1039997.443 units remaining
 { parameter unit ;
   storage address ;
   code { DROP
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--sender_after_fib_view.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--sender_after_fib_view.tz].out
index ae57014a5da9b1095dd1eedf450db959f0bd9003..fef792b0d708b532c50b8f3a7b564220728ca8bb 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--sender_after_fib_view.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--sender_after_fib_view.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/sender_after_fib_view.tz]
 
 Well typed
-Gas remaining: 1039985.607 units remaining
+Gas remaining: 1039986.567 units remaining
 { parameter address ;
   storage address ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--sender_after_nonexistent_view.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--sender_after_nonexistent_view.tz].out
index f6f3014bed5ec8b4c264322022d257757f0cb5e3..a9eca92f717cf299aaaf49a70babaa858ce9ccda 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--sender_after_nonexistent_view.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--sender_after_nonexistent_view.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/sender_after_nonexistent_view.tz]
 
 Well typed
-Gas remaining: 1039986.090 units remaining
+Gas remaining: 1039987.050 units remaining
 { parameter address ;
   storage address ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--sender_after_view.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--sender_after_view.tz].out
index 85d670b17904aa3750aefa02383c0537c384fd49..7685d458cd1b52fd0234b5acc2d80927e39c1bb9 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--sender_after_view.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--sender_after_view.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/sender_after_view.tz]
 
 Well typed
-Gas remaining: 1039985.432 units remaining
+Gas remaining: 1039986.392 units remaining
 { parameter address ;
   storage address ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--set_car.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--set_car.tz].out
index c35a50514883db57ef74dad27086d8c03de02313..f5d1aac00406fb39bada2716677dae48698a7943 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--set_car.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--set_car.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/set_car.tz]
 
 Well typed
-Gas remaining: 1039991.314 units remaining
+Gas remaining: 1039992.274 units remaining
 { parameter string ;
   storage (pair (string %s) (nat %n)) ;
   code { DUP
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--set_cdr.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--set_cdr.tz].out
index 8f0613744184af4f2354c5f503a73405cd254bf5..46379662badbbe8481bc0f43cbdd7bedf0307865 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--set_cdr.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--set_cdr.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/set_cdr.tz]
 
 Well typed
-Gas remaining: 1039991.782 units remaining
+Gas remaining: 1039992.742 units remaining
 { parameter nat ;
   storage (pair (string %s) (nat %n)) ;
   code { DUP
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--set_delegate.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--set_delegate.tz].out
index 421679abb6e93ef4f1ac69844505324ddbc53ca1..0c0a969ae21c48150fe9de76ab7920f90ffbb2f8 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--set_delegate.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--set_delegate.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/set_delegate.tz]
 
 Well typed
-Gas remaining: 1039995.476 units remaining
+Gas remaining: 1039996.276 units remaining
 { parameter (option key_hash) ;
   storage unit ;
   code { UNPAIR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--set_id.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--set_id.tz].out
index 06ee5f76c931e88845faf826f1801e9ec31214fe..c370182147513065a08d76553391e38dcd564f6a 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--set_id.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--set_id.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/set_id.tz]
 
 Well typed
-Gas remaining: 1039996.880 units remaining
+Gas remaining: 1039997.680 units remaining
 { parameter (set string) ;
   storage (set string) ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--set_iter.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--set_iter.tz].out
index 7be78c7ad6f11d177f9908b221531292ad804335..0c771bd7a6dd06b7d95c16bb9d7766fcb6c9a9d2 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--set_iter.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--set_iter.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/set_iter.tz]
 
 Well typed
-Gas remaining: 1039994.793 units remaining
+Gas remaining: 1039995.593 units remaining
 { parameter (set int) ;
   storage int ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--set_member.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--set_member.tz].out
index 06b1fd28911dd7dd9a3d09e33947754a2f977650..c36c34c152bf0b28a95ef600130216416a074fc3 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--set_member.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--set_member.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/set_member.tz]
 
 Well typed
-Gas remaining: 1039988.400 units remaining
+Gas remaining: 1039989.840 units remaining
 { parameter string ;
   storage (pair (set string) (option bool)) ;
   code { DUP
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--set_size.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--set_size.tz].out
index da56a47991e00a31effed07e1e8b747bbab346cf..a791706f7f08bbfd29cbacc22c975de379e592bf 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--set_size.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--set_size.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/set_size.tz]
 
 Well typed
-Gas remaining: 1039996.720 units remaining
+Gas remaining: 1039997.360 units remaining
 { parameter (set int) ;
   storage nat ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--sets.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--sets.tz].out
index 8ff33abfb71ffa4e2c0c9f612dd7f94c8f32b616..9423dfa7d71438f46da19d0a3a5d1d1e7df81aa9 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--sets.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--sets.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/sets.tz]
 
 Well typed
-Gas remaining: 1038012.810 units remaining
+Gas remaining: 1039942.190 units remaining
 { parameter unit ;
   storage unit ;
   code { DROP
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--sha3.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--sha3.tz].out
index 6cc41f18a4f6aaeef1e7896f3f2637ff05f281a5..11ef6be9c93484afa14fb0323d07133dfac9e75b 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--sha3.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--sha3.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/sha3.tz]
 
 Well typed
-Gas remaining: 1039996.037 units remaining
+Gas remaining: 1039996.837 units remaining
 { storage (option bytes) ;
   parameter bytes ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--shifts.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--shifts.tz].out
index 07199a261f82fb4d9203c03d389a88e8d24c4162..4b614d952ffdb46224b792e2e1d8075cd4e13f1b 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--shifts.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--shifts.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/shifts.tz]
 
 Well typed
-Gas remaining: 1039993.299 units remaining
+Gas remaining: 1039994.259 units remaining
 { parameter (or (pair nat nat) (pair nat nat)) ;
   storage (option nat) ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--slice.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--slice.tz].out
index 9852bd98dc1c9dae10ea63524fbde8f13ebc19a1..3760e12a6137fdbc87bed8508bf2669e42841620 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--slice.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--slice.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/slice.tz]
 
 Well typed
-Gas remaining: 1039992.627 units remaining
+Gas remaining: 1039993.747 units remaining
 { parameter (pair nat nat) ;
   storage (option string) ;
   code { UNPAIR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--slice_bytes.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--slice_bytes.tz].out
index acfe24dfaba65404977b4f449c29db430c92b79b..62005cd96426e31acb2d0c0d66e05787d5268b11 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--slice_bytes.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--slice_bytes.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/slice_bytes.tz]
 
 Well typed
-Gas remaining: 1039992.627 units remaining
+Gas remaining: 1039993.747 units remaining
 { parameter (pair nat nat) ;
   storage (option bytes) ;
   code { UNPAIR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--slices.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--slices.tz].out
index 67d46ea071ccf5c6f6473d97af328164f8d2b7bf..d461e0ceb7a179f2c14b32247a544cf2d5b8e364 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--slices.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--slices.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/slices.tz]
 
 Well typed
-Gas remaining: 1039935.257 units remaining
+Gas remaining: 1039936.697 units remaining
 { parameter (pair bytes signature) ;
   storage key ;
   code { DUP
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--source.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--source.tz].out
index 5988f8799723236ae2c0b014f7578e9333657c25..3acb11602f8bf04a8ea7c549d124855cf13e6ed5 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--source.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--source.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/source.tz]
 
 Well typed
-Gas remaining: 1039996.803 units remaining
+Gas remaining: 1039997.443 units remaining
 { parameter unit ;
   storage address ;
   code { DROP
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--split_bytes.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--split_bytes.tz].out
index 046f01cc63101f973225edc6272d409750500a0f..5407d6df615db4223ca460313e8164906077c8c1 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--split_bytes.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--split_bytes.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/split_bytes.tz]
 
 Well typed
-Gas remaining: 1039970.057 units remaining
+Gas remaining: 1039973.097 units remaining
 { parameter bytes ;
   storage (list bytes) ;
   code { UNPAIR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--split_string.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--split_string.tz].out
index fe0abf63c8a393d7acd3499465b00645c2d1a846..a41c387c8037f110e71b85a9423273085a56a14d 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--split_string.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--split_string.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/split_string.tz]
 
 Well typed
-Gas remaining: 1039970.057 units remaining
+Gas remaining: 1039973.097 units remaining
 { parameter string ;
   storage (list string) ;
   code { UNPAIR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--store_bls12_381_fr.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--store_bls12_381_fr.tz].out
index 0ce379704283a6f9be4bf22b72aa7f5bcfc54aec..45cc05c575ea15a2c3189525200532cb97fb91f0 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--store_bls12_381_fr.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--store_bls12_381_fr.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/store_bls12_381_fr.tz]
 
 Well typed
-Gas remaining: 1039996.500 units remaining
+Gas remaining: 1039997.300 units remaining
 { parameter bls12_381_fr ;
   storage (option bls12_381_fr) ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--store_bls12_381_g1.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--store_bls12_381_g1.tz].out
index 221602a62b8194c521902bbda1d4e4ff35f09a30..596b66bf91b5ea7428ff839d8928fff85eb3a6a1 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--store_bls12_381_g1.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--store_bls12_381_g1.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/store_bls12_381_g1.tz]
 
 Well typed
-Gas remaining: 1039996.500 units remaining
+Gas remaining: 1039997.300 units remaining
 { parameter bls12_381_g1 ;
   storage (option bls12_381_g1) ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--store_bls12_381_g2.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--store_bls12_381_g2.tz].out
index 5296f8c2d283e4534acdb639749fd9f556f2b31c..fa8c6a0a8a0c501698d1b5f38bdb486b76f8907e 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--store_bls12_381_g2.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--store_bls12_381_g2.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/store_bls12_381_g2.tz]
 
 Well typed
-Gas remaining: 1039996.500 units remaining
+Gas remaining: 1039997.300 units remaining
 { parameter bls12_381_g2 ;
   storage (option bls12_381_g2) ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--store_input.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--store_input.tz].out
index 63ada8111ceeb095bc526c95decd324b9670108c..bf27cb0ea0c7abc032b6f595116ce8082463f043 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--store_input.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--store_input.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/store_input.tz]
 
 Well typed
-Gas remaining: 1039997.267 units remaining
+Gas remaining: 1039997.907 units remaining
 { parameter string ;
   storage string ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--store_now.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--store_now.tz].out
index 84a7ccf3899ea006acf887d62405b5149ab5386f..8d8aee87a059796c598843b600183084afc17e5a 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--store_now.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--store_now.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/store_now.tz]
 
 Well typed
-Gas remaining: 1039996.803 units remaining
+Gas remaining: 1039997.443 units remaining
 { parameter unit ;
   storage timestamp ;
   code { DROP
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--str_id.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--str_id.tz].out
index ebe457e16a8eabaf9e767462f8ff4b9a8e70a0d0..cc4bfa0b435f1bf30bee9ccfb42620102d42905d 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--str_id.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--str_id.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/str_id.tz]
 
 Well typed
-Gas remaining: 1039996.500 units remaining
+Gas remaining: 1039997.300 units remaining
 { parameter string ;
   storage (option string) ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--sub_timestamp_delta.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--sub_timestamp_delta.tz].out
index 1e2fc89bc90b12d22d53bcf87cdb21c524fe0606..5272610193aef9badf4bea45309544b253674a21 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--sub_timestamp_delta.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--sub_timestamp_delta.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/sub_timestamp_delta.tz]
 
 Well typed
-Gas remaining: 1039994.373 units remaining
+Gas remaining: 1039995.013 units remaining
 { parameter (pair timestamp int) ;
   storage timestamp ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--subset.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--subset.tz].out
index 79400d7b938fdafac7bff375db603ee6647d7370..57186a64f41edeab8564f56127ddbcf58e5cb121 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--subset.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--subset.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/subset.tz]
 
 Well typed
-Gas remaining: 1039984.961 units remaining
+Gas remaining: 1039986.401 units remaining
 { parameter (pair (set string) (set string)) ;
   storage bool ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--tez_add_sub.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--tez_add_sub.tz].out
index e00f14c16632e037df42573886b841ee158ec53a..ca6ae30d4c2c9b7d1c034f2d1bba3c9d20184f9a 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--tez_add_sub.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--tez_add_sub.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/tez_add_sub.tz]
 
 Well typed
-Gas remaining: 1039986.225 units remaining
+Gas remaining: 1039987.345 units remaining
 { parameter (pair mutez mutez) ;
   storage (option (pair mutez mutez)) ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ticket_bad.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ticket_bad.tz].out
index dfadec2cbd6b0b62e9f1506a3d4182140eeea1a6..b497a28c3d9bb2523e67932aa80e3c4db5298733 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ticket_bad.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ticket_bad.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/ticket_bad.tz]
 
 Well typed
-Gas remaining: 1039996.963 units remaining
+Gas remaining: 1039997.763 units remaining
 { parameter unit ;
   storage (ticket nat) ;
   code { CDR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ticket_big_store.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ticket_big_store.tz].out
index 95a2d194dafc37a4f4b020e27d2f10b088056b79..614e9d15c766d2f6c8a876e375236ad026d02f7f 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ticket_big_store.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ticket_big_store.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/ticket_big_store.tz]
 
 Well typed
-Gas remaining: 1039992.430 units remaining
+Gas remaining: 1039994.030 units remaining
 { parameter nat ;
   storage (big_map unit (ticket nat)) ;
   code { UNPAIR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ticket_join.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ticket_join.tz].out
index 105a8cf557710d50a506bc9a997b62a82d56e24a..932c47ce9e62c2f5d57dcef5f91bda314a961489 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ticket_join.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ticket_join.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/ticket_join.tz]
 
 Well typed
-Gas remaining: 1039991.063 units remaining
+Gas remaining: 1039992.503 units remaining
 { parameter (ticket nat) ;
   storage (option (ticket nat)) ;
   code { UNPAIR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ticket_read.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ticket_read.tz].out
index 9b518b2320ac82179bb67e9137e573dd66107899..9af95550a12a2220f89c07786313bff7232caecc 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ticket_read.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ticket_read.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/ticket_read.tz]
 
 Well typed
-Gas remaining: 1039984.150 units remaining
+Gas remaining: 1039985.110 units remaining
 { parameter (ticket nat) ;
   storage address ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ticket_split.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ticket_split.tz].out
index c5b65922c7be547f2d6bdb3054cf55712c75530d..59a6a9227397ab6d06f17b277aeacee5aa1633f8 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ticket_split.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ticket_split.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/ticket_split.tz]
 
 Well typed
-Gas remaining: 1039978.358 units remaining
+Gas remaining: 1039979.318 units remaining
 { parameter (ticket nat) ;
   storage unit ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ticket_store-2.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ticket_store-2.tz].out
index f9409f9c088296b31f108659f1d26a68d7464744..6a01f19ffc49154a157d405a0b01939f38dfa811 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ticket_store-2.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ticket_store-2.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/ticket_store-2.tz]
 
 Well typed
-Gas remaining: 1039996.494 units remaining
+Gas remaining: 1039997.454 units remaining
 { parameter (option (ticket nat)) ;
   storage (option (ticket nat)) ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ticket_store.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ticket_store.tz].out
index 2d268f8eee438df4195e95400bbb8cda071ca9a7..2be5e46cabd2f94b05beb4974bf54e0fa8b186de 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ticket_store.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ticket_store.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/ticket_store.tz]
 
 Well typed
-Gas remaining: 1039996.114 units remaining
+Gas remaining: 1039997.074 units remaining
 { parameter (ticket nat) ;
   storage (option (ticket nat)) ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ticketer-2.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ticketer-2.tz].out
index 37bdafc1c8f1a2c4d5aa90225148ab515b0c2737..3f2733a8c9dba107375ede533fe6162c53435cba 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ticketer-2.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ticketer-2.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/ticketer-2.tz]
 
 Well typed
-Gas remaining: 1039987.194 units remaining
+Gas remaining: 1039988.314 units remaining
 { parameter (pair (pair address nat) nat) ;
   storage unit ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ticketer.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ticketer.tz].out
index 3e14e5a603ece660b538e6c9040512c9a0f55311..311f05d59d2d43f8614756479c69efa017f4b46f 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ticketer.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--ticketer.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/ticketer.tz]
 
 Well typed
-Gas remaining: 1039987.710 units remaining
+Gas remaining: 1039988.830 units remaining
 { parameter address ;
   storage nat ;
   code { UNPAIR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--transfer_amount.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--transfer_amount.tz].out
index bb136dfd59117cd15fca83f2d782309fa16aa4e8..997311e4e02385e9e0e1ffb2e73a77ffe76308b3 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--transfer_amount.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--transfer_amount.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/transfer_amount.tz]
 
 Well typed
-Gas remaining: 1039996.803 units remaining
+Gas remaining: 1039997.443 units remaining
 { parameter unit ;
   storage mutez ;
   code { DROP
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--transfer_tokens.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--transfer_tokens.tz].out
index 9d58fef3a5b60bd055a17f6b351abacf8a703d29..1e16540629a094c8edda59f9ac2ce85049d57e93 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--transfer_tokens.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--transfer_tokens.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/transfer_tokens.tz]
 
 Well typed
-Gas remaining: 1039993.170 units remaining
+Gas remaining: 1039994.130 units remaining
 { parameter (contract unit) ;
   storage unit ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--uncomb.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--uncomb.tz].out
index a2184775c1013dad6a09ec5d17003366b739a7b3..e6e8381b59bcca2f755e460de1f4edfdc2bda836 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--uncomb.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--uncomb.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/uncomb.tz]
 
 Well typed
-Gas remaining: 1039992.541 units remaining
+Gas remaining: 1039993.181 units remaining
 { parameter (pair nat nat nat) ;
   storage nat ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--unpair.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--unpair.tz].out
index 8ffcdbce78d830feabb5274ea731090eaba53e95..2a760fc990b43606facd02ad64e4ad776af1b7e3 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--unpair.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--unpair.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/unpair.tz]
 
 Well typed
-Gas remaining: 1039903.879 units remaining
+Gas remaining: 1039904.519 units remaining
 { parameter (unit :param_unit) ;
   storage (unit :u1) ;
   code { DROP
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--unpair_field_annotation_mismatch.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--unpair_field_annotation_mismatch.tz].out
index 51456482ac14a532cb0c3ae3d405526fe6dfae3a..d33dfb66c0a3719ffeca4bf511d407ae87488493 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--unpair_field_annotation_mismatch.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--unpair_field_annotation_mismatch.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/unpair_field_annotation_mismatch.tz]
 
 Well typed
-Gas remaining: 1039993.045 units remaining
+Gas remaining: 1039993.685 units remaining
 { parameter (unit :param_unit) ;
   storage (unit :u1) ;
   code { DROP
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--update_big_map.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--update_big_map.tz].out
index bfbac44cce76511b922c2814951f35182427efd7..b48a55d680d5e447f0576deaafb56bd70a758000 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--update_big_map.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--update_big_map.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/update_big_map.tz]
 
 Well typed
-Gas remaining: 1039991.231 units remaining
+Gas remaining: 1039993.471 units remaining
 { storage (pair (big_map string string) unit) ;
   parameter (map string (option string)) ;
   code { UNPAPAIR ;
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--utxo_read.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--utxo_read.tz].out
index 963772716386ec430408a9d49eb4c6ef3452577b..159513f3c53ef307cf5cdbb6da2130e0031beb40 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--utxo_read.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--utxo_read.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/utxo_read.tz]
 
 Well typed
-Gas remaining: 1039984.190 units remaining
+Gas remaining: 1039985.150 units remaining
 { parameter (pair (ticket nat) nat) ;
   storage address ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--utxor.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--utxor.tz].out
index 3675169d674b75bb534d5d3ac4e8d8949bcac2bc..36da626697da354419714c10a43ae342776e7424 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--utxor.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--utxor.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/utxor.tz]
 
 Well typed
-Gas remaining: 1039966.683 units remaining
+Gas remaining: 1039968.923 units remaining
 { parameter (pair address address) ;
   storage nat ;
   code { UNPAIR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_fib.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_fib.tz].out
index 590912e0ae72cc5eb1573b37aa89e944fccf9cc7..b673a5c76d1968443f9e23196b6170e82b341311 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_fib.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_fib.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/view_fib.tz]
 
 Well typed
-Gas remaining: 1039993.990 units remaining
+Gas remaining: 1039994.630 units remaining
 { parameter (pair nat address) ;
   storage nat ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_mutual_recursion.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_mutual_recursion.tz].out
index f41d7a56e5dee70f16bda5c742d4238b7076addd..81c87067496d93e91b0604fba45584ee51bcc54a 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_mutual_recursion.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_mutual_recursion.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/view_mutual_recursion.tz]
 
 Well typed
-Gas remaining: 1039992.695 units remaining
+Gas remaining: 1039993.335 units remaining
 { parameter (pair nat address) ;
   storage nat ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_op_add.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_op_add.tz].out
index bf4ddbc5db558443b95ec844013c4078227bfe28..96f47218f710d87121e7d2470efbdf9c6b591436 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_op_add.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_op_add.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/view_op_add.tz]
 
 Well typed
-Gas remaining: 1039993.770 units remaining
+Gas remaining: 1039994.410 units remaining
 { parameter (pair nat address) ;
   storage nat ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_op_constant.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_op_constant.tz].out
index 50989bad3caac28189e0689bf0ae712f3c2ad61d..42f933a9cd0e4a26f75baa40460a03dcc670dc1e 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_op_constant.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_op_constant.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/view_op_constant.tz]
 
 Well typed
-Gas remaining: 1039993.750 units remaining
+Gas remaining: 1039994.390 units remaining
 { parameter (pair nat address) ;
   storage nat ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_op_id.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_op_id.tz].out
index f63595e875138c28c9271ea385dbf2d0ce22b160..cc23989db0415831e72afb1f2fbcb20b7549d03e 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_op_id.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_op_id.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/view_op_id.tz]
 
 Well typed
-Gas remaining: 1039992.989 units remaining
+Gas remaining: 1039993.949 units remaining
 { parameter (pair nat address) ;
   storage (pair nat nat) ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_op_nonexistent_addr.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_op_nonexistent_addr.tz].out
index 644d5603f5265170c2b1e1566ccae607c3aed03d..da5972dbc68af19c88cdf7874549f188917dac06 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_op_nonexistent_addr.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_op_nonexistent_addr.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/view_op_nonexistent_addr.tz]
 
 Well typed
-Gas remaining: 1039342.059 units remaining
+Gas remaining: 1039986.259 units remaining
 { parameter (pair nat address) ;
   storage bool ;
   code { DROP
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_op_nonexistent_func.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_op_nonexistent_func.tz].out
index dabad0ace439915f0c9f4a14d6590683b3266238..6b534bfc9727d64dad9884f7520a7bb25288bc69 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_op_nonexistent_func.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_op_nonexistent_func.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/view_op_nonexistent_func.tz]
 
 Well typed
-Gas remaining: 1039993.059 units remaining
+Gas remaining: 1039993.859 units remaining
 { parameter (pair nat address) ;
   storage bool ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_op_test_step_contants.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_op_test_step_contants.tz].out
index 49344d4359a38cadc1fa8fbe119068e48f801081..f39c6d21d5869c46a49f54774eb0ff96818483a9 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_op_test_step_contants.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_op_test_step_contants.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/view_op_test_step_contants.tz]
 
 Well typed
-Gas remaining: 1039992.390 units remaining
+Gas remaining: 1039994.470 units remaining
 { parameter address ;
   storage (option (pair (pair mutez mutez) (pair (pair address address) address))) ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_op_toplevel_inconsistent_input_type.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_op_toplevel_inconsistent_input_type.tz].out
index b15e69394e47ce3868e3ebc2de5a6b4ff06880f0..ae8f0dcab812cbd554fcb087b0aba4ba623768db 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_op_toplevel_inconsistent_input_type.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_op_toplevel_inconsistent_input_type.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/view_op_toplevel_inconsistent_input_type.tz]
 
 Well typed
-Gas remaining: 1039993.119 units remaining
+Gas remaining: 1039993.919 units remaining
 { parameter (pair int address) ;
   storage nat ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_op_toplevel_inconsistent_output_type.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_op_toplevel_inconsistent_output_type.tz].out
index 9ca270c4dd2a58d2dcb0649a52270ef19c5a872b..bb364e0d0ab8be1733f69dbc874f81612bdebd3a 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_op_toplevel_inconsistent_output_type.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_op_toplevel_inconsistent_output_type.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/view_op_toplevel_inconsistent_output_type.tz]
 
 Well typed
-Gas remaining: 1039993.119 units remaining
+Gas remaining: 1039993.919 units remaining
 { parameter (pair nat address) ;
   storage bool ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_rec.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_rec.tz].out
index f43ce20dee6e5b82a5a7f1ed27a59b31d6b99646..d8a77bc835a620114b76e4f2a32d411fd19766d5 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_rec.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_rec.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/view_rec.tz]
 
 Well typed
-Gas remaining: 1039987.736 units remaining
+Gas remaining: 1039988.536 units remaining
 { parameter unit ;
   storage unit ;
   view "loop"
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_toplevel_lib.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_toplevel_lib.tz].out
index 2171282d8a6faab969e4775f60bd5b54cd6117e1..7da661cfaa71a818b8ed1cd03959d6026e429ce1 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_toplevel_lib.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--view_toplevel_lib.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/view_toplevel_lib.tz]
 
 Well typed
-Gas remaining: 1039943.603 units remaining
+Gas remaining: 1039947.763 units remaining
 { parameter nat ;
   storage nat ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--voting_power.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--voting_power.tz].out
index ec0b0777e8f65312ea246d357cb5d40da75ffead..6b83cc27c699f58fcc9ed20e9cab287209186fdd 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--voting_power.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--voting_power.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/voting_power.tz]
 
 Well typed
-Gas remaining: 1039994.233 units remaining
+Gas remaining: 1039995.193 units remaining
 { parameter key ;
   storage (pair nat nat) ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--xor.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--xor.tz].out
index f70dba64c63a22ffed2b213cd644521f6f117ef8..e13b20b58af7b4b2eac12ef0940833a2abfebf92 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--xor.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[opcodes--xor.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestTypecheck::test_typecheck[opcodes/xor.tz]
 
 Well typed
-Gas remaining: 1039990.984 units remaining
+Gas remaining: 1039992.584 units remaining
 { parameter (or (pair bool bool) (pair nat nat)) ;
   storage (option (or bool nat)) ;
   code { CAR
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractBigMapOrigination::test_big_map_origination_literal.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractBigMapOrigination::test_big_map_origination_literal.out
index 6310b5a1b9399c169427149a991b0a593871633e..04663d53beb59292b532fd78feb86a34856a2dc5 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractBigMapOrigination::test_big_map_origination_literal.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractBigMapOrigination::test_big_map_origination_literal.out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract_onchain_opcodes.py::TestContractBigMapOrigination::test_big_map_origination_literal
 
 Node is bootstrapped.
-Estimated gas: 1642.832 units (will add 100 for safety)
+Estimated gas: 1641.797 units (will add 100 for safety)
 Estimated storage: 403 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -14,7 +14,7 @@ This sequence of operations was run:
     From: [CONTRACT_HASH]
     Fee to the baker: ꜩ0.000461
     Expected counter: [EXPECTED_COUNTER]
-    Gas limit: 1743
+    Gas limit: 1742
     Storage limit: 423 bytes
     Balance updates:
       [CONTRACT_HASH] ... -ꜩ0.000461
@@ -36,7 +36,7 @@ This sequence of operations was run:
           New map(4) of type (big_map int int)
           Set map(4)[0] to 0
         Paid storage size diff: 146 bytes
-        Consumed gas: 1642.832
+        Consumed gas: 1641.797
         Balance updates:
           [CONTRACT_HASH] ... -ꜩ0.0365
           storage fees ........................... +ꜩ0.0365
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainLevel::test_level.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainLevel::test_level.out
index dbaee1136adeb967491c36126b8ac7903fd0bb76..e8df944618817c90def52c55645879310650598e 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainLevel::test_level.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainLevel::test_level.out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract_onchain_opcodes.py::TestContractOnchainLevel::test_level
 
 Node is bootstrapped.
-Estimated gas: 1409.664 units (will add 100 for safety)
+Estimated gas: 1409.024 units (will add 100 for safety)
 Estimated storage: 300 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -33,7 +33,7 @@ This sequence of operations was run:
           [CONTRACT_HASH]
         Storage size: 43 bytes
         Paid storage size diff: 43 bytes
-        Consumed gas: 1409.664
+        Consumed gas: 1409.024
         Balance updates:
           [CONTRACT_HASH] ... -ꜩ0.01075
           storage fees ........................... +ꜩ0.01075
@@ -47,7 +47,7 @@ Contract memorized as level.
 Injected block at minimal timestamp
 Injected block at minimal timestamp
 Node is bootstrapped.
-Estimated gas: 2050.718 units (will add 100 for safety)
+Estimated gas: 2109.490 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -58,13 +58,13 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [CONTRACT_HASH]
-    Fee to the baker: ꜩ0.000468
+    Fee to the baker: ꜩ0.000473
     Expected counter: [EXPECTED_COUNTER]
-    Gas limit: 2151
+    Gas limit: 2210
     Storage limit: 0 bytes
     Balance updates:
-      [CONTRACT_HASH] ... -ꜩ0.000468
-      payload fees(the block proposer) ....... +ꜩ0.000468
+      [CONTRACT_HASH] ... -ꜩ0.000473
+      payload fees(the block proposer) ....... +ꜩ0.000473
     Transaction:
       Amount: ꜩ500
       From: [CONTRACT_HASH]
@@ -72,7 +72,7 @@ This sequence of operations was run:
       This transaction was successfully applied
       Updated storage: 4
       Storage size: 40 bytes
-      Consumed gas: 2050.718
+      Consumed gas: 2109.490
       Balance updates:
         [CONTRACT_HASH] ... -ꜩ500
         [CONTRACT_HASH] ... +ꜩ500
@@ -89,7 +89,7 @@ Injected block at minimal timestamp
 Injected block at minimal timestamp
 4
 Node is bootstrapped.
-Estimated gas: 1203.505 units (will add 100 for safety)
+Estimated gas: 1202.917 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -102,7 +102,7 @@ This sequence of operations was run:
     From: [CONTRACT_HASH]
     Fee to the baker: ꜩ0.000383
     Expected counter: [EXPECTED_COUNTER]
-    Gas limit: 1304
+    Gas limit: 1303
     Storage limit: 0 bytes
     Balance updates:
       [CONTRACT_HASH] ... -ꜩ0.000383
@@ -114,7 +114,7 @@ This sequence of operations was run:
       This transaction was successfully applied
       Updated storage: 7
       Storage size: 40 bytes
-      Consumed gas: 1203.505
+      Consumed gas: 1202.917
       Balance updates:
         [CONTRACT_HASH] ... -ꜩ500
         [CONTRACT_HASH] ... +ꜩ500
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_init_proxy.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_init_proxy.out
index fc46d0f7f99f636d1496f0813f0e5623c87bb513..5ea4438f0f170d0e60c54e1e2e5cc3d0aa25f300 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_init_proxy.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_init_proxy.out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract_onchain_opcodes.py::TestContractOnchainOpcodes::test_init_proxy
 
 Node is bootstrapped.
-Estimated gas: 1414.942 units (will add 100 for safety)
+Estimated gas: 1413.982 units (will add 100 for safety)
 Estimated storage: 312 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -14,7 +14,7 @@ This sequence of operations was run:
     From: [CONTRACT_HASH]
     Fee to the baker: ꜩ0.000438
     Expected counter: [EXPECTED_COUNTER]
-    Gas limit: 1515
+    Gas limit: 1514
     Storage limit: 332 bytes
     Balance updates:
       [CONTRACT_HASH] ... -ꜩ0.000438
@@ -39,7 +39,7 @@ This sequence of operations was run:
           [CONTRACT_HASH]
         Storage size: 55 bytes
         Paid storage size diff: 55 bytes
-        Consumed gas: 1414.942
+        Consumed gas: 1413.982
         Balance updates:
           [CONTRACT_HASH] ... -ꜩ0.01375
           storage fees ........................... +ꜩ0.01375
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_set_delegate.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_set_delegate.out
index 2a9be46083b76db5fc488ea916bb1836cec71f9f..cde8912d7412df4ab2561ba64770b5ba5e3868a0 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_set_delegate.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_set_delegate.out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract_onchain_opcodes.py::TestContractOnchainOpcodes::test_set_delegate
 
 Node is bootstrapped.
-Estimated gas: 1412.789 units (will add 100 for safety)
+Estimated gas: 1411.989 units (will add 100 for safety)
 Estimated storage: 308 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -14,7 +14,7 @@ This sequence of operations was run:
     From: [CONTRACT_HASH]
     Fee to the baker: ꜩ0.000434
     Expected counter: [EXPECTED_COUNTER]
-    Gas limit: 1513
+    Gas limit: 1512
     Storage limit: 328 bytes
     Balance updates:
       [CONTRACT_HASH] ... -ꜩ0.000434
@@ -33,7 +33,7 @@ This sequence of operations was run:
           [CONTRACT_HASH]
         Storage size: 51 bytes
         Paid storage size diff: 51 bytes
-        Consumed gas: 1412.789
+        Consumed gas: 1411.989
         Balance updates:
           [CONTRACT_HASH] ... -ꜩ0.01275
           storage fees ........................... +ꜩ0.01275
@@ -48,7 +48,7 @@ Injected block at minimal timestamp
 Injected block at minimal timestamp
 none
 Node is bootstrapped.
-Estimated gas: 3057.146 units (will add 100 for safety)
+Estimated gas: 3115.714 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -59,13 +59,13 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [CONTRACT_HASH]
-    Fee to the baker: ꜩ0.000612
+    Fee to the baker: ꜩ0.000618
     Expected counter: [EXPECTED_COUNTER]
-    Gas limit: 3158
+    Gas limit: 3216
     Storage limit: 0 bytes
     Balance updates:
-      [CONTRACT_HASH] ... -ꜩ0.000612
-      payload fees(the block proposer) ....... +ꜩ0.000612
+      [CONTRACT_HASH] ... -ꜩ0.000618
+      payload fees(the block proposer) ....... +ꜩ0.000618
     Transaction:
       Amount: ꜩ0
       From: [CONTRACT_HASH]
@@ -74,7 +74,7 @@ This sequence of operations was run:
       This transaction was successfully applied
       Updated storage: Unit
       Storage size: 51 bytes
-      Consumed gas: 2057.146
+      Consumed gas: 2115.714
     Internal operations:
       Delegation:
         Contract: [CONTRACT_HASH]
@@ -85,7 +85,7 @@ This sequence of operations was run:
 Injected block at minimal timestamp
 [CONTRACT_HASH] (known as bootstrap5)
 Node is bootstrapped.
-Estimated gas: 2203.600 units (will add 100 for safety)
+Estimated gas: 2202.968 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -98,7 +98,7 @@ This sequence of operations was run:
     From: [CONTRACT_HASH]
     Fee to the baker: ꜩ0.000486
     Expected counter: [EXPECTED_COUNTER]
-    Gas limit: 2304
+    Gas limit: 2303
     Storage limit: 0 bytes
     Balance updates:
       [CONTRACT_HASH] ... -ꜩ0.000486
@@ -111,7 +111,7 @@ This sequence of operations was run:
       This transaction was successfully applied
       Updated storage: Unit
       Storage size: 51 bytes
-      Consumed gas: 1203.600
+      Consumed gas: 1202.968
     Internal operations:
       Delegation:
         Contract: [CONTRACT_HASH]
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_slice.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_slice.out
index 2cc224a5e13951d73c1728430016ffce4556aa2c..d5d8af30ddf6a3ae72c60acf238a63ef3e1b5fc0 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_slice.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_slice.out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract_onchain_opcodes.py::TestContractOnchainOpcodes::test_slice
 
 Node is bootstrapped.
-Estimated gas: 1879.474 units (will add 100 for safety)
+Estimated gas: 1878.034 units (will add 100 for safety)
 Estimated storage: 835 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -14,7 +14,7 @@ This sequence of operations was run:
     From: [CONTRACT_HASH]
     Fee to the baker: ꜩ0.001028
     Expected counter: [EXPECTED_COUNTER]
-    Gas limit: 1980
+    Gas limit: 1979
     Storage limit: 855 bytes
     Balance updates:
       [CONTRACT_HASH] ... -ꜩ0.001028
@@ -73,7 +73,7 @@ This sequence of operations was run:
           [CONTRACT_HASH]
         Storage size: 578 bytes
         Paid storage size diff: 578 bytes
-        Consumed gas: 1879.474
+        Consumed gas: 1878.034
         Balance updates:
           [CONTRACT_HASH] ... -ꜩ0.1445
           storage fees ........................... +ꜩ0.1445
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_slice_success[(Pair 0xe009ab79e8b84ef0e55c43a9a857214d8761e67b.7da5c9014e.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_slice_success[(Pair 0xe009ab79e8b84ef0e55c43a9a857214d8761e67b.7da5c9014e.out
index 42ca56653a44aff868bca9c47c1b31849f7bd6c8..83eff2f427063c81af1c70a3500f7fd934a570ee 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_slice_success[(Pair 0xe009ab79e8b84ef0e55c43a9a857214d8761e67b.7da5c9014e.out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_slice_success[(Pair 0xe009ab79e8b84ef0e55c43a9a857214d8761e67b.7da5c9014e.out	
@@ -1,7 +1,7 @@
 tests_alpha/test_contract_onchain_opcodes.py::TestContractOnchainOpcodes::test_slice_success[(Pair 0xe009ab79e8b84ef0e55c43a9a857214d8761e67b75ba63500a5694fb2ffe174acc2de22d01ccb7259342437f05e1987949f0ad82e9f32e9a0b79cb252d7f7b8236ad728893f4e7150742eefdbeda254970f9fcd92c6228c178e1a923e5600758eb83f2a05edd0be7625657901f2ba81eaf145d003dbef78e33f43a32a3788bdf0501000000085341554349535345 "spsig1PPUFZucuAQybs5wsqsNQ68QNgFaBnVKMFaoZZfi1BtNnuCAWnmL9wVy5HfHkR6AeodjVGxpBVVSYcJKyMURn6K1yknYLm")]
 
 Node is bootstrapped.
-Estimated gas: 3962.434 units (will add 100 for safety)
+Estimated gas: 4049.953 units (will add 100 for safety)
 Estimated storage: 257 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -12,13 +12,13 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [CONTRACT_HASH]
-    Fee to the baker: ꜩ0.000914
+    Fee to the baker: ꜩ0.000922
     Expected counter: [EXPECTED_COUNTER]
-    Gas limit: 4063
+    Gas limit: 4150
     Storage limit: 277 bytes
     Balance updates:
-      [CONTRACT_HASH] ... -ꜩ0.000914
-      payload fees(the block proposer) ....... +ꜩ0.000914
+      [CONTRACT_HASH] ... -ꜩ0.000922
+      payload fees(the block proposer) ....... +ꜩ0.000922
     Transaction:
       Amount: ꜩ0
       From: [CONTRACT_HASH]
@@ -29,14 +29,14 @@ This sequence of operations was run:
       Updated storage:
         [OPERATION_HASH]48f709699019725ba
       Storage size: 578 bytes
-      Consumed gas: 2542.434
+      Consumed gas: 2599.953
     Internal operations:
       Transaction:
         Amount: ꜩ1000
         From: [CONTRACT_HASH]
         To: [CONTRACT_HASH]
         This transaction was successfully applied
-        Consumed gas: 1420
+        Consumed gas: 1450
         Balance updates:
           [CONTRACT_HASH] ... -ꜩ1000
           [CONTRACT_HASH] ... +ꜩ1000
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_source.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_source.out
index 2e4c88afa6d4dbd43e57bbcb1b780a29cd730a03..458492ee7036f02d1c7abfbf54f5b517f4c13a93 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_source.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_source.out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract_onchain_opcodes.py::TestContractOnchainOpcodes::test_source
 
 Node is bootstrapped.
-Estimated gas: 2070.517 units (will add 100 for safety)
+Estimated gas: 1416.647 units (will add 100 for safety)
 Estimated storage: 322 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -12,13 +12,13 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [CONTRACT_HASH]
-    Fee to the baker: ꜩ0.000528
+    Fee to the baker: ꜩ0.000462
     Expected counter: [EXPECTED_COUNTER]
-    Gas limit: 2171
+    Gas limit: 1517
     Storage limit: 342 bytes
     Balance updates:
-      [CONTRACT_HASH] ... -ꜩ0.000528
-      payload fees(the block proposer) ....... +ꜩ0.000528
+      [CONTRACT_HASH] ... -ꜩ0.000462
+      payload fees(the block proposer) ....... +ꜩ0.000462
     Origination:
       From: [CONTRACT_HASH]
       Credit: ꜩ1000
@@ -33,7 +33,7 @@ This sequence of operations was run:
           [CONTRACT_HASH]
         Storage size: 65 bytes
         Paid storage size diff: 65 bytes
-        Consumed gas: 2070.517
+        Consumed gas: 1416.647
         Balance updates:
           [CONTRACT_HASH] ... -ꜩ0.01625
           storage fees ........................... +ꜩ0.01625
@@ -46,7 +46,7 @@ New contract [CONTRACT_HASH] originated.
 Contract memorized as source.
 Injected block at minimal timestamp
 Node is bootstrapped.
-Estimated gas: 2711.837 units (will add 100 for safety)
+Estimated gas: 2110.829 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -57,13 +57,13 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [CONTRACT_HASH]
-    Fee to the baker: ꜩ0.00053
+    Fee to the baker: ꜩ0.00047
     Expected counter: [EXPECTED_COUNTER]
-    Gas limit: 2812
+    Gas limit: 2211
     Storage limit: 0 bytes
     Balance updates:
-      [CONTRACT_HASH] ... -ꜩ0.00053
-      payload fees(the block proposer) ....... +ꜩ0.00053
+      [CONTRACT_HASH] ... -ꜩ0.00047
+      payload fees(the block proposer) ....... +ꜩ0.00047
     Transaction:
       Amount: ꜩ0
       From: [CONTRACT_HASH]
@@ -71,14 +71,14 @@ This sequence of operations was run:
       This transaction was successfully applied
       Updated storage: 0x0000e7670f32038107a59a2b9cfefae36ea21f5aa63c
       Storage size: 65 bytes
-      Consumed gas: 2711.837
+      Consumed gas: 2110.829
 
 Injected block at minimal timestamp
 "[CONTRACT_HASH]"
 [CONTRACT_HASH]
 
 Node is bootstrapped.
-Estimated gas: 4341.893 units (will add 100 for safety)
+Estimated gas: 3775.704 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -89,13 +89,13 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [CONTRACT_HASH]
-    Fee to the baker: ꜩ0.000739
+    Fee to the baker: ꜩ0.000682
     Expected counter: [EXPECTED_COUNTER]
-    Gas limit: 4442
+    Gas limit: 3876
     Storage limit: 0 bytes
     Balance updates:
-      [CONTRACT_HASH] ... -ꜩ0.000739
-      payload fees(the block proposer) ....... +ꜩ0.000739
+      [CONTRACT_HASH] ... -ꜩ0.000682
+      payload fees(the block proposer) ....... +ꜩ0.000682
     Transaction:
       Amount: ꜩ0
       From: [CONTRACT_HASH]
@@ -104,7 +104,7 @@ This sequence of operations was run:
       This transaction was successfully applied
       Updated storage: Unit
       Storage size: 55 bytes
-      Consumed gas: 3128.113
+      Consumed gas: 2572.502
     Internal operations:
       Transaction:
         Amount: ꜩ0
@@ -113,7 +113,7 @@ This sequence of operations was run:
         This transaction was successfully applied
         Updated storage: 0x0000e7670f32038107a59a2b9cfefae36ea21f5aa63c
         Storage size: 65 bytes
-        Consumed gas: 1213.780
+        Consumed gas: 1203.202
 
 Injected block at minimal timestamp
 "[CONTRACT_HASH]"
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_split_bytes.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_split_bytes.out
index cf6a39a01b6dd02ab911b54d46f29fdc165df572..9bf7bcff9969a63d6d6447c59a202af3f43b3fdf 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_split_bytes.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_split_bytes.out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract_onchain_opcodes.py::TestContractOnchainOpcodes::test_split_bytes
 
 Node is bootstrapped.
-Estimated gas: 1470.552 units (will add 100 for safety)
+Estimated gas: 1467.512 units (will add 100 for safety)
 Estimated storage: 511 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -12,13 +12,13 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [CONTRACT_HASH]
-    Fee to the baker: ꜩ0.000643
+    Fee to the baker: ꜩ0.000642
     Expected counter: [EXPECTED_COUNTER]
-    Gas limit: 1571
+    Gas limit: 1568
     Storage limit: 531 bytes
     Balance updates:
-      [CONTRACT_HASH] ... -ꜩ0.000643
-      payload fees(the block proposer) ....... +ꜩ0.000643
+      [CONTRACT_HASH] ... -ꜩ0.000642
+      payload fees(the block proposer) ....... +ꜩ0.000642
     Origination:
       From: [CONTRACT_HASH]
       Credit: ꜩ1000
@@ -55,7 +55,7 @@ This sequence of operations was run:
           [CONTRACT_HASH]
         Storage size: 254 bytes
         Paid storage size diff: 254 bytes
-        Consumed gas: 1470.552
+        Consumed gas: 1467.512
         Balance updates:
           [CONTRACT_HASH] ... -ꜩ0.0635
           storage fees ........................... +ꜩ0.0635
@@ -68,7 +68,7 @@ New contract [CONTRACT_HASH] originated.
 Contract memorized as split_bytes.
 Injected block at minimal timestamp
 Node is bootstrapped.
-Estimated gas: 2097.863 units (will add 100 for safety)
+Estimated gas: 2153.591 units (will add 100 for safety)
 Estimated storage: 18 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -79,13 +79,13 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [CONTRACT_HASH]
-    Fee to the baker: ꜩ0.000481
+    Fee to the baker: ꜩ0.000487
     Expected counter: [EXPECTED_COUNTER]
-    Gas limit: 2198
+    Gas limit: 2254
     Storage limit: 38 bytes
     Balance updates:
-      [CONTRACT_HASH] ... -ꜩ0.000481
-      payload fees(the block proposer) ....... +ꜩ0.000481
+      [CONTRACT_HASH] ... -ꜩ0.000487
+      payload fees(the block proposer) ....... +ꜩ0.000487
     Transaction:
       Amount: ꜩ0
       From: [CONTRACT_HASH]
@@ -95,7 +95,7 @@ This sequence of operations was run:
       Updated storage: { 0xaa ; 0xbb ; 0xcc }
       Storage size: 272 bytes
       Paid storage size diff: 18 bytes
-      Consumed gas: 2097.863
+      Consumed gas: 2153.591
       Balance updates:
         [CONTRACT_HASH] ... -ꜩ0.0045
         storage fees ........................... +ꜩ0.0045
@@ -103,7 +103,7 @@ This sequence of operations was run:
 Injected block at minimal timestamp
 { 0xaa ; 0xbb ; 0xcc }
 Node is bootstrapped.
-Estimated gas: 1207.932 units (will add 100 for safety)
+Estimated gas: 1206.580 units (will add 100 for safety)
 Estimated storage: 18 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -116,7 +116,7 @@ This sequence of operations was run:
     From: [CONTRACT_HASH]
     Fee to the baker: ꜩ0.000392
     Expected counter: [EXPECTED_COUNTER]
-    Gas limit: 1308
+    Gas limit: 1307
     Storage limit: 38 bytes
     Balance updates:
       [CONTRACT_HASH] ... -ꜩ0.000392
@@ -130,7 +130,7 @@ This sequence of operations was run:
       Updated storage: { 0xaa ; 0xbb ; 0xcc ; 0xdd ; 0xee ; 0xff }
       Storage size: 290 bytes
       Paid storage size diff: 18 bytes
-      Consumed gas: 1207.932
+      Consumed gas: 1206.580
       Balance updates:
         [CONTRACT_HASH] ... -ꜩ0.0045
         storage fees ........................... +ꜩ0.0045
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_split_string.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_split_string.out
index 22796d4abeed78a99cff168236c1ee58f80278fa..e5695026fdf4813e1fb342a75e4cc4e1e79ccffe 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_split_string.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_split_string.out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract_onchain_opcodes.py::TestContractOnchainOpcodes::test_split_string
 
 Node is bootstrapped.
-Estimated gas: 1470.552 units (will add 100 for safety)
+Estimated gas: 1467.512 units (will add 100 for safety)
 Estimated storage: 511 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -12,13 +12,13 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [CONTRACT_HASH]
-    Fee to the baker: ꜩ0.000643
+    Fee to the baker: ꜩ0.000642
     Expected counter: [EXPECTED_COUNTER]
-    Gas limit: 1571
+    Gas limit: 1568
     Storage limit: 531 bytes
     Balance updates:
-      [CONTRACT_HASH] ... -ꜩ0.000643
-      payload fees(the block proposer) ....... +ꜩ0.000643
+      [CONTRACT_HASH] ... -ꜩ0.000642
+      payload fees(the block proposer) ....... +ꜩ0.000642
     Origination:
       From: [CONTRACT_HASH]
       Credit: ꜩ1000
@@ -55,7 +55,7 @@ This sequence of operations was run:
           [CONTRACT_HASH]
         Storage size: 254 bytes
         Paid storage size diff: 254 bytes
-        Consumed gas: 1470.552
+        Consumed gas: 1467.512
         Balance updates:
           [CONTRACT_HASH] ... -ꜩ0.0635
           storage fees ........................... +ꜩ0.0635
@@ -68,7 +68,7 @@ New contract [CONTRACT_HASH] originated.
 Contract memorized as split_string.
 Injected block at minimal timestamp
 Node is bootstrapped.
-Estimated gas: 2097.907 units (will add 100 for safety)
+Estimated gas: 2153.655 units (will add 100 for safety)
 Estimated storage: 18 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -79,13 +79,13 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [CONTRACT_HASH]
-    Fee to the baker: ꜩ0.000481
+    Fee to the baker: ꜩ0.000487
     Expected counter: [EXPECTED_COUNTER]
-    Gas limit: 2198
+    Gas limit: 2254
     Storage limit: 38 bytes
     Balance updates:
-      [CONTRACT_HASH] ... -ꜩ0.000481
-      payload fees(the block proposer) ....... +ꜩ0.000481
+      [CONTRACT_HASH] ... -ꜩ0.000487
+      payload fees(the block proposer) ....... +ꜩ0.000487
     Transaction:
       Amount: ꜩ0
       From: [CONTRACT_HASH]
@@ -95,7 +95,7 @@ This sequence of operations was run:
       Updated storage: { "a" ; "b" ; "c" }
       Storage size: 272 bytes
       Paid storage size diff: 18 bytes
-      Consumed gas: 2097.907
+      Consumed gas: 2153.655
       Balance updates:
         [CONTRACT_HASH] ... -ꜩ0.0045
         storage fees ........................... +ꜩ0.0045
@@ -103,7 +103,7 @@ This sequence of operations was run:
 Injected block at minimal timestamp
 { "a" ; "b" ; "c" }
 Node is bootstrapped.
-Estimated gas: 1207.976 units (will add 100 for safety)
+Estimated gas: 1206.644 units (will add 100 for safety)
 Estimated storage: 18 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -116,7 +116,7 @@ This sequence of operations was run:
     From: [CONTRACT_HASH]
     Fee to the baker: ꜩ0.000392
     Expected counter: [EXPECTED_COUNTER]
-    Gas limit: 1308
+    Gas limit: 1307
     Storage limit: 38 bytes
     Balance updates:
       [CONTRACT_HASH] ... -ꜩ0.000392
@@ -130,7 +130,7 @@ This sequence of operations was run:
       Updated storage: { "a" ; "b" ; "c" ; "d" ; "e" ; "f" }
       Storage size: 290 bytes
       Paid storage size diff: 18 bytes
-      Consumed gas: 1207.976
+      Consumed gas: 1206.644
       Balance updates:
         [CONTRACT_HASH] ... -ꜩ0.0045
         storage fees ........................... +ꜩ0.0045
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_store_input.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_store_input.out
index 0817c4707c0f93a1a485175773ca2b77641b7377..7a2d10175ba3642330738d90a4e1f171c8027d54 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_store_input.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_store_input.out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract_onchain_opcodes.py::TestContractOnchainOpcodes::test_store_input
 
 Node is bootstrapped.
-Estimated gas: 1420.040 units (will add 0 for safety)
+Estimated gas: 1450.040 units (will add 0 for safety)
 Estimated storage: 257 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -12,19 +12,19 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [CONTRACT_HASH]
-    Fee to the baker: ꜩ0.000396
+    Fee to the baker: ꜩ0.000399
     Expected counter: [EXPECTED_COUNTER]
-    Gas limit: 1421
+    Gas limit: 1451
     Storage limit: 277 bytes
     Balance updates:
-      [CONTRACT_HASH] ... -ꜩ0.000396
-      payload fees(the block proposer) ....... +ꜩ0.000396
+      [CONTRACT_HASH] ... -ꜩ0.000399
+      payload fees(the block proposer) ....... +ꜩ0.000399
     Transaction:
       Amount: ꜩ1000
       From: [CONTRACT_HASH]
       To: [CONTRACT_HASH]
       This transaction was successfully applied
-      Consumed gas: 1420.040
+      Consumed gas: 1450.040
       Balance updates:
         [CONTRACT_HASH] ... -ꜩ1000
         [CONTRACT_HASH] ... +ꜩ1000
@@ -33,7 +33,7 @@ This sequence of operations was run:
 
 Injected block at minimal timestamp
 Node is bootstrapped.
-Estimated gas: 1420.040 units (will add 0 for safety)
+Estimated gas: 1450.040 units (will add 0 for safety)
 Estimated storage: 257 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -44,19 +44,19 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [CONTRACT_HASH]
-    Fee to the baker: ꜩ0.000396
+    Fee to the baker: ꜩ0.000399
     Expected counter: [EXPECTED_COUNTER]
-    Gas limit: 1421
+    Gas limit: 1451
     Storage limit: 277 bytes
     Balance updates:
-      [CONTRACT_HASH] ... -ꜩ0.000396
-      payload fees(the block proposer) ....... +ꜩ0.000396
+      [CONTRACT_HASH] ... -ꜩ0.000399
+      payload fees(the block proposer) ....... +ꜩ0.000399
     Transaction:
       Amount: ꜩ2000
       From: [CONTRACT_HASH]
       To: [CONTRACT_HASH]
       This transaction was successfully applied
-      Consumed gas: 1420.040
+      Consumed gas: 1450.040
       Balance updates:
         [CONTRACT_HASH] ... -ꜩ2000
         [CONTRACT_HASH] ... +ꜩ2000
@@ -67,7 +67,7 @@ Injected block at minimal timestamp
 1000 ꜩ
 2000 ꜩ
 Node is bootstrapped.
-Estimated gas: 1408.666 units (will add 100 for safety)
+Estimated gas: 1408.026 units (will add 100 for safety)
 Estimated storage: 298 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -99,7 +99,7 @@ This sequence of operations was run:
           [CONTRACT_HASH]
         Storage size: 41 bytes
         Paid storage size diff: 41 bytes
-        Consumed gas: 1408.666
+        Consumed gas: 1408.026
         Balance updates:
           [CONTRACT_HASH] ... -ꜩ0.01025
           storage fees ........................... +ꜩ0.01025
@@ -112,7 +112,7 @@ New contract [CONTRACT_HASH] originated.
 Contract memorized as store_input.
 Injected block at minimal timestamp
 Node is bootstrapped.
-Estimated gas: 2050.403 units (will add 100 for safety)
+Estimated gas: 2109.180 units (will add 100 for safety)
 Estimated storage: 7 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -123,13 +123,13 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [CONTRACT_HASH]
-    Fee to the baker: ꜩ0.000484
+    Fee to the baker: ꜩ0.000489
     Expected counter: [EXPECTED_COUNTER]
-    Gas limit: 2151
+    Gas limit: 2210
     Storage limit: 27 bytes
     Balance updates:
-      [CONTRACT_HASH] ... -ꜩ0.000484
-      payload fees(the block proposer) ....... +ꜩ0.000484
+      [CONTRACT_HASH] ... -ꜩ0.000489
+      payload fees(the block proposer) ....... +ꜩ0.000489
     Transaction:
       Amount: ꜩ100
       From: [CONTRACT_HASH]
@@ -139,7 +139,7 @@ This sequence of operations was run:
       Updated storage: "abcdefg"
       Storage size: 48 bytes
       Paid storage size diff: 7 bytes
-      Consumed gas: 2050.403
+      Consumed gas: 2109.180
       Balance updates:
         [CONTRACT_HASH] ... -ꜩ0.00175
         storage fees ........................... +ꜩ0.00175
@@ -150,7 +150,7 @@ Injected block at minimal timestamp
 200 ꜩ
 "abcdefg"
 Node is bootstrapped.
-Estimated gas: 1203.683 units (will add 100 for safety)
+Estimated gas: 1203.100 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -176,7 +176,7 @@ This sequence of operations was run:
       This transaction was successfully applied
       Updated storage: "xyz"
       Storage size: 44 bytes
-      Consumed gas: 1203.683
+      Consumed gas: 1203.100
       Balance updates:
         [CONTRACT_HASH] ... -ꜩ100
         [CONTRACT_HASH] ... +ꜩ100
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_trace_origination[compare_big_type.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_trace_origination[compare_big_type.tz].out
index e8c37879436939abdcf5ee47d88c42fa52b22a50..0683c288fea604f5cda2f35380b4af6bfee63e41 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_trace_origination[compare_big_type.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_trace_origination[compare_big_type.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract_onchain_opcodes.py::TestContractOnchainOpcodes::test_trace_origination[compare_big_type.tz]
 
 Node is bootstrapped.
-Estimated gas: 3432.650 units (will add 100 for safety)
+Estimated gas: 2941.450 units (will add 100 for safety)
 Estimated storage: 385 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -12,13 +12,13 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [CONTRACT_HASH]
-    Fee to the baker: ꜩ0.000713
+    Fee to the baker: ꜩ0.000664
     Expected counter: [EXPECTED_COUNTER]
-    Gas limit: 3533
+    Gas limit: 3042
     Storage limit: 405 bytes
     Balance updates:
-      [CONTRACT_HASH] ... -ꜩ0.000713
-      payload fees(the block proposer) ....... +ꜩ0.000713
+      [CONTRACT_HASH] ... -ꜩ0.000664
+      payload fees(the block proposer) ....... +ꜩ0.000664
     Origination:
       From: [CONTRACT_HASH]
       Credit: ꜩ1000
@@ -78,7 +78,7 @@ This sequence of operations was run:
           [CONTRACT_HASH]
         Storage size: 128 bytes
         Paid storage size diff: 128 bytes
-        Consumed gas: 3432.650
+        Consumed gas: 2941.450
         Balance updates:
           [CONTRACT_HASH] ... -ꜩ0.032
           storage fees ........................... +ꜩ0.032
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_trace_origination[compare_big_type2.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_trace_origination[compare_big_type2.tz].out
index e765a4fc0e4cb49227a3f625b3620e3d01de30df..747165d29e1415115e9cba65d2a33ec4d2d6af33 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_trace_origination[compare_big_type2.tz].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_trace_origination[compare_big_type2.tz].out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract_onchain_opcodes.py::TestContractOnchainOpcodes::test_trace_origination[compare_big_type2.tz]
 
 Node is bootstrapped.
-Estimated gas: 3758.394 units (will add 100 for safety)
+Estimated gas: 3185.434 units (will add 100 for safety)
 Estimated storage: 393 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -12,13 +12,13 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [CONTRACT_HASH]
-    Fee to the baker: ꜩ0.000753
+    Fee to the baker: ꜩ0.000696
     Expected counter: [EXPECTED_COUNTER]
-    Gas limit: 3859
+    Gas limit: 3286
     Storage limit: 413 bytes
     Balance updates:
-      [CONTRACT_HASH] ... -ꜩ0.000753
-      payload fees(the block proposer) ....... +ꜩ0.000753
+      [CONTRACT_HASH] ... -ꜩ0.000696
+      payload fees(the block proposer) ....... +ꜩ0.000696
     Origination:
       From: [CONTRACT_HASH]
       Credit: ꜩ1000
@@ -82,7 +82,7 @@ This sequence of operations was run:
           [CONTRACT_HASH]
         Storage size: 136 bytes
         Paid storage size diff: 136 bytes
-        Consumed gas: 3758.394
+        Consumed gas: 3185.434
         Balance updates:
           [CONTRACT_HASH] ... -ꜩ0.034
           storage fees ........................... +ꜩ0.034
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_transfer_amount.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_transfer_amount.out
index 043d22827a2afd634e73d0a23953682ac8ac7b31..385b35913d48218015232cf9205e484ef6909a8c 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_transfer_amount.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_transfer_amount.out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract_onchain_opcodes.py::TestContractOnchainOpcodes::test_transfer_amount
 
 Node is bootstrapped.
-Estimated gas: 1409.517 units (will add 100 for safety)
+Estimated gas: 1408.877 units (will add 100 for safety)
 Estimated storage: 297 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -14,7 +14,7 @@ This sequence of operations was run:
     From: [CONTRACT_HASH]
     Fee to the baker: ꜩ0.000421
     Expected counter: [EXPECTED_COUNTER]
-    Gas limit: 1510
+    Gas limit: 1509
     Storage limit: 317 bytes
     Balance updates:
       [CONTRACT_HASH] ... -ꜩ0.000421
@@ -33,7 +33,7 @@ This sequence of operations was run:
           [CONTRACT_HASH]
         Storage size: 40 bytes
         Paid storage size diff: 40 bytes
-        Consumed gas: 1409.517
+        Consumed gas: 1408.877
         Balance updates:
           [CONTRACT_HASH] ... -ꜩ0.01
           storage fees ........................... +ꜩ0.01
@@ -46,7 +46,7 @@ New contract [CONTRACT_HASH] originated.
 Contract memorized as transfer_amount.
 Injected block at minimal timestamp
 Node is bootstrapped.
-Estimated gas: 2050.683 units (will add 100 for safety)
+Estimated gas: 2109.455 units (will add 100 for safety)
 Estimated storage: 4 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -57,13 +57,13 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [CONTRACT_HASH]
-    Fee to the baker: ꜩ0.000468
+    Fee to the baker: ꜩ0.000473
     Expected counter: [EXPECTED_COUNTER]
-    Gas limit: 2151
+    Gas limit: 2210
     Storage limit: 24 bytes
     Balance updates:
-      [CONTRACT_HASH] ... -ꜩ0.000468
-      payload fees(the block proposer) ....... +ꜩ0.000468
+      [CONTRACT_HASH] ... -ꜩ0.000473
+      payload fees(the block proposer) ....... +ꜩ0.000473
     Transaction:
       Amount: ꜩ500
       From: [CONTRACT_HASH]
@@ -72,7 +72,7 @@ This sequence of operations was run:
       Updated storage: 500000000
       Storage size: 44 bytes
       Paid storage size diff: 4 bytes
-      Consumed gas: 2050.683
+      Consumed gas: 2109.455
       Balance updates:
         [CONTRACT_HASH] ... -ꜩ0.001
         storage fees ........................... +ꜩ0.001
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_transfer_tokens.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_transfer_tokens.out
index b2eea45973406861f884e6d80685138a4a72df0a..7bd37a521413fd61d96e4bd27c38b7d2bab46c44 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_transfer_tokens.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_transfer_tokens.out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract_onchain_opcodes.py::TestContractOnchainOpcodes::test_transfer_tokens
 
 Node is bootstrapped.
-Estimated gas: 1408.580 units (will add 100 for safety)
+Estimated gas: 1407.940 units (will add 100 for safety)
 Estimated storage: 295 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -14,7 +14,7 @@ This sequence of operations was run:
     From: [CONTRACT_HASH]
     Fee to the baker: ꜩ0.000419
     Expected counter: [EXPECTED_COUNTER]
-    Gas limit: 1509
+    Gas limit: 1508
     Storage limit: 315 bytes
     Balance updates:
       [CONTRACT_HASH] ... -ꜩ0.000419
@@ -31,7 +31,7 @@ This sequence of operations was run:
           [CONTRACT_HASH]
         Storage size: 38 bytes
         Paid storage size diff: 38 bytes
-        Consumed gas: 1408.580
+        Consumed gas: 1407.940
         Balance updates:
           [CONTRACT_HASH] ... -ꜩ0.0095
           storage fees ........................... +ꜩ0.0095
@@ -44,7 +44,7 @@ New contract [CONTRACT_HASH] originated.
 Contract memorized as test_transfer_account1.
 Injected block at minimal timestamp
 Node is bootstrapped.
-Estimated gas: 1408.580 units (will add 100 for safety)
+Estimated gas: 1407.940 units (will add 100 for safety)
 Estimated storage: 295 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -57,7 +57,7 @@ This sequence of operations was run:
     From: [CONTRACT_HASH]
     Fee to the baker: ꜩ0.000419
     Expected counter: [EXPECTED_COUNTER]
-    Gas limit: 1509
+    Gas limit: 1508
     Storage limit: 315 bytes
     Balance updates:
       [CONTRACT_HASH] ... -ꜩ0.000419
@@ -74,7 +74,7 @@ This sequence of operations was run:
           [CONTRACT_HASH]
         Storage size: 38 bytes
         Paid storage size diff: 38 bytes
-        Consumed gas: 1408.580
+        Consumed gas: 1407.940
         Balance updates:
           [CONTRACT_HASH] ... -ꜩ0.0095
           storage fees ........................... +ꜩ0.0095
@@ -87,7 +87,7 @@ New contract [CONTRACT_HASH] originated.
 Contract memorized as test_transfer_account2.
 Injected block at minimal timestamp
 Node is bootstrapped.
-Estimated gas: 1418.057 units (will add 100 for safety)
+Estimated gas: 1417.097 units (will add 100 for safety)
 Estimated storage: 323 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -100,7 +100,7 @@ This sequence of operations was run:
     From: [CONTRACT_HASH]
     Fee to the baker: ꜩ0.000449
     Expected counter: [EXPECTED_COUNTER]
-    Gas limit: 1519
+    Gas limit: 1518
     Storage limit: 343 bytes
     Balance updates:
       [CONTRACT_HASH] ... -ꜩ0.000449
@@ -127,7 +127,7 @@ This sequence of operations was run:
           [CONTRACT_HASH]
         Storage size: 66 bytes
         Paid storage size diff: 66 bytes
-        Consumed gas: 1418.057
+        Consumed gas: 1417.097
         Balance updates:
           [CONTRACT_HASH] ... -ꜩ0.0165
           storage fees ........................... +ꜩ0.0165
@@ -143,7 +143,7 @@ Injected block at minimal timestamp
 [CONTRACT_HASH]
 
 Node is bootstrapped.
-Estimated gas: 5180.056 units (will add 100 for safety)
+Estimated gas: 4683.067 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -154,13 +154,13 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [CONTRACT_HASH]
-    Fee to the baker: ꜩ0.000826
+    Fee to the baker: ꜩ0.000776
     Expected counter: [EXPECTED_COUNTER]
-    Gas limit: 5281
+    Gas limit: 4784
     Storage limit: 0 bytes
     Balance updates:
-      [CONTRACT_HASH] ... -ꜩ0.000826
-      payload fees(the block proposer) ....... +ꜩ0.000826
+      [CONTRACT_HASH] ... -ꜩ0.000776
+      payload fees(the block proposer) ....... +ꜩ0.000776
     Transaction:
       Amount: ꜩ100
       From: [CONTRACT_HASH]
@@ -169,7 +169,7 @@ This sequence of operations was run:
       This transaction was successfully applied
       Updated storage: Unit
       Storage size: 66 bytes
-      Consumed gas: 3976.511
+      Consumed gas: 3480.265
       Balance updates:
         [CONTRACT_HASH] ... -ꜩ100
         [CONTRACT_HASH] ... +ꜩ100
@@ -181,7 +181,7 @@ This sequence of operations was run:
         This transaction was successfully applied
         Updated storage: Unit
         Storage size: 38 bytes
-        Consumed gas: 1203.545
+        Consumed gas: 1202.802
         Balance updates:
           [CONTRACT_HASH] ... -ꜩ100
           [CONTRACT_HASH] ... +ꜩ100
@@ -191,7 +191,7 @@ Injected block at minimal timestamp
 [CONTRACT_HASH]
 
 Node is bootstrapped.
-Estimated gas: 4327.029 units (will add 100 for safety)
+Estimated gas: 3771 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -202,13 +202,13 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [CONTRACT_HASH]
-    Fee to the baker: ꜩ0.00074
+    Fee to the baker: ꜩ0.000685
     Expected counter: [EXPECTED_COUNTER]
-    Gas limit: 4428
+    Gas limit: 3871
     Storage limit: 0 bytes
     Balance updates:
-      [CONTRACT_HASH] ... -ꜩ0.00074
-      payload fees(the block proposer) ....... +ꜩ0.00074
+      [CONTRACT_HASH] ... -ꜩ0.000685
+      payload fees(the block proposer) ....... +ꜩ0.000685
     Transaction:
       Amount: ꜩ100
       From: [CONTRACT_HASH]
@@ -217,7 +217,7 @@ This sequence of operations was run:
       This transaction was successfully applied
       Updated storage: Unit
       Storage size: 66 bytes
-      Consumed gas: 3123.484
+      Consumed gas: 2568.198
       Balance updates:
         [CONTRACT_HASH] ... -ꜩ100
         [CONTRACT_HASH] ... +ꜩ100
@@ -229,7 +229,7 @@ This sequence of operations was run:
         This transaction was successfully applied
         Updated storage: Unit
         Storage size: 38 bytes
-        Consumed gas: 1203.545
+        Consumed gas: 1202.802
         Balance updates:
           [CONTRACT_HASH] ... -ꜩ100
           [CONTRACT_HASH] ... +ꜩ100
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair (Some 4) {})-\"hello\"-(Pa.f6092ac5d6.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair (Some 4) {})-\"hello\"-(Pa.f6092ac5d6.out"
index 9e2845af8188a7dfc3ceabaceb27931d52a4d7f8..ac75a966e31cad203b14e9109a3b855c9ec2ca71 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair (Some 4) {})-\"hello\"-(Pa.f6092ac5d6.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair (Some 4) {})-\"hello\"-(Pa.f6092ac5d6.out"	
@@ -8,28 +8,28 @@ big_map diff
   New map(4) of type (big_map string nat)
   Set map(4)["hello"] to 4
 trace
-  - location: 13 (remaining gas: 1039989.301 units remaining)
+  - location: 13 (remaining gas: 1039991.061 units remaining)
     [ (Pair "hello" (Some 4) {}) ]
-  - location: 13 (remaining gas: 1039989.291 units remaining)
+  - location: 13 (remaining gas: 1039991.051 units remaining)
     [ "hello"
       (Pair (Some 4) {}) ]
-  - location: 14 (remaining gas: 1039989.276 units remaining)
+  - location: 14 (remaining gas: 1039991.041 units remaining)
     [ (Pair (Some 4) {}) ]
-  - location: 16 (remaining gas: 1039989.266 units remaining)
+  - location: 16 (remaining gas: 1039991.031 units remaining)
     [ (Some 4)
       {} ]
-  - location: 14 (remaining gas: 1039989.236 units remaining)
+  - location: 14 (remaining gas: 1039991.011 units remaining)
     [ "hello"
       (Some 4)
       {} ]
-  - location: 17 (remaining gas: 1039988.164 units remaining)
+  - location: 17 (remaining gas: 1039989.999 units remaining)
     [ None
       { Elt "hello" 4 } ]
-  - location: 18 (remaining gas: 1039988.149 units remaining)
+  - location: 18 (remaining gas: 1039989.989 units remaining)
     [ (Pair None { Elt "hello" 4 }) ]
-  - location: 19 (remaining gas: 1039988.134 units remaining)
+  - location: 19 (remaining gas: 1039989.979 units remaining)
     [ {}
       (Pair None { Elt "hello" 4 }) ]
-  - location: 21 (remaining gas: 1039988.119 units remaining)
+  - location: 21 (remaining gas: 1039989.969 units remaining)
     [ (Pair {} None { Elt "hello" 4 }) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair (Some 5) { Elt \"hello\" 4.0427752f13.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair (Some 5) { Elt \"hello\" 4.0427752f13.out"
index c7a99e26f27f99c677fe14fd7d135749b6309193..315ee35f2c6beb249388a910fb94ba27df980684 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair (Some 5) { Elt \"hello\" 4.0427752f13.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair (Some 5) { Elt \"hello\" 4.0427752f13.out"	
@@ -8,28 +8,28 @@ big_map diff
   New map(4) of type (big_map string nat)
   Set map(4)["hello"] to 5
 trace
-  - location: 13 (remaining gas: 1039987.971 units remaining)
+  - location: 13 (remaining gas: 1039989.806 units remaining)
     [ (Pair "hello" (Some 5) { Elt "hello" 4 }) ]
-  - location: 13 (remaining gas: 1039987.961 units remaining)
+  - location: 13 (remaining gas: 1039989.796 units remaining)
     [ "hello"
       (Pair (Some 5) { Elt "hello" 4 }) ]
-  - location: 14 (remaining gas: 1039987.946 units remaining)
+  - location: 14 (remaining gas: 1039989.786 units remaining)
     [ (Pair (Some 5) { Elt "hello" 4 }) ]
-  - location: 16 (remaining gas: 1039987.936 units remaining)
+  - location: 16 (remaining gas: 1039989.776 units remaining)
     [ (Some 5)
       { Elt "hello" 4 } ]
-  - location: 14 (remaining gas: 1039987.906 units remaining)
+  - location: 14 (remaining gas: 1039989.756 units remaining)
     [ "hello"
       (Some 5)
       { Elt "hello" 4 } ]
-  - location: 17 (remaining gas: 1039986.829 units remaining)
+  - location: 17 (remaining gas: 1039988.739 units remaining)
     [ (Some 4)
       { Elt "hello" 5 } ]
-  - location: 18 (remaining gas: 1039986.814 units remaining)
+  - location: 18 (remaining gas: 1039988.729 units remaining)
     [ (Pair (Some 4) { Elt "hello" 5 }) ]
-  - location: 19 (remaining gas: 1039986.799 units remaining)
+  - location: 19 (remaining gas: 1039988.719 units remaining)
     [ {}
       (Pair (Some 4) { Elt "hello" 5 }) ]
-  - location: 21 (remaining gas: 1039986.784 units remaining)
+  - location: 21 (remaining gas: 1039988.709 units remaining)
     [ (Pair {} (Some 4) { Elt "hello" 5 }) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair (Some 5) { Elt \"hello\" 4.0793dc66d5.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair (Some 5) { Elt \"hello\" 4.0793dc66d5.out"
index d095614c895585132a6f11ab57ca14b935ae57ec..deb659fe63db5c7b81dc5142ca3582c35eb732ae 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair (Some 5) { Elt \"hello\" 4.0793dc66d5.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair (Some 5) { Elt \"hello\" 4.0793dc66d5.out"	
@@ -9,28 +9,28 @@ big_map diff
   Set map(4)["hello"] to 4
   Set map(4)["hi"] to 5
 trace
-  - location: 13 (remaining gas: 1039988.001 units remaining)
+  - location: 13 (remaining gas: 1039989.836 units remaining)
     [ (Pair "hi" (Some 5) { Elt "hello" 4 }) ]
-  - location: 13 (remaining gas: 1039987.991 units remaining)
+  - location: 13 (remaining gas: 1039989.826 units remaining)
     [ "hi"
       (Pair (Some 5) { Elt "hello" 4 }) ]
-  - location: 14 (remaining gas: 1039987.976 units remaining)
+  - location: 14 (remaining gas: 1039989.816 units remaining)
     [ (Pair (Some 5) { Elt "hello" 4 }) ]
-  - location: 16 (remaining gas: 1039987.966 units remaining)
+  - location: 16 (remaining gas: 1039989.806 units remaining)
     [ (Some 5)
       { Elt "hello" 4 } ]
-  - location: 14 (remaining gas: 1039987.936 units remaining)
+  - location: 14 (remaining gas: 1039989.786 units remaining)
     [ "hi"
       (Some 5)
       { Elt "hello" 4 } ]
-  - location: 17 (remaining gas: 1039986.961 units remaining)
+  - location: 17 (remaining gas: 1039988.871 units remaining)
     [ None
       { Elt "hello" 4 ; Elt "hi" 5 } ]
-  - location: 18 (remaining gas: 1039986.946 units remaining)
+  - location: 18 (remaining gas: 1039988.861 units remaining)
     [ (Pair None { Elt "hello" 4 ; Elt "hi" 5 }) ]
-  - location: 19 (remaining gas: 1039986.931 units remaining)
+  - location: 19 (remaining gas: 1039988.851 units remaining)
     [ {}
       (Pair None { Elt "hello" 4 ; Elt "hi" 5 }) ]
-  - location: 21 (remaining gas: 1039986.916 units remaining)
+  - location: 21 (remaining gas: 1039988.841 units remaining)
     [ (Pair {} None { Elt "hello" 4 ; Elt "hi" 5 }) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair None { Elt \"1\" 1 ;      .df114499b8.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair None { Elt \"1\" 1 ;      .df114499b8.out"
index 4a9ba0552616082f922889b0c6045d4f671515b6..ee85ace23d21072baea8dc17bd24a84563d22aa1 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair None { Elt \"1\" 1 ;      .df114499b8.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair None { Elt \"1\" 1 ;      .df114499b8.out"	
@@ -9,28 +9,28 @@ big_map diff
   Set map(4)["2"] to 2
   Unset map(4)["1"]
 trace
-  - location: 13 (remaining gas: 1039987.097 units remaining)
+  - location: 13 (remaining gas: 1039989.007 units remaining)
     [ (Pair "1" None { Elt "1" 1 ; Elt "2" 2 }) ]
-  - location: 13 (remaining gas: 1039987.087 units remaining)
+  - location: 13 (remaining gas: 1039988.997 units remaining)
     [ "1"
       (Pair None { Elt "1" 1 ; Elt "2" 2 }) ]
-  - location: 14 (remaining gas: 1039987.072 units remaining)
+  - location: 14 (remaining gas: 1039988.987 units remaining)
     [ (Pair None { Elt "1" 1 ; Elt "2" 2 }) ]
-  - location: 16 (remaining gas: 1039987.062 units remaining)
+  - location: 16 (remaining gas: 1039988.977 units remaining)
     [ None
       { Elt "1" 1 ; Elt "2" 2 } ]
-  - location: 14 (remaining gas: 1039987.032 units remaining)
+  - location: 14 (remaining gas: 1039988.957 units remaining)
     [ "1"
       None
       { Elt "1" 1 ; Elt "2" 2 } ]
-  - location: 17 (remaining gas: 1039986.088 units remaining)
+  - location: 17 (remaining gas: 1039988.073 units remaining)
     [ (Some 1)
       { Elt "2" 2 } ]
-  - location: 18 (remaining gas: 1039986.073 units remaining)
+  - location: 18 (remaining gas: 1039988.063 units remaining)
     [ (Pair (Some 1) { Elt "2" 2 }) ]
-  - location: 19 (remaining gas: 1039986.058 units remaining)
+  - location: 19 (remaining gas: 1039988.053 units remaining)
     [ {}
       (Pair (Some 1) { Elt "2" 2 }) ]
-  - location: 21 (remaining gas: 1039986.043 units remaining)
+  - location: 21 (remaining gas: 1039988.043 units remaining)
     [ (Pair {} (Some 1) { Elt "2" 2 }) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair None { Elt \"1\" 1 ;      .f9bea98de9.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair None { Elt \"1\" 1 ;      .f9bea98de9.out"
index 54e3dc84725a1d62b61b96980c8295d0ccbc647f..e7900ae5fe67fb1874c576e621fc70e8289d6471 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair None { Elt \"1\" 1 ;      .f9bea98de9.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair None { Elt \"1\" 1 ;      .f9bea98de9.out"	
@@ -9,28 +9,28 @@ big_map diff
   Set map(4)["2"] to 2
   Unset map(4)["1"]
 trace
-  - location: 13 (remaining gas: 1039987.097 units remaining)
+  - location: 13 (remaining gas: 1039989.007 units remaining)
     [ (Pair "1" None { Elt "1" 1 ; Elt "2" 2 }) ]
-  - location: 13 (remaining gas: 1039987.087 units remaining)
+  - location: 13 (remaining gas: 1039988.997 units remaining)
     [ "1"
       (Pair None { Elt "1" 1 ; Elt "2" 2 }) ]
-  - location: 14 (remaining gas: 1039987.072 units remaining)
+  - location: 14 (remaining gas: 1039988.987 units remaining)
     [ (Pair None { Elt "1" 1 ; Elt "2" 2 }) ]
-  - location: 16 (remaining gas: 1039987.062 units remaining)
+  - location: 16 (remaining gas: 1039988.977 units remaining)
     [ None
       { Elt "1" 1 ; Elt "2" 2 } ]
-  - location: 14 (remaining gas: 1039987.032 units remaining)
+  - location: 14 (remaining gas: 1039988.957 units remaining)
     [ "1"
       None
       { Elt "1" 1 ; Elt "2" 2 } ]
-  - location: 17 (remaining gas: 1039986.088 units remaining)
+  - location: 17 (remaining gas: 1039988.073 units remaining)
     [ (Some 1)
       { Elt "2" 2 } ]
-  - location: 18 (remaining gas: 1039986.073 units remaining)
+  - location: 18 (remaining gas: 1039988.063 units remaining)
     [ (Pair (Some 1) { Elt "2" 2 }) ]
-  - location: 19 (remaining gas: 1039986.058 units remaining)
+  - location: 19 (remaining gas: 1039988.053 units remaining)
     [ {}
       (Pair (Some 1) { Elt "2" 2 }) ]
-  - location: 21 (remaining gas: 1039986.043 units remaining)
+  - location: 21 (remaining gas: 1039988.043 units remaining)
     [ (Pair {} (Some 1) { Elt "2" 2 }) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair None { Elt \"hello\" 4 })-.1db12cd837.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair None { Elt \"hello\" 4 })-.1db12cd837.out"
index 9d037082277a583d99a91ba36d603403039b7b93..d08a580ce17e8747823ad291d44a20ff1baba095 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair None { Elt \"hello\" 4 })-.1db12cd837.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair None { Elt \"hello\" 4 })-.1db12cd837.out"	
@@ -8,28 +8,28 @@ big_map diff
   New map(4) of type (big_map string nat)
   Unset map(4)["hello"]
 trace
-  - location: 13 (remaining gas: 1039988.071 units remaining)
+  - location: 13 (remaining gas: 1039989.906 units remaining)
     [ (Pair "hello" None { Elt "hello" 4 }) ]
-  - location: 13 (remaining gas: 1039988.061 units remaining)
+  - location: 13 (remaining gas: 1039989.896 units remaining)
     [ "hello"
       (Pair None { Elt "hello" 4 }) ]
-  - location: 14 (remaining gas: 1039988.046 units remaining)
+  - location: 14 (remaining gas: 1039989.886 units remaining)
     [ (Pair None { Elt "hello" 4 }) ]
-  - location: 16 (remaining gas: 1039988.036 units remaining)
+  - location: 16 (remaining gas: 1039989.876 units remaining)
     [ None
       { Elt "hello" 4 } ]
-  - location: 14 (remaining gas: 1039988.006 units remaining)
+  - location: 14 (remaining gas: 1039989.856 units remaining)
     [ "hello"
       None
       { Elt "hello" 4 } ]
-  - location: 17 (remaining gas: 1039986.929 units remaining)
+  - location: 17 (remaining gas: 1039988.839 units remaining)
     [ (Some 4)
       {} ]
-  - location: 18 (remaining gas: 1039986.914 units remaining)
+  - location: 18 (remaining gas: 1039988.829 units remaining)
     [ (Pair (Some 4) {}) ]
-  - location: 19 (remaining gas: 1039986.899 units remaining)
+  - location: 19 (remaining gas: 1039988.819 units remaining)
     [ {}
       (Pair (Some 4) {}) ]
-  - location: 21 (remaining gas: 1039986.884 units remaining)
+  - location: 21 (remaining gas: 1039988.809 units remaining)
     [ (Pair {} (Some 4) {}) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair None {})-\"hello\"-(Pair N.6fc7d0acf2.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair None {})-\"hello\"-(Pair N.6fc7d0acf2.out"
index b249e93802a6651d99ed452e67f64a6d1e1cb492..7fe676facfadd6754df1e45ee0b67f03dcb5d597 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair None {})-\"hello\"-(Pair N.6fc7d0acf2.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_and_update_big_map.tz-(Pair None {})-\"hello\"-(Pair N.6fc7d0acf2.out"	
@@ -8,28 +8,28 @@ big_map diff
   New map(4) of type (big_map string nat)
   Unset map(4)["hello"]
 trace
-  - location: 13 (remaining gas: 1039989.401 units remaining)
+  - location: 13 (remaining gas: 1039991.161 units remaining)
     [ (Pair "hello" None {}) ]
-  - location: 13 (remaining gas: 1039989.391 units remaining)
+  - location: 13 (remaining gas: 1039991.151 units remaining)
     [ "hello"
       (Pair None {}) ]
-  - location: 14 (remaining gas: 1039989.376 units remaining)
+  - location: 14 (remaining gas: 1039991.141 units remaining)
     [ (Pair None {}) ]
-  - location: 16 (remaining gas: 1039989.366 units remaining)
+  - location: 16 (remaining gas: 1039991.131 units remaining)
     [ None
       {} ]
-  - location: 14 (remaining gas: 1039989.336 units remaining)
+  - location: 14 (remaining gas: 1039991.111 units remaining)
     [ "hello"
       None
       {} ]
-  - location: 17 (remaining gas: 1039988.264 units remaining)
+  - location: 17 (remaining gas: 1039990.099 units remaining)
     [ None
       {} ]
-  - location: 18 (remaining gas: 1039988.249 units remaining)
+  - location: 18 (remaining gas: 1039990.089 units remaining)
     [ (Pair None {}) ]
-  - location: 19 (remaining gas: 1039988.234 units remaining)
+  - location: 19 (remaining gas: 1039990.079 units remaining)
     [ {}
       (Pair None {}) ]
-  - location: 21 (remaining gas: 1039988.219 units remaining)
+  - location: 21 (remaining gas: 1039990.069 units remaining)
     [ (Pair {} None {}) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_big_map_value.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"tw.524c5459f8.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_big_map_value.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"tw.524c5459f8.out"
index e4c9221c2cf9ae6fadfb3ecb6376354507e73332..a6acff3544b0535840d95c8e27c5d6e8cf7c3fd0 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_big_map_value.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"tw.524c5459f8.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_big_map_value.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"tw.524c5459f8.out"	
@@ -9,38 +9,38 @@ big_map diff
   Set map(4)["2"] to "two"
   Set map(4)["1"] to "one"
 trace
-  - location: 12 (remaining gas: 1039983.918 units remaining)
+  - location: 12 (remaining gas: 1039985.668 units remaining)
     [ (Pair "1" { Elt "1" "one" ; Elt "2" "two" } None) ]
-  - location: 12 (remaining gas: 1039983.908 units remaining)
+  - location: 12 (remaining gas: 1039985.658 units remaining)
     [ (Pair "1" { Elt "1" "one" ; Elt "2" "two" } None)
       (Pair "1" { Elt "1" "one" ; Elt "2" "two" } None) ]
-  - location: 13 (remaining gas: 1039983.898 units remaining)
+  - location: 13 (remaining gas: 1039985.648 units remaining)
     [ "1"
       (Pair "1" { Elt "1" "one" ; Elt "2" "two" } None) ]
-  - location: 14 (remaining gas: 1039983.883 units remaining)
+  - location: 14 (remaining gas: 1039985.638 units remaining)
     [ (Pair "1" { Elt "1" "one" ; Elt "2" "two" } None) ]
-  - location: 17 (remaining gas: 1039983.873 units remaining)
+  - location: 17 (remaining gas: 1039985.628 units remaining)
     [ (Pair { Elt "1" "one" ; Elt "2" "two" } None) ]
-  - location: 18 (remaining gas: 1039983.863 units remaining)
+  - location: 18 (remaining gas: 1039985.618 units remaining)
     [ { Elt "1" "one" ; Elt "2" "two" } ]
-  - location: 19 (remaining gas: 1039983.853 units remaining)
+  - location: 19 (remaining gas: 1039985.608 units remaining)
     [ { Elt "1" "one" ; Elt "2" "two" }
       { Elt "1" "one" ; Elt "2" "two" } ]
-  - location: 14 (remaining gas: 1039983.823 units remaining)
+  - location: 14 (remaining gas: 1039985.588 units remaining)
     [ "1"
       { Elt "1" "one" ; Elt "2" "two" }
       { Elt "1" "one" ; Elt "2" "two" } ]
-  - location: 20 (remaining gas: 1039982.913 units remaining)
+  - location: 20 (remaining gas: 1039984.743 units remaining)
     [ (Some "one")
       { Elt "1" "one" ; Elt "2" "two" } ]
-  - location: 21 (remaining gas: 1039982.903 units remaining)
+  - location: 21 (remaining gas: 1039984.733 units remaining)
     [ { Elt "1" "one" ; Elt "2" "two" }
       (Some "one") ]
-  - location: 22 (remaining gas: 1039982.888 units remaining)
+  - location: 22 (remaining gas: 1039984.723 units remaining)
     [ (Pair { Elt "1" "one" ; Elt "2" "two" } (Some "one")) ]
-  - location: 23 (remaining gas: 1039982.873 units remaining)
+  - location: 23 (remaining gas: 1039984.713 units remaining)
     [ {}
       (Pair { Elt "1" "one" ; Elt "2" "two" } (Some "one")) ]
-  - location: 25 (remaining gas: 1039982.858 units remaining)
+  - location: 25 (remaining gas: 1039984.703 units remaining)
     [ (Pair {} { Elt "1" "one" ; Elt "2" "two" } (Some "one")) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_big_map_value.tz-(Pair { Elt \"hello\" \"hi\" } None)-\"\".33eba403e7.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_big_map_value.tz-(Pair { Elt \"hello\" \"hi\" } None)-\"\".33eba403e7.out"
index bc3b211a17b46775fd4a7fb5b8e3a8e9cf1916e2..cffca6fd5fdd0e3ab3c0447aa314cb4279a95909 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_big_map_value.tz-(Pair { Elt \"hello\" \"hi\" } None)-\"\".33eba403e7.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_big_map_value.tz-(Pair { Elt \"hello\" \"hi\" } None)-\"\".33eba403e7.out"	
@@ -8,38 +8,38 @@ big_map diff
   New map(4) of type (big_map string string)
   Set map(4)["hello"] to "hi"
 trace
-  - location: 12 (remaining gas: 1039984.996 units remaining)
+  - location: 12 (remaining gas: 1039986.671 units remaining)
     [ (Pair "" { Elt "hello" "hi" } None) ]
-  - location: 12 (remaining gas: 1039984.986 units remaining)
+  - location: 12 (remaining gas: 1039986.661 units remaining)
     [ (Pair "" { Elt "hello" "hi" } None)
       (Pair "" { Elt "hello" "hi" } None) ]
-  - location: 13 (remaining gas: 1039984.976 units remaining)
+  - location: 13 (remaining gas: 1039986.651 units remaining)
     [ ""
       (Pair "" { Elt "hello" "hi" } None) ]
-  - location: 14 (remaining gas: 1039984.961 units remaining)
+  - location: 14 (remaining gas: 1039986.641 units remaining)
     [ (Pair "" { Elt "hello" "hi" } None) ]
-  - location: 17 (remaining gas: 1039984.951 units remaining)
+  - location: 17 (remaining gas: 1039986.631 units remaining)
     [ (Pair { Elt "hello" "hi" } None) ]
-  - location: 18 (remaining gas: 1039984.941 units remaining)
+  - location: 18 (remaining gas: 1039986.621 units remaining)
     [ { Elt "hello" "hi" } ]
-  - location: 19 (remaining gas: 1039984.931 units remaining)
+  - location: 19 (remaining gas: 1039986.611 units remaining)
     [ { Elt "hello" "hi" }
       { Elt "hello" "hi" } ]
-  - location: 14 (remaining gas: 1039984.901 units remaining)
+  - location: 14 (remaining gas: 1039986.591 units remaining)
     [ ""
       { Elt "hello" "hi" }
       { Elt "hello" "hi" } ]
-  - location: 20 (remaining gas: 1039984.026 units remaining)
+  - location: 20 (remaining gas: 1039985.781 units remaining)
     [ None
       { Elt "hello" "hi" } ]
-  - location: 21 (remaining gas: 1039984.016 units remaining)
+  - location: 21 (remaining gas: 1039985.771 units remaining)
     [ { Elt "hello" "hi" }
       None ]
-  - location: 22 (remaining gas: 1039984.001 units remaining)
+  - location: 22 (remaining gas: 1039985.761 units remaining)
     [ (Pair { Elt "hello" "hi" } None) ]
-  - location: 23 (remaining gas: 1039983.986 units remaining)
+  - location: 23 (remaining gas: 1039985.751 units remaining)
     [ {}
       (Pair { Elt "hello" "hi" } None) ]
-  - location: 25 (remaining gas: 1039983.971 units remaining)
+  - location: 25 (remaining gas: 1039985.741 units remaining)
     [ (Pair {} { Elt "hello" "hi" } None) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_big_map_value.tz-(Pair { Elt \"hello\" \"hi\" } None)-\"h.a5cd1005c9.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_big_map_value.tz-(Pair { Elt \"hello\" \"hi\" } None)-\"h.a5cd1005c9.out"
index dbe7153b136bb411696ae4e3072f8716b863afc1..3f59079f9b9f2b7c9b50b7ba8e7f235e403bb6fa 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_big_map_value.tz-(Pair { Elt \"hello\" \"hi\" } None)-\"h.a5cd1005c9.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[get_big_map_value.tz-(Pair { Elt \"hello\" \"hi\" } None)-\"h.a5cd1005c9.out"	
@@ -8,38 +8,38 @@ big_map diff
   New map(4) of type (big_map string string)
   Set map(4)["hello"] to "hi"
 trace
-  - location: 12 (remaining gas: 1039984.946 units remaining)
+  - location: 12 (remaining gas: 1039986.621 units remaining)
     [ (Pair "hello" { Elt "hello" "hi" } None) ]
-  - location: 12 (remaining gas: 1039984.936 units remaining)
+  - location: 12 (remaining gas: 1039986.611 units remaining)
     [ (Pair "hello" { Elt "hello" "hi" } None)
       (Pair "hello" { Elt "hello" "hi" } None) ]
-  - location: 13 (remaining gas: 1039984.926 units remaining)
+  - location: 13 (remaining gas: 1039986.601 units remaining)
     [ "hello"
       (Pair "hello" { Elt "hello" "hi" } None) ]
-  - location: 14 (remaining gas: 1039984.911 units remaining)
+  - location: 14 (remaining gas: 1039986.591 units remaining)
     [ (Pair "hello" { Elt "hello" "hi" } None) ]
-  - location: 17 (remaining gas: 1039984.901 units remaining)
+  - location: 17 (remaining gas: 1039986.581 units remaining)
     [ (Pair { Elt "hello" "hi" } None) ]
-  - location: 18 (remaining gas: 1039984.891 units remaining)
+  - location: 18 (remaining gas: 1039986.571 units remaining)
     [ { Elt "hello" "hi" } ]
-  - location: 19 (remaining gas: 1039984.881 units remaining)
+  - location: 19 (remaining gas: 1039986.561 units remaining)
     [ { Elt "hello" "hi" }
       { Elt "hello" "hi" } ]
-  - location: 14 (remaining gas: 1039984.851 units remaining)
+  - location: 14 (remaining gas: 1039986.541 units remaining)
     [ "hello"
       { Elt "hello" "hi" }
       { Elt "hello" "hi" } ]
-  - location: 20 (remaining gas: 1039983.805 units remaining)
+  - location: 20 (remaining gas: 1039985.560 units remaining)
     [ (Some "hi")
       { Elt "hello" "hi" } ]
-  - location: 21 (remaining gas: 1039983.795 units remaining)
+  - location: 21 (remaining gas: 1039985.550 units remaining)
     [ { Elt "hello" "hi" }
       (Some "hi") ]
-  - location: 22 (remaining gas: 1039983.780 units remaining)
+  - location: 22 (remaining gas: 1039985.540 units remaining)
     [ (Pair { Elt "hello" "hi" } (Some "hi")) ]
-  - location: 23 (remaining gas: 1039983.765 units remaining)
+  - location: 23 (remaining gas: 1039985.530 units remaining)
     [ {}
       (Pair { Elt "hello" "hi" } (Some "hi")) ]
-  - location: 25 (remaining gas: 1039983.750 units remaining)
+  - location: 25 (remaining gas: 1039985.520 units remaining)
     [ (Pair {} { Elt "hello" "hi" } (Some "hi")) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .6f3d35b151.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .6f3d35b151.out"
index f8bd33517d9b4c6927f541c5dc91e808ec17e106..acb986bfd981826df9392392115c79ec6d77cdd1 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .6f3d35b151.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .6f3d35b151.out"	
@@ -9,28 +9,28 @@ big_map diff
   Set map(4)["2"] to "two"
   Set map(4)["1"] to "one"
 trace
-  - location: 15 (remaining gas: 1039984.604 units remaining)
+  - location: 15 (remaining gas: 1039986.994 units remaining)
     [ (Pair {} { Elt "1" "one" ; Elt "2" "two" } Unit) ]
-  - location: 15 (remaining gas: 1039984.594 units remaining)
+  - location: 15 (remaining gas: 1039986.984 units remaining)
     [ {}
       (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ]
-  - location: 16 (remaining gas: 1039984.579 units remaining)
+  - location: 16 (remaining gas: 1039986.974 units remaining)
     [ (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ]
-  - location: 18 (remaining gas: 1039984.569 units remaining)
+  - location: 18 (remaining gas: 1039986.964 units remaining)
     [ { Elt "1" "one" ; Elt "2" "two" }
       Unit ]
-  - location: 16 (remaining gas: 1039984.539 units remaining)
+  - location: 16 (remaining gas: 1039986.944 units remaining)
     [ {}
       { Elt "1" "one" ; Elt "2" "two" }
       Unit ]
-  - location: 19 (remaining gas: 1039984.539 units remaining)
+  - location: 19 (remaining gas: 1039986.944 units remaining)
     [ { Elt "1" "one" ; Elt "2" "two" }
       Unit ]
-  - location: 23 (remaining gas: 1039984.524 units remaining)
+  - location: 23 (remaining gas: 1039986.934 units remaining)
     [ (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ]
-  - location: 24 (remaining gas: 1039984.509 units remaining)
+  - location: 24 (remaining gas: 1039986.924 units remaining)
     [ {}
       (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ]
-  - location: 26 (remaining gas: 1039984.494 units remaining)
+  - location: 26 (remaining gas: 1039986.914 units remaining)
     [ (Pair {} { Elt "1" "one" ; Elt "2" "two" } Unit) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .76aeaa0706.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .76aeaa0706.out"
index 66568e6183e3cfc5432dbe312600aefc091915a8..662c333fdd43e4c3aba02b7c1676ba4521cd39d5 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .76aeaa0706.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .76aeaa0706.out"	
@@ -9,40 +9,40 @@ big_map diff
   Set map(4)["2"] to "two"
   Set map(4)["1"] to "two"
 trace
-  - location: 15 (remaining gas: 1039984.154 units remaining)
+  - location: 15 (remaining gas: 1039986.544 units remaining)
     [ (Pair { Elt "1" (Some "two") } { Elt "1" "one" ; Elt "2" "two" } Unit) ]
-  - location: 15 (remaining gas: 1039984.144 units remaining)
+  - location: 15 (remaining gas: 1039986.534 units remaining)
     [ { Elt "1" (Some "two") }
       (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ]
-  - location: 16 (remaining gas: 1039984.129 units remaining)
+  - location: 16 (remaining gas: 1039986.524 units remaining)
     [ (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ]
-  - location: 18 (remaining gas: 1039984.119 units remaining)
+  - location: 18 (remaining gas: 1039986.514 units remaining)
     [ { Elt "1" "one" ; Elt "2" "two" }
       Unit ]
-  - location: 16 (remaining gas: 1039984.089 units remaining)
+  - location: 16 (remaining gas: 1039986.494 units remaining)
     [ { Elt "1" (Some "two") }
       { Elt "1" "one" ; Elt "2" "two" }
       Unit ]
-  - location: 19 (remaining gas: 1039984.089 units remaining)
+  - location: 19 (remaining gas: 1039986.494 units remaining)
     [ (Pair "1" (Some "two"))
       { Elt "1" "one" ; Elt "2" "two" }
       Unit ]
-  - location: 21 (remaining gas: 1039984.079 units remaining)
+  - location: 21 (remaining gas: 1039986.484 units remaining)
     [ "1"
       (Some "two")
       { Elt "1" "one" ; Elt "2" "two" }
       Unit ]
-  - location: 22 (remaining gas: 1039983.144 units remaining)
+  - location: 22 (remaining gas: 1039985.624 units remaining)
     [ { Elt "1" "two" ; Elt "2" "two" }
       Unit ]
-  - location: 19 (remaining gas: 1039983.129 units remaining)
+  - location: 19 (remaining gas: 1039985.614 units remaining)
     [ { Elt "1" "two" ; Elt "2" "two" }
       Unit ]
-  - location: 23 (remaining gas: 1039983.114 units remaining)
+  - location: 23 (remaining gas: 1039985.604 units remaining)
     [ (Pair { Elt "1" "two" ; Elt "2" "two" } Unit) ]
-  - location: 24 (remaining gas: 1039983.099 units remaining)
+  - location: 24 (remaining gas: 1039985.594 units remaining)
     [ {}
       (Pair { Elt "1" "two" ; Elt "2" "two" } Unit) ]
-  - location: 26 (remaining gas: 1039983.084 units remaining)
+  - location: 26 (remaining gas: 1039985.584 units remaining)
     [ (Pair {} { Elt "1" "two" ; Elt "2" "two" } Unit) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .7e7197f248.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .7e7197f248.out"
index f6070a97fd620bdb1f28acb5ebac683b04a00692..af97e757e4e8d8b18fd46e76ba86fe9bbf2e2986 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .7e7197f248.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .7e7197f248.out"	
@@ -9,40 +9,40 @@ big_map diff
   Set map(4)["2"] to "two"
   Set map(4)["1"] to "two"
 trace
-  - location: 15 (remaining gas: 1039984.154 units remaining)
+  - location: 15 (remaining gas: 1039986.544 units remaining)
     [ (Pair { Elt "1" (Some "two") } { Elt "1" "one" ; Elt "2" "two" } Unit) ]
-  - location: 15 (remaining gas: 1039984.144 units remaining)
+  - location: 15 (remaining gas: 1039986.534 units remaining)
     [ { Elt "1" (Some "two") }
       (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ]
-  - location: 16 (remaining gas: 1039984.129 units remaining)
+  - location: 16 (remaining gas: 1039986.524 units remaining)
     [ (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ]
-  - location: 18 (remaining gas: 1039984.119 units remaining)
+  - location: 18 (remaining gas: 1039986.514 units remaining)
     [ { Elt "1" "one" ; Elt "2" "two" }
       Unit ]
-  - location: 16 (remaining gas: 1039984.089 units remaining)
+  - location: 16 (remaining gas: 1039986.494 units remaining)
     [ { Elt "1" (Some "two") }
       { Elt "1" "one" ; Elt "2" "two" }
       Unit ]
-  - location: 19 (remaining gas: 1039984.089 units remaining)
+  - location: 19 (remaining gas: 1039986.494 units remaining)
     [ (Pair "1" (Some "two"))
       { Elt "1" "one" ; Elt "2" "two" }
       Unit ]
-  - location: 21 (remaining gas: 1039984.079 units remaining)
+  - location: 21 (remaining gas: 1039986.484 units remaining)
     [ "1"
       (Some "two")
       { Elt "1" "one" ; Elt "2" "two" }
       Unit ]
-  - location: 22 (remaining gas: 1039983.144 units remaining)
+  - location: 22 (remaining gas: 1039985.624 units remaining)
     [ { Elt "1" "two" ; Elt "2" "two" }
       Unit ]
-  - location: 19 (remaining gas: 1039983.129 units remaining)
+  - location: 19 (remaining gas: 1039985.614 units remaining)
     [ { Elt "1" "two" ; Elt "2" "two" }
       Unit ]
-  - location: 23 (remaining gas: 1039983.114 units remaining)
+  - location: 23 (remaining gas: 1039985.604 units remaining)
     [ (Pair { Elt "1" "two" ; Elt "2" "two" } Unit) ]
-  - location: 24 (remaining gas: 1039983.099 units remaining)
+  - location: 24 (remaining gas: 1039985.594 units remaining)
     [ {}
       (Pair { Elt "1" "two" ; Elt "2" "two" } Unit) ]
-  - location: 26 (remaining gas: 1039983.084 units remaining)
+  - location: 26 (remaining gas: 1039985.584 units remaining)
     [ (Pair {} { Elt "1" "two" ; Elt "2" "two" } Unit) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .7ef2c415a7.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .7ef2c415a7.out"
index 0999a0ad3d06621f5d18b8209c06c6b8be975d68..d18d5a49280ff4d273fe9297ef00981d5ba4ced4 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .7ef2c415a7.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .7ef2c415a7.out"	
@@ -10,40 +10,40 @@ big_map diff
   Set map(4)["3"] to "three"
   Set map(4)["1"] to "one"
 trace
-  - location: 15 (remaining gas: 1039984.134 units remaining)
+  - location: 15 (remaining gas: 1039986.524 units remaining)
     [ (Pair { Elt "3" (Some "three") } { Elt "1" "one" ; Elt "2" "two" } Unit) ]
-  - location: 15 (remaining gas: 1039984.124 units remaining)
+  - location: 15 (remaining gas: 1039986.514 units remaining)
     [ { Elt "3" (Some "three") }
       (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ]
-  - location: 16 (remaining gas: 1039984.109 units remaining)
+  - location: 16 (remaining gas: 1039986.504 units remaining)
     [ (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ]
-  - location: 18 (remaining gas: 1039984.099 units remaining)
+  - location: 18 (remaining gas: 1039986.494 units remaining)
     [ { Elt "1" "one" ; Elt "2" "two" }
       Unit ]
-  - location: 16 (remaining gas: 1039984.069 units remaining)
+  - location: 16 (remaining gas: 1039986.474 units remaining)
     [ { Elt "3" (Some "three") }
       { Elt "1" "one" ; Elt "2" "two" }
       Unit ]
-  - location: 19 (remaining gas: 1039984.069 units remaining)
+  - location: 19 (remaining gas: 1039986.474 units remaining)
     [ (Pair "3" (Some "three"))
       { Elt "1" "one" ; Elt "2" "two" }
       Unit ]
-  - location: 21 (remaining gas: 1039984.059 units remaining)
+  - location: 21 (remaining gas: 1039986.464 units remaining)
     [ "3"
       (Some "three")
       { Elt "1" "one" ; Elt "2" "two" }
       Unit ]
-  - location: 22 (remaining gas: 1039983.124 units remaining)
+  - location: 22 (remaining gas: 1039985.604 units remaining)
     [ { Elt "1" "one" ; Elt "2" "two" ; Elt "3" "three" }
       Unit ]
-  - location: 19 (remaining gas: 1039983.109 units remaining)
+  - location: 19 (remaining gas: 1039985.594 units remaining)
     [ { Elt "1" "one" ; Elt "2" "two" ; Elt "3" "three" }
       Unit ]
-  - location: 23 (remaining gas: 1039983.094 units remaining)
+  - location: 23 (remaining gas: 1039985.584 units remaining)
     [ (Pair { Elt "1" "one" ; Elt "2" "two" ; Elt "3" "three" } Unit) ]
-  - location: 24 (remaining gas: 1039983.079 units remaining)
+  - location: 24 (remaining gas: 1039985.574 units remaining)
     [ {}
       (Pair { Elt "1" "one" ; Elt "2" "two" ; Elt "3" "three" } Unit) ]
-  - location: 26 (remaining gas: 1039983.064 units remaining)
+  - location: 26 (remaining gas: 1039985.564 units remaining)
     [ (Pair {} { Elt "1" "one" ; Elt "2" "two" ; Elt "3" "three" } Unit) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .b688cc94a7.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .b688cc94a7.out"
index 868fa10f044fe5b64e4ee7787984858195306c8b..4d4d10b2e4307ff0097573d9645ea7b1a2727a27 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .b688cc94a7.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .b688cc94a7.out"	
@@ -10,40 +10,40 @@ big_map diff
   Unset map(4)["3"]
   Set map(4)["1"] to "one"
 trace
-  - location: 15 (remaining gas: 1039984.298 units remaining)
+  - location: 15 (remaining gas: 1039986.688 units remaining)
     [ (Pair { Elt "3" None } { Elt "1" "one" ; Elt "2" "two" } Unit) ]
-  - location: 15 (remaining gas: 1039984.288 units remaining)
+  - location: 15 (remaining gas: 1039986.678 units remaining)
     [ { Elt "3" None }
       (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ]
-  - location: 16 (remaining gas: 1039984.273 units remaining)
+  - location: 16 (remaining gas: 1039986.668 units remaining)
     [ (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ]
-  - location: 18 (remaining gas: 1039984.263 units remaining)
+  - location: 18 (remaining gas: 1039986.658 units remaining)
     [ { Elt "1" "one" ; Elt "2" "two" }
       Unit ]
-  - location: 16 (remaining gas: 1039984.233 units remaining)
+  - location: 16 (remaining gas: 1039986.638 units remaining)
     [ { Elt "3" None }
       { Elt "1" "one" ; Elt "2" "two" }
       Unit ]
-  - location: 19 (remaining gas: 1039984.233 units remaining)
+  - location: 19 (remaining gas: 1039986.638 units remaining)
     [ (Pair "3" None)
       { Elt "1" "one" ; Elt "2" "two" }
       Unit ]
-  - location: 21 (remaining gas: 1039984.223 units remaining)
+  - location: 21 (remaining gas: 1039986.628 units remaining)
     [ "3"
       None
       { Elt "1" "one" ; Elt "2" "two" }
       Unit ]
-  - location: 22 (remaining gas: 1039983.288 units remaining)
+  - location: 22 (remaining gas: 1039985.768 units remaining)
     [ { Elt "1" "one" ; Elt "2" "two" }
       Unit ]
-  - location: 19 (remaining gas: 1039983.273 units remaining)
+  - location: 19 (remaining gas: 1039985.758 units remaining)
     [ { Elt "1" "one" ; Elt "2" "two" }
       Unit ]
-  - location: 23 (remaining gas: 1039983.258 units remaining)
+  - location: 23 (remaining gas: 1039985.748 units remaining)
     [ (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ]
-  - location: 24 (remaining gas: 1039983.243 units remaining)
+  - location: 24 (remaining gas: 1039985.738 units remaining)
     [ {}
       (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ]
-  - location: 26 (remaining gas: 1039983.228 units remaining)
+  - location: 26 (remaining gas: 1039985.728 units remaining)
     [ (Pair {} { Elt "1" "one" ; Elt "2" "two" } Unit) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .c68db221ed.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .c68db221ed.out"
index e7804265cd783433f3bcb4033abe02b0bf822f11..7dc65adc38eb3467ba67de502ed5a2688354294b 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .c68db221ed.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test__big_map_contract_io[update_big_map.tz-(Pair { Elt \"1\" \"one\" ; Elt \"2\" \"two\" .c68db221ed.out"	
@@ -9,40 +9,40 @@ big_map diff
   Unset map(4)["2"]
   Set map(4)["1"] to "one"
 trace
-  - location: 15 (remaining gas: 1039984.298 units remaining)
+  - location: 15 (remaining gas: 1039986.688 units remaining)
     [ (Pair { Elt "2" None } { Elt "1" "one" ; Elt "2" "two" } Unit) ]
-  - location: 15 (remaining gas: 1039984.288 units remaining)
+  - location: 15 (remaining gas: 1039986.678 units remaining)
     [ { Elt "2" None }
       (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ]
-  - location: 16 (remaining gas: 1039984.273 units remaining)
+  - location: 16 (remaining gas: 1039986.668 units remaining)
     [ (Pair { Elt "1" "one" ; Elt "2" "two" } Unit) ]
-  - location: 18 (remaining gas: 1039984.263 units remaining)
+  - location: 18 (remaining gas: 1039986.658 units remaining)
     [ { Elt "1" "one" ; Elt "2" "two" }
       Unit ]
-  - location: 16 (remaining gas: 1039984.233 units remaining)
+  - location: 16 (remaining gas: 1039986.638 units remaining)
     [ { Elt "2" None }
       { Elt "1" "one" ; Elt "2" "two" }
       Unit ]
-  - location: 19 (remaining gas: 1039984.233 units remaining)
+  - location: 19 (remaining gas: 1039986.638 units remaining)
     [ (Pair "2" None)
       { Elt "1" "one" ; Elt "2" "two" }
       Unit ]
-  - location: 21 (remaining gas: 1039984.223 units remaining)
+  - location: 21 (remaining gas: 1039986.628 units remaining)
     [ "2"
       None
       { Elt "1" "one" ; Elt "2" "two" }
       Unit ]
-  - location: 22 (remaining gas: 1039983.288 units remaining)
+  - location: 22 (remaining gas: 1039985.768 units remaining)
     [ { Elt "1" "one" }
       Unit ]
-  - location: 19 (remaining gas: 1039983.273 units remaining)
+  - location: 19 (remaining gas: 1039985.758 units remaining)
     [ { Elt "1" "one" }
       Unit ]
-  - location: 23 (remaining gas: 1039983.258 units remaining)
+  - location: 23 (remaining gas: 1039985.748 units remaining)
     [ (Pair { Elt "1" "one" } Unit) ]
-  - location: 24 (remaining gas: 1039983.243 units remaining)
+  - location: 24 (remaining gas: 1039985.738 units remaining)
     [ {}
       (Pair { Elt "1" "one" } Unit) ]
-  - location: 26 (remaining gas: 1039983.228 units remaining)
+  - location: 26 (remaining gas: 1039985.728 units remaining)
     [ (Pair {} { Elt "1" "one" } Unit) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[0.5].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[0.5].out
index 69746051500853cf1f5169b97075069f079f6683..0ff6a320e845d0bbc5a791e53290a7141f4072a1 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[0.5].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[0.5].out
@@ -7,15 +7,15 @@ emitted operations
 big_map diff
   
 trace
-  - location: 7 (remaining gas: 1039994.913 units remaining)
+  - location: 7 (remaining gas: 1039995.553 units remaining)
     [ (Pair Unit 0) ]
-  - location: 7 (remaining gas: 1039994.903 units remaining)
+  - location: 7 (remaining gas: 1039995.543 units remaining)
     [  ]
-  - location: 8 (remaining gas: 1039994.903 units remaining)
+  - location: 8 (remaining gas: 1039995.543 units remaining)
     [ 500000 ]
-  - location: 9 (remaining gas: 1039994.888 units remaining)
+  - location: 9 (remaining gas: 1039995.533 units remaining)
     [ {}
       500000 ]
-  - location: 11 (remaining gas: 1039994.873 units remaining)
+  - location: 11 (remaining gas: 1039995.523 units remaining)
     [ (Pair {} 500000) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[0].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[0].out
index 27140ef7d89a15dfcb1307ccf4bbca47dc35586c..b1677ae3f64b38bd5415c8b83dfdd2c4bd2647bf 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[0].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[0].out
@@ -7,15 +7,15 @@ emitted operations
 big_map diff
   
 trace
-  - location: 7 (remaining gas: 1039994.913 units remaining)
+  - location: 7 (remaining gas: 1039995.553 units remaining)
     [ (Pair Unit 0) ]
-  - location: 7 (remaining gas: 1039994.903 units remaining)
+  - location: 7 (remaining gas: 1039995.543 units remaining)
     [  ]
-  - location: 8 (remaining gas: 1039994.903 units remaining)
+  - location: 8 (remaining gas: 1039995.543 units remaining)
     [ 0 ]
-  - location: 9 (remaining gas: 1039994.888 units remaining)
+  - location: 9 (remaining gas: 1039995.533 units remaining)
     [ {}
       0 ]
-  - location: 11 (remaining gas: 1039994.873 units remaining)
+  - location: 11 (remaining gas: 1039995.523 units remaining)
     [ (Pair {} 0) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[1000].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[1000].out
index c185e193dfc9cbaf3f3acca0c6fca5c0d5f4570a..6921d02a6aaa93bd3437bc5873835c89d248327e 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[1000].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[1000].out
@@ -7,15 +7,15 @@ emitted operations
 big_map diff
   
 trace
-  - location: 7 (remaining gas: 1039994.913 units remaining)
+  - location: 7 (remaining gas: 1039995.553 units remaining)
     [ (Pair Unit 0) ]
-  - location: 7 (remaining gas: 1039994.903 units remaining)
+  - location: 7 (remaining gas: 1039995.543 units remaining)
     [  ]
-  - location: 8 (remaining gas: 1039994.903 units remaining)
+  - location: 8 (remaining gas: 1039995.543 units remaining)
     [ 1000000000 ]
-  - location: 9 (remaining gas: 1039994.888 units remaining)
+  - location: 9 (remaining gas: 1039995.533 units remaining)
     [ {}
       1000000000 ]
-  - location: 11 (remaining gas: 1039994.873 units remaining)
+  - location: 11 (remaining gas: 1039995.523 units remaining)
     [ (Pair {} 1000000000) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[1].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[1].out
index e1f60bcfde4fb522fddc2fe8bef2a2c67df672bd..60d998dafd335cb80559d5b634f30daaf60cf7b1 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[1].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[1].out
@@ -7,15 +7,15 @@ emitted operations
 big_map diff
   
 trace
-  - location: 7 (remaining gas: 1039994.913 units remaining)
+  - location: 7 (remaining gas: 1039995.553 units remaining)
     [ (Pair Unit 0) ]
-  - location: 7 (remaining gas: 1039994.903 units remaining)
+  - location: 7 (remaining gas: 1039995.543 units remaining)
     [  ]
-  - location: 8 (remaining gas: 1039994.903 units remaining)
+  - location: 8 (remaining gas: 1039995.543 units remaining)
     [ 1000000 ]
-  - location: 9 (remaining gas: 1039994.888 units remaining)
+  - location: 9 (remaining gas: 1039995.533 units remaining)
     [ {}
       1000000 ]
-  - location: 11 (remaining gas: 1039994.873 units remaining)
+  - location: 11 (remaining gas: 1039995.523 units remaining)
     [ (Pair {} 1000000) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[1e-06].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[1e-06].out
index 57fcf5fbe14ad73e782e1c038262e8afe19e75ef..de7e71688263e31b5ba61f7290a994b2d2b1ee93 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[1e-06].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[1e-06].out
@@ -7,15 +7,15 @@ emitted operations
 big_map diff
   
 trace
-  - location: 7 (remaining gas: 1039994.913 units remaining)
+  - location: 7 (remaining gas: 1039995.553 units remaining)
     [ (Pair Unit 0) ]
-  - location: 7 (remaining gas: 1039994.903 units remaining)
+  - location: 7 (remaining gas: 1039995.543 units remaining)
     [  ]
-  - location: 8 (remaining gas: 1039994.903 units remaining)
+  - location: 8 (remaining gas: 1039995.543 units remaining)
     [ 1 ]
-  - location: 9 (remaining gas: 1039994.888 units remaining)
+  - location: 9 (remaining gas: 1039995.533 units remaining)
     [ {}
       1 ]
-  - location: 11 (remaining gas: 1039994.873 units remaining)
+  - location: 11 (remaining gas: 1039995.523 units remaining)
     [ (Pair {} 1) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[5].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[5].out
index cf6f6cca6d7726fd229863f587cd5ada67e05102..638b0a69ccabb6f0584add724839829bbe002334 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[5].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[5].out
@@ -7,15 +7,15 @@ emitted operations
 big_map diff
   
 trace
-  - location: 7 (remaining gas: 1039994.913 units remaining)
+  - location: 7 (remaining gas: 1039995.553 units remaining)
     [ (Pair Unit 0) ]
-  - location: 7 (remaining gas: 1039994.903 units remaining)
+  - location: 7 (remaining gas: 1039995.543 units remaining)
     [  ]
-  - location: 8 (remaining gas: 1039994.903 units remaining)
+  - location: 8 (remaining gas: 1039995.543 units remaining)
     [ 5000000 ]
-  - location: 9 (remaining gas: 1039994.888 units remaining)
+  - location: 9 (remaining gas: 1039995.533 units remaining)
     [ {}
       5000000 ]
-  - location: 11 (remaining gas: 1039994.873 units remaining)
+  - location: 11 (remaining gas: 1039995.523 units remaining)
     [ (Pair {} 5000000) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[8000000000000.0].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[8000000000000.0].out
index b3e3ca045f4bec51536c96e515cb31a0d7e6c90d..62ed0ad9491fb93369389da7f8a1b5c90478f14b 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[8000000000000.0].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_balance[8000000000000.0].out
@@ -7,15 +7,15 @@ emitted operations
 big_map diff
   
 trace
-  - location: 7 (remaining gas: 1039994.913 units remaining)
+  - location: 7 (remaining gas: 1039995.553 units remaining)
     [ (Pair Unit 0) ]
-  - location: 7 (remaining gas: 1039994.903 units remaining)
+  - location: 7 (remaining gas: 1039995.543 units remaining)
     [  ]
-  - location: 8 (remaining gas: 1039994.903 units remaining)
+  - location: 8 (remaining gas: 1039995.543 units remaining)
     [ 8000000000000000000 ]
-  - location: 9 (remaining gas: 1039994.888 units remaining)
+  - location: 9 (remaining gas: 1039995.533 units remaining)
     [ {}
       8000000000000000000 ]
-  - location: 11 (remaining gas: 1039994.873 units remaining)
+  - location: 11 (remaining gas: 1039995.523 units remaining)
     [ (Pair {} 8000000000000000000) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }) )-(Right (Righ.7492e8cdea.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }) )-(Right (Righ.7492e8cdea.out"
index 39a755a95c888ed06adaabcae971c86d5d6ccbff..b5b369e9a65ff7c7fb0fd7e506d4aa5a64d5fedc 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }) )-(Right (Righ.7492e8cdea.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }) )-(Right (Righ.7492e8cdea.out"	
@@ -11,80 +11,80 @@ big_map diff
   Set map(4)["3"] to "three"
   Set map(4)["1"] to "one"
 trace
-  - location: 43 (remaining gas: 1039919.988 units remaining)
+  - location: 43 (remaining gas: 1039933.098 units remaining)
     [ (Pair (Right (Right (Right (Left { Pair "3" "three" }))))
             (Left (Pair { Elt "1" "one" } { Elt "2" "two" }))) ]
-  - location: 43 (remaining gas: 1039919.978 units remaining)
+  - location: 43 (remaining gas: 1039933.088 units remaining)
     [ (Right (Right (Right (Left { Pair "3" "three" }))))
       (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ]
-  - location: 44 (remaining gas: 1039919.968 units remaining)
+  - location: 44 (remaining gas: 1039933.078 units remaining)
     [ (Right (Right (Left { Pair "3" "three" })))
       (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ]
-  - location: 60 (remaining gas: 1039919.958 units remaining)
+  - location: 60 (remaining gas: 1039933.068 units remaining)
     [ (Right (Left { Pair "3" "three" }))
       (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ]
-  - location: 65 (remaining gas: 1039919.948 units remaining)
+  - location: 65 (remaining gas: 1039933.058 units remaining)
     [ (Left { Pair "3" "three" })
       (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ]
-  - location: 108 (remaining gas: 1039919.938 units remaining)
+  - location: 108 (remaining gas: 1039933.048 units remaining)
     [ { Pair "3" "three" }
       (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ]
-  - location: 110 (remaining gas: 1039919.923 units remaining)
+  - location: 110 (remaining gas: 1039933.038 units remaining)
     [ (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ]
-  - location: 113 (remaining gas: 1039919.913 units remaining)
+  - location: 113 (remaining gas: 1039933.028 units remaining)
     [ (Pair { Elt "1" "one" } { Elt "2" "two" }) ]
-  - location: 113 (remaining gas: 1039919.898 units remaining)
+  - location: 113 (remaining gas: 1039933.018 units remaining)
     [ (Pair { Elt "1" "one" } { Elt "2" "two" }) ]
-  - location: 119 (remaining gas: 1039919.888 units remaining)
+  - location: 119 (remaining gas: 1039933.008 units remaining)
     [ { Elt "1" "one" }
       { Elt "2" "two" } ]
-  - location: 110 (remaining gas: 1039919.858 units remaining)
+  - location: 110 (remaining gas: 1039932.988 units remaining)
     [ { Pair "3" "three" }
       { Elt "1" "one" }
       { Elt "2" "two" } ]
-  - location: 120 (remaining gas: 1039919.858 units remaining)
+  - location: 120 (remaining gas: 1039932.988 units remaining)
     [ (Pair "3" "three")
       { Elt "1" "one" }
       { Elt "2" "two" } ]
-  - location: 122 (remaining gas: 1039919.848 units remaining)
+  - location: 122 (remaining gas: 1039932.978 units remaining)
     [ "3"
       "three"
       { Elt "1" "one" }
       { Elt "2" "two" } ]
-  - location: 123 (remaining gas: 1039919.833 units remaining)
+  - location: 123 (remaining gas: 1039932.968 units remaining)
     [ "three"
       { Elt "1" "one" }
       { Elt "2" "two" } ]
-  - location: 125 (remaining gas: 1039919.818 units remaining)
+  - location: 125 (remaining gas: 1039932.958 units remaining)
     [ (Some "three")
       { Elt "1" "one" }
       { Elt "2" "two" } ]
-  - location: 123 (remaining gas: 1039919.788 units remaining)
+  - location: 123 (remaining gas: 1039932.938 units remaining)
     [ "3"
       (Some "three")
       { Elt "1" "one" }
       { Elt "2" "two" } ]
-  - location: 126 (remaining gas: 1039918.856 units remaining)
+  - location: 126 (remaining gas: 1039932.081 units remaining)
     [ { Elt "1" "one" ; Elt "3" "three" }
       { Elt "2" "two" } ]
-  - location: 120 (remaining gas: 1039918.841 units remaining)
+  - location: 120 (remaining gas: 1039932.071 units remaining)
     [ { Elt "1" "one" ; Elt "3" "three" }
       { Elt "2" "two" } ]
-  - location: 127 (remaining gas: 1039918.826 units remaining)
+  - location: 127 (remaining gas: 1039932.061 units remaining)
     [ (Pair { Elt "1" "one" ; Elt "3" "three" } { Elt "2" "two" }) ]
-  - location: 128 (remaining gas: 1039918.811 units remaining)
+  - location: 128 (remaining gas: 1039932.051 units remaining)
     [ (Left (Pair { Elt "1" "one" ; Elt "3" "three" } { Elt "2" "two" })) ]
-  - location: 108 (remaining gas: 1039918.796 units remaining)
+  - location: 108 (remaining gas: 1039932.041 units remaining)
     [ (Left (Pair { Elt "1" "one" ; Elt "3" "three" } { Elt "2" "two" })) ]
-  - location: 65 (remaining gas: 1039918.781 units remaining)
+  - location: 65 (remaining gas: 1039932.031 units remaining)
     [ (Left (Pair { Elt "1" "one" ; Elt "3" "three" } { Elt "2" "two" })) ]
-  - location: 60 (remaining gas: 1039918.766 units remaining)
+  - location: 60 (remaining gas: 1039932.021 units remaining)
     [ (Left (Pair { Elt "1" "one" ; Elt "3" "three" } { Elt "2" "two" })) ]
-  - location: 44 (remaining gas: 1039918.751 units remaining)
+  - location: 44 (remaining gas: 1039932.011 units remaining)
     [ (Left (Pair { Elt "1" "one" ; Elt "3" "three" } { Elt "2" "two" })) ]
-  - location: 151 (remaining gas: 1039918.736 units remaining)
+  - location: 151 (remaining gas: 1039932.001 units remaining)
     [ {}
       (Left (Pair { Elt "1" "one" ; Elt "3" "three" } { Elt "2" "two" })) ]
-  - location: 153 (remaining gas: 1039918.721 units remaining)
+  - location: 153 (remaining gas: 1039931.991 units remaining)
     [ (Pair {} (Left (Pair { Elt "1" "one" ; Elt "3" "three" } { Elt "2" "two" }))) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Left Unit)-(.21b30dd90f.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Left Unit)-(.21b30dd90f.out"
index 438366ea336ddc4198532938e089a8c08561786d..9f4e64903bfaa1ab8dc4ee8e8199313cec32cfa3 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Left Unit)-(.21b30dd90f.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Left Unit)-(.21b30dd90f.out"	
@@ -10,35 +10,35 @@ big_map diff
   New map(4) of type (big_map string string)
   Set map(4)["2"] to "two"
 trace
-  - location: 43 (remaining gas: 1039920.896 units remaining)
+  - location: 43 (remaining gas: 1039934.006 units remaining)
     [ (Pair (Left Unit) (Left (Pair { Elt "1" "one" } { Elt "2" "two" }))) ]
-  - location: 43 (remaining gas: 1039920.886 units remaining)
+  - location: 43 (remaining gas: 1039933.996 units remaining)
     [ (Left Unit)
       (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ]
-  - location: 44 (remaining gas: 1039920.876 units remaining)
+  - location: 44 (remaining gas: 1039933.986 units remaining)
     [ Unit
       (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ]
-  - location: 46 (remaining gas: 1039920.866 units remaining)
+  - location: 46 (remaining gas: 1039933.976 units remaining)
     [ (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ]
-  - location: 48 (remaining gas: 1039920.856 units remaining)
+  - location: 48 (remaining gas: 1039933.966 units remaining)
     [ (Pair { Elt "1" "one" } { Elt "2" "two" }) ]
-  - location: 48 (remaining gas: 1039920.841 units remaining)
+  - location: 48 (remaining gas: 1039933.956 units remaining)
     [ (Pair { Elt "1" "one" } { Elt "2" "two" }) ]
-  - location: 54 (remaining gas: 1039920.831 units remaining)
+  - location: 54 (remaining gas: 1039933.946 units remaining)
     [ { Elt "1" "one" }
       { Elt "2" "two" } ]
-  - location: 55 (remaining gas: 1039920.821 units remaining)
+  - location: 55 (remaining gas: 1039933.936 units remaining)
     [ { Elt "2" "two" }
       { Elt "1" "one" } ]
-  - location: 56 (remaining gas: 1039920.806 units remaining)
+  - location: 56 (remaining gas: 1039933.926 units remaining)
     [ (Pair { Elt "2" "two" } { Elt "1" "one" }) ]
-  - location: 57 (remaining gas: 1039920.791 units remaining)
+  - location: 57 (remaining gas: 1039933.916 units remaining)
     [ (Left (Pair { Elt "2" "two" } { Elt "1" "one" })) ]
-  - location: 44 (remaining gas: 1039920.776 units remaining)
+  - location: 44 (remaining gas: 1039933.906 units remaining)
     [ (Left (Pair { Elt "2" "two" } { Elt "1" "one" })) ]
-  - location: 151 (remaining gas: 1039920.761 units remaining)
+  - location: 151 (remaining gas: 1039933.896 units remaining)
     [ {}
       (Left (Pair { Elt "2" "two" } { Elt "1" "one" })) ]
-  - location: 153 (remaining gas: 1039920.746 units remaining)
+  - location: 153 (remaining gas: 1039933.886 units remaining)
     [ (Pair {} (Left (Pair { Elt "2" "two" } { Elt "1" "one" }))) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Right (Left .2873ef610c.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Right (Left .2873ef610c.out"
index aa532e8b1649324548f2741dff06573e0fe8b880..353853c4e7ebc22290c15456c17540f3d2bd1ecf 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Right (Left .2873ef610c.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Right (Left .2873ef610c.out"	
@@ -10,30 +10,30 @@ big_map diff
   New map(4) of type (big_map string string)
   Set map(4)["3"] to "three"
 trace
-  - location: 43 (remaining gas: 1039917.192 units remaining)
+  - location: 43 (remaining gas: 1039930.452 units remaining)
     [ (Pair (Right (Left (Left (Pair { Elt "3" "three" } { Elt "4" "four" }))))
             (Left (Pair { Elt "1" "one" } { Elt "2" "two" }))) ]
-  - location: 43 (remaining gas: 1039917.182 units remaining)
+  - location: 43 (remaining gas: 1039930.442 units remaining)
     [ (Right (Left (Left (Pair { Elt "3" "three" } { Elt "4" "four" }))))
       (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ]
-  - location: 44 (remaining gas: 1039917.172 units remaining)
+  - location: 44 (remaining gas: 1039930.432 units remaining)
     [ (Left (Left (Pair { Elt "3" "three" } { Elt "4" "four" })))
       (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ]
-  - location: 60 (remaining gas: 1039917.162 units remaining)
+  - location: 60 (remaining gas: 1039930.422 units remaining)
     [ (Left (Pair { Elt "3" "three" } { Elt "4" "four" }))
       (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ]
-  - location: 62 (remaining gas: 1039917.152 units remaining)
+  - location: 62 (remaining gas: 1039930.412 units remaining)
     [ (Left (Pair { Elt "1" "one" } { Elt "2" "two" }))
       (Left (Pair { Elt "3" "three" } { Elt "4" "four" })) ]
-  - location: 63 (remaining gas: 1039917.142 units remaining)
+  - location: 63 (remaining gas: 1039930.402 units remaining)
     [ (Left (Pair { Elt "3" "three" } { Elt "4" "four" })) ]
-  - location: 60 (remaining gas: 1039917.127 units remaining)
+  - location: 60 (remaining gas: 1039930.392 units remaining)
     [ (Left (Pair { Elt "3" "three" } { Elt "4" "four" })) ]
-  - location: 44 (remaining gas: 1039917.112 units remaining)
+  - location: 44 (remaining gas: 1039930.382 units remaining)
     [ (Left (Pair { Elt "3" "three" } { Elt "4" "four" })) ]
-  - location: 151 (remaining gas: 1039917.097 units remaining)
+  - location: 151 (remaining gas: 1039930.372 units remaining)
     [ {}
       (Left (Pair { Elt "3" "three" } { Elt "4" "four" })) ]
-  - location: 153 (remaining gas: 1039917.082 units remaining)
+  - location: 153 (remaining gas: 1039930.362 units remaining)
     [ (Pair {} (Left (Pair { Elt "3" "three" } { Elt "4" "four" }))) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Right (Left .8a6f480005.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Right (Left .8a6f480005.out"
index 90645801169b04320ee495d97029ecbec7650fb7..4a054235030b374ba21425c975760258ca770e6e 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Right (Left .8a6f480005.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Right (Left .8a6f480005.out"	
@@ -7,29 +7,29 @@ emitted operations
 big_map diff
   
 trace
-  - location: 43 (remaining gas: 1039920.256 units remaining)
+  - location: 43 (remaining gas: 1039933.366 units remaining)
     [ (Pair (Right (Left (Right Unit))) (Left (Pair { Elt "1" "one" } { Elt "2" "two" }))) ]
-  - location: 43 (remaining gas: 1039920.246 units remaining)
+  - location: 43 (remaining gas: 1039933.356 units remaining)
     [ (Right (Left (Right Unit)))
       (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ]
-  - location: 44 (remaining gas: 1039920.236 units remaining)
+  - location: 44 (remaining gas: 1039933.346 units remaining)
     [ (Left (Right Unit))
       (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ]
-  - location: 60 (remaining gas: 1039920.226 units remaining)
+  - location: 60 (remaining gas: 1039933.336 units remaining)
     [ (Right Unit)
       (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ]
-  - location: 62 (remaining gas: 1039920.216 units remaining)
+  - location: 62 (remaining gas: 1039933.326 units remaining)
     [ (Left (Pair { Elt "1" "one" } { Elt "2" "two" }))
       (Right Unit) ]
-  - location: 63 (remaining gas: 1039920.206 units remaining)
+  - location: 63 (remaining gas: 1039933.316 units remaining)
     [ (Right Unit) ]
-  - location: 60 (remaining gas: 1039920.191 units remaining)
+  - location: 60 (remaining gas: 1039933.306 units remaining)
     [ (Right Unit) ]
-  - location: 44 (remaining gas: 1039920.176 units remaining)
+  - location: 44 (remaining gas: 1039933.296 units remaining)
     [ (Right Unit) ]
-  - location: 151 (remaining gas: 1039920.161 units remaining)
+  - location: 151 (remaining gas: 1039933.286 units remaining)
     [ {}
       (Right Unit) ]
-  - location: 153 (remaining gas: 1039920.146 units remaining)
+  - location: 153 (remaining gas: 1039933.276 units remaining)
     [ (Pair {} (Right Unit)) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Right (Right.d336ca1903.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Right (Right.d336ca1903.out"
index 6e81578b1801d996627c5ca7adc004a4264e42f5..8ac7b958247beeb228a87889d2bb6fffc016132e 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Right (Right.d336ca1903.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Left (Pair { Elt \"1\" \"one\" } { Elt \"2\" \"two\" }))-(Right (Right.d336ca1903.out"	
@@ -10,74 +10,74 @@ big_map diff
   New map(4) of type (big_map string string)
   Unset map(4)["1"]
 trace
-  - location: 43 (remaining gas: 1039920.252 units remaining)
+  - location: 43 (remaining gas: 1039933.362 units remaining)
     [ (Pair (Right (Right (Right (Right { "1" }))))
             (Left (Pair { Elt "1" "one" } { Elt "2" "two" }))) ]
-  - location: 43 (remaining gas: 1039920.242 units remaining)
+  - location: 43 (remaining gas: 1039933.352 units remaining)
     [ (Right (Right (Right (Right { "1" }))))
       (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ]
-  - location: 44 (remaining gas: 1039920.232 units remaining)
+  - location: 44 (remaining gas: 1039933.342 units remaining)
     [ (Right (Right (Right { "1" })))
       (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ]
-  - location: 60 (remaining gas: 1039920.222 units remaining)
+  - location: 60 (remaining gas: 1039933.332 units remaining)
     [ (Right (Right { "1" }))
       (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ]
-  - location: 65 (remaining gas: 1039920.212 units remaining)
+  - location: 65 (remaining gas: 1039933.322 units remaining)
     [ (Right { "1" })
       (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ]
-  - location: 108 (remaining gas: 1039920.202 units remaining)
+  - location: 108 (remaining gas: 1039933.312 units remaining)
     [ { "1" }
       (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ]
-  - location: 131 (remaining gas: 1039920.187 units remaining)
+  - location: 131 (remaining gas: 1039933.302 units remaining)
     [ (Left (Pair { Elt "1" "one" } { Elt "2" "two" })) ]
-  - location: 134 (remaining gas: 1039920.177 units remaining)
+  - location: 134 (remaining gas: 1039933.292 units remaining)
     [ (Pair { Elt "1" "one" } { Elt "2" "two" }) ]
-  - location: 134 (remaining gas: 1039920.162 units remaining)
+  - location: 134 (remaining gas: 1039933.282 units remaining)
     [ (Pair { Elt "1" "one" } { Elt "2" "two" }) ]
-  - location: 140 (remaining gas: 1039920.152 units remaining)
+  - location: 140 (remaining gas: 1039933.272 units remaining)
     [ { Elt "1" "one" }
       { Elt "2" "two" } ]
-  - location: 131 (remaining gas: 1039920.122 units remaining)
+  - location: 131 (remaining gas: 1039933.252 units remaining)
     [ { "1" }
       { Elt "1" "one" }
       { Elt "2" "two" } ]
-  - location: 141 (remaining gas: 1039920.122 units remaining)
+  - location: 141 (remaining gas: 1039933.252 units remaining)
     [ "1"
       { Elt "1" "one" }
       { Elt "2" "two" } ]
-  - location: 143 (remaining gas: 1039920.107 units remaining)
+  - location: 143 (remaining gas: 1039933.242 units remaining)
     [ { Elt "1" "one" }
       { Elt "2" "two" } ]
-  - location: 145 (remaining gas: 1039920.092 units remaining)
+  - location: 145 (remaining gas: 1039933.232 units remaining)
     [ None
       { Elt "1" "one" }
       { Elt "2" "two" } ]
-  - location: 143 (remaining gas: 1039920.062 units remaining)
+  - location: 143 (remaining gas: 1039933.212 units remaining)
     [ "1"
       None
       { Elt "1" "one" }
       { Elt "2" "two" } ]
-  - location: 147 (remaining gas: 1039919.130 units remaining)
+  - location: 147 (remaining gas: 1039932.355 units remaining)
     [ {}
       { Elt "2" "two" } ]
-  - location: 141 (remaining gas: 1039919.115 units remaining)
+  - location: 141 (remaining gas: 1039932.345 units remaining)
     [ {}
       { Elt "2" "two" } ]
-  - location: 148 (remaining gas: 1039919.100 units remaining)
+  - location: 148 (remaining gas: 1039932.335 units remaining)
     [ (Pair {} { Elt "2" "two" }) ]
-  - location: 149 (remaining gas: 1039919.085 units remaining)
+  - location: 149 (remaining gas: 1039932.325 units remaining)
     [ (Left (Pair {} { Elt "2" "two" })) ]
-  - location: 108 (remaining gas: 1039919.070 units remaining)
+  - location: 108 (remaining gas: 1039932.315 units remaining)
     [ (Left (Pair {} { Elt "2" "two" })) ]
-  - location: 65 (remaining gas: 1039919.055 units remaining)
+  - location: 65 (remaining gas: 1039932.305 units remaining)
     [ (Left (Pair {} { Elt "2" "two" })) ]
-  - location: 60 (remaining gas: 1039919.040 units remaining)
+  - location: 60 (remaining gas: 1039932.295 units remaining)
     [ (Left (Pair {} { Elt "2" "two" })) ]
-  - location: 44 (remaining gas: 1039919.025 units remaining)
+  - location: 44 (remaining gas: 1039932.285 units remaining)
     [ (Left (Pair {} { Elt "2" "two" })) ]
-  - location: 151 (remaining gas: 1039919.010 units remaining)
+  - location: 151 (remaining gas: 1039932.275 units remaining)
     [ {}
       (Left (Pair {} { Elt "2" "two" })) ]
-  - location: 153 (remaining gas: 1039918.995 units remaining)
+  - location: 153 (remaining gas: 1039932.265 units remaining)
     [ (Pair {} (Left (Pair {} { Elt "2" "two" }))) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Right Unit)-(Right (Right (Left (Pair { Pair \"foo\" \"bar\" } { P.7f2ee47600.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Right Unit)-(Right (Right (Left (Pair { Pair \"foo\" \"bar\" } { P.7f2ee47600.out"
index e3e4f07ed88fab82ff7b591b42cc02967a54375a..72ec13723338ebb639704412831c68178b2e2cd2 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Right Unit)-(Right (Right (Left (Pair { Pair \"foo\" \"bar\" } { P.7f2ee47600.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_big_map_magic[(Right Unit)-(Right (Right (Left (Pair { Pair \"foo\" \"bar\" } { P.7f2ee47600.out"	
@@ -10,126 +10,126 @@ big_map diff
   New map(4) of type (big_map string string)
   Set map(4)["foo"] to "bar"
 trace
-  - location: 43 (remaining gas: 1039922.534 units remaining)
+  - location: 43 (remaining gas: 1039935.494 units remaining)
     [ (Pair (Right (Right (Left (Pair { Pair "foo" "bar" } { Pair "gaz" "baz" })))) (Right Unit)) ]
-  - location: 43 (remaining gas: 1039922.524 units remaining)
+  - location: 43 (remaining gas: 1039935.484 units remaining)
     [ (Right (Right (Left (Pair { Pair "foo" "bar" } { Pair "gaz" "baz" }))))
       (Right Unit) ]
-  - location: 44 (remaining gas: 1039922.514 units remaining)
+  - location: 44 (remaining gas: 1039935.474 units remaining)
     [ (Right (Left (Pair { Pair "foo" "bar" } { Pair "gaz" "baz" })))
       (Right Unit) ]
-  - location: 60 (remaining gas: 1039922.504 units remaining)
+  - location: 60 (remaining gas: 1039935.464 units remaining)
     [ (Left (Pair { Pair "foo" "bar" } { Pair "gaz" "baz" }))
       (Right Unit) ]
-  - location: 65 (remaining gas: 1039922.494 units remaining)
+  - location: 65 (remaining gas: 1039935.454 units remaining)
     [ (Pair { Pair "foo" "bar" } { Pair "gaz" "baz" })
       (Right Unit) ]
-  - location: 67 (remaining gas: 1039922.479 units remaining)
+  - location: 67 (remaining gas: 1039935.444 units remaining)
     [ (Right Unit) ]
-  - location: 70 (remaining gas: 1039922.469 units remaining)
+  - location: 70 (remaining gas: 1039935.434 units remaining)
     [ Unit ]
-  - location: 70 (remaining gas: 1039922.454 units remaining)
+  - location: 70 (remaining gas: 1039935.424 units remaining)
     [ Unit ]
-  - location: 76 (remaining gas: 1039922.444 units remaining)
+  - location: 76 (remaining gas: 1039935.414 units remaining)
     [  ]
-  - location: 67 (remaining gas: 1039922.414 units remaining)
+  - location: 67 (remaining gas: 1039935.394 units remaining)
     [ (Pair { Pair "foo" "bar" } { Pair "gaz" "baz" }) ]
-  - location: 77 (remaining gas: 1039922.404 units remaining)
+  - location: 77 (remaining gas: 1039935.384 units remaining)
     [ { Pair "foo" "bar" }
       { Pair "gaz" "baz" } ]
-  - location: 78 (remaining gas: 1039922.389 units remaining)
+  - location: 78 (remaining gas: 1039935.374 units remaining)
     [ { Pair "gaz" "baz" } ]
-  - location: 80 (remaining gas: 1039922.374 units remaining)
+  - location: 80 (remaining gas: 1039935.364 units remaining)
     [ {}
       { Pair "gaz" "baz" } ]
-  - location: 78 (remaining gas: 1039922.344 units remaining)
+  - location: 78 (remaining gas: 1039935.344 units remaining)
     [ { Pair "foo" "bar" }
       {}
       { Pair "gaz" "baz" } ]
-  - location: 83 (remaining gas: 1039922.344 units remaining)
+  - location: 83 (remaining gas: 1039935.344 units remaining)
     [ (Pair "foo" "bar")
       {}
       { Pair "gaz" "baz" } ]
-  - location: 85 (remaining gas: 1039922.334 units remaining)
+  - location: 85 (remaining gas: 1039935.334 units remaining)
     [ "foo"
       "bar"
       {}
       { Pair "gaz" "baz" } ]
-  - location: 86 (remaining gas: 1039922.319 units remaining)
+  - location: 86 (remaining gas: 1039935.324 units remaining)
     [ "bar"
       {}
       { Pair "gaz" "baz" } ]
-  - location: 88 (remaining gas: 1039922.304 units remaining)
+  - location: 88 (remaining gas: 1039935.314 units remaining)
     [ (Some "bar")
       {}
       { Pair "gaz" "baz" } ]
-  - location: 86 (remaining gas: 1039922.274 units remaining)
+  - location: 86 (remaining gas: 1039935.294 units remaining)
     [ "foo"
       (Some "bar")
       {}
       { Pair "gaz" "baz" } ]
-  - location: 89 (remaining gas: 1039921.276 units remaining)
+  - location: 89 (remaining gas: 1039934.371 units remaining)
     [ { Elt "foo" "bar" }
       { Pair "gaz" "baz" } ]
-  - location: 83 (remaining gas: 1039921.261 units remaining)
+  - location: 83 (remaining gas: 1039934.361 units remaining)
     [ { Elt "foo" "bar" }
       { Pair "gaz" "baz" } ]
-  - location: 90 (remaining gas: 1039921.251 units remaining)
+  - location: 90 (remaining gas: 1039934.351 units remaining)
     [ { Pair "gaz" "baz" }
       { Elt "foo" "bar" } ]
-  - location: 91 (remaining gas: 1039921.236 units remaining)
+  - location: 91 (remaining gas: 1039934.341 units remaining)
     [ { Elt "foo" "bar" } ]
-  - location: 93 (remaining gas: 1039921.221 units remaining)
+  - location: 93 (remaining gas: 1039934.331 units remaining)
     [ {}
       { Elt "foo" "bar" } ]
-  - location: 91 (remaining gas: 1039921.191 units remaining)
+  - location: 91 (remaining gas: 1039934.311 units remaining)
     [ { Pair "gaz" "baz" }
       {}
       { Elt "foo" "bar" } ]
-  - location: 96 (remaining gas: 1039921.191 units remaining)
+  - location: 96 (remaining gas: 1039934.311 units remaining)
     [ (Pair "gaz" "baz")
       {}
       { Elt "foo" "bar" } ]
-  - location: 98 (remaining gas: 1039921.181 units remaining)
+  - location: 98 (remaining gas: 1039934.301 units remaining)
     [ "gaz"
       "baz"
       {}
       { Elt "foo" "bar" } ]
-  - location: 99 (remaining gas: 1039921.166 units remaining)
+  - location: 99 (remaining gas: 1039934.291 units remaining)
     [ "baz"
       {}
       { Elt "foo" "bar" } ]
-  - location: 101 (remaining gas: 1039921.151 units remaining)
+  - location: 101 (remaining gas: 1039934.281 units remaining)
     [ (Some "baz")
       {}
       { Elt "foo" "bar" } ]
-  - location: 99 (remaining gas: 1039921.121 units remaining)
+  - location: 99 (remaining gas: 1039934.261 units remaining)
     [ "gaz"
       (Some "baz")
       {}
       { Elt "foo" "bar" } ]
-  - location: 102 (remaining gas: 1039920.123 units remaining)
+  - location: 102 (remaining gas: 1039933.338 units remaining)
     [ { Elt "gaz" "baz" }
       { Elt "foo" "bar" } ]
-  - location: 96 (remaining gas: 1039920.108 units remaining)
+  - location: 96 (remaining gas: 1039933.328 units remaining)
     [ { Elt "gaz" "baz" }
       { Elt "foo" "bar" } ]
-  - location: 103 (remaining gas: 1039920.098 units remaining)
+  - location: 103 (remaining gas: 1039933.318 units remaining)
     [ { Elt "foo" "bar" }
       { Elt "gaz" "baz" } ]
-  - location: 104 (remaining gas: 1039920.083 units remaining)
+  - location: 104 (remaining gas: 1039933.308 units remaining)
     [ (Pair { Elt "foo" "bar" } { Elt "gaz" "baz" }) ]
-  - location: 105 (remaining gas: 1039920.068 units remaining)
+  - location: 105 (remaining gas: 1039933.298 units remaining)
     [ (Left (Pair { Elt "foo" "bar" } { Elt "gaz" "baz" })) ]
-  - location: 65 (remaining gas: 1039920.053 units remaining)
+  - location: 65 (remaining gas: 1039933.288 units remaining)
     [ (Left (Pair { Elt "foo" "bar" } { Elt "gaz" "baz" })) ]
-  - location: 60 (remaining gas: 1039920.038 units remaining)
+  - location: 60 (remaining gas: 1039933.278 units remaining)
     [ (Left (Pair { Elt "foo" "bar" } { Elt "gaz" "baz" })) ]
-  - location: 44 (remaining gas: 1039920.023 units remaining)
+  - location: 44 (remaining gas: 1039933.268 units remaining)
     [ (Left (Pair { Elt "foo" "bar" } { Elt "gaz" "baz" })) ]
-  - location: 151 (remaining gas: 1039920.008 units remaining)
+  - location: 151 (remaining gas: 1039933.258 units remaining)
     [ {}
       (Left (Pair { Elt "foo" "bar" } { Elt "gaz" "baz" })) ]
-  - location: 153 (remaining gas: 1039919.993 units remaining)
+  - location: 153 (remaining gas: 1039933.248 units remaining)
     [ (Pair {} (Left (Pair { Elt "foo" "bar" } { Elt "gaz" "baz" }))) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_check_signature.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_check_signature.out
index 988fdadbbf4d2b2edb7886a28b38aa569639123f..8c16c2c9f30c41da42b216edbde20884e8f3e8f4 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_check_signature.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_check_signature.out
@@ -8,18 +8,18 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (remaining gas: 1039651.905 units remaining)
+  - location: 9 (remaining gas: 1039652.865 units remaining)
     [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "hello") ]
-  - location: 9 (remaining gas: 1039651.895 units remaining)
+  - location: 9 (remaining gas: 1039652.855 units remaining)
     [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "hello")
       (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "hello") ]
-  - location: 10 (remaining gas: 1039651.885 units remaining)
+  - location: 10 (remaining gas: 1039652.845 units remaining)
     [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "hello")
@@ -29,20 +29,20 @@ trace
       (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "hello") ]
-  - location: 11 (remaining gas: 1039651.870 units remaining)
+  - location: 11 (remaining gas: 1039652.835 units remaining)
     [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "hello")
       (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "hello") ]
-  - location: 13 (remaining gas: 1039651.860 units remaining)
+  - location: 13 (remaining gas: 1039652.825 units remaining)
     [ (Pair "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "hello")
       (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "hello") ]
-  - location: 14 (remaining gas: 1039651.850 units remaining)
+  - location: 14 (remaining gas: 1039652.815 units remaining)
     [ (Pair "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "hello")
       (Pair "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
@@ -50,36 +50,36 @@ trace
       (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "hello") ]
-  - location: 15 (remaining gas: 1039651.840 units remaining)
+  - location: 15 (remaining gas: 1039652.805 units remaining)
     [ "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
       (Pair "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "hello")
       (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "hello") ]
-  - location: 16 (remaining gas: 1039651.825 units remaining)
+  - location: 16 (remaining gas: 1039652.795 units remaining)
     [ (Pair "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "hello")
       (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "hello") ]
-  - location: 18 (remaining gas: 1039651.815 units remaining)
+  - location: 18 (remaining gas: 1039652.785 units remaining)
     [ "hello"
       (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "hello") ]
-  - location: 19 (remaining gas: 1039651.324 units remaining)
+  - location: 19 (remaining gas: 1039652.294 units remaining)
     [ 0x05010000000568656c6c6f
       (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "hello") ]
-  - location: 16 (remaining gas: 1039651.294 units remaining)
+  - location: 16 (remaining gas: 1039652.274 units remaining)
     [ "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
       0x05010000000568656c6c6f
       (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "hello") ]
-  - location: 11 (remaining gas: 1039651.264 units remaining)
+  - location: 11 (remaining gas: 1039652.254 units remaining)
     [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "hello")
@@ -88,34 +88,34 @@ trace
       (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "hello") ]
-  - location: 20 (remaining gas: 1039651.254 units remaining)
+  - location: 20 (remaining gas: 1039652.244 units remaining)
     [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
       "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
       0x05010000000568656c6c6f
       (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "hello") ]
-  - location: 21 (remaining gas: 1039585.442 units remaining)
+  - location: 21 (remaining gas: 1039586.432 units remaining)
     [ True
       (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "hello") ]
-  - location: 22 (remaining gas: 1039585.432 units remaining)
+  - location: 22 (remaining gas: 1039586.422 units remaining)
     [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "hello") ]
-  - location: 22 (remaining gas: 1039585.417 units remaining)
+  - location: 22 (remaining gas: 1039586.412 units remaining)
     [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "hello") ]
-  - location: 28 (remaining gas: 1039585.407 units remaining)
+  - location: 28 (remaining gas: 1039586.402 units remaining)
     [ (Pair "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "hello") ]
-  - location: 29 (remaining gas: 1039585.392 units remaining)
+  - location: 29 (remaining gas: 1039586.392 units remaining)
     [ {}
       (Pair "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "hello") ]
-  - location: 31 (remaining gas: 1039585.377 units remaining)
+  - location: 31 (remaining gas: 1039586.382 units remaining)
     [ (Pair {}
             "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "hello") ]
@@ -136,18 +136,18 @@ At line 8 characters 14 to 18,
 script reached FAILWITH instruction
 with Unit
 trace
-  - location: 9 (remaining gas: 1039651.915 units remaining)
+  - location: 9 (remaining gas: 1039652.875 units remaining)
     [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "abcd") ]
-  - location: 9 (remaining gas: 1039651.905 units remaining)
+  - location: 9 (remaining gas: 1039652.865 units remaining)
     [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "abcd")
       (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "abcd") ]
-  - location: 10 (remaining gas: 1039651.895 units remaining)
+  - location: 10 (remaining gas: 1039652.855 units remaining)
     [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "abcd")
@@ -157,20 +157,20 @@ trace
       (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "abcd") ]
-  - location: 11 (remaining gas: 1039651.880 units remaining)
+  - location: 11 (remaining gas: 1039652.845 units remaining)
     [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "abcd")
       (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "abcd") ]
-  - location: 13 (remaining gas: 1039651.870 units remaining)
+  - location: 13 (remaining gas: 1039652.835 units remaining)
     [ (Pair "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "abcd")
       (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "abcd") ]
-  - location: 14 (remaining gas: 1039651.860 units remaining)
+  - location: 14 (remaining gas: 1039652.825 units remaining)
     [ (Pair "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "abcd")
       (Pair "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
@@ -178,36 +178,36 @@ trace
       (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "abcd") ]
-  - location: 15 (remaining gas: 1039651.850 units remaining)
+  - location: 15 (remaining gas: 1039652.815 units remaining)
     [ "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
       (Pair "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "abcd")
       (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "abcd") ]
-  - location: 16 (remaining gas: 1039651.835 units remaining)
+  - location: 16 (remaining gas: 1039652.805 units remaining)
     [ (Pair "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "abcd")
       (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "abcd") ]
-  - location: 18 (remaining gas: 1039651.825 units remaining)
+  - location: 18 (remaining gas: 1039652.795 units remaining)
     [ "abcd"
       (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "abcd") ]
-  - location: 19 (remaining gas: 1039651.367 units remaining)
+  - location: 19 (remaining gas: 1039652.337 units remaining)
     [ 0x05010000000461626364
       (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "abcd") ]
-  - location: 16 (remaining gas: 1039651.337 units remaining)
+  - location: 16 (remaining gas: 1039652.317 units remaining)
     [ "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
       0x05010000000461626364
       (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "abcd") ]
-  - location: 11 (remaining gas: 1039651.307 units remaining)
+  - location: 11 (remaining gas: 1039652.297 units remaining)
     [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "abcd")
@@ -216,23 +216,23 @@ trace
       (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "abcd") ]
-  - location: 20 (remaining gas: 1039651.297 units remaining)
+  - location: 20 (remaining gas: 1039652.287 units remaining)
     [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
       "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
       0x05010000000461626364
       (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "abcd") ]
-  - location: 21 (remaining gas: 1039585.486 units remaining)
+  - location: 21 (remaining gas: 1039586.476 units remaining)
     [ False
       (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "abcd") ]
-  - location: 22 (remaining gas: 1039585.476 units remaining)
+  - location: 22 (remaining gas: 1039586.466 units remaining)
     [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
             "abcd") ]
-  - location: 26 (remaining gas: 1039585.466 units remaining)
+  - location: 26 (remaining gas: 1039586.456 units remaining)
     [ Unit
       (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             "edsigu3QszDjUpeqYqbvhyRxMpVFamEnvm9FYnt7YiiNt9nmjYfh8ZTbsybZ5WnBkhA7zfHsRVyuTnRsGLR6fNHt1Up1FxgyRtF"
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[abs.tz-Unit-0-Unit].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[abs.tz-Unit-0-Unit].out
index 1e5ceba092ac2b8bf44f1709f7dd7cef17041456..0c02c049c3c943bea0f5a535c444fe614c38c774 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[abs.tz-Unit-0-Unit].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[abs.tz-Unit-0-Unit].out
@@ -7,32 +7,32 @@ emitted operations
 big_map diff
   
 trace
-  - location: 7 (remaining gas: 1039988.329 units remaining)
+  - location: 7 (remaining gas: 1039989.129 units remaining)
     [ (Pair 0 Unit) ]
-  - location: 7 (remaining gas: 1039988.319 units remaining)
+  - location: 7 (remaining gas: 1039989.119 units remaining)
     [ 0 ]
-  - location: 8 (remaining gas: 1039988.309 units remaining)
+  - location: 8 (remaining gas: 1039989.109 units remaining)
     [ 0
       0 ]
-  - location: 9 (remaining gas: 1039988.269 units remaining)
+  - location: 9 (remaining gas: 1039989.084 units remaining)
     [ 0
       0 ]
-  - location: 10 (remaining gas: 1039988.244 units remaining)
+  - location: 10 (remaining gas: 1039989.064 units remaining)
     [ 0
       0 ]
-  - location: 11 (remaining gas: 1039988.209 units remaining)
+  - location: 11 (remaining gas: 1039989.029 units remaining)
     [ 0 ]
-  - location: 13 (remaining gas: 1039988.194 units remaining)
+  - location: 13 (remaining gas: 1039989.019 units remaining)
     [ True ]
-  - location: 14 (remaining gas: 1039988.184 units remaining)
+  - location: 14 (remaining gas: 1039989.009 units remaining)
     [  ]
-  - location: 14 (remaining gas: 1039988.169 units remaining)
+  - location: 14 (remaining gas: 1039988.999 units remaining)
     [  ]
-  - location: 20 (remaining gas: 1039988.159 units remaining)
+  - location: 20 (remaining gas: 1039988.989 units remaining)
     [ Unit ]
-  - location: 21 (remaining gas: 1039988.144 units remaining)
+  - location: 21 (remaining gas: 1039988.979 units remaining)
     [ {}
       Unit ]
-  - location: 23 (remaining gas: 1039988.129 units remaining)
+  - location: 23 (remaining gas: 1039988.969 units remaining)
     [ (Pair {} Unit) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[abs.tz-Unit-12039123919239192312931-Unit].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[abs.tz-Unit-12039123919239192312931-Unit].out
index 65f79920e8a4c4a149d58472e1c206f847f140f7..2858c1e4faca9d21fe10d24756ac248d18e72ef6 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[abs.tz-Unit-12039123919239192312931-Unit].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[abs.tz-Unit-12039123919239192312931-Unit].out
@@ -7,32 +7,32 @@ emitted operations
 big_map diff
   
 trace
-  - location: 7 (remaining gas: 1039988.329 units remaining)
+  - location: 7 (remaining gas: 1039989.129 units remaining)
     [ (Pair 12039123919239192312931 Unit) ]
-  - location: 7 (remaining gas: 1039988.319 units remaining)
+  - location: 7 (remaining gas: 1039989.119 units remaining)
     [ 12039123919239192312931 ]
-  - location: 8 (remaining gas: 1039988.309 units remaining)
+  - location: 8 (remaining gas: 1039989.109 units remaining)
     [ 12039123919239192312931
       12039123919239192312931 ]
-  - location: 9 (remaining gas: 1039988.269 units remaining)
+  - location: 9 (remaining gas: 1039989.084 units remaining)
     [ -12039123919239192312931
       12039123919239192312931 ]
-  - location: 10 (remaining gas: 1039988.244 units remaining)
+  - location: 10 (remaining gas: 1039989.064 units remaining)
     [ 12039123919239192312931
       12039123919239192312931 ]
-  - location: 11 (remaining gas: 1039988.209 units remaining)
+  - location: 11 (remaining gas: 1039989.029 units remaining)
     [ 0 ]
-  - location: 13 (remaining gas: 1039988.194 units remaining)
+  - location: 13 (remaining gas: 1039989.019 units remaining)
     [ True ]
-  - location: 14 (remaining gas: 1039988.184 units remaining)
+  - location: 14 (remaining gas: 1039989.009 units remaining)
     [  ]
-  - location: 14 (remaining gas: 1039988.169 units remaining)
+  - location: 14 (remaining gas: 1039988.999 units remaining)
     [  ]
-  - location: 20 (remaining gas: 1039988.159 units remaining)
+  - location: 20 (remaining gas: 1039988.989 units remaining)
     [ Unit ]
-  - location: 21 (remaining gas: 1039988.144 units remaining)
+  - location: 21 (remaining gas: 1039988.979 units remaining)
     [ {}
       Unit ]
-  - location: 23 (remaining gas: 1039988.129 units remaining)
+  - location: 23 (remaining gas: 1039988.969 units remaining)
     [ (Pair {} Unit) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[abs.tz-Unit-948-Unit].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[abs.tz-Unit-948-Unit].out
index e3f8e94b61517272d8e998aacedacbc802be8647..d525986344da7a9800765c7cb9e3abc8b1496665 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[abs.tz-Unit-948-Unit].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[abs.tz-Unit-948-Unit].out
@@ -7,32 +7,32 @@ emitted operations
 big_map diff
   
 trace
-  - location: 7 (remaining gas: 1039988.329 units remaining)
+  - location: 7 (remaining gas: 1039989.129 units remaining)
     [ (Pair 948 Unit) ]
-  - location: 7 (remaining gas: 1039988.319 units remaining)
+  - location: 7 (remaining gas: 1039989.119 units remaining)
     [ 948 ]
-  - location: 8 (remaining gas: 1039988.309 units remaining)
+  - location: 8 (remaining gas: 1039989.109 units remaining)
     [ 948
       948 ]
-  - location: 9 (remaining gas: 1039988.269 units remaining)
+  - location: 9 (remaining gas: 1039989.084 units remaining)
     [ -948
       948 ]
-  - location: 10 (remaining gas: 1039988.244 units remaining)
+  - location: 10 (remaining gas: 1039989.064 units remaining)
     [ 948
       948 ]
-  - location: 11 (remaining gas: 1039988.209 units remaining)
+  - location: 11 (remaining gas: 1039989.029 units remaining)
     [ 0 ]
-  - location: 13 (remaining gas: 1039988.194 units remaining)
+  - location: 13 (remaining gas: 1039989.019 units remaining)
     [ True ]
-  - location: 14 (remaining gas: 1039988.184 units remaining)
+  - location: 14 (remaining gas: 1039989.009 units remaining)
     [  ]
-  - location: 14 (remaining gas: 1039988.169 units remaining)
+  - location: 14 (remaining gas: 1039988.999 units remaining)
     [  ]
-  - location: 20 (remaining gas: 1039988.159 units remaining)
+  - location: 20 (remaining gas: 1039988.989 units remaining)
     [ Unit ]
-  - location: 21 (remaining gas: 1039988.144 units remaining)
+  - location: 21 (remaining gas: 1039988.979 units remaining)
     [ {}
       Unit ]
-  - location: 23 (remaining gas: 1039988.129 units remaining)
+  - location: 23 (remaining gas: 1039988.969 units remaining)
     [ (Pair {} Unit) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add.tz-Unit-Unit-Unit].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add.tz-Unit-Unit-Unit].out
index 6c4e5eb5d75f4841b7864a4f06cb6913982c550d..c677be7050fd774a29be5dc230d023cb90ee5ad5 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add.tz-Unit-Unit-Unit].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add.tz-Unit-Unit-Unit].out
@@ -7,205 +7,205 @@ emitted operations
 big_map diff
   
 trace
-  - location: 7 (remaining gas: 1039926.048 units remaining)
+  - location: 7 (remaining gas: 1039925.048 units remaining)
     [ (Pair Unit Unit) ]
-  - location: 7 (remaining gas: 1039926.038 units remaining)
+  - location: 7 (remaining gas: 1039925.038 units remaining)
     [ Unit ]
-  - location: 8 (remaining gas: 1039926.028 units remaining)
+  - location: 8 (remaining gas: 1039925.028 units remaining)
     [ 2
       Unit ]
-  - location: 11 (remaining gas: 1039926.018 units remaining)
+  - location: 11 (remaining gas: 1039925.018 units remaining)
     [ 2
       2
       Unit ]
-  - location: 14 (remaining gas: 1039925.963 units remaining)
+  - location: 14 (remaining gas: 1039924.983 units remaining)
     [ 4
       Unit ]
-  - location: 15 (remaining gas: 1039925.953 units remaining)
+  - location: 15 (remaining gas: 1039924.973 units remaining)
     [ 4
       4
       Unit ]
-  - location: 20 (remaining gas: 1039925.918 units remaining)
+  - location: 20 (remaining gas: 1039924.938 units remaining)
     [ 0
       Unit ]
-  - location: 21 (remaining gas: 1039925.903 units remaining)
+  - location: 21 (remaining gas: 1039924.928 units remaining)
     [ True
       Unit ]
-  - location: 22 (remaining gas: 1039925.893 units remaining)
+  - location: 22 (remaining gas: 1039924.918 units remaining)
     [ Unit ]
-  - location: 22 (remaining gas: 1039925.878 units remaining)
+  - location: 22 (remaining gas: 1039924.908 units remaining)
     [ Unit ]
-  - location: 28 (remaining gas: 1039925.868 units remaining)
+  - location: 28 (remaining gas: 1039924.898 units remaining)
     [ 2
       Unit ]
-  - location: 31 (remaining gas: 1039925.858 units remaining)
+  - location: 31 (remaining gas: 1039924.888 units remaining)
     [ 2
       2
       Unit ]
-  - location: 34 (remaining gas: 1039925.803 units remaining)
+  - location: 34 (remaining gas: 1039924.853 units remaining)
     [ 4
       Unit ]
-  - location: 35 (remaining gas: 1039925.793 units remaining)
+  - location: 35 (remaining gas: 1039924.843 units remaining)
     [ 4
       4
       Unit ]
-  - location: 40 (remaining gas: 1039925.758 units remaining)
+  - location: 40 (remaining gas: 1039924.808 units remaining)
     [ 0
       Unit ]
-  - location: 41 (remaining gas: 1039925.743 units remaining)
+  - location: 41 (remaining gas: 1039924.798 units remaining)
     [ True
       Unit ]
-  - location: 42 (remaining gas: 1039925.733 units remaining)
+  - location: 42 (remaining gas: 1039924.788 units remaining)
     [ Unit ]
-  - location: 42 (remaining gas: 1039925.718 units remaining)
+  - location: 42 (remaining gas: 1039924.778 units remaining)
     [ Unit ]
-  - location: 48 (remaining gas: 1039925.708 units remaining)
+  - location: 48 (remaining gas: 1039924.768 units remaining)
     [ 2
       Unit ]
-  - location: 51 (remaining gas: 1039925.698 units remaining)
+  - location: 51 (remaining gas: 1039924.758 units remaining)
     [ 2
       2
       Unit ]
-  - location: 54 (remaining gas: 1039925.643 units remaining)
+  - location: 54 (remaining gas: 1039924.723 units remaining)
     [ 4
       Unit ]
-  - location: 55 (remaining gas: 1039925.633 units remaining)
+  - location: 55 (remaining gas: 1039924.713 units remaining)
     [ 4
       4
       Unit ]
-  - location: 60 (remaining gas: 1039925.598 units remaining)
+  - location: 60 (remaining gas: 1039924.678 units remaining)
     [ 0
       Unit ]
-  - location: 61 (remaining gas: 1039925.583 units remaining)
+  - location: 61 (remaining gas: 1039924.668 units remaining)
     [ True
       Unit ]
-  - location: 62 (remaining gas: 1039925.573 units remaining)
+  - location: 62 (remaining gas: 1039924.658 units remaining)
     [ Unit ]
-  - location: 62 (remaining gas: 1039925.558 units remaining)
+  - location: 62 (remaining gas: 1039924.648 units remaining)
     [ Unit ]
-  - location: 68 (remaining gas: 1039925.548 units remaining)
+  - location: 68 (remaining gas: 1039924.638 units remaining)
     [ 2
       Unit ]
-  - location: 71 (remaining gas: 1039925.538 units remaining)
+  - location: 71 (remaining gas: 1039924.628 units remaining)
     [ 2
       2
       Unit ]
-  - location: 74 (remaining gas: 1039925.483 units remaining)
+  - location: 74 (remaining gas: 1039924.593 units remaining)
     [ 4
       Unit ]
-  - location: 75 (remaining gas: 1039925.473 units remaining)
+  - location: 75 (remaining gas: 1039924.583 units remaining)
     [ 4
       4
       Unit ]
-  - location: 80 (remaining gas: 1039925.438 units remaining)
+  - location: 80 (remaining gas: 1039924.548 units remaining)
     [ 0
       Unit ]
-  - location: 81 (remaining gas: 1039925.423 units remaining)
+  - location: 81 (remaining gas: 1039924.538 units remaining)
     [ True
       Unit ]
-  - location: 82 (remaining gas: 1039925.413 units remaining)
+  - location: 82 (remaining gas: 1039924.528 units remaining)
     [ Unit ]
-  - location: 82 (remaining gas: 1039925.398 units remaining)
+  - location: 82 (remaining gas: 1039924.518 units remaining)
     [ Unit ]
-  - location: 88 (remaining gas: 1039925.388 units remaining)
+  - location: 88 (remaining gas: 1039924.508 units remaining)
     [ 2
       Unit ]
-  - location: 91 (remaining gas: 1039925.378 units remaining)
+  - location: 91 (remaining gas: 1039924.498 units remaining)
     [ 2
       2
       Unit ]
-  - location: 94 (remaining gas: 1039925.323 units remaining)
+  - location: 94 (remaining gas: 1039924.463 units remaining)
     [ 4
       Unit ]
-  - location: 95 (remaining gas: 1039925.313 units remaining)
+  - location: 95 (remaining gas: 1039924.453 units remaining)
     [ 4
       4
       Unit ]
-  - location: 100 (remaining gas: 1039925.278 units remaining)
+  - location: 100 (remaining gas: 1039924.418 units remaining)
     [ 0
       Unit ]
-  - location: 101 (remaining gas: 1039925.263 units remaining)
+  - location: 101 (remaining gas: 1039924.408 units remaining)
     [ True
       Unit ]
-  - location: 102 (remaining gas: 1039925.253 units remaining)
+  - location: 102 (remaining gas: 1039924.398 units remaining)
     [ Unit ]
-  - location: 102 (remaining gas: 1039925.238 units remaining)
+  - location: 102 (remaining gas: 1039924.388 units remaining)
     [ Unit ]
-  - location: 108 (remaining gas: 1039925.228 units remaining)
+  - location: 108 (remaining gas: 1039924.378 units remaining)
     [ 60
       Unit ]
-  - location: 111 (remaining gas: 1039925.218 units remaining)
+  - location: 111 (remaining gas: 1039924.368 units remaining)
     [ "2019-09-09T12:08:37Z"
       60
       Unit ]
-  - location: 114 (remaining gas: 1039925.163 units remaining)
+  - location: 114 (remaining gas: 1039924.333 units remaining)
     [ "2019-09-09T12:09:37Z"
       Unit ]
-  - location: 115 (remaining gas: 1039925.153 units remaining)
+  - location: 115 (remaining gas: 1039924.323 units remaining)
     [ "2019-09-09T12:09:37Z"
       "2019-09-09T12:09:37Z"
       Unit ]
-  - location: 120 (remaining gas: 1039925.118 units remaining)
+  - location: 120 (remaining gas: 1039924.288 units remaining)
     [ 0
       Unit ]
-  - location: 121 (remaining gas: 1039925.103 units remaining)
+  - location: 121 (remaining gas: 1039924.278 units remaining)
     [ True
       Unit ]
-  - location: 122 (remaining gas: 1039925.093 units remaining)
+  - location: 122 (remaining gas: 1039924.268 units remaining)
     [ Unit ]
-  - location: 122 (remaining gas: 1039925.078 units remaining)
+  - location: 122 (remaining gas: 1039924.258 units remaining)
     [ Unit ]
-  - location: 128 (remaining gas: 1039925.068 units remaining)
+  - location: 128 (remaining gas: 1039924.248 units remaining)
     [ "2019-09-09T12:08:37Z"
       Unit ]
-  - location: 131 (remaining gas: 1039925.058 units remaining)
+  - location: 131 (remaining gas: 1039924.238 units remaining)
     [ 60
       "2019-09-09T12:08:37Z"
       Unit ]
-  - location: 134 (remaining gas: 1039925.003 units remaining)
+  - location: 134 (remaining gas: 1039924.203 units remaining)
     [ "2019-09-09T12:09:37Z"
       Unit ]
-  - location: 135 (remaining gas: 1039924.993 units remaining)
+  - location: 135 (remaining gas: 1039924.193 units remaining)
     [ "2019-09-09T12:09:37Z"
       "2019-09-09T12:09:37Z"
       Unit ]
-  - location: 140 (remaining gas: 1039924.958 units remaining)
+  - location: 140 (remaining gas: 1039924.158 units remaining)
     [ 0
       Unit ]
-  - location: 141 (remaining gas: 1039924.943 units remaining)
+  - location: 141 (remaining gas: 1039924.148 units remaining)
     [ True
       Unit ]
-  - location: 142 (remaining gas: 1039924.933 units remaining)
+  - location: 142 (remaining gas: 1039924.138 units remaining)
     [ Unit ]
-  - location: 142 (remaining gas: 1039924.918 units remaining)
+  - location: 142 (remaining gas: 1039924.128 units remaining)
     [ Unit ]
-  - location: 148 (remaining gas: 1039924.908 units remaining)
+  - location: 148 (remaining gas: 1039924.118 units remaining)
     [ 1000
       Unit ]
-  - location: 151 (remaining gas: 1039924.898 units remaining)
+  - location: 151 (remaining gas: 1039924.108 units remaining)
     [ 1000
       1000
       Unit ]
-  - location: 154 (remaining gas: 1039924.878 units remaining)
+  - location: 154 (remaining gas: 1039924.088 units remaining)
     [ 2000
       Unit ]
-  - location: 155 (remaining gas: 1039924.868 units remaining)
+  - location: 155 (remaining gas: 1039924.078 units remaining)
     [ 2000
       2000
       Unit ]
-  - location: 160 (remaining gas: 1039924.833 units remaining)
+  - location: 160 (remaining gas: 1039924.043 units remaining)
     [ 0
       Unit ]
-  - location: 161 (remaining gas: 1039924.818 units remaining)
+  - location: 161 (remaining gas: 1039924.033 units remaining)
     [ True
       Unit ]
-  - location: 162 (remaining gas: 1039924.808 units remaining)
+  - location: 162 (remaining gas: 1039924.023 units remaining)
     [ Unit ]
-  - location: 162 (remaining gas: 1039924.793 units remaining)
+  - location: 162 (remaining gas: 1039924.013 units remaining)
     [ Unit ]
-  - location: 168 (remaining gas: 1039924.778 units remaining)
+  - location: 168 (remaining gas: 1039924.003 units remaining)
     [ {}
       Unit ]
-  - location: 170 (remaining gas: 1039924.763 units remaining)
+  - location: 170 (remaining gas: 1039923.993 units remaining)
     [ (Pair {} Unit) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_bls12_381_fr.tz-None-Pair 0x00 0x00-(Some 0x0000000.3c2de60480.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_bls12_381_fr.tz-None-Pair 0x00 0x00-(Some 0x0000000.3c2de60480.out
index 4adc7e217f79ec38943ab0418353f8e907053f56..215463158df994a651b56fe82c37d152d30bbb11 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_bls12_381_fr.tz-None-Pair 0x00 0x00-(Some 0x0000000.3c2de60480.out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_bls12_381_fr.tz-None-Pair 0x00 0x00-(Some 0x0000000.3c2de60480.out	
@@ -7,24 +7,24 @@ emitted operations
 big_map diff
   
 trace
-  - location: 10 (remaining gas: 1039992.489 units remaining)
+  - location: 10 (remaining gas: 1039993.349 units remaining)
     [ (Pair (Pair 0x0000000000000000000000000000000000000000000000000000000000000000
                   0x0000000000000000000000000000000000000000000000000000000000000000)
             None) ]
-  - location: 10 (remaining gas: 1039992.479 units remaining)
+  - location: 10 (remaining gas: 1039993.339 units remaining)
     [ (Pair 0x0000000000000000000000000000000000000000000000000000000000000000
             0x0000000000000000000000000000000000000000000000000000000000000000) ]
-  - location: 11 (remaining gas: 1039992.469 units remaining)
+  - location: 11 (remaining gas: 1039993.329 units remaining)
     [ 0x0000000000000000000000000000000000000000000000000000000000000000
       0x0000000000000000000000000000000000000000000000000000000000000000 ]
-  - location: 12 (remaining gas: 1039992.424 units remaining)
+  - location: 12 (remaining gas: 1039993.299 units remaining)
     [ 0x0000000000000000000000000000000000000000000000000000000000000000 ]
-  - location: 13 (remaining gas: 1039992.409 units remaining)
+  - location: 13 (remaining gas: 1039993.289 units remaining)
     [ (Some 0x0000000000000000000000000000000000000000000000000000000000000000) ]
-  - location: 14 (remaining gas: 1039992.394 units remaining)
+  - location: 14 (remaining gas: 1039993.279 units remaining)
     [ {}
       (Some 0x0000000000000000000000000000000000000000000000000000000000000000) ]
-  - location: 16 (remaining gas: 1039992.379 units remaining)
+  - location: 16 (remaining gas: 1039993.269 units remaining)
     [ (Pair {}
             (Some 0x0000000000000000000000000000000000000000000000000000000000000000)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_bls12_381_fr.tz-None-Pair 0x01 0x00-(Some 0x0100000.12b2c1172b.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_bls12_381_fr.tz-None-Pair 0x01 0x00-(Some 0x0100000.12b2c1172b.out
index d5b4c7a3da2d593e99c3ec588db2582d8b86c166..aba515bd6260ded83d1d373c69532f7c6d2f0575 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_bls12_381_fr.tz-None-Pair 0x01 0x00-(Some 0x0100000.12b2c1172b.out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_bls12_381_fr.tz-None-Pair 0x01 0x00-(Some 0x0100000.12b2c1172b.out	
@@ -7,24 +7,24 @@ emitted operations
 big_map diff
   
 trace
-  - location: 10 (remaining gas: 1039992.489 units remaining)
+  - location: 10 (remaining gas: 1039993.349 units remaining)
     [ (Pair (Pair 0x0100000000000000000000000000000000000000000000000000000000000000
                   0x0000000000000000000000000000000000000000000000000000000000000000)
             None) ]
-  - location: 10 (remaining gas: 1039992.479 units remaining)
+  - location: 10 (remaining gas: 1039993.339 units remaining)
     [ (Pair 0x0100000000000000000000000000000000000000000000000000000000000000
             0x0000000000000000000000000000000000000000000000000000000000000000) ]
-  - location: 11 (remaining gas: 1039992.469 units remaining)
+  - location: 11 (remaining gas: 1039993.329 units remaining)
     [ 0x0100000000000000000000000000000000000000000000000000000000000000
       0x0000000000000000000000000000000000000000000000000000000000000000 ]
-  - location: 12 (remaining gas: 1039992.424 units remaining)
+  - location: 12 (remaining gas: 1039993.299 units remaining)
     [ 0x0100000000000000000000000000000000000000000000000000000000000000 ]
-  - location: 13 (remaining gas: 1039992.409 units remaining)
+  - location: 13 (remaining gas: 1039993.289 units remaining)
     [ (Some 0x0100000000000000000000000000000000000000000000000000000000000000) ]
-  - location: 14 (remaining gas: 1039992.394 units remaining)
+  - location: 14 (remaining gas: 1039993.279 units remaining)
     [ {}
       (Some 0x0100000000000000000000000000000000000000000000000000000000000000) ]
-  - location: 16 (remaining gas: 1039992.379 units remaining)
+  - location: 16 (remaining gas: 1039993.269 units remaining)
     [ (Pair {}
             (Some 0x0100000000000000000000000000000000000000000000000000000000000000)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_bls12_381_fr.tz-None-Pair 0x010000 0x00-(Some 0x010.0e44fc6f40.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_bls12_381_fr.tz-None-Pair 0x010000 0x00-(Some 0x010.0e44fc6f40.out
index 0ad0c9d1a62a50e96f66e2045f19bee27d0abc79..4e85dc4661e4a176b8541e3e0f1c4dfaccbf03a3 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_bls12_381_fr.tz-None-Pair 0x010000 0x00-(Some 0x010.0e44fc6f40.out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_bls12_381_fr.tz-None-Pair 0x010000 0x00-(Some 0x010.0e44fc6f40.out	
@@ -7,24 +7,24 @@ emitted operations
 big_map diff
   
 trace
-  - location: 10 (remaining gas: 1039992.489 units remaining)
+  - location: 10 (remaining gas: 1039993.349 units remaining)
     [ (Pair (Pair 0x0100000000000000000000000000000000000000000000000000000000000000
                   0x0000000000000000000000000000000000000000000000000000000000000000)
             None) ]
-  - location: 10 (remaining gas: 1039992.479 units remaining)
+  - location: 10 (remaining gas: 1039993.339 units remaining)
     [ (Pair 0x0100000000000000000000000000000000000000000000000000000000000000
             0x0000000000000000000000000000000000000000000000000000000000000000) ]
-  - location: 11 (remaining gas: 1039992.469 units remaining)
+  - location: 11 (remaining gas: 1039993.329 units remaining)
     [ 0x0100000000000000000000000000000000000000000000000000000000000000
       0x0000000000000000000000000000000000000000000000000000000000000000 ]
-  - location: 12 (remaining gas: 1039992.424 units remaining)
+  - location: 12 (remaining gas: 1039993.299 units remaining)
     [ 0x0100000000000000000000000000000000000000000000000000000000000000 ]
-  - location: 13 (remaining gas: 1039992.409 units remaining)
+  - location: 13 (remaining gas: 1039993.289 units remaining)
     [ (Some 0x0100000000000000000000000000000000000000000000000000000000000000) ]
-  - location: 14 (remaining gas: 1039992.394 units remaining)
+  - location: 14 (remaining gas: 1039993.279 units remaining)
     [ {}
       (Some 0x0100000000000000000000000000000000000000000000000000000000000000) ]
-  - location: 16 (remaining gas: 1039992.379 units remaining)
+  - location: 16 (remaining gas: 1039993.269 units remaining)
     [ (Pair {}
             (Some 0x0100000000000000000000000000000000000000000000000000000000000000)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_bls12_381_fr.tz-None-Pair 0x010000 0x010000-(Some 0.7e0ed229a3.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_bls12_381_fr.tz-None-Pair 0x010000 0x010000-(Some 0.7e0ed229a3.out
index c7760b07d33f3f66a24139f766dad744d4ebe68c..2d0b82bf8a70017ccc79f3f5169fa6e7c5825505 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_bls12_381_fr.tz-None-Pair 0x010000 0x010000-(Some 0.7e0ed229a3.out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_bls12_381_fr.tz-None-Pair 0x010000 0x010000-(Some 0.7e0ed229a3.out	
@@ -7,24 +7,24 @@ emitted operations
 big_map diff
   
 trace
-  - location: 10 (remaining gas: 1039992.489 units remaining)
+  - location: 10 (remaining gas: 1039993.349 units remaining)
     [ (Pair (Pair 0x0100000000000000000000000000000000000000000000000000000000000000
                   0x0100000000000000000000000000000000000000000000000000000000000000)
             None) ]
-  - location: 10 (remaining gas: 1039992.479 units remaining)
+  - location: 10 (remaining gas: 1039993.339 units remaining)
     [ (Pair 0x0100000000000000000000000000000000000000000000000000000000000000
             0x0100000000000000000000000000000000000000000000000000000000000000) ]
-  - location: 11 (remaining gas: 1039992.469 units remaining)
+  - location: 11 (remaining gas: 1039993.329 units remaining)
     [ 0x0100000000000000000000000000000000000000000000000000000000000000
       0x0100000000000000000000000000000000000000000000000000000000000000 ]
-  - location: 12 (remaining gas: 1039992.424 units remaining)
+  - location: 12 (remaining gas: 1039993.299 units remaining)
     [ 0x0200000000000000000000000000000000000000000000000000000000000000 ]
-  - location: 13 (remaining gas: 1039992.409 units remaining)
+  - location: 13 (remaining gas: 1039993.289 units remaining)
     [ (Some 0x0200000000000000000000000000000000000000000000000000000000000000) ]
-  - location: 14 (remaining gas: 1039992.394 units remaining)
+  - location: 14 (remaining gas: 1039993.279 units remaining)
     [ {}
       (Some 0x0200000000000000000000000000000000000000000000000000000000000000) ]
-  - location: 16 (remaining gas: 1039992.379 units remaining)
+  - location: 16 (remaining gas: 1039993.269 units remaining)
     [ (Pair {}
             (Some 0x0200000000000000000000000000000000000000000000000000000000000000)) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_delta_timestamp.tz-None-(Pair -100 100)-(Some \"1970.7c1b1e4e5b.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_delta_timestamp.tz-None-(Pair -100 100)-(Some \"1970.7c1b1e4e5b.out"
index a7b55ad101eb8c59c76772886ea8400b6aa1ff07..74d45201381ac20d9dcbf6d4e241e9821a5e54fe 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_delta_timestamp.tz-None-(Pair -100 100)-(Some \"1970.7c1b1e4e5b.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_delta_timestamp.tz-None-(Pair -100 100)-(Some \"1970.7c1b1e4e5b.out"	
@@ -7,30 +7,30 @@ emitted operations
 big_map diff
   
 trace
-  - location: 10 (remaining gas: 1039990.518 units remaining)
+  - location: 10 (remaining gas: 1039991.318 units remaining)
     [ (Pair (Pair -100 "1970-01-01T00:01:40Z") None) ]
-  - location: 10 (remaining gas: 1039990.508 units remaining)
+  - location: 10 (remaining gas: 1039991.308 units remaining)
     [ (Pair -100 "1970-01-01T00:01:40Z") ]
-  - location: 11 (remaining gas: 1039990.498 units remaining)
+  - location: 11 (remaining gas: 1039991.298 units remaining)
     [ (Pair -100 "1970-01-01T00:01:40Z")
       (Pair -100 "1970-01-01T00:01:40Z") ]
-  - location: 12 (remaining gas: 1039990.488 units remaining)
+  - location: 12 (remaining gas: 1039991.288 units remaining)
     [ -100
       (Pair -100 "1970-01-01T00:01:40Z") ]
-  - location: 13 (remaining gas: 1039990.473 units remaining)
+  - location: 13 (remaining gas: 1039991.278 units remaining)
     [ (Pair -100 "1970-01-01T00:01:40Z") ]
-  - location: 15 (remaining gas: 1039990.463 units remaining)
+  - location: 15 (remaining gas: 1039991.268 units remaining)
     [ "1970-01-01T00:01:40Z" ]
-  - location: 13 (remaining gas: 1039990.433 units remaining)
+  - location: 13 (remaining gas: 1039991.248 units remaining)
     [ -100
       "1970-01-01T00:01:40Z" ]
-  - location: 16 (remaining gas: 1039990.378 units remaining)
+  - location: 16 (remaining gas: 1039991.213 units remaining)
     [ "1970-01-01T00:00:00Z" ]
-  - location: 17 (remaining gas: 1039990.363 units remaining)
+  - location: 17 (remaining gas: 1039991.203 units remaining)
     [ (Some "1970-01-01T00:00:00Z") ]
-  - location: 18 (remaining gas: 1039990.348 units remaining)
+  - location: 18 (remaining gas: 1039991.193 units remaining)
     [ {}
       (Some "1970-01-01T00:00:00Z") ]
-  - location: 20 (remaining gas: 1039990.333 units remaining)
+  - location: 20 (remaining gas: 1039991.183 units remaining)
     [ (Pair {} (Some "1970-01-01T00:00:00Z")) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_delta_timestamp.tz-None-(Pair 0 \"1970-01-01T00:00:0.528ed42c01.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_delta_timestamp.tz-None-(Pair 0 \"1970-01-01T00:00:0.528ed42c01.out"
index 03fe3abf21d9c3ce43dbbb2425800440ce6e3ca7..38626a779e691c03c9d386eeb7e51b55e35b76c4 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_delta_timestamp.tz-None-(Pair 0 \"1970-01-01T00:00:0.528ed42c01.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_delta_timestamp.tz-None-(Pair 0 \"1970-01-01T00:00:0.528ed42c01.out"	
@@ -7,30 +7,30 @@ emitted operations
 big_map diff
   
 trace
-  - location: 10 (remaining gas: 1039990.418 units remaining)
+  - location: 10 (remaining gas: 1039990.488 units remaining)
     [ (Pair (Pair 0 "1970-01-01T00:00:00Z") None) ]
-  - location: 10 (remaining gas: 1039990.408 units remaining)
+  - location: 10 (remaining gas: 1039990.478 units remaining)
     [ (Pair 0 "1970-01-01T00:00:00Z") ]
-  - location: 11 (remaining gas: 1039990.398 units remaining)
+  - location: 11 (remaining gas: 1039990.468 units remaining)
     [ (Pair 0 "1970-01-01T00:00:00Z")
       (Pair 0 "1970-01-01T00:00:00Z") ]
-  - location: 12 (remaining gas: 1039990.388 units remaining)
+  - location: 12 (remaining gas: 1039990.458 units remaining)
     [ 0
       (Pair 0 "1970-01-01T00:00:00Z") ]
-  - location: 13 (remaining gas: 1039990.373 units remaining)
+  - location: 13 (remaining gas: 1039990.448 units remaining)
     [ (Pair 0 "1970-01-01T00:00:00Z") ]
-  - location: 15 (remaining gas: 1039990.363 units remaining)
+  - location: 15 (remaining gas: 1039990.438 units remaining)
     [ "1970-01-01T00:00:00Z" ]
-  - location: 13 (remaining gas: 1039990.333 units remaining)
+  - location: 13 (remaining gas: 1039990.418 units remaining)
     [ 0
       "1970-01-01T00:00:00Z" ]
-  - location: 16 (remaining gas: 1039990.278 units remaining)
+  - location: 16 (remaining gas: 1039990.383 units remaining)
     [ "1970-01-01T00:00:00Z" ]
-  - location: 17 (remaining gas: 1039990.263 units remaining)
+  - location: 17 (remaining gas: 1039990.373 units remaining)
     [ (Some "1970-01-01T00:00:00Z") ]
-  - location: 18 (remaining gas: 1039990.248 units remaining)
+  - location: 18 (remaining gas: 1039990.363 units remaining)
     [ {}
       (Some "1970-01-01T00:00:00Z") ]
-  - location: 20 (remaining gas: 1039990.233 units remaining)
+  - location: 20 (remaining gas: 1039990.353 units remaining)
     [ (Pair {} (Some "1970-01-01T00:00:00Z")) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_delta_timestamp.tz-None-(Pair 100 100)-(Some \"1970-.6566111ad2.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_delta_timestamp.tz-None-(Pair 100 100)-(Some \"1970-.6566111ad2.out"
index d7bb3fd202501cce9acc33351bc97808b45e49cb..64cbdaa7e97362017d8e23ba1d86dd64b6acff72 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_delta_timestamp.tz-None-(Pair 100 100)-(Some \"1970-.6566111ad2.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_delta_timestamp.tz-None-(Pair 100 100)-(Some \"1970-.6566111ad2.out"	
@@ -7,30 +7,30 @@ emitted operations
 big_map diff
   
 trace
-  - location: 10 (remaining gas: 1039990.518 units remaining)
+  - location: 10 (remaining gas: 1039991.318 units remaining)
     [ (Pair (Pair 100 "1970-01-01T00:01:40Z") None) ]
-  - location: 10 (remaining gas: 1039990.508 units remaining)
+  - location: 10 (remaining gas: 1039991.308 units remaining)
     [ (Pair 100 "1970-01-01T00:01:40Z") ]
-  - location: 11 (remaining gas: 1039990.498 units remaining)
+  - location: 11 (remaining gas: 1039991.298 units remaining)
     [ (Pair 100 "1970-01-01T00:01:40Z")
       (Pair 100 "1970-01-01T00:01:40Z") ]
-  - location: 12 (remaining gas: 1039990.488 units remaining)
+  - location: 12 (remaining gas: 1039991.288 units remaining)
     [ 100
       (Pair 100 "1970-01-01T00:01:40Z") ]
-  - location: 13 (remaining gas: 1039990.473 units remaining)
+  - location: 13 (remaining gas: 1039991.278 units remaining)
     [ (Pair 100 "1970-01-01T00:01:40Z") ]
-  - location: 15 (remaining gas: 1039990.463 units remaining)
+  - location: 15 (remaining gas: 1039991.268 units remaining)
     [ "1970-01-01T00:01:40Z" ]
-  - location: 13 (remaining gas: 1039990.433 units remaining)
+  - location: 13 (remaining gas: 1039991.248 units remaining)
     [ 100
       "1970-01-01T00:01:40Z" ]
-  - location: 16 (remaining gas: 1039990.378 units remaining)
+  - location: 16 (remaining gas: 1039991.213 units remaining)
     [ "1970-01-01T00:03:20Z" ]
-  - location: 17 (remaining gas: 1039990.363 units remaining)
+  - location: 17 (remaining gas: 1039991.203 units remaining)
     [ (Some "1970-01-01T00:03:20Z") ]
-  - location: 18 (remaining gas: 1039990.348 units remaining)
+  - location: 18 (remaining gas: 1039991.193 units remaining)
     [ {}
       (Some "1970-01-01T00:03:20Z") ]
-  - location: 20 (remaining gas: 1039990.333 units remaining)
+  - location: 20 (remaining gas: 1039991.183 units remaining)
     [ (Pair {} (Some "1970-01-01T00:03:20Z")) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_timestamp_delta.tz-None-(Pair \"1970-01-01T00:00:00Z.72c424f3da.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_timestamp_delta.tz-None-(Pair \"1970-01-01T00:00:00Z.72c424f3da.out"
index a9be552b317793c90be493a6e4d351e93d03421e..db3a3d3726a7855f5a7d8fe262cad1dd8dbf3e1b 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_timestamp_delta.tz-None-(Pair \"1970-01-01T00:00:00Z.72c424f3da.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_timestamp_delta.tz-None-(Pair \"1970-01-01T00:00:00Z.72c424f3da.out"	
@@ -7,30 +7,30 @@ emitted operations
 big_map diff
   
 trace
-  - location: 10 (remaining gas: 1039990.418 units remaining)
+  - location: 10 (remaining gas: 1039990.488 units remaining)
     [ (Pair (Pair "1970-01-01T00:00:00Z" 0) None) ]
-  - location: 10 (remaining gas: 1039990.408 units remaining)
+  - location: 10 (remaining gas: 1039990.478 units remaining)
     [ (Pair "1970-01-01T00:00:00Z" 0) ]
-  - location: 11 (remaining gas: 1039990.398 units remaining)
+  - location: 11 (remaining gas: 1039990.468 units remaining)
     [ (Pair "1970-01-01T00:00:00Z" 0)
       (Pair "1970-01-01T00:00:00Z" 0) ]
-  - location: 12 (remaining gas: 1039990.388 units remaining)
+  - location: 12 (remaining gas: 1039990.458 units remaining)
     [ "1970-01-01T00:00:00Z"
       (Pair "1970-01-01T00:00:00Z" 0) ]
-  - location: 13 (remaining gas: 1039990.373 units remaining)
+  - location: 13 (remaining gas: 1039990.448 units remaining)
     [ (Pair "1970-01-01T00:00:00Z" 0) ]
-  - location: 15 (remaining gas: 1039990.363 units remaining)
+  - location: 15 (remaining gas: 1039990.438 units remaining)
     [ 0 ]
-  - location: 13 (remaining gas: 1039990.333 units remaining)
+  - location: 13 (remaining gas: 1039990.418 units remaining)
     [ "1970-01-01T00:00:00Z"
       0 ]
-  - location: 16 (remaining gas: 1039990.278 units remaining)
+  - location: 16 (remaining gas: 1039990.383 units remaining)
     [ "1970-01-01T00:00:00Z" ]
-  - location: 17 (remaining gas: 1039990.263 units remaining)
+  - location: 17 (remaining gas: 1039990.373 units remaining)
     [ (Some "1970-01-01T00:00:00Z") ]
-  - location: 18 (remaining gas: 1039990.248 units remaining)
+  - location: 18 (remaining gas: 1039990.363 units remaining)
     [ {}
       (Some "1970-01-01T00:00:00Z") ]
-  - location: 20 (remaining gas: 1039990.233 units remaining)
+  - location: 20 (remaining gas: 1039990.353 units remaining)
     [ (Pair {} (Some "1970-01-01T00:00:00Z")) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_timestamp_delta.tz-None-(Pair 100 -100)-(Some \"1970.7c4b12e9aa.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_timestamp_delta.tz-None-(Pair 100 -100)-(Some \"1970.7c4b12e9aa.out"
index 9177e089c1e86a91f5bca550087a9126d74b5af9..9b05e56a4781b86df7591e7a7cde82fbda834c00 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_timestamp_delta.tz-None-(Pair 100 -100)-(Some \"1970.7c4b12e9aa.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_timestamp_delta.tz-None-(Pair 100 -100)-(Some \"1970.7c4b12e9aa.out"	
@@ -7,30 +7,30 @@ emitted operations
 big_map diff
   
 trace
-  - location: 10 (remaining gas: 1039990.518 units remaining)
+  - location: 10 (remaining gas: 1039991.318 units remaining)
     [ (Pair (Pair "1970-01-01T00:01:40Z" -100) None) ]
-  - location: 10 (remaining gas: 1039990.508 units remaining)
+  - location: 10 (remaining gas: 1039991.308 units remaining)
     [ (Pair "1970-01-01T00:01:40Z" -100) ]
-  - location: 11 (remaining gas: 1039990.498 units remaining)
+  - location: 11 (remaining gas: 1039991.298 units remaining)
     [ (Pair "1970-01-01T00:01:40Z" -100)
       (Pair "1970-01-01T00:01:40Z" -100) ]
-  - location: 12 (remaining gas: 1039990.488 units remaining)
+  - location: 12 (remaining gas: 1039991.288 units remaining)
     [ "1970-01-01T00:01:40Z"
       (Pair "1970-01-01T00:01:40Z" -100) ]
-  - location: 13 (remaining gas: 1039990.473 units remaining)
+  - location: 13 (remaining gas: 1039991.278 units remaining)
     [ (Pair "1970-01-01T00:01:40Z" -100) ]
-  - location: 15 (remaining gas: 1039990.463 units remaining)
+  - location: 15 (remaining gas: 1039991.268 units remaining)
     [ -100 ]
-  - location: 13 (remaining gas: 1039990.433 units remaining)
+  - location: 13 (remaining gas: 1039991.248 units remaining)
     [ "1970-01-01T00:01:40Z"
       -100 ]
-  - location: 16 (remaining gas: 1039990.378 units remaining)
+  - location: 16 (remaining gas: 1039991.213 units remaining)
     [ "1970-01-01T00:00:00Z" ]
-  - location: 17 (remaining gas: 1039990.363 units remaining)
+  - location: 17 (remaining gas: 1039991.203 units remaining)
     [ (Some "1970-01-01T00:00:00Z") ]
-  - location: 18 (remaining gas: 1039990.348 units remaining)
+  - location: 18 (remaining gas: 1039991.193 units remaining)
     [ {}
       (Some "1970-01-01T00:00:00Z") ]
-  - location: 20 (remaining gas: 1039990.333 units remaining)
+  - location: 20 (remaining gas: 1039991.183 units remaining)
     [ (Pair {} (Some "1970-01-01T00:00:00Z")) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_timestamp_delta.tz-None-(Pair 100 100)-(Some \"1970-.af32743640.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_timestamp_delta.tz-None-(Pair 100 100)-(Some \"1970-.af32743640.out"
index e127f44167c84cee4e03b03c0974e1c8e8a0df8f..79e001b50721b4fa5694e075255e34b5dc45afa5 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_timestamp_delta.tz-None-(Pair 100 100)-(Some \"1970-.af32743640.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[add_timestamp_delta.tz-None-(Pair 100 100)-(Some \"1970-.af32743640.out"	
@@ -7,30 +7,30 @@ emitted operations
 big_map diff
   
 trace
-  - location: 10 (remaining gas: 1039990.518 units remaining)
+  - location: 10 (remaining gas: 1039991.318 units remaining)
     [ (Pair (Pair "1970-01-01T00:01:40Z" 100) None) ]
-  - location: 10 (remaining gas: 1039990.508 units remaining)
+  - location: 10 (remaining gas: 1039991.308 units remaining)
     [ (Pair "1970-01-01T00:01:40Z" 100) ]
-  - location: 11 (remaining gas: 1039990.498 units remaining)
+  - location: 11 (remaining gas: 1039991.298 units remaining)
     [ (Pair "1970-01-01T00:01:40Z" 100)
       (Pair "1970-01-01T00:01:40Z" 100) ]
-  - location: 12 (remaining gas: 1039990.488 units remaining)
+  - location: 12 (remaining gas: 1039991.288 units remaining)
     [ "1970-01-01T00:01:40Z"
       (Pair "1970-01-01T00:01:40Z" 100) ]
-  - location: 13 (remaining gas: 1039990.473 units remaining)
+  - location: 13 (remaining gas: 1039991.278 units remaining)
     [ (Pair "1970-01-01T00:01:40Z" 100) ]
-  - location: 15 (remaining gas: 1039990.463 units remaining)
+  - location: 15 (remaining gas: 1039991.268 units remaining)
     [ 100 ]
-  - location: 13 (remaining gas: 1039990.433 units remaining)
+  - location: 13 (remaining gas: 1039991.248 units remaining)
     [ "1970-01-01T00:01:40Z"
       100 ]
-  - location: 16 (remaining gas: 1039990.378 units remaining)
+  - location: 16 (remaining gas: 1039991.213 units remaining)
     [ "1970-01-01T00:03:20Z" ]
-  - location: 17 (remaining gas: 1039990.363 units remaining)
+  - location: 17 (remaining gas: 1039991.203 units remaining)
     [ (Some "1970-01-01T00:03:20Z") ]
-  - location: 18 (remaining gas: 1039990.348 units remaining)
+  - location: 18 (remaining gas: 1039991.193 units remaining)
     [ {}
       (Some "1970-01-01T00:03:20Z") ]
-  - location: 20 (remaining gas: 1039990.333 units remaining)
+  - location: 20 (remaining gas: 1039991.183 units remaining)
     [ (Pair {} (Some "1970-01-01T00:03:20Z")) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[address.tz-None-\"tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5\"-.f9045c3a04.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[address.tz-None-\"tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5\"-.f9045c3a04.out"
index ffc33ab1be2c2cc677296066df17d5beff499075..c8458a1300a782f76476e7c8f4121a56e271fac0 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[address.tz-None-\"tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5\"-.f9045c3a04.out"
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[address.tz-None-\"tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5\"-.f9045c3a04.out"
@@ -7,17 +7,17 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (remaining gas: 1039343.574 units remaining)
+  - location: 9 (remaining gas: 1039987.934 units remaining)
     [ (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" None) ]
-  - location: 9 (remaining gas: 1039343.564 units remaining)
+  - location: 9 (remaining gas: 1039987.924 units remaining)
     [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 10 (remaining gas: 1039343.554 units remaining)
+  - location: 10 (remaining gas: 1039987.914 units remaining)
     [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 11 (remaining gas: 1039343.539 units remaining)
+  - location: 11 (remaining gas: 1039987.904 units remaining)
     [ (Some "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 12 (remaining gas: 1039343.524 units remaining)
+  - location: 12 (remaining gas: 1039987.894 units remaining)
     [ {}
       (Some "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 14 (remaining gas: 1039343.509 units remaining)
+  - location: 14 (remaining gas: 1039987.884 units remaining)
     [ (Pair {} (Some "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and.tz-None-(Pair False False)-(Some False)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and.tz-None-(Pair False False)-(Some False)].out
index c86e6ce5360a4c4f7bde35636ad3cb1b03c90452..caa1b5e80f6749befdf94bcd0fd7d3020e68d24a 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and.tz-None-(Pair False False)-(Some False)].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and.tz-None-(Pair False False)-(Some False)].out	
@@ -7,25 +7,25 @@ emitted operations
 big_map diff
   
 trace
-  - location: 10 (remaining gas: 1039991.268 units remaining)
+  - location: 10 (remaining gas: 1039992.068 units remaining)
     [ (Pair (Pair False False) None) ]
-  - location: 10 (remaining gas: 1039991.258 units remaining)
+  - location: 10 (remaining gas: 1039992.058 units remaining)
     [ (Pair False False) ]
-  - location: 11 (remaining gas: 1039991.248 units remaining)
+  - location: 11 (remaining gas: 1039992.048 units remaining)
     [ False
       False ]
-  - location: 12 (remaining gas: 1039991.228 units remaining)
+  - location: 12 (remaining gas: 1039992.038 units remaining)
     [ False ]
-  - location: 13 (remaining gas: 1039991.213 units remaining)
+  - location: 13 (remaining gas: 1039992.028 units remaining)
     [ (Some False) ]
-  - location: 14 (remaining gas: 1039991.198 units remaining)
+  - location: 14 (remaining gas: 1039992.018 units remaining)
     [ {}
       (Some False) ]
-  - location: 16 (remaining gas: 1039991.183 units remaining)
+  - location: 16 (remaining gas: 1039992.008 units remaining)
     [ (Pair {} (Some False)) ]
-  - location: 17 (remaining gas: 1039991.173 units remaining)
+  - location: 17 (remaining gas: 1039991.998 units remaining)
     [ {}
       (Some False) ]
-  - location: 18 (remaining gas: 1039991.158 units remaining)
+  - location: 18 (remaining gas: 1039991.988 units remaining)
     [ (Pair {} (Some False)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and.tz-None-(Pair False True)-(Some False)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and.tz-None-(Pair False True)-(Some False)].out
index 26034d0b42d0e349b64751790551c3f232680f47..d83c79ab78e19635ba3d571fc9a21cbb350103b5 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and.tz-None-(Pair False True)-(Some False)].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and.tz-None-(Pair False True)-(Some False)].out	
@@ -7,25 +7,25 @@ emitted operations
 big_map diff
   
 trace
-  - location: 10 (remaining gas: 1039991.268 units remaining)
+  - location: 10 (remaining gas: 1039992.068 units remaining)
     [ (Pair (Pair False True) None) ]
-  - location: 10 (remaining gas: 1039991.258 units remaining)
+  - location: 10 (remaining gas: 1039992.058 units remaining)
     [ (Pair False True) ]
-  - location: 11 (remaining gas: 1039991.248 units remaining)
+  - location: 11 (remaining gas: 1039992.048 units remaining)
     [ False
       True ]
-  - location: 12 (remaining gas: 1039991.228 units remaining)
+  - location: 12 (remaining gas: 1039992.038 units remaining)
     [ False ]
-  - location: 13 (remaining gas: 1039991.213 units remaining)
+  - location: 13 (remaining gas: 1039992.028 units remaining)
     [ (Some False) ]
-  - location: 14 (remaining gas: 1039991.198 units remaining)
+  - location: 14 (remaining gas: 1039992.018 units remaining)
     [ {}
       (Some False) ]
-  - location: 16 (remaining gas: 1039991.183 units remaining)
+  - location: 16 (remaining gas: 1039992.008 units remaining)
     [ (Pair {} (Some False)) ]
-  - location: 17 (remaining gas: 1039991.173 units remaining)
+  - location: 17 (remaining gas: 1039991.998 units remaining)
     [ {}
       (Some False) ]
-  - location: 18 (remaining gas: 1039991.158 units remaining)
+  - location: 18 (remaining gas: 1039991.988 units remaining)
     [ (Pair {} (Some False)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and.tz-None-(Pair True False)-(Some False)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and.tz-None-(Pair True False)-(Some False)].out
index acd78d0a73a55c9562e14b9062a5acc71fe34d58..1ad6be77d1ce19d49e4c26553c5b5428c3d65298 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and.tz-None-(Pair True False)-(Some False)].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and.tz-None-(Pair True False)-(Some False)].out	
@@ -7,25 +7,25 @@ emitted operations
 big_map diff
   
 trace
-  - location: 10 (remaining gas: 1039991.268 units remaining)
+  - location: 10 (remaining gas: 1039992.068 units remaining)
     [ (Pair (Pair True False) None) ]
-  - location: 10 (remaining gas: 1039991.258 units remaining)
+  - location: 10 (remaining gas: 1039992.058 units remaining)
     [ (Pair True False) ]
-  - location: 11 (remaining gas: 1039991.248 units remaining)
+  - location: 11 (remaining gas: 1039992.048 units remaining)
     [ True
       False ]
-  - location: 12 (remaining gas: 1039991.228 units remaining)
+  - location: 12 (remaining gas: 1039992.038 units remaining)
     [ False ]
-  - location: 13 (remaining gas: 1039991.213 units remaining)
+  - location: 13 (remaining gas: 1039992.028 units remaining)
     [ (Some False) ]
-  - location: 14 (remaining gas: 1039991.198 units remaining)
+  - location: 14 (remaining gas: 1039992.018 units remaining)
     [ {}
       (Some False) ]
-  - location: 16 (remaining gas: 1039991.183 units remaining)
+  - location: 16 (remaining gas: 1039992.008 units remaining)
     [ (Pair {} (Some False)) ]
-  - location: 17 (remaining gas: 1039991.173 units remaining)
+  - location: 17 (remaining gas: 1039991.998 units remaining)
     [ {}
       (Some False) ]
-  - location: 18 (remaining gas: 1039991.158 units remaining)
+  - location: 18 (remaining gas: 1039991.988 units remaining)
     [ (Pair {} (Some False)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and.tz-None-(Pair True True)-(Some True)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and.tz-None-(Pair True True)-(Some True)].out
index 1802a1ce9802ad135e3dfafb50174fd2f9a825fa..1f9db0fc15e3aa670cb2675f39790368a3571bee 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and.tz-None-(Pair True True)-(Some True)].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and.tz-None-(Pair True True)-(Some True)].out	
@@ -7,25 +7,25 @@ emitted operations
 big_map diff
   
 trace
-  - location: 10 (remaining gas: 1039991.268 units remaining)
+  - location: 10 (remaining gas: 1039992.068 units remaining)
     [ (Pair (Pair True True) None) ]
-  - location: 10 (remaining gas: 1039991.258 units remaining)
+  - location: 10 (remaining gas: 1039992.058 units remaining)
     [ (Pair True True) ]
-  - location: 11 (remaining gas: 1039991.248 units remaining)
+  - location: 11 (remaining gas: 1039992.048 units remaining)
     [ True
       True ]
-  - location: 12 (remaining gas: 1039991.228 units remaining)
+  - location: 12 (remaining gas: 1039992.038 units remaining)
     [ True ]
-  - location: 13 (remaining gas: 1039991.213 units remaining)
+  - location: 13 (remaining gas: 1039992.028 units remaining)
     [ (Some True) ]
-  - location: 14 (remaining gas: 1039991.198 units remaining)
+  - location: 14 (remaining gas: 1039992.018 units remaining)
     [ {}
       (Some True) ]
-  - location: 16 (remaining gas: 1039991.183 units remaining)
+  - location: 16 (remaining gas: 1039992.008 units remaining)
     [ (Pair {} (Some True)) ]
-  - location: 17 (remaining gas: 1039991.173 units remaining)
+  - location: 17 (remaining gas: 1039991.998 units remaining)
     [ {}
       (Some True) ]
-  - location: 18 (remaining gas: 1039991.158 units remaining)
+  - location: 18 (remaining gas: 1039991.988 units remaining)
     [ (Pair {} (Some True)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and_binary.tz-Unit-Unit-Unit].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and_binary.tz-Unit-Unit-Unit].out
index bf72f70c3ea24b4c178b9f9ba4ff77ece25c5be0..3c17b8b12f1044dc200b06a2cfe08a79720e59af 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and_binary.tz-Unit-Unit-Unit].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and_binary.tz-Unit-Unit-Unit].out
@@ -7,87 +7,87 @@ emitted operations
 big_map diff
   
 trace
-  - location: 7 (remaining gas: 1039960.596 units remaining)
+  - location: 7 (remaining gas: 1039961.876 units remaining)
     [ (Pair Unit Unit) ]
-  - location: 7 (remaining gas: 1039960.586 units remaining)
+  - location: 7 (remaining gas: 1039961.866 units remaining)
     [  ]
-  - location: 8 (remaining gas: 1039960.576 units remaining)
+  - location: 8 (remaining gas: 1039961.856 units remaining)
     [ 5 ]
-  - location: 11 (remaining gas: 1039960.566 units remaining)
+  - location: 11 (remaining gas: 1039961.846 units remaining)
     [ 6
       5 ]
-  - location: 14 (remaining gas: 1039960.516 units remaining)
+  - location: 14 (remaining gas: 1039961.811 units remaining)
     [ 4 ]
-  - location: 15 (remaining gas: 1039960.506 units remaining)
+  - location: 15 (remaining gas: 1039961.801 units remaining)
     [ 4
       4 ]
-  - location: 20 (remaining gas: 1039960.471 units remaining)
+  - location: 20 (remaining gas: 1039961.766 units remaining)
     [ 0 ]
-  - location: 21 (remaining gas: 1039960.456 units remaining)
+  - location: 21 (remaining gas: 1039961.756 units remaining)
     [ True ]
-  - location: 22 (remaining gas: 1039960.446 units remaining)
+  - location: 22 (remaining gas: 1039961.746 units remaining)
     [  ]
-  - location: 22 (remaining gas: 1039960.431 units remaining)
+  - location: 22 (remaining gas: 1039961.736 units remaining)
     [  ]
-  - location: 28 (remaining gas: 1039960.421 units remaining)
+  - location: 28 (remaining gas: 1039961.726 units remaining)
     [ 6 ]
-  - location: 31 (remaining gas: 1039960.411 units remaining)
+  - location: 31 (remaining gas: 1039961.716 units remaining)
     [ 5
       6 ]
-  - location: 34 (remaining gas: 1039960.361 units remaining)
+  - location: 34 (remaining gas: 1039961.681 units remaining)
     [ 4 ]
-  - location: 35 (remaining gas: 1039960.351 units remaining)
+  - location: 35 (remaining gas: 1039961.671 units remaining)
     [ 4
       4 ]
-  - location: 40 (remaining gas: 1039960.316 units remaining)
+  - location: 40 (remaining gas: 1039961.636 units remaining)
     [ 0 ]
-  - location: 41 (remaining gas: 1039960.301 units remaining)
+  - location: 41 (remaining gas: 1039961.626 units remaining)
     [ True ]
-  - location: 42 (remaining gas: 1039960.291 units remaining)
+  - location: 42 (remaining gas: 1039961.616 units remaining)
     [  ]
-  - location: 42 (remaining gas: 1039960.276 units remaining)
+  - location: 42 (remaining gas: 1039961.606 units remaining)
     [  ]
-  - location: 48 (remaining gas: 1039960.266 units remaining)
+  - location: 48 (remaining gas: 1039961.596 units remaining)
     [ 12 ]
-  - location: 51 (remaining gas: 1039960.256 units remaining)
+  - location: 51 (remaining gas: 1039961.586 units remaining)
     [ -1
       12 ]
-  - location: 54 (remaining gas: 1039960.206 units remaining)
+  - location: 54 (remaining gas: 1039961.551 units remaining)
     [ 12 ]
-  - location: 55 (remaining gas: 1039960.196 units remaining)
+  - location: 55 (remaining gas: 1039961.541 units remaining)
     [ 12
       12 ]
-  - location: 60 (remaining gas: 1039960.161 units remaining)
+  - location: 60 (remaining gas: 1039961.506 units remaining)
     [ 0 ]
-  - location: 61 (remaining gas: 1039960.146 units remaining)
+  - location: 61 (remaining gas: 1039961.496 units remaining)
     [ True ]
-  - location: 62 (remaining gas: 1039960.136 units remaining)
+  - location: 62 (remaining gas: 1039961.486 units remaining)
     [  ]
-  - location: 62 (remaining gas: 1039960.121 units remaining)
+  - location: 62 (remaining gas: 1039961.476 units remaining)
     [  ]
-  - location: 68 (remaining gas: 1039960.111 units remaining)
+  - location: 68 (remaining gas: 1039961.466 units remaining)
     [ 12 ]
-  - location: 71 (remaining gas: 1039960.101 units remaining)
+  - location: 71 (remaining gas: 1039961.456 units remaining)
     [ -5
       12 ]
-  - location: 74 (remaining gas: 1039960.051 units remaining)
+  - location: 74 (remaining gas: 1039961.421 units remaining)
     [ 8 ]
-  - location: 75 (remaining gas: 1039960.041 units remaining)
+  - location: 75 (remaining gas: 1039961.411 units remaining)
     [ 8
       8 ]
-  - location: 80 (remaining gas: 1039960.006 units remaining)
+  - location: 80 (remaining gas: 1039961.376 units remaining)
     [ 0 ]
-  - location: 81 (remaining gas: 1039959.991 units remaining)
+  - location: 81 (remaining gas: 1039961.366 units remaining)
     [ True ]
-  - location: 82 (remaining gas: 1039959.981 units remaining)
+  - location: 82 (remaining gas: 1039961.356 units remaining)
     [  ]
-  - location: 82 (remaining gas: 1039959.966 units remaining)
+  - location: 82 (remaining gas: 1039961.346 units remaining)
     [  ]
-  - location: 88 (remaining gas: 1039959.956 units remaining)
+  - location: 88 (remaining gas: 1039961.336 units remaining)
     [ Unit ]
-  - location: 89 (remaining gas: 1039959.941 units remaining)
+  - location: 89 (remaining gas: 1039961.326 units remaining)
     [ {}
       Unit ]
-  - location: 91 (remaining gas: 1039959.926 units remaining)
+  - location: 91 (remaining gas: 1039961.316 units remaining)
     [ (Pair {} Unit) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and_logical_1.tz-False-(Pair False False)-False].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and_logical_1.tz-False-(Pair False False)-False].out
index 746ab1bd6b1f5c668609a0a63745021281fe47d9..8f4b9c41cd82f6a2750233821fb7151705e5d11f 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and_logical_1.tz-False-(Pair False False)-False].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and_logical_1.tz-False-(Pair False False)-False].out	
@@ -7,18 +7,18 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (remaining gas: 1039993.769 units remaining)
+  - location: 9 (remaining gas: 1039994.409 units remaining)
     [ (Pair (Pair False False) False) ]
-  - location: 9 (remaining gas: 1039993.759 units remaining)
+  - location: 9 (remaining gas: 1039994.399 units remaining)
     [ (Pair False False) ]
-  - location: 10 (remaining gas: 1039993.749 units remaining)
+  - location: 10 (remaining gas: 1039994.389 units remaining)
     [ False
       False ]
-  - location: 11 (remaining gas: 1039993.729 units remaining)
+  - location: 11 (remaining gas: 1039994.379 units remaining)
     [ False ]
-  - location: 12 (remaining gas: 1039993.714 units remaining)
+  - location: 12 (remaining gas: 1039994.369 units remaining)
     [ {}
       False ]
-  - location: 14 (remaining gas: 1039993.699 units remaining)
+  - location: 14 (remaining gas: 1039994.359 units remaining)
     [ (Pair {} False) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and_logical_1.tz-False-(Pair False True)-False].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and_logical_1.tz-False-(Pair False True)-False].out
index ac8db947c875de95409a9fcc0658e549785e1284..0806f3295e007f3a53e36cfb9c4833449a652e1a 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and_logical_1.tz-False-(Pair False True)-False].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and_logical_1.tz-False-(Pair False True)-False].out	
@@ -7,18 +7,18 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (remaining gas: 1039993.769 units remaining)
+  - location: 9 (remaining gas: 1039994.409 units remaining)
     [ (Pair (Pair False True) False) ]
-  - location: 9 (remaining gas: 1039993.759 units remaining)
+  - location: 9 (remaining gas: 1039994.399 units remaining)
     [ (Pair False True) ]
-  - location: 10 (remaining gas: 1039993.749 units remaining)
+  - location: 10 (remaining gas: 1039994.389 units remaining)
     [ False
       True ]
-  - location: 11 (remaining gas: 1039993.729 units remaining)
+  - location: 11 (remaining gas: 1039994.379 units remaining)
     [ False ]
-  - location: 12 (remaining gas: 1039993.714 units remaining)
+  - location: 12 (remaining gas: 1039994.369 units remaining)
     [ {}
       False ]
-  - location: 14 (remaining gas: 1039993.699 units remaining)
+  - location: 14 (remaining gas: 1039994.359 units remaining)
     [ (Pair {} False) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and_logical_1.tz-False-(Pair True False)-False].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and_logical_1.tz-False-(Pair True False)-False].out
index 0afd9deb76a6889f9084a2c44f6585e83169f016..e0cc028b8f2f057de5540c4ed71d7503ca5c5f0f 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and_logical_1.tz-False-(Pair True False)-False].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and_logical_1.tz-False-(Pair True False)-False].out	
@@ -7,18 +7,18 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (remaining gas: 1039993.769 units remaining)
+  - location: 9 (remaining gas: 1039994.409 units remaining)
     [ (Pair (Pair True False) False) ]
-  - location: 9 (remaining gas: 1039993.759 units remaining)
+  - location: 9 (remaining gas: 1039994.399 units remaining)
     [ (Pair True False) ]
-  - location: 10 (remaining gas: 1039993.749 units remaining)
+  - location: 10 (remaining gas: 1039994.389 units remaining)
     [ True
       False ]
-  - location: 11 (remaining gas: 1039993.729 units remaining)
+  - location: 11 (remaining gas: 1039994.379 units remaining)
     [ False ]
-  - location: 12 (remaining gas: 1039993.714 units remaining)
+  - location: 12 (remaining gas: 1039994.369 units remaining)
     [ {}
       False ]
-  - location: 14 (remaining gas: 1039993.699 units remaining)
+  - location: 14 (remaining gas: 1039994.359 units remaining)
     [ (Pair {} False) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and_logical_1.tz-False-(Pair True True)-True].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and_logical_1.tz-False-(Pair True True)-True].out
index eda1410e9a8fae63598208a08b41aa00d0e3234f..01df94ba4b745b01a9cf358424f4fe573c052f92 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and_logical_1.tz-False-(Pair True True)-True].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[and_logical_1.tz-False-(Pair True True)-True].out	
@@ -7,18 +7,18 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (remaining gas: 1039993.769 units remaining)
+  - location: 9 (remaining gas: 1039994.409 units remaining)
     [ (Pair (Pair True True) False) ]
-  - location: 9 (remaining gas: 1039993.759 units remaining)
+  - location: 9 (remaining gas: 1039994.399 units remaining)
     [ (Pair True True) ]
-  - location: 10 (remaining gas: 1039993.749 units remaining)
+  - location: 10 (remaining gas: 1039994.389 units remaining)
     [ True
       True ]
-  - location: 11 (remaining gas: 1039993.729 units remaining)
+  - location: 11 (remaining gas: 1039994.379 units remaining)
     [ True ]
-  - location: 12 (remaining gas: 1039993.714 units remaining)
+  - location: 12 (remaining gas: 1039994.369 units remaining)
     [ {}
       True ]
-  - location: 14 (remaining gas: 1039993.699 units remaining)
+  - location: 14 (remaining gas: 1039994.359 units remaining)
     [ (Pair {} True) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[balance.tz-111-Unit-4000000000000].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[balance.tz-111-Unit-4000000000000].out
index 2db431486a2a22e2c488f2f11591f40dc382f873..542b68a1caa010dfd443d3997b2043a6d9030af7 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[balance.tz-111-Unit-4000000000000].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[balance.tz-111-Unit-4000000000000].out
@@ -7,15 +7,15 @@ emitted operations
 big_map diff
   
 trace
-  - location: 7 (remaining gas: 1039994.913 units remaining)
+  - location: 7 (remaining gas: 1039995.553 units remaining)
     [ (Pair Unit 111) ]
-  - location: 7 (remaining gas: 1039994.903 units remaining)
+  - location: 7 (remaining gas: 1039995.543 units remaining)
     [  ]
-  - location: 8 (remaining gas: 1039994.903 units remaining)
+  - location: 8 (remaining gas: 1039995.543 units remaining)
     [ 4000000000000 ]
-  - location: 9 (remaining gas: 1039994.888 units remaining)
+  - location: 9 (remaining gas: 1039995.533 units remaining)
     [ {}
       4000000000000 ]
-  - location: 11 (remaining gas: 1039994.873 units remaining)
+  - location: 11 (remaining gas: 1039995.523 units remaining)
     [ (Pair {} 4000000000000) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 0 1 } None)-1-(Pair 4 (S.2292d6ce17.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 0 1 } None)-1-(Pair 4 (S.2292d6ce17.out
index 032afe334a11e94ea5a57143d668285120a5ccf0..5538cf5b54107b81ba81b2f193954c4c3e1cfbca 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 0 1 } None)-1-(Pair 4 (S.2292d6ce17.out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 0 1 } None)-1-(Pair 4 (S.2292d6ce17.out	
@@ -8,36 +8,36 @@ big_map diff
   New map(4) of type (big_map nat nat)
   Set map(4)[0] to 1
 trace
-  - location: 12 (remaining gas: 1039986.976 units remaining)
+  - location: 12 (remaining gas: 1039988.651 units remaining)
     [ (Pair 1 { Elt 0 1 } None) ]
-  - location: 12 (remaining gas: 1039986.966 units remaining)
+  - location: 12 (remaining gas: 1039988.641 units remaining)
     [ 1
       (Pair { Elt 0 1 } None) ]
-  - location: 13 (remaining gas: 1039986.951 units remaining)
+  - location: 13 (remaining gas: 1039988.631 units remaining)
     [ (Pair { Elt 0 1 } None) ]
-  - location: 15 (remaining gas: 1039986.941 units remaining)
+  - location: 15 (remaining gas: 1039988.621 units remaining)
     [ { Elt 0 1 } ]
-  - location: 16 (remaining gas: 1039986.931 units remaining)
+  - location: 16 (remaining gas: 1039988.611 units remaining)
     [ { Elt 0 1 }
       { Elt 0 1 } ]
-  - location: 13 (remaining gas: 1039986.901 units remaining)
+  - location: 13 (remaining gas: 1039988.591 units remaining)
     [ 1
       { Elt 0 1 }
       { Elt 0 1 } ]
-  - location: 17 (remaining gas: 1039986.128 units remaining)
+  - location: 17 (remaining gas: 1039987.883 units remaining)
     [ False
       { Elt 0 1 } ]
-  - location: 18 (remaining gas: 1039986.113 units remaining)
+  - location: 18 (remaining gas: 1039987.873 units remaining)
     [ (Some False)
       { Elt 0 1 } ]
-  - location: 19 (remaining gas: 1039986.103 units remaining)
+  - location: 19 (remaining gas: 1039987.863 units remaining)
     [ { Elt 0 1 }
       (Some False) ]
-  - location: 20 (remaining gas: 1039986.088 units remaining)
+  - location: 20 (remaining gas: 1039987.853 units remaining)
     [ (Pair { Elt 0 1 } (Some False)) ]
-  - location: 21 (remaining gas: 1039986.073 units remaining)
+  - location: 21 (remaining gas: 1039987.843 units remaining)
     [ {}
       (Pair { Elt 0 1 } (Some False)) ]
-  - location: 23 (remaining gas: 1039986.058 units remaining)
+  - location: 23 (remaining gas: 1039987.833 units remaining)
     [ (Pair {} { Elt 0 1 } (Some False)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 0 1 } None)-1-(Pair 4 (S.dda583f5e9.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 0 1 } None)-1-(Pair 4 (S.dda583f5e9.out
index 8d90b0cab1ef8067745fb20fd0fd67127d9ecb37..aed39e8d3ff44b74c5fb330ef467d312515749d1 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 0 1 } None)-1-(Pair 4 (S.dda583f5e9.out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 0 1 } None)-1-(Pair 4 (S.dda583f5e9.out	
@@ -8,36 +8,36 @@ big_map diff
   New map(4) of type (big_map nat nat)
   Set map(4)[0] to 1
 trace
-  - location: 12 (remaining gas: 1039986.976 units remaining)
+  - location: 12 (remaining gas: 1039988.651 units remaining)
     [ (Pair 1 { Elt 0 1 } None) ]
-  - location: 12 (remaining gas: 1039986.966 units remaining)
+  - location: 12 (remaining gas: 1039988.641 units remaining)
     [ 1
       (Pair { Elt 0 1 } None) ]
-  - location: 13 (remaining gas: 1039986.951 units remaining)
+  - location: 13 (remaining gas: 1039988.631 units remaining)
     [ (Pair { Elt 0 1 } None) ]
-  - location: 15 (remaining gas: 1039986.941 units remaining)
+  - location: 15 (remaining gas: 1039988.621 units remaining)
     [ { Elt 0 1 } ]
-  - location: 16 (remaining gas: 1039986.931 units remaining)
+  - location: 16 (remaining gas: 1039988.611 units remaining)
     [ { Elt 0 1 }
       { Elt 0 1 } ]
-  - location: 13 (remaining gas: 1039986.901 units remaining)
+  - location: 13 (remaining gas: 1039988.591 units remaining)
     [ 1
       { Elt 0 1 }
       { Elt 0 1 } ]
-  - location: 17 (remaining gas: 1039986.128 units remaining)
+  - location: 17 (remaining gas: 1039987.883 units remaining)
     [ False
       { Elt 0 1 } ]
-  - location: 18 (remaining gas: 1039986.113 units remaining)
+  - location: 18 (remaining gas: 1039987.873 units remaining)
     [ (Some False)
       { Elt 0 1 } ]
-  - location: 19 (remaining gas: 1039986.103 units remaining)
+  - location: 19 (remaining gas: 1039987.863 units remaining)
     [ { Elt 0 1 }
       (Some False) ]
-  - location: 20 (remaining gas: 1039986.088 units remaining)
+  - location: 20 (remaining gas: 1039987.853 units remaining)
     [ (Pair { Elt 0 1 } (Some False)) ]
-  - location: 21 (remaining gas: 1039986.073 units remaining)
+  - location: 21 (remaining gas: 1039987.843 units remaining)
     [ {}
       (Pair { Elt 0 1 } (Some False)) ]
-  - location: 23 (remaining gas: 1039986.058 units remaining)
+  - location: 23 (remaining gas: 1039987.833 units remaining)
     [ (Pair {} { Elt 0 1 } (Some False)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 0 } None)-1-(Pair 4 (S.6d753598ba.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 0 } None)-1-(Pair 4 (S.6d753598ba.out
index a8e3d8cd7304a6eaabfb080ee261433ee3748b24..da0a61305826b30324815290ae9940e6574589f2 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 0 } None)-1-(Pair 4 (S.6d753598ba.out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 0 } None)-1-(Pair 4 (S.6d753598ba.out	
@@ -8,36 +8,36 @@ big_map diff
   New map(4) of type (big_map nat nat)
   Set map(4)[1] to 0
 trace
-  - location: 12 (remaining gas: 1039986.976 units remaining)
+  - location: 12 (remaining gas: 1039988.651 units remaining)
     [ (Pair 1 { Elt 1 0 } None) ]
-  - location: 12 (remaining gas: 1039986.966 units remaining)
+  - location: 12 (remaining gas: 1039988.641 units remaining)
     [ 1
       (Pair { Elt 1 0 } None) ]
-  - location: 13 (remaining gas: 1039986.951 units remaining)
+  - location: 13 (remaining gas: 1039988.631 units remaining)
     [ (Pair { Elt 1 0 } None) ]
-  - location: 15 (remaining gas: 1039986.941 units remaining)
+  - location: 15 (remaining gas: 1039988.621 units remaining)
     [ { Elt 1 0 } ]
-  - location: 16 (remaining gas: 1039986.931 units remaining)
+  - location: 16 (remaining gas: 1039988.611 units remaining)
     [ { Elt 1 0 }
       { Elt 1 0 } ]
-  - location: 13 (remaining gas: 1039986.901 units remaining)
+  - location: 13 (remaining gas: 1039988.591 units remaining)
     [ 1
       { Elt 1 0 }
       { Elt 1 0 } ]
-  - location: 17 (remaining gas: 1039986.128 units remaining)
+  - location: 17 (remaining gas: 1039987.883 units remaining)
     [ True
       { Elt 1 0 } ]
-  - location: 18 (remaining gas: 1039986.113 units remaining)
+  - location: 18 (remaining gas: 1039987.873 units remaining)
     [ (Some True)
       { Elt 1 0 } ]
-  - location: 19 (remaining gas: 1039986.103 units remaining)
+  - location: 19 (remaining gas: 1039987.863 units remaining)
     [ { Elt 1 0 }
       (Some True) ]
-  - location: 20 (remaining gas: 1039986.088 units remaining)
+  - location: 20 (remaining gas: 1039987.853 units remaining)
     [ (Pair { Elt 1 0 } (Some True)) ]
-  - location: 21 (remaining gas: 1039986.073 units remaining)
+  - location: 21 (remaining gas: 1039987.843 units remaining)
     [ {}
       (Pair { Elt 1 0 } (Some True)) ]
-  - location: 23 (remaining gas: 1039986.058 units remaining)
+  - location: 23 (remaining gas: 1039987.833 units remaining)
     [ (Pair {} { Elt 1 0 } (Some True)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 0 } None)-1-(Pair 4 (S.73700321f8.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 0 } None)-1-(Pair 4 (S.73700321f8.out
index 0d7f4c93a02cd18337fd38232a66b92e41b212cb..a8fd880a95166960ff19c1a343cc8709cb345615 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 0 } None)-1-(Pair 4 (S.73700321f8.out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 0 } None)-1-(Pair 4 (S.73700321f8.out	
@@ -8,36 +8,36 @@ big_map diff
   New map(4) of type (big_map nat nat)
   Set map(4)[1] to 0
 trace
-  - location: 12 (remaining gas: 1039986.976 units remaining)
+  - location: 12 (remaining gas: 1039988.651 units remaining)
     [ (Pair 1 { Elt 1 0 } None) ]
-  - location: 12 (remaining gas: 1039986.966 units remaining)
+  - location: 12 (remaining gas: 1039988.641 units remaining)
     [ 1
       (Pair { Elt 1 0 } None) ]
-  - location: 13 (remaining gas: 1039986.951 units remaining)
+  - location: 13 (remaining gas: 1039988.631 units remaining)
     [ (Pair { Elt 1 0 } None) ]
-  - location: 15 (remaining gas: 1039986.941 units remaining)
+  - location: 15 (remaining gas: 1039988.621 units remaining)
     [ { Elt 1 0 } ]
-  - location: 16 (remaining gas: 1039986.931 units remaining)
+  - location: 16 (remaining gas: 1039988.611 units remaining)
     [ { Elt 1 0 }
       { Elt 1 0 } ]
-  - location: 13 (remaining gas: 1039986.901 units remaining)
+  - location: 13 (remaining gas: 1039988.591 units remaining)
     [ 1
       { Elt 1 0 }
       { Elt 1 0 } ]
-  - location: 17 (remaining gas: 1039986.128 units remaining)
+  - location: 17 (remaining gas: 1039987.883 units remaining)
     [ True
       { Elt 1 0 } ]
-  - location: 18 (remaining gas: 1039986.113 units remaining)
+  - location: 18 (remaining gas: 1039987.873 units remaining)
     [ (Some True)
       { Elt 1 0 } ]
-  - location: 19 (remaining gas: 1039986.103 units remaining)
+  - location: 19 (remaining gas: 1039987.863 units remaining)
     [ { Elt 1 0 }
       (Some True) ]
-  - location: 20 (remaining gas: 1039986.088 units remaining)
+  - location: 20 (remaining gas: 1039987.853 units remaining)
     [ (Pair { Elt 1 0 } (Some True)) ]
-  - location: 21 (remaining gas: 1039986.073 units remaining)
+  - location: 21 (remaining gas: 1039987.843 units remaining)
     [ {}
       (Pair { Elt 1 0 } (Some True)) ]
-  - location: 23 (remaining gas: 1039986.058 units remaining)
+  - location: 23 (remaining gas: 1039987.833 units remaining)
     [ (Pair {} { Elt 1 0 } (Some True)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-1.1182eca937.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-1.1182eca937.out
index 05594940c0676317c487399f0496c2431e3be813..d48928ac663c37bd1dfb9266573f0f24ad965342 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-1.1182eca937.out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-1.1182eca937.out	
@@ -9,36 +9,36 @@ big_map diff
   Set map(4)[1] to 4
   Set map(4)[2] to 11
 trace
-  - location: 12 (remaining gas: 1039985.945 units remaining)
+  - location: 12 (remaining gas: 1039987.695 units remaining)
     [ (Pair 1 { Elt 1 4 ; Elt 2 11 } None) ]
-  - location: 12 (remaining gas: 1039985.935 units remaining)
+  - location: 12 (remaining gas: 1039987.685 units remaining)
     [ 1
       (Pair { Elt 1 4 ; Elt 2 11 } None) ]
-  - location: 13 (remaining gas: 1039985.920 units remaining)
+  - location: 13 (remaining gas: 1039987.675 units remaining)
     [ (Pair { Elt 1 4 ; Elt 2 11 } None) ]
-  - location: 15 (remaining gas: 1039985.910 units remaining)
+  - location: 15 (remaining gas: 1039987.665 units remaining)
     [ { Elt 1 4 ; Elt 2 11 } ]
-  - location: 16 (remaining gas: 1039985.900 units remaining)
+  - location: 16 (remaining gas: 1039987.655 units remaining)
     [ { Elt 1 4 ; Elt 2 11 }
       { Elt 1 4 ; Elt 2 11 } ]
-  - location: 13 (remaining gas: 1039985.870 units remaining)
+  - location: 13 (remaining gas: 1039987.635 units remaining)
     [ 1
       { Elt 1 4 ; Elt 2 11 }
       { Elt 1 4 ; Elt 2 11 } ]
-  - location: 17 (remaining gas: 1039985.096 units remaining)
+  - location: 17 (remaining gas: 1039986.926 units remaining)
     [ True
       { Elt 1 4 ; Elt 2 11 } ]
-  - location: 18 (remaining gas: 1039985.081 units remaining)
+  - location: 18 (remaining gas: 1039986.916 units remaining)
     [ (Some True)
       { Elt 1 4 ; Elt 2 11 } ]
-  - location: 19 (remaining gas: 1039985.071 units remaining)
+  - location: 19 (remaining gas: 1039986.906 units remaining)
     [ { Elt 1 4 ; Elt 2 11 }
       (Some True) ]
-  - location: 20 (remaining gas: 1039985.056 units remaining)
+  - location: 20 (remaining gas: 1039986.896 units remaining)
     [ (Pair { Elt 1 4 ; Elt 2 11 } (Some True)) ]
-  - location: 21 (remaining gas: 1039985.041 units remaining)
+  - location: 21 (remaining gas: 1039986.886 units remaining)
     [ {}
       (Pair { Elt 1 4 ; Elt 2 11 } (Some True)) ]
-  - location: 23 (remaining gas: 1039985.026 units remaining)
+  - location: 23 (remaining gas: 1039986.876 units remaining)
     [ (Pair {} { Elt 1 4 ; Elt 2 11 } (Some True)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-1.2ea67af009.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-1.2ea67af009.out
index 11d652b078928674a48c268d959f463dfee25db1..54dc49a9ae81bd8b21afa9045560b68fc8f5d8b0 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-1.2ea67af009.out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-1.2ea67af009.out	
@@ -9,36 +9,36 @@ big_map diff
   Set map(4)[1] to 4
   Set map(4)[2] to 11
 trace
-  - location: 12 (remaining gas: 1039985.945 units remaining)
+  - location: 12 (remaining gas: 1039987.695 units remaining)
     [ (Pair 1 { Elt 1 4 ; Elt 2 11 } None) ]
-  - location: 12 (remaining gas: 1039985.935 units remaining)
+  - location: 12 (remaining gas: 1039987.685 units remaining)
     [ 1
       (Pair { Elt 1 4 ; Elt 2 11 } None) ]
-  - location: 13 (remaining gas: 1039985.920 units remaining)
+  - location: 13 (remaining gas: 1039987.675 units remaining)
     [ (Pair { Elt 1 4 ; Elt 2 11 } None) ]
-  - location: 15 (remaining gas: 1039985.910 units remaining)
+  - location: 15 (remaining gas: 1039987.665 units remaining)
     [ { Elt 1 4 ; Elt 2 11 } ]
-  - location: 16 (remaining gas: 1039985.900 units remaining)
+  - location: 16 (remaining gas: 1039987.655 units remaining)
     [ { Elt 1 4 ; Elt 2 11 }
       { Elt 1 4 ; Elt 2 11 } ]
-  - location: 13 (remaining gas: 1039985.870 units remaining)
+  - location: 13 (remaining gas: 1039987.635 units remaining)
     [ 1
       { Elt 1 4 ; Elt 2 11 }
       { Elt 1 4 ; Elt 2 11 } ]
-  - location: 17 (remaining gas: 1039985.096 units remaining)
+  - location: 17 (remaining gas: 1039986.926 units remaining)
     [ True
       { Elt 1 4 ; Elt 2 11 } ]
-  - location: 18 (remaining gas: 1039985.081 units remaining)
+  - location: 18 (remaining gas: 1039986.916 units remaining)
     [ (Some True)
       { Elt 1 4 ; Elt 2 11 } ]
-  - location: 19 (remaining gas: 1039985.071 units remaining)
+  - location: 19 (remaining gas: 1039986.906 units remaining)
     [ { Elt 1 4 ; Elt 2 11 }
       (Some True) ]
-  - location: 20 (remaining gas: 1039985.056 units remaining)
+  - location: 20 (remaining gas: 1039986.896 units remaining)
     [ (Pair { Elt 1 4 ; Elt 2 11 } (Some True)) ]
-  - location: 21 (remaining gas: 1039985.041 units remaining)
+  - location: 21 (remaining gas: 1039986.886 units remaining)
     [ {}
       (Pair { Elt 1 4 ; Elt 2 11 } (Some True)) ]
-  - location: 23 (remaining gas: 1039985.026 units remaining)
+  - location: 23 (remaining gas: 1039986.876 units remaining)
     [ (Pair {} { Elt 1 4 ; Elt 2 11 } (Some True)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-2.1eead33885.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-2.1eead33885.out
index f89d93fd342c9afde6d067fd87f3e83b205dc053..6f8c0f077397294ea0f7aa3de413e2e9485c2e18 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-2.1eead33885.out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-2.1eead33885.out	
@@ -9,36 +9,36 @@ big_map diff
   Set map(4)[1] to 4
   Set map(4)[2] to 11
 trace
-  - location: 12 (remaining gas: 1039985.945 units remaining)
+  - location: 12 (remaining gas: 1039987.695 units remaining)
     [ (Pair 2 { Elt 1 4 ; Elt 2 11 } None) ]
-  - location: 12 (remaining gas: 1039985.935 units remaining)
+  - location: 12 (remaining gas: 1039987.685 units remaining)
     [ 2
       (Pair { Elt 1 4 ; Elt 2 11 } None) ]
-  - location: 13 (remaining gas: 1039985.920 units remaining)
+  - location: 13 (remaining gas: 1039987.675 units remaining)
     [ (Pair { Elt 1 4 ; Elt 2 11 } None) ]
-  - location: 15 (remaining gas: 1039985.910 units remaining)
+  - location: 15 (remaining gas: 1039987.665 units remaining)
     [ { Elt 1 4 ; Elt 2 11 } ]
-  - location: 16 (remaining gas: 1039985.900 units remaining)
+  - location: 16 (remaining gas: 1039987.655 units remaining)
     [ { Elt 1 4 ; Elt 2 11 }
       { Elt 1 4 ; Elt 2 11 } ]
-  - location: 13 (remaining gas: 1039985.870 units remaining)
+  - location: 13 (remaining gas: 1039987.635 units remaining)
     [ 2
       { Elt 1 4 ; Elt 2 11 }
       { Elt 1 4 ; Elt 2 11 } ]
-  - location: 17 (remaining gas: 1039985.096 units remaining)
+  - location: 17 (remaining gas: 1039986.926 units remaining)
     [ True
       { Elt 1 4 ; Elt 2 11 } ]
-  - location: 18 (remaining gas: 1039985.081 units remaining)
+  - location: 18 (remaining gas: 1039986.916 units remaining)
     [ (Some True)
       { Elt 1 4 ; Elt 2 11 } ]
-  - location: 19 (remaining gas: 1039985.071 units remaining)
+  - location: 19 (remaining gas: 1039986.906 units remaining)
     [ { Elt 1 4 ; Elt 2 11 }
       (Some True) ]
-  - location: 20 (remaining gas: 1039985.056 units remaining)
+  - location: 20 (remaining gas: 1039986.896 units remaining)
     [ (Pair { Elt 1 4 ; Elt 2 11 } (Some True)) ]
-  - location: 21 (remaining gas: 1039985.041 units remaining)
+  - location: 21 (remaining gas: 1039986.886 units remaining)
     [ {}
       (Pair { Elt 1 4 ; Elt 2 11 } (Some True)) ]
-  - location: 23 (remaining gas: 1039985.026 units remaining)
+  - location: 23 (remaining gas: 1039986.876 units remaining)
     [ (Pair {} { Elt 1 4 ; Elt 2 11 } (Some True)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-2.47f55c94c8.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-2.47f55c94c8.out
index ab3d92834ae885ef323e6a551bf3b30ce38f1ba8..7d7085b70890f57a598ae58ac9abac33dc225a7a 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-2.47f55c94c8.out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-2.47f55c94c8.out	
@@ -9,36 +9,36 @@ big_map diff
   Set map(4)[1] to 4
   Set map(4)[2] to 11
 trace
-  - location: 12 (remaining gas: 1039985.945 units remaining)
+  - location: 12 (remaining gas: 1039987.695 units remaining)
     [ (Pair 2 { Elt 1 4 ; Elt 2 11 } None) ]
-  - location: 12 (remaining gas: 1039985.935 units remaining)
+  - location: 12 (remaining gas: 1039987.685 units remaining)
     [ 2
       (Pair { Elt 1 4 ; Elt 2 11 } None) ]
-  - location: 13 (remaining gas: 1039985.920 units remaining)
+  - location: 13 (remaining gas: 1039987.675 units remaining)
     [ (Pair { Elt 1 4 ; Elt 2 11 } None) ]
-  - location: 15 (remaining gas: 1039985.910 units remaining)
+  - location: 15 (remaining gas: 1039987.665 units remaining)
     [ { Elt 1 4 ; Elt 2 11 } ]
-  - location: 16 (remaining gas: 1039985.900 units remaining)
+  - location: 16 (remaining gas: 1039987.655 units remaining)
     [ { Elt 1 4 ; Elt 2 11 }
       { Elt 1 4 ; Elt 2 11 } ]
-  - location: 13 (remaining gas: 1039985.870 units remaining)
+  - location: 13 (remaining gas: 1039987.635 units remaining)
     [ 2
       { Elt 1 4 ; Elt 2 11 }
       { Elt 1 4 ; Elt 2 11 } ]
-  - location: 17 (remaining gas: 1039985.096 units remaining)
+  - location: 17 (remaining gas: 1039986.926 units remaining)
     [ True
       { Elt 1 4 ; Elt 2 11 } ]
-  - location: 18 (remaining gas: 1039985.081 units remaining)
+  - location: 18 (remaining gas: 1039986.916 units remaining)
     [ (Some True)
       { Elt 1 4 ; Elt 2 11 } ]
-  - location: 19 (remaining gas: 1039985.071 units remaining)
+  - location: 19 (remaining gas: 1039986.906 units remaining)
     [ { Elt 1 4 ; Elt 2 11 }
       (Some True) ]
-  - location: 20 (remaining gas: 1039985.056 units remaining)
+  - location: 20 (remaining gas: 1039986.896 units remaining)
     [ (Pair { Elt 1 4 ; Elt 2 11 } (Some True)) ]
-  - location: 21 (remaining gas: 1039985.041 units remaining)
+  - location: 21 (remaining gas: 1039986.886 units remaining)
     [ {}
       (Pair { Elt 1 4 ; Elt 2 11 } (Some True)) ]
-  - location: 23 (remaining gas: 1039985.026 units remaining)
+  - location: 23 (remaining gas: 1039986.876 units remaining)
     [ (Pair {} { Elt 1 4 ; Elt 2 11 } (Some True)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-3.7f1f2ab27d.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-3.7f1f2ab27d.out
index 2b3e5319ba9631b7fb236ea603ce34a1e02c696d..b8a3a844643ba89f146a6d26bda154e3ec27a2ee 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-3.7f1f2ab27d.out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-3.7f1f2ab27d.out	
@@ -9,36 +9,36 @@ big_map diff
   Set map(4)[1] to 4
   Set map(4)[2] to 11
 trace
-  - location: 12 (remaining gas: 1039985.945 units remaining)
+  - location: 12 (remaining gas: 1039987.695 units remaining)
     [ (Pair 3 { Elt 1 4 ; Elt 2 11 } None) ]
-  - location: 12 (remaining gas: 1039985.935 units remaining)
+  - location: 12 (remaining gas: 1039987.685 units remaining)
     [ 3
       (Pair { Elt 1 4 ; Elt 2 11 } None) ]
-  - location: 13 (remaining gas: 1039985.920 units remaining)
+  - location: 13 (remaining gas: 1039987.675 units remaining)
     [ (Pair { Elt 1 4 ; Elt 2 11 } None) ]
-  - location: 15 (remaining gas: 1039985.910 units remaining)
+  - location: 15 (remaining gas: 1039987.665 units remaining)
     [ { Elt 1 4 ; Elt 2 11 } ]
-  - location: 16 (remaining gas: 1039985.900 units remaining)
+  - location: 16 (remaining gas: 1039987.655 units remaining)
     [ { Elt 1 4 ; Elt 2 11 }
       { Elt 1 4 ; Elt 2 11 } ]
-  - location: 13 (remaining gas: 1039985.870 units remaining)
+  - location: 13 (remaining gas: 1039987.635 units remaining)
     [ 3
       { Elt 1 4 ; Elt 2 11 }
       { Elt 1 4 ; Elt 2 11 } ]
-  - location: 17 (remaining gas: 1039985.096 units remaining)
+  - location: 17 (remaining gas: 1039986.926 units remaining)
     [ False
       { Elt 1 4 ; Elt 2 11 } ]
-  - location: 18 (remaining gas: 1039985.081 units remaining)
+  - location: 18 (remaining gas: 1039986.916 units remaining)
     [ (Some False)
       { Elt 1 4 ; Elt 2 11 } ]
-  - location: 19 (remaining gas: 1039985.071 units remaining)
+  - location: 19 (remaining gas: 1039986.906 units remaining)
     [ { Elt 1 4 ; Elt 2 11 }
       (Some False) ]
-  - location: 20 (remaining gas: 1039985.056 units remaining)
+  - location: 20 (remaining gas: 1039986.896 units remaining)
     [ (Pair { Elt 1 4 ; Elt 2 11 } (Some False)) ]
-  - location: 21 (remaining gas: 1039985.041 units remaining)
+  - location: 21 (remaining gas: 1039986.886 units remaining)
     [ {}
       (Pair { Elt 1 4 ; Elt 2 11 } (Some False)) ]
-  - location: 23 (remaining gas: 1039985.026 units remaining)
+  - location: 23 (remaining gas: 1039986.876 units remaining)
     [ (Pair {} { Elt 1 4 ; Elt 2 11 } (Some False)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-3.a3c5c126ce.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-3.a3c5c126ce.out
index c070fb8c956b9621039bb93f477646303955c755..a8494f3f06abf12fb2cf96ae03949f35be27b6ee 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-3.a3c5c126ce.out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-3.a3c5c126ce.out	
@@ -9,36 +9,36 @@ big_map diff
   Set map(4)[1] to 4
   Set map(4)[2] to 11
 trace
-  - location: 12 (remaining gas: 1039985.945 units remaining)
+  - location: 12 (remaining gas: 1039987.695 units remaining)
     [ (Pair 3 { Elt 1 4 ; Elt 2 11 } None) ]
-  - location: 12 (remaining gas: 1039985.935 units remaining)
+  - location: 12 (remaining gas: 1039987.685 units remaining)
     [ 3
       (Pair { Elt 1 4 ; Elt 2 11 } None) ]
-  - location: 13 (remaining gas: 1039985.920 units remaining)
+  - location: 13 (remaining gas: 1039987.675 units remaining)
     [ (Pair { Elt 1 4 ; Elt 2 11 } None) ]
-  - location: 15 (remaining gas: 1039985.910 units remaining)
+  - location: 15 (remaining gas: 1039987.665 units remaining)
     [ { Elt 1 4 ; Elt 2 11 } ]
-  - location: 16 (remaining gas: 1039985.900 units remaining)
+  - location: 16 (remaining gas: 1039987.655 units remaining)
     [ { Elt 1 4 ; Elt 2 11 }
       { Elt 1 4 ; Elt 2 11 } ]
-  - location: 13 (remaining gas: 1039985.870 units remaining)
+  - location: 13 (remaining gas: 1039987.635 units remaining)
     [ 3
       { Elt 1 4 ; Elt 2 11 }
       { Elt 1 4 ; Elt 2 11 } ]
-  - location: 17 (remaining gas: 1039985.096 units remaining)
+  - location: 17 (remaining gas: 1039986.926 units remaining)
     [ False
       { Elt 1 4 ; Elt 2 11 } ]
-  - location: 18 (remaining gas: 1039985.081 units remaining)
+  - location: 18 (remaining gas: 1039986.916 units remaining)
     [ (Some False)
       { Elt 1 4 ; Elt 2 11 } ]
-  - location: 19 (remaining gas: 1039985.071 units remaining)
+  - location: 19 (remaining gas: 1039986.906 units remaining)
     [ { Elt 1 4 ; Elt 2 11 }
       (Some False) ]
-  - location: 20 (remaining gas: 1039985.056 units remaining)
+  - location: 20 (remaining gas: 1039986.896 units remaining)
     [ (Pair { Elt 1 4 ; Elt 2 11 } (Some False)) ]
-  - location: 21 (remaining gas: 1039985.041 units remaining)
+  - location: 21 (remaining gas: 1039986.886 units remaining)
     [ {}
       (Pair { Elt 1 4 ; Elt 2 11 } (Some False)) ]
-  - location: 23 (remaining gas: 1039985.026 units remaining)
+  - location: 23 (remaining gas: 1039986.876 units remaining)
     [ (Pair {} { Elt 1 4 ; Elt 2 11 } (Some False)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair {} None)-1-(Pair 4 (Some False))0].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair {} None)-1-(Pair 4 (Some False))0].out
index 9e59349f38219eaeb09e8029455767ef85ec9d1b..3f84ab198be47a405bef3f6e281d3b94b21aad13 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair {} None)-1-(Pair 4 (Some False))0].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair {} None)-1-(Pair 4 (Some False))0].out	
@@ -7,36 +7,36 @@ emitted operations
 big_map diff
   New map(4) of type (big_map nat nat)
 trace
-  - location: 12 (remaining gas: 1039987.969 units remaining)
+  - location: 12 (remaining gas: 1039989.569 units remaining)
     [ (Pair 1 {} None) ]
-  - location: 12 (remaining gas: 1039987.959 units remaining)
+  - location: 12 (remaining gas: 1039989.559 units remaining)
     [ 1
       (Pair {} None) ]
-  - location: 13 (remaining gas: 1039987.944 units remaining)
+  - location: 13 (remaining gas: 1039989.549 units remaining)
     [ (Pair {} None) ]
-  - location: 15 (remaining gas: 1039987.934 units remaining)
+  - location: 15 (remaining gas: 1039989.539 units remaining)
     [ {} ]
-  - location: 16 (remaining gas: 1039987.924 units remaining)
+  - location: 16 (remaining gas: 1039989.529 units remaining)
     [ {}
       {} ]
-  - location: 13 (remaining gas: 1039987.894 units remaining)
+  - location: 13 (remaining gas: 1039989.509 units remaining)
     [ 1
       {}
       {} ]
-  - location: 17 (remaining gas: 1039987.123 units remaining)
+  - location: 17 (remaining gas: 1039988.803 units remaining)
     [ False
       {} ]
-  - location: 18 (remaining gas: 1039987.108 units remaining)
+  - location: 18 (remaining gas: 1039988.793 units remaining)
     [ (Some False)
       {} ]
-  - location: 19 (remaining gas: 1039987.098 units remaining)
+  - location: 19 (remaining gas: 1039988.783 units remaining)
     [ {}
       (Some False) ]
-  - location: 20 (remaining gas: 1039987.083 units remaining)
+  - location: 20 (remaining gas: 1039988.773 units remaining)
     [ (Pair {} (Some False)) ]
-  - location: 21 (remaining gas: 1039987.068 units remaining)
+  - location: 21 (remaining gas: 1039988.763 units remaining)
     [ {}
       (Pair {} (Some False)) ]
-  - location: 23 (remaining gas: 1039987.053 units remaining)
+  - location: 23 (remaining gas: 1039988.753 units remaining)
     [ (Pair {} {} (Some False)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair {} None)-1-(Pair 4 (Some False))1].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair {} None)-1-(Pair 4 (Some False))1].out
index 7ee949f66a5093c39ec3f26ff52fd779436a4b96..5bb466121d924ab0cdbddb001ff74c3e919f2d55 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair {} None)-1-(Pair 4 (Some False))1].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_nat.tz-(Pair {} None)-1-(Pair 4 (Some False))1].out	
@@ -7,36 +7,36 @@ emitted operations
 big_map diff
   New map(4) of type (big_map nat nat)
 trace
-  - location: 12 (remaining gas: 1039987.969 units remaining)
+  - location: 12 (remaining gas: 1039989.569 units remaining)
     [ (Pair 1 {} None) ]
-  - location: 12 (remaining gas: 1039987.959 units remaining)
+  - location: 12 (remaining gas: 1039989.559 units remaining)
     [ 1
       (Pair {} None) ]
-  - location: 13 (remaining gas: 1039987.944 units remaining)
+  - location: 13 (remaining gas: 1039989.549 units remaining)
     [ (Pair {} None) ]
-  - location: 15 (remaining gas: 1039987.934 units remaining)
+  - location: 15 (remaining gas: 1039989.539 units remaining)
     [ {} ]
-  - location: 16 (remaining gas: 1039987.924 units remaining)
+  - location: 16 (remaining gas: 1039989.529 units remaining)
     [ {}
       {} ]
-  - location: 13 (remaining gas: 1039987.894 units remaining)
+  - location: 13 (remaining gas: 1039989.509 units remaining)
     [ 1
       {}
       {} ]
-  - location: 17 (remaining gas: 1039987.123 units remaining)
+  - location: 17 (remaining gas: 1039988.803 units remaining)
     [ False
       {} ]
-  - location: 18 (remaining gas: 1039987.108 units remaining)
+  - location: 18 (remaining gas: 1039988.793 units remaining)
     [ (Some False)
       {} ]
-  - location: 19 (remaining gas: 1039987.098 units remaining)
+  - location: 19 (remaining gas: 1039988.783 units remaining)
     [ {}
       (Some False) ]
-  - location: 20 (remaining gas: 1039987.083 units remaining)
+  - location: 20 (remaining gas: 1039988.773 units remaining)
     [ (Pair {} (Some False)) ]
-  - location: 21 (remaining gas: 1039987.068 units remaining)
+  - location: 21 (remaining gas: 1039988.763 units remaining)
     [ {}
       (Pair {} (Some False)) ]
-  - location: 23 (remaining gas: 1039987.053 units remaining)
+  - location: 23 (remaining gas: 1039988.753 units remaining)
     [ (Pair {} {} (Some False)) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 1.4be99ce05d.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 1.4be99ce05d.out"
index 1eb54a233c32e51661e58f7426519f79681b6942..50e59e4c2f78b8d183576a07442f67284844778b 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 1.4be99ce05d.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 1.4be99ce05d.out"	
@@ -9,36 +9,36 @@ big_map diff
   Set map(4)["bar"] to 4
   Set map(4)["foo"] to 11
 trace
-  - location: 12 (remaining gas: 1039985.403 units remaining)
+  - location: 12 (remaining gas: 1039987.153 units remaining)
     [ (Pair "baz" { Elt "bar" 4 ; Elt "foo" 11 } None) ]
-  - location: 12 (remaining gas: 1039985.393 units remaining)
+  - location: 12 (remaining gas: 1039987.143 units remaining)
     [ "baz"
       (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) ]
-  - location: 13 (remaining gas: 1039985.378 units remaining)
+  - location: 13 (remaining gas: 1039987.133 units remaining)
     [ (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) ]
-  - location: 15 (remaining gas: 1039985.368 units remaining)
+  - location: 15 (remaining gas: 1039987.123 units remaining)
     [ { Elt "bar" 4 ; Elt "foo" 11 } ]
-  - location: 16 (remaining gas: 1039985.358 units remaining)
+  - location: 16 (remaining gas: 1039987.113 units remaining)
     [ { Elt "bar" 4 ; Elt "foo" 11 }
       { Elt "bar" 4 ; Elt "foo" 11 } ]
-  - location: 13 (remaining gas: 1039985.328 units remaining)
+  - location: 13 (remaining gas: 1039987.093 units remaining)
     [ "baz"
       { Elt "bar" 4 ; Elt "foo" 11 }
       { Elt "bar" 4 ; Elt "foo" 11 } ]
-  - location: 17 (remaining gas: 1039984.349 units remaining)
+  - location: 17 (remaining gas: 1039986.179 units remaining)
     [ False
       { Elt "bar" 4 ; Elt "foo" 11 } ]
-  - location: 18 (remaining gas: 1039984.334 units remaining)
+  - location: 18 (remaining gas: 1039986.169 units remaining)
     [ (Some False)
       { Elt "bar" 4 ; Elt "foo" 11 } ]
-  - location: 19 (remaining gas: 1039984.324 units remaining)
+  - location: 19 (remaining gas: 1039986.159 units remaining)
     [ { Elt "bar" 4 ; Elt "foo" 11 }
       (Some False) ]
-  - location: 20 (remaining gas: 1039984.309 units remaining)
+  - location: 20 (remaining gas: 1039986.149 units remaining)
     [ (Pair { Elt "bar" 4 ; Elt "foo" 11 } (Some False)) ]
-  - location: 21 (remaining gas: 1039984.294 units remaining)
+  - location: 21 (remaining gas: 1039986.139 units remaining)
     [ {}
       (Pair { Elt "bar" 4 ; Elt "foo" 11 } (Some False)) ]
-  - location: 23 (remaining gas: 1039984.279 units remaining)
+  - location: 23 (remaining gas: 1039986.129 units remaining)
     [ (Pair {} { Elt "bar" 4 ; Elt "foo" 11 } (Some False)) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 1.50c0e0ff8b.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 1.50c0e0ff8b.out"
index c80c33fe190d8227b2aa6cb54c5d92db5c779b07..03e0c6932236c36f70da1c7dbc8d1bebda75bc84 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 1.50c0e0ff8b.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 1.50c0e0ff8b.out"	
@@ -9,36 +9,36 @@ big_map diff
   Set map(4)["bar"] to 4
   Set map(4)["foo"] to 11
 trace
-  - location: 12 (remaining gas: 1039985.403 units remaining)
+  - location: 12 (remaining gas: 1039987.153 units remaining)
     [ (Pair "foo" { Elt "bar" 4 ; Elt "foo" 11 } None) ]
-  - location: 12 (remaining gas: 1039985.393 units remaining)
+  - location: 12 (remaining gas: 1039987.143 units remaining)
     [ "foo"
       (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) ]
-  - location: 13 (remaining gas: 1039985.378 units remaining)
+  - location: 13 (remaining gas: 1039987.133 units remaining)
     [ (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) ]
-  - location: 15 (remaining gas: 1039985.368 units remaining)
+  - location: 15 (remaining gas: 1039987.123 units remaining)
     [ { Elt "bar" 4 ; Elt "foo" 11 } ]
-  - location: 16 (remaining gas: 1039985.358 units remaining)
+  - location: 16 (remaining gas: 1039987.113 units remaining)
     [ { Elt "bar" 4 ; Elt "foo" 11 }
       { Elt "bar" 4 ; Elt "foo" 11 } ]
-  - location: 13 (remaining gas: 1039985.328 units remaining)
+  - location: 13 (remaining gas: 1039987.093 units remaining)
     [ "foo"
       { Elt "bar" 4 ; Elt "foo" 11 }
       { Elt "bar" 4 ; Elt "foo" 11 } ]
-  - location: 17 (remaining gas: 1039984.349 units remaining)
+  - location: 17 (remaining gas: 1039986.179 units remaining)
     [ True
       { Elt "bar" 4 ; Elt "foo" 11 } ]
-  - location: 18 (remaining gas: 1039984.334 units remaining)
+  - location: 18 (remaining gas: 1039986.169 units remaining)
     [ (Some True)
       { Elt "bar" 4 ; Elt "foo" 11 } ]
-  - location: 19 (remaining gas: 1039984.324 units remaining)
+  - location: 19 (remaining gas: 1039986.159 units remaining)
     [ { Elt "bar" 4 ; Elt "foo" 11 }
       (Some True) ]
-  - location: 20 (remaining gas: 1039984.309 units remaining)
+  - location: 20 (remaining gas: 1039986.149 units remaining)
     [ (Pair { Elt "bar" 4 ; Elt "foo" 11 } (Some True)) ]
-  - location: 21 (remaining gas: 1039984.294 units remaining)
+  - location: 21 (remaining gas: 1039986.139 units remaining)
     [ {}
       (Pair { Elt "bar" 4 ; Elt "foo" 11 } (Some True)) ]
-  - location: 23 (remaining gas: 1039984.279 units remaining)
+  - location: 23 (remaining gas: 1039986.129 units remaining)
     [ (Pair {} { Elt "bar" 4 ; Elt "foo" 11 } (Some True)) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 1.775c22b027.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 1.775c22b027.out"
index 015cdca28d273b0982b665264546801be525c433..3162ddd8be9546b316cb1ad59b520308884ad940 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 1.775c22b027.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 1.775c22b027.out"	
@@ -9,36 +9,36 @@ big_map diff
   Set map(4)["bar"] to 4
   Set map(4)["foo"] to 11
 trace
-  - location: 12 (remaining gas: 1039985.403 units remaining)
+  - location: 12 (remaining gas: 1039987.153 units remaining)
     [ (Pair "bar" { Elt "bar" 4 ; Elt "foo" 11 } None) ]
-  - location: 12 (remaining gas: 1039985.393 units remaining)
+  - location: 12 (remaining gas: 1039987.143 units remaining)
     [ "bar"
       (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) ]
-  - location: 13 (remaining gas: 1039985.378 units remaining)
+  - location: 13 (remaining gas: 1039987.133 units remaining)
     [ (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) ]
-  - location: 15 (remaining gas: 1039985.368 units remaining)
+  - location: 15 (remaining gas: 1039987.123 units remaining)
     [ { Elt "bar" 4 ; Elt "foo" 11 } ]
-  - location: 16 (remaining gas: 1039985.358 units remaining)
+  - location: 16 (remaining gas: 1039987.113 units remaining)
     [ { Elt "bar" 4 ; Elt "foo" 11 }
       { Elt "bar" 4 ; Elt "foo" 11 } ]
-  - location: 13 (remaining gas: 1039985.328 units remaining)
+  - location: 13 (remaining gas: 1039987.093 units remaining)
     [ "bar"
       { Elt "bar" 4 ; Elt "foo" 11 }
       { Elt "bar" 4 ; Elt "foo" 11 } ]
-  - location: 17 (remaining gas: 1039984.349 units remaining)
+  - location: 17 (remaining gas: 1039986.179 units remaining)
     [ True
       { Elt "bar" 4 ; Elt "foo" 11 } ]
-  - location: 18 (remaining gas: 1039984.334 units remaining)
+  - location: 18 (remaining gas: 1039986.169 units remaining)
     [ (Some True)
       { Elt "bar" 4 ; Elt "foo" 11 } ]
-  - location: 19 (remaining gas: 1039984.324 units remaining)
+  - location: 19 (remaining gas: 1039986.159 units remaining)
     [ { Elt "bar" 4 ; Elt "foo" 11 }
       (Some True) ]
-  - location: 20 (remaining gas: 1039984.309 units remaining)
+  - location: 20 (remaining gas: 1039986.149 units remaining)
     [ (Pair { Elt "bar" 4 ; Elt "foo" 11 } (Some True)) ]
-  - location: 21 (remaining gas: 1039984.294 units remaining)
+  - location: 21 (remaining gas: 1039986.139 units remaining)
     [ {}
       (Pair { Elt "bar" 4 ; Elt "foo" 11 } (Some True)) ]
-  - location: 23 (remaining gas: 1039984.279 units remaining)
+  - location: 23 (remaining gas: 1039986.129 units remaining)
     [ (Pair {} { Elt "bar" 4 ; Elt "foo" 11 } (Some True)) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"foo\" 0 } None)-\"foo\".968709d39d.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"foo\" 0 } None)-\"foo\".968709d39d.out"
index ec598646164cf446d7bc7875f80e457ea0f65b76..aa28b548c3c7739a9b1a513e67a8bbbdd3d1cf31 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"foo\" 0 } None)-\"foo\".968709d39d.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"foo\" 0 } None)-\"foo\".968709d39d.out"	
@@ -8,36 +8,36 @@ big_map diff
   New map(4) of type (big_map string nat)
   Set map(4)["foo"] to 0
 trace
-  - location: 12 (remaining gas: 1039986.683 units remaining)
+  - location: 12 (remaining gas: 1039988.358 units remaining)
     [ (Pair "foo" { Elt "foo" 0 } None) ]
-  - location: 12 (remaining gas: 1039986.673 units remaining)
+  - location: 12 (remaining gas: 1039988.348 units remaining)
     [ "foo"
       (Pair { Elt "foo" 0 } None) ]
-  - location: 13 (remaining gas: 1039986.658 units remaining)
+  - location: 13 (remaining gas: 1039988.338 units remaining)
     [ (Pair { Elt "foo" 0 } None) ]
-  - location: 15 (remaining gas: 1039986.648 units remaining)
+  - location: 15 (remaining gas: 1039988.328 units remaining)
     [ { Elt "foo" 0 } ]
-  - location: 16 (remaining gas: 1039986.638 units remaining)
+  - location: 16 (remaining gas: 1039988.318 units remaining)
     [ { Elt "foo" 0 }
       { Elt "foo" 0 } ]
-  - location: 13 (remaining gas: 1039986.608 units remaining)
+  - location: 13 (remaining gas: 1039988.298 units remaining)
     [ "foo"
       { Elt "foo" 0 }
       { Elt "foo" 0 } ]
-  - location: 17 (remaining gas: 1039985.630 units remaining)
+  - location: 17 (remaining gas: 1039987.385 units remaining)
     [ True
       { Elt "foo" 0 } ]
-  - location: 18 (remaining gas: 1039985.615 units remaining)
+  - location: 18 (remaining gas: 1039987.375 units remaining)
     [ (Some True)
       { Elt "foo" 0 } ]
-  - location: 19 (remaining gas: 1039985.605 units remaining)
+  - location: 19 (remaining gas: 1039987.365 units remaining)
     [ { Elt "foo" 0 }
       (Some True) ]
-  - location: 20 (remaining gas: 1039985.590 units remaining)
+  - location: 20 (remaining gas: 1039987.355 units remaining)
     [ (Pair { Elt "foo" 0 } (Some True)) ]
-  - location: 21 (remaining gas: 1039985.575 units remaining)
+  - location: 21 (remaining gas: 1039987.345 units remaining)
     [ {}
       (Pair { Elt "foo" 0 } (Some True)) ]
-  - location: 23 (remaining gas: 1039985.560 units remaining)
+  - location: 23 (remaining gas: 1039987.335 units remaining)
     [ (Pair {} { Elt "foo" 0 } (Some True)) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"foo\" 1 } None)-\"bar\".cdcfaf9d09.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"foo\" 1 } None)-\"bar\".cdcfaf9d09.out"
index 3e6bad667561173245023f088991c889ad5788d0..e59c977b70ee816624ffb6dbb76a6a56b1a80c41 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"foo\" 1 } None)-\"bar\".cdcfaf9d09.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair { Elt \"foo\" 1 } None)-\"bar\".cdcfaf9d09.out"	
@@ -8,36 +8,36 @@ big_map diff
   New map(4) of type (big_map string nat)
   Set map(4)["foo"] to 1
 trace
-  - location: 12 (remaining gas: 1039986.683 units remaining)
+  - location: 12 (remaining gas: 1039988.358 units remaining)
     [ (Pair "bar" { Elt "foo" 1 } None) ]
-  - location: 12 (remaining gas: 1039986.673 units remaining)
+  - location: 12 (remaining gas: 1039988.348 units remaining)
     [ "bar"
       (Pair { Elt "foo" 1 } None) ]
-  - location: 13 (remaining gas: 1039986.658 units remaining)
+  - location: 13 (remaining gas: 1039988.338 units remaining)
     [ (Pair { Elt "foo" 1 } None) ]
-  - location: 15 (remaining gas: 1039986.648 units remaining)
+  - location: 15 (remaining gas: 1039988.328 units remaining)
     [ { Elt "foo" 1 } ]
-  - location: 16 (remaining gas: 1039986.638 units remaining)
+  - location: 16 (remaining gas: 1039988.318 units remaining)
     [ { Elt "foo" 1 }
       { Elt "foo" 1 } ]
-  - location: 13 (remaining gas: 1039986.608 units remaining)
+  - location: 13 (remaining gas: 1039988.298 units remaining)
     [ "bar"
       { Elt "foo" 1 }
       { Elt "foo" 1 } ]
-  - location: 17 (remaining gas: 1039985.630 units remaining)
+  - location: 17 (remaining gas: 1039987.385 units remaining)
     [ False
       { Elt "foo" 1 } ]
-  - location: 18 (remaining gas: 1039985.615 units remaining)
+  - location: 18 (remaining gas: 1039987.375 units remaining)
     [ (Some False)
       { Elt "foo" 1 } ]
-  - location: 19 (remaining gas: 1039985.605 units remaining)
+  - location: 19 (remaining gas: 1039987.365 units remaining)
     [ { Elt "foo" 1 }
       (Some False) ]
-  - location: 20 (remaining gas: 1039985.590 units remaining)
+  - location: 20 (remaining gas: 1039987.355 units remaining)
     [ (Pair { Elt "foo" 1 } (Some False)) ]
-  - location: 21 (remaining gas: 1039985.575 units remaining)
+  - location: 21 (remaining gas: 1039987.345 units remaining)
     [ {}
       (Pair { Elt "foo" 1 } (Some False)) ]
-  - location: 23 (remaining gas: 1039985.560 units remaining)
+  - location: 23 (remaining gas: 1039987.335 units remaining)
     [ (Pair {} { Elt "foo" 1 } (Some False)) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair {} None)-\"bar\"-(Pair 4 (Some False))].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair {} None)-\"bar\"-(Pair 4 (Some False))].out"
index d71a657718c48f568c721159fde2a8e8b7d6e5ff..87788fab42f010c4432a5602b16ad17133e6b9f4 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair {} None)-\"bar\"-(Pair 4 (Some False))].out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[big_map_mem_string.tz-(Pair {} None)-\"bar\"-(Pair 4 (Some False))].out"	
@@ -7,36 +7,36 @@ emitted operations
 big_map diff
   New map(4) of type (big_map string nat)
 trace
-  - location: 12 (remaining gas: 1039987.925 units remaining)
+  - location: 12 (remaining gas: 1039989.525 units remaining)
     [ (Pair "bar" {} None) ]
-  - location: 12 (remaining gas: 1039987.915 units remaining)
+  - location: 12 (remaining gas: 1039989.515 units remaining)
     [ "bar"
       (Pair {} None) ]
-  - location: 13 (remaining gas: 1039987.900 units remaining)
+  - location: 13 (remaining gas: 1039989.505 units remaining)
     [ (Pair {} None) ]
-  - location: 15 (remaining gas: 1039987.890 units remaining)
+  - location: 15 (remaining gas: 1039989.495 units remaining)
     [ {} ]
-  - location: 16 (remaining gas: 1039987.880 units remaining)
+  - location: 16 (remaining gas: 1039989.485 units remaining)
     [ {}
       {} ]
-  - location: 13 (remaining gas: 1039987.850 units remaining)
+  - location: 13 (remaining gas: 1039989.465 units remaining)
     [ "bar"
       {}
       {} ]
-  - location: 17 (remaining gas: 1039986.874 units remaining)
+  - location: 17 (remaining gas: 1039988.554 units remaining)
     [ False
       {} ]
-  - location: 18 (remaining gas: 1039986.859 units remaining)
+  - location: 18 (remaining gas: 1039988.544 units remaining)
     [ (Some False)
       {} ]
-  - location: 19 (remaining gas: 1039986.849 units remaining)
+  - location: 19 (remaining gas: 1039988.534 units remaining)
     [ {}
       (Some False) ]
-  - location: 20 (remaining gas: 1039986.834 units remaining)
+  - location: 20 (remaining gas: 1039988.524 units remaining)
     [ (Pair {} (Some False)) ]
-  - location: 21 (remaining gas: 1039986.819 units remaining)
+  - location: 21 (remaining gas: 1039988.514 units remaining)
     [ {}
       (Pair {} (Some False)) ]
-  - location: 23 (remaining gas: 1039986.804 units remaining)
+  - location: 23 (remaining gas: 1039988.504 units remaining)
     [ (Pair {} {} (Some False)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_push_bytes_not_padded.tz-None-Unit-(Some 0.9b6e8bcbd3.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_push_bytes_not_padded.tz-None-Unit-(Some 0.9b6e8bcbd3.out
index cdaffebe70b13b8d6137fd7bfd6ac5912200ad1e..fa13c847d6ed22952ca606a8c11292f37d10b945 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_push_bytes_not_padded.tz-None-Unit-(Some 0.9b6e8bcbd3.out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_push_bytes_not_padded.tz-None-Unit-(Some 0.9b6e8bcbd3.out	
@@ -7,18 +7,18 @@ emitted operations
 big_map diff
   
 trace
-  - location: 8 (remaining gas: 1039993.356 units remaining)
+  - location: 8 (remaining gas: 1039994.186 units remaining)
     [ (Pair Unit None) ]
-  - location: 8 (remaining gas: 1039993.346 units remaining)
+  - location: 8 (remaining gas: 1039994.176 units remaining)
     [  ]
-  - location: 9 (remaining gas: 1039993.336 units remaining)
+  - location: 9 (remaining gas: 1039994.166 units remaining)
     [ 0x0000000000000000000000000000000000000000000000000000000000000000 ]
-  - location: 12 (remaining gas: 1039993.321 units remaining)
+  - location: 12 (remaining gas: 1039994.156 units remaining)
     [ (Some 0x0000000000000000000000000000000000000000000000000000000000000000) ]
-  - location: 13 (remaining gas: 1039993.306 units remaining)
+  - location: 13 (remaining gas: 1039994.146 units remaining)
     [ {}
       (Some 0x0000000000000000000000000000000000000000000000000000000000000000) ]
-  - location: 15 (remaining gas: 1039993.291 units remaining)
+  - location: 15 (remaining gas: 1039994.136 units remaining)
     [ (Pair {}
             (Some 0x0000000000000000000000000000000000000000000000000000000000000000)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_push_nat.tz-None-Unit-(Some 0x100000000000.d1219ca789.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_push_nat.tz-None-Unit-(Some 0x100000000000.d1219ca789.out
index 98817139447ee98a7620e8097d87e3ec2db6a8aa..c0e566b6c5fb73d9dbda07379ba3ac03d91a4e2c 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_push_nat.tz-None-Unit-(Some 0x100000000000.d1219ca789.out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_push_nat.tz-None-Unit-(Some 0x100000000000.d1219ca789.out	
@@ -7,18 +7,18 @@ emitted operations
 big_map diff
   
 trace
-  - location: 8 (remaining gas: 1039993.356 units remaining)
+  - location: 8 (remaining gas: 1039994.186 units remaining)
     [ (Pair Unit None) ]
-  - location: 8 (remaining gas: 1039993.346 units remaining)
+  - location: 8 (remaining gas: 1039994.176 units remaining)
     [  ]
-  - location: 9 (remaining gas: 1039993.336 units remaining)
+  - location: 9 (remaining gas: 1039994.166 units remaining)
     [ 0x1000000000000000000000000000000000000000000000000000000000000000 ]
-  - location: 12 (remaining gas: 1039993.321 units remaining)
+  - location: 12 (remaining gas: 1039994.156 units remaining)
     [ (Some 0x1000000000000000000000000000000000000000000000000000000000000000) ]
-  - location: 13 (remaining gas: 1039993.306 units remaining)
+  - location: 13 (remaining gas: 1039994.146 units remaining)
     [ {}
       (Some 0x1000000000000000000000000000000000000000000000000000000000000000) ]
-  - location: 15 (remaining gas: 1039993.291 units remaining)
+  - location: 15 (remaining gas: 1039994.136 units remaining)
     [ (Pair {}
             (Some 0x1000000000000000000000000000000000000000000000000000000000000000)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_to_int.tz-0-0x00-0].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_to_int.tz-0-0x00-0].out
index 23e875e8bfba5c7701ae3be959ece7a6b843e18b..372e98058e1db3f612eb5844f38439ce2891e99a 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_to_int.tz-0-0x00-0].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_to_int.tz-0-0x00-0].out
@@ -7,15 +7,15 @@ emitted operations
 big_map diff
   
 trace
-  - location: 7 (remaining gas: 1039994.763 units remaining)
+  - location: 7 (remaining gas: 1039995.433 units remaining)
     [ (Pair 0x0000000000000000000000000000000000000000000000000000000000000000 0) ]
-  - location: 7 (remaining gas: 1039994.753 units remaining)
+  - location: 7 (remaining gas: 1039995.423 units remaining)
     [ 0x0000000000000000000000000000000000000000000000000000000000000000 ]
-  - location: 8 (remaining gas: 1039994.628 units remaining)
+  - location: 8 (remaining gas: 1039995.308 units remaining)
     [ 0 ]
-  - location: 9 (remaining gas: 1039994.613 units remaining)
+  - location: 9 (remaining gas: 1039995.298 units remaining)
     [ {}
       0 ]
-  - location: 11 (remaining gas: 1039994.598 units remaining)
+  - location: 11 (remaining gas: 1039995.288 units remaining)
     [ (Pair {} 0) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_to_int.tz-0-0x01-1].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_to_int.tz-0-0x01-1].out
index 7ba1dfa939e625b34a6fd4266559340e80851719..94d4e1aa7f2aaa38e0de94708d418835c6b380b2 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_to_int.tz-0-0x01-1].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_to_int.tz-0-0x01-1].out
@@ -7,15 +7,15 @@ emitted operations
 big_map diff
   
 trace
-  - location: 7 (remaining gas: 1039994.763 units remaining)
+  - location: 7 (remaining gas: 1039995.433 units remaining)
     [ (Pair 0x0100000000000000000000000000000000000000000000000000000000000000 0) ]
-  - location: 7 (remaining gas: 1039994.753 units remaining)
+  - location: 7 (remaining gas: 1039995.423 units remaining)
     [ 0x0100000000000000000000000000000000000000000000000000000000000000 ]
-  - location: 8 (remaining gas: 1039994.628 units remaining)
+  - location: 8 (remaining gas: 1039995.308 units remaining)
     [ 1 ]
-  - location: 9 (remaining gas: 1039994.613 units remaining)
+  - location: 9 (remaining gas: 1039995.298 units remaining)
     [ {}
       1 ]
-  - location: 11 (remaining gas: 1039994.598 units remaining)
+  - location: 11 (remaining gas: 1039995.288 units remaining)
     [ (Pair {} 1) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_to_int.tz-0-0x28db8e57af88d9576acd181b89f2.7a85c336ff.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_to_int.tz-0-0x28db8e57af88d9576acd181b89f2.7a85c336ff.out
index 0374ef2cb91574ef00cfe5986c3c02c70faab840..fbb2252f0beb0b93c2fa43e93d0323bed38efb9c 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_to_int.tz-0-0x28db8e57af88d9576acd181b89f2.7a85c336ff.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_to_int.tz-0-0x28db8e57af88d9576acd181b89f2.7a85c336ff.out
@@ -7,16 +7,16 @@ emitted operations
 big_map diff
   
 trace
-  - location: 7 (remaining gas: 1039994.763 units remaining)
+  - location: 7 (remaining gas: 1039995.433 units remaining)
     [ (Pair 0x28db8e57af88d9576acd181b89f24e50a89a6423f939026ed91349fc9af16c27 0) ]
-  - location: 7 (remaining gas: 1039994.753 units remaining)
+  - location: 7 (remaining gas: 1039995.423 units remaining)
     [ 0x28db8e57af88d9576acd181b89f24e50a89a6423f939026ed91349fc9af16c27 ]
-  - location: 8 (remaining gas: 1039994.628 units remaining)
+  - location: 8 (remaining gas: 1039995.308 units remaining)
     [ 17832688077013577776524784494464728518213913213412866604053735695200962927400 ]
-  - location: 9 (remaining gas: 1039994.613 units remaining)
+  - location: 9 (remaining gas: 1039995.298 units remaining)
     [ {}
       17832688077013577776524784494464728518213913213412866604053735695200962927400 ]
-  - location: 11 (remaining gas: 1039994.598 units remaining)
+  - location: 11 (remaining gas: 1039995.288 units remaining)
     [ (Pair {}
             17832688077013577776524784494464728518213913213412866604053735695200962927400) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_to_int.tz-0-0xb9e8abf8dc324a010007addde986.b821eb26b3.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_to_int.tz-0-0xb9e8abf8dc324a010007addde986.b821eb26b3.out
index 2d4a0454070488aef395c5a3b4f4594f9fa869f9..7726e8fec8b862e3312bbe9fa75e7fffebeb1445 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_to_int.tz-0-0xb9e8abf8dc324a010007addde986.b821eb26b3.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_to_int.tz-0-0xb9e8abf8dc324a010007addde986.b821eb26b3.out
@@ -7,16 +7,16 @@ emitted operations
 big_map diff
   
 trace
-  - location: 7 (remaining gas: 1039994.763 units remaining)
+  - location: 7 (remaining gas: 1039995.433 units remaining)
     [ (Pair 0xb9e8abf8dc324a010007addde986fe0f7c81fab16d26819d0534b7691c0b0719 0) ]
-  - location: 7 (remaining gas: 1039994.753 units remaining)
+  - location: 7 (remaining gas: 1039995.423 units remaining)
     [ 0xb9e8abf8dc324a010007addde986fe0f7c81fab16d26819d0534b7691c0b0719 ]
-  - location: 8 (remaining gas: 1039994.628 units remaining)
+  - location: 8 (remaining gas: 1039995.308 units remaining)
     [ 11320265829256585830781521966149529460476767408210445238902869222031333517497 ]
-  - location: 9 (remaining gas: 1039994.613 units remaining)
+  - location: 9 (remaining gas: 1039995.298 units remaining)
     [ {}
       11320265829256585830781521966149529460476767408210445238902869222031333517497 ]
-  - location: 11 (remaining gas: 1039994.598 units remaining)
+  - location: 11 (remaining gas: 1039995.288 units remaining)
     [ (Pair {}
             11320265829256585830781521966149529460476767408210445238902869222031333517497) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_to_mutez.tz-0-0x10-16].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_to_mutez.tz-0-0x10-16].out
index 2aafb7a72a2b25133425e682c5a833747837b2eb..d44ede2738019168cb3494ce6348149cef0a50f6 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_to_mutez.tz-0-0x10-16].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_to_mutez.tz-0-0x10-16].out
@@ -7,26 +7,26 @@ emitted operations
 big_map diff
   
 trace
-  - location: 7 (remaining gas: 1039989.609 units remaining)
+  - location: 7 (remaining gas: 1039990.279 units remaining)
     [ (Pair 0x1000000000000000000000000000000000000000000000000000000000000000 0) ]
-  - location: 7 (remaining gas: 1039989.599 units remaining)
+  - location: 7 (remaining gas: 1039990.269 units remaining)
     [ 0x1000000000000000000000000000000000000000000000000000000000000000 ]
-  - location: 8 (remaining gas: 1039989.474 units remaining)
+  - location: 8 (remaining gas: 1039990.154 units remaining)
     [ 16 ]
-  - location: 9 (remaining gas: 1039989.459 units remaining)
+  - location: 9 (remaining gas: 1039990.144 units remaining)
     [ (Some 16) ]
-  - location: 11 (remaining gas: 1039989.449 units remaining)
+  - location: 11 (remaining gas: 1039990.134 units remaining)
     [ 16 ]
-  - location: 11 (remaining gas: 1039989.434 units remaining)
+  - location: 11 (remaining gas: 1039990.124 units remaining)
     [ 16 ]
-  - location: 17 (remaining gas: 1039989.424 units remaining)
+  - location: 17 (remaining gas: 1039990.114 units remaining)
     [ 1
       16 ]
-  - location: 20 (remaining gas: 1039989.424 units remaining)
+  - location: 20 (remaining gas: 1039990.114 units remaining)
     [ 16 ]
-  - location: 21 (remaining gas: 1039989.409 units remaining)
+  - location: 21 (remaining gas: 1039990.104 units remaining)
     [ {}
       16 ]
-  - location: 23 (remaining gas: 1039989.394 units remaining)
+  - location: 23 (remaining gas: 1039990.094 units remaining)
     [ (Pair {} 16) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.0accef5bef.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.0accef5bef.out
index 1f66b69d84a23d98a22ae534fcf2157e96a3b0f3..66d3016105080a6634cf5d710c41dbbb8543a28d 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.0accef5bef.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.0accef5bef.out
@@ -7,16 +7,16 @@ emitted operations
 big_map diff
   
 trace
-  - location: 7 (remaining gas: 1039994.763 units remaining)
+  - location: 7 (remaining gas: 1039995.433 units remaining)
     [ (Pair -42 0x0100000000000000000000000000000000000000000000000000000000000000) ]
-  - location: 7 (remaining gas: 1039994.753 units remaining)
+  - location: 7 (remaining gas: 1039995.423 units remaining)
     [ -42
       0x0100000000000000000000000000000000000000000000000000000000000000 ]
-  - location: 8 (remaining gas: 1039994.422 units remaining)
+  - location: 8 (remaining gas: 1039995.157 units remaining)
     [ 0xd7fffffffefffffffe5bfeff02a4bd5305d8a10908d83933487d9d2953a7ed73 ]
-  - location: 9 (remaining gas: 1039994.407 units remaining)
+  - location: 9 (remaining gas: 1039995.147 units remaining)
     [ {}
       0xd7fffffffefffffffe5bfeff02a4bd5305d8a10908d83933487d9d2953a7ed73 ]
-  - location: 11 (remaining gas: 1039994.392 units remaining)
+  - location: 11 (remaining gas: 1039995.137 units remaining)
     [ (Pair {} 0xd7fffffffefffffffe5bfeff02a4bd5305d8a10908d83933487d9d2953a7ed73) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.0ecc537252.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.0ecc537252.out
index c3185be8619cd8fcf6670b50aed0da543b318ca8..33dddd5d1404234b0e5be6cdd3ae11ba905eb181 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.0ecc537252.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.0ecc537252.out
@@ -7,16 +7,16 @@ emitted operations
 big_map diff
   
 trace
-  - location: 7 (remaining gas: 1039994.763 units remaining)
+  - location: 7 (remaining gas: 1039995.433 units remaining)
     [ (Pair 2 0x0100000000000000000000000000000000000000000000000000000000000000) ]
-  - location: 7 (remaining gas: 1039994.753 units remaining)
+  - location: 7 (remaining gas: 1039995.423 units remaining)
     [ 2
       0x0100000000000000000000000000000000000000000000000000000000000000 ]
-  - location: 8 (remaining gas: 1039994.422 units remaining)
+  - location: 8 (remaining gas: 1039995.157 units remaining)
     [ 0x0200000000000000000000000000000000000000000000000000000000000000 ]
-  - location: 9 (remaining gas: 1039994.407 units remaining)
+  - location: 9 (remaining gas: 1039995.147 units remaining)
     [ {}
       0x0200000000000000000000000000000000000000000000000000000000000000 ]
-  - location: 11 (remaining gas: 1039994.392 units remaining)
+  - location: 11 (remaining gas: 1039995.137 units remaining)
     [ (Pair {} 0x0200000000000000000000000000000000000000000000000000000000000000) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.2229b767cd.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.2229b767cd.out
index 3033384d3d58121370590cacfdf9f3c6cf744de5..4965d1231c0ea2aab2fd34e213475aae30b04b5d 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.2229b767cd.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.2229b767cd.out
@@ -7,16 +7,16 @@ emitted operations
 big_map diff
   
 trace
-  - location: 7 (remaining gas: 1039994.763 units remaining)
+  - location: 7 (remaining gas: 1039995.433 units remaining)
     [ (Pair -1 0x0100000000000000000000000000000000000000000000000000000000000000) ]
-  - location: 7 (remaining gas: 1039994.753 units remaining)
+  - location: 7 (remaining gas: 1039995.423 units remaining)
     [ -1
       0x0100000000000000000000000000000000000000000000000000000000000000 ]
-  - location: 8 (remaining gas: 1039994.422 units remaining)
+  - location: 8 (remaining gas: 1039995.157 units remaining)
     [ 0x00000000fffffffffe5bfeff02a4bd5305d8a10908d83933487d9d2953a7ed73 ]
-  - location: 9 (remaining gas: 1039994.407 units remaining)
+  - location: 9 (remaining gas: 1039995.147 units remaining)
     [ {}
       0x00000000fffffffffe5bfeff02a4bd5305d8a10908d83933487d9d2953a7ed73 ]
-  - location: 11 (remaining gas: 1039994.392 units remaining)
+  - location: 11 (remaining gas: 1039995.137 units remaining)
     [ (Pair {} 0x00000000fffffffffe5bfeff02a4bd5305d8a10908d83933487d9d2953a7ed73) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.2ff549b46b.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.2ff549b46b.out
index 1e7c193342b7fbdcbe3caa58caa4c0f651732ffe..26fa0a20ef8e4863def3b9333c846949c41babe9 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.2ff549b46b.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.2ff549b46b.out
@@ -7,16 +7,16 @@ emitted operations
 big_map diff
   
 trace
-  - location: 7 (remaining gas: 1039994.763 units remaining)
+  - location: 7 (remaining gas: 1039995.433 units remaining)
     [ (Pair 0 0x0100000000000000000000000000000000000000000000000000000000000000) ]
-  - location: 7 (remaining gas: 1039994.753 units remaining)
+  - location: 7 (remaining gas: 1039995.423 units remaining)
     [ 0
       0x0100000000000000000000000000000000000000000000000000000000000000 ]
-  - location: 8 (remaining gas: 1039994.423 units remaining)
+  - location: 8 (remaining gas: 1039995.158 units remaining)
     [ 0x0000000000000000000000000000000000000000000000000000000000000000 ]
-  - location: 9 (remaining gas: 1039994.408 units remaining)
+  - location: 9 (remaining gas: 1039995.148 units remaining)
     [ {}
       0x0000000000000000000000000000000000000000000000000000000000000000 ]
-  - location: 11 (remaining gas: 1039994.393 units remaining)
+  - location: 11 (remaining gas: 1039995.138 units remaining)
     [ (Pair {} 0x0000000000000000000000000000000000000000000000000000000000000000) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.bf8a711be6.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.bf8a711be6.out
index 6afa5bdab325492e39e230d11d3cede4369e8378..e30044b8136bf33834329fc8604c98161f35a95b 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.bf8a711be6.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.bf8a711be6.out
@@ -7,17 +7,17 @@ emitted operations
 big_map diff
   
 trace
-  - location: 7 (remaining gas: 1039994.763 units remaining)
+  - location: 7 (remaining gas: 1039995.433 units remaining)
     [ (Pair 52435875175126190479447740508185965837690552500527637822603658699938581184514
             0x0100000000000000000000000000000000000000000000000000000000000000) ]
-  - location: 7 (remaining gas: 1039994.753 units remaining)
+  - location: 7 (remaining gas: 1039995.423 units remaining)
     [ 52435875175126190479447740508185965837690552500527637822603658699938581184514
       0x0100000000000000000000000000000000000000000000000000000000000000 ]
-  - location: 8 (remaining gas: 1039994.389 units remaining)
+  - location: 8 (remaining gas: 1039995.124 units remaining)
     [ 0x0100000000000000000000000000000000000000000000000000000000000000 ]
-  - location: 9 (remaining gas: 1039994.374 units remaining)
+  - location: 9 (remaining gas: 1039995.114 units remaining)
     [ {}
       0x0100000000000000000000000000000000000000000000000000000000000000 ]
-  - location: 11 (remaining gas: 1039994.359 units remaining)
+  - location: 11 (remaining gas: 1039995.104 units remaining)
     [ (Pair {} 0x0100000000000000000000000000000000000000000000000000000000000000) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.d41cbb044b.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.d41cbb044b.out
index a3115bb6788e967caeae31d71bf4fb7263c1a42f..226417bdbed877b3546198ae317cc79eefdb079a 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.d41cbb044b.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x0100000000000000000000000000000.d41cbb044b.out
@@ -7,16 +7,16 @@ emitted operations
 big_map diff
   
 trace
-  - location: 7 (remaining gas: 1039994.763 units remaining)
+  - location: 7 (remaining gas: 1039995.433 units remaining)
     [ (Pair 1 0x0100000000000000000000000000000000000000000000000000000000000000) ]
-  - location: 7 (remaining gas: 1039994.753 units remaining)
+  - location: 7 (remaining gas: 1039995.423 units remaining)
     [ 1
       0x0100000000000000000000000000000000000000000000000000000000000000 ]
-  - location: 8 (remaining gas: 1039994.422 units remaining)
+  - location: 8 (remaining gas: 1039995.157 units remaining)
     [ 0x0100000000000000000000000000000000000000000000000000000000000000 ]
-  - location: 9 (remaining gas: 1039994.407 units remaining)
+  - location: 9 (remaining gas: 1039995.147 units remaining)
     [ {}
       0x0100000000000000000000000000000000000000000000000000000000000000 ]
-  - location: 11 (remaining gas: 1039994.392 units remaining)
+  - location: 11 (remaining gas: 1039995.137 units remaining)
     [ (Pair {} 0x0100000000000000000000000000000000000000000000000000000000000000) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x4147a5ad0a633e4880d2296f08ec5c1.a50412e458.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x4147a5ad0a633e4880d2296f08ec5c1.a50412e458.out
index e5bf6eedc194da0583e5fef08cb33f294887ef4f..e55ddb55a948134d47c14eb760ec2d92b63e57e6 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x4147a5ad0a633e4880d2296f08ec5c1.a50412e458.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x4147a5ad0a633e4880d2296f08ec5c1.a50412e458.out
@@ -7,17 +7,17 @@ emitted operations
 big_map diff
   
 trace
-  - location: 7 (remaining gas: 1039994.763 units remaining)
+  - location: 7 (remaining gas: 1039995.433 units remaining)
     [ (Pair 22620284817922784902564672469917992996328211127984472897491698543785655336309
             0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f) ]
-  - location: 7 (remaining gas: 1039994.753 units remaining)
+  - location: 7 (remaining gas: 1039995.423 units remaining)
     [ 22620284817922784902564672469917992996328211127984472897491698543785655336309
       0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f ]
-  - location: 8 (remaining gas: 1039994.389 units remaining)
+  - location: 8 (remaining gas: 1039995.124 units remaining)
     [ 0x4e387e0ebfb3d1633153c195036e0c0b672955c4a0e420f93ec20a76fe677c62 ]
-  - location: 9 (remaining gas: 1039994.374 units remaining)
+  - location: 9 (remaining gas: 1039995.114 units remaining)
     [ {}
       0x4e387e0ebfb3d1633153c195036e0c0b672955c4a0e420f93ec20a76fe677c62 ]
-  - location: 11 (remaining gas: 1039994.359 units remaining)
+  - location: 11 (remaining gas: 1039995.104 units remaining)
     [ (Pair {} 0x4e387e0ebfb3d1633153c195036e0c0b672955c4a0e420f93ec20a76fe677c62) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x5b0ecd0fa853810e356f1eb79721e80.f3a349c4a7.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x5b0ecd0fa853810e356f1eb79721e80.f3a349c4a7.out
index 94369a796b809d88d791e6b26a62ea2caafa8d5b..3cb94ddc5f2a3db9dd132349c4c8bf0358b3d131 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x5b0ecd0fa853810e356f1eb79721e80.f3a349c4a7.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x5b0ecd0fa853810e356f1eb79721e80.f3a349c4a7.out
@@ -7,17 +7,17 @@ emitted operations
 big_map diff
   
 trace
-  - location: 7 (remaining gas: 1039994.763 units remaining)
+  - location: 7 (remaining gas: 1039995.433 units remaining)
     [ (Pair 33644916630334844239120348434626468649534186770809802792596996408934105684394
             0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f) ]
-  - location: 7 (remaining gas: 1039994.753 units remaining)
+  - location: 7 (remaining gas: 1039995.423 units remaining)
     [ 33644916630334844239120348434626468649534186770809802792596996408934105684394
       0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f ]
-  - location: 8 (remaining gas: 1039994.389 units remaining)
+  - location: 8 (remaining gas: 1039995.124 units remaining)
     [ 0x2ef123703093cbbbd124e15f2054fa5781ed0b8d092ec3c6e5d76b4ca918a221 ]
-  - location: 9 (remaining gas: 1039994.374 units remaining)
+  - location: 9 (remaining gas: 1039995.114 units remaining)
     [ {}
       0x2ef123703093cbbbd124e15f2054fa5781ed0b8d092ec3c6e5d76b4ca918a221 ]
-  - location: 11 (remaining gas: 1039994.359 units remaining)
+  - location: 11 (remaining gas: 1039995.104 units remaining)
     [ (Pair {} 0x2ef123703093cbbbd124e15f2054fa5781ed0b8d092ec3c6e5d76b4ca918a221) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x8578be1766f92cd82c5e5135c374a03.1b9676e4c2.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x8578be1766f92cd82c5e5135c374a03.1b9676e4c2.out
index be68da535c93c41b7e5d165f0a559104c0a4d344..829be5cbd0a40c31865281f8e697ecac7e98df82 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x8578be1766f92cd82c5e5135c374a03.1b9676e4c2.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x8578be1766f92cd82c5e5135c374a03.1b9676e4c2.out
@@ -7,17 +7,17 @@ emitted operations
 big_map diff
   
 trace
-  - location: 7 (remaining gas: 1039994.763 units remaining)
+  - location: 7 (remaining gas: 1039995.433 units remaining)
     [ (Pair 69615968247920749285624776342583898043608129789011377475114141186797415307882
             0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d) ]
-  - location: 7 (remaining gas: 1039994.753 units remaining)
+  - location: 7 (remaining gas: 1039995.423 units remaining)
     [ 69615968247920749285624776342583898043608129789011377475114141186797415307882
       0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d ]
-  - location: 8 (remaining gas: 1039994.389 units remaining)
+  - location: 8 (remaining gas: 1039995.124 units remaining)
     [ 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ]
-  - location: 9 (remaining gas: 1039994.374 units remaining)
+  - location: 9 (remaining gas: 1039995.114 units remaining)
     [ {}
       0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ]
-  - location: 11 (remaining gas: 1039994.359 units remaining)
+  - location: 11 (remaining gas: 1039995.104 units remaining)
     [ (Pair {} 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x8578be1766f92cd82c5e5135c374a03.e966dc6de5.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x8578be1766f92cd82c5e5135c374a03.e966dc6de5.out
index 5348ea176e7546538d2f392a4c8fc308881a5a02..338705306faf4a6fc39c52a7b0c78f80e06f48c5 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x8578be1766f92cd82c5e5135c374a03.e966dc6de5.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_int.tz-0x8578be1766f92cd82c5e5135c374a03.e966dc6de5.out
@@ -7,17 +7,17 @@ emitted operations
 big_map diff
   
 trace
-  - location: 7 (remaining gas: 1039994.763 units remaining)
+  - location: 7 (remaining gas: 1039995.433 units remaining)
     [ (Pair 17180093072794558806177035834397932205917577288483739652510482486858834123369
             0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d) ]
-  - location: 7 (remaining gas: 1039994.753 units remaining)
+  - location: 7 (remaining gas: 1039995.423 units remaining)
     [ 17180093072794558806177035834397932205917577288483739652510482486858834123369
       0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d ]
-  - location: 8 (remaining gas: 1039994.389 units remaining)
+  - location: 8 (remaining gas: 1039995.124 units remaining)
     [ 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ]
-  - location: 9 (remaining gas: 1039994.374 units remaining)
+  - location: 9 (remaining gas: 1039995.114 units remaining)
     [ {}
       0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ]
-  - location: 11 (remaining gas: 1039994.359 units remaining)
+  - location: 11 (remaining gas: 1039995.104 units remaining)
     [ (Pair {} 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x0100000000000000000000000000000.964835cc43.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x0100000000000000000000000000000.964835cc43.out
index c62d439881ada5383dd9da636203c4adbfef4f98..49575f606336ee70fc608dac21c6d4b980e1a0bd 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x0100000000000000000000000000000.964835cc43.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x0100000000000000000000000000000.964835cc43.out
@@ -7,16 +7,16 @@ emitted operations
 big_map diff
   
 trace
-  - location: 7 (remaining gas: 1039994.763 units remaining)
+  - location: 7 (remaining gas: 1039995.433 units remaining)
     [ (Pair 1 0x0100000000000000000000000000000000000000000000000000000000000000) ]
-  - location: 7 (remaining gas: 1039994.753 units remaining)
+  - location: 7 (remaining gas: 1039995.423 units remaining)
     [ 1
       0x0100000000000000000000000000000000000000000000000000000000000000 ]
-  - location: 8 (remaining gas: 1039994.422 units remaining)
+  - location: 8 (remaining gas: 1039995.157 units remaining)
     [ 0x0100000000000000000000000000000000000000000000000000000000000000 ]
-  - location: 9 (remaining gas: 1039994.407 units remaining)
+  - location: 9 (remaining gas: 1039995.147 units remaining)
     [ {}
       0x0100000000000000000000000000000000000000000000000000000000000000 ]
-  - location: 11 (remaining gas: 1039994.392 units remaining)
+  - location: 11 (remaining gas: 1039995.137 units remaining)
     [ (Pair {} 0x0100000000000000000000000000000000000000000000000000000000000000) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x0100000000000000000000000000000.b25ea709fb.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x0100000000000000000000000000000.b25ea709fb.out
index 54d20a5524c7c912df18839d535ea59044084a8b..705bdaf4d803063bddd2c3da53781413d7821a14 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x0100000000000000000000000000000.b25ea709fb.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x0100000000000000000000000000000.b25ea709fb.out
@@ -7,16 +7,16 @@ emitted operations
 big_map diff
   
 trace
-  - location: 7 (remaining gas: 1039994.763 units remaining)
+  - location: 7 (remaining gas: 1039995.433 units remaining)
     [ (Pair 0 0x0100000000000000000000000000000000000000000000000000000000000000) ]
-  - location: 7 (remaining gas: 1039994.753 units remaining)
+  - location: 7 (remaining gas: 1039995.423 units remaining)
     [ 0
       0x0100000000000000000000000000000000000000000000000000000000000000 ]
-  - location: 8 (remaining gas: 1039994.423 units remaining)
+  - location: 8 (remaining gas: 1039995.158 units remaining)
     [ 0x0000000000000000000000000000000000000000000000000000000000000000 ]
-  - location: 9 (remaining gas: 1039994.408 units remaining)
+  - location: 9 (remaining gas: 1039995.148 units remaining)
     [ {}
       0x0000000000000000000000000000000000000000000000000000000000000000 ]
-  - location: 11 (remaining gas: 1039994.393 units remaining)
+  - location: 11 (remaining gas: 1039995.138 units remaining)
     [ (Pair {} 0x0000000000000000000000000000000000000000000000000000000000000000) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x0100000000000000000000000000000.eae36753ea.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x0100000000000000000000000000000.eae36753ea.out
index be0bcffab83ba156870bb5e771e1773a4eb2ee10..4114f76bc5c1625f8ddae179bdbba91164e1f2a9 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x0100000000000000000000000000000.eae36753ea.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x0100000000000000000000000000000.eae36753ea.out
@@ -7,17 +7,17 @@ emitted operations
 big_map diff
   
 trace
-  - location: 7 (remaining gas: 1039994.763 units remaining)
+  - location: 7 (remaining gas: 1039995.433 units remaining)
     [ (Pair 52435875175126190479447740508185965837690552500527637822603658699938581184514
             0x0100000000000000000000000000000000000000000000000000000000000000) ]
-  - location: 7 (remaining gas: 1039994.753 units remaining)
+  - location: 7 (remaining gas: 1039995.423 units remaining)
     [ 52435875175126190479447740508185965837690552500527637822603658699938581184514
       0x0100000000000000000000000000000000000000000000000000000000000000 ]
-  - location: 8 (remaining gas: 1039994.389 units remaining)
+  - location: 8 (remaining gas: 1039995.124 units remaining)
     [ 0x0100000000000000000000000000000000000000000000000000000000000000 ]
-  - location: 9 (remaining gas: 1039994.374 units remaining)
+  - location: 9 (remaining gas: 1039995.114 units remaining)
     [ {}
       0x0100000000000000000000000000000000000000000000000000000000000000 ]
-  - location: 11 (remaining gas: 1039994.359 units remaining)
+  - location: 11 (remaining gas: 1039995.104 units remaining)
     [ (Pair {} 0x0100000000000000000000000000000000000000000000000000000000000000) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x0100000000000000000000000000000.ee57dac8f7.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x0100000000000000000000000000000.ee57dac8f7.out
index e0e973ac70ae5e2a2752208120846f255491cba8..1ea7acc06ac13d71c6c9676d8e002544929ca7b6 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x0100000000000000000000000000000.ee57dac8f7.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x0100000000000000000000000000000.ee57dac8f7.out
@@ -7,16 +7,16 @@ emitted operations
 big_map diff
   
 trace
-  - location: 7 (remaining gas: 1039994.763 units remaining)
+  - location: 7 (remaining gas: 1039995.433 units remaining)
     [ (Pair 2 0x0100000000000000000000000000000000000000000000000000000000000000) ]
-  - location: 7 (remaining gas: 1039994.753 units remaining)
+  - location: 7 (remaining gas: 1039995.423 units remaining)
     [ 2
       0x0100000000000000000000000000000000000000000000000000000000000000 ]
-  - location: 8 (remaining gas: 1039994.422 units remaining)
+  - location: 8 (remaining gas: 1039995.157 units remaining)
     [ 0x0200000000000000000000000000000000000000000000000000000000000000 ]
-  - location: 9 (remaining gas: 1039994.407 units remaining)
+  - location: 9 (remaining gas: 1039995.147 units remaining)
     [ {}
       0x0200000000000000000000000000000000000000000000000000000000000000 ]
-  - location: 11 (remaining gas: 1039994.392 units remaining)
+  - location: 11 (remaining gas: 1039995.137 units remaining)
     [ (Pair {} 0x0200000000000000000000000000000000000000000000000000000000000000) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x4147a5ad0a633e4880d2296f08ec5c1.928f6d4b93.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x4147a5ad0a633e4880d2296f08ec5c1.928f6d4b93.out
index aa6e92bc5aa2440a02b19074e064812a150fa9c7..44608fbf2d083d32d1fe8c34f07a56ed3c6cbedd 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x4147a5ad0a633e4880d2296f08ec5c1.928f6d4b93.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x4147a5ad0a633e4880d2296f08ec5c1.928f6d4b93.out
@@ -7,17 +7,17 @@ emitted operations
 big_map diff
   
 trace
-  - location: 7 (remaining gas: 1039994.763 units remaining)
+  - location: 7 (remaining gas: 1039995.433 units remaining)
     [ (Pair 22620284817922784902564672469917992996328211127984472897491698543785655336309
             0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f) ]
-  - location: 7 (remaining gas: 1039994.753 units remaining)
+  - location: 7 (remaining gas: 1039995.423 units remaining)
     [ 22620284817922784902564672469917992996328211127984472897491698543785655336309
       0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f ]
-  - location: 8 (remaining gas: 1039994.389 units remaining)
+  - location: 8 (remaining gas: 1039995.124 units remaining)
     [ 0x4e387e0ebfb3d1633153c195036e0c0b672955c4a0e420f93ec20a76fe677c62 ]
-  - location: 9 (remaining gas: 1039994.374 units remaining)
+  - location: 9 (remaining gas: 1039995.114 units remaining)
     [ {}
       0x4e387e0ebfb3d1633153c195036e0c0b672955c4a0e420f93ec20a76fe677c62 ]
-  - location: 11 (remaining gas: 1039994.359 units remaining)
+  - location: 11 (remaining gas: 1039995.104 units remaining)
     [ (Pair {} 0x4e387e0ebfb3d1633153c195036e0c0b672955c4a0e420f93ec20a76fe677c62) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x5b0ecd0fa853810e356f1eb79721e80.bd5800f6b8.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x5b0ecd0fa853810e356f1eb79721e80.bd5800f6b8.out
index bf0194833221282de347bd2d1d576a093c4fffb7..03c986d41ae28fcd6888091d62e226881d8b88cb 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x5b0ecd0fa853810e356f1eb79721e80.bd5800f6b8.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x5b0ecd0fa853810e356f1eb79721e80.bd5800f6b8.out
@@ -7,17 +7,17 @@ emitted operations
 big_map diff
   
 trace
-  - location: 7 (remaining gas: 1039994.763 units remaining)
+  - location: 7 (remaining gas: 1039995.433 units remaining)
     [ (Pair 33644916630334844239120348434626468649534186770809802792596996408934105684394
             0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f) ]
-  - location: 7 (remaining gas: 1039994.753 units remaining)
+  - location: 7 (remaining gas: 1039995.423 units remaining)
     [ 33644916630334844239120348434626468649534186770809802792596996408934105684394
       0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f ]
-  - location: 8 (remaining gas: 1039994.389 units remaining)
+  - location: 8 (remaining gas: 1039995.124 units remaining)
     [ 0x2ef123703093cbbbd124e15f2054fa5781ed0b8d092ec3c6e5d76b4ca918a221 ]
-  - location: 9 (remaining gas: 1039994.374 units remaining)
+  - location: 9 (remaining gas: 1039995.114 units remaining)
     [ {}
       0x2ef123703093cbbbd124e15f2054fa5781ed0b8d092ec3c6e5d76b4ca918a221 ]
-  - location: 11 (remaining gas: 1039994.359 units remaining)
+  - location: 11 (remaining gas: 1039995.104 units remaining)
     [ (Pair {} 0x2ef123703093cbbbd124e15f2054fa5781ed0b8d092ec3c6e5d76b4ca918a221) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x8578be1766f92cd82c5e5135c374a03.00e897789a.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x8578be1766f92cd82c5e5135c374a03.00e897789a.out
index 09f02c9d4b799a826d0f07c7e30518c182c1717b..4a096112d6699597984a2b49ca8a4698e68eb340 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x8578be1766f92cd82c5e5135c374a03.00e897789a.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x8578be1766f92cd82c5e5135c374a03.00e897789a.out
@@ -7,17 +7,17 @@ emitted operations
 big_map diff
   
 trace
-  - location: 7 (remaining gas: 1039994.763 units remaining)
+  - location: 7 (remaining gas: 1039995.433 units remaining)
     [ (Pair 17180093072794558806177035834397932205917577288483739652510482486858834123369
             0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d) ]
-  - location: 7 (remaining gas: 1039994.753 units remaining)
+  - location: 7 (remaining gas: 1039995.423 units remaining)
     [ 17180093072794558806177035834397932205917577288483739652510482486858834123369
       0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d ]
-  - location: 8 (remaining gas: 1039994.389 units remaining)
+  - location: 8 (remaining gas: 1039995.124 units remaining)
     [ 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ]
-  - location: 9 (remaining gas: 1039994.374 units remaining)
+  - location: 9 (remaining gas: 1039995.114 units remaining)
     [ {}
       0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ]
-  - location: 11 (remaining gas: 1039994.359 units remaining)
+  - location: 11 (remaining gas: 1039995.104 units remaining)
     [ (Pair {} 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x8578be1766f92cd82c5e5135c374a03.a4697eaa13.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x8578be1766f92cd82c5e5135c374a03.a4697eaa13.out
index e1ed8545d7e274449f5b0695ecb51957921e6799..57c28f0fa7fc4759cbaa4589ea80fe9e8b5e246e 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x8578be1766f92cd82c5e5135c374a03.a4697eaa13.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_fr_z_nat.tz-0x8578be1766f92cd82c5e5135c374a03.a4697eaa13.out
@@ -7,17 +7,17 @@ emitted operations
 big_map diff
   
 trace
-  - location: 7 (remaining gas: 1039994.763 units remaining)
+  - location: 7 (remaining gas: 1039995.433 units remaining)
     [ (Pair 69615968247920749285624776342583898043608129789011377475114141186797415307882
             0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d) ]
-  - location: 7 (remaining gas: 1039994.753 units remaining)
+  - location: 7 (remaining gas: 1039995.423 units remaining)
     [ 69615968247920749285624776342583898043608129789011377475114141186797415307882
       0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d ]
-  - location: 8 (remaining gas: 1039994.389 units remaining)
+  - location: 8 (remaining gas: 1039995.124 units remaining)
     [ 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ]
-  - location: 9 (remaining gas: 1039994.374 units remaining)
+  - location: 9 (remaining gas: 1039995.114 units remaining)
     [ {}
       0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ]
-  - location: 11 (remaining gas: 1039994.359 units remaining)
+  - location: 11 (remaining gas: 1039995.104 units remaining)
     [ (Pair {} 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.0177355bbf.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.0177355bbf.out
index 9f666f0692f93c2c98792ef0c0bddf151dad9306..0ec944f59f90b0c5fc06a4fecfa47838b9ee396d 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.0177355bbf.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.0177355bbf.out
@@ -7,19 +7,19 @@ emitted operations
 big_map diff
   
 trace
-  - location: 7 (remaining gas: 1039994.165 units remaining)
+  - location: 7 (remaining gas: 1039994.835 units remaining)
     [ (Pair 2 0x0100000000000000000000000000000000000000000000000000000000000000) ]
-  - location: 7 (remaining gas: 1039994.155 units remaining)
+  - location: 7 (remaining gas: 1039994.825 units remaining)
     [ 2
       0x0100000000000000000000000000000000000000000000000000000000000000 ]
-  - location: 8 (remaining gas: 1039994.145 units remaining)
+  - location: 8 (remaining gas: 1039994.815 units remaining)
     [ 0x0100000000000000000000000000000000000000000000000000000000000000
       2 ]
-  - location: 9 (remaining gas: 1039993.814 units remaining)
+  - location: 9 (remaining gas: 1039994.549 units remaining)
     [ 0x0200000000000000000000000000000000000000000000000000000000000000 ]
-  - location: 10 (remaining gas: 1039993.799 units remaining)
+  - location: 10 (remaining gas: 1039994.539 units remaining)
     [ {}
       0x0200000000000000000000000000000000000000000000000000000000000000 ]
-  - location: 12 (remaining gas: 1039993.784 units remaining)
+  - location: 12 (remaining gas: 1039994.529 units remaining)
     [ (Pair {} 0x0200000000000000000000000000000000000000000000000000000000000000) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.744166c609.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.744166c609.out
index bd54ae051ac9e4b94a0f17cbc61a1387bafe3c9c..942e8778ac53b7dd9ed5c1626c6523d273e648c1 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.744166c609.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.744166c609.out
@@ -7,19 +7,19 @@ emitted operations
 big_map diff
   
 trace
-  - location: 7 (remaining gas: 1039994.165 units remaining)
+  - location: 7 (remaining gas: 1039994.835 units remaining)
     [ (Pair -1 0x0100000000000000000000000000000000000000000000000000000000000000) ]
-  - location: 7 (remaining gas: 1039994.155 units remaining)
+  - location: 7 (remaining gas: 1039994.825 units remaining)
     [ -1
       0x0100000000000000000000000000000000000000000000000000000000000000 ]
-  - location: 8 (remaining gas: 1039994.145 units remaining)
+  - location: 8 (remaining gas: 1039994.815 units remaining)
     [ 0x0100000000000000000000000000000000000000000000000000000000000000
       -1 ]
-  - location: 9 (remaining gas: 1039993.814 units remaining)
+  - location: 9 (remaining gas: 1039994.549 units remaining)
     [ 0x00000000fffffffffe5bfeff02a4bd5305d8a10908d83933487d9d2953a7ed73 ]
-  - location: 10 (remaining gas: 1039993.799 units remaining)
+  - location: 10 (remaining gas: 1039994.539 units remaining)
     [ {}
       0x00000000fffffffffe5bfeff02a4bd5305d8a10908d83933487d9d2953a7ed73 ]
-  - location: 12 (remaining gas: 1039993.784 units remaining)
+  - location: 12 (remaining gas: 1039994.529 units remaining)
     [ (Pair {} 0x00000000fffffffffe5bfeff02a4bd5305d8a10908d83933487d9d2953a7ed73) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.9f3c5cdc6a.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.9f3c5cdc6a.out
index 159bc17380af71f17594201175ae576376cc3d56..08bbdf6f3a4753193eba37d58743238e7c3197c2 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.9f3c5cdc6a.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.9f3c5cdc6a.out
@@ -7,19 +7,19 @@ emitted operations
 big_map diff
   
 trace
-  - location: 7 (remaining gas: 1039994.165 units remaining)
+  - location: 7 (remaining gas: 1039994.835 units remaining)
     [ (Pair 0 0x0100000000000000000000000000000000000000000000000000000000000000) ]
-  - location: 7 (remaining gas: 1039994.155 units remaining)
+  - location: 7 (remaining gas: 1039994.825 units remaining)
     [ 0
       0x0100000000000000000000000000000000000000000000000000000000000000 ]
-  - location: 8 (remaining gas: 1039994.145 units remaining)
+  - location: 8 (remaining gas: 1039994.815 units remaining)
     [ 0x0100000000000000000000000000000000000000000000000000000000000000
       0 ]
-  - location: 9 (remaining gas: 1039993.815 units remaining)
+  - location: 9 (remaining gas: 1039994.550 units remaining)
     [ 0x0000000000000000000000000000000000000000000000000000000000000000 ]
-  - location: 10 (remaining gas: 1039993.800 units remaining)
+  - location: 10 (remaining gas: 1039994.540 units remaining)
     [ {}
       0x0000000000000000000000000000000000000000000000000000000000000000 ]
-  - location: 12 (remaining gas: 1039993.785 units remaining)
+  - location: 12 (remaining gas: 1039994.530 units remaining)
     [ (Pair {} 0x0000000000000000000000000000000000000000000000000000000000000000) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.a54cb341ba.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.a54cb341ba.out
index 7177a41a908da1d98accb9c830dd74d7d1598025..49b539204d46d2f032ce6c098967b55b41b06103 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.a54cb341ba.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.a54cb341ba.out
@@ -7,19 +7,19 @@ emitted operations
 big_map diff
   
 trace
-  - location: 7 (remaining gas: 1039994.165 units remaining)
+  - location: 7 (remaining gas: 1039994.835 units remaining)
     [ (Pair -42 0x0100000000000000000000000000000000000000000000000000000000000000) ]
-  - location: 7 (remaining gas: 1039994.155 units remaining)
+  - location: 7 (remaining gas: 1039994.825 units remaining)
     [ -42
       0x0100000000000000000000000000000000000000000000000000000000000000 ]
-  - location: 8 (remaining gas: 1039994.145 units remaining)
+  - location: 8 (remaining gas: 1039994.815 units remaining)
     [ 0x0100000000000000000000000000000000000000000000000000000000000000
       -42 ]
-  - location: 9 (remaining gas: 1039993.814 units remaining)
+  - location: 9 (remaining gas: 1039994.549 units remaining)
     [ 0xd7fffffffefffffffe5bfeff02a4bd5305d8a10908d83933487d9d2953a7ed73 ]
-  - location: 10 (remaining gas: 1039993.799 units remaining)
+  - location: 10 (remaining gas: 1039994.539 units remaining)
     [ {}
       0xd7fffffffefffffffe5bfeff02a4bd5305d8a10908d83933487d9d2953a7ed73 ]
-  - location: 12 (remaining gas: 1039993.784 units remaining)
+  - location: 12 (remaining gas: 1039994.529 units remaining)
     [ (Pair {} 0xd7fffffffefffffffe5bfeff02a4bd5305d8a10908d83933487d9d2953a7ed73) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.b0dc584c94.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.b0dc584c94.out
index 9aa105dee5fe9deca6b739489007fafc59fa91b5..defff86777c06a65c12bd7e1daafd8e723aafea1 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.b0dc584c94.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.b0dc584c94.out
@@ -7,19 +7,19 @@ emitted operations
 big_map diff
   
 trace
-  - location: 7 (remaining gas: 1039994.165 units remaining)
+  - location: 7 (remaining gas: 1039994.835 units remaining)
     [ (Pair 1 0x0100000000000000000000000000000000000000000000000000000000000000) ]
-  - location: 7 (remaining gas: 1039994.155 units remaining)
+  - location: 7 (remaining gas: 1039994.825 units remaining)
     [ 1
       0x0100000000000000000000000000000000000000000000000000000000000000 ]
-  - location: 8 (remaining gas: 1039994.145 units remaining)
+  - location: 8 (remaining gas: 1039994.815 units remaining)
     [ 0x0100000000000000000000000000000000000000000000000000000000000000
       1 ]
-  - location: 9 (remaining gas: 1039993.814 units remaining)
+  - location: 9 (remaining gas: 1039994.549 units remaining)
     [ 0x0100000000000000000000000000000000000000000000000000000000000000 ]
-  - location: 10 (remaining gas: 1039993.799 units remaining)
+  - location: 10 (remaining gas: 1039994.539 units remaining)
     [ {}
       0x0100000000000000000000000000000000000000000000000000000000000000 ]
-  - location: 12 (remaining gas: 1039993.784 units remaining)
+  - location: 12 (remaining gas: 1039994.529 units remaining)
     [ (Pair {} 0x0100000000000000000000000000000000000000000000000000000000000000) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.bddcad090c.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.bddcad090c.out
index 0ad1d287836d0176fa2f648a49a0b5d78cdea978..eb092137b8b542ccd5284c6b5af341f1c048c766 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.bddcad090c.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x0100000000000000000000000000000.bddcad090c.out
@@ -7,20 +7,20 @@ emitted operations
 big_map diff
   
 trace
-  - location: 7 (remaining gas: 1039994.165 units remaining)
+  - location: 7 (remaining gas: 1039994.835 units remaining)
     [ (Pair 52435875175126190479447740508185965837690552500527637822603658699938581184514
             0x0100000000000000000000000000000000000000000000000000000000000000) ]
-  - location: 7 (remaining gas: 1039994.155 units remaining)
+  - location: 7 (remaining gas: 1039994.825 units remaining)
     [ 52435875175126190479447740508185965837690552500527637822603658699938581184514
       0x0100000000000000000000000000000000000000000000000000000000000000 ]
-  - location: 8 (remaining gas: 1039994.145 units remaining)
+  - location: 8 (remaining gas: 1039994.815 units remaining)
     [ 0x0100000000000000000000000000000000000000000000000000000000000000
       52435875175126190479447740508185965837690552500527637822603658699938581184514 ]
-  - location: 9 (remaining gas: 1039993.781 units remaining)
+  - location: 9 (remaining gas: 1039994.516 units remaining)
     [ 0x0100000000000000000000000000000000000000000000000000000000000000 ]
-  - location: 10 (remaining gas: 1039993.766 units remaining)
+  - location: 10 (remaining gas: 1039994.506 units remaining)
     [ {}
       0x0100000000000000000000000000000000000000000000000000000000000000 ]
-  - location: 12 (remaining gas: 1039993.751 units remaining)
+  - location: 12 (remaining gas: 1039994.496 units remaining)
     [ (Pair {} 0x0100000000000000000000000000000000000000000000000000000000000000) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x4147a5ad0a633e4880d2296f08ec5c1.92c153eb47.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x4147a5ad0a633e4880d2296f08ec5c1.92c153eb47.out
index 9ca38a00e22d9b22e1820c6ecd77564da5e75b36..88458752d7e17c428d1e481723fefd7c0f6a209e 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x4147a5ad0a633e4880d2296f08ec5c1.92c153eb47.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x4147a5ad0a633e4880d2296f08ec5c1.92c153eb47.out
@@ -7,20 +7,20 @@ emitted operations
 big_map diff
   
 trace
-  - location: 7 (remaining gas: 1039994.165 units remaining)
+  - location: 7 (remaining gas: 1039994.835 units remaining)
     [ (Pair 22620284817922784902564672469917992996328211127984472897491698543785655336309
             0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f) ]
-  - location: 7 (remaining gas: 1039994.155 units remaining)
+  - location: 7 (remaining gas: 1039994.825 units remaining)
     [ 22620284817922784902564672469917992996328211127984472897491698543785655336309
       0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f ]
-  - location: 8 (remaining gas: 1039994.145 units remaining)
+  - location: 8 (remaining gas: 1039994.815 units remaining)
     [ 0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f
       22620284817922784902564672469917992996328211127984472897491698543785655336309 ]
-  - location: 9 (remaining gas: 1039993.781 units remaining)
+  - location: 9 (remaining gas: 1039994.516 units remaining)
     [ 0x4e387e0ebfb3d1633153c195036e0c0b672955c4a0e420f93ec20a76fe677c62 ]
-  - location: 10 (remaining gas: 1039993.766 units remaining)
+  - location: 10 (remaining gas: 1039994.506 units remaining)
     [ {}
       0x4e387e0ebfb3d1633153c195036e0c0b672955c4a0e420f93ec20a76fe677c62 ]
-  - location: 12 (remaining gas: 1039993.751 units remaining)
+  - location: 12 (remaining gas: 1039994.496 units remaining)
     [ (Pair {} 0x4e387e0ebfb3d1633153c195036e0c0b672955c4a0e420f93ec20a76fe677c62) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x5b0ecd0fa853810e356f1eb79721e80.290ab49d11.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x5b0ecd0fa853810e356f1eb79721e80.290ab49d11.out
index 5bf336f5154e527e5274edb982bad09db2ecc5b8..0a3ecdb2a38bd97cc0c81a10278979c1be8c0a80 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x5b0ecd0fa853810e356f1eb79721e80.290ab49d11.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x5b0ecd0fa853810e356f1eb79721e80.290ab49d11.out
@@ -7,20 +7,20 @@ emitted operations
 big_map diff
   
 trace
-  - location: 7 (remaining gas: 1039994.165 units remaining)
+  - location: 7 (remaining gas: 1039994.835 units remaining)
     [ (Pair 33644916630334844239120348434626468649534186770809802792596996408934105684394
             0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f) ]
-  - location: 7 (remaining gas: 1039994.155 units remaining)
+  - location: 7 (remaining gas: 1039994.825 units remaining)
     [ 33644916630334844239120348434626468649534186770809802792596996408934105684394
       0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f ]
-  - location: 8 (remaining gas: 1039994.145 units remaining)
+  - location: 8 (remaining gas: 1039994.815 units remaining)
     [ 0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f
       33644916630334844239120348434626468649534186770809802792596996408934105684394 ]
-  - location: 9 (remaining gas: 1039993.781 units remaining)
+  - location: 9 (remaining gas: 1039994.516 units remaining)
     [ 0x2ef123703093cbbbd124e15f2054fa5781ed0b8d092ec3c6e5d76b4ca918a221 ]
-  - location: 10 (remaining gas: 1039993.766 units remaining)
+  - location: 10 (remaining gas: 1039994.506 units remaining)
     [ {}
       0x2ef123703093cbbbd124e15f2054fa5781ed0b8d092ec3c6e5d76b4ca918a221 ]
-  - location: 12 (remaining gas: 1039993.751 units remaining)
+  - location: 12 (remaining gas: 1039994.496 units remaining)
     [ (Pair {} 0x2ef123703093cbbbd124e15f2054fa5781ed0b8d092ec3c6e5d76b4ca918a221) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x8578be1766f92cd82c5e5135c374a03.69f3589a06.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x8578be1766f92cd82c5e5135c374a03.69f3589a06.out
index 20ad78282e81e8f56c7e82cbb983dbf455fd1a39..20ae8800e0f4900d3d375f2496d77178ac0bdf1c 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x8578be1766f92cd82c5e5135c374a03.69f3589a06.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x8578be1766f92cd82c5e5135c374a03.69f3589a06.out
@@ -7,20 +7,20 @@ emitted operations
 big_map diff
   
 trace
-  - location: 7 (remaining gas: 1039994.165 units remaining)
+  - location: 7 (remaining gas: 1039994.835 units remaining)
     [ (Pair 17180093072794558806177035834397932205917577288483739652510482486858834123369
             0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d) ]
-  - location: 7 (remaining gas: 1039994.155 units remaining)
+  - location: 7 (remaining gas: 1039994.825 units remaining)
     [ 17180093072794558806177035834397932205917577288483739652510482486858834123369
       0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d ]
-  - location: 8 (remaining gas: 1039994.145 units remaining)
+  - location: 8 (remaining gas: 1039994.815 units remaining)
     [ 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d
       17180093072794558806177035834397932205917577288483739652510482486858834123369 ]
-  - location: 9 (remaining gas: 1039993.781 units remaining)
+  - location: 9 (remaining gas: 1039994.516 units remaining)
     [ 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ]
-  - location: 10 (remaining gas: 1039993.766 units remaining)
+  - location: 10 (remaining gas: 1039994.506 units remaining)
     [ {}
       0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ]
-  - location: 12 (remaining gas: 1039993.751 units remaining)
+  - location: 12 (remaining gas: 1039994.496 units remaining)
     [ (Pair {} 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x8578be1766f92cd82c5e5135c374a03.fee3c5cf43.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x8578be1766f92cd82c5e5135c374a03.fee3c5cf43.out
index 82d61277ad7635f7654f1d8bbed196c1f7ccf60d..ef1f258220b205b966a6ac4b49a1cf27d366c624 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x8578be1766f92cd82c5e5135c374a03.fee3c5cf43.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_int.tz-0x8578be1766f92cd82c5e5135c374a03.fee3c5cf43.out
@@ -7,20 +7,20 @@ emitted operations
 big_map diff
   
 trace
-  - location: 7 (remaining gas: 1039994.165 units remaining)
+  - location: 7 (remaining gas: 1039994.835 units remaining)
     [ (Pair 69615968247920749285624776342583898043608129789011377475114141186797415307882
             0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d) ]
-  - location: 7 (remaining gas: 1039994.155 units remaining)
+  - location: 7 (remaining gas: 1039994.825 units remaining)
     [ 69615968247920749285624776342583898043608129789011377475114141186797415307882
       0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d ]
-  - location: 8 (remaining gas: 1039994.145 units remaining)
+  - location: 8 (remaining gas: 1039994.815 units remaining)
     [ 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d
       69615968247920749285624776342583898043608129789011377475114141186797415307882 ]
-  - location: 9 (remaining gas: 1039993.781 units remaining)
+  - location: 9 (remaining gas: 1039994.516 units remaining)
     [ 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ]
-  - location: 10 (remaining gas: 1039993.766 units remaining)
+  - location: 10 (remaining gas: 1039994.506 units remaining)
     [ {}
       0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ]
-  - location: 12 (remaining gas: 1039993.751 units remaining)
+  - location: 12 (remaining gas: 1039994.496 units remaining)
     [ (Pair {} 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x0100000000000000000000000000000.1bccc033e8.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x0100000000000000000000000000000.1bccc033e8.out
index 7c8b08569611829dbc9a1c8fa9d4d2efe49d5a98..084a749440b862cc7249de46ed9e10023baf6642 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x0100000000000000000000000000000.1bccc033e8.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x0100000000000000000000000000000.1bccc033e8.out
@@ -7,20 +7,20 @@ emitted operations
 big_map diff
   
 trace
-  - location: 7 (remaining gas: 1039994.165 units remaining)
+  - location: 7 (remaining gas: 1039994.835 units remaining)
     [ (Pair 52435875175126190479447740508185965837690552500527637822603658699938581184514
             0x0100000000000000000000000000000000000000000000000000000000000000) ]
-  - location: 7 (remaining gas: 1039994.155 units remaining)
+  - location: 7 (remaining gas: 1039994.825 units remaining)
     [ 52435875175126190479447740508185965837690552500527637822603658699938581184514
       0x0100000000000000000000000000000000000000000000000000000000000000 ]
-  - location: 8 (remaining gas: 1039994.145 units remaining)
+  - location: 8 (remaining gas: 1039994.815 units remaining)
     [ 0x0100000000000000000000000000000000000000000000000000000000000000
       52435875175126190479447740508185965837690552500527637822603658699938581184514 ]
-  - location: 9 (remaining gas: 1039993.781 units remaining)
+  - location: 9 (remaining gas: 1039994.516 units remaining)
     [ 0x0100000000000000000000000000000000000000000000000000000000000000 ]
-  - location: 10 (remaining gas: 1039993.766 units remaining)
+  - location: 10 (remaining gas: 1039994.506 units remaining)
     [ {}
       0x0100000000000000000000000000000000000000000000000000000000000000 ]
-  - location: 12 (remaining gas: 1039993.751 units remaining)
+  - location: 12 (remaining gas: 1039994.496 units remaining)
     [ (Pair {} 0x0100000000000000000000000000000000000000000000000000000000000000) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x0100000000000000000000000000000.40958700fe.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x0100000000000000000000000000000.40958700fe.out
index f9b4c8619995a55634546b7b48b79205ec5c4434..95e53c17c8b836f9ccf4ad2432601ce661022f15 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x0100000000000000000000000000000.40958700fe.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x0100000000000000000000000000000.40958700fe.out
@@ -7,19 +7,19 @@ emitted operations
 big_map diff
   
 trace
-  - location: 7 (remaining gas: 1039994.165 units remaining)
+  - location: 7 (remaining gas: 1039994.835 units remaining)
     [ (Pair 0 0x0100000000000000000000000000000000000000000000000000000000000000) ]
-  - location: 7 (remaining gas: 1039994.155 units remaining)
+  - location: 7 (remaining gas: 1039994.825 units remaining)
     [ 0
       0x0100000000000000000000000000000000000000000000000000000000000000 ]
-  - location: 8 (remaining gas: 1039994.145 units remaining)
+  - location: 8 (remaining gas: 1039994.815 units remaining)
     [ 0x0100000000000000000000000000000000000000000000000000000000000000
       0 ]
-  - location: 9 (remaining gas: 1039993.815 units remaining)
+  - location: 9 (remaining gas: 1039994.550 units remaining)
     [ 0x0000000000000000000000000000000000000000000000000000000000000000 ]
-  - location: 10 (remaining gas: 1039993.800 units remaining)
+  - location: 10 (remaining gas: 1039994.540 units remaining)
     [ {}
       0x0000000000000000000000000000000000000000000000000000000000000000 ]
-  - location: 12 (remaining gas: 1039993.785 units remaining)
+  - location: 12 (remaining gas: 1039994.530 units remaining)
     [ (Pair {} 0x0000000000000000000000000000000000000000000000000000000000000000) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x0100000000000000000000000000000.6c62b03d78.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x0100000000000000000000000000000.6c62b03d78.out
index be2dd23f0543cbb905e4266cb18470bfed962653..523fa404d14dc6346daad3dc3f9501a2798ff310 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x0100000000000000000000000000000.6c62b03d78.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x0100000000000000000000000000000.6c62b03d78.out
@@ -7,19 +7,19 @@ emitted operations
 big_map diff
   
 trace
-  - location: 7 (remaining gas: 1039994.165 units remaining)
+  - location: 7 (remaining gas: 1039994.835 units remaining)
     [ (Pair 1 0x0100000000000000000000000000000000000000000000000000000000000000) ]
-  - location: 7 (remaining gas: 1039994.155 units remaining)
+  - location: 7 (remaining gas: 1039994.825 units remaining)
     [ 1
       0x0100000000000000000000000000000000000000000000000000000000000000 ]
-  - location: 8 (remaining gas: 1039994.145 units remaining)
+  - location: 8 (remaining gas: 1039994.815 units remaining)
     [ 0x0100000000000000000000000000000000000000000000000000000000000000
       1 ]
-  - location: 9 (remaining gas: 1039993.814 units remaining)
+  - location: 9 (remaining gas: 1039994.549 units remaining)
     [ 0x0100000000000000000000000000000000000000000000000000000000000000 ]
-  - location: 10 (remaining gas: 1039993.799 units remaining)
+  - location: 10 (remaining gas: 1039994.539 units remaining)
     [ {}
       0x0100000000000000000000000000000000000000000000000000000000000000 ]
-  - location: 12 (remaining gas: 1039993.784 units remaining)
+  - location: 12 (remaining gas: 1039994.529 units remaining)
     [ (Pair {} 0x0100000000000000000000000000000000000000000000000000000000000000) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x0100000000000000000000000000000.d23f269341.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x0100000000000000000000000000000.d23f269341.out
index 1e0b5f4205ded6769e2b5391e1d716c465914ad9..ed9f63efc61cdad1b7ba67b47fb2ff43b39460df 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x0100000000000000000000000000000.d23f269341.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x0100000000000000000000000000000.d23f269341.out
@@ -7,19 +7,19 @@ emitted operations
 big_map diff
   
 trace
-  - location: 7 (remaining gas: 1039994.165 units remaining)
+  - location: 7 (remaining gas: 1039994.835 units remaining)
     [ (Pair 2 0x0100000000000000000000000000000000000000000000000000000000000000) ]
-  - location: 7 (remaining gas: 1039994.155 units remaining)
+  - location: 7 (remaining gas: 1039994.825 units remaining)
     [ 2
       0x0100000000000000000000000000000000000000000000000000000000000000 ]
-  - location: 8 (remaining gas: 1039994.145 units remaining)
+  - location: 8 (remaining gas: 1039994.815 units remaining)
     [ 0x0100000000000000000000000000000000000000000000000000000000000000
       2 ]
-  - location: 9 (remaining gas: 1039993.814 units remaining)
+  - location: 9 (remaining gas: 1039994.549 units remaining)
     [ 0x0200000000000000000000000000000000000000000000000000000000000000 ]
-  - location: 10 (remaining gas: 1039993.799 units remaining)
+  - location: 10 (remaining gas: 1039994.539 units remaining)
     [ {}
       0x0200000000000000000000000000000000000000000000000000000000000000 ]
-  - location: 12 (remaining gas: 1039993.784 units remaining)
+  - location: 12 (remaining gas: 1039994.529 units remaining)
     [ (Pair {} 0x0200000000000000000000000000000000000000000000000000000000000000) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x4147a5ad0a633e4880d2296f08ec5c1.927f808504.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x4147a5ad0a633e4880d2296f08ec5c1.927f808504.out
index acfd6d99c04f95bf4c9af0c260cf9d09265e94da..c7a90445d18f0df809a0106338b1087d49ae2f4d 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x4147a5ad0a633e4880d2296f08ec5c1.927f808504.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x4147a5ad0a633e4880d2296f08ec5c1.927f808504.out
@@ -7,20 +7,20 @@ emitted operations
 big_map diff
   
 trace
-  - location: 7 (remaining gas: 1039994.165 units remaining)
+  - location: 7 (remaining gas: 1039994.835 units remaining)
     [ (Pair 22620284817922784902564672469917992996328211127984472897491698543785655336309
             0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f) ]
-  - location: 7 (remaining gas: 1039994.155 units remaining)
+  - location: 7 (remaining gas: 1039994.825 units remaining)
     [ 22620284817922784902564672469917992996328211127984472897491698543785655336309
       0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f ]
-  - location: 8 (remaining gas: 1039994.145 units remaining)
+  - location: 8 (remaining gas: 1039994.815 units remaining)
     [ 0x4147a5ad0a633e4880d2296f08ec5c12d03e3fa4a6b49ecbd16a30a3cfcdbe3f
       22620284817922784902564672469917992996328211127984472897491698543785655336309 ]
-  - location: 9 (remaining gas: 1039993.781 units remaining)
+  - location: 9 (remaining gas: 1039994.516 units remaining)
     [ 0x4e387e0ebfb3d1633153c195036e0c0b672955c4a0e420f93ec20a76fe677c62 ]
-  - location: 10 (remaining gas: 1039993.766 units remaining)
+  - location: 10 (remaining gas: 1039994.506 units remaining)
     [ {}
       0x4e387e0ebfb3d1633153c195036e0c0b672955c4a0e420f93ec20a76fe677c62 ]
-  - location: 12 (remaining gas: 1039993.751 units remaining)
+  - location: 12 (remaining gas: 1039994.496 units remaining)
     [ (Pair {} 0x4e387e0ebfb3d1633153c195036e0c0b672955c4a0e420f93ec20a76fe677c62) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x5b0ecd0fa853810e356f1eb79721e80.0c114c956a.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x5b0ecd0fa853810e356f1eb79721e80.0c114c956a.out
index 7591ca86e29e7bbaa07937261f9f996d631574f1..24cc591fdcc1f8612ef3508aae1a0a342fb8f323 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x5b0ecd0fa853810e356f1eb79721e80.0c114c956a.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x5b0ecd0fa853810e356f1eb79721e80.0c114c956a.out
@@ -7,20 +7,20 @@ emitted operations
 big_map diff
   
 trace
-  - location: 7 (remaining gas: 1039994.165 units remaining)
+  - location: 7 (remaining gas: 1039994.835 units remaining)
     [ (Pair 33644916630334844239120348434626468649534186770809802792596996408934105684394
             0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f) ]
-  - location: 7 (remaining gas: 1039994.155 units remaining)
+  - location: 7 (remaining gas: 1039994.825 units remaining)
     [ 33644916630334844239120348434626468649534186770809802792596996408934105684394
       0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f ]
-  - location: 8 (remaining gas: 1039994.145 units remaining)
+  - location: 8 (remaining gas: 1039994.815 units remaining)
     [ 0x5b0ecd0fa853810e356f1eb79721e80b30510fcc3a455f4fc02fdd9a90c5401f
       33644916630334844239120348434626468649534186770809802792596996408934105684394 ]
-  - location: 9 (remaining gas: 1039993.781 units remaining)
+  - location: 9 (remaining gas: 1039994.516 units remaining)
     [ 0x2ef123703093cbbbd124e15f2054fa5781ed0b8d092ec3c6e5d76b4ca918a221 ]
-  - location: 10 (remaining gas: 1039993.766 units remaining)
+  - location: 10 (remaining gas: 1039994.506 units remaining)
     [ {}
       0x2ef123703093cbbbd124e15f2054fa5781ed0b8d092ec3c6e5d76b4ca918a221 ]
-  - location: 12 (remaining gas: 1039993.751 units remaining)
+  - location: 12 (remaining gas: 1039994.496 units remaining)
     [ (Pair {} 0x2ef123703093cbbbd124e15f2054fa5781ed0b8d092ec3c6e5d76b4ca918a221) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x8578be1766f92cd82c5e5135c374a03.03c4f38e68.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x8578be1766f92cd82c5e5135c374a03.03c4f38e68.out
index 8bae5dd01bfbbc7f9d489c4cdd185bd3751c314d..960125e052917d13876e1fa7fd29bf986fd62f5d 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x8578be1766f92cd82c5e5135c374a03.03c4f38e68.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x8578be1766f92cd82c5e5135c374a03.03c4f38e68.out
@@ -7,20 +7,20 @@ emitted operations
 big_map diff
   
 trace
-  - location: 7 (remaining gas: 1039994.165 units remaining)
+  - location: 7 (remaining gas: 1039994.835 units remaining)
     [ (Pair 69615968247920749285624776342583898043608129789011377475114141186797415307882
             0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d) ]
-  - location: 7 (remaining gas: 1039994.155 units remaining)
+  - location: 7 (remaining gas: 1039994.825 units remaining)
     [ 69615968247920749285624776342583898043608129789011377475114141186797415307882
       0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d ]
-  - location: 8 (remaining gas: 1039994.145 units remaining)
+  - location: 8 (remaining gas: 1039994.815 units remaining)
     [ 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d
       69615968247920749285624776342583898043608129789011377475114141186797415307882 ]
-  - location: 9 (remaining gas: 1039993.781 units remaining)
+  - location: 9 (remaining gas: 1039994.516 units remaining)
     [ 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ]
-  - location: 10 (remaining gas: 1039993.766 units remaining)
+  - location: 10 (remaining gas: 1039994.506 units remaining)
     [ {}
       0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ]
-  - location: 12 (remaining gas: 1039993.751 units remaining)
+  - location: 12 (remaining gas: 1039994.496 units remaining)
     [ (Pair {} 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x8578be1766f92cd82c5e5135c374a03.8ed19cfdd9.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x8578be1766f92cd82c5e5135c374a03.8ed19cfdd9.out
index 0b70fee2cd86bebfcaa39db512de671d3cdf71a4..68ebda64897ba414870d1f88c35cfd863d791a97 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x8578be1766f92cd82c5e5135c374a03.8ed19cfdd9.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[bls12_381_z_fr_nat.tz-0x8578be1766f92cd82c5e5135c374a03.8ed19cfdd9.out
@@ -7,20 +7,20 @@ emitted operations
 big_map diff
   
 trace
-  - location: 7 (remaining gas: 1039994.165 units remaining)
+  - location: 7 (remaining gas: 1039994.835 units remaining)
     [ (Pair 17180093072794558806177035834397932205917577288483739652510482486858834123369
             0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d) ]
-  - location: 7 (remaining gas: 1039994.155 units remaining)
+  - location: 7 (remaining gas: 1039994.825 units remaining)
     [ 17180093072794558806177035834397932205917577288483739652510482486858834123369
       0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d ]
-  - location: 8 (remaining gas: 1039994.145 units remaining)
+  - location: 8 (remaining gas: 1039994.815 units remaining)
     [ 0x8578be1766f92cd82c5e5135c374a03a8562e263ea953a3f9711b0153b7fcf2d
       17180093072794558806177035834397932205917577288483739652510482486858834123369 ]
-  - location: 9 (remaining gas: 1039993.781 units remaining)
+  - location: 9 (remaining gas: 1039994.516 units remaining)
     [ 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ]
-  - location: 10 (remaining gas: 1039993.766 units remaining)
+  - location: 10 (remaining gas: 1039994.506 units remaining)
     [ {}
       0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221 ]
-  - location: 12 (remaining gas: 1039993.751 units remaining)
+  - location: 12 (remaining gas: 1039994.496 units remaining)
     [ (Pair {} 0xfaa60dacea8e26112e524d379720fe4f95fbc5a26f1b1a67e229e26ddecbf221) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[car.tz-0-(Pair 34 17)-34].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[car.tz-0-(Pair 34 17)-34].out
index e6ee8d5c748ffb8fd3fa0d6c0530f088ee6eb1b5..18c75c7000ba341bdc8950e698b3cda61e71f55d 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[car.tz-0-(Pair 34 17)-34].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[car.tz-0-(Pair 34 17)-34].out	
@@ -7,15 +7,15 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (remaining gas: 1039994.457 units remaining)
+  - location: 9 (remaining gas: 1039995.097 units remaining)
     [ (Pair (Pair 34 17) 0) ]
-  - location: 9 (remaining gas: 1039994.447 units remaining)
+  - location: 9 (remaining gas: 1039995.087 units remaining)
     [ (Pair 34 17) ]
-  - location: 10 (remaining gas: 1039994.437 units remaining)
+  - location: 10 (remaining gas: 1039995.077 units remaining)
     [ 34 ]
-  - location: 11 (remaining gas: 1039994.422 units remaining)
+  - location: 11 (remaining gas: 1039995.067 units remaining)
     [ {}
       34 ]
-  - location: 13 (remaining gas: 1039994.407 units remaining)
+  - location: 13 (remaining gas: 1039995.057 units remaining)
     [ (Pair {} 34) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[cdr.tz-0-(Pair 34 17)-17].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[cdr.tz-0-(Pair 34 17)-17].out
index 19d88f06ec07ad797d83e5d6187e9e4654ac4e37..5d1f09dddc2a9b837e90acc0d538d7bdfc859266 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[cdr.tz-0-(Pair 34 17)-17].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[cdr.tz-0-(Pair 34 17)-17].out	
@@ -7,15 +7,15 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (remaining gas: 1039994.457 units remaining)
+  - location: 9 (remaining gas: 1039995.097 units remaining)
     [ (Pair (Pair 34 17) 0) ]
-  - location: 9 (remaining gas: 1039994.447 units remaining)
+  - location: 9 (remaining gas: 1039995.087 units remaining)
     [ (Pair 34 17) ]
-  - location: 10 (remaining gas: 1039994.437 units remaining)
+  - location: 10 (remaining gas: 1039995.077 units remaining)
     [ 17 ]
-  - location: 11 (remaining gas: 1039994.422 units remaining)
+  - location: 11 (remaining gas: 1039995.067 units remaining)
     [ {}
       17 ]
-  - location: 13 (remaining gas: 1039994.407 units remaining)
+  - location: 13 (remaining gas: 1039995.057 units remaining)
     [ (Pair {} 17) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[chain_id_store.tz-(Some \"NetXdQprcVkpaWU\")-Unit-(Some \".8420090f97.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[chain_id_store.tz-(Some \"NetXdQprcVkpaWU\")-Unit-(Some \".8420090f97.out"
index 95a94fee7d1b6bdca87d45a6dc6d4b7b0fabd053..c2b2a98fa0409630585f3e862a9bfd32143d9efa 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[chain_id_store.tz-(Some \"NetXdQprcVkpaWU\")-Unit-(Some \".8420090f97.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[chain_id_store.tz-(Some \"NetXdQprcVkpaWU\")-Unit-(Some \".8420090f97.out"	
@@ -7,17 +7,17 @@ emitted operations
 big_map diff
   
 trace
-  - location: 8 (remaining gas: 1039992.222 units remaining)
+  - location: 8 (remaining gas: 1039993.022 units remaining)
     [ (Pair Unit (Some "NetXdQprcVkpaWU")) ]
-  - location: 8 (remaining gas: 1039992.212 units remaining)
+  - location: 8 (remaining gas: 1039993.012 units remaining)
     [  ]
-  - location: 9 (remaining gas: 1039992.197 units remaining)
+  - location: 9 (remaining gas: 1039992.997 units remaining)
     [ "NetXdQprcVkpaWU" ]
-  - location: 10 (remaining gas: 1039992.182 units remaining)
+  - location: 10 (remaining gas: 1039992.987 units remaining)
     [ (Some "NetXdQprcVkpaWU") ]
-  - location: 11 (remaining gas: 1039992.167 units remaining)
+  - location: 11 (remaining gas: 1039992.977 units remaining)
     [ {}
       (Some "NetXdQprcVkpaWU") ]
-  - location: 13 (remaining gas: 1039992.152 units remaining)
+  - location: 13 (remaining gas: 1039992.967 units remaining)
     [ (Pair {} (Some "NetXdQprcVkpaWU")) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[chain_id_store.tz-(Some 0x7a06a770)-Unit-(Some \"NetXdQprcVkpaWU\")].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[chain_id_store.tz-(Some 0x7a06a770)-Unit-(Some \"NetXdQprcVkpaWU\")].out"
index 252c6527ca5e22d24a3e86faf97d89b3aeea749b..d8d6569463ad818618d0193c0772c941db012b1e 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[chain_id_store.tz-(Some 0x7a06a770)-Unit-(Some \"NetXdQprcVkpaWU\")].out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[chain_id_store.tz-(Some 0x7a06a770)-Unit-(Some \"NetXdQprcVkpaWU\")].out"	
@@ -7,17 +7,17 @@ emitted operations
 big_map diff
   
 trace
-  - location: 8 (remaining gas: 1039993.772 units remaining)
+  - location: 8 (remaining gas: 1039994.572 units remaining)
     [ (Pair Unit (Some "NetXdQprcVkpaWU")) ]
-  - location: 8 (remaining gas: 1039993.762 units remaining)
+  - location: 8 (remaining gas: 1039994.562 units remaining)
     [  ]
-  - location: 9 (remaining gas: 1039993.747 units remaining)
+  - location: 9 (remaining gas: 1039994.547 units remaining)
     [ "NetXdQprcVkpaWU" ]
-  - location: 10 (remaining gas: 1039993.732 units remaining)
+  - location: 10 (remaining gas: 1039994.537 units remaining)
     [ (Some "NetXdQprcVkpaWU") ]
-  - location: 11 (remaining gas: 1039993.717 units remaining)
+  - location: 11 (remaining gas: 1039994.527 units remaining)
     [ {}
       (Some "NetXdQprcVkpaWU") ]
-  - location: 13 (remaining gas: 1039993.702 units remaining)
+  - location: 13 (remaining gas: 1039994.517 units remaining)
     [ (Pair {} (Some "NetXdQprcVkpaWU")) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[chain_id_store.tz-None-Unit-(Some \"NetXdQprcVkpaWU\")].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[chain_id_store.tz-None-Unit-(Some \"NetXdQprcVkpaWU\")].out"
index e954fcd38e37f7c17b4c06276a09a3d78e2c7bf1..134af6d224209a77eb0bf2a9c79c7002064ab3cc 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[chain_id_store.tz-None-Unit-(Some \"NetXdQprcVkpaWU\")].out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[chain_id_store.tz-None-Unit-(Some \"NetXdQprcVkpaWU\")].out"	
@@ -7,17 +7,17 @@ emitted operations
 big_map diff
   
 trace
-  - location: 8 (remaining gas: 1039993.922 units remaining)
+  - location: 8 (remaining gas: 1039994.722 units remaining)
     [ (Pair Unit None) ]
-  - location: 8 (remaining gas: 1039993.912 units remaining)
+  - location: 8 (remaining gas: 1039994.712 units remaining)
     [  ]
-  - location: 9 (remaining gas: 1039993.897 units remaining)
+  - location: 9 (remaining gas: 1039994.697 units remaining)
     [ "NetXdQprcVkpaWU" ]
-  - location: 10 (remaining gas: 1039993.882 units remaining)
+  - location: 10 (remaining gas: 1039994.687 units remaining)
     [ (Some "NetXdQprcVkpaWU") ]
-  - location: 11 (remaining gas: 1039993.867 units remaining)
+  - location: 11 (remaining gas: 1039994.677 units remaining)
     [ {}
       (Some "NetXdQprcVkpaWU") ]
-  - location: 13 (remaining gas: 1039993.852 units remaining)
+  - location: 13 (remaining gas: 1039994.667 units remaining)
     [ (Pair {} (Some "NetXdQprcVkpaWU")) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[comb-get.tz-Unit-(Pair 1 4 2 Unit)-Unit].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[comb-get.tz-Unit-(Pair 1 4 2 Unit)-Unit].out
index cd84c1ceb196018a56cfd0128aba0f7fab2d8643..425d714ff27f3e4a17cd60ccad459bd1f2188e88 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[comb-get.tz-Unit-(Pair 1 4 2 Unit)-Unit].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[comb-get.tz-Unit-(Pair 1 4 2 Unit)-Unit].out	
@@ -7,117 +7,117 @@ emitted operations
 big_map diff
   
 trace
-  - location: 11 (remaining gas: 1039952.632 units remaining)
+  - location: 11 (remaining gas: 1039954.072 units remaining)
     [ (Pair (Pair 1 4 2 Unit) Unit) ]
-  - location: 11 (remaining gas: 1039952.622 units remaining)
+  - location: 11 (remaining gas: 1039954.062 units remaining)
     [ (Pair 1 4 2 Unit) ]
-  - location: 12 (remaining gas: 1039952.612 units remaining)
+  - location: 12 (remaining gas: 1039954.052 units remaining)
     [ (Pair 1 4 2 Unit)
       (Pair 1 4 2 Unit) ]
-  - location: 13 (remaining gas: 1039952.602 units remaining)
+  - location: 13 (remaining gas: 1039954.042 units remaining)
     [ 1
       (Pair 1 4 2 Unit) ]
-  - location: 14 (remaining gas: 1039952.592 units remaining)
+  - location: 14 (remaining gas: 1039954.032 units remaining)
     [ 1
       1
       (Pair 1 4 2 Unit) ]
-  - location: 19 (remaining gas: 1039952.557 units remaining)
+  - location: 19 (remaining gas: 1039953.997 units remaining)
     [ 0
       (Pair 1 4 2 Unit) ]
-  - location: 20 (remaining gas: 1039952.542 units remaining)
+  - location: 20 (remaining gas: 1039953.987 units remaining)
     [ True
       (Pair 1 4 2 Unit) ]
-  - location: 21 (remaining gas: 1039952.532 units remaining)
+  - location: 21 (remaining gas: 1039953.977 units remaining)
     [ (Pair 1 4 2 Unit) ]
-  - location: 21 (remaining gas: 1039952.517 units remaining)
+  - location: 21 (remaining gas: 1039953.967 units remaining)
     [ (Pair 1 4 2 Unit) ]
-  - location: 27 (remaining gas: 1039952.507 units remaining)
+  - location: 27 (remaining gas: 1039953.957 units remaining)
     [ (Pair 1 4 2 Unit)
       (Pair 1 4 2 Unit) ]
-  - location: 28 (remaining gas: 1039952.477 units remaining)
+  - location: 28 (remaining gas: 1039953.937 units remaining)
     [ 1
       (Pair 1 4 2 Unit) ]
-  - location: 30 (remaining gas: 1039952.467 units remaining)
+  - location: 30 (remaining gas: 1039953.927 units remaining)
     [ 1
       1
       (Pair 1 4 2 Unit) ]
-  - location: 35 (remaining gas: 1039952.432 units remaining)
+  - location: 35 (remaining gas: 1039953.892 units remaining)
     [ 0
       (Pair 1 4 2 Unit) ]
-  - location: 36 (remaining gas: 1039952.417 units remaining)
+  - location: 36 (remaining gas: 1039953.882 units remaining)
     [ True
       (Pair 1 4 2 Unit) ]
-  - location: 37 (remaining gas: 1039952.407 units remaining)
+  - location: 37 (remaining gas: 1039953.872 units remaining)
     [ (Pair 1 4 2 Unit) ]
-  - location: 37 (remaining gas: 1039952.392 units remaining)
+  - location: 37 (remaining gas: 1039953.862 units remaining)
     [ (Pair 1 4 2 Unit) ]
-  - location: 43 (remaining gas: 1039952.382 units remaining)
+  - location: 43 (remaining gas: 1039953.852 units remaining)
     [ (Pair 1 4 2 Unit)
       (Pair 1 4 2 Unit) ]
-  - location: 44 (remaining gas: 1039952.351 units remaining)
+  - location: 44 (remaining gas: 1039953.831 units remaining)
     [ 4
       (Pair 1 4 2 Unit) ]
-  - location: 46 (remaining gas: 1039952.341 units remaining)
+  - location: 46 (remaining gas: 1039953.821 units remaining)
     [ 4
       4
       (Pair 1 4 2 Unit) ]
-  - location: 51 (remaining gas: 1039952.306 units remaining)
+  - location: 51 (remaining gas: 1039953.786 units remaining)
     [ 0
       (Pair 1 4 2 Unit) ]
-  - location: 52 (remaining gas: 1039952.291 units remaining)
+  - location: 52 (remaining gas: 1039953.776 units remaining)
     [ True
       (Pair 1 4 2 Unit) ]
-  - location: 53 (remaining gas: 1039952.281 units remaining)
+  - location: 53 (remaining gas: 1039953.766 units remaining)
     [ (Pair 1 4 2 Unit) ]
-  - location: 53 (remaining gas: 1039952.266 units remaining)
+  - location: 53 (remaining gas: 1039953.756 units remaining)
     [ (Pair 1 4 2 Unit) ]
-  - location: 59 (remaining gas: 1039952.256 units remaining)
+  - location: 59 (remaining gas: 1039953.746 units remaining)
     [ (Pair 1 4 2 Unit)
       (Pair 1 4 2 Unit) ]
-  - location: 60 (remaining gas: 1039952.224 units remaining)
+  - location: 60 (remaining gas: 1039953.724 units remaining)
     [ 2
       (Pair 1 4 2 Unit) ]
-  - location: 62 (remaining gas: 1039952.214 units remaining)
+  - location: 62 (remaining gas: 1039953.714 units remaining)
     [ 2
       2
       (Pair 1 4 2 Unit) ]
-  - location: 67 (remaining gas: 1039952.179 units remaining)
+  - location: 67 (remaining gas: 1039953.679 units remaining)
     [ 0
       (Pair 1 4 2 Unit) ]
-  - location: 68 (remaining gas: 1039952.164 units remaining)
+  - location: 68 (remaining gas: 1039953.669 units remaining)
     [ True
       (Pair 1 4 2 Unit) ]
-  - location: 69 (remaining gas: 1039952.154 units remaining)
+  - location: 69 (remaining gas: 1039953.659 units remaining)
     [ (Pair 1 4 2 Unit) ]
-  - location: 69 (remaining gas: 1039952.139 units remaining)
+  - location: 69 (remaining gas: 1039953.649 units remaining)
     [ (Pair 1 4 2 Unit) ]
-  - location: 75 (remaining gas: 1039952.129 units remaining)
+  - location: 75 (remaining gas: 1039953.639 units remaining)
     [ (Pair 1 4 2 Unit)
       (Pair 1 4 2 Unit) ]
-  - location: 76 (remaining gas: 1039952.096 units remaining)
+  - location: 76 (remaining gas: 1039953.616 units remaining)
     [ Unit
       (Pair 1 4 2 Unit) ]
-  - location: 78 (remaining gas: 1039952.086 units remaining)
+  - location: 78 (remaining gas: 1039953.606 units remaining)
     [ Unit
       Unit
       (Pair 1 4 2 Unit) ]
-  - location: 81 (remaining gas: 1039952.076 units remaining)
+  - location: 81 (remaining gas: 1039953.596 units remaining)
     [ 0
       (Pair 1 4 2 Unit) ]
-  - location: 82 (remaining gas: 1039952.061 units remaining)
+  - location: 82 (remaining gas: 1039953.586 units remaining)
     [ True
       (Pair 1 4 2 Unit) ]
-  - location: 83 (remaining gas: 1039952.051 units remaining)
+  - location: 83 (remaining gas: 1039953.576 units remaining)
     [ (Pair 1 4 2 Unit) ]
-  - location: 83 (remaining gas: 1039952.036 units remaining)
+  - location: 83 (remaining gas: 1039953.566 units remaining)
     [ (Pair 1 4 2 Unit) ]
-  - location: 89 (remaining gas: 1039952.026 units remaining)
+  - location: 89 (remaining gas: 1039953.556 units remaining)
     [  ]
-  - location: 90 (remaining gas: 1039952.016 units remaining)
+  - location: 90 (remaining gas: 1039953.546 units remaining)
     [ Unit ]
-  - location: 91 (remaining gas: 1039952.001 units remaining)
+  - location: 91 (remaining gas: 1039953.536 units remaining)
     [ {}
       Unit ]
-  - location: 93 (remaining gas: 1039951.986 units remaining)
+  - location: 93 (remaining gas: 1039953.526 units remaining)
     [ (Pair {} Unit) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[comb-set-2.tz-None-(Pair 1 4 2 Unit)-(Some (Pair 2 4 \"t.886cc365c6.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[comb-set-2.tz-None-(Pair 1 4 2 Unit)-(Some (Pair 2 4 \"t.886cc365c6.out"
index d9f905912bb86103c52ecca5906d6b24fc73049a..a589cef830e6b3468bbbacc3950c46a0611b9dd6 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[comb-set-2.tz-None-(Pair 1 4 2 Unit)-(Some (Pair 2 4 \"t.886cc365c6.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[comb-set-2.tz-None-(Pair 1 4 2 Unit)-(Some (Pair 2 4 \"t.886cc365c6.out"	
@@ -7,30 +7,30 @@ emitted operations
 big_map diff
   
 trace
-  - location: 16 (remaining gas: 1039985.081 units remaining)
+  - location: 16 (remaining gas: 1039986.841 units remaining)
     [ (Pair (Pair 1 4 2 Unit) None) ]
-  - location: 16 (remaining gas: 1039985.071 units remaining)
+  - location: 16 (remaining gas: 1039986.831 units remaining)
     [ (Pair 1 4 2 Unit) ]
-  - location: 17 (remaining gas: 1039985.061 units remaining)
+  - location: 17 (remaining gas: 1039986.821 units remaining)
     [ 2
       (Pair 1 4 2 Unit) ]
-  - location: 20 (remaining gas: 1039985.020 units remaining)
+  - location: 20 (remaining gas: 1039986.800 units remaining)
     [ (Pair 2 4 2 Unit) ]
-  - location: 22 (remaining gas: 1039985.010 units remaining)
+  - location: 22 (remaining gas: 1039986.790 units remaining)
     [ "toto"
       (Pair 2 4 2 Unit) ]
-  - location: 25 (remaining gas: 1039984.964 units remaining)
+  - location: 25 (remaining gas: 1039986.764 units remaining)
     [ (Pair 2 4 "toto" Unit) ]
-  - location: 27 (remaining gas: 1039984.954 units remaining)
+  - location: 27 (remaining gas: 1039986.754 units remaining)
     [ 0x01
       (Pair 2 4 "toto" Unit) ]
-  - location: 30 (remaining gas: 1039984.907 units remaining)
+  - location: 30 (remaining gas: 1039986.727 units remaining)
     [ (Pair 2 4 "toto" 0x01) ]
-  - location: 32 (remaining gas: 1039984.892 units remaining)
+  - location: 32 (remaining gas: 1039986.717 units remaining)
     [ (Some (Pair 2 4 "toto" 0x01)) ]
-  - location: 33 (remaining gas: 1039984.877 units remaining)
+  - location: 33 (remaining gas: 1039986.707 units remaining)
     [ {}
       (Some (Pair 2 4 "toto" 0x01)) ]
-  - location: 35 (remaining gas: 1039984.862 units remaining)
+  - location: 35 (remaining gas: 1039986.697 units remaining)
     [ (Pair {} (Some (Pair 2 4 "toto" 0x01))) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[comb-set.tz-(Pair 1 4 2 Unit)-Unit-(Pair 2 12 8 Unit)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[comb-set.tz-(Pair 1 4 2 Unit)-Unit-(Pair 2 12 8 Unit)].out
index 0fb38b6d846388766a4824c1bc9835aeabec758f..bf7a11391f1dda26d00116d8437b1e8e6a13ca2e 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[comb-set.tz-(Pair 1 4 2 Unit)-Unit-(Pair 2 12 8 Unit)].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[comb-set.tz-(Pair 1 4 2 Unit)-Unit-(Pair 2 12 8 Unit)].out	
@@ -7,33 +7,33 @@ emitted operations
 big_map diff
   
 trace
-  - location: 11 (remaining gas: 1039985.418 units remaining)
+  - location: 11 (remaining gas: 1039987.018 units remaining)
     [ (Pair Unit 1 4 2 Unit) ]
-  - location: 11 (remaining gas: 1039985.408 units remaining)
+  - location: 11 (remaining gas: 1039987.008 units remaining)
     [ (Pair 1 4 2 Unit) ]
-  - location: 12 (remaining gas: 1039985.398 units remaining)
+  - location: 12 (remaining gas: 1039986.998 units remaining)
     [ 2
       (Pair 1 4 2 Unit) ]
-  - location: 15 (remaining gas: 1039985.357 units remaining)
+  - location: 15 (remaining gas: 1039986.977 units remaining)
     [ (Pair 2 4 2 Unit) ]
-  - location: 17 (remaining gas: 1039985.347 units remaining)
+  - location: 17 (remaining gas: 1039986.967 units remaining)
     [ 12
       (Pair 2 4 2 Unit) ]
-  - location: 20 (remaining gas: 1039985.304 units remaining)
+  - location: 20 (remaining gas: 1039986.944 units remaining)
     [ (Pair 2 12 2 Unit) ]
-  - location: 22 (remaining gas: 1039985.294 units remaining)
+  - location: 22 (remaining gas: 1039986.934 units remaining)
     [ 8
       (Pair 2 12 2 Unit) ]
-  - location: 25 (remaining gas: 1039985.248 units remaining)
+  - location: 25 (remaining gas: 1039986.908 units remaining)
     [ (Pair 2 12 8 Unit) ]
-  - location: 27 (remaining gas: 1039985.238 units remaining)
+  - location: 27 (remaining gas: 1039986.898 units remaining)
     [ Unit
       (Pair 2 12 8 Unit) ]
-  - location: 28 (remaining gas: 1039985.191 units remaining)
+  - location: 28 (remaining gas: 1039986.871 units remaining)
     [ (Pair 2 12 8 Unit) ]
-  - location: 30 (remaining gas: 1039985.176 units remaining)
+  - location: 30 (remaining gas: 1039986.861 units remaining)
     [ {}
       (Pair 2 12 8 Unit) ]
-  - location: 32 (remaining gas: 1039985.161 units remaining)
+  - location: 32 (remaining gas: 1039986.851 units remaining)
     [ (Pair {} 2 12 8 Unit) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[comb.tz-(Pair 0 0 0)-Unit-(Pair 1 2 3)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[comb.tz-(Pair 0 0 0)-Unit-(Pair 1 2 3)].out
index 5141a8da7c3bd6192f6f2cbc5306810216c2c6a9..85227851fc569a079c5f15a655374cc6c6004467 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[comb.tz-(Pair 0 0 0)-Unit-(Pair 1 2 3)].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[comb.tz-(Pair 0 0 0)-Unit-(Pair 1 2 3)].out	
@@ -7,24 +7,24 @@ emitted operations
 big_map diff
   
 trace
-  - location: 10 (remaining gas: 1039990.364 units remaining)
+  - location: 10 (remaining gas: 1039991.644 units remaining)
     [ (Pair Unit 0 0 0) ]
-  - location: 10 (remaining gas: 1039990.354 units remaining)
+  - location: 10 (remaining gas: 1039991.634 units remaining)
     [  ]
-  - location: 11 (remaining gas: 1039990.344 units remaining)
+  - location: 11 (remaining gas: 1039991.624 units remaining)
     [ 3 ]
-  - location: 14 (remaining gas: 1039990.334 units remaining)
+  - location: 14 (remaining gas: 1039991.614 units remaining)
     [ 2
       3 ]
-  - location: 17 (remaining gas: 1039990.324 units remaining)
+  - location: 17 (remaining gas: 1039991.604 units remaining)
     [ 1
       2
       3 ]
-  - location: 20 (remaining gas: 1039990.309 units remaining)
+  - location: 20 (remaining gas: 1039991.594 units remaining)
     [ {}
       1
       2
       3 ]
-  - location: 22 (remaining gas: 1039990.295 units remaining)
+  - location: 22 (remaining gas: 1039991.580 units remaining)
     [ (Pair {} 1 2 3) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[compare.tz-Unit-Unit-Unit].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[compare.tz-Unit-Unit-Unit].out
index 82a283a0802bf59bd6b558f7158a33e56068fee7..2fbc21dd6d5c424cbabc2ac92796279fcbf5bd36 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[compare.tz-Unit-Unit-Unit].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[compare.tz-Unit-Unit-Unit].out
@@ -7,392 +7,392 @@ emitted operations
 big_map diff
   
 trace
-  - location: 7 (remaining gas: 1039783.938 units remaining)
+  - location: 7 (remaining gas: 1039785.568 units remaining)
     [ (Pair Unit Unit) ]
-  - location: 7 (remaining gas: 1039783.928 units remaining)
+  - location: 7 (remaining gas: 1039785.558 units remaining)
     [  ]
-  - location: 8 (remaining gas: 1039783.918 units remaining)
+  - location: 8 (remaining gas: 1039785.548 units remaining)
     [ True ]
-  - location: 11 (remaining gas: 1039783.908 units remaining)
+  - location: 11 (remaining gas: 1039785.538 units remaining)
     [ True
       True ]
-  - location: 12 (remaining gas: 1039783.873 units remaining)
+  - location: 12 (remaining gas: 1039785.503 units remaining)
     [ 0 ]
-  - location: 14 (remaining gas: 1039783.858 units remaining)
+  - location: 14 (remaining gas: 1039785.493 units remaining)
     [ True ]
-  - location: 15 (remaining gas: 1039783.848 units remaining)
+  - location: 15 (remaining gas: 1039785.483 units remaining)
     [  ]
-  - location: 15 (remaining gas: 1039783.833 units remaining)
+  - location: 15 (remaining gas: 1039785.473 units remaining)
     [  ]
-  - location: 21 (remaining gas: 1039783.823 units remaining)
+  - location: 21 (remaining gas: 1039785.463 units remaining)
     [ False ]
-  - location: 24 (remaining gas: 1039783.813 units remaining)
+  - location: 24 (remaining gas: 1039785.453 units remaining)
     [ False
       False ]
-  - location: 25 (remaining gas: 1039783.778 units remaining)
+  - location: 25 (remaining gas: 1039785.418 units remaining)
     [ 0 ]
-  - location: 27 (remaining gas: 1039783.763 units remaining)
+  - location: 27 (remaining gas: 1039785.408 units remaining)
     [ True ]
-  - location: 28 (remaining gas: 1039783.753 units remaining)
+  - location: 28 (remaining gas: 1039785.398 units remaining)
     [  ]
-  - location: 28 (remaining gas: 1039783.738 units remaining)
+  - location: 28 (remaining gas: 1039785.388 units remaining)
     [  ]
-  - location: 34 (remaining gas: 1039783.728 units remaining)
+  - location: 34 (remaining gas: 1039785.378 units remaining)
     [ False ]
-  - location: 37 (remaining gas: 1039783.718 units remaining)
+  - location: 37 (remaining gas: 1039785.368 units remaining)
     [ True
       False ]
-  - location: 40 (remaining gas: 1039783.683 units remaining)
+  - location: 40 (remaining gas: 1039785.333 units remaining)
     [ 1 ]
-  - location: 42 (remaining gas: 1039783.668 units remaining)
+  - location: 42 (remaining gas: 1039785.323 units remaining)
     [ True ]
-  - location: 43 (remaining gas: 1039783.658 units remaining)
+  - location: 43 (remaining gas: 1039785.313 units remaining)
     [  ]
-  - location: 43 (remaining gas: 1039783.643 units remaining)
+  - location: 43 (remaining gas: 1039785.303 units remaining)
     [  ]
-  - location: 49 (remaining gas: 1039783.633 units remaining)
+  - location: 49 (remaining gas: 1039785.293 units remaining)
     [ True ]
-  - location: 52 (remaining gas: 1039783.623 units remaining)
+  - location: 52 (remaining gas: 1039785.283 units remaining)
     [ False
       True ]
-  - location: 55 (remaining gas: 1039783.588 units remaining)
+  - location: 55 (remaining gas: 1039785.248 units remaining)
     [ -1 ]
-  - location: 57 (remaining gas: 1039783.573 units remaining)
+  - location: 57 (remaining gas: 1039785.238 units remaining)
     [ True ]
-  - location: 58 (remaining gas: 1039783.563 units remaining)
+  - location: 58 (remaining gas: 1039785.228 units remaining)
     [  ]
-  - location: 58 (remaining gas: 1039783.548 units remaining)
+  - location: 58 (remaining gas: 1039785.218 units remaining)
     [  ]
-  - location: 64 (remaining gas: 1039783.538 units remaining)
+  - location: 64 (remaining gas: 1039785.208 units remaining)
     [ 0xaabbcc ]
-  - location: 67 (remaining gas: 1039783.528 units remaining)
+  - location: 67 (remaining gas: 1039785.198 units remaining)
     [ 0xaabbcc
       0xaabbcc ]
-  - location: 68 (remaining gas: 1039783.493 units remaining)
+  - location: 68 (remaining gas: 1039785.163 units remaining)
     [ 0 ]
-  - location: 70 (remaining gas: 1039783.478 units remaining)
+  - location: 70 (remaining gas: 1039785.153 units remaining)
     [ True ]
-  - location: 71 (remaining gas: 1039783.468 units remaining)
+  - location: 71 (remaining gas: 1039785.143 units remaining)
     [  ]
-  - location: 71 (remaining gas: 1039783.453 units remaining)
+  - location: 71 (remaining gas: 1039785.133 units remaining)
     [  ]
-  - location: 77 (remaining gas: 1039783.443 units remaining)
+  - location: 77 (remaining gas: 1039785.123 units remaining)
     [ 0x ]
-  - location: 80 (remaining gas: 1039783.433 units remaining)
+  - location: 80 (remaining gas: 1039785.113 units remaining)
     [ 0x
       0x ]
-  - location: 83 (remaining gas: 1039783.398 units remaining)
+  - location: 83 (remaining gas: 1039785.078 units remaining)
     [ 0 ]
-  - location: 85 (remaining gas: 1039783.383 units remaining)
+  - location: 85 (remaining gas: 1039785.068 units remaining)
     [ True ]
-  - location: 86 (remaining gas: 1039783.373 units remaining)
+  - location: 86 (remaining gas: 1039785.058 units remaining)
     [  ]
-  - location: 86 (remaining gas: 1039783.358 units remaining)
+  - location: 86 (remaining gas: 1039785.048 units remaining)
     [  ]
-  - location: 92 (remaining gas: 1039783.348 units remaining)
+  - location: 92 (remaining gas: 1039785.038 units remaining)
     [ 0x ]
-  - location: 95 (remaining gas: 1039783.338 units remaining)
+  - location: 95 (remaining gas: 1039785.028 units remaining)
     [ 0x01
       0x ]
-  - location: 98 (remaining gas: 1039783.303 units remaining)
+  - location: 98 (remaining gas: 1039784.993 units remaining)
     [ 1 ]
-  - location: 100 (remaining gas: 1039783.288 units remaining)
+  - location: 100 (remaining gas: 1039784.983 units remaining)
     [ True ]
-  - location: 101 (remaining gas: 1039783.278 units remaining)
+  - location: 101 (remaining gas: 1039784.973 units remaining)
     [  ]
-  - location: 101 (remaining gas: 1039783.263 units remaining)
+  - location: 101 (remaining gas: 1039784.963 units remaining)
     [  ]
-  - location: 107 (remaining gas: 1039783.253 units remaining)
+  - location: 107 (remaining gas: 1039784.953 units remaining)
     [ 0x01 ]
-  - location: 110 (remaining gas: 1039783.243 units remaining)
+  - location: 110 (remaining gas: 1039784.943 units remaining)
     [ 0x02
       0x01 ]
-  - location: 113 (remaining gas: 1039783.208 units remaining)
+  - location: 113 (remaining gas: 1039784.908 units remaining)
     [ 1 ]
-  - location: 115 (remaining gas: 1039783.193 units remaining)
+  - location: 115 (remaining gas: 1039784.898 units remaining)
     [ True ]
-  - location: 116 (remaining gas: 1039783.183 units remaining)
+  - location: 116 (remaining gas: 1039784.888 units remaining)
     [  ]
-  - location: 116 (remaining gas: 1039783.168 units remaining)
+  - location: 116 (remaining gas: 1039784.878 units remaining)
     [  ]
-  - location: 122 (remaining gas: 1039783.158 units remaining)
+  - location: 122 (remaining gas: 1039784.868 units remaining)
     [ 0x02 ]
-  - location: 125 (remaining gas: 1039783.148 units remaining)
+  - location: 125 (remaining gas: 1039784.858 units remaining)
     [ 0x01
       0x02 ]
-  - location: 128 (remaining gas: 1039783.113 units remaining)
+  - location: 128 (remaining gas: 1039784.823 units remaining)
     [ -1 ]
-  - location: 130 (remaining gas: 1039783.098 units remaining)
+  - location: 130 (remaining gas: 1039784.813 units remaining)
     [ True ]
-  - location: 131 (remaining gas: 1039783.088 units remaining)
+  - location: 131 (remaining gas: 1039784.803 units remaining)
     [  ]
-  - location: 131 (remaining gas: 1039783.073 units remaining)
+  - location: 131 (remaining gas: 1039784.793 units remaining)
     [  ]
-  - location: 137 (remaining gas: 1039783.063 units remaining)
+  - location: 137 (remaining gas: 1039784.783 units remaining)
     [ 1 ]
-  - location: 140 (remaining gas: 1039783.053 units remaining)
+  - location: 140 (remaining gas: 1039784.773 units remaining)
     [ 1
       1 ]
-  - location: 141 (remaining gas: 1039783.018 units remaining)
+  - location: 141 (remaining gas: 1039784.738 units remaining)
     [ 0 ]
-  - location: 143 (remaining gas: 1039783.003 units remaining)
+  - location: 143 (remaining gas: 1039784.728 units remaining)
     [ True ]
-  - location: 144 (remaining gas: 1039782.993 units remaining)
+  - location: 144 (remaining gas: 1039784.718 units remaining)
     [  ]
-  - location: 144 (remaining gas: 1039782.978 units remaining)
+  - location: 144 (remaining gas: 1039784.708 units remaining)
     [  ]
-  - location: 150 (remaining gas: 1039782.968 units remaining)
+  - location: 150 (remaining gas: 1039784.698 units remaining)
     [ 10 ]
-  - location: 153 (remaining gas: 1039782.958 units remaining)
+  - location: 153 (remaining gas: 1039784.688 units remaining)
     [ 5
       10 ]
-  - location: 156 (remaining gas: 1039782.923 units remaining)
+  - location: 156 (remaining gas: 1039784.653 units remaining)
     [ -1 ]
-  - location: 158 (remaining gas: 1039782.908 units remaining)
+  - location: 158 (remaining gas: 1039784.643 units remaining)
     [ True ]
-  - location: 159 (remaining gas: 1039782.898 units remaining)
+  - location: 159 (remaining gas: 1039784.633 units remaining)
     [  ]
-  - location: 159 (remaining gas: 1039782.883 units remaining)
+  - location: 159 (remaining gas: 1039784.623 units remaining)
     [  ]
-  - location: 165 (remaining gas: 1039782.873 units remaining)
+  - location: 165 (remaining gas: 1039784.613 units remaining)
     [ -4 ]
-  - location: 168 (remaining gas: 1039782.863 units remaining)
+  - location: 168 (remaining gas: 1039784.603 units remaining)
     [ 1923
       -4 ]
-  - location: 171 (remaining gas: 1039782.828 units remaining)
+  - location: 171 (remaining gas: 1039784.568 units remaining)
     [ 1 ]
-  - location: 173 (remaining gas: 1039782.813 units remaining)
+  - location: 173 (remaining gas: 1039784.558 units remaining)
     [ True ]
-  - location: 174 (remaining gas: 1039782.803 units remaining)
+  - location: 174 (remaining gas: 1039784.548 units remaining)
     [  ]
-  - location: 174 (remaining gas: 1039782.788 units remaining)
+  - location: 174 (remaining gas: 1039784.538 units remaining)
     [  ]
-  - location: 180 (remaining gas: 1039782.778 units remaining)
+  - location: 180 (remaining gas: 1039784.528 units remaining)
     [ 1 ]
-  - location: 183 (remaining gas: 1039782.768 units remaining)
+  - location: 183 (remaining gas: 1039784.518 units remaining)
     [ 1
       1 ]
-  - location: 184 (remaining gas: 1039782.733 units remaining)
+  - location: 184 (remaining gas: 1039784.483 units remaining)
     [ 0 ]
-  - location: 186 (remaining gas: 1039782.718 units remaining)
+  - location: 186 (remaining gas: 1039784.473 units remaining)
     [ True ]
-  - location: 187 (remaining gas: 1039782.708 units remaining)
+  - location: 187 (remaining gas: 1039784.463 units remaining)
     [  ]
-  - location: 187 (remaining gas: 1039782.693 units remaining)
+  - location: 187 (remaining gas: 1039784.453 units remaining)
     [  ]
-  - location: 193 (remaining gas: 1039782.683 units remaining)
+  - location: 193 (remaining gas: 1039784.443 units remaining)
     [ 10 ]
-  - location: 196 (remaining gas: 1039782.673 units remaining)
+  - location: 196 (remaining gas: 1039784.433 units remaining)
     [ 5
       10 ]
-  - location: 199 (remaining gas: 1039782.638 units remaining)
+  - location: 199 (remaining gas: 1039784.398 units remaining)
     [ -1 ]
-  - location: 201 (remaining gas: 1039782.623 units remaining)
+  - location: 201 (remaining gas: 1039784.388 units remaining)
     [ True ]
-  - location: 202 (remaining gas: 1039782.613 units remaining)
+  - location: 202 (remaining gas: 1039784.378 units remaining)
     [  ]
-  - location: 202 (remaining gas: 1039782.598 units remaining)
+  - location: 202 (remaining gas: 1039784.368 units remaining)
     [  ]
-  - location: 208 (remaining gas: 1039782.588 units remaining)
+  - location: 208 (remaining gas: 1039784.358 units remaining)
     [ 4 ]
-  - location: 211 (remaining gas: 1039782.578 units remaining)
+  - location: 211 (remaining gas: 1039784.348 units remaining)
     [ 1923
       4 ]
-  - location: 214 (remaining gas: 1039782.543 units remaining)
+  - location: 214 (remaining gas: 1039784.313 units remaining)
     [ 1 ]
-  - location: 216 (remaining gas: 1039782.528 units remaining)
+  - location: 216 (remaining gas: 1039784.303 units remaining)
     [ True ]
-  - location: 217 (remaining gas: 1039782.518 units remaining)
+  - location: 217 (remaining gas: 1039784.293 units remaining)
     [  ]
-  - location: 217 (remaining gas: 1039782.503 units remaining)
+  - location: 217 (remaining gas: 1039784.283 units remaining)
     [  ]
-  - location: 223 (remaining gas: 1039782.493 units remaining)
+  - location: 223 (remaining gas: 1039784.273 units remaining)
     [ "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx" ]
-  - location: 226 (remaining gas: 1039782.483 units remaining)
+  - location: 226 (remaining gas: 1039784.263 units remaining)
     [ "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx"
       "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx" ]
-  - location: 227 (remaining gas: 1039782.447 units remaining)
+  - location: 227 (remaining gas: 1039784.227 units remaining)
     [ 0 ]
-  - location: 229 (remaining gas: 1039782.432 units remaining)
+  - location: 229 (remaining gas: 1039784.217 units remaining)
     [ True ]
-  - location: 230 (remaining gas: 1039782.422 units remaining)
+  - location: 230 (remaining gas: 1039784.207 units remaining)
     [  ]
-  - location: 230 (remaining gas: 1039782.407 units remaining)
+  - location: 230 (remaining gas: 1039784.197 units remaining)
     [  ]
-  - location: 236 (remaining gas: 1039782.397 units remaining)
+  - location: 236 (remaining gas: 1039784.187 units remaining)
     [ "tz1ddb9NMYHZi5UzPdzTZMYQQZoMub195zgv" ]
-  - location: 239 (remaining gas: 1039782.387 units remaining)
+  - location: 239 (remaining gas: 1039784.177 units remaining)
     [ "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx"
       "tz1ddb9NMYHZi5UzPdzTZMYQQZoMub195zgv" ]
-  - location: 242 (remaining gas: 1039782.351 units remaining)
+  - location: 242 (remaining gas: 1039784.141 units remaining)
     [ -1 ]
-  - location: 244 (remaining gas: 1039782.336 units remaining)
+  - location: 244 (remaining gas: 1039784.131 units remaining)
     [ True ]
-  - location: 245 (remaining gas: 1039782.326 units remaining)
+  - location: 245 (remaining gas: 1039784.121 units remaining)
     [  ]
-  - location: 245 (remaining gas: 1039782.311 units remaining)
+  - location: 245 (remaining gas: 1039784.111 units remaining)
     [  ]
-  - location: 251 (remaining gas: 1039782.301 units remaining)
+  - location: 251 (remaining gas: 1039784.101 units remaining)
     [ "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx" ]
-  - location: 254 (remaining gas: 1039782.291 units remaining)
+  - location: 254 (remaining gas: 1039784.091 units remaining)
     [ "tz1ddb9NMYHZi5UzPdzTZMYQQZoMub195zgv"
       "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx" ]
-  - location: 257 (remaining gas: 1039782.255 units remaining)
+  - location: 257 (remaining gas: 1039784.055 units remaining)
     [ 1 ]
-  - location: 259 (remaining gas: 1039782.240 units remaining)
+  - location: 259 (remaining gas: 1039784.045 units remaining)
     [ True ]
-  - location: 260 (remaining gas: 1039782.230 units remaining)
+  - location: 260 (remaining gas: 1039784.035 units remaining)
     [  ]
-  - location: 260 (remaining gas: 1039782.215 units remaining)
+  - location: 260 (remaining gas: 1039784.025 units remaining)
     [  ]
-  - location: 266 (remaining gas: 1039782.205 units remaining)
+  - location: 266 (remaining gas: 1039784.015 units remaining)
     [ 1 ]
-  - location: 269 (remaining gas: 1039782.195 units remaining)
+  - location: 269 (remaining gas: 1039784.005 units remaining)
     [ 1
       1 ]
-  - location: 270 (remaining gas: 1039782.160 units remaining)
+  - location: 270 (remaining gas: 1039783.970 units remaining)
     [ 0 ]
-  - location: 272 (remaining gas: 1039782.145 units remaining)
+  - location: 272 (remaining gas: 1039783.960 units remaining)
     [ True ]
-  - location: 273 (remaining gas: 1039782.135 units remaining)
+  - location: 273 (remaining gas: 1039783.950 units remaining)
     [  ]
-  - location: 273 (remaining gas: 1039782.120 units remaining)
+  - location: 273 (remaining gas: 1039783.940 units remaining)
     [  ]
-  - location: 279 (remaining gas: 1039782.110 units remaining)
+  - location: 279 (remaining gas: 1039783.930 units remaining)
     [ 10 ]
-  - location: 282 (remaining gas: 1039782.100 units remaining)
+  - location: 282 (remaining gas: 1039783.920 units remaining)
     [ 5
       10 ]
-  - location: 285 (remaining gas: 1039782.065 units remaining)
+  - location: 285 (remaining gas: 1039783.885 units remaining)
     [ -1 ]
-  - location: 287 (remaining gas: 1039782.050 units remaining)
+  - location: 287 (remaining gas: 1039783.875 units remaining)
     [ True ]
-  - location: 288 (remaining gas: 1039782.040 units remaining)
+  - location: 288 (remaining gas: 1039783.865 units remaining)
     [  ]
-  - location: 288 (remaining gas: 1039782.025 units remaining)
+  - location: 288 (remaining gas: 1039783.855 units remaining)
     [  ]
-  - location: 294 (remaining gas: 1039782.015 units remaining)
+  - location: 294 (remaining gas: 1039783.845 units remaining)
     [ 4 ]
-  - location: 297 (remaining gas: 1039782.005 units remaining)
+  - location: 297 (remaining gas: 1039783.835 units remaining)
     [ 1923
       4 ]
-  - location: 300 (remaining gas: 1039781.970 units remaining)
+  - location: 300 (remaining gas: 1039783.800 units remaining)
     [ 1 ]
-  - location: 302 (remaining gas: 1039781.955 units remaining)
+  - location: 302 (remaining gas: 1039783.790 units remaining)
     [ True ]
-  - location: 303 (remaining gas: 1039781.945 units remaining)
+  - location: 303 (remaining gas: 1039783.780 units remaining)
     [  ]
-  - location: 303 (remaining gas: 1039781.930 units remaining)
+  - location: 303 (remaining gas: 1039783.770 units remaining)
     [  ]
-  - location: 309 (remaining gas: 1039781.920 units remaining)
+  - location: 309 (remaining gas: 1039783.760 units remaining)
     [ "AABBCC" ]
-  - location: 312 (remaining gas: 1039781.910 units remaining)
+  - location: 312 (remaining gas: 1039783.750 units remaining)
     [ "AABBCC"
       "AABBCC" ]
-  - location: 313 (remaining gas: 1039781.875 units remaining)
+  - location: 313 (remaining gas: 1039783.715 units remaining)
     [ 0 ]
-  - location: 315 (remaining gas: 1039781.860 units remaining)
+  - location: 315 (remaining gas: 1039783.705 units remaining)
     [ True ]
-  - location: 316 (remaining gas: 1039781.850 units remaining)
+  - location: 316 (remaining gas: 1039783.695 units remaining)
     [  ]
-  - location: 316 (remaining gas: 1039781.835 units remaining)
+  - location: 316 (remaining gas: 1039783.685 units remaining)
     [  ]
-  - location: 322 (remaining gas: 1039781.825 units remaining)
+  - location: 322 (remaining gas: 1039783.675 units remaining)
     [ "" ]
-  - location: 325 (remaining gas: 1039781.815 units remaining)
+  - location: 325 (remaining gas: 1039783.665 units remaining)
     [ ""
       "" ]
-  - location: 328 (remaining gas: 1039781.780 units remaining)
+  - location: 328 (remaining gas: 1039783.630 units remaining)
     [ 0 ]
-  - location: 330 (remaining gas: 1039781.765 units remaining)
+  - location: 330 (remaining gas: 1039783.620 units remaining)
     [ True ]
-  - location: 331 (remaining gas: 1039781.755 units remaining)
+  - location: 331 (remaining gas: 1039783.610 units remaining)
     [  ]
-  - location: 331 (remaining gas: 1039781.740 units remaining)
+  - location: 331 (remaining gas: 1039783.600 units remaining)
     [  ]
-  - location: 337 (remaining gas: 1039781.730 units remaining)
+  - location: 337 (remaining gas: 1039783.590 units remaining)
     [ "" ]
-  - location: 340 (remaining gas: 1039781.720 units remaining)
+  - location: 340 (remaining gas: 1039783.580 units remaining)
     [ "a"
       "" ]
-  - location: 343 (remaining gas: 1039781.685 units remaining)
+  - location: 343 (remaining gas: 1039783.545 units remaining)
     [ 1 ]
-  - location: 345 (remaining gas: 1039781.670 units remaining)
+  - location: 345 (remaining gas: 1039783.535 units remaining)
     [ True ]
-  - location: 346 (remaining gas: 1039781.660 units remaining)
+  - location: 346 (remaining gas: 1039783.525 units remaining)
     [  ]
-  - location: 346 (remaining gas: 1039781.645 units remaining)
+  - location: 346 (remaining gas: 1039783.515 units remaining)
     [  ]
-  - location: 352 (remaining gas: 1039781.635 units remaining)
+  - location: 352 (remaining gas: 1039783.505 units remaining)
     [ "a" ]
-  - location: 355 (remaining gas: 1039781.625 units remaining)
+  - location: 355 (remaining gas: 1039783.495 units remaining)
     [ "b"
       "a" ]
-  - location: 358 (remaining gas: 1039781.590 units remaining)
+  - location: 358 (remaining gas: 1039783.460 units remaining)
     [ 1 ]
-  - location: 360 (remaining gas: 1039781.575 units remaining)
+  - location: 360 (remaining gas: 1039783.450 units remaining)
     [ True ]
-  - location: 361 (remaining gas: 1039781.565 units remaining)
+  - location: 361 (remaining gas: 1039783.440 units remaining)
     [  ]
-  - location: 361 (remaining gas: 1039781.550 units remaining)
+  - location: 361 (remaining gas: 1039783.430 units remaining)
     [  ]
-  - location: 367 (remaining gas: 1039781.540 units remaining)
+  - location: 367 (remaining gas: 1039783.420 units remaining)
     [ "b" ]
-  - location: 370 (remaining gas: 1039781.530 units remaining)
+  - location: 370 (remaining gas: 1039783.410 units remaining)
     [ "a"
       "b" ]
-  - location: 373 (remaining gas: 1039781.495 units remaining)
+  - location: 373 (remaining gas: 1039783.375 units remaining)
     [ -1 ]
-  - location: 375 (remaining gas: 1039781.480 units remaining)
+  - location: 375 (remaining gas: 1039783.365 units remaining)
     [ True ]
-  - location: 376 (remaining gas: 1039781.470 units remaining)
+  - location: 376 (remaining gas: 1039783.355 units remaining)
     [  ]
-  - location: 376 (remaining gas: 1039781.455 units remaining)
+  - location: 376 (remaining gas: 1039783.345 units remaining)
     [  ]
-  - location: 382 (remaining gas: 1039781.445 units remaining)
+  - location: 382 (remaining gas: 1039783.335 units remaining)
     [ "2019-09-16T08:38:05Z" ]
-  - location: 385 (remaining gas: 1039781.435 units remaining)
+  - location: 385 (remaining gas: 1039783.325 units remaining)
     [ "2019-09-16T08:38:05Z"
       "2019-09-16T08:38:05Z" ]
-  - location: 386 (remaining gas: 1039781.400 units remaining)
+  - location: 386 (remaining gas: 1039783.290 units remaining)
     [ 0 ]
-  - location: 388 (remaining gas: 1039781.385 units remaining)
+  - location: 388 (remaining gas: 1039783.280 units remaining)
     [ True ]
-  - location: 389 (remaining gas: 1039781.375 units remaining)
+  - location: 389 (remaining gas: 1039783.270 units remaining)
     [  ]
-  - location: 389 (remaining gas: 1039781.360 units remaining)
+  - location: 389 (remaining gas: 1039783.260 units remaining)
     [  ]
-  - location: 395 (remaining gas: 1039781.350 units remaining)
+  - location: 395 (remaining gas: 1039783.250 units remaining)
     [ "2017-09-16T08:38:04Z" ]
-  - location: 398 (remaining gas: 1039781.340 units remaining)
+  - location: 398 (remaining gas: 1039783.240 units remaining)
     [ "2019-09-16T08:38:05Z"
       "2017-09-16T08:38:04Z" ]
-  - location: 401 (remaining gas: 1039781.305 units remaining)
+  - location: 401 (remaining gas: 1039783.205 units remaining)
     [ 1 ]
-  - location: 403 (remaining gas: 1039781.290 units remaining)
+  - location: 403 (remaining gas: 1039783.195 units remaining)
     [ True ]
-  - location: 404 (remaining gas: 1039781.280 units remaining)
+  - location: 404 (remaining gas: 1039783.185 units remaining)
     [  ]
-  - location: 404 (remaining gas: 1039781.265 units remaining)
+  - location: 404 (remaining gas: 1039783.175 units remaining)
     [  ]
-  - location: 410 (remaining gas: 1039781.255 units remaining)
+  - location: 410 (remaining gas: 1039783.165 units remaining)
     [ "2019-09-16T08:38:05Z" ]
-  - location: 413 (remaining gas: 1039781.245 units remaining)
+  - location: 413 (remaining gas: 1039783.155 units remaining)
     [ "2019-09-16T08:38:04Z"
       "2019-09-16T08:38:05Z" ]
-  - location: 416 (remaining gas: 1039781.210 units remaining)
+  - location: 416 (remaining gas: 1039783.120 units remaining)
     [ -1 ]
-  - location: 418 (remaining gas: 1039781.195 units remaining)
+  - location: 418 (remaining gas: 1039783.110 units remaining)
     [ True ]
-  - location: 419 (remaining gas: 1039781.185 units remaining)
+  - location: 419 (remaining gas: 1039783.100 units remaining)
     [  ]
-  - location: 419 (remaining gas: 1039781.170 units remaining)
+  - location: 419 (remaining gas: 1039783.090 units remaining)
     [  ]
-  - location: 425 (remaining gas: 1039781.160 units remaining)
+  - location: 425 (remaining gas: 1039783.080 units remaining)
     [ Unit ]
-  - location: 426 (remaining gas: 1039781.145 units remaining)
+  - location: 426 (remaining gas: 1039783.070 units remaining)
     [ {}
       Unit ]
-  - location: 428 (remaining gas: 1039781.130 units remaining)
+  - location: 428 (remaining gas: 1039783.060 units remaining)
     [ (Pair {} Unit) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[comparisons.tz-{}-{ -9999999; -1 ; 0 ; 1 ; 9999999 }-{ .bbaa8924d2.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[comparisons.tz-{}-{ -9999999; -1 ; 0 ; 1 ; 9999999 }-{ .bbaa8924d2.out
index 3c6e7c1e52b12cda0b4e95f3ce363cda210b9415..cc47c2c83b8c5e27cfab651c076ac4014fa6992d 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[comparisons.tz-{}-{ -9999999; -1 ; 0 ; 1 ; 9999999 }-{ .bbaa8924d2.out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[comparisons.tz-{}-{ -9999999; -1 ; 0 ; 1 ; 9999999 }-{ .bbaa8924d2.out	
@@ -12,326 +12,326 @@ emitted operations
 big_map diff
   
 trace
-  - location: 10 (remaining gas: 1039963.682 units remaining)
+  - location: 10 (remaining gas: 1039968.162 units remaining)
     [ (Pair { -9999999 ; -1 ; 0 ; 1 ; 9999999 } {}) ]
-  - location: 10 (remaining gas: 1039963.672 units remaining)
+  - location: 10 (remaining gas: 1039968.152 units remaining)
     [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 11 (remaining gas: 1039963.657 units remaining)
+  - location: 11 (remaining gas: 1039968.142 units remaining)
     [ {}
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 14 (remaining gas: 1039963.642 units remaining)
+  - location: 14 (remaining gas: 1039968.132 units remaining)
     [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 16 (remaining gas: 1039963.632 units remaining)
+  - location: 16 (remaining gas: 1039968.122 units remaining)
     [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 }
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 17 (remaining gas: 1039963.632 units remaining)
+  - location: 17 (remaining gas: 1039968.122 units remaining)
     [ -9999999
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 19 (remaining gas: 1039963.617 units remaining)
+  - location: 19 (remaining gas: 1039968.112 units remaining)
     [ False
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 17 (remaining gas: 1039963.602 units remaining)
+  - location: 17 (remaining gas: 1039968.102 units remaining)
     [ -1
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 19 (remaining gas: 1039963.587 units remaining)
+  - location: 19 (remaining gas: 1039968.092 units remaining)
     [ False
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 17 (remaining gas: 1039963.572 units remaining)
+  - location: 17 (remaining gas: 1039968.082 units remaining)
     [ 0
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 19 (remaining gas: 1039963.557 units remaining)
+  - location: 19 (remaining gas: 1039968.072 units remaining)
     [ True
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 17 (remaining gas: 1039963.542 units remaining)
+  - location: 17 (remaining gas: 1039968.062 units remaining)
     [ 1
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 19 (remaining gas: 1039963.527 units remaining)
+  - location: 19 (remaining gas: 1039968.052 units remaining)
     [ False
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 17 (remaining gas: 1039963.512 units remaining)
+  - location: 17 (remaining gas: 1039968.042 units remaining)
     [ 9999999
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 19 (remaining gas: 1039963.497 units remaining)
+  - location: 19 (remaining gas: 1039968.032 units remaining)
     [ False
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 17 (remaining gas: 1039963.482 units remaining)
+  - location: 17 (remaining gas: 1039968.022 units remaining)
     [ { False ; False ; True ; False ; False }
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 14 (remaining gas: 1039963.452 units remaining)
+  - location: 14 (remaining gas: 1039968.002 units remaining)
     [ {}
       { False ; False ; True ; False ; False }
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 20 (remaining gas: 1039963.442 units remaining)
+  - location: 20 (remaining gas: 1039967.992 units remaining)
     [ { False ; False ; True ; False ; False }
       {}
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 21 (remaining gas: 1039963.427 units remaining)
+  - location: 21 (remaining gas: 1039967.982 units remaining)
     [ { { False ; False ; True ; False ; False } }
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 22 (remaining gas: 1039963.412 units remaining)
+  - location: 22 (remaining gas: 1039967.972 units remaining)
     [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 24 (remaining gas: 1039963.402 units remaining)
+  - location: 24 (remaining gas: 1039967.962 units remaining)
     [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 }
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 25 (remaining gas: 1039963.402 units remaining)
+  - location: 25 (remaining gas: 1039967.962 units remaining)
     [ -9999999
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 27 (remaining gas: 1039963.387 units remaining)
+  - location: 27 (remaining gas: 1039967.952 units remaining)
     [ True
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 25 (remaining gas: 1039963.372 units remaining)
+  - location: 25 (remaining gas: 1039967.942 units remaining)
     [ -1
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 27 (remaining gas: 1039963.357 units remaining)
+  - location: 27 (remaining gas: 1039967.932 units remaining)
     [ True
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 25 (remaining gas: 1039963.342 units remaining)
+  - location: 25 (remaining gas: 1039967.922 units remaining)
     [ 0
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 27 (remaining gas: 1039963.327 units remaining)
+  - location: 27 (remaining gas: 1039967.912 units remaining)
     [ False
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 25 (remaining gas: 1039963.312 units remaining)
+  - location: 25 (remaining gas: 1039967.902 units remaining)
     [ 1
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 27 (remaining gas: 1039963.297 units remaining)
+  - location: 27 (remaining gas: 1039967.892 units remaining)
     [ True
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 25 (remaining gas: 1039963.282 units remaining)
+  - location: 25 (remaining gas: 1039967.882 units remaining)
     [ 9999999
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 27 (remaining gas: 1039963.267 units remaining)
+  - location: 27 (remaining gas: 1039967.872 units remaining)
     [ True
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 25 (remaining gas: 1039963.252 units remaining)
+  - location: 25 (remaining gas: 1039967.862 units remaining)
     [ { True ; True ; False ; True ; True }
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 22 (remaining gas: 1039963.222 units remaining)
+  - location: 22 (remaining gas: 1039967.842 units remaining)
     [ { { False ; False ; True ; False ; False } }
       { True ; True ; False ; True ; True }
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 28 (remaining gas: 1039963.212 units remaining)
+  - location: 28 (remaining gas: 1039967.832 units remaining)
     [ { True ; True ; False ; True ; True }
       { { False ; False ; True ; False ; False } }
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 29 (remaining gas: 1039963.197 units remaining)
+  - location: 29 (remaining gas: 1039967.822 units remaining)
     [ { { True ; True ; False ; True ; True } ;
         { False ; False ; True ; False ; False } }
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 30 (remaining gas: 1039963.182 units remaining)
+  - location: 30 (remaining gas: 1039967.812 units remaining)
     [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 32 (remaining gas: 1039963.172 units remaining)
+  - location: 32 (remaining gas: 1039967.802 units remaining)
     [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 }
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 33 (remaining gas: 1039963.172 units remaining)
+  - location: 33 (remaining gas: 1039967.802 units remaining)
     [ -9999999
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 35 (remaining gas: 1039963.157 units remaining)
+  - location: 35 (remaining gas: 1039967.792 units remaining)
     [ True
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 33 (remaining gas: 1039963.142 units remaining)
+  - location: 33 (remaining gas: 1039967.782 units remaining)
     [ -1
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 35 (remaining gas: 1039963.127 units remaining)
+  - location: 35 (remaining gas: 1039967.772 units remaining)
     [ True
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 33 (remaining gas: 1039963.112 units remaining)
+  - location: 33 (remaining gas: 1039967.762 units remaining)
     [ 0
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 35 (remaining gas: 1039963.097 units remaining)
+  - location: 35 (remaining gas: 1039967.752 units remaining)
     [ True
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 33 (remaining gas: 1039963.082 units remaining)
+  - location: 33 (remaining gas: 1039967.742 units remaining)
     [ 1
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 35 (remaining gas: 1039963.067 units remaining)
+  - location: 35 (remaining gas: 1039967.732 units remaining)
     [ False
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 33 (remaining gas: 1039963.052 units remaining)
+  - location: 33 (remaining gas: 1039967.722 units remaining)
     [ 9999999
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 35 (remaining gas: 1039963.037 units remaining)
+  - location: 35 (remaining gas: 1039967.712 units remaining)
     [ False
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 33 (remaining gas: 1039963.022 units remaining)
+  - location: 33 (remaining gas: 1039967.702 units remaining)
     [ { True ; True ; True ; False ; False }
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 30 (remaining gas: 1039962.992 units remaining)
+  - location: 30 (remaining gas: 1039967.682 units remaining)
     [ { { True ; True ; False ; True ; True } ;
         { False ; False ; True ; False ; False } }
       { True ; True ; True ; False ; False }
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 36 (remaining gas: 1039962.982 units remaining)
+  - location: 36 (remaining gas: 1039967.672 units remaining)
     [ { True ; True ; True ; False ; False }
       { { True ; True ; False ; True ; True } ;
         { False ; False ; True ; False ; False } }
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 37 (remaining gas: 1039962.967 units remaining)
+  - location: 37 (remaining gas: 1039967.662 units remaining)
     [ { { True ; True ; True ; False ; False } ;
         { True ; True ; False ; True ; True } ;
         { False ; False ; True ; False ; False } }
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 38 (remaining gas: 1039962.952 units remaining)
+  - location: 38 (remaining gas: 1039967.652 units remaining)
     [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 40 (remaining gas: 1039962.942 units remaining)
+  - location: 40 (remaining gas: 1039967.642 units remaining)
     [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 }
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 41 (remaining gas: 1039962.942 units remaining)
+  - location: 41 (remaining gas: 1039967.642 units remaining)
     [ -9999999
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 43 (remaining gas: 1039962.927 units remaining)
+  - location: 43 (remaining gas: 1039967.632 units remaining)
     [ True
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 41 (remaining gas: 1039962.912 units remaining)
+  - location: 41 (remaining gas: 1039967.622 units remaining)
     [ -1
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 43 (remaining gas: 1039962.897 units remaining)
+  - location: 43 (remaining gas: 1039967.612 units remaining)
     [ True
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 41 (remaining gas: 1039962.882 units remaining)
+  - location: 41 (remaining gas: 1039967.602 units remaining)
     [ 0
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 43 (remaining gas: 1039962.867 units remaining)
+  - location: 43 (remaining gas: 1039967.592 units remaining)
     [ False
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 41 (remaining gas: 1039962.852 units remaining)
+  - location: 41 (remaining gas: 1039967.582 units remaining)
     [ 1
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 43 (remaining gas: 1039962.837 units remaining)
+  - location: 43 (remaining gas: 1039967.572 units remaining)
     [ False
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 41 (remaining gas: 1039962.822 units remaining)
+  - location: 41 (remaining gas: 1039967.562 units remaining)
     [ 9999999
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 43 (remaining gas: 1039962.807 units remaining)
+  - location: 43 (remaining gas: 1039967.552 units remaining)
     [ False
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 41 (remaining gas: 1039962.792 units remaining)
+  - location: 41 (remaining gas: 1039967.542 units remaining)
     [ { True ; True ; False ; False ; False }
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 38 (remaining gas: 1039962.762 units remaining)
+  - location: 38 (remaining gas: 1039967.522 units remaining)
     [ { { True ; True ; True ; False ; False } ;
         { True ; True ; False ; True ; True } ;
         { False ; False ; True ; False ; False } }
       { True ; True ; False ; False ; False }
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 44 (remaining gas: 1039962.752 units remaining)
+  - location: 44 (remaining gas: 1039967.512 units remaining)
     [ { True ; True ; False ; False ; False }
       { { True ; True ; True ; False ; False } ;
         { True ; True ; False ; True ; True } ;
         { False ; False ; True ; False ; False } }
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 45 (remaining gas: 1039962.737 units remaining)
+  - location: 45 (remaining gas: 1039967.502 units remaining)
     [ { { True ; True ; False ; False ; False } ;
         { True ; True ; True ; False ; False } ;
         { True ; True ; False ; True ; True } ;
         { False ; False ; True ; False ; False } }
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 46 (remaining gas: 1039962.722 units remaining)
+  - location: 46 (remaining gas: 1039967.492 units remaining)
     [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 48 (remaining gas: 1039962.712 units remaining)
+  - location: 48 (remaining gas: 1039967.482 units remaining)
     [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 }
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 49 (remaining gas: 1039962.712 units remaining)
+  - location: 49 (remaining gas: 1039967.482 units remaining)
     [ -9999999
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 51 (remaining gas: 1039962.697 units remaining)
+  - location: 51 (remaining gas: 1039967.472 units remaining)
     [ False
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 49 (remaining gas: 1039962.682 units remaining)
+  - location: 49 (remaining gas: 1039967.462 units remaining)
     [ -1
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 51 (remaining gas: 1039962.667 units remaining)
+  - location: 51 (remaining gas: 1039967.452 units remaining)
     [ False
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 49 (remaining gas: 1039962.652 units remaining)
+  - location: 49 (remaining gas: 1039967.442 units remaining)
     [ 0
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 51 (remaining gas: 1039962.637 units remaining)
+  - location: 51 (remaining gas: 1039967.432 units remaining)
     [ True
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 49 (remaining gas: 1039962.622 units remaining)
+  - location: 49 (remaining gas: 1039967.422 units remaining)
     [ 1
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 51 (remaining gas: 1039962.607 units remaining)
+  - location: 51 (remaining gas: 1039967.412 units remaining)
     [ True
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 49 (remaining gas: 1039962.592 units remaining)
+  - location: 49 (remaining gas: 1039967.402 units remaining)
     [ 9999999
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 51 (remaining gas: 1039962.577 units remaining)
+  - location: 51 (remaining gas: 1039967.392 units remaining)
     [ True
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 49 (remaining gas: 1039962.562 units remaining)
+  - location: 49 (remaining gas: 1039967.382 units remaining)
     [ { False ; False ; True ; True ; True }
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 46 (remaining gas: 1039962.532 units remaining)
+  - location: 46 (remaining gas: 1039967.362 units remaining)
     [ { { True ; True ; False ; False ; False } ;
         { True ; True ; True ; False ; False } ;
         { True ; True ; False ; True ; True } ;
         { False ; False ; True ; False ; False } }
       { False ; False ; True ; True ; True }
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 52 (remaining gas: 1039962.522 units remaining)
+  - location: 52 (remaining gas: 1039967.352 units remaining)
     [ { False ; False ; True ; True ; True }
       { { True ; True ; False ; False ; False } ;
         { True ; True ; True ; False ; False } ;
         { True ; True ; False ; True ; True } ;
         { False ; False ; True ; False ; False } }
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 53 (remaining gas: 1039962.507 units remaining)
+  - location: 53 (remaining gas: 1039967.342 units remaining)
     [ { { False ; False ; True ; True ; True } ;
         { True ; True ; False ; False ; False } ;
         { True ; True ; True ; False ; False } ;
         { True ; True ; False ; True ; True } ;
         { False ; False ; True ; False ; False } }
       { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 54 (remaining gas: 1039962.492 units remaining)
+  - location: 54 (remaining gas: 1039967.332 units remaining)
     [ { -9999999 ; -1 ; 0 ; 1 ; 9999999 } ]
-  - location: 56 (remaining gas: 1039962.492 units remaining)
+  - location: 56 (remaining gas: 1039967.332 units remaining)
     [ -9999999 ]
-  - location: 58 (remaining gas: 1039962.477 units remaining)
+  - location: 58 (remaining gas: 1039967.322 units remaining)
     [ False ]
-  - location: 56 (remaining gas: 1039962.462 units remaining)
+  - location: 56 (remaining gas: 1039967.312 units remaining)
     [ -1 ]
-  - location: 58 (remaining gas: 1039962.447 units remaining)
+  - location: 58 (remaining gas: 1039967.302 units remaining)
     [ False ]
-  - location: 56 (remaining gas: 1039962.432 units remaining)
+  - location: 56 (remaining gas: 1039967.292 units remaining)
     [ 0 ]
-  - location: 58 (remaining gas: 1039962.417 units remaining)
+  - location: 58 (remaining gas: 1039967.282 units remaining)
     [ False ]
-  - location: 56 (remaining gas: 1039962.402 units remaining)
+  - location: 56 (remaining gas: 1039967.272 units remaining)
     [ 1 ]
-  - location: 58 (remaining gas: 1039962.387 units remaining)
+  - location: 58 (remaining gas: 1039967.262 units remaining)
     [ True ]
-  - location: 56 (remaining gas: 1039962.372 units remaining)
+  - location: 56 (remaining gas: 1039967.252 units remaining)
     [ 9999999 ]
-  - location: 58 (remaining gas: 1039962.357 units remaining)
+  - location: 58 (remaining gas: 1039967.242 units remaining)
     [ True ]
-  - location: 56 (remaining gas: 1039962.342 units remaining)
+  - location: 56 (remaining gas: 1039967.232 units remaining)
     [ { False ; False ; False ; True ; True } ]
-  - location: 54 (remaining gas: 1039962.312 units remaining)
+  - location: 54 (remaining gas: 1039967.212 units remaining)
     [ { { False ; False ; True ; True ; True } ;
         { True ; True ; False ; False ; False } ;
         { True ; True ; True ; False ; False } ;
         { True ; True ; False ; True ; True } ;
         { False ; False ; True ; False ; False } }
       { False ; False ; False ; True ; True } ]
-  - location: 59 (remaining gas: 1039962.302 units remaining)
+  - location: 59 (remaining gas: 1039967.202 units remaining)
     [ { False ; False ; False ; True ; True }
       { { False ; False ; True ; True ; True } ;
         { True ; True ; False ; False ; False } ;
         { True ; True ; True ; False ; False } ;
         { True ; True ; False ; True ; True } ;
         { False ; False ; True ; False ; False } } ]
-  - location: 60 (remaining gas: 1039962.287 units remaining)
+  - location: 60 (remaining gas: 1039967.192 units remaining)
     [ { { False ; False ; False ; True ; True } ;
         { False ; False ; True ; True ; True } ;
         { True ; True ; False ; False ; False } ;
         { True ; True ; True ; False ; False } ;
         { True ; True ; False ; True ; True } ;
         { False ; False ; True ; False ; False } } ]
-  - location: 61 (remaining gas: 1039962.272 units remaining)
+  - location: 61 (remaining gas: 1039967.182 units remaining)
     [ {}
       { { False ; False ; False ; True ; True } ;
         { False ; False ; True ; True ; True } ;
@@ -339,7 +339,7 @@ trace
         { True ; True ; True ; False ; False } ;
         { True ; True ; False ; True ; True } ;
         { False ; False ; True ; False ; False } } ]
-  - location: 63 (remaining gas: 1039962.257 units remaining)
+  - location: 63 (remaining gas: 1039967.172 units remaining)
     [ (Pair {}
             { { False ; False ; False ; True ; True } ;
               { False ; False ; True ; True ; True } ;
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello.tz-{}-{ \"World!\" }-{ \"Hello World!\" }].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello.tz-{}-{ \"World!\" }-{ \"Hello World!\" }].out"
index e88cf2ef28e0360785c3b6825b89443116e79f9e..d91071f1fa01674b040cb076cf8cf407f372dd59 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello.tz-{}-{ \"World!\" }-{ \"Hello World!\" }].out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello.tz-{}-{ \"World!\" }-{ \"Hello World!\" }].out"	
@@ -7,22 +7,22 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (remaining gas: 1039992.315 units remaining)
+  - location: 9 (remaining gas: 1039993.115 units remaining)
     [ (Pair { "World!" } {}) ]
-  - location: 9 (remaining gas: 1039992.305 units remaining)
+  - location: 9 (remaining gas: 1039993.105 units remaining)
     [ { "World!" } ]
-  - location: 10 (remaining gas: 1039992.305 units remaining)
+  - location: 10 (remaining gas: 1039993.105 units remaining)
     [ "World!" ]
-  - location: 12 (remaining gas: 1039992.295 units remaining)
+  - location: 12 (remaining gas: 1039993.095 units remaining)
     [ "Hello "
       "World!" ]
-  - location: 15 (remaining gas: 1039992.230 units remaining)
+  - location: 15 (remaining gas: 1039993.050 units remaining)
     [ "Hello World!" ]
-  - location: 10 (remaining gas: 1039992.215 units remaining)
+  - location: 10 (remaining gas: 1039993.040 units remaining)
     [ { "Hello World!" } ]
-  - location: 16 (remaining gas: 1039992.200 units remaining)
+  - location: 16 (remaining gas: 1039993.030 units remaining)
     [ {}
       { "Hello World!" } ]
-  - location: 18 (remaining gas: 1039992.185 units remaining)
+  - location: 18 (remaining gas: 1039993.020 units remaining)
     [ (Pair {} { "Hello World!" }) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello.tz-{}-{ \"test1\" ; \"test2\" }-{ \"Hello test1.c27e8c3ee6.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello.tz-{}-{ \"test1\" ; \"test2\" }-{ \"Hello test1.c27e8c3ee6.out"
index 36f826790ecd43d8eee684b9561b64e279abe6f1..2513c6bc9180f0ca754982bd594008a74085ba0c 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello.tz-{}-{ \"test1\" ; \"test2\" }-{ \"Hello test1.c27e8c3ee6.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello.tz-{}-{ \"test1\" ; \"test2\" }-{ \"Hello test1.c27e8c3ee6.out"	
@@ -7,29 +7,29 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (remaining gas: 1039992.161 units remaining)
+  - location: 9 (remaining gas: 1039992.961 units remaining)
     [ (Pair { "test1" ; "test2" } {}) ]
-  - location: 9 (remaining gas: 1039992.151 units remaining)
+  - location: 9 (remaining gas: 1039992.951 units remaining)
     [ { "test1" ; "test2" } ]
-  - location: 10 (remaining gas: 1039992.151 units remaining)
+  - location: 10 (remaining gas: 1039992.951 units remaining)
     [ "test1" ]
-  - location: 12 (remaining gas: 1039992.141 units remaining)
+  - location: 12 (remaining gas: 1039992.941 units remaining)
     [ "Hello "
       "test1" ]
-  - location: 15 (remaining gas: 1039992.076 units remaining)
+  - location: 15 (remaining gas: 1039992.896 units remaining)
     [ "Hello test1" ]
-  - location: 10 (remaining gas: 1039992.061 units remaining)
+  - location: 10 (remaining gas: 1039992.886 units remaining)
     [ "test2" ]
-  - location: 12 (remaining gas: 1039992.051 units remaining)
+  - location: 12 (remaining gas: 1039992.876 units remaining)
     [ "Hello "
       "test2" ]
-  - location: 15 (remaining gas: 1039991.986 units remaining)
+  - location: 15 (remaining gas: 1039992.831 units remaining)
     [ "Hello test2" ]
-  - location: 10 (remaining gas: 1039991.971 units remaining)
+  - location: 10 (remaining gas: 1039992.821 units remaining)
     [ { "Hello test1" ; "Hello test2" } ]
-  - location: 16 (remaining gas: 1039991.956 units remaining)
+  - location: 16 (remaining gas: 1039992.811 units remaining)
     [ {}
       { "Hello test1" ; "Hello test2" } ]
-  - location: 18 (remaining gas: 1039991.941 units remaining)
+  - location: 18 (remaining gas: 1039992.801 units remaining)
     [ (Pair {} { "Hello test1" ; "Hello test2" }) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello.tz-{}-{}-{}].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello.tz-{}-{}-{}].out
index 9af1337fbe87ae744ee1af3f5c29509274d88c03..69572d5af697493ab3ec5e6c1da95af0344f26b4 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello.tz-{}-{}-{}].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello.tz-{}-{}-{}].out
@@ -7,15 +7,15 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (remaining gas: 1039992.489 units remaining)
+  - location: 9 (remaining gas: 1039993.289 units remaining)
     [ (Pair {} {}) ]
-  - location: 9 (remaining gas: 1039992.479 units remaining)
+  - location: 9 (remaining gas: 1039993.279 units remaining)
     [ {} ]
-  - location: 10 (remaining gas: 1039992.479 units remaining)
+  - location: 10 (remaining gas: 1039993.279 units remaining)
     [ {} ]
-  - location: 16 (remaining gas: 1039992.464 units remaining)
+  - location: 16 (remaining gas: 1039993.269 units remaining)
     [ {}
       {} ]
-  - location: 18 (remaining gas: 1039992.449 units remaining)
+  - location: 18 (remaining gas: 1039993.259 units remaining)
     [ (Pair {} {}) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello_bytes.tz-{}-{ 0xab ; 0xcd }-{ 0xffab ; 0xffcd }].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello_bytes.tz-{}-{ 0xab ; 0xcd }-{ 0xffab ; 0xffcd }].out
index 549079261d91460df1fe841d9221bc12a6a01610..b61205aa9df464d5d2c791ce2ccc72a4b0b801a3 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello_bytes.tz-{}-{ 0xab ; 0xcd }-{ 0xffab ; 0xffcd }].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello_bytes.tz-{}-{ 0xab ; 0xcd }-{ 0xffab ; 0xffcd }].out	
@@ -7,29 +7,29 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (remaining gas: 1039992.408 units remaining)
+  - location: 9 (remaining gas: 1039993.208 units remaining)
     [ (Pair { 0xab ; 0xcd } {}) ]
-  - location: 9 (remaining gas: 1039992.398 units remaining)
+  - location: 9 (remaining gas: 1039993.198 units remaining)
     [ { 0xab ; 0xcd } ]
-  - location: 10 (remaining gas: 1039992.398 units remaining)
+  - location: 10 (remaining gas: 1039993.198 units remaining)
     [ 0xab ]
-  - location: 12 (remaining gas: 1039992.388 units remaining)
+  - location: 12 (remaining gas: 1039993.188 units remaining)
     [ 0xff
       0xab ]
-  - location: 15 (remaining gas: 1039992.323 units remaining)
+  - location: 15 (remaining gas: 1039993.143 units remaining)
     [ 0xffab ]
-  - location: 10 (remaining gas: 1039992.308 units remaining)
+  - location: 10 (remaining gas: 1039993.133 units remaining)
     [ 0xcd ]
-  - location: 12 (remaining gas: 1039992.298 units remaining)
+  - location: 12 (remaining gas: 1039993.123 units remaining)
     [ 0xff
       0xcd ]
-  - location: 15 (remaining gas: 1039992.233 units remaining)
+  - location: 15 (remaining gas: 1039993.078 units remaining)
     [ 0xffcd ]
-  - location: 10 (remaining gas: 1039992.218 units remaining)
+  - location: 10 (remaining gas: 1039993.068 units remaining)
     [ { 0xffab ; 0xffcd } ]
-  - location: 16 (remaining gas: 1039992.203 units remaining)
+  - location: 16 (remaining gas: 1039993.058 units remaining)
     [ {}
       { 0xffab ; 0xffcd } ]
-  - location: 18 (remaining gas: 1039992.188 units remaining)
+  - location: 18 (remaining gas: 1039993.048 units remaining)
     [ (Pair {} { 0xffab ; 0xffcd }) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello_bytes.tz-{}-{ 0xcd }-{ 0xffcd }].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello_bytes.tz-{}-{ 0xcd }-{ 0xffcd }].out
index b7a2f30e144f60171c9f604fe6aed5a61fbf1adc..eb284297fc8fe7a144ec2ecbeb69ae08bdc0e83f 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello_bytes.tz-{}-{ 0xcd }-{ 0xffcd }].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello_bytes.tz-{}-{ 0xcd }-{ 0xffcd }].out	
@@ -7,22 +7,22 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (remaining gas: 1039992.508 units remaining)
+  - location: 9 (remaining gas: 1039993.308 units remaining)
     [ (Pair { 0xcd } {}) ]
-  - location: 9 (remaining gas: 1039992.498 units remaining)
+  - location: 9 (remaining gas: 1039993.298 units remaining)
     [ { 0xcd } ]
-  - location: 10 (remaining gas: 1039992.498 units remaining)
+  - location: 10 (remaining gas: 1039993.298 units remaining)
     [ 0xcd ]
-  - location: 12 (remaining gas: 1039992.488 units remaining)
+  - location: 12 (remaining gas: 1039993.288 units remaining)
     [ 0xff
       0xcd ]
-  - location: 15 (remaining gas: 1039992.423 units remaining)
+  - location: 15 (remaining gas: 1039993.243 units remaining)
     [ 0xffcd ]
-  - location: 10 (remaining gas: 1039992.408 units remaining)
+  - location: 10 (remaining gas: 1039993.233 units remaining)
     [ { 0xffcd } ]
-  - location: 16 (remaining gas: 1039992.393 units remaining)
+  - location: 16 (remaining gas: 1039993.223 units remaining)
     [ {}
       { 0xffcd } ]
-  - location: 18 (remaining gas: 1039992.378 units remaining)
+  - location: 18 (remaining gas: 1039993.213 units remaining)
     [ (Pair {} { 0xffcd }) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello_bytes.tz-{}-{}-{}].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello_bytes.tz-{}-{}-{}].out
index e97a1a0b9ac7337e07d3264c3e6463b2fb01b99a..57e8d7107be9494e0a55b93e9ba2737373c196d0 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello_bytes.tz-{}-{}-{}].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_hello_bytes.tz-{}-{}-{}].out
@@ -7,15 +7,15 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (remaining gas: 1039992.608 units remaining)
+  - location: 9 (remaining gas: 1039993.408 units remaining)
     [ (Pair {} {}) ]
-  - location: 9 (remaining gas: 1039992.598 units remaining)
+  - location: 9 (remaining gas: 1039993.398 units remaining)
     [ {} ]
-  - location: 10 (remaining gas: 1039992.598 units remaining)
+  - location: 10 (remaining gas: 1039993.398 units remaining)
     [ {} ]
-  - location: 16 (remaining gas: 1039992.583 units remaining)
+  - location: 16 (remaining gas: 1039993.388 units remaining)
     [ {}
       {} ]
-  - location: 18 (remaining gas: 1039992.568 units remaining)
+  - location: 18 (remaining gas: 1039993.378 units remaining)
     [ (Pair {} {}) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_list.tz-\"\"-{ \"Hello\" ; \" \" ; \"World\" ; \"!\" }-\"He.0c7b4cd53c.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_list.tz-\"\"-{ \"Hello\" ; \" \" ; \"World\" ; \"!\" }-\"He.0c7b4cd53c.out"
index f177953acc846c062d24620c2562489766ec6142..0e9e3276ed8161c7653b9ac21e532b5d58e453e8 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_list.tz-\"\"-{ \"Hello\" ; \" \" ; \"World\" ; \"!\" }-\"He.0c7b4cd53c.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_list.tz-\"\"-{ \"Hello\" ; \" \" ; \"World\" ; \"!\" }-\"He.0c7b4cd53c.out"	
@@ -7,113 +7,113 @@ emitted operations
 big_map diff
   
 trace
-  - location: 8 (remaining gas: 1039987.227 units remaining)
+  - location: 8 (remaining gas: 1039988.347 units remaining)
     [ (Pair { "Hello" ; " " ; "World" ; "!" } "") ]
-  - location: 8 (remaining gas: 1039987.217 units remaining)
+  - location: 8 (remaining gas: 1039988.337 units remaining)
     [ { "Hello" ; " " ; "World" ; "!" } ]
-  - location: 9 (remaining gas: 1039987.207 units remaining)
+  - location: 9 (remaining gas: 1039988.327 units remaining)
     [ ""
       { "Hello" ; " " ; "World" ; "!" } ]
-  - location: 12 (remaining gas: 1039987.197 units remaining)
+  - location: 12 (remaining gas: 1039988.317 units remaining)
     [ { "Hello" ; " " ; "World" ; "!" }
       "" ]
-  - location: 13 (remaining gas: 1039987.197 units remaining)
+  - location: 13 (remaining gas: 1039988.317 units remaining)
     [ "Hello"
       "" ]
-  - location: 15 (remaining gas: 1039987.187 units remaining)
+  - location: 15 (remaining gas: 1039988.307 units remaining)
     [ ""
       "Hello" ]
-  - location: 16 (remaining gas: 1039987.172 units remaining)
+  - location: 16 (remaining gas: 1039988.297 units remaining)
     [ "Hello" ]
-  - location: 18 (remaining gas: 1039987.157 units remaining)
+  - location: 18 (remaining gas: 1039988.287 units remaining)
     [ {}
       "Hello" ]
-  - location: 20 (remaining gas: 1039987.147 units remaining)
+  - location: 20 (remaining gas: 1039988.277 units remaining)
     [ "Hello"
       {} ]
-  - location: 21 (remaining gas: 1039987.132 units remaining)
+  - location: 21 (remaining gas: 1039988.267 units remaining)
     [ { "Hello" } ]
-  - location: 16 (remaining gas: 1039987.102 units remaining)
+  - location: 16 (remaining gas: 1039988.247 units remaining)
     [ ""
       { "Hello" } ]
-  - location: 22 (remaining gas: 1039987.087 units remaining)
+  - location: 22 (remaining gas: 1039988.237 units remaining)
     [ { "" ; "Hello" } ]
-  - location: 23 (remaining gas: 1039986.967 units remaining)
+  - location: 23 (remaining gas: 1039988.117 units remaining)
     [ "Hello" ]
-  - location: 13 (remaining gas: 1039986.952 units remaining)
+  - location: 13 (remaining gas: 1039988.107 units remaining)
     [ " "
       "Hello" ]
-  - location: 15 (remaining gas: 1039986.942 units remaining)
+  - location: 15 (remaining gas: 1039988.097 units remaining)
     [ "Hello"
       " " ]
-  - location: 16 (remaining gas: 1039986.927 units remaining)
+  - location: 16 (remaining gas: 1039988.087 units remaining)
     [ " " ]
-  - location: 18 (remaining gas: 1039986.912 units remaining)
+  - location: 18 (remaining gas: 1039988.077 units remaining)
     [ {}
       " " ]
-  - location: 20 (remaining gas: 1039986.902 units remaining)
+  - location: 20 (remaining gas: 1039988.067 units remaining)
     [ " "
       {} ]
-  - location: 21 (remaining gas: 1039986.887 units remaining)
+  - location: 21 (remaining gas: 1039988.057 units remaining)
     [ { " " } ]
-  - location: 16 (remaining gas: 1039986.857 units remaining)
+  - location: 16 (remaining gas: 1039988.037 units remaining)
     [ "Hello"
       { " " } ]
-  - location: 22 (remaining gas: 1039986.842 units remaining)
+  - location: 22 (remaining gas: 1039988.027 units remaining)
     [ { "Hello" ; " " } ]
-  - location: 23 (remaining gas: 1039986.722 units remaining)
+  - location: 23 (remaining gas: 1039987.907 units remaining)
     [ "Hello " ]
-  - location: 13 (remaining gas: 1039986.707 units remaining)
+  - location: 13 (remaining gas: 1039987.897 units remaining)
     [ "World"
       "Hello " ]
-  - location: 15 (remaining gas: 1039986.697 units remaining)
+  - location: 15 (remaining gas: 1039987.887 units remaining)
     [ "Hello "
       "World" ]
-  - location: 16 (remaining gas: 1039986.682 units remaining)
+  - location: 16 (remaining gas: 1039987.877 units remaining)
     [ "World" ]
-  - location: 18 (remaining gas: 1039986.667 units remaining)
+  - location: 18 (remaining gas: 1039987.867 units remaining)
     [ {}
       "World" ]
-  - location: 20 (remaining gas: 1039986.657 units remaining)
+  - location: 20 (remaining gas: 1039987.857 units remaining)
     [ "World"
       {} ]
-  - location: 21 (remaining gas: 1039986.642 units remaining)
+  - location: 21 (remaining gas: 1039987.847 units remaining)
     [ { "World" } ]
-  - location: 16 (remaining gas: 1039986.612 units remaining)
+  - location: 16 (remaining gas: 1039987.827 units remaining)
     [ "Hello "
       { "World" } ]
-  - location: 22 (remaining gas: 1039986.597 units remaining)
+  - location: 22 (remaining gas: 1039987.817 units remaining)
     [ { "Hello " ; "World" } ]
-  - location: 23 (remaining gas: 1039986.476 units remaining)
+  - location: 23 (remaining gas: 1039987.696 units remaining)
     [ "Hello World" ]
-  - location: 13 (remaining gas: 1039986.461 units remaining)
+  - location: 13 (remaining gas: 1039987.686 units remaining)
     [ "!"
       "Hello World" ]
-  - location: 15 (remaining gas: 1039986.451 units remaining)
+  - location: 15 (remaining gas: 1039987.676 units remaining)
     [ "Hello World"
       "!" ]
-  - location: 16 (remaining gas: 1039986.436 units remaining)
+  - location: 16 (remaining gas: 1039987.666 units remaining)
     [ "!" ]
-  - location: 18 (remaining gas: 1039986.421 units remaining)
+  - location: 18 (remaining gas: 1039987.656 units remaining)
     [ {}
       "!" ]
-  - location: 20 (remaining gas: 1039986.411 units remaining)
+  - location: 20 (remaining gas: 1039987.646 units remaining)
     [ "!"
       {} ]
-  - location: 21 (remaining gas: 1039986.396 units remaining)
+  - location: 21 (remaining gas: 1039987.636 units remaining)
     [ { "!" } ]
-  - location: 16 (remaining gas: 1039986.366 units remaining)
+  - location: 16 (remaining gas: 1039987.616 units remaining)
     [ "Hello World"
       { "!" } ]
-  - location: 22 (remaining gas: 1039986.351 units remaining)
+  - location: 22 (remaining gas: 1039987.606 units remaining)
     [ { "Hello World" ; "!" } ]
-  - location: 23 (remaining gas: 1039986.230 units remaining)
+  - location: 23 (remaining gas: 1039987.485 units remaining)
     [ "Hello World!" ]
-  - location: 13 (remaining gas: 1039986.215 units remaining)
+  - location: 13 (remaining gas: 1039987.475 units remaining)
     [ "Hello World!" ]
-  - location: 24 (remaining gas: 1039986.200 units remaining)
+  - location: 24 (remaining gas: 1039987.465 units remaining)
     [ {}
       "Hello World!" ]
-  - location: 26 (remaining gas: 1039986.185 units remaining)
+  - location: 26 (remaining gas: 1039987.455 units remaining)
     [ (Pair {} "Hello World!") ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_list.tz-\"\"-{ \"a\" ; \"b\" ; \"c\" }-\"abc\"].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_list.tz-\"\"-{ \"a\" ; \"b\" ; \"c\" }-\"abc\"].out"
index 826d8b79377a8c742120a4e34d534d96aee48f57..cd24376650f9594fdfb2f3ba47fd20553a9e30ec 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_list.tz-\"\"-{ \"a\" ; \"b\" ; \"c\" }-\"abc\"].out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_list.tz-\"\"-{ \"a\" ; \"b\" ; \"c\" }-\"abc\"].out"	
@@ -7,90 +7,90 @@ emitted operations
 big_map diff
   
 trace
-  - location: 8 (remaining gas: 1039987.431 units remaining)
+  - location: 8 (remaining gas: 1039988.551 units remaining)
     [ (Pair { "a" ; "b" ; "c" } "") ]
-  - location: 8 (remaining gas: 1039987.421 units remaining)
+  - location: 8 (remaining gas: 1039988.541 units remaining)
     [ { "a" ; "b" ; "c" } ]
-  - location: 9 (remaining gas: 1039987.411 units remaining)
+  - location: 9 (remaining gas: 1039988.531 units remaining)
     [ ""
       { "a" ; "b" ; "c" } ]
-  - location: 12 (remaining gas: 1039987.401 units remaining)
+  - location: 12 (remaining gas: 1039988.521 units remaining)
     [ { "a" ; "b" ; "c" }
       "" ]
-  - location: 13 (remaining gas: 1039987.401 units remaining)
+  - location: 13 (remaining gas: 1039988.521 units remaining)
     [ "a"
       "" ]
-  - location: 15 (remaining gas: 1039987.391 units remaining)
+  - location: 15 (remaining gas: 1039988.511 units remaining)
     [ ""
       "a" ]
-  - location: 16 (remaining gas: 1039987.376 units remaining)
+  - location: 16 (remaining gas: 1039988.501 units remaining)
     [ "a" ]
-  - location: 18 (remaining gas: 1039987.361 units remaining)
+  - location: 18 (remaining gas: 1039988.491 units remaining)
     [ {}
       "a" ]
-  - location: 20 (remaining gas: 1039987.351 units remaining)
+  - location: 20 (remaining gas: 1039988.481 units remaining)
     [ "a"
       {} ]
-  - location: 21 (remaining gas: 1039987.336 units remaining)
+  - location: 21 (remaining gas: 1039988.471 units remaining)
     [ { "a" } ]
-  - location: 16 (remaining gas: 1039987.306 units remaining)
+  - location: 16 (remaining gas: 1039988.451 units remaining)
     [ ""
       { "a" } ]
-  - location: 22 (remaining gas: 1039987.291 units remaining)
+  - location: 22 (remaining gas: 1039988.441 units remaining)
     [ { "" ; "a" } ]
-  - location: 23 (remaining gas: 1039987.171 units remaining)
+  - location: 23 (remaining gas: 1039988.321 units remaining)
     [ "a" ]
-  - location: 13 (remaining gas: 1039987.156 units remaining)
+  - location: 13 (remaining gas: 1039988.311 units remaining)
     [ "b"
       "a" ]
-  - location: 15 (remaining gas: 1039987.146 units remaining)
+  - location: 15 (remaining gas: 1039988.301 units remaining)
     [ "a"
       "b" ]
-  - location: 16 (remaining gas: 1039987.131 units remaining)
+  - location: 16 (remaining gas: 1039988.291 units remaining)
     [ "b" ]
-  - location: 18 (remaining gas: 1039987.116 units remaining)
+  - location: 18 (remaining gas: 1039988.281 units remaining)
     [ {}
       "b" ]
-  - location: 20 (remaining gas: 1039987.106 units remaining)
+  - location: 20 (remaining gas: 1039988.271 units remaining)
     [ "b"
       {} ]
-  - location: 21 (remaining gas: 1039987.091 units remaining)
+  - location: 21 (remaining gas: 1039988.261 units remaining)
     [ { "b" } ]
-  - location: 16 (remaining gas: 1039987.061 units remaining)
+  - location: 16 (remaining gas: 1039988.241 units remaining)
     [ "a"
       { "b" } ]
-  - location: 22 (remaining gas: 1039987.046 units remaining)
+  - location: 22 (remaining gas: 1039988.231 units remaining)
     [ { "a" ; "b" } ]
-  - location: 23 (remaining gas: 1039986.926 units remaining)
+  - location: 23 (remaining gas: 1039988.111 units remaining)
     [ "ab" ]
-  - location: 13 (remaining gas: 1039986.911 units remaining)
+  - location: 13 (remaining gas: 1039988.101 units remaining)
     [ "c"
       "ab" ]
-  - location: 15 (remaining gas: 1039986.901 units remaining)
+  - location: 15 (remaining gas: 1039988.091 units remaining)
     [ "ab"
       "c" ]
-  - location: 16 (remaining gas: 1039986.886 units remaining)
+  - location: 16 (remaining gas: 1039988.081 units remaining)
     [ "c" ]
-  - location: 18 (remaining gas: 1039986.871 units remaining)
+  - location: 18 (remaining gas: 1039988.071 units remaining)
     [ {}
       "c" ]
-  - location: 20 (remaining gas: 1039986.861 units remaining)
+  - location: 20 (remaining gas: 1039988.061 units remaining)
     [ "c"
       {} ]
-  - location: 21 (remaining gas: 1039986.846 units remaining)
+  - location: 21 (remaining gas: 1039988.051 units remaining)
     [ { "c" } ]
-  - location: 16 (remaining gas: 1039986.816 units remaining)
+  - location: 16 (remaining gas: 1039988.031 units remaining)
     [ "ab"
       { "c" } ]
-  - location: 22 (remaining gas: 1039986.801 units remaining)
+  - location: 22 (remaining gas: 1039988.021 units remaining)
     [ { "ab" ; "c" } ]
-  - location: 23 (remaining gas: 1039986.681 units remaining)
+  - location: 23 (remaining gas: 1039987.901 units remaining)
     [ "abc" ]
-  - location: 13 (remaining gas: 1039986.666 units remaining)
+  - location: 13 (remaining gas: 1039987.891 units remaining)
     [ "abc" ]
-  - location: 24 (remaining gas: 1039986.651 units remaining)
+  - location: 24 (remaining gas: 1039987.881 units remaining)
     [ {}
       "abc" ]
-  - location: 26 (remaining gas: 1039986.636 units remaining)
+  - location: 26 (remaining gas: 1039987.871 units remaining)
     [ (Pair {} "abc") ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_list.tz-\"\"-{}-\"\"].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_list.tz-\"\"-{}-\"\"].out"
index dd07a31d5e8ea6d717900624e3a3e01a1067fe91..529ecabe4cc664c2c5fd2d38c914a2b0564728c5 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_list.tz-\"\"-{}-\"\"].out"
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[concat_list.tz-\"\"-{}-\"\"].out"
@@ -7,21 +7,21 @@ emitted operations
 big_map diff
   
 trace
-  - location: 8 (remaining gas: 1039987.803 units remaining)
+  - location: 8 (remaining gas: 1039988.923 units remaining)
     [ (Pair {} "") ]
-  - location: 8 (remaining gas: 1039987.793 units remaining)
+  - location: 8 (remaining gas: 1039988.913 units remaining)
     [ {} ]
-  - location: 9 (remaining gas: 1039987.783 units remaining)
+  - location: 9 (remaining gas: 1039988.903 units remaining)
     [ ""
       {} ]
-  - location: 12 (remaining gas: 1039987.773 units remaining)
+  - location: 12 (remaining gas: 1039988.893 units remaining)
     [ {}
       "" ]
-  - location: 13 (remaining gas: 1039987.773 units remaining)
+  - location: 13 (remaining gas: 1039988.893 units remaining)
     [ "" ]
-  - location: 24 (remaining gas: 1039987.758 units remaining)
+  - location: 24 (remaining gas: 1039988.883 units remaining)
     [ {}
       "" ]
-  - location: 26 (remaining gas: 1039987.743 units remaining)
+  - location: 26 (remaining gas: 1039988.873 units remaining)
     [ (Pair {} "") ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[cons.tz-{ -5 ; 10 }-99-{ 99 ; -5 ; 10 }].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[cons.tz-{ -5 ; 10 }-99-{ 99 ; -5 ; 10 }].out
index 63ef83aa6a7ba5770aefefd58065c521ee139d72..90f2d387e615b603cc707c2b54b278b6a5aa7fa8 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[cons.tz-{ -5 ; 10 }-99-{ 99 ; -5 ; 10 }].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[cons.tz-{ -5 ; 10 }-99-{ 99 ; -5 ; 10 }].out	
@@ -7,16 +7,16 @@ emitted operations
 big_map diff
   
 trace
-  - location: 8 (remaining gas: 1039994.100 units remaining)
+  - location: 8 (remaining gas: 1039995.060 units remaining)
     [ (Pair 99 { -5 ; 10 }) ]
-  - location: 8 (remaining gas: 1039994.090 units remaining)
+  - location: 8 (remaining gas: 1039995.050 units remaining)
     [ 99
       { -5 ; 10 } ]
-  - location: 9 (remaining gas: 1039994.075 units remaining)
+  - location: 9 (remaining gas: 1039995.040 units remaining)
     [ { 99 ; -5 ; 10 } ]
-  - location: 10 (remaining gas: 1039994.060 units remaining)
+  - location: 10 (remaining gas: 1039995.030 units remaining)
     [ {}
       { 99 ; -5 ; 10 } ]
-  - location: 12 (remaining gas: 1039994.045 units remaining)
+  - location: 12 (remaining gas: 1039995.020 units remaining)
     [ (Pair {} { 99 ; -5 ; 10 }) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[cons.tz-{ 10 }--5-{ -5 ; 10 }].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[cons.tz-{ 10 }--5-{ -5 ; 10 }].out
index 8f7771efb9e008d26657bb3b304b0ef091263cde..9afa6329c74723c83137ce22eb26448e5c84bd43 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[cons.tz-{ 10 }--5-{ -5 ; 10 }].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[cons.tz-{ 10 }--5-{ -5 ; 10 }].out	
@@ -7,16 +7,16 @@ emitted operations
 big_map diff
   
 trace
-  - location: 8 (remaining gas: 1039994.200 units remaining)
+  - location: 8 (remaining gas: 1039995.160 units remaining)
     [ (Pair -5 { 10 }) ]
-  - location: 8 (remaining gas: 1039994.190 units remaining)
+  - location: 8 (remaining gas: 1039995.150 units remaining)
     [ -5
       { 10 } ]
-  - location: 9 (remaining gas: 1039994.175 units remaining)
+  - location: 9 (remaining gas: 1039995.140 units remaining)
     [ { -5 ; 10 } ]
-  - location: 10 (remaining gas: 1039994.160 units remaining)
+  - location: 10 (remaining gas: 1039995.130 units remaining)
     [ {}
       { -5 ; 10 } ]
-  - location: 12 (remaining gas: 1039994.145 units remaining)
+  - location: 12 (remaining gas: 1039995.120 units remaining)
     [ (Pair {} { -5 ; 10 }) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[cons.tz-{}-10-{ 10 }].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[cons.tz-{}-10-{ 10 }].out
index 33c5368e025ce0643c40d6e0612565fce6b6c086..dbaa8068611e5770a2b5025f4dad8bf44cd870bb 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[cons.tz-{}-10-{ 10 }].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[cons.tz-{}-10-{ 10 }].out	
@@ -7,16 +7,16 @@ emitted operations
 big_map diff
   
 trace
-  - location: 8 (remaining gas: 1039994.300 units remaining)
+  - location: 8 (remaining gas: 1039995.260 units remaining)
     [ (Pair 10 {}) ]
-  - location: 8 (remaining gas: 1039994.290 units remaining)
+  - location: 8 (remaining gas: 1039995.250 units remaining)
     [ 10
       {} ]
-  - location: 9 (remaining gas: 1039994.275 units remaining)
+  - location: 9 (remaining gas: 1039995.240 units remaining)
     [ { 10 } ]
-  - location: 10 (remaining gas: 1039994.260 units remaining)
+  - location: 10 (remaining gas: 1039995.230 units remaining)
     [ {}
       { 10 } ]
-  - location: 12 (remaining gas: 1039994.245 units remaining)
+  - location: 12 (remaining gas: 1039995.220 units remaining)
     [ (Pair {} { 10 }) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"A\" } { \"B\" })-(Some False)].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"A\" } { \"B\" })-(Some False)].out"
index 69cdae188cf1ea9cfa46cdd212349510946550e9..f507559c7a61eabf9850d8fe0839fc70882f32ec 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"A\" } { \"B\" })-(Some False)].out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"A\" } { \"B\" })-(Some False)].out"	
@@ -7,160 +7,160 @@ emitted operations
 big_map diff
   
 trace
-  - location: 12 (remaining gas: 1039963.234 units remaining)
+  - location: 12 (remaining gas: 1039965.634 units remaining)
     [ (Pair (Pair { "A" } { "B" }) None) ]
-  - location: 12 (remaining gas: 1039963.224 units remaining)
+  - location: 12 (remaining gas: 1039965.624 units remaining)
     [ (Pair { "A" } { "B" }) ]
-  - location: 13 (remaining gas: 1039963.214 units remaining)
+  - location: 13 (remaining gas: 1039965.614 units remaining)
     [ (Pair { "A" } { "B" })
       (Pair { "A" } { "B" }) ]
-  - location: 14 (remaining gas: 1039963.204 units remaining)
+  - location: 14 (remaining gas: 1039965.604 units remaining)
     [ { "A" }
       (Pair { "A" } { "B" }) ]
-  - location: 15 (remaining gas: 1039963.189 units remaining)
+  - location: 15 (remaining gas: 1039965.594 units remaining)
     [ (Pair { "A" } { "B" }) ]
-  - location: 17 (remaining gas: 1039963.179 units remaining)
+  - location: 17 (remaining gas: 1039965.584 units remaining)
     [ { "B" } ]
-  - location: 15 (remaining gas: 1039963.149 units remaining)
+  - location: 15 (remaining gas: 1039965.564 units remaining)
     [ { "A" }
       { "B" } ]
-  - location: 18 (remaining gas: 1039962.929 units remaining)
+  - location: 18 (remaining gas: 1039965.344 units remaining)
     [ {}
       { "A" }
       { "B" } ]
-  - location: 20 (remaining gas: 1039962.919 units remaining)
+  - location: 20 (remaining gas: 1039965.334 units remaining)
     [ { "A" }
       {}
       { "B" } ]
-  - location: 21 (remaining gas: 1039962.919 units remaining)
+  - location: 21 (remaining gas: 1039965.334 units remaining)
     [ "A"
       {}
       { "B" } ]
-  - location: 23 (remaining gas: 1039962.904 units remaining)
+  - location: 23 (remaining gas: 1039965.324 units remaining)
     [ (Pair "A" {})
       { "B" } ]
-  - location: 24 (remaining gas: 1039962.894 units remaining)
+  - location: 24 (remaining gas: 1039965.314 units remaining)
     [ (Pair "A" {})
       (Pair "A" {})
       { "B" } ]
-  - location: 25 (remaining gas: 1039962.884 units remaining)
+  - location: 25 (remaining gas: 1039965.304 units remaining)
     [ "A"
       (Pair "A" {})
       { "B" } ]
-  - location: 26 (remaining gas: 1039962.869 units remaining)
+  - location: 26 (remaining gas: 1039965.294 units remaining)
     [ (Pair "A" {})
       { "B" } ]
-  - location: 28 (remaining gas: 1039962.859 units remaining)
+  - location: 28 (remaining gas: 1039965.284 units remaining)
     [ {}
       { "B" } ]
-  - location: 26 (remaining gas: 1039962.829 units remaining)
+  - location: 26 (remaining gas: 1039965.264 units remaining)
     [ "A"
       {}
       { "B" } ]
-  - location: 29 (remaining gas: 1039962.819 units remaining)
+  - location: 29 (remaining gas: 1039965.254 units remaining)
     [ True
       "A"
       {}
       { "B" } ]
-  - location: 32 (remaining gas: 1039962.809 units remaining)
+  - location: 32 (remaining gas: 1039965.244 units remaining)
     [ "A"
       True
       {}
       { "B" } ]
-  - location: 33 (remaining gas: 1039962.677 units remaining)
+  - location: 33 (remaining gas: 1039965.112 units remaining)
     [ { "A" }
       { "B" } ]
-  - location: 21 (remaining gas: 1039962.662 units remaining)
+  - location: 21 (remaining gas: 1039965.102 units remaining)
     [ { "A" }
       { "B" } ]
-  - location: 34 (remaining gas: 1039962.652 units remaining)
+  - location: 34 (remaining gas: 1039965.092 units remaining)
     [ True
       { "A" }
       { "B" } ]
-  - location: 37 (remaining gas: 1039962.642 units remaining)
+  - location: 37 (remaining gas: 1039965.082 units remaining)
     [ { "A" }
       True
       { "B" } ]
-  - location: 38 (remaining gas: 1039962.627 units remaining)
+  - location: 38 (remaining gas: 1039965.072 units remaining)
     [ (Pair { "A" } True)
       { "B" } ]
-  - location: 39 (remaining gas: 1039962.617 units remaining)
+  - location: 39 (remaining gas: 1039965.062 units remaining)
     [ { "B" }
       (Pair { "A" } True) ]
-  - location: 40 (remaining gas: 1039962.617 units remaining)
+  - location: 40 (remaining gas: 1039965.062 units remaining)
     [ "B"
       (Pair { "A" } True) ]
-  - location: 42 (remaining gas: 1039962.602 units remaining)
+  - location: 42 (remaining gas: 1039965.052 units remaining)
     [ (Pair "B" { "A" } True) ]
-  - location: 43 (remaining gas: 1039962.592 units remaining)
+  - location: 43 (remaining gas: 1039965.042 units remaining)
     [ (Pair "B" { "A" } True)
       (Pair "B" { "A" } True) ]
-  - location: 44 (remaining gas: 1039962.582 units remaining)
+  - location: 44 (remaining gas: 1039965.032 units remaining)
     [ (Pair "B" { "A" } True)
       (Pair "B" { "A" } True)
       (Pair "B" { "A" } True) ]
-  - location: 45 (remaining gas: 1039962.572 units remaining)
+  - location: 45 (remaining gas: 1039965.022 units remaining)
     [ "B"
       (Pair "B" { "A" } True)
       (Pair "B" { "A" } True) ]
-  - location: 46 (remaining gas: 1039962.557 units remaining)
+  - location: 46 (remaining gas: 1039965.012 units remaining)
     [ (Pair "B" { "A" } True)
       (Pair "B" { "A" } True) ]
-  - location: 49 (remaining gas: 1039962.547 units remaining)
+  - location: 49 (remaining gas: 1039965.002 units remaining)
     [ (Pair { "A" } True)
       (Pair "B" { "A" } True) ]
-  - location: 50 (remaining gas: 1039962.537 units remaining)
+  - location: 50 (remaining gas: 1039964.992 units remaining)
     [ { "A" }
       (Pair "B" { "A" } True) ]
-  - location: 51 (remaining gas: 1039962.522 units remaining)
+  - location: 51 (remaining gas: 1039964.982 units remaining)
     [ (Pair "B" { "A" } True) ]
-  - location: 54 (remaining gas: 1039962.512 units remaining)
+  - location: 54 (remaining gas: 1039964.972 units remaining)
     [ (Pair { "A" } True) ]
-  - location: 55 (remaining gas: 1039962.502 units remaining)
+  - location: 55 (remaining gas: 1039964.962 units remaining)
     [ True ]
-  - location: 51 (remaining gas: 1039962.472 units remaining)
+  - location: 51 (remaining gas: 1039964.942 units remaining)
     [ { "A" }
       True ]
-  - location: 56 (remaining gas: 1039962.462 units remaining)
+  - location: 56 (remaining gas: 1039964.932 units remaining)
     [ { "A" }
       { "A" }
       True ]
-  - location: 46 (remaining gas: 1039962.432 units remaining)
+  - location: 46 (remaining gas: 1039964.912 units remaining)
     [ "B"
       { "A" }
       { "A" }
       True ]
-  - location: 57 (remaining gas: 1039962.315 units remaining)
+  - location: 57 (remaining gas: 1039964.795 units remaining)
     [ False
       { "A" }
       True ]
-  - location: 58 (remaining gas: 1039962.300 units remaining)
+  - location: 58 (remaining gas: 1039964.785 units remaining)
     [ { "A" }
       True ]
-  - location: 60 (remaining gas: 1039962.290 units remaining)
+  - location: 60 (remaining gas: 1039964.775 units remaining)
     [ True
       { "A" } ]
-  - location: 58 (remaining gas: 1039962.260 units remaining)
+  - location: 58 (remaining gas: 1039964.755 units remaining)
     [ False
       True
       { "A" } ]
-  - location: 61 (remaining gas: 1039962.240 units remaining)
+  - location: 61 (remaining gas: 1039964.745 units remaining)
     [ False
       { "A" } ]
-  - location: 62 (remaining gas: 1039962.230 units remaining)
+  - location: 62 (remaining gas: 1039964.735 units remaining)
     [ { "A" }
       False ]
-  - location: 63 (remaining gas: 1039962.215 units remaining)
+  - location: 63 (remaining gas: 1039964.725 units remaining)
     [ (Pair { "A" } False) ]
-  - location: 40 (remaining gas: 1039962.200 units remaining)
+  - location: 40 (remaining gas: 1039964.715 units remaining)
     [ (Pair { "A" } False) ]
-  - location: 64 (remaining gas: 1039962.190 units remaining)
+  - location: 64 (remaining gas: 1039964.705 units remaining)
     [ False ]
-  - location: 65 (remaining gas: 1039962.175 units remaining)
+  - location: 65 (remaining gas: 1039964.695 units remaining)
     [ (Some False) ]
-  - location: 66 (remaining gas: 1039962.160 units remaining)
+  - location: 66 (remaining gas: 1039964.685 units remaining)
     [ {}
       (Some False) ]
-  - location: 68 (remaining gas: 1039962.145 units remaining)
+  - location: 68 (remaining gas: 1039964.675 units remaining)
     [ (Pair {} (Some False)) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"B\" ; \"B\" ; \"asdf\" ; \"C\" }.4360bbe5d0.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"B\" ; \"B\" ; \"asdf\" ; \"C\" }.4360bbe5d0.out"
index 624f63b45f94ad89afbfd8975afdaad61034b484..90e5259febcc05ecd0dda24b60787b1512344c07 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"B\" ; \"B\" ; \"asdf\" ; \"C\" }.4360bbe5d0.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"B\" ; \"B\" ; \"asdf\" ; \"C\" }.4360bbe5d0.out"	
@@ -7,404 +7,404 @@ emitted operations
 big_map diff
   
 trace
-  - location: 12 (remaining gas: 1039962.554 units remaining)
+  - location: 12 (remaining gas: 1039964.954 units remaining)
     [ (Pair (Pair { "B" ; "B" ; "asdf" ; "C" } { "B" ; "C" ; "asdf" }) None) ]
-  - location: 12 (remaining gas: 1039962.544 units remaining)
+  - location: 12 (remaining gas: 1039964.944 units remaining)
     [ (Pair { "B" ; "B" ; "asdf" ; "C" } { "B" ; "C" ; "asdf" }) ]
-  - location: 13 (remaining gas: 1039962.534 units remaining)
+  - location: 13 (remaining gas: 1039964.934 units remaining)
     [ (Pair { "B" ; "B" ; "asdf" ; "C" } { "B" ; "C" ; "asdf" })
       (Pair { "B" ; "B" ; "asdf" ; "C" } { "B" ; "C" ; "asdf" }) ]
-  - location: 14 (remaining gas: 1039962.524 units remaining)
+  - location: 14 (remaining gas: 1039964.924 units remaining)
     [ { "B" ; "B" ; "asdf" ; "C" }
       (Pair { "B" ; "B" ; "asdf" ; "C" } { "B" ; "C" ; "asdf" }) ]
-  - location: 15 (remaining gas: 1039962.509 units remaining)
+  - location: 15 (remaining gas: 1039964.914 units remaining)
     [ (Pair { "B" ; "B" ; "asdf" ; "C" } { "B" ; "C" ; "asdf" }) ]
-  - location: 17 (remaining gas: 1039962.499 units remaining)
+  - location: 17 (remaining gas: 1039964.904 units remaining)
     [ { "B" ; "C" ; "asdf" } ]
-  - location: 15 (remaining gas: 1039962.469 units remaining)
+  - location: 15 (remaining gas: 1039964.884 units remaining)
     [ { "B" ; "B" ; "asdf" ; "C" }
       { "B" ; "C" ; "asdf" } ]
-  - location: 18 (remaining gas: 1039962.249 units remaining)
+  - location: 18 (remaining gas: 1039964.664 units remaining)
     [ {}
       { "B" ; "B" ; "asdf" ; "C" }
       { "B" ; "C" ; "asdf" } ]
-  - location: 20 (remaining gas: 1039962.239 units remaining)
+  - location: 20 (remaining gas: 1039964.654 units remaining)
     [ { "B" ; "B" ; "asdf" ; "C" }
       {}
       { "B" ; "C" ; "asdf" } ]
-  - location: 21 (remaining gas: 1039962.239 units remaining)
+  - location: 21 (remaining gas: 1039964.654 units remaining)
     [ "B"
       {}
       { "B" ; "C" ; "asdf" } ]
-  - location: 23 (remaining gas: 1039962.224 units remaining)
+  - location: 23 (remaining gas: 1039964.644 units remaining)
     [ (Pair "B" {})
       { "B" ; "C" ; "asdf" } ]
-  - location: 24 (remaining gas: 1039962.214 units remaining)
+  - location: 24 (remaining gas: 1039964.634 units remaining)
     [ (Pair "B" {})
       (Pair "B" {})
       { "B" ; "C" ; "asdf" } ]
-  - location: 25 (remaining gas: 1039962.204 units remaining)
+  - location: 25 (remaining gas: 1039964.624 units remaining)
     [ "B"
       (Pair "B" {})
       { "B" ; "C" ; "asdf" } ]
-  - location: 26 (remaining gas: 1039962.189 units remaining)
+  - location: 26 (remaining gas: 1039964.614 units remaining)
     [ (Pair "B" {})
       { "B" ; "C" ; "asdf" } ]
-  - location: 28 (remaining gas: 1039962.179 units remaining)
+  - location: 28 (remaining gas: 1039964.604 units remaining)
     [ {}
       { "B" ; "C" ; "asdf" } ]
-  - location: 26 (remaining gas: 1039962.149 units remaining)
+  - location: 26 (remaining gas: 1039964.584 units remaining)
     [ "B"
       {}
       { "B" ; "C" ; "asdf" } ]
-  - location: 29 (remaining gas: 1039962.139 units remaining)
+  - location: 29 (remaining gas: 1039964.574 units remaining)
     [ True
       "B"
       {}
       { "B" ; "C" ; "asdf" } ]
-  - location: 32 (remaining gas: 1039962.129 units remaining)
+  - location: 32 (remaining gas: 1039964.564 units remaining)
     [ "B"
       True
       {}
       { "B" ; "C" ; "asdf" } ]
-  - location: 33 (remaining gas: 1039961.997 units remaining)
+  - location: 33 (remaining gas: 1039964.432 units remaining)
     [ { "B" }
       { "B" ; "C" ; "asdf" } ]
-  - location: 21 (remaining gas: 1039961.982 units remaining)
+  - location: 21 (remaining gas: 1039964.422 units remaining)
     [ "B"
       { "B" }
       { "B" ; "C" ; "asdf" } ]
-  - location: 23 (remaining gas: 1039961.967 units remaining)
+  - location: 23 (remaining gas: 1039964.412 units remaining)
     [ (Pair "B" { "B" })
       { "B" ; "C" ; "asdf" } ]
-  - location: 24 (remaining gas: 1039961.957 units remaining)
+  - location: 24 (remaining gas: 1039964.402 units remaining)
     [ (Pair "B" { "B" })
       (Pair "B" { "B" })
       { "B" ; "C" ; "asdf" } ]
-  - location: 25 (remaining gas: 1039961.947 units remaining)
+  - location: 25 (remaining gas: 1039964.392 units remaining)
     [ "B"
       (Pair "B" { "B" })
       { "B" ; "C" ; "asdf" } ]
-  - location: 26 (remaining gas: 1039961.932 units remaining)
+  - location: 26 (remaining gas: 1039964.382 units remaining)
     [ (Pair "B" { "B" })
       { "B" ; "C" ; "asdf" } ]
-  - location: 28 (remaining gas: 1039961.922 units remaining)
+  - location: 28 (remaining gas: 1039964.372 units remaining)
     [ { "B" }
       { "B" ; "C" ; "asdf" } ]
-  - location: 26 (remaining gas: 1039961.892 units remaining)
+  - location: 26 (remaining gas: 1039964.352 units remaining)
     [ "B"
       { "B" }
       { "B" ; "C" ; "asdf" } ]
-  - location: 29 (remaining gas: 1039961.882 units remaining)
+  - location: 29 (remaining gas: 1039964.342 units remaining)
     [ True
       "B"
       { "B" }
       { "B" ; "C" ; "asdf" } ]
-  - location: 32 (remaining gas: 1039961.872 units remaining)
+  - location: 32 (remaining gas: 1039964.332 units remaining)
     [ "B"
       True
       { "B" }
       { "B" ; "C" ; "asdf" } ]
-  - location: 33 (remaining gas: 1039961.738 units remaining)
+  - location: 33 (remaining gas: 1039964.198 units remaining)
     [ { "B" }
       { "B" ; "C" ; "asdf" } ]
-  - location: 21 (remaining gas: 1039961.723 units remaining)
+  - location: 21 (remaining gas: 1039964.188 units remaining)
     [ "asdf"
       { "B" }
       { "B" ; "C" ; "asdf" } ]
-  - location: 23 (remaining gas: 1039961.708 units remaining)
+  - location: 23 (remaining gas: 1039964.178 units remaining)
     [ (Pair "asdf" { "B" })
       { "B" ; "C" ; "asdf" } ]
-  - location: 24 (remaining gas: 1039961.698 units remaining)
+  - location: 24 (remaining gas: 1039964.168 units remaining)
     [ (Pair "asdf" { "B" })
       (Pair "asdf" { "B" })
       { "B" ; "C" ; "asdf" } ]
-  - location: 25 (remaining gas: 1039961.688 units remaining)
+  - location: 25 (remaining gas: 1039964.158 units remaining)
     [ "asdf"
       (Pair "asdf" { "B" })
       { "B" ; "C" ; "asdf" } ]
-  - location: 26 (remaining gas: 1039961.673 units remaining)
+  - location: 26 (remaining gas: 1039964.148 units remaining)
     [ (Pair "asdf" { "B" })
       { "B" ; "C" ; "asdf" } ]
-  - location: 28 (remaining gas: 1039961.663 units remaining)
+  - location: 28 (remaining gas: 1039964.138 units remaining)
     [ { "B" }
       { "B" ; "C" ; "asdf" } ]
-  - location: 26 (remaining gas: 1039961.633 units remaining)
+  - location: 26 (remaining gas: 1039964.118 units remaining)
     [ "asdf"
       { "B" }
       { "B" ; "C" ; "asdf" } ]
-  - location: 29 (remaining gas: 1039961.623 units remaining)
+  - location: 29 (remaining gas: 1039964.108 units remaining)
     [ True
       "asdf"
       { "B" }
       { "B" ; "C" ; "asdf" } ]
-  - location: 32 (remaining gas: 1039961.613 units remaining)
+  - location: 32 (remaining gas: 1039964.098 units remaining)
     [ "asdf"
       True
       { "B" }
       { "B" ; "C" ; "asdf" } ]
-  - location: 33 (remaining gas: 1039961.467 units remaining)
+  - location: 33 (remaining gas: 1039963.952 units remaining)
     [ { "B" ; "asdf" }
       { "B" ; "C" ; "asdf" } ]
-  - location: 21 (remaining gas: 1039961.452 units remaining)
+  - location: 21 (remaining gas: 1039963.942 units remaining)
     [ "C"
       { "B" ; "asdf" }
       { "B" ; "C" ; "asdf" } ]
-  - location: 23 (remaining gas: 1039961.437 units remaining)
+  - location: 23 (remaining gas: 1039963.932 units remaining)
     [ (Pair "C" { "B" ; "asdf" })
       { "B" ; "C" ; "asdf" } ]
-  - location: 24 (remaining gas: 1039961.427 units remaining)
+  - location: 24 (remaining gas: 1039963.922 units remaining)
     [ (Pair "C" { "B" ; "asdf" })
       (Pair "C" { "B" ; "asdf" })
       { "B" ; "C" ; "asdf" } ]
-  - location: 25 (remaining gas: 1039961.417 units remaining)
+  - location: 25 (remaining gas: 1039963.912 units remaining)
     [ "C"
       (Pair "C" { "B" ; "asdf" })
       { "B" ; "C" ; "asdf" } ]
-  - location: 26 (remaining gas: 1039961.402 units remaining)
+  - location: 26 (remaining gas: 1039963.902 units remaining)
     [ (Pair "C" { "B" ; "asdf" })
       { "B" ; "C" ; "asdf" } ]
-  - location: 28 (remaining gas: 1039961.392 units remaining)
+  - location: 28 (remaining gas: 1039963.892 units remaining)
     [ { "B" ; "asdf" }
       { "B" ; "C" ; "asdf" } ]
-  - location: 26 (remaining gas: 1039961.362 units remaining)
+  - location: 26 (remaining gas: 1039963.872 units remaining)
     [ "C"
       { "B" ; "asdf" }
       { "B" ; "C" ; "asdf" } ]
-  - location: 29 (remaining gas: 1039961.352 units remaining)
+  - location: 29 (remaining gas: 1039963.862 units remaining)
     [ True
       "C"
       { "B" ; "asdf" }
       { "B" ; "C" ; "asdf" } ]
-  - location: 32 (remaining gas: 1039961.342 units remaining)
+  - location: 32 (remaining gas: 1039963.852 units remaining)
     [ "C"
       True
       { "B" ; "asdf" }
       { "B" ; "C" ; "asdf" } ]
-  - location: 33 (remaining gas: 1039961.206 units remaining)
+  - location: 33 (remaining gas: 1039963.716 units remaining)
     [ { "B" ; "C" ; "asdf" }
       { "B" ; "C" ; "asdf" } ]
-  - location: 21 (remaining gas: 1039961.191 units remaining)
+  - location: 21 (remaining gas: 1039963.706 units remaining)
     [ { "B" ; "C" ; "asdf" }
       { "B" ; "C" ; "asdf" } ]
-  - location: 34 (remaining gas: 1039961.181 units remaining)
+  - location: 34 (remaining gas: 1039963.696 units remaining)
     [ True
       { "B" ; "C" ; "asdf" }
       { "B" ; "C" ; "asdf" } ]
-  - location: 37 (remaining gas: 1039961.171 units remaining)
+  - location: 37 (remaining gas: 1039963.686 units remaining)
     [ { "B" ; "C" ; "asdf" }
       True
       { "B" ; "C" ; "asdf" } ]
-  - location: 38 (remaining gas: 1039961.156 units remaining)
+  - location: 38 (remaining gas: 1039963.676 units remaining)
     [ (Pair { "B" ; "C" ; "asdf" } True)
       { "B" ; "C" ; "asdf" } ]
-  - location: 39 (remaining gas: 1039961.146 units remaining)
+  - location: 39 (remaining gas: 1039963.666 units remaining)
     [ { "B" ; "C" ; "asdf" }
       (Pair { "B" ; "C" ; "asdf" } True) ]
-  - location: 40 (remaining gas: 1039961.146 units remaining)
+  - location: 40 (remaining gas: 1039963.666 units remaining)
     [ "B"
       (Pair { "B" ; "C" ; "asdf" } True) ]
-  - location: 42 (remaining gas: 1039961.131 units remaining)
+  - location: 42 (remaining gas: 1039963.656 units remaining)
     [ (Pair "B" { "B" ; "C" ; "asdf" } True) ]
-  - location: 43 (remaining gas: 1039961.121 units remaining)
+  - location: 43 (remaining gas: 1039963.646 units remaining)
     [ (Pair "B" { "B" ; "C" ; "asdf" } True)
       (Pair "B" { "B" ; "C" ; "asdf" } True) ]
-  - location: 44 (remaining gas: 1039961.111 units remaining)
+  - location: 44 (remaining gas: 1039963.636 units remaining)
     [ (Pair "B" { "B" ; "C" ; "asdf" } True)
       (Pair "B" { "B" ; "C" ; "asdf" } True)
       (Pair "B" { "B" ; "C" ; "asdf" } True) ]
-  - location: 45 (remaining gas: 1039961.101 units remaining)
+  - location: 45 (remaining gas: 1039963.626 units remaining)
     [ "B"
       (Pair "B" { "B" ; "C" ; "asdf" } True)
       (Pair "B" { "B" ; "C" ; "asdf" } True) ]
-  - location: 46 (remaining gas: 1039961.086 units remaining)
+  - location: 46 (remaining gas: 1039963.616 units remaining)
     [ (Pair "B" { "B" ; "C" ; "asdf" } True)
       (Pair "B" { "B" ; "C" ; "asdf" } True) ]
-  - location: 49 (remaining gas: 1039961.076 units remaining)
+  - location: 49 (remaining gas: 1039963.606 units remaining)
     [ (Pair { "B" ; "C" ; "asdf" } True)
       (Pair "B" { "B" ; "C" ; "asdf" } True) ]
-  - location: 50 (remaining gas: 1039961.066 units remaining)
+  - location: 50 (remaining gas: 1039963.596 units remaining)
     [ { "B" ; "C" ; "asdf" }
       (Pair "B" { "B" ; "C" ; "asdf" } True) ]
-  - location: 51 (remaining gas: 1039961.051 units remaining)
+  - location: 51 (remaining gas: 1039963.586 units remaining)
     [ (Pair "B" { "B" ; "C" ; "asdf" } True) ]
-  - location: 54 (remaining gas: 1039961.041 units remaining)
+  - location: 54 (remaining gas: 1039963.576 units remaining)
     [ (Pair { "B" ; "C" ; "asdf" } True) ]
-  - location: 55 (remaining gas: 1039961.031 units remaining)
+  - location: 55 (remaining gas: 1039963.566 units remaining)
     [ True ]
-  - location: 51 (remaining gas: 1039961.001 units remaining)
+  - location: 51 (remaining gas: 1039963.546 units remaining)
     [ { "B" ; "C" ; "asdf" }
       True ]
-  - location: 56 (remaining gas: 1039960.991 units remaining)
+  - location: 56 (remaining gas: 1039963.536 units remaining)
     [ { "B" ; "C" ; "asdf" }
       { "B" ; "C" ; "asdf" }
       True ]
-  - location: 46 (remaining gas: 1039960.961 units remaining)
+  - location: 46 (remaining gas: 1039963.516 units remaining)
     [ "B"
       { "B" ; "C" ; "asdf" }
       { "B" ; "C" ; "asdf" }
       True ]
-  - location: 57 (remaining gas: 1039960.843 units remaining)
+  - location: 57 (remaining gas: 1039963.398 units remaining)
     [ True
       { "B" ; "C" ; "asdf" }
       True ]
-  - location: 58 (remaining gas: 1039960.828 units remaining)
+  - location: 58 (remaining gas: 1039963.388 units remaining)
     [ { "B" ; "C" ; "asdf" }
       True ]
-  - location: 60 (remaining gas: 1039960.818 units remaining)
+  - location: 60 (remaining gas: 1039963.378 units remaining)
     [ True
       { "B" ; "C" ; "asdf" } ]
-  - location: 58 (remaining gas: 1039960.788 units remaining)
+  - location: 58 (remaining gas: 1039963.358 units remaining)
     [ True
       True
       { "B" ; "C" ; "asdf" } ]
-  - location: 61 (remaining gas: 1039960.768 units remaining)
+  - location: 61 (remaining gas: 1039963.348 units remaining)
     [ True
       { "B" ; "C" ; "asdf" } ]
-  - location: 62 (remaining gas: 1039960.758 units remaining)
+  - location: 62 (remaining gas: 1039963.338 units remaining)
     [ { "B" ; "C" ; "asdf" }
       True ]
-  - location: 63 (remaining gas: 1039960.743 units remaining)
+  - location: 63 (remaining gas: 1039963.328 units remaining)
     [ (Pair { "B" ; "C" ; "asdf" } True) ]
-  - location: 40 (remaining gas: 1039960.728 units remaining)
+  - location: 40 (remaining gas: 1039963.318 units remaining)
     [ "C"
       (Pair { "B" ; "C" ; "asdf" } True) ]
-  - location: 42 (remaining gas: 1039960.713 units remaining)
+  - location: 42 (remaining gas: 1039963.308 units remaining)
     [ (Pair "C" { "B" ; "C" ; "asdf" } True) ]
-  - location: 43 (remaining gas: 1039960.703 units remaining)
+  - location: 43 (remaining gas: 1039963.298 units remaining)
     [ (Pair "C" { "B" ; "C" ; "asdf" } True)
       (Pair "C" { "B" ; "C" ; "asdf" } True) ]
-  - location: 44 (remaining gas: 1039960.693 units remaining)
+  - location: 44 (remaining gas: 1039963.288 units remaining)
     [ (Pair "C" { "B" ; "C" ; "asdf" } True)
       (Pair "C" { "B" ; "C" ; "asdf" } True)
       (Pair "C" { "B" ; "C" ; "asdf" } True) ]
-  - location: 45 (remaining gas: 1039960.683 units remaining)
+  - location: 45 (remaining gas: 1039963.278 units remaining)
     [ "C"
       (Pair "C" { "B" ; "C" ; "asdf" } True)
       (Pair "C" { "B" ; "C" ; "asdf" } True) ]
-  - location: 46 (remaining gas: 1039960.668 units remaining)
+  - location: 46 (remaining gas: 1039963.268 units remaining)
     [ (Pair "C" { "B" ; "C" ; "asdf" } True)
       (Pair "C" { "B" ; "C" ; "asdf" } True) ]
-  - location: 49 (remaining gas: 1039960.658 units remaining)
+  - location: 49 (remaining gas: 1039963.258 units remaining)
     [ (Pair { "B" ; "C" ; "asdf" } True)
       (Pair "C" { "B" ; "C" ; "asdf" } True) ]
-  - location: 50 (remaining gas: 1039960.648 units remaining)
+  - location: 50 (remaining gas: 1039963.248 units remaining)
     [ { "B" ; "C" ; "asdf" }
       (Pair "C" { "B" ; "C" ; "asdf" } True) ]
-  - location: 51 (remaining gas: 1039960.633 units remaining)
+  - location: 51 (remaining gas: 1039963.238 units remaining)
     [ (Pair "C" { "B" ; "C" ; "asdf" } True) ]
-  - location: 54 (remaining gas: 1039960.623 units remaining)
+  - location: 54 (remaining gas: 1039963.228 units remaining)
     [ (Pair { "B" ; "C" ; "asdf" } True) ]
-  - location: 55 (remaining gas: 1039960.613 units remaining)
+  - location: 55 (remaining gas: 1039963.218 units remaining)
     [ True ]
-  - location: 51 (remaining gas: 1039960.583 units remaining)
+  - location: 51 (remaining gas: 1039963.198 units remaining)
     [ { "B" ; "C" ; "asdf" }
       True ]
-  - location: 56 (remaining gas: 1039960.573 units remaining)
+  - location: 56 (remaining gas: 1039963.188 units remaining)
     [ { "B" ; "C" ; "asdf" }
       { "B" ; "C" ; "asdf" }
       True ]
-  - location: 46 (remaining gas: 1039960.543 units remaining)
+  - location: 46 (remaining gas: 1039963.168 units remaining)
     [ "C"
       { "B" ; "C" ; "asdf" }
       { "B" ; "C" ; "asdf" }
       True ]
-  - location: 57 (remaining gas: 1039960.425 units remaining)
+  - location: 57 (remaining gas: 1039963.050 units remaining)
     [ True
       { "B" ; "C" ; "asdf" }
       True ]
-  - location: 58 (remaining gas: 1039960.410 units remaining)
+  - location: 58 (remaining gas: 1039963.040 units remaining)
     [ { "B" ; "C" ; "asdf" }
       True ]
-  - location: 60 (remaining gas: 1039960.400 units remaining)
+  - location: 60 (remaining gas: 1039963.030 units remaining)
     [ True
       { "B" ; "C" ; "asdf" } ]
-  - location: 58 (remaining gas: 1039960.370 units remaining)
+  - location: 58 (remaining gas: 1039963.010 units remaining)
     [ True
       True
       { "B" ; "C" ; "asdf" } ]
-  - location: 61 (remaining gas: 1039960.350 units remaining)
+  - location: 61 (remaining gas: 1039963 units remaining)
     [ True
       { "B" ; "C" ; "asdf" } ]
-  - location: 62 (remaining gas: 1039960.340 units remaining)
+  - location: 62 (remaining gas: 1039962.990 units remaining)
     [ { "B" ; "C" ; "asdf" }
       True ]
-  - location: 63 (remaining gas: 1039960.325 units remaining)
+  - location: 63 (remaining gas: 1039962.980 units remaining)
     [ (Pair { "B" ; "C" ; "asdf" } True) ]
-  - location: 40 (remaining gas: 1039960.310 units remaining)
+  - location: 40 (remaining gas: 1039962.970 units remaining)
     [ "asdf"
       (Pair { "B" ; "C" ; "asdf" } True) ]
-  - location: 42 (remaining gas: 1039960.295 units remaining)
+  - location: 42 (remaining gas: 1039962.960 units remaining)
     [ (Pair "asdf" { "B" ; "C" ; "asdf" } True) ]
-  - location: 43 (remaining gas: 1039960.285 units remaining)
+  - location: 43 (remaining gas: 1039962.950 units remaining)
     [ (Pair "asdf" { "B" ; "C" ; "asdf" } True)
       (Pair "asdf" { "B" ; "C" ; "asdf" } True) ]
-  - location: 44 (remaining gas: 1039960.275 units remaining)
+  - location: 44 (remaining gas: 1039962.940 units remaining)
     [ (Pair "asdf" { "B" ; "C" ; "asdf" } True)
       (Pair "asdf" { "B" ; "C" ; "asdf" } True)
       (Pair "asdf" { "B" ; "C" ; "asdf" } True) ]
-  - location: 45 (remaining gas: 1039960.265 units remaining)
+  - location: 45 (remaining gas: 1039962.930 units remaining)
     [ "asdf"
       (Pair "asdf" { "B" ; "C" ; "asdf" } True)
       (Pair "asdf" { "B" ; "C" ; "asdf" } True) ]
-  - location: 46 (remaining gas: 1039960.250 units remaining)
+  - location: 46 (remaining gas: 1039962.920 units remaining)
     [ (Pair "asdf" { "B" ; "C" ; "asdf" } True)
       (Pair "asdf" { "B" ; "C" ; "asdf" } True) ]
-  - location: 49 (remaining gas: 1039960.240 units remaining)
+  - location: 49 (remaining gas: 1039962.910 units remaining)
     [ (Pair { "B" ; "C" ; "asdf" } True)
       (Pair "asdf" { "B" ; "C" ; "asdf" } True) ]
-  - location: 50 (remaining gas: 1039960.230 units remaining)
+  - location: 50 (remaining gas: 1039962.900 units remaining)
     [ { "B" ; "C" ; "asdf" }
       (Pair "asdf" { "B" ; "C" ; "asdf" } True) ]
-  - location: 51 (remaining gas: 1039960.215 units remaining)
+  - location: 51 (remaining gas: 1039962.890 units remaining)
     [ (Pair "asdf" { "B" ; "C" ; "asdf" } True) ]
-  - location: 54 (remaining gas: 1039960.205 units remaining)
+  - location: 54 (remaining gas: 1039962.880 units remaining)
     [ (Pair { "B" ; "C" ; "asdf" } True) ]
-  - location: 55 (remaining gas: 1039960.195 units remaining)
+  - location: 55 (remaining gas: 1039962.870 units remaining)
     [ True ]
-  - location: 51 (remaining gas: 1039960.165 units remaining)
+  - location: 51 (remaining gas: 1039962.850 units remaining)
     [ { "B" ; "C" ; "asdf" }
       True ]
-  - location: 56 (remaining gas: 1039960.155 units remaining)
+  - location: 56 (remaining gas: 1039962.840 units remaining)
     [ { "B" ; "C" ; "asdf" }
       { "B" ; "C" ; "asdf" }
       True ]
-  - location: 46 (remaining gas: 1039960.125 units remaining)
+  - location: 46 (remaining gas: 1039962.820 units remaining)
     [ "asdf"
       { "B" ; "C" ; "asdf" }
       { "B" ; "C" ; "asdf" }
       True ]
-  - location: 57 (remaining gas: 1039959.998 units remaining)
+  - location: 57 (remaining gas: 1039962.693 units remaining)
     [ True
       { "B" ; "C" ; "asdf" }
       True ]
-  - location: 58 (remaining gas: 1039959.983 units remaining)
+  - location: 58 (remaining gas: 1039962.683 units remaining)
     [ { "B" ; "C" ; "asdf" }
       True ]
-  - location: 60 (remaining gas: 1039959.973 units remaining)
+  - location: 60 (remaining gas: 1039962.673 units remaining)
     [ True
       { "B" ; "C" ; "asdf" } ]
-  - location: 58 (remaining gas: 1039959.943 units remaining)
+  - location: 58 (remaining gas: 1039962.653 units remaining)
     [ True
       True
       { "B" ; "C" ; "asdf" } ]
-  - location: 61 (remaining gas: 1039959.923 units remaining)
+  - location: 61 (remaining gas: 1039962.643 units remaining)
     [ True
       { "B" ; "C" ; "asdf" } ]
-  - location: 62 (remaining gas: 1039959.913 units remaining)
+  - location: 62 (remaining gas: 1039962.633 units remaining)
     [ { "B" ; "C" ; "asdf" }
       True ]
-  - location: 63 (remaining gas: 1039959.898 units remaining)
+  - location: 63 (remaining gas: 1039962.623 units remaining)
     [ (Pair { "B" ; "C" ; "asdf" } True) ]
-  - location: 40 (remaining gas: 1039959.883 units remaining)
+  - location: 40 (remaining gas: 1039962.613 units remaining)
     [ (Pair { "B" ; "C" ; "asdf" } True) ]
-  - location: 64 (remaining gas: 1039959.873 units remaining)
+  - location: 64 (remaining gas: 1039962.603 units remaining)
     [ True ]
-  - location: 65 (remaining gas: 1039959.858 units remaining)
+  - location: 65 (remaining gas: 1039962.593 units remaining)
     [ (Some True) ]
-  - location: 66 (remaining gas: 1039959.843 units remaining)
+  - location: 66 (remaining gas: 1039962.583 units remaining)
     [ {}
       (Some True) ]
-  - location: 68 (remaining gas: 1039959.828 units remaining)
+  - location: 68 (remaining gas: 1039962.573 units remaining)
     [ (Pair {} (Some True)) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"B\" ; \"C\" ; \"asdf\" } { \"B\".ff6e4785ee.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"B\" ; \"C\" ; \"asdf\" } { \"B\".ff6e4785ee.out"
index 0fe7e0aaacecbd7587213125b2ccfbc2d7ed0e30..e004123a97232dff0fa8b002162b3049e82be4d3 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"B\" ; \"C\" ; \"asdf\" } { \"B\".ff6e4785ee.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"B\" ; \"C\" ; \"asdf\" } { \"B\".ff6e4785ee.out"	
@@ -7,431 +7,431 @@ emitted operations
 big_map diff
   
 trace
-  - location: 12 (remaining gas: 1039962.554 units remaining)
+  - location: 12 (remaining gas: 1039964.954 units remaining)
     [ (Pair (Pair { "B" ; "C" ; "asdf" } { "B" ; "B" ; "asdf" ; "C" }) None) ]
-  - location: 12 (remaining gas: 1039962.544 units remaining)
+  - location: 12 (remaining gas: 1039964.944 units remaining)
     [ (Pair { "B" ; "C" ; "asdf" } { "B" ; "B" ; "asdf" ; "C" }) ]
-  - location: 13 (remaining gas: 1039962.534 units remaining)
+  - location: 13 (remaining gas: 1039964.934 units remaining)
     [ (Pair { "B" ; "C" ; "asdf" } { "B" ; "B" ; "asdf" ; "C" })
       (Pair { "B" ; "C" ; "asdf" } { "B" ; "B" ; "asdf" ; "C" }) ]
-  - location: 14 (remaining gas: 1039962.524 units remaining)
+  - location: 14 (remaining gas: 1039964.924 units remaining)
     [ { "B" ; "C" ; "asdf" }
       (Pair { "B" ; "C" ; "asdf" } { "B" ; "B" ; "asdf" ; "C" }) ]
-  - location: 15 (remaining gas: 1039962.509 units remaining)
+  - location: 15 (remaining gas: 1039964.914 units remaining)
     [ (Pair { "B" ; "C" ; "asdf" } { "B" ; "B" ; "asdf" ; "C" }) ]
-  - location: 17 (remaining gas: 1039962.499 units remaining)
+  - location: 17 (remaining gas: 1039964.904 units remaining)
     [ { "B" ; "B" ; "asdf" ; "C" } ]
-  - location: 15 (remaining gas: 1039962.469 units remaining)
+  - location: 15 (remaining gas: 1039964.884 units remaining)
     [ { "B" ; "C" ; "asdf" }
       { "B" ; "B" ; "asdf" ; "C" } ]
-  - location: 18 (remaining gas: 1039962.249 units remaining)
+  - location: 18 (remaining gas: 1039964.664 units remaining)
     [ {}
       { "B" ; "C" ; "asdf" }
       { "B" ; "B" ; "asdf" ; "C" } ]
-  - location: 20 (remaining gas: 1039962.239 units remaining)
+  - location: 20 (remaining gas: 1039964.654 units remaining)
     [ { "B" ; "C" ; "asdf" }
       {}
       { "B" ; "B" ; "asdf" ; "C" } ]
-  - location: 21 (remaining gas: 1039962.239 units remaining)
+  - location: 21 (remaining gas: 1039964.654 units remaining)
     [ "B"
       {}
       { "B" ; "B" ; "asdf" ; "C" } ]
-  - location: 23 (remaining gas: 1039962.224 units remaining)
+  - location: 23 (remaining gas: 1039964.644 units remaining)
     [ (Pair "B" {})
       { "B" ; "B" ; "asdf" ; "C" } ]
-  - location: 24 (remaining gas: 1039962.214 units remaining)
+  - location: 24 (remaining gas: 1039964.634 units remaining)
     [ (Pair "B" {})
       (Pair "B" {})
       { "B" ; "B" ; "asdf" ; "C" } ]
-  - location: 25 (remaining gas: 1039962.204 units remaining)
+  - location: 25 (remaining gas: 1039964.624 units remaining)
     [ "B"
       (Pair "B" {})
       { "B" ; "B" ; "asdf" ; "C" } ]
-  - location: 26 (remaining gas: 1039962.189 units remaining)
+  - location: 26 (remaining gas: 1039964.614 units remaining)
     [ (Pair "B" {})
       { "B" ; "B" ; "asdf" ; "C" } ]
-  - location: 28 (remaining gas: 1039962.179 units remaining)
+  - location: 28 (remaining gas: 1039964.604 units remaining)
     [ {}
       { "B" ; "B" ; "asdf" ; "C" } ]
-  - location: 26 (remaining gas: 1039962.149 units remaining)
+  - location: 26 (remaining gas: 1039964.584 units remaining)
     [ "B"
       {}
       { "B" ; "B" ; "asdf" ; "C" } ]
-  - location: 29 (remaining gas: 1039962.139 units remaining)
+  - location: 29 (remaining gas: 1039964.574 units remaining)
     [ True
       "B"
       {}
       { "B" ; "B" ; "asdf" ; "C" } ]
-  - location: 32 (remaining gas: 1039962.129 units remaining)
+  - location: 32 (remaining gas: 1039964.564 units remaining)
     [ "B"
       True
       {}
       { "B" ; "B" ; "asdf" ; "C" } ]
-  - location: 33 (remaining gas: 1039961.997 units remaining)
+  - location: 33 (remaining gas: 1039964.432 units remaining)
     [ { "B" }
       { "B" ; "B" ; "asdf" ; "C" } ]
-  - location: 21 (remaining gas: 1039961.982 units remaining)
+  - location: 21 (remaining gas: 1039964.422 units remaining)
     [ "C"
       { "B" }
       { "B" ; "B" ; "asdf" ; "C" } ]
-  - location: 23 (remaining gas: 1039961.967 units remaining)
+  - location: 23 (remaining gas: 1039964.412 units remaining)
     [ (Pair "C" { "B" })
       { "B" ; "B" ; "asdf" ; "C" } ]
-  - location: 24 (remaining gas: 1039961.957 units remaining)
+  - location: 24 (remaining gas: 1039964.402 units remaining)
     [ (Pair "C" { "B" })
       (Pair "C" { "B" })
       { "B" ; "B" ; "asdf" ; "C" } ]
-  - location: 25 (remaining gas: 1039961.947 units remaining)
+  - location: 25 (remaining gas: 1039964.392 units remaining)
     [ "C"
       (Pair "C" { "B" })
       { "B" ; "B" ; "asdf" ; "C" } ]
-  - location: 26 (remaining gas: 1039961.932 units remaining)
+  - location: 26 (remaining gas: 1039964.382 units remaining)
     [ (Pair "C" { "B" })
       { "B" ; "B" ; "asdf" ; "C" } ]
-  - location: 28 (remaining gas: 1039961.922 units remaining)
+  - location: 28 (remaining gas: 1039964.372 units remaining)
     [ { "B" }
       { "B" ; "B" ; "asdf" ; "C" } ]
-  - location: 26 (remaining gas: 1039961.892 units remaining)
+  - location: 26 (remaining gas: 1039964.352 units remaining)
     [ "C"
       { "B" }
       { "B" ; "B" ; "asdf" ; "C" } ]
-  - location: 29 (remaining gas: 1039961.882 units remaining)
+  - location: 29 (remaining gas: 1039964.342 units remaining)
     [ True
       "C"
       { "B" }
       { "B" ; "B" ; "asdf" ; "C" } ]
-  - location: 32 (remaining gas: 1039961.872 units remaining)
+  - location: 32 (remaining gas: 1039964.332 units remaining)
     [ "C"
       True
       { "B" }
       { "B" ; "B" ; "asdf" ; "C" } ]
-  - location: 33 (remaining gas: 1039961.738 units remaining)
+  - location: 33 (remaining gas: 1039964.198 units remaining)
     [ { "B" ; "C" }
       { "B" ; "B" ; "asdf" ; "C" } ]
-  - location: 21 (remaining gas: 1039961.723 units remaining)
+  - location: 21 (remaining gas: 1039964.188 units remaining)
     [ "asdf"
       { "B" ; "C" }
       { "B" ; "B" ; "asdf" ; "C" } ]
-  - location: 23 (remaining gas: 1039961.708 units remaining)
+  - location: 23 (remaining gas: 1039964.178 units remaining)
     [ (Pair "asdf" { "B" ; "C" })
       { "B" ; "B" ; "asdf" ; "C" } ]
-  - location: 24 (remaining gas: 1039961.698 units remaining)
+  - location: 24 (remaining gas: 1039964.168 units remaining)
     [ (Pair "asdf" { "B" ; "C" })
       (Pair "asdf" { "B" ; "C" })
       { "B" ; "B" ; "asdf" ; "C" } ]
-  - location: 25 (remaining gas: 1039961.688 units remaining)
+  - location: 25 (remaining gas: 1039964.158 units remaining)
     [ "asdf"
       (Pair "asdf" { "B" ; "C" })
       { "B" ; "B" ; "asdf" ; "C" } ]
-  - location: 26 (remaining gas: 1039961.673 units remaining)
+  - location: 26 (remaining gas: 1039964.148 units remaining)
     [ (Pair "asdf" { "B" ; "C" })
       { "B" ; "B" ; "asdf" ; "C" } ]
-  - location: 28 (remaining gas: 1039961.663 units remaining)
+  - location: 28 (remaining gas: 1039964.138 units remaining)
     [ { "B" ; "C" }
       { "B" ; "B" ; "asdf" ; "C" } ]
-  - location: 26 (remaining gas: 1039961.633 units remaining)
+  - location: 26 (remaining gas: 1039964.118 units remaining)
     [ "asdf"
       { "B" ; "C" }
       { "B" ; "B" ; "asdf" ; "C" } ]
-  - location: 29 (remaining gas: 1039961.623 units remaining)
+  - location: 29 (remaining gas: 1039964.108 units remaining)
     [ True
       "asdf"
       { "B" ; "C" }
       { "B" ; "B" ; "asdf" ; "C" } ]
-  - location: 32 (remaining gas: 1039961.613 units remaining)
+  - location: 32 (remaining gas: 1039964.098 units remaining)
     [ "asdf"
       True
       { "B" ; "C" }
       { "B" ; "B" ; "asdf" ; "C" } ]
-  - location: 33 (remaining gas: 1039961.459 units remaining)
+  - location: 33 (remaining gas: 1039963.944 units remaining)
     [ { "B" ; "C" ; "asdf" }
       { "B" ; "B" ; "asdf" ; "C" } ]
-  - location: 21 (remaining gas: 1039961.444 units remaining)
+  - location: 21 (remaining gas: 1039963.934 units remaining)
     [ { "B" ; "C" ; "asdf" }
       { "B" ; "B" ; "asdf" ; "C" } ]
-  - location: 34 (remaining gas: 1039961.434 units remaining)
+  - location: 34 (remaining gas: 1039963.924 units remaining)
     [ True
       { "B" ; "C" ; "asdf" }
       { "B" ; "B" ; "asdf" ; "C" } ]
-  - location: 37 (remaining gas: 1039961.424 units remaining)
+  - location: 37 (remaining gas: 1039963.914 units remaining)
     [ { "B" ; "C" ; "asdf" }
       True
       { "B" ; "B" ; "asdf" ; "C" } ]
-  - location: 38 (remaining gas: 1039961.409 units remaining)
+  - location: 38 (remaining gas: 1039963.904 units remaining)
     [ (Pair { "B" ; "C" ; "asdf" } True)
       { "B" ; "B" ; "asdf" ; "C" } ]
-  - location: 39 (remaining gas: 1039961.399 units remaining)
+  - location: 39 (remaining gas: 1039963.894 units remaining)
     [ { "B" ; "B" ; "asdf" ; "C" }
       (Pair { "B" ; "C" ; "asdf" } True) ]
-  - location: 40 (remaining gas: 1039961.399 units remaining)
+  - location: 40 (remaining gas: 1039963.894 units remaining)
     [ "B"
       (Pair { "B" ; "C" ; "asdf" } True) ]
-  - location: 42 (remaining gas: 1039961.384 units remaining)
+  - location: 42 (remaining gas: 1039963.884 units remaining)
     [ (Pair "B" { "B" ; "C" ; "asdf" } True) ]
-  - location: 43 (remaining gas: 1039961.374 units remaining)
+  - location: 43 (remaining gas: 1039963.874 units remaining)
     [ (Pair "B" { "B" ; "C" ; "asdf" } True)
       (Pair "B" { "B" ; "C" ; "asdf" } True) ]
-  - location: 44 (remaining gas: 1039961.364 units remaining)
+  - location: 44 (remaining gas: 1039963.864 units remaining)
     [ (Pair "B" { "B" ; "C" ; "asdf" } True)
       (Pair "B" { "B" ; "C" ; "asdf" } True)
       (Pair "B" { "B" ; "C" ; "asdf" } True) ]
-  - location: 45 (remaining gas: 1039961.354 units remaining)
+  - location: 45 (remaining gas: 1039963.854 units remaining)
     [ "B"
       (Pair "B" { "B" ; "C" ; "asdf" } True)
       (Pair "B" { "B" ; "C" ; "asdf" } True) ]
-  - location: 46 (remaining gas: 1039961.339 units remaining)
+  - location: 46 (remaining gas: 1039963.844 units remaining)
     [ (Pair "B" { "B" ; "C" ; "asdf" } True)
       (Pair "B" { "B" ; "C" ; "asdf" } True) ]
-  - location: 49 (remaining gas: 1039961.329 units remaining)
+  - location: 49 (remaining gas: 1039963.834 units remaining)
     [ (Pair { "B" ; "C" ; "asdf" } True)
       (Pair "B" { "B" ; "C" ; "asdf" } True) ]
-  - location: 50 (remaining gas: 1039961.319 units remaining)
+  - location: 50 (remaining gas: 1039963.824 units remaining)
     [ { "B" ; "C" ; "asdf" }
       (Pair "B" { "B" ; "C" ; "asdf" } True) ]
-  - location: 51 (remaining gas: 1039961.304 units remaining)
+  - location: 51 (remaining gas: 1039963.814 units remaining)
     [ (Pair "B" { "B" ; "C" ; "asdf" } True) ]
-  - location: 54 (remaining gas: 1039961.294 units remaining)
+  - location: 54 (remaining gas: 1039963.804 units remaining)
     [ (Pair { "B" ; "C" ; "asdf" } True) ]
-  - location: 55 (remaining gas: 1039961.284 units remaining)
+  - location: 55 (remaining gas: 1039963.794 units remaining)
     [ True ]
-  - location: 51 (remaining gas: 1039961.254 units remaining)
+  - location: 51 (remaining gas: 1039963.774 units remaining)
     [ { "B" ; "C" ; "asdf" }
       True ]
-  - location: 56 (remaining gas: 1039961.244 units remaining)
+  - location: 56 (remaining gas: 1039963.764 units remaining)
     [ { "B" ; "C" ; "asdf" }
       { "B" ; "C" ; "asdf" }
       True ]
-  - location: 46 (remaining gas: 1039961.214 units remaining)
+  - location: 46 (remaining gas: 1039963.744 units remaining)
     [ "B"
       { "B" ; "C" ; "asdf" }
       { "B" ; "C" ; "asdf" }
       True ]
-  - location: 57 (remaining gas: 1039961.096 units remaining)
+  - location: 57 (remaining gas: 1039963.626 units remaining)
     [ True
       { "B" ; "C" ; "asdf" }
       True ]
-  - location: 58 (remaining gas: 1039961.081 units remaining)
+  - location: 58 (remaining gas: 1039963.616 units remaining)
     [ { "B" ; "C" ; "asdf" }
       True ]
-  - location: 60 (remaining gas: 1039961.071 units remaining)
+  - location: 60 (remaining gas: 1039963.606 units remaining)
     [ True
       { "B" ; "C" ; "asdf" } ]
-  - location: 58 (remaining gas: 1039961.041 units remaining)
+  - location: 58 (remaining gas: 1039963.586 units remaining)
     [ True
       True
       { "B" ; "C" ; "asdf" } ]
-  - location: 61 (remaining gas: 1039961.021 units remaining)
+  - location: 61 (remaining gas: 1039963.576 units remaining)
     [ True
       { "B" ; "C" ; "asdf" } ]
-  - location: 62 (remaining gas: 1039961.011 units remaining)
+  - location: 62 (remaining gas: 1039963.566 units remaining)
     [ { "B" ; "C" ; "asdf" }
       True ]
-  - location: 63 (remaining gas: 1039960.996 units remaining)
+  - location: 63 (remaining gas: 1039963.556 units remaining)
     [ (Pair { "B" ; "C" ; "asdf" } True) ]
-  - location: 40 (remaining gas: 1039960.981 units remaining)
+  - location: 40 (remaining gas: 1039963.546 units remaining)
     [ "B"
       (Pair { "B" ; "C" ; "asdf" } True) ]
-  - location: 42 (remaining gas: 1039960.966 units remaining)
+  - location: 42 (remaining gas: 1039963.536 units remaining)
     [ (Pair "B" { "B" ; "C" ; "asdf" } True) ]
-  - location: 43 (remaining gas: 1039960.956 units remaining)
+  - location: 43 (remaining gas: 1039963.526 units remaining)
     [ (Pair "B" { "B" ; "C" ; "asdf" } True)
       (Pair "B" { "B" ; "C" ; "asdf" } True) ]
-  - location: 44 (remaining gas: 1039960.946 units remaining)
+  - location: 44 (remaining gas: 1039963.516 units remaining)
     [ (Pair "B" { "B" ; "C" ; "asdf" } True)
       (Pair "B" { "B" ; "C" ; "asdf" } True)
       (Pair "B" { "B" ; "C" ; "asdf" } True) ]
-  - location: 45 (remaining gas: 1039960.936 units remaining)
+  - location: 45 (remaining gas: 1039963.506 units remaining)
     [ "B"
       (Pair "B" { "B" ; "C" ; "asdf" } True)
       (Pair "B" { "B" ; "C" ; "asdf" } True) ]
-  - location: 46 (remaining gas: 1039960.921 units remaining)
+  - location: 46 (remaining gas: 1039963.496 units remaining)
     [ (Pair "B" { "B" ; "C" ; "asdf" } True)
       (Pair "B" { "B" ; "C" ; "asdf" } True) ]
-  - location: 49 (remaining gas: 1039960.911 units remaining)
+  - location: 49 (remaining gas: 1039963.486 units remaining)
     [ (Pair { "B" ; "C" ; "asdf" } True)
       (Pair "B" { "B" ; "C" ; "asdf" } True) ]
-  - location: 50 (remaining gas: 1039960.901 units remaining)
+  - location: 50 (remaining gas: 1039963.476 units remaining)
     [ { "B" ; "C" ; "asdf" }
       (Pair "B" { "B" ; "C" ; "asdf" } True) ]
-  - location: 51 (remaining gas: 1039960.886 units remaining)
+  - location: 51 (remaining gas: 1039963.466 units remaining)
     [ (Pair "B" { "B" ; "C" ; "asdf" } True) ]
-  - location: 54 (remaining gas: 1039960.876 units remaining)
+  - location: 54 (remaining gas: 1039963.456 units remaining)
     [ (Pair { "B" ; "C" ; "asdf" } True) ]
-  - location: 55 (remaining gas: 1039960.866 units remaining)
+  - location: 55 (remaining gas: 1039963.446 units remaining)
     [ True ]
-  - location: 51 (remaining gas: 1039960.836 units remaining)
+  - location: 51 (remaining gas: 1039963.426 units remaining)
     [ { "B" ; "C" ; "asdf" }
       True ]
-  - location: 56 (remaining gas: 1039960.826 units remaining)
+  - location: 56 (remaining gas: 1039963.416 units remaining)
     [ { "B" ; "C" ; "asdf" }
       { "B" ; "C" ; "asdf" }
       True ]
-  - location: 46 (remaining gas: 1039960.796 units remaining)
+  - location: 46 (remaining gas: 1039963.396 units remaining)
     [ "B"
       { "B" ; "C" ; "asdf" }
       { "B" ; "C" ; "asdf" }
       True ]
-  - location: 57 (remaining gas: 1039960.678 units remaining)
+  - location: 57 (remaining gas: 1039963.278 units remaining)
     [ True
       { "B" ; "C" ; "asdf" }
       True ]
-  - location: 58 (remaining gas: 1039960.663 units remaining)
+  - location: 58 (remaining gas: 1039963.268 units remaining)
     [ { "B" ; "C" ; "asdf" }
       True ]
-  - location: 60 (remaining gas: 1039960.653 units remaining)
+  - location: 60 (remaining gas: 1039963.258 units remaining)
     [ True
       { "B" ; "C" ; "asdf" } ]
-  - location: 58 (remaining gas: 1039960.623 units remaining)
+  - location: 58 (remaining gas: 1039963.238 units remaining)
     [ True
       True
       { "B" ; "C" ; "asdf" } ]
-  - location: 61 (remaining gas: 1039960.603 units remaining)
+  - location: 61 (remaining gas: 1039963.228 units remaining)
     [ True
       { "B" ; "C" ; "asdf" } ]
-  - location: 62 (remaining gas: 1039960.593 units remaining)
+  - location: 62 (remaining gas: 1039963.218 units remaining)
     [ { "B" ; "C" ; "asdf" }
       True ]
-  - location: 63 (remaining gas: 1039960.578 units remaining)
+  - location: 63 (remaining gas: 1039963.208 units remaining)
     [ (Pair { "B" ; "C" ; "asdf" } True) ]
-  - location: 40 (remaining gas: 1039960.563 units remaining)
+  - location: 40 (remaining gas: 1039963.198 units remaining)
     [ "asdf"
       (Pair { "B" ; "C" ; "asdf" } True) ]
-  - location: 42 (remaining gas: 1039960.548 units remaining)
+  - location: 42 (remaining gas: 1039963.188 units remaining)
     [ (Pair "asdf" { "B" ; "C" ; "asdf" } True) ]
-  - location: 43 (remaining gas: 1039960.538 units remaining)
+  - location: 43 (remaining gas: 1039963.178 units remaining)
     [ (Pair "asdf" { "B" ; "C" ; "asdf" } True)
       (Pair "asdf" { "B" ; "C" ; "asdf" } True) ]
-  - location: 44 (remaining gas: 1039960.528 units remaining)
+  - location: 44 (remaining gas: 1039963.168 units remaining)
     [ (Pair "asdf" { "B" ; "C" ; "asdf" } True)
       (Pair "asdf" { "B" ; "C" ; "asdf" } True)
       (Pair "asdf" { "B" ; "C" ; "asdf" } True) ]
-  - location: 45 (remaining gas: 1039960.518 units remaining)
+  - location: 45 (remaining gas: 1039963.158 units remaining)
     [ "asdf"
       (Pair "asdf" { "B" ; "C" ; "asdf" } True)
       (Pair "asdf" { "B" ; "C" ; "asdf" } True) ]
-  - location: 46 (remaining gas: 1039960.503 units remaining)
+  - location: 46 (remaining gas: 1039963.148 units remaining)
     [ (Pair "asdf" { "B" ; "C" ; "asdf" } True)
       (Pair "asdf" { "B" ; "C" ; "asdf" } True) ]
-  - location: 49 (remaining gas: 1039960.493 units remaining)
+  - location: 49 (remaining gas: 1039963.138 units remaining)
     [ (Pair { "B" ; "C" ; "asdf" } True)
       (Pair "asdf" { "B" ; "C" ; "asdf" } True) ]
-  - location: 50 (remaining gas: 1039960.483 units remaining)
+  - location: 50 (remaining gas: 1039963.128 units remaining)
     [ { "B" ; "C" ; "asdf" }
       (Pair "asdf" { "B" ; "C" ; "asdf" } True) ]
-  - location: 51 (remaining gas: 1039960.468 units remaining)
+  - location: 51 (remaining gas: 1039963.118 units remaining)
     [ (Pair "asdf" { "B" ; "C" ; "asdf" } True) ]
-  - location: 54 (remaining gas: 1039960.458 units remaining)
+  - location: 54 (remaining gas: 1039963.108 units remaining)
     [ (Pair { "B" ; "C" ; "asdf" } True) ]
-  - location: 55 (remaining gas: 1039960.448 units remaining)
+  - location: 55 (remaining gas: 1039963.098 units remaining)
     [ True ]
-  - location: 51 (remaining gas: 1039960.418 units remaining)
+  - location: 51 (remaining gas: 1039963.078 units remaining)
     [ { "B" ; "C" ; "asdf" }
       True ]
-  - location: 56 (remaining gas: 1039960.408 units remaining)
+  - location: 56 (remaining gas: 1039963.068 units remaining)
     [ { "B" ; "C" ; "asdf" }
       { "B" ; "C" ; "asdf" }
       True ]
-  - location: 46 (remaining gas: 1039960.378 units remaining)
+  - location: 46 (remaining gas: 1039963.048 units remaining)
     [ "asdf"
       { "B" ; "C" ; "asdf" }
       { "B" ; "C" ; "asdf" }
       True ]
-  - location: 57 (remaining gas: 1039960.251 units remaining)
+  - location: 57 (remaining gas: 1039962.921 units remaining)
     [ True
       { "B" ; "C" ; "asdf" }
       True ]
-  - location: 58 (remaining gas: 1039960.236 units remaining)
+  - location: 58 (remaining gas: 1039962.911 units remaining)
     [ { "B" ; "C" ; "asdf" }
       True ]
-  - location: 60 (remaining gas: 1039960.226 units remaining)
+  - location: 60 (remaining gas: 1039962.901 units remaining)
     [ True
       { "B" ; "C" ; "asdf" } ]
-  - location: 58 (remaining gas: 1039960.196 units remaining)
+  - location: 58 (remaining gas: 1039962.881 units remaining)
     [ True
       True
       { "B" ; "C" ; "asdf" } ]
-  - location: 61 (remaining gas: 1039960.176 units remaining)
+  - location: 61 (remaining gas: 1039962.871 units remaining)
     [ True
       { "B" ; "C" ; "asdf" } ]
-  - location: 62 (remaining gas: 1039960.166 units remaining)
+  - location: 62 (remaining gas: 1039962.861 units remaining)
     [ { "B" ; "C" ; "asdf" }
       True ]
-  - location: 63 (remaining gas: 1039960.151 units remaining)
+  - location: 63 (remaining gas: 1039962.851 units remaining)
     [ (Pair { "B" ; "C" ; "asdf" } True) ]
-  - location: 40 (remaining gas: 1039960.136 units remaining)
+  - location: 40 (remaining gas: 1039962.841 units remaining)
     [ "C"
       (Pair { "B" ; "C" ; "asdf" } True) ]
-  - location: 42 (remaining gas: 1039960.121 units remaining)
+  - location: 42 (remaining gas: 1039962.831 units remaining)
     [ (Pair "C" { "B" ; "C" ; "asdf" } True) ]
-  - location: 43 (remaining gas: 1039960.111 units remaining)
+  - location: 43 (remaining gas: 1039962.821 units remaining)
     [ (Pair "C" { "B" ; "C" ; "asdf" } True)
       (Pair "C" { "B" ; "C" ; "asdf" } True) ]
-  - location: 44 (remaining gas: 1039960.101 units remaining)
+  - location: 44 (remaining gas: 1039962.811 units remaining)
     [ (Pair "C" { "B" ; "C" ; "asdf" } True)
       (Pair "C" { "B" ; "C" ; "asdf" } True)
       (Pair "C" { "B" ; "C" ; "asdf" } True) ]
-  - location: 45 (remaining gas: 1039960.091 units remaining)
+  - location: 45 (remaining gas: 1039962.801 units remaining)
     [ "C"
       (Pair "C" { "B" ; "C" ; "asdf" } True)
       (Pair "C" { "B" ; "C" ; "asdf" } True) ]
-  - location: 46 (remaining gas: 1039960.076 units remaining)
+  - location: 46 (remaining gas: 1039962.791 units remaining)
     [ (Pair "C" { "B" ; "C" ; "asdf" } True)
       (Pair "C" { "B" ; "C" ; "asdf" } True) ]
-  - location: 49 (remaining gas: 1039960.066 units remaining)
+  - location: 49 (remaining gas: 1039962.781 units remaining)
     [ (Pair { "B" ; "C" ; "asdf" } True)
       (Pair "C" { "B" ; "C" ; "asdf" } True) ]
-  - location: 50 (remaining gas: 1039960.056 units remaining)
+  - location: 50 (remaining gas: 1039962.771 units remaining)
     [ { "B" ; "C" ; "asdf" }
       (Pair "C" { "B" ; "C" ; "asdf" } True) ]
-  - location: 51 (remaining gas: 1039960.041 units remaining)
+  - location: 51 (remaining gas: 1039962.761 units remaining)
     [ (Pair "C" { "B" ; "C" ; "asdf" } True) ]
-  - location: 54 (remaining gas: 1039960.031 units remaining)
+  - location: 54 (remaining gas: 1039962.751 units remaining)
     [ (Pair { "B" ; "C" ; "asdf" } True) ]
-  - location: 55 (remaining gas: 1039960.021 units remaining)
+  - location: 55 (remaining gas: 1039962.741 units remaining)
     [ True ]
-  - location: 51 (remaining gas: 1039959.991 units remaining)
+  - location: 51 (remaining gas: 1039962.721 units remaining)
     [ { "B" ; "C" ; "asdf" }
       True ]
-  - location: 56 (remaining gas: 1039959.981 units remaining)
+  - location: 56 (remaining gas: 1039962.711 units remaining)
     [ { "B" ; "C" ; "asdf" }
       { "B" ; "C" ; "asdf" }
       True ]
-  - location: 46 (remaining gas: 1039959.951 units remaining)
+  - location: 46 (remaining gas: 1039962.691 units remaining)
     [ "C"
       { "B" ; "C" ; "asdf" }
       { "B" ; "C" ; "asdf" }
       True ]
-  - location: 57 (remaining gas: 1039959.833 units remaining)
+  - location: 57 (remaining gas: 1039962.573 units remaining)
     [ True
       { "B" ; "C" ; "asdf" }
       True ]
-  - location: 58 (remaining gas: 1039959.818 units remaining)
+  - location: 58 (remaining gas: 1039962.563 units remaining)
     [ { "B" ; "C" ; "asdf" }
       True ]
-  - location: 60 (remaining gas: 1039959.808 units remaining)
+  - location: 60 (remaining gas: 1039962.553 units remaining)
     [ True
       { "B" ; "C" ; "asdf" } ]
-  - location: 58 (remaining gas: 1039959.778 units remaining)
+  - location: 58 (remaining gas: 1039962.533 units remaining)
     [ True
       True
       { "B" ; "C" ; "asdf" } ]
-  - location: 61 (remaining gas: 1039959.758 units remaining)
+  - location: 61 (remaining gas: 1039962.523 units remaining)
     [ True
       { "B" ; "C" ; "asdf" } ]
-  - location: 62 (remaining gas: 1039959.748 units remaining)
+  - location: 62 (remaining gas: 1039962.513 units remaining)
     [ { "B" ; "C" ; "asdf" }
       True ]
-  - location: 63 (remaining gas: 1039959.733 units remaining)
+  - location: 63 (remaining gas: 1039962.503 units remaining)
     [ (Pair { "B" ; "C" ; "asdf" } True) ]
-  - location: 40 (remaining gas: 1039959.718 units remaining)
+  - location: 40 (remaining gas: 1039962.493 units remaining)
     [ (Pair { "B" ; "C" ; "asdf" } True) ]
-  - location: 64 (remaining gas: 1039959.708 units remaining)
+  - location: 64 (remaining gas: 1039962.483 units remaining)
     [ True ]
-  - location: 65 (remaining gas: 1039959.693 units remaining)
+  - location: 65 (remaining gas: 1039962.473 units remaining)
     [ (Some True) ]
-  - location: 66 (remaining gas: 1039959.678 units remaining)
+  - location: 66 (remaining gas: 1039962.463 units remaining)
     [ {}
       (Some True) ]
-  - location: 68 (remaining gas: 1039959.663 units remaining)
+  - location: 68 (remaining gas: 1039962.453 units remaining)
     [ (Pair {} (Some True)) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"B\" } { \"B\" })-(Some True)].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"B\" } { \"B\" })-(Some True)].out"
index c80623431a2a6494b9cff2dd935096ff43282002..195f29395d03e40a8655ddd7b653f5eaf2adc6f5 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"B\" } { \"B\" })-(Some True)].out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"B\" } { \"B\" })-(Some True)].out"	
@@ -7,160 +7,160 @@ emitted operations
 big_map diff
   
 trace
-  - location: 12 (remaining gas: 1039963.234 units remaining)
+  - location: 12 (remaining gas: 1039965.634 units remaining)
     [ (Pair (Pair { "B" } { "B" }) None) ]
-  - location: 12 (remaining gas: 1039963.224 units remaining)
+  - location: 12 (remaining gas: 1039965.624 units remaining)
     [ (Pair { "B" } { "B" }) ]
-  - location: 13 (remaining gas: 1039963.214 units remaining)
+  - location: 13 (remaining gas: 1039965.614 units remaining)
     [ (Pair { "B" } { "B" })
       (Pair { "B" } { "B" }) ]
-  - location: 14 (remaining gas: 1039963.204 units remaining)
+  - location: 14 (remaining gas: 1039965.604 units remaining)
     [ { "B" }
       (Pair { "B" } { "B" }) ]
-  - location: 15 (remaining gas: 1039963.189 units remaining)
+  - location: 15 (remaining gas: 1039965.594 units remaining)
     [ (Pair { "B" } { "B" }) ]
-  - location: 17 (remaining gas: 1039963.179 units remaining)
+  - location: 17 (remaining gas: 1039965.584 units remaining)
     [ { "B" } ]
-  - location: 15 (remaining gas: 1039963.149 units remaining)
+  - location: 15 (remaining gas: 1039965.564 units remaining)
     [ { "B" }
       { "B" } ]
-  - location: 18 (remaining gas: 1039962.929 units remaining)
+  - location: 18 (remaining gas: 1039965.344 units remaining)
     [ {}
       { "B" }
       { "B" } ]
-  - location: 20 (remaining gas: 1039962.919 units remaining)
+  - location: 20 (remaining gas: 1039965.334 units remaining)
     [ { "B" }
       {}
       { "B" } ]
-  - location: 21 (remaining gas: 1039962.919 units remaining)
+  - location: 21 (remaining gas: 1039965.334 units remaining)
     [ "B"
       {}
       { "B" } ]
-  - location: 23 (remaining gas: 1039962.904 units remaining)
+  - location: 23 (remaining gas: 1039965.324 units remaining)
     [ (Pair "B" {})
       { "B" } ]
-  - location: 24 (remaining gas: 1039962.894 units remaining)
+  - location: 24 (remaining gas: 1039965.314 units remaining)
     [ (Pair "B" {})
       (Pair "B" {})
       { "B" } ]
-  - location: 25 (remaining gas: 1039962.884 units remaining)
+  - location: 25 (remaining gas: 1039965.304 units remaining)
     [ "B"
       (Pair "B" {})
       { "B" } ]
-  - location: 26 (remaining gas: 1039962.869 units remaining)
+  - location: 26 (remaining gas: 1039965.294 units remaining)
     [ (Pair "B" {})
       { "B" } ]
-  - location: 28 (remaining gas: 1039962.859 units remaining)
+  - location: 28 (remaining gas: 1039965.284 units remaining)
     [ {}
       { "B" } ]
-  - location: 26 (remaining gas: 1039962.829 units remaining)
+  - location: 26 (remaining gas: 1039965.264 units remaining)
     [ "B"
       {}
       { "B" } ]
-  - location: 29 (remaining gas: 1039962.819 units remaining)
+  - location: 29 (remaining gas: 1039965.254 units remaining)
     [ True
       "B"
       {}
       { "B" } ]
-  - location: 32 (remaining gas: 1039962.809 units remaining)
+  - location: 32 (remaining gas: 1039965.244 units remaining)
     [ "B"
       True
       {}
       { "B" } ]
-  - location: 33 (remaining gas: 1039962.677 units remaining)
+  - location: 33 (remaining gas: 1039965.112 units remaining)
     [ { "B" }
       { "B" } ]
-  - location: 21 (remaining gas: 1039962.662 units remaining)
+  - location: 21 (remaining gas: 1039965.102 units remaining)
     [ { "B" }
       { "B" } ]
-  - location: 34 (remaining gas: 1039962.652 units remaining)
+  - location: 34 (remaining gas: 1039965.092 units remaining)
     [ True
       { "B" }
       { "B" } ]
-  - location: 37 (remaining gas: 1039962.642 units remaining)
+  - location: 37 (remaining gas: 1039965.082 units remaining)
     [ { "B" }
       True
       { "B" } ]
-  - location: 38 (remaining gas: 1039962.627 units remaining)
+  - location: 38 (remaining gas: 1039965.072 units remaining)
     [ (Pair { "B" } True)
       { "B" } ]
-  - location: 39 (remaining gas: 1039962.617 units remaining)
+  - location: 39 (remaining gas: 1039965.062 units remaining)
     [ { "B" }
       (Pair { "B" } True) ]
-  - location: 40 (remaining gas: 1039962.617 units remaining)
+  - location: 40 (remaining gas: 1039965.062 units remaining)
     [ "B"
       (Pair { "B" } True) ]
-  - location: 42 (remaining gas: 1039962.602 units remaining)
+  - location: 42 (remaining gas: 1039965.052 units remaining)
     [ (Pair "B" { "B" } True) ]
-  - location: 43 (remaining gas: 1039962.592 units remaining)
+  - location: 43 (remaining gas: 1039965.042 units remaining)
     [ (Pair "B" { "B" } True)
       (Pair "B" { "B" } True) ]
-  - location: 44 (remaining gas: 1039962.582 units remaining)
+  - location: 44 (remaining gas: 1039965.032 units remaining)
     [ (Pair "B" { "B" } True)
       (Pair "B" { "B" } True)
       (Pair "B" { "B" } True) ]
-  - location: 45 (remaining gas: 1039962.572 units remaining)
+  - location: 45 (remaining gas: 1039965.022 units remaining)
     [ "B"
       (Pair "B" { "B" } True)
       (Pair "B" { "B" } True) ]
-  - location: 46 (remaining gas: 1039962.557 units remaining)
+  - location: 46 (remaining gas: 1039965.012 units remaining)
     [ (Pair "B" { "B" } True)
       (Pair "B" { "B" } True) ]
-  - location: 49 (remaining gas: 1039962.547 units remaining)
+  - location: 49 (remaining gas: 1039965.002 units remaining)
     [ (Pair { "B" } True)
       (Pair "B" { "B" } True) ]
-  - location: 50 (remaining gas: 1039962.537 units remaining)
+  - location: 50 (remaining gas: 1039964.992 units remaining)
     [ { "B" }
       (Pair "B" { "B" } True) ]
-  - location: 51 (remaining gas: 1039962.522 units remaining)
+  - location: 51 (remaining gas: 1039964.982 units remaining)
     [ (Pair "B" { "B" } True) ]
-  - location: 54 (remaining gas: 1039962.512 units remaining)
+  - location: 54 (remaining gas: 1039964.972 units remaining)
     [ (Pair { "B" } True) ]
-  - location: 55 (remaining gas: 1039962.502 units remaining)
+  - location: 55 (remaining gas: 1039964.962 units remaining)
     [ True ]
-  - location: 51 (remaining gas: 1039962.472 units remaining)
+  - location: 51 (remaining gas: 1039964.942 units remaining)
     [ { "B" }
       True ]
-  - location: 56 (remaining gas: 1039962.462 units remaining)
+  - location: 56 (remaining gas: 1039964.932 units remaining)
     [ { "B" }
       { "B" }
       True ]
-  - location: 46 (remaining gas: 1039962.432 units remaining)
+  - location: 46 (remaining gas: 1039964.912 units remaining)
     [ "B"
       { "B" }
       { "B" }
       True ]
-  - location: 57 (remaining gas: 1039962.315 units remaining)
+  - location: 57 (remaining gas: 1039964.795 units remaining)
     [ True
       { "B" }
       True ]
-  - location: 58 (remaining gas: 1039962.300 units remaining)
+  - location: 58 (remaining gas: 1039964.785 units remaining)
     [ { "B" }
       True ]
-  - location: 60 (remaining gas: 1039962.290 units remaining)
+  - location: 60 (remaining gas: 1039964.775 units remaining)
     [ True
       { "B" } ]
-  - location: 58 (remaining gas: 1039962.260 units remaining)
+  - location: 58 (remaining gas: 1039964.755 units remaining)
     [ True
       True
       { "B" } ]
-  - location: 61 (remaining gas: 1039962.240 units remaining)
+  - location: 61 (remaining gas: 1039964.745 units remaining)
     [ True
       { "B" } ]
-  - location: 62 (remaining gas: 1039962.230 units remaining)
+  - location: 62 (remaining gas: 1039964.735 units remaining)
     [ { "B" }
       True ]
-  - location: 63 (remaining gas: 1039962.215 units remaining)
+  - location: 63 (remaining gas: 1039964.725 units remaining)
     [ (Pair { "B" } True) ]
-  - location: 40 (remaining gas: 1039962.200 units remaining)
+  - location: 40 (remaining gas: 1039964.715 units remaining)
     [ (Pair { "B" } True) ]
-  - location: 64 (remaining gas: 1039962.190 units remaining)
+  - location: 64 (remaining gas: 1039964.705 units remaining)
     [ True ]
-  - location: 65 (remaining gas: 1039962.175 units remaining)
+  - location: 65 (remaining gas: 1039964.695 units remaining)
     [ (Some True) ]
-  - location: 66 (remaining gas: 1039962.160 units remaining)
+  - location: 66 (remaining gas: 1039964.685 units remaining)
     [ {}
       (Some True) ]
-  - location: 68 (remaining gas: 1039962.145 units remaining)
+  - location: 68 (remaining gas: 1039964.675 units remaining)
     [ (Pair {} (Some True)) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"c\" } { \"B\" })-(Some False)].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"c\" } { \"B\" })-(Some False)].out"
index 922482d26fd230073d6c6681b2b5e75bdf13db4e..f3b88080270bf84fa69e8d8111b7818217e30624 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"c\" } { \"B\" })-(Some False)].out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair { \"c\" } { \"B\" })-(Some False)].out"	
@@ -7,160 +7,160 @@ emitted operations
 big_map diff
   
 trace
-  - location: 12 (remaining gas: 1039963.234 units remaining)
+  - location: 12 (remaining gas: 1039965.634 units remaining)
     [ (Pair (Pair { "c" } { "B" }) None) ]
-  - location: 12 (remaining gas: 1039963.224 units remaining)
+  - location: 12 (remaining gas: 1039965.624 units remaining)
     [ (Pair { "c" } { "B" }) ]
-  - location: 13 (remaining gas: 1039963.214 units remaining)
+  - location: 13 (remaining gas: 1039965.614 units remaining)
     [ (Pair { "c" } { "B" })
       (Pair { "c" } { "B" }) ]
-  - location: 14 (remaining gas: 1039963.204 units remaining)
+  - location: 14 (remaining gas: 1039965.604 units remaining)
     [ { "c" }
       (Pair { "c" } { "B" }) ]
-  - location: 15 (remaining gas: 1039963.189 units remaining)
+  - location: 15 (remaining gas: 1039965.594 units remaining)
     [ (Pair { "c" } { "B" }) ]
-  - location: 17 (remaining gas: 1039963.179 units remaining)
+  - location: 17 (remaining gas: 1039965.584 units remaining)
     [ { "B" } ]
-  - location: 15 (remaining gas: 1039963.149 units remaining)
+  - location: 15 (remaining gas: 1039965.564 units remaining)
     [ { "c" }
       { "B" } ]
-  - location: 18 (remaining gas: 1039962.929 units remaining)
+  - location: 18 (remaining gas: 1039965.344 units remaining)
     [ {}
       { "c" }
       { "B" } ]
-  - location: 20 (remaining gas: 1039962.919 units remaining)
+  - location: 20 (remaining gas: 1039965.334 units remaining)
     [ { "c" }
       {}
       { "B" } ]
-  - location: 21 (remaining gas: 1039962.919 units remaining)
+  - location: 21 (remaining gas: 1039965.334 units remaining)
     [ "c"
       {}
       { "B" } ]
-  - location: 23 (remaining gas: 1039962.904 units remaining)
+  - location: 23 (remaining gas: 1039965.324 units remaining)
     [ (Pair "c" {})
       { "B" } ]
-  - location: 24 (remaining gas: 1039962.894 units remaining)
+  - location: 24 (remaining gas: 1039965.314 units remaining)
     [ (Pair "c" {})
       (Pair "c" {})
       { "B" } ]
-  - location: 25 (remaining gas: 1039962.884 units remaining)
+  - location: 25 (remaining gas: 1039965.304 units remaining)
     [ "c"
       (Pair "c" {})
       { "B" } ]
-  - location: 26 (remaining gas: 1039962.869 units remaining)
+  - location: 26 (remaining gas: 1039965.294 units remaining)
     [ (Pair "c" {})
       { "B" } ]
-  - location: 28 (remaining gas: 1039962.859 units remaining)
+  - location: 28 (remaining gas: 1039965.284 units remaining)
     [ {}
       { "B" } ]
-  - location: 26 (remaining gas: 1039962.829 units remaining)
+  - location: 26 (remaining gas: 1039965.264 units remaining)
     [ "c"
       {}
       { "B" } ]
-  - location: 29 (remaining gas: 1039962.819 units remaining)
+  - location: 29 (remaining gas: 1039965.254 units remaining)
     [ True
       "c"
       {}
       { "B" } ]
-  - location: 32 (remaining gas: 1039962.809 units remaining)
+  - location: 32 (remaining gas: 1039965.244 units remaining)
     [ "c"
       True
       {}
       { "B" } ]
-  - location: 33 (remaining gas: 1039962.677 units remaining)
+  - location: 33 (remaining gas: 1039965.112 units remaining)
     [ { "c" }
       { "B" } ]
-  - location: 21 (remaining gas: 1039962.662 units remaining)
+  - location: 21 (remaining gas: 1039965.102 units remaining)
     [ { "c" }
       { "B" } ]
-  - location: 34 (remaining gas: 1039962.652 units remaining)
+  - location: 34 (remaining gas: 1039965.092 units remaining)
     [ True
       { "c" }
       { "B" } ]
-  - location: 37 (remaining gas: 1039962.642 units remaining)
+  - location: 37 (remaining gas: 1039965.082 units remaining)
     [ { "c" }
       True
       { "B" } ]
-  - location: 38 (remaining gas: 1039962.627 units remaining)
+  - location: 38 (remaining gas: 1039965.072 units remaining)
     [ (Pair { "c" } True)
       { "B" } ]
-  - location: 39 (remaining gas: 1039962.617 units remaining)
+  - location: 39 (remaining gas: 1039965.062 units remaining)
     [ { "B" }
       (Pair { "c" } True) ]
-  - location: 40 (remaining gas: 1039962.617 units remaining)
+  - location: 40 (remaining gas: 1039965.062 units remaining)
     [ "B"
       (Pair { "c" } True) ]
-  - location: 42 (remaining gas: 1039962.602 units remaining)
+  - location: 42 (remaining gas: 1039965.052 units remaining)
     [ (Pair "B" { "c" } True) ]
-  - location: 43 (remaining gas: 1039962.592 units remaining)
+  - location: 43 (remaining gas: 1039965.042 units remaining)
     [ (Pair "B" { "c" } True)
       (Pair "B" { "c" } True) ]
-  - location: 44 (remaining gas: 1039962.582 units remaining)
+  - location: 44 (remaining gas: 1039965.032 units remaining)
     [ (Pair "B" { "c" } True)
       (Pair "B" { "c" } True)
       (Pair "B" { "c" } True) ]
-  - location: 45 (remaining gas: 1039962.572 units remaining)
+  - location: 45 (remaining gas: 1039965.022 units remaining)
     [ "B"
       (Pair "B" { "c" } True)
       (Pair "B" { "c" } True) ]
-  - location: 46 (remaining gas: 1039962.557 units remaining)
+  - location: 46 (remaining gas: 1039965.012 units remaining)
     [ (Pair "B" { "c" } True)
       (Pair "B" { "c" } True) ]
-  - location: 49 (remaining gas: 1039962.547 units remaining)
+  - location: 49 (remaining gas: 1039965.002 units remaining)
     [ (Pair { "c" } True)
       (Pair "B" { "c" } True) ]
-  - location: 50 (remaining gas: 1039962.537 units remaining)
+  - location: 50 (remaining gas: 1039964.992 units remaining)
     [ { "c" }
       (Pair "B" { "c" } True) ]
-  - location: 51 (remaining gas: 1039962.522 units remaining)
+  - location: 51 (remaining gas: 1039964.982 units remaining)
     [ (Pair "B" { "c" } True) ]
-  - location: 54 (remaining gas: 1039962.512 units remaining)
+  - location: 54 (remaining gas: 1039964.972 units remaining)
     [ (Pair { "c" } True) ]
-  - location: 55 (remaining gas: 1039962.502 units remaining)
+  - location: 55 (remaining gas: 1039964.962 units remaining)
     [ True ]
-  - location: 51 (remaining gas: 1039962.472 units remaining)
+  - location: 51 (remaining gas: 1039964.942 units remaining)
     [ { "c" }
       True ]
-  - location: 56 (remaining gas: 1039962.462 units remaining)
+  - location: 56 (remaining gas: 1039964.932 units remaining)
     [ { "c" }
       { "c" }
       True ]
-  - location: 46 (remaining gas: 1039962.432 units remaining)
+  - location: 46 (remaining gas: 1039964.912 units remaining)
     [ "B"
       { "c" }
       { "c" }
       True ]
-  - location: 57 (remaining gas: 1039962.315 units remaining)
+  - location: 57 (remaining gas: 1039964.795 units remaining)
     [ False
       { "c" }
       True ]
-  - location: 58 (remaining gas: 1039962.300 units remaining)
+  - location: 58 (remaining gas: 1039964.785 units remaining)
     [ { "c" }
       True ]
-  - location: 60 (remaining gas: 1039962.290 units remaining)
+  - location: 60 (remaining gas: 1039964.775 units remaining)
     [ True
       { "c" } ]
-  - location: 58 (remaining gas: 1039962.260 units remaining)
+  - location: 58 (remaining gas: 1039964.755 units remaining)
     [ False
       True
       { "c" } ]
-  - location: 61 (remaining gas: 1039962.240 units remaining)
+  - location: 61 (remaining gas: 1039964.745 units remaining)
     [ False
       { "c" } ]
-  - location: 62 (remaining gas: 1039962.230 units remaining)
+  - location: 62 (remaining gas: 1039964.735 units remaining)
     [ { "c" }
       False ]
-  - location: 63 (remaining gas: 1039962.215 units remaining)
+  - location: 63 (remaining gas: 1039964.725 units remaining)
     [ (Pair { "c" } False) ]
-  - location: 40 (remaining gas: 1039962.200 units remaining)
+  - location: 40 (remaining gas: 1039964.715 units remaining)
     [ (Pair { "c" } False) ]
-  - location: 64 (remaining gas: 1039962.190 units remaining)
+  - location: 64 (remaining gas: 1039964.705 units remaining)
     [ False ]
-  - location: 65 (remaining gas: 1039962.175 units remaining)
+  - location: 65 (remaining gas: 1039964.695 units remaining)
     [ (Some False) ]
-  - location: 66 (remaining gas: 1039962.160 units remaining)
+  - location: 66 (remaining gas: 1039964.685 units remaining)
     [ {}
       (Some False) ]
-  - location: 68 (remaining gas: 1039962.145 units remaining)
+  - location: 68 (remaining gas: 1039964.675 units remaining)
     [ (Pair {} (Some False)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair {} {})-(Some True)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair {} {})-(Some True)].out
index 91393ee0af886e189b993fbf3d0e2e0f8bc35ae1..a0782fbc9a632ea0978899d7a57f5b51f66eac43 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair {} {})-(Some True)].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contains_all.tz-None-(Pair {} {})-(Some True)].out	
@@ -7,57 +7,57 @@ emitted operations
 big_map diff
   
 trace
-  - location: 12 (remaining gas: 1039963.482 units remaining)
+  - location: 12 (remaining gas: 1039965.882 units remaining)
     [ (Pair (Pair {} {}) None) ]
-  - location: 12 (remaining gas: 1039963.472 units remaining)
+  - location: 12 (remaining gas: 1039965.872 units remaining)
     [ (Pair {} {}) ]
-  - location: 13 (remaining gas: 1039963.462 units remaining)
+  - location: 13 (remaining gas: 1039965.862 units remaining)
     [ (Pair {} {})
       (Pair {} {}) ]
-  - location: 14 (remaining gas: 1039963.452 units remaining)
+  - location: 14 (remaining gas: 1039965.852 units remaining)
     [ {}
       (Pair {} {}) ]
-  - location: 15 (remaining gas: 1039963.437 units remaining)
+  - location: 15 (remaining gas: 1039965.842 units remaining)
     [ (Pair {} {}) ]
-  - location: 17 (remaining gas: 1039963.427 units remaining)
+  - location: 17 (remaining gas: 1039965.832 units remaining)
     [ {} ]
-  - location: 15 (remaining gas: 1039963.397 units remaining)
+  - location: 15 (remaining gas: 1039965.812 units remaining)
     [ {}
       {} ]
-  - location: 18 (remaining gas: 1039963.177 units remaining)
+  - location: 18 (remaining gas: 1039965.592 units remaining)
     [ {}
       {}
       {} ]
-  - location: 20 (remaining gas: 1039963.167 units remaining)
+  - location: 20 (remaining gas: 1039965.582 units remaining)
     [ {}
       {}
       {} ]
-  - location: 21 (remaining gas: 1039963.167 units remaining)
+  - location: 21 (remaining gas: 1039965.582 units remaining)
     [ {}
       {} ]
-  - location: 34 (remaining gas: 1039963.157 units remaining)
+  - location: 34 (remaining gas: 1039965.572 units remaining)
     [ True
       {}
       {} ]
-  - location: 37 (remaining gas: 1039963.147 units remaining)
+  - location: 37 (remaining gas: 1039965.562 units remaining)
     [ {}
       True
       {} ]
-  - location: 38 (remaining gas: 1039963.132 units remaining)
+  - location: 38 (remaining gas: 1039965.552 units remaining)
     [ (Pair {} True)
       {} ]
-  - location: 39 (remaining gas: 1039963.122 units remaining)
+  - location: 39 (remaining gas: 1039965.542 units remaining)
     [ {}
       (Pair {} True) ]
-  - location: 40 (remaining gas: 1039963.122 units remaining)
+  - location: 40 (remaining gas: 1039965.542 units remaining)
     [ (Pair {} True) ]
-  - location: 64 (remaining gas: 1039963.112 units remaining)
+  - location: 64 (remaining gas: 1039965.532 units remaining)
     [ True ]
-  - location: 65 (remaining gas: 1039963.097 units remaining)
+  - location: 65 (remaining gas: 1039965.522 units remaining)
     [ (Some True) ]
-  - location: 66 (remaining gas: 1039963.082 units remaining)
+  - location: 66 (remaining gas: 1039965.512 units remaining)
     [ {}
       (Some True) ]
-  - location: 68 (remaining gas: 1039963.067 units remaining)
+  - location: 68 (remaining gas: 1039965.502 units remaining)
     [ (Pair {} (Some True)) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contract.tz-Unit-\"tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5\"-Unit].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contract.tz-Unit-\"tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5\"-Unit].out"
index bc6d97809655301984a62df32d44793678cbbc17..38b1029037076ad93925d70a95d07dbeabd90f90 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contract.tz-Unit-\"tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5\"-Unit].out"
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[contract.tz-Unit-\"tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5\"-Unit].out"
@@ -7,23 +7,23 @@ emitted operations
 big_map diff
   
 trace
-  - location: 7 (remaining gas: 1039340.490 units remaining)
+  - location: 7 (remaining gas: 1039984.530 units remaining)
     [ (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" Unit) ]
-  - location: 7 (remaining gas: 1039340.480 units remaining)
+  - location: 7 (remaining gas: 1039984.520 units remaining)
     [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 8 (remaining gas: 1039340.230 units remaining)
+  - location: 8 (remaining gas: 1039984.430 units remaining)
     [ (Some "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 11 (remaining gas: 1039340.220 units remaining)
+  - location: 11 (remaining gas: 1039984.420 units remaining)
     [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 11 (remaining gas: 1039340.205 units remaining)
+  - location: 11 (remaining gas: 1039984.410 units remaining)
     [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 17 (remaining gas: 1039340.195 units remaining)
+  - location: 17 (remaining gas: 1039984.400 units remaining)
     [  ]
-  - location: 18 (remaining gas: 1039340.185 units remaining)
+  - location: 18 (remaining gas: 1039984.390 units remaining)
     [ Unit ]
-  - location: 19 (remaining gas: 1039340.170 units remaining)
+  - location: 19 (remaining gas: 1039984.380 units remaining)
     [ {}
       Unit ]
-  - location: 21 (remaining gas: 1039340.155 units remaining)
+  - location: 21 (remaining gas: 1039984.370 units remaining)
     [ (Pair {} Unit) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[create_contract.tz-None-Unit-(Some \"KT1Mjjcb6tmSsLm7Cb3.c3984fbc14.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[create_contract.tz-None-Unit-(Some \"KT1Mjjcb6tmSsLm7Cb3.c3984fbc14.out"
index 98ec1d692733e7649891fa4dd7a3a521f596f3d1..22855f1149aadfec4b9504f5676a33475d908a53 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[create_contract.tz-None-Unit-(Some \"KT1Mjjcb6tmSsLm7Cb3.c3984fbc14.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[create_contract.tz-None-Unit-(Some \"KT1Mjjcb6tmSsLm7Cb3.c3984fbc14.out"	
@@ -13,37 +13,37 @@ emitted operations
   big_map diff
     
   trace
-    - location: 8 (remaining gas: 1039984.654 units remaining)
+    - location: 8 (remaining gas: 1039987.534 units remaining)
       [ (Pair Unit None) ]
-    - location: 8 (remaining gas: 1039984.644 units remaining)
+    - location: 8 (remaining gas: 1039987.524 units remaining)
       [  ]
-    - location: 9 (remaining gas: 1039984.634 units remaining)
+    - location: 9 (remaining gas: 1039987.514 units remaining)
       [ Unit ]
-    - location: 10 (remaining gas: 1039984.619 units remaining)
+    - location: 10 (remaining gas: 1039987.504 units remaining)
       [ 50000
         Unit ]
-    - location: 11 (remaining gas: 1039984.604 units remaining)
+    - location: 11 (remaining gas: 1039987.494 units remaining)
       [ None
         50000
         Unit ]
-    - location: 13 (remaining gas: 1039984.038 units remaining)
+    - location: 13 (remaining gas: 1039986.928 units remaining)
       [ 0x011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600000002d08603000000001c02000000170500036c0501036c050202000000080317053d036d034200000002030b
         "KT1Mjjcb6tmSsLm7Cb3DSQszePjfchPM4Uxm" ]
-    - location: 25 (remaining gas: 1039984.023 units remaining)
+    - location: 25 (remaining gas: 1039986.918 units remaining)
       [ "KT1Mjjcb6tmSsLm7Cb3DSQszePjfchPM4Uxm" ]
-    - location: 27 (remaining gas: 1039984.008 units remaining)
+    - location: 27 (remaining gas: 1039986.908 units remaining)
       [ (Some "KT1Mjjcb6tmSsLm7Cb3DSQszePjfchPM4Uxm") ]
-    - location: 28 (remaining gas: 1039983.993 units remaining)
+    - location: 28 (remaining gas: 1039986.898 units remaining)
       [ {}
         (Some "KT1Mjjcb6tmSsLm7Cb3DSQszePjfchPM4Uxm") ]
-    - location: 25 (remaining gas: 1039983.963 units remaining)
+    - location: 25 (remaining gas: 1039986.878 units remaining)
       [ 0x011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600000002d08603000000001c02000000170500036c0501036c050202000000080317053d036d034200000002030b
         {}
         (Some "KT1Mjjcb6tmSsLm7Cb3DSQszePjfchPM4Uxm") ]
-    - location: 30 (remaining gas: 1039983.948 units remaining)
+    - location: 30 (remaining gas: 1039986.868 units remaining)
       [ { 0x011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600000002d08603000000001c02000000170500036c0501036c050202000000080317053d036d034200000002030b }
         (Some "KT1Mjjcb6tmSsLm7Cb3DSQszePjfchPM4Uxm") ]
-    - location: 31 (remaining gas: 1039983.933 units remaining)
+    - location: 31 (remaining gas: 1039986.858 units remaining)
       [ (Pair { 0x011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600000002d08603000000001c02000000170500036c0501036c050202000000080317053d036d034200000002030b }
               (Some "KT1Mjjcb6tmSsLm7Cb3DSQszePjfchPM4Uxm")) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[diff_timestamps.tz-111-(Pair \"1970-01-01T00:03:20Z\" \"19.90e9215d17.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[diff_timestamps.tz-111-(Pair \"1970-01-01T00:03:20Z\" \"19.90e9215d17.out"
index dc7d892b88e4846a762de93dd55b4e70a90663ca..fba1ecc9932cc196b43dc318a13d5ce40d2835b5 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[diff_timestamps.tz-111-(Pair \"1970-01-01T00:03:20Z\" \"19.90e9215d17.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[diff_timestamps.tz-111-(Pair \"1970-01-01T00:03:20Z\" \"19.90e9215d17.out"	
@@ -7,28 +7,28 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (remaining gas: 1039991.318 units remaining)
+  - location: 9 (remaining gas: 1039990.498 units remaining)
     [ (Pair (Pair "1970-01-01T00:03:20Z" "1970-01-01T00:00:00Z") 111) ]
-  - location: 9 (remaining gas: 1039991.308 units remaining)
+  - location: 9 (remaining gas: 1039990.488 units remaining)
     [ (Pair "1970-01-01T00:03:20Z" "1970-01-01T00:00:00Z") ]
-  - location: 10 (remaining gas: 1039991.298 units remaining)
+  - location: 10 (remaining gas: 1039990.478 units remaining)
     [ (Pair "1970-01-01T00:03:20Z" "1970-01-01T00:00:00Z")
       (Pair "1970-01-01T00:03:20Z" "1970-01-01T00:00:00Z") ]
-  - location: 11 (remaining gas: 1039991.288 units remaining)
+  - location: 11 (remaining gas: 1039990.468 units remaining)
     [ "1970-01-01T00:03:20Z"
       (Pair "1970-01-01T00:03:20Z" "1970-01-01T00:00:00Z") ]
-  - location: 12 (remaining gas: 1039991.273 units remaining)
+  - location: 12 (remaining gas: 1039990.458 units remaining)
     [ (Pair "1970-01-01T00:03:20Z" "1970-01-01T00:00:00Z") ]
-  - location: 14 (remaining gas: 1039991.263 units remaining)
+  - location: 14 (remaining gas: 1039990.448 units remaining)
     [ "1970-01-01T00:00:00Z" ]
-  - location: 12 (remaining gas: 1039991.233 units remaining)
+  - location: 12 (remaining gas: 1039990.428 units remaining)
     [ "1970-01-01T00:03:20Z"
       "1970-01-01T00:00:00Z" ]
-  - location: 15 (remaining gas: 1039991.178 units remaining)
+  - location: 15 (remaining gas: 1039990.393 units remaining)
     [ 200 ]
-  - location: 16 (remaining gas: 1039991.163 units remaining)
+  - location: 16 (remaining gas: 1039990.383 units remaining)
     [ {}
       200 ]
-  - location: 18 (remaining gas: 1039991.148 units remaining)
+  - location: 18 (remaining gas: 1039990.373 units remaining)
     [ (Pair {} 200) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[diff_timestamps.tz-111-(Pair 0 0)-0].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[diff_timestamps.tz-111-(Pair 0 0)-0].out
index 2c0bbf81baf27b44fa984a7061acb78efbe3731e..60f9bedf457aeb3e730d6bda5678c9b5d42a25c0 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[diff_timestamps.tz-111-(Pair 0 0)-0].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[diff_timestamps.tz-111-(Pair 0 0)-0].out	
@@ -7,28 +7,28 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (remaining gas: 1039991.518 units remaining)
+  - location: 9 (remaining gas: 1039992.158 units remaining)
     [ (Pair (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:00Z") 111) ]
-  - location: 9 (remaining gas: 1039991.508 units remaining)
+  - location: 9 (remaining gas: 1039992.148 units remaining)
     [ (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:00Z") ]
-  - location: 10 (remaining gas: 1039991.498 units remaining)
+  - location: 10 (remaining gas: 1039992.138 units remaining)
     [ (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:00Z")
       (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:00Z") ]
-  - location: 11 (remaining gas: 1039991.488 units remaining)
+  - location: 11 (remaining gas: 1039992.128 units remaining)
     [ "1970-01-01T00:00:00Z"
       (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:00Z") ]
-  - location: 12 (remaining gas: 1039991.473 units remaining)
+  - location: 12 (remaining gas: 1039992.118 units remaining)
     [ (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:00Z") ]
-  - location: 14 (remaining gas: 1039991.463 units remaining)
+  - location: 14 (remaining gas: 1039992.108 units remaining)
     [ "1970-01-01T00:00:00Z" ]
-  - location: 12 (remaining gas: 1039991.433 units remaining)
+  - location: 12 (remaining gas: 1039992.088 units remaining)
     [ "1970-01-01T00:00:00Z"
       "1970-01-01T00:00:00Z" ]
-  - location: 15 (remaining gas: 1039991.378 units remaining)
+  - location: 15 (remaining gas: 1039992.053 units remaining)
     [ 0 ]
-  - location: 16 (remaining gas: 1039991.363 units remaining)
+  - location: 16 (remaining gas: 1039992.043 units remaining)
     [ {}
       0 ]
-  - location: 18 (remaining gas: 1039991.348 units remaining)
+  - location: 18 (remaining gas: 1039992.033 units remaining)
     [ (Pair {} 0) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[diff_timestamps.tz-111-(Pair 0 1)--1].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[diff_timestamps.tz-111-(Pair 0 1)--1].out
index 46c9387e6cabe6d903287f9da5a65aa514e76188..58f1a351f77744d82c82d75bad234ed3c12e0e61 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[diff_timestamps.tz-111-(Pair 0 1)--1].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[diff_timestamps.tz-111-(Pair 0 1)--1].out	
@@ -7,28 +7,28 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (remaining gas: 1039991.518 units remaining)
+  - location: 9 (remaining gas: 1039992.158 units remaining)
     [ (Pair (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:01Z") 111) ]
-  - location: 9 (remaining gas: 1039991.508 units remaining)
+  - location: 9 (remaining gas: 1039992.148 units remaining)
     [ (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:01Z") ]
-  - location: 10 (remaining gas: 1039991.498 units remaining)
+  - location: 10 (remaining gas: 1039992.138 units remaining)
     [ (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:01Z")
       (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:01Z") ]
-  - location: 11 (remaining gas: 1039991.488 units remaining)
+  - location: 11 (remaining gas: 1039992.128 units remaining)
     [ "1970-01-01T00:00:00Z"
       (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:01Z") ]
-  - location: 12 (remaining gas: 1039991.473 units remaining)
+  - location: 12 (remaining gas: 1039992.118 units remaining)
     [ (Pair "1970-01-01T00:00:00Z" "1970-01-01T00:00:01Z") ]
-  - location: 14 (remaining gas: 1039991.463 units remaining)
+  - location: 14 (remaining gas: 1039992.108 units remaining)
     [ "1970-01-01T00:00:01Z" ]
-  - location: 12 (remaining gas: 1039991.433 units remaining)
+  - location: 12 (remaining gas: 1039992.088 units remaining)
     [ "1970-01-01T00:00:00Z"
       "1970-01-01T00:00:01Z" ]
-  - location: 15 (remaining gas: 1039991.378 units remaining)
+  - location: 15 (remaining gas: 1039992.053 units remaining)
     [ -1 ]
-  - location: 16 (remaining gas: 1039991.363 units remaining)
+  - location: 16 (remaining gas: 1039992.043 units remaining)
     [ {}
       -1 ]
-  - location: 18 (remaining gas: 1039991.348 units remaining)
+  - location: 18 (remaining gas: 1039992.033 units remaining)
     [ (Pair {} -1) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[diff_timestamps.tz-111-(Pair 1 0)-1].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[diff_timestamps.tz-111-(Pair 1 0)-1].out
index 2fc1c7d6bc335f942e88958e1feca65ed3a415ea..1efe72851783e2e6fb1b4c197bb0390d6085cf83 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[diff_timestamps.tz-111-(Pair 1 0)-1].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[diff_timestamps.tz-111-(Pair 1 0)-1].out	
@@ -7,28 +7,28 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (remaining gas: 1039991.518 units remaining)
+  - location: 9 (remaining gas: 1039992.158 units remaining)
     [ (Pair (Pair "1970-01-01T00:00:01Z" "1970-01-01T00:00:00Z") 111) ]
-  - location: 9 (remaining gas: 1039991.508 units remaining)
+  - location: 9 (remaining gas: 1039992.148 units remaining)
     [ (Pair "1970-01-01T00:00:01Z" "1970-01-01T00:00:00Z") ]
-  - location: 10 (remaining gas: 1039991.498 units remaining)
+  - location: 10 (remaining gas: 1039992.138 units remaining)
     [ (Pair "1970-01-01T00:00:01Z" "1970-01-01T00:00:00Z")
       (Pair "1970-01-01T00:00:01Z" "1970-01-01T00:00:00Z") ]
-  - location: 11 (remaining gas: 1039991.488 units remaining)
+  - location: 11 (remaining gas: 1039992.128 units remaining)
     [ "1970-01-01T00:00:01Z"
       (Pair "1970-01-01T00:00:01Z" "1970-01-01T00:00:00Z") ]
-  - location: 12 (remaining gas: 1039991.473 units remaining)
+  - location: 12 (remaining gas: 1039992.118 units remaining)
     [ (Pair "1970-01-01T00:00:01Z" "1970-01-01T00:00:00Z") ]
-  - location: 14 (remaining gas: 1039991.463 units remaining)
+  - location: 14 (remaining gas: 1039992.108 units remaining)
     [ "1970-01-01T00:00:00Z" ]
-  - location: 12 (remaining gas: 1039991.433 units remaining)
+  - location: 12 (remaining gas: 1039992.088 units remaining)
     [ "1970-01-01T00:00:01Z"
       "1970-01-01T00:00:00Z" ]
-  - location: 15 (remaining gas: 1039991.378 units remaining)
+  - location: 15 (remaining gas: 1039992.053 units remaining)
     [ 1 ]
-  - location: 16 (remaining gas: 1039991.363 units remaining)
+  - location: 16 (remaining gas: 1039992.043 units remaining)
     [ {}
       1 ]
-  - location: 18 (remaining gas: 1039991.348 units remaining)
+  - location: 18 (remaining gas: 1039992.033 units remaining)
     [ (Pair {} 1) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dig_eq.tz-Unit-(Pair 17 (Pair 16 (Pair 15 (Pair 14 (Pai.2794d4782e.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dig_eq.tz-Unit-(Pair 17 (Pair 16 (Pair 15 (Pair 14 (Pai.2794d4782e.out
index c5a04f479be2de4b1b7fbfc57dc59f296e0392ff..2f638e4df92bb13f29668cd226a88bf1874db3b1 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dig_eq.tz-Unit-(Pair 17 (Pair 16 (Pair 15 (Pair 14 (Pai.2794d4782e.out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dig_eq.tz-Unit-(Pair 17 (Pair 16 (Pair 15 (Pair 14 (Pai.2794d4782e.out	
@@ -7,111 +7,111 @@ emitted operations
 big_map diff
   
 trace
-  - location: 24 (remaining gas: 1039868.717 units remaining)
+  - location: 24 (remaining gas: 1039874.637 units remaining)
     [ (Pair (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) Unit) ]
-  - location: 24 (remaining gas: 1039868.707 units remaining)
+  - location: 24 (remaining gas: 1039874.627 units remaining)
     [ (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 25 (remaining gas: 1039868.697 units remaining)
+  - location: 25 (remaining gas: 1039874.617 units remaining)
     [ (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 27 (remaining gas: 1039868.687 units remaining)
+  - location: 27 (remaining gas: 1039874.607 units remaining)
     [ 17
       (Pair 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 28 (remaining gas: 1039868.672 units remaining)
+  - location: 28 (remaining gas: 1039874.597 units remaining)
     [ (Pair 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 30 (remaining gas: 1039868.662 units remaining)
+  - location: 30 (remaining gas: 1039874.587 units remaining)
     [ 16
       (Pair 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 28 (remaining gas: 1039868.632 units remaining)
+  - location: 28 (remaining gas: 1039874.567 units remaining)
     [ 17
       16
       (Pair 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 31 (remaining gas: 1039868.584 units remaining)
+  - location: 31 (remaining gas: 1039874.532 units remaining)
     [ (Pair 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 34 (remaining gas: 1039868.574 units remaining)
+  - location: 34 (remaining gas: 1039874.522 units remaining)
     [ 15
       (Pair 14 13 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 31 (remaining gas: 1039868.549 units remaining)
+  - location: 31 (remaining gas: 1039874.502 units remaining)
     [ 16
       15
       (Pair 14 13 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 31 (remaining gas: 1039868.539 units remaining)
+  - location: 31 (remaining gas: 1039874.492 units remaining)
     [ 17
       16
       15
       (Pair 14 13 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 31 (remaining gas: 1039868.539 units remaining)
+  - location: 31 (remaining gas: 1039874.492 units remaining)
     [ 17
       16
       15
       (Pair 14 13 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 35 (remaining gas: 1039868.490 units remaining)
+  - location: 35 (remaining gas: 1039874.455 units remaining)
     [ (Pair 14 13 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 38 (remaining gas: 1039868.480 units remaining)
+  - location: 38 (remaining gas: 1039874.445 units remaining)
     [ 14
       (Pair 13 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 35 (remaining gas: 1039868.455 units remaining)
+  - location: 35 (remaining gas: 1039874.425 units remaining)
     [ 15
       14
       (Pair 13 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 35 (remaining gas: 1039868.445 units remaining)
+  - location: 35 (remaining gas: 1039874.415 units remaining)
     [ 16
       15
       14
       (Pair 13 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 35 (remaining gas: 1039868.435 units remaining)
+  - location: 35 (remaining gas: 1039874.405 units remaining)
     [ 17
       16
       15
       14
       (Pair 13 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 35 (remaining gas: 1039868.435 units remaining)
+  - location: 35 (remaining gas: 1039874.405 units remaining)
     [ 17
       16
       15
       14
       (Pair 13 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 39 (remaining gas: 1039868.384 units remaining)
+  - location: 39 (remaining gas: 1039874.365 units remaining)
     [ (Pair 13 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 42 (remaining gas: 1039868.374 units remaining)
+  - location: 42 (remaining gas: 1039874.355 units remaining)
     [ 13
       (Pair 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 39 (remaining gas: 1039868.349 units remaining)
+  - location: 39 (remaining gas: 1039874.335 units remaining)
     [ 14
       13
       (Pair 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 39 (remaining gas: 1039868.339 units remaining)
+  - location: 39 (remaining gas: 1039874.325 units remaining)
     [ 15
       14
       13
       (Pair 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 39 (remaining gas: 1039868.329 units remaining)
+  - location: 39 (remaining gas: 1039874.315 units remaining)
     [ 16
       15
       14
       13
       (Pair 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 39 (remaining gas: 1039868.319 units remaining)
+  - location: 39 (remaining gas: 1039874.305 units remaining)
     [ 17
       16
       15
@@ -119,7 +119,7 @@ trace
       13
       (Pair 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 39 (remaining gas: 1039868.319 units remaining)
+  - location: 39 (remaining gas: 1039874.305 units remaining)
     [ 17
       16
       15
@@ -127,32 +127,32 @@ trace
       13
       (Pair 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 43 (remaining gas: 1039868.267 units remaining)
+  - location: 43 (remaining gas: 1039874.263 units remaining)
     [ (Pair 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 46 (remaining gas: 1039868.257 units remaining)
+  - location: 46 (remaining gas: 1039874.253 units remaining)
     [ 12
       (Pair 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 43 (remaining gas: 1039868.232 units remaining)
+  - location: 43 (remaining gas: 1039874.233 units remaining)
     [ 13
       12
       (Pair 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 43 (remaining gas: 1039868.222 units remaining)
+  - location: 43 (remaining gas: 1039874.223 units remaining)
     [ 14
       13
       12
       (Pair 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 43 (remaining gas: 1039868.212 units remaining)
+  - location: 43 (remaining gas: 1039874.213 units remaining)
     [ 15
       14
       13
       12
       (Pair 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 43 (remaining gas: 1039868.202 units remaining)
+  - location: 43 (remaining gas: 1039874.203 units remaining)
     [ 16
       15
       14
@@ -160,7 +160,7 @@ trace
       12
       (Pair 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 43 (remaining gas: 1039868.192 units remaining)
+  - location: 43 (remaining gas: 1039874.193 units remaining)
     [ 17
       16
       15
@@ -169,7 +169,7 @@ trace
       12
       (Pair 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 43 (remaining gas: 1039868.192 units remaining)
+  - location: 43 (remaining gas: 1039874.193 units remaining)
     [ 17
       16
       15
@@ -178,32 +178,32 @@ trace
       12
       (Pair 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 47 (remaining gas: 1039868.138 units remaining)
+  - location: 47 (remaining gas: 1039874.148 units remaining)
     [ (Pair 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 50 (remaining gas: 1039868.128 units remaining)
+  - location: 50 (remaining gas: 1039874.138 units remaining)
     [ 11
       (Pair 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 47 (remaining gas: 1039868.103 units remaining)
+  - location: 47 (remaining gas: 1039874.118 units remaining)
     [ 12
       11
       (Pair 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 47 (remaining gas: 1039868.093 units remaining)
+  - location: 47 (remaining gas: 1039874.108 units remaining)
     [ 13
       12
       11
       (Pair 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 47 (remaining gas: 1039868.083 units remaining)
+  - location: 47 (remaining gas: 1039874.098 units remaining)
     [ 14
       13
       12
       11
       (Pair 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 47 (remaining gas: 1039868.073 units remaining)
+  - location: 47 (remaining gas: 1039874.088 units remaining)
     [ 15
       14
       13
@@ -211,7 +211,7 @@ trace
       11
       (Pair 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 47 (remaining gas: 1039868.063 units remaining)
+  - location: 47 (remaining gas: 1039874.078 units remaining)
     [ 16
       15
       14
@@ -220,7 +220,7 @@ trace
       11
       (Pair 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 47 (remaining gas: 1039868.053 units remaining)
+  - location: 47 (remaining gas: 1039874.068 units remaining)
     [ 17
       16
       15
@@ -230,7 +230,7 @@ trace
       11
       (Pair 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 47 (remaining gas: 1039868.053 units remaining)
+  - location: 47 (remaining gas: 1039874.068 units remaining)
     [ 17
       16
       15
@@ -240,32 +240,32 @@ trace
       11
       (Pair 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 51 (remaining gas: 1039867.998 units remaining)
+  - location: 51 (remaining gas: 1039874.021 units remaining)
     [ (Pair 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 54 (remaining gas: 1039867.988 units remaining)
+  - location: 54 (remaining gas: 1039874.011 units remaining)
     [ 10
       (Pair 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 51 (remaining gas: 1039867.963 units remaining)
+  - location: 51 (remaining gas: 1039873.991 units remaining)
     [ 11
       10
       (Pair 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 51 (remaining gas: 1039867.953 units remaining)
+  - location: 51 (remaining gas: 1039873.981 units remaining)
     [ 12
       11
       10
       (Pair 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 51 (remaining gas: 1039867.943 units remaining)
+  - location: 51 (remaining gas: 1039873.971 units remaining)
     [ 13
       12
       11
       10
       (Pair 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 51 (remaining gas: 1039867.933 units remaining)
+  - location: 51 (remaining gas: 1039873.961 units remaining)
     [ 14
       13
       12
@@ -273,7 +273,7 @@ trace
       10
       (Pair 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 51 (remaining gas: 1039867.923 units remaining)
+  - location: 51 (remaining gas: 1039873.951 units remaining)
     [ 15
       14
       13
@@ -282,7 +282,7 @@ trace
       10
       (Pair 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 51 (remaining gas: 1039867.913 units remaining)
+  - location: 51 (remaining gas: 1039873.941 units remaining)
     [ 16
       15
       14
@@ -292,7 +292,7 @@ trace
       10
       (Pair 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 51 (remaining gas: 1039867.903 units remaining)
+  - location: 51 (remaining gas: 1039873.931 units remaining)
     [ 17
       16
       15
@@ -303,7 +303,7 @@ trace
       10
       (Pair 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 51 (remaining gas: 1039867.903 units remaining)
+  - location: 51 (remaining gas: 1039873.931 units remaining)
     [ 17
       16
       15
@@ -314,32 +314,32 @@ trace
       10
       (Pair 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 55 (remaining gas: 1039867.845 units remaining)
+  - location: 55 (remaining gas: 1039873.880 units remaining)
     [ (Pair 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 58 (remaining gas: 1039867.835 units remaining)
+  - location: 58 (remaining gas: 1039873.870 units remaining)
     [ 9
       (Pair 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 55 (remaining gas: 1039867.810 units remaining)
+  - location: 55 (remaining gas: 1039873.850 units remaining)
     [ 10
       9
       (Pair 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 55 (remaining gas: 1039867.800 units remaining)
+  - location: 55 (remaining gas: 1039873.840 units remaining)
     [ 11
       10
       9
       (Pair 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 55 (remaining gas: 1039867.790 units remaining)
+  - location: 55 (remaining gas: 1039873.830 units remaining)
     [ 12
       11
       10
       9
       (Pair 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 55 (remaining gas: 1039867.780 units remaining)
+  - location: 55 (remaining gas: 1039873.820 units remaining)
     [ 13
       12
       11
@@ -347,7 +347,7 @@ trace
       9
       (Pair 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 55 (remaining gas: 1039867.770 units remaining)
+  - location: 55 (remaining gas: 1039873.810 units remaining)
     [ 14
       13
       12
@@ -356,7 +356,7 @@ trace
       9
       (Pair 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 55 (remaining gas: 1039867.760 units remaining)
+  - location: 55 (remaining gas: 1039873.800 units remaining)
     [ 15
       14
       13
@@ -366,7 +366,7 @@ trace
       9
       (Pair 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 55 (remaining gas: 1039867.750 units remaining)
+  - location: 55 (remaining gas: 1039873.790 units remaining)
     [ 16
       15
       14
@@ -377,7 +377,7 @@ trace
       9
       (Pair 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 55 (remaining gas: 1039867.740 units remaining)
+  - location: 55 (remaining gas: 1039873.780 units remaining)
     [ 17
       16
       15
@@ -389,7 +389,7 @@ trace
       9
       (Pair 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 55 (remaining gas: 1039867.740 units remaining)
+  - location: 55 (remaining gas: 1039873.780 units remaining)
     [ 17
       16
       15
@@ -401,32 +401,32 @@ trace
       9
       (Pair 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 59 (remaining gas: 1039867.681 units remaining)
+  - location: 59 (remaining gas: 1039873.727 units remaining)
     [ (Pair 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 62 (remaining gas: 1039867.671 units remaining)
+  - location: 62 (remaining gas: 1039873.717 units remaining)
     [ 8
       (Pair 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 59 (remaining gas: 1039867.646 units remaining)
+  - location: 59 (remaining gas: 1039873.697 units remaining)
     [ 9
       8
       (Pair 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 59 (remaining gas: 1039867.636 units remaining)
+  - location: 59 (remaining gas: 1039873.687 units remaining)
     [ 10
       9
       8
       (Pair 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 59 (remaining gas: 1039867.626 units remaining)
+  - location: 59 (remaining gas: 1039873.677 units remaining)
     [ 11
       10
       9
       8
       (Pair 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 59 (remaining gas: 1039867.616 units remaining)
+  - location: 59 (remaining gas: 1039873.667 units remaining)
     [ 12
       11
       10
@@ -434,7 +434,7 @@ trace
       8
       (Pair 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 59 (remaining gas: 1039867.606 units remaining)
+  - location: 59 (remaining gas: 1039873.657 units remaining)
     [ 13
       12
       11
@@ -443,7 +443,7 @@ trace
       8
       (Pair 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 59 (remaining gas: 1039867.596 units remaining)
+  - location: 59 (remaining gas: 1039873.647 units remaining)
     [ 14
       13
       12
@@ -453,7 +453,7 @@ trace
       8
       (Pair 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 59 (remaining gas: 1039867.586 units remaining)
+  - location: 59 (remaining gas: 1039873.637 units remaining)
     [ 15
       14
       13
@@ -464,7 +464,7 @@ trace
       8
       (Pair 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 59 (remaining gas: 1039867.576 units remaining)
+  - location: 59 (remaining gas: 1039873.627 units remaining)
     [ 16
       15
       14
@@ -476,7 +476,7 @@ trace
       8
       (Pair 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 59 (remaining gas: 1039867.566 units remaining)
+  - location: 59 (remaining gas: 1039873.617 units remaining)
     [ 17
       16
       15
@@ -489,7 +489,7 @@ trace
       8
       (Pair 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 59 (remaining gas: 1039867.566 units remaining)
+  - location: 59 (remaining gas: 1039873.617 units remaining)
     [ 17
       16
       15
@@ -502,32 +502,32 @@ trace
       8
       (Pair 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 63 (remaining gas: 1039867.505 units remaining)
+  - location: 63 (remaining gas: 1039873.561 units remaining)
     [ (Pair 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 66 (remaining gas: 1039867.495 units remaining)
+  - location: 66 (remaining gas: 1039873.551 units remaining)
     [ 7
       (Pair 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 63 (remaining gas: 1039867.470 units remaining)
+  - location: 63 (remaining gas: 1039873.531 units remaining)
     [ 8
       7
       (Pair 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 63 (remaining gas: 1039867.460 units remaining)
+  - location: 63 (remaining gas: 1039873.521 units remaining)
     [ 9
       8
       7
       (Pair 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 63 (remaining gas: 1039867.450 units remaining)
+  - location: 63 (remaining gas: 1039873.511 units remaining)
     [ 10
       9
       8
       7
       (Pair 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 63 (remaining gas: 1039867.440 units remaining)
+  - location: 63 (remaining gas: 1039873.501 units remaining)
     [ 11
       10
       9
@@ -535,7 +535,7 @@ trace
       7
       (Pair 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 63 (remaining gas: 1039867.430 units remaining)
+  - location: 63 (remaining gas: 1039873.491 units remaining)
     [ 12
       11
       10
@@ -544,7 +544,7 @@ trace
       7
       (Pair 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 63 (remaining gas: 1039867.420 units remaining)
+  - location: 63 (remaining gas: 1039873.481 units remaining)
     [ 13
       12
       11
@@ -554,7 +554,7 @@ trace
       7
       (Pair 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 63 (remaining gas: 1039867.410 units remaining)
+  - location: 63 (remaining gas: 1039873.471 units remaining)
     [ 14
       13
       12
@@ -565,7 +565,7 @@ trace
       7
       (Pair 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 63 (remaining gas: 1039867.400 units remaining)
+  - location: 63 (remaining gas: 1039873.461 units remaining)
     [ 15
       14
       13
@@ -577,7 +577,7 @@ trace
       7
       (Pair 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 63 (remaining gas: 1039867.390 units remaining)
+  - location: 63 (remaining gas: 1039873.451 units remaining)
     [ 16
       15
       14
@@ -590,7 +590,7 @@ trace
       7
       (Pair 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 63 (remaining gas: 1039867.380 units remaining)
+  - location: 63 (remaining gas: 1039873.441 units remaining)
     [ 17
       16
       15
@@ -604,7 +604,7 @@ trace
       7
       (Pair 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 63 (remaining gas: 1039867.380 units remaining)
+  - location: 63 (remaining gas: 1039873.441 units remaining)
     [ 17
       16
       15
@@ -618,32 +618,32 @@ trace
       7
       (Pair 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 67 (remaining gas: 1039867.318 units remaining)
+  - location: 67 (remaining gas: 1039873.383 units remaining)
     [ (Pair 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 70 (remaining gas: 1039867.308 units remaining)
+  - location: 70 (remaining gas: 1039873.373 units remaining)
     [ 6
       (Pair 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 67 (remaining gas: 1039867.283 units remaining)
+  - location: 67 (remaining gas: 1039873.353 units remaining)
     [ 7
       6
       (Pair 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 67 (remaining gas: 1039867.273 units remaining)
+  - location: 67 (remaining gas: 1039873.343 units remaining)
     [ 8
       7
       6
       (Pair 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 67 (remaining gas: 1039867.263 units remaining)
+  - location: 67 (remaining gas: 1039873.333 units remaining)
     [ 9
       8
       7
       6
       (Pair 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 67 (remaining gas: 1039867.253 units remaining)
+  - location: 67 (remaining gas: 1039873.323 units remaining)
     [ 10
       9
       8
@@ -651,7 +651,7 @@ trace
       6
       (Pair 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 67 (remaining gas: 1039867.243 units remaining)
+  - location: 67 (remaining gas: 1039873.313 units remaining)
     [ 11
       10
       9
@@ -660,7 +660,7 @@ trace
       6
       (Pair 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 67 (remaining gas: 1039867.233 units remaining)
+  - location: 67 (remaining gas: 1039873.303 units remaining)
     [ 12
       11
       10
@@ -670,7 +670,7 @@ trace
       6
       (Pair 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 67 (remaining gas: 1039867.223 units remaining)
+  - location: 67 (remaining gas: 1039873.293 units remaining)
     [ 13
       12
       11
@@ -681,7 +681,7 @@ trace
       6
       (Pair 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 67 (remaining gas: 1039867.213 units remaining)
+  - location: 67 (remaining gas: 1039873.283 units remaining)
     [ 14
       13
       12
@@ -693,7 +693,7 @@ trace
       6
       (Pair 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 67 (remaining gas: 1039867.203 units remaining)
+  - location: 67 (remaining gas: 1039873.273 units remaining)
     [ 15
       14
       13
@@ -706,7 +706,7 @@ trace
       6
       (Pair 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 67 (remaining gas: 1039867.193 units remaining)
+  - location: 67 (remaining gas: 1039873.263 units remaining)
     [ 16
       15
       14
@@ -720,7 +720,7 @@ trace
       6
       (Pair 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 67 (remaining gas: 1039867.183 units remaining)
+  - location: 67 (remaining gas: 1039873.253 units remaining)
     [ 17
       16
       15
@@ -735,7 +735,7 @@ trace
       6
       (Pair 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 67 (remaining gas: 1039867.183 units remaining)
+  - location: 67 (remaining gas: 1039873.253 units remaining)
     [ 17
       16
       15
@@ -750,32 +750,32 @@ trace
       6
       (Pair 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 71 (remaining gas: 1039867.119 units remaining)
+  - location: 71 (remaining gas: 1039873.192 units remaining)
     [ (Pair 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 74 (remaining gas: 1039867.109 units remaining)
+  - location: 74 (remaining gas: 1039873.182 units remaining)
     [ 5
       (Pair 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 71 (remaining gas: 1039867.084 units remaining)
+  - location: 71 (remaining gas: 1039873.162 units remaining)
     [ 6
       5
       (Pair 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 71 (remaining gas: 1039867.074 units remaining)
+  - location: 71 (remaining gas: 1039873.152 units remaining)
     [ 7
       6
       5
       (Pair 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 71 (remaining gas: 1039867.064 units remaining)
+  - location: 71 (remaining gas: 1039873.142 units remaining)
     [ 8
       7
       6
       5
       (Pair 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 71 (remaining gas: 1039867.054 units remaining)
+  - location: 71 (remaining gas: 1039873.132 units remaining)
     [ 9
       8
       7
@@ -783,7 +783,7 @@ trace
       5
       (Pair 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 71 (remaining gas: 1039867.044 units remaining)
+  - location: 71 (remaining gas: 1039873.122 units remaining)
     [ 10
       9
       8
@@ -792,7 +792,7 @@ trace
       5
       (Pair 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 71 (remaining gas: 1039867.034 units remaining)
+  - location: 71 (remaining gas: 1039873.112 units remaining)
     [ 11
       10
       9
@@ -802,7 +802,7 @@ trace
       5
       (Pair 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 71 (remaining gas: 1039867.024 units remaining)
+  - location: 71 (remaining gas: 1039873.102 units remaining)
     [ 12
       11
       10
@@ -813,7 +813,7 @@ trace
       5
       (Pair 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 71 (remaining gas: 1039867.014 units remaining)
+  - location: 71 (remaining gas: 1039873.092 units remaining)
     [ 13
       12
       11
@@ -825,7 +825,7 @@ trace
       5
       (Pair 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 71 (remaining gas: 1039867.004 units remaining)
+  - location: 71 (remaining gas: 1039873.082 units remaining)
     [ 14
       13
       12
@@ -838,7 +838,7 @@ trace
       5
       (Pair 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 71 (remaining gas: 1039866.994 units remaining)
+  - location: 71 (remaining gas: 1039873.072 units remaining)
     [ 15
       14
       13
@@ -852,7 +852,7 @@ trace
       5
       (Pair 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 71 (remaining gas: 1039866.984 units remaining)
+  - location: 71 (remaining gas: 1039873.062 units remaining)
     [ 16
       15
       14
@@ -867,7 +867,7 @@ trace
       5
       (Pair 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 71 (remaining gas: 1039866.974 units remaining)
+  - location: 71 (remaining gas: 1039873.052 units remaining)
     [ 17
       16
       15
@@ -883,7 +883,7 @@ trace
       5
       (Pair 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 71 (remaining gas: 1039866.974 units remaining)
+  - location: 71 (remaining gas: 1039873.052 units remaining)
     [ 17
       16
       15
@@ -899,32 +899,32 @@ trace
       5
       (Pair 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 75 (remaining gas: 1039866.909 units remaining)
+  - location: 75 (remaining gas: 1039872.989 units remaining)
     [ (Pair 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 78 (remaining gas: 1039866.899 units remaining)
+  - location: 78 (remaining gas: 1039872.979 units remaining)
     [ 4
       (Pair 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 75 (remaining gas: 1039866.874 units remaining)
+  - location: 75 (remaining gas: 1039872.959 units remaining)
     [ 5
       4
       (Pair 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 75 (remaining gas: 1039866.864 units remaining)
+  - location: 75 (remaining gas: 1039872.949 units remaining)
     [ 6
       5
       4
       (Pair 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 75 (remaining gas: 1039866.854 units remaining)
+  - location: 75 (remaining gas: 1039872.939 units remaining)
     [ 7
       6
       5
       4
       (Pair 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 75 (remaining gas: 1039866.844 units remaining)
+  - location: 75 (remaining gas: 1039872.929 units remaining)
     [ 8
       7
       6
@@ -932,7 +932,7 @@ trace
       4
       (Pair 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 75 (remaining gas: 1039866.834 units remaining)
+  - location: 75 (remaining gas: 1039872.919 units remaining)
     [ 9
       8
       7
@@ -941,7 +941,7 @@ trace
       4
       (Pair 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 75 (remaining gas: 1039866.824 units remaining)
+  - location: 75 (remaining gas: 1039872.909 units remaining)
     [ 10
       9
       8
@@ -951,7 +951,7 @@ trace
       4
       (Pair 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 75 (remaining gas: 1039866.814 units remaining)
+  - location: 75 (remaining gas: 1039872.899 units remaining)
     [ 11
       10
       9
@@ -962,7 +962,7 @@ trace
       4
       (Pair 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 75 (remaining gas: 1039866.804 units remaining)
+  - location: 75 (remaining gas: 1039872.889 units remaining)
     [ 12
       11
       10
@@ -974,7 +974,7 @@ trace
       4
       (Pair 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 75 (remaining gas: 1039866.794 units remaining)
+  - location: 75 (remaining gas: 1039872.879 units remaining)
     [ 13
       12
       11
@@ -987,7 +987,7 @@ trace
       4
       (Pair 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 75 (remaining gas: 1039866.784 units remaining)
+  - location: 75 (remaining gas: 1039872.869 units remaining)
     [ 14
       13
       12
@@ -1001,7 +1001,7 @@ trace
       4
       (Pair 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 75 (remaining gas: 1039866.774 units remaining)
+  - location: 75 (remaining gas: 1039872.859 units remaining)
     [ 15
       14
       13
@@ -1016,7 +1016,7 @@ trace
       4
       (Pair 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 75 (remaining gas: 1039866.764 units remaining)
+  - location: 75 (remaining gas: 1039872.849 units remaining)
     [ 16
       15
       14
@@ -1032,7 +1032,7 @@ trace
       4
       (Pair 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 75 (remaining gas: 1039866.754 units remaining)
+  - location: 75 (remaining gas: 1039872.839 units remaining)
     [ 17
       16
       15
@@ -1049,7 +1049,7 @@ trace
       4
       (Pair 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 75 (remaining gas: 1039866.754 units remaining)
+  - location: 75 (remaining gas: 1039872.839 units remaining)
     [ 17
       16
       15
@@ -1066,32 +1066,32 @@ trace
       4
       (Pair 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 79 (remaining gas: 1039866.687 units remaining)
+  - location: 79 (remaining gas: 1039872.773 units remaining)
     [ (Pair 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 82 (remaining gas: 1039866.677 units remaining)
+  - location: 82 (remaining gas: 1039872.763 units remaining)
     [ 3
       (Pair 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 79 (remaining gas: 1039866.652 units remaining)
+  - location: 79 (remaining gas: 1039872.743 units remaining)
     [ 4
       3
       (Pair 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 79 (remaining gas: 1039866.642 units remaining)
+  - location: 79 (remaining gas: 1039872.733 units remaining)
     [ 5
       4
       3
       (Pair 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 79 (remaining gas: 1039866.632 units remaining)
+  - location: 79 (remaining gas: 1039872.723 units remaining)
     [ 6
       5
       4
       3
       (Pair 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 79 (remaining gas: 1039866.622 units remaining)
+  - location: 79 (remaining gas: 1039872.713 units remaining)
     [ 7
       6
       5
@@ -1099,7 +1099,7 @@ trace
       3
       (Pair 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 79 (remaining gas: 1039866.612 units remaining)
+  - location: 79 (remaining gas: 1039872.703 units remaining)
     [ 8
       7
       6
@@ -1108,7 +1108,7 @@ trace
       3
       (Pair 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 79 (remaining gas: 1039866.602 units remaining)
+  - location: 79 (remaining gas: 1039872.693 units remaining)
     [ 9
       8
       7
@@ -1118,7 +1118,7 @@ trace
       3
       (Pair 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 79 (remaining gas: 1039866.592 units remaining)
+  - location: 79 (remaining gas: 1039872.683 units remaining)
     [ 10
       9
       8
@@ -1129,7 +1129,7 @@ trace
       3
       (Pair 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 79 (remaining gas: 1039866.582 units remaining)
+  - location: 79 (remaining gas: 1039872.673 units remaining)
     [ 11
       10
       9
@@ -1141,7 +1141,7 @@ trace
       3
       (Pair 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 79 (remaining gas: 1039866.572 units remaining)
+  - location: 79 (remaining gas: 1039872.663 units remaining)
     [ 12
       11
       10
@@ -1154,7 +1154,7 @@ trace
       3
       (Pair 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 79 (remaining gas: 1039866.562 units remaining)
+  - location: 79 (remaining gas: 1039872.653 units remaining)
     [ 13
       12
       11
@@ -1168,7 +1168,7 @@ trace
       3
       (Pair 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 79 (remaining gas: 1039866.552 units remaining)
+  - location: 79 (remaining gas: 1039872.643 units remaining)
     [ 14
       13
       12
@@ -1183,7 +1183,7 @@ trace
       3
       (Pair 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 79 (remaining gas: 1039866.542 units remaining)
+  - location: 79 (remaining gas: 1039872.633 units remaining)
     [ 15
       14
       13
@@ -1199,7 +1199,7 @@ trace
       3
       (Pair 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 79 (remaining gas: 1039866.532 units remaining)
+  - location: 79 (remaining gas: 1039872.623 units remaining)
     [ 16
       15
       14
@@ -1216,7 +1216,7 @@ trace
       3
       (Pair 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 79 (remaining gas: 1039866.522 units remaining)
+  - location: 79 (remaining gas: 1039872.613 units remaining)
     [ 17
       16
       15
@@ -1234,7 +1234,7 @@ trace
       3
       (Pair 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 79 (remaining gas: 1039866.522 units remaining)
+  - location: 79 (remaining gas: 1039872.613 units remaining)
     [ 17
       16
       15
@@ -1252,32 +1252,32 @@ trace
       3
       (Pair 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 83 (remaining gas: 1039866.454 units remaining)
+  - location: 83 (remaining gas: 1039872.545 units remaining)
     [ (Pair 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 86 (remaining gas: 1039866.444 units remaining)
+  - location: 86 (remaining gas: 1039872.535 units remaining)
     [ 2
       1
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 83 (remaining gas: 1039866.419 units remaining)
+  - location: 83 (remaining gas: 1039872.515 units remaining)
     [ 3
       2
       1
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 83 (remaining gas: 1039866.409 units remaining)
+  - location: 83 (remaining gas: 1039872.505 units remaining)
     [ 4
       3
       2
       1
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 83 (remaining gas: 1039866.399 units remaining)
+  - location: 83 (remaining gas: 1039872.495 units remaining)
     [ 5
       4
       3
       2
       1
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 83 (remaining gas: 1039866.389 units remaining)
+  - location: 83 (remaining gas: 1039872.485 units remaining)
     [ 6
       5
       4
@@ -1285,7 +1285,7 @@ trace
       2
       1
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 83 (remaining gas: 1039866.379 units remaining)
+  - location: 83 (remaining gas: 1039872.475 units remaining)
     [ 7
       6
       5
@@ -1294,7 +1294,7 @@ trace
       2
       1
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 83 (remaining gas: 1039866.369 units remaining)
+  - location: 83 (remaining gas: 1039872.465 units remaining)
     [ 8
       7
       6
@@ -1304,7 +1304,7 @@ trace
       2
       1
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 83 (remaining gas: 1039866.359 units remaining)
+  - location: 83 (remaining gas: 1039872.455 units remaining)
     [ 9
       8
       7
@@ -1315,7 +1315,7 @@ trace
       2
       1
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 83 (remaining gas: 1039866.349 units remaining)
+  - location: 83 (remaining gas: 1039872.445 units remaining)
     [ 10
       9
       8
@@ -1327,7 +1327,7 @@ trace
       2
       1
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 83 (remaining gas: 1039866.339 units remaining)
+  - location: 83 (remaining gas: 1039872.435 units remaining)
     [ 11
       10
       9
@@ -1340,7 +1340,7 @@ trace
       2
       1
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 83 (remaining gas: 1039866.329 units remaining)
+  - location: 83 (remaining gas: 1039872.425 units remaining)
     [ 12
       11
       10
@@ -1354,7 +1354,7 @@ trace
       2
       1
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 83 (remaining gas: 1039866.319 units remaining)
+  - location: 83 (remaining gas: 1039872.415 units remaining)
     [ 13
       12
       11
@@ -1369,7 +1369,7 @@ trace
       2
       1
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 83 (remaining gas: 1039866.309 units remaining)
+  - location: 83 (remaining gas: 1039872.405 units remaining)
     [ 14
       13
       12
@@ -1385,7 +1385,7 @@ trace
       2
       1
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 83 (remaining gas: 1039866.299 units remaining)
+  - location: 83 (remaining gas: 1039872.395 units remaining)
     [ 15
       14
       13
@@ -1402,7 +1402,7 @@ trace
       2
       1
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 83 (remaining gas: 1039866.289 units remaining)
+  - location: 83 (remaining gas: 1039872.385 units remaining)
     [ 16
       15
       14
@@ -1420,7 +1420,7 @@ trace
       2
       1
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 83 (remaining gas: 1039866.279 units remaining)
+  - location: 83 (remaining gas: 1039872.375 units remaining)
     [ 17
       16
       15
@@ -1439,7 +1439,7 @@ trace
       2
       1
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 83 (remaining gas: 1039866.279 units remaining)
+  - location: 83 (remaining gas: 1039872.375 units remaining)
     [ 17
       16
       15
@@ -1458,7 +1458,7 @@ trace
       2
       1
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 87 (remaining gas: 1039866.219 units remaining)
+  - location: 87 (remaining gas: 1039872.345 units remaining)
     [ 17
       16
       15
@@ -1477,7 +1477,7 @@ trace
       2
       1
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 89 (remaining gas: 1039866.153 units remaining)
+  - location: 89 (remaining gas: 1039872.309 units remaining)
     [ 16
       17
       15
@@ -1496,7 +1496,7 @@ trace
       2
       1
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 91 (remaining gas: 1039866.080 units remaining)
+  - location: 91 (remaining gas: 1039872.266 units remaining)
     [ 15
       16
       17
@@ -1515,7 +1515,7 @@ trace
       2
       1
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 93 (remaining gas: 1039866.001 units remaining)
+  - location: 93 (remaining gas: 1039872.217 units remaining)
     [ 14
       15
       16
@@ -1534,7 +1534,7 @@ trace
       2
       1
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 95 (remaining gas: 1039865.914 units remaining)
+  - location: 95 (remaining gas: 1039872.160 units remaining)
     [ 13
       14
       15
@@ -1553,7 +1553,7 @@ trace
       2
       1
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 97 (remaining gas: 1039865.821 units remaining)
+  - location: 97 (remaining gas: 1039872.097 units remaining)
     [ 12
       13
       14
@@ -1572,7 +1572,7 @@ trace
       2
       1
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 99 (remaining gas: 1039865.721 units remaining)
+  - location: 99 (remaining gas: 1039872.027 units remaining)
     [ 11
       12
       13
@@ -1591,7 +1591,7 @@ trace
       2
       1
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 101 (remaining gas: 1039865.615 units remaining)
+  - location: 101 (remaining gas: 1039871.951 units remaining)
     [ 10
       11
       12
@@ -1610,7 +1610,7 @@ trace
       2
       1
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 103 (remaining gas: 1039865.501 units remaining)
+  - location: 103 (remaining gas: 1039871.867 units remaining)
     [ 9
       10
       11
@@ -1629,7 +1629,7 @@ trace
       2
       1
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 105 (remaining gas: 1039865.381 units remaining)
+  - location: 105 (remaining gas: 1039871.777 units remaining)
     [ 8
       9
       10
@@ -1648,7 +1648,7 @@ trace
       2
       1
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 107 (remaining gas: 1039865.254 units remaining)
+  - location: 107 (remaining gas: 1039871.680 units remaining)
     [ 7
       8
       9
@@ -1667,7 +1667,7 @@ trace
       2
       1
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 109 (remaining gas: 1039865.121 units remaining)
+  - location: 109 (remaining gas: 1039871.577 units remaining)
     [ 6
       7
       8
@@ -1686,7 +1686,7 @@ trace
       2
       1
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 111 (remaining gas: 1039864.980 units remaining)
+  - location: 111 (remaining gas: 1039871.466 units remaining)
     [ 5
       6
       7
@@ -1705,7 +1705,7 @@ trace
       2
       1
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 113 (remaining gas: 1039864.833 units remaining)
+  - location: 113 (remaining gas: 1039871.349 units remaining)
     [ 4
       5
       6
@@ -1724,7 +1724,7 @@ trace
       2
       1
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 115 (remaining gas: 1039864.679 units remaining)
+  - location: 115 (remaining gas: 1039871.225 units remaining)
     [ 3
       4
       5
@@ -1743,7 +1743,7 @@ trace
       2
       1
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 117 (remaining gas: 1039864.519 units remaining)
+  - location: 117 (remaining gas: 1039871.095 units remaining)
     [ 2
       3
       4
@@ -1762,7 +1762,7 @@ trace
       17
       1
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 119 (remaining gas: 1039864.351 units remaining)
+  - location: 119 (remaining gas: 1039870.957 units remaining)
     [ 1
       2
       3
@@ -1781,7 +1781,7 @@ trace
       16
       17
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 121 (remaining gas: 1039864.291 units remaining)
+  - location: 121 (remaining gas: 1039870.927 units remaining)
     [ 1
       2
       3
@@ -1800,7 +1800,7 @@ trace
       16
       17
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 123 (remaining gas: 1039864.225 units remaining)
+  - location: 123 (remaining gas: 1039870.891 units remaining)
     [ 2
       1
       3
@@ -1819,7 +1819,7 @@ trace
       16
       17
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 125 (remaining gas: 1039864.152 units remaining)
+  - location: 125 (remaining gas: 1039870.848 units remaining)
     [ 3
       2
       1
@@ -1838,7 +1838,7 @@ trace
       16
       17
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 127 (remaining gas: 1039864.073 units remaining)
+  - location: 127 (remaining gas: 1039870.799 units remaining)
     [ 4
       3
       2
@@ -1857,7 +1857,7 @@ trace
       16
       17
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 129 (remaining gas: 1039863.986 units remaining)
+  - location: 129 (remaining gas: 1039870.742 units remaining)
     [ 5
       4
       3
@@ -1876,7 +1876,7 @@ trace
       16
       17
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 131 (remaining gas: 1039863.893 units remaining)
+  - location: 131 (remaining gas: 1039870.679 units remaining)
     [ 6
       5
       4
@@ -1895,7 +1895,7 @@ trace
       16
       17
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 133 (remaining gas: 1039863.793 units remaining)
+  - location: 133 (remaining gas: 1039870.609 units remaining)
     [ 7
       6
       5
@@ -1914,7 +1914,7 @@ trace
       16
       17
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 135 (remaining gas: 1039863.687 units remaining)
+  - location: 135 (remaining gas: 1039870.533 units remaining)
     [ 8
       7
       6
@@ -1933,7 +1933,7 @@ trace
       16
       17
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 137 (remaining gas: 1039863.573 units remaining)
+  - location: 137 (remaining gas: 1039870.449 units remaining)
     [ 9
       8
       7
@@ -1952,7 +1952,7 @@ trace
       16
       17
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 139 (remaining gas: 1039863.453 units remaining)
+  - location: 139 (remaining gas: 1039870.359 units remaining)
     [ 10
       9
       8
@@ -1971,7 +1971,7 @@ trace
       16
       17
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 141 (remaining gas: 1039863.326 units remaining)
+  - location: 141 (remaining gas: 1039870.262 units remaining)
     [ 11
       10
       9
@@ -1990,7 +1990,7 @@ trace
       16
       17
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 143 (remaining gas: 1039863.193 units remaining)
+  - location: 143 (remaining gas: 1039870.159 units remaining)
     [ 12
       11
       10
@@ -2009,7 +2009,7 @@ trace
       16
       17
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 145 (remaining gas: 1039863.052 units remaining)
+  - location: 145 (remaining gas: 1039870.048 units remaining)
     [ 13
       12
       11
@@ -2028,7 +2028,7 @@ trace
       16
       17
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 147 (remaining gas: 1039862.905 units remaining)
+  - location: 147 (remaining gas: 1039869.931 units remaining)
     [ 14
       13
       12
@@ -2047,7 +2047,7 @@ trace
       16
       17
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 149 (remaining gas: 1039862.751 units remaining)
+  - location: 149 (remaining gas: 1039869.807 units remaining)
     [ 15
       14
       13
@@ -2066,7 +2066,7 @@ trace
       16
       17
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 151 (remaining gas: 1039862.591 units remaining)
+  - location: 151 (remaining gas: 1039869.677 units remaining)
     [ 16
       15
       14
@@ -2085,7 +2085,7 @@ trace
       1
       17
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 153 (remaining gas: 1039862.423 units remaining)
+  - location: 153 (remaining gas: 1039869.539 units remaining)
     [ 17
       16
       15
@@ -2104,36 +2104,36 @@ trace
       2
       1
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 156 (remaining gas: 1039862.355 units remaining)
+  - location: 156 (remaining gas: 1039869.471 units remaining)
     [ 2
       1
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 159 (remaining gas: 1039862.340 units remaining)
+  - location: 159 (remaining gas: 1039869.461 units remaining)
     [ (Pair 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 156 (remaining gas: 1039862.315 units remaining)
+  - location: 156 (remaining gas: 1039869.441 units remaining)
     [ 3
       (Pair 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 156 (remaining gas: 1039862.305 units remaining)
+  - location: 156 (remaining gas: 1039869.431 units remaining)
     [ 4
       3
       (Pair 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 156 (remaining gas: 1039862.295 units remaining)
+  - location: 156 (remaining gas: 1039869.421 units remaining)
     [ 5
       4
       3
       (Pair 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 156 (remaining gas: 1039862.285 units remaining)
+  - location: 156 (remaining gas: 1039869.411 units remaining)
     [ 6
       5
       4
       3
       (Pair 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 156 (remaining gas: 1039862.275 units remaining)
+  - location: 156 (remaining gas: 1039869.401 units remaining)
     [ 7
       6
       5
@@ -2141,7 +2141,7 @@ trace
       3
       (Pair 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 156 (remaining gas: 1039862.265 units remaining)
+  - location: 156 (remaining gas: 1039869.391 units remaining)
     [ 8
       7
       6
@@ -2150,7 +2150,7 @@ trace
       3
       (Pair 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 156 (remaining gas: 1039862.255 units remaining)
+  - location: 156 (remaining gas: 1039869.381 units remaining)
     [ 9
       8
       7
@@ -2160,7 +2160,7 @@ trace
       3
       (Pair 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 156 (remaining gas: 1039862.245 units remaining)
+  - location: 156 (remaining gas: 1039869.371 units remaining)
     [ 10
       9
       8
@@ -2171,7 +2171,7 @@ trace
       3
       (Pair 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 156 (remaining gas: 1039862.235 units remaining)
+  - location: 156 (remaining gas: 1039869.361 units remaining)
     [ 11
       10
       9
@@ -2183,7 +2183,7 @@ trace
       3
       (Pair 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 156 (remaining gas: 1039862.225 units remaining)
+  - location: 156 (remaining gas: 1039869.351 units remaining)
     [ 12
       11
       10
@@ -2196,7 +2196,7 @@ trace
       3
       (Pair 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 156 (remaining gas: 1039862.215 units remaining)
+  - location: 156 (remaining gas: 1039869.341 units remaining)
     [ 13
       12
       11
@@ -2210,7 +2210,7 @@ trace
       3
       (Pair 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 156 (remaining gas: 1039862.205 units remaining)
+  - location: 156 (remaining gas: 1039869.331 units remaining)
     [ 14
       13
       12
@@ -2225,7 +2225,7 @@ trace
       3
       (Pair 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 156 (remaining gas: 1039862.195 units remaining)
+  - location: 156 (remaining gas: 1039869.321 units remaining)
     [ 15
       14
       13
@@ -2241,7 +2241,7 @@ trace
       3
       (Pair 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 156 (remaining gas: 1039862.185 units remaining)
+  - location: 156 (remaining gas: 1039869.311 units remaining)
     [ 16
       15
       14
@@ -2258,7 +2258,7 @@ trace
       3
       (Pair 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 156 (remaining gas: 1039862.175 units remaining)
+  - location: 156 (remaining gas: 1039869.301 units remaining)
     [ 17
       16
       15
@@ -2276,7 +2276,7 @@ trace
       3
       (Pair 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 156 (remaining gas: 1039862.175 units remaining)
+  - location: 156 (remaining gas: 1039869.301 units remaining)
     [ 17
       16
       15
@@ -2294,36 +2294,36 @@ trace
       3
       (Pair 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 160 (remaining gas: 1039862.108 units remaining)
+  - location: 160 (remaining gas: 1039869.235 units remaining)
     [ 3
       (Pair 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 163 (remaining gas: 1039862.093 units remaining)
+  - location: 163 (remaining gas: 1039869.225 units remaining)
     [ (Pair 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 160 (remaining gas: 1039862.068 units remaining)
+  - location: 160 (remaining gas: 1039869.205 units remaining)
     [ 4
       (Pair 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 160 (remaining gas: 1039862.058 units remaining)
+  - location: 160 (remaining gas: 1039869.195 units remaining)
     [ 5
       4
       (Pair 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 160 (remaining gas: 1039862.048 units remaining)
+  - location: 160 (remaining gas: 1039869.185 units remaining)
     [ 6
       5
       4
       (Pair 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 160 (remaining gas: 1039862.038 units remaining)
+  - location: 160 (remaining gas: 1039869.175 units remaining)
     [ 7
       6
       5
       4
       (Pair 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 160 (remaining gas: 1039862.028 units remaining)
+  - location: 160 (remaining gas: 1039869.165 units remaining)
     [ 8
       7
       6
@@ -2331,7 +2331,7 @@ trace
       4
       (Pair 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 160 (remaining gas: 1039862.018 units remaining)
+  - location: 160 (remaining gas: 1039869.155 units remaining)
     [ 9
       8
       7
@@ -2340,7 +2340,7 @@ trace
       4
       (Pair 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 160 (remaining gas: 1039862.008 units remaining)
+  - location: 160 (remaining gas: 1039869.145 units remaining)
     [ 10
       9
       8
@@ -2350,7 +2350,7 @@ trace
       4
       (Pair 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 160 (remaining gas: 1039861.998 units remaining)
+  - location: 160 (remaining gas: 1039869.135 units remaining)
     [ 11
       10
       9
@@ -2361,7 +2361,7 @@ trace
       4
       (Pair 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 160 (remaining gas: 1039861.988 units remaining)
+  - location: 160 (remaining gas: 1039869.125 units remaining)
     [ 12
       11
       10
@@ -2373,7 +2373,7 @@ trace
       4
       (Pair 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 160 (remaining gas: 1039861.978 units remaining)
+  - location: 160 (remaining gas: 1039869.115 units remaining)
     [ 13
       12
       11
@@ -2386,7 +2386,7 @@ trace
       4
       (Pair 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 160 (remaining gas: 1039861.968 units remaining)
+  - location: 160 (remaining gas: 1039869.105 units remaining)
     [ 14
       13
       12
@@ -2400,7 +2400,7 @@ trace
       4
       (Pair 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 160 (remaining gas: 1039861.958 units remaining)
+  - location: 160 (remaining gas: 1039869.095 units remaining)
     [ 15
       14
       13
@@ -2415,7 +2415,7 @@ trace
       4
       (Pair 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 160 (remaining gas: 1039861.948 units remaining)
+  - location: 160 (remaining gas: 1039869.085 units remaining)
     [ 16
       15
       14
@@ -2431,7 +2431,7 @@ trace
       4
       (Pair 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 160 (remaining gas: 1039861.938 units remaining)
+  - location: 160 (remaining gas: 1039869.075 units remaining)
     [ 17
       16
       15
@@ -2448,7 +2448,7 @@ trace
       4
       (Pair 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 160 (remaining gas: 1039861.938 units remaining)
+  - location: 160 (remaining gas: 1039869.075 units remaining)
     [ 17
       16
       15
@@ -2465,36 +2465,36 @@ trace
       4
       (Pair 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 164 (remaining gas: 1039861.873 units remaining)
+  - location: 164 (remaining gas: 1039869.012 units remaining)
     [ 4
       (Pair 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 167 (remaining gas: 1039861.858 units remaining)
+  - location: 167 (remaining gas: 1039869.002 units remaining)
     [ (Pair 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 164 (remaining gas: 1039861.833 units remaining)
+  - location: 164 (remaining gas: 1039868.982 units remaining)
     [ 5
       (Pair 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 164 (remaining gas: 1039861.823 units remaining)
+  - location: 164 (remaining gas: 1039868.972 units remaining)
     [ 6
       5
       (Pair 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 164 (remaining gas: 1039861.813 units remaining)
+  - location: 164 (remaining gas: 1039868.962 units remaining)
     [ 7
       6
       5
       (Pair 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 164 (remaining gas: 1039861.803 units remaining)
+  - location: 164 (remaining gas: 1039868.952 units remaining)
     [ 8
       7
       6
       5
       (Pair 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 164 (remaining gas: 1039861.793 units remaining)
+  - location: 164 (remaining gas: 1039868.942 units remaining)
     [ 9
       8
       7
@@ -2502,7 +2502,7 @@ trace
       5
       (Pair 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 164 (remaining gas: 1039861.783 units remaining)
+  - location: 164 (remaining gas: 1039868.932 units remaining)
     [ 10
       9
       8
@@ -2511,7 +2511,7 @@ trace
       5
       (Pair 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 164 (remaining gas: 1039861.773 units remaining)
+  - location: 164 (remaining gas: 1039868.922 units remaining)
     [ 11
       10
       9
@@ -2521,7 +2521,7 @@ trace
       5
       (Pair 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 164 (remaining gas: 1039861.763 units remaining)
+  - location: 164 (remaining gas: 1039868.912 units remaining)
     [ 12
       11
       10
@@ -2532,7 +2532,7 @@ trace
       5
       (Pair 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 164 (remaining gas: 1039861.753 units remaining)
+  - location: 164 (remaining gas: 1039868.902 units remaining)
     [ 13
       12
       11
@@ -2544,7 +2544,7 @@ trace
       5
       (Pair 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 164 (remaining gas: 1039861.743 units remaining)
+  - location: 164 (remaining gas: 1039868.892 units remaining)
     [ 14
       13
       12
@@ -2557,7 +2557,7 @@ trace
       5
       (Pair 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 164 (remaining gas: 1039861.733 units remaining)
+  - location: 164 (remaining gas: 1039868.882 units remaining)
     [ 15
       14
       13
@@ -2571,7 +2571,7 @@ trace
       5
       (Pair 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 164 (remaining gas: 1039861.723 units remaining)
+  - location: 164 (remaining gas: 1039868.872 units remaining)
     [ 16
       15
       14
@@ -2586,7 +2586,7 @@ trace
       5
       (Pair 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 164 (remaining gas: 1039861.713 units remaining)
+  - location: 164 (remaining gas: 1039868.862 units remaining)
     [ 17
       16
       15
@@ -2602,7 +2602,7 @@ trace
       5
       (Pair 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 164 (remaining gas: 1039861.713 units remaining)
+  - location: 164 (remaining gas: 1039868.862 units remaining)
     [ 17
       16
       15
@@ -2618,36 +2618,36 @@ trace
       5
       (Pair 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 168 (remaining gas: 1039861.649 units remaining)
+  - location: 168 (remaining gas: 1039868.801 units remaining)
     [ 5
       (Pair 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 171 (remaining gas: 1039861.634 units remaining)
+  - location: 171 (remaining gas: 1039868.791 units remaining)
     [ (Pair 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 168 (remaining gas: 1039861.609 units remaining)
+  - location: 168 (remaining gas: 1039868.771 units remaining)
     [ 6
       (Pair 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 168 (remaining gas: 1039861.599 units remaining)
+  - location: 168 (remaining gas: 1039868.761 units remaining)
     [ 7
       6
       (Pair 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 168 (remaining gas: 1039861.589 units remaining)
+  - location: 168 (remaining gas: 1039868.751 units remaining)
     [ 8
       7
       6
       (Pair 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 168 (remaining gas: 1039861.579 units remaining)
+  - location: 168 (remaining gas: 1039868.741 units remaining)
     [ 9
       8
       7
       6
       (Pair 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 168 (remaining gas: 1039861.569 units remaining)
+  - location: 168 (remaining gas: 1039868.731 units remaining)
     [ 10
       9
       8
@@ -2655,7 +2655,7 @@ trace
       6
       (Pair 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 168 (remaining gas: 1039861.559 units remaining)
+  - location: 168 (remaining gas: 1039868.721 units remaining)
     [ 11
       10
       9
@@ -2664,7 +2664,7 @@ trace
       6
       (Pair 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 168 (remaining gas: 1039861.549 units remaining)
+  - location: 168 (remaining gas: 1039868.711 units remaining)
     [ 12
       11
       10
@@ -2674,7 +2674,7 @@ trace
       6
       (Pair 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 168 (remaining gas: 1039861.539 units remaining)
+  - location: 168 (remaining gas: 1039868.701 units remaining)
     [ 13
       12
       11
@@ -2685,7 +2685,7 @@ trace
       6
       (Pair 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 168 (remaining gas: 1039861.529 units remaining)
+  - location: 168 (remaining gas: 1039868.691 units remaining)
     [ 14
       13
       12
@@ -2697,7 +2697,7 @@ trace
       6
       (Pair 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 168 (remaining gas: 1039861.519 units remaining)
+  - location: 168 (remaining gas: 1039868.681 units remaining)
     [ 15
       14
       13
@@ -2710,7 +2710,7 @@ trace
       6
       (Pair 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 168 (remaining gas: 1039861.509 units remaining)
+  - location: 168 (remaining gas: 1039868.671 units remaining)
     [ 16
       15
       14
@@ -2724,7 +2724,7 @@ trace
       6
       (Pair 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 168 (remaining gas: 1039861.499 units remaining)
+  - location: 168 (remaining gas: 1039868.661 units remaining)
     [ 17
       16
       15
@@ -2739,7 +2739,7 @@ trace
       6
       (Pair 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 168 (remaining gas: 1039861.499 units remaining)
+  - location: 168 (remaining gas: 1039868.661 units remaining)
     [ 17
       16
       15
@@ -2754,36 +2754,36 @@ trace
       6
       (Pair 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 172 (remaining gas: 1039861.437 units remaining)
+  - location: 172 (remaining gas: 1039868.603 units remaining)
     [ 6
       (Pair 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 175 (remaining gas: 1039861.422 units remaining)
+  - location: 175 (remaining gas: 1039868.593 units remaining)
     [ (Pair 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 172 (remaining gas: 1039861.397 units remaining)
+  - location: 172 (remaining gas: 1039868.573 units remaining)
     [ 7
       (Pair 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 172 (remaining gas: 1039861.387 units remaining)
+  - location: 172 (remaining gas: 1039868.563 units remaining)
     [ 8
       7
       (Pair 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 172 (remaining gas: 1039861.377 units remaining)
+  - location: 172 (remaining gas: 1039868.553 units remaining)
     [ 9
       8
       7
       (Pair 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 172 (remaining gas: 1039861.367 units remaining)
+  - location: 172 (remaining gas: 1039868.543 units remaining)
     [ 10
       9
       8
       7
       (Pair 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 172 (remaining gas: 1039861.357 units remaining)
+  - location: 172 (remaining gas: 1039868.533 units remaining)
     [ 11
       10
       9
@@ -2791,7 +2791,7 @@ trace
       7
       (Pair 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 172 (remaining gas: 1039861.347 units remaining)
+  - location: 172 (remaining gas: 1039868.523 units remaining)
     [ 12
       11
       10
@@ -2800,7 +2800,7 @@ trace
       7
       (Pair 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 172 (remaining gas: 1039861.337 units remaining)
+  - location: 172 (remaining gas: 1039868.513 units remaining)
     [ 13
       12
       11
@@ -2810,7 +2810,7 @@ trace
       7
       (Pair 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 172 (remaining gas: 1039861.327 units remaining)
+  - location: 172 (remaining gas: 1039868.503 units remaining)
     [ 14
       13
       12
@@ -2821,7 +2821,7 @@ trace
       7
       (Pair 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 172 (remaining gas: 1039861.317 units remaining)
+  - location: 172 (remaining gas: 1039868.493 units remaining)
     [ 15
       14
       13
@@ -2833,7 +2833,7 @@ trace
       7
       (Pair 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 172 (remaining gas: 1039861.307 units remaining)
+  - location: 172 (remaining gas: 1039868.483 units remaining)
     [ 16
       15
       14
@@ -2846,7 +2846,7 @@ trace
       7
       (Pair 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 172 (remaining gas: 1039861.297 units remaining)
+  - location: 172 (remaining gas: 1039868.473 units remaining)
     [ 17
       16
       15
@@ -2860,7 +2860,7 @@ trace
       7
       (Pair 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 172 (remaining gas: 1039861.297 units remaining)
+  - location: 172 (remaining gas: 1039868.473 units remaining)
     [ 17
       16
       15
@@ -2874,36 +2874,36 @@ trace
       7
       (Pair 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 176 (remaining gas: 1039861.236 units remaining)
+  - location: 176 (remaining gas: 1039868.417 units remaining)
     [ 7
       (Pair 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 179 (remaining gas: 1039861.221 units remaining)
+  - location: 179 (remaining gas: 1039868.407 units remaining)
     [ (Pair 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 176 (remaining gas: 1039861.196 units remaining)
+  - location: 176 (remaining gas: 1039868.387 units remaining)
     [ 8
       (Pair 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 176 (remaining gas: 1039861.186 units remaining)
+  - location: 176 (remaining gas: 1039868.377 units remaining)
     [ 9
       8
       (Pair 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 176 (remaining gas: 1039861.176 units remaining)
+  - location: 176 (remaining gas: 1039868.367 units remaining)
     [ 10
       9
       8
       (Pair 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 176 (remaining gas: 1039861.166 units remaining)
+  - location: 176 (remaining gas: 1039868.357 units remaining)
     [ 11
       10
       9
       8
       (Pair 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 176 (remaining gas: 1039861.156 units remaining)
+  - location: 176 (remaining gas: 1039868.347 units remaining)
     [ 12
       11
       10
@@ -2911,7 +2911,7 @@ trace
       8
       (Pair 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 176 (remaining gas: 1039861.146 units remaining)
+  - location: 176 (remaining gas: 1039868.337 units remaining)
     [ 13
       12
       11
@@ -2920,7 +2920,7 @@ trace
       8
       (Pair 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 176 (remaining gas: 1039861.136 units remaining)
+  - location: 176 (remaining gas: 1039868.327 units remaining)
     [ 14
       13
       12
@@ -2930,7 +2930,7 @@ trace
       8
       (Pair 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 176 (remaining gas: 1039861.126 units remaining)
+  - location: 176 (remaining gas: 1039868.317 units remaining)
     [ 15
       14
       13
@@ -2941,7 +2941,7 @@ trace
       8
       (Pair 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 176 (remaining gas: 1039861.116 units remaining)
+  - location: 176 (remaining gas: 1039868.307 units remaining)
     [ 16
       15
       14
@@ -2953,7 +2953,7 @@ trace
       8
       (Pair 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 176 (remaining gas: 1039861.106 units remaining)
+  - location: 176 (remaining gas: 1039868.297 units remaining)
     [ 17
       16
       15
@@ -2966,7 +2966,7 @@ trace
       8
       (Pair 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 176 (remaining gas: 1039861.106 units remaining)
+  - location: 176 (remaining gas: 1039868.297 units remaining)
     [ 17
       16
       15
@@ -2979,36 +2979,36 @@ trace
       8
       (Pair 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 180 (remaining gas: 1039861.047 units remaining)
+  - location: 180 (remaining gas: 1039868.244 units remaining)
     [ 8
       (Pair 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 183 (remaining gas: 1039861.032 units remaining)
+  - location: 183 (remaining gas: 1039868.234 units remaining)
     [ (Pair 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 180 (remaining gas: 1039861.007 units remaining)
+  - location: 180 (remaining gas: 1039868.214 units remaining)
     [ 9
       (Pair 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 180 (remaining gas: 1039860.997 units remaining)
+  - location: 180 (remaining gas: 1039868.204 units remaining)
     [ 10
       9
       (Pair 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 180 (remaining gas: 1039860.987 units remaining)
+  - location: 180 (remaining gas: 1039868.194 units remaining)
     [ 11
       10
       9
       (Pair 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 180 (remaining gas: 1039860.977 units remaining)
+  - location: 180 (remaining gas: 1039868.184 units remaining)
     [ 12
       11
       10
       9
       (Pair 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 180 (remaining gas: 1039860.967 units remaining)
+  - location: 180 (remaining gas: 1039868.174 units remaining)
     [ 13
       12
       11
@@ -3016,7 +3016,7 @@ trace
       9
       (Pair 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 180 (remaining gas: 1039860.957 units remaining)
+  - location: 180 (remaining gas: 1039868.164 units remaining)
     [ 14
       13
       12
@@ -3025,7 +3025,7 @@ trace
       9
       (Pair 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 180 (remaining gas: 1039860.947 units remaining)
+  - location: 180 (remaining gas: 1039868.154 units remaining)
     [ 15
       14
       13
@@ -3035,7 +3035,7 @@ trace
       9
       (Pair 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 180 (remaining gas: 1039860.937 units remaining)
+  - location: 180 (remaining gas: 1039868.144 units remaining)
     [ 16
       15
       14
@@ -3046,7 +3046,7 @@ trace
       9
       (Pair 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 180 (remaining gas: 1039860.927 units remaining)
+  - location: 180 (remaining gas: 1039868.134 units remaining)
     [ 17
       16
       15
@@ -3058,7 +3058,7 @@ trace
       9
       (Pair 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 180 (remaining gas: 1039860.927 units remaining)
+  - location: 180 (remaining gas: 1039868.134 units remaining)
     [ 17
       16
       15
@@ -3070,36 +3070,36 @@ trace
       9
       (Pair 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 184 (remaining gas: 1039860.869 units remaining)
+  - location: 184 (remaining gas: 1039868.083 units remaining)
     [ 9
       (Pair 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 187 (remaining gas: 1039860.854 units remaining)
+  - location: 187 (remaining gas: 1039868.073 units remaining)
     [ (Pair 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 184 (remaining gas: 1039860.829 units remaining)
+  - location: 184 (remaining gas: 1039868.053 units remaining)
     [ 10
       (Pair 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 184 (remaining gas: 1039860.819 units remaining)
+  - location: 184 (remaining gas: 1039868.043 units remaining)
     [ 11
       10
       (Pair 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 184 (remaining gas: 1039860.809 units remaining)
+  - location: 184 (remaining gas: 1039868.033 units remaining)
     [ 12
       11
       10
       (Pair 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 184 (remaining gas: 1039860.799 units remaining)
+  - location: 184 (remaining gas: 1039868.023 units remaining)
     [ 13
       12
       11
       10
       (Pair 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 184 (remaining gas: 1039860.789 units remaining)
+  - location: 184 (remaining gas: 1039868.013 units remaining)
     [ 14
       13
       12
@@ -3107,7 +3107,7 @@ trace
       10
       (Pair 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 184 (remaining gas: 1039860.779 units remaining)
+  - location: 184 (remaining gas: 1039868.003 units remaining)
     [ 15
       14
       13
@@ -3116,7 +3116,7 @@ trace
       10
       (Pair 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 184 (remaining gas: 1039860.769 units remaining)
+  - location: 184 (remaining gas: 1039867.993 units remaining)
     [ 16
       15
       14
@@ -3126,7 +3126,7 @@ trace
       10
       (Pair 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 184 (remaining gas: 1039860.759 units remaining)
+  - location: 184 (remaining gas: 1039867.983 units remaining)
     [ 17
       16
       15
@@ -3137,7 +3137,7 @@ trace
       10
       (Pair 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 184 (remaining gas: 1039860.759 units remaining)
+  - location: 184 (remaining gas: 1039867.983 units remaining)
     [ 17
       16
       15
@@ -3148,36 +3148,36 @@ trace
       10
       (Pair 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 188 (remaining gas: 1039860.704 units remaining)
+  - location: 188 (remaining gas: 1039867.936 units remaining)
     [ 10
       (Pair 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 191 (remaining gas: 1039860.689 units remaining)
+  - location: 191 (remaining gas: 1039867.926 units remaining)
     [ (Pair 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 188 (remaining gas: 1039860.664 units remaining)
+  - location: 188 (remaining gas: 1039867.906 units remaining)
     [ 11
       (Pair 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 188 (remaining gas: 1039860.654 units remaining)
+  - location: 188 (remaining gas: 1039867.896 units remaining)
     [ 12
       11
       (Pair 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 188 (remaining gas: 1039860.644 units remaining)
+  - location: 188 (remaining gas: 1039867.886 units remaining)
     [ 13
       12
       11
       (Pair 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 188 (remaining gas: 1039860.634 units remaining)
+  - location: 188 (remaining gas: 1039867.876 units remaining)
     [ 14
       13
       12
       11
       (Pair 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 188 (remaining gas: 1039860.624 units remaining)
+  - location: 188 (remaining gas: 1039867.866 units remaining)
     [ 15
       14
       13
@@ -3185,7 +3185,7 @@ trace
       11
       (Pair 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 188 (remaining gas: 1039860.614 units remaining)
+  - location: 188 (remaining gas: 1039867.856 units remaining)
     [ 16
       15
       14
@@ -3194,7 +3194,7 @@ trace
       11
       (Pair 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 188 (remaining gas: 1039860.604 units remaining)
+  - location: 188 (remaining gas: 1039867.846 units remaining)
     [ 17
       16
       15
@@ -3204,7 +3204,7 @@ trace
       11
       (Pair 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 188 (remaining gas: 1039860.604 units remaining)
+  - location: 188 (remaining gas: 1039867.846 units remaining)
     [ 17
       16
       15
@@ -3214,36 +3214,36 @@ trace
       11
       (Pair 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 192 (remaining gas: 1039860.550 units remaining)
+  - location: 192 (remaining gas: 1039867.801 units remaining)
     [ 11
       (Pair 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 195 (remaining gas: 1039860.535 units remaining)
+  - location: 195 (remaining gas: 1039867.791 units remaining)
     [ (Pair 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 192 (remaining gas: 1039860.510 units remaining)
+  - location: 192 (remaining gas: 1039867.771 units remaining)
     [ 12
       (Pair 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 192 (remaining gas: 1039860.500 units remaining)
+  - location: 192 (remaining gas: 1039867.761 units remaining)
     [ 13
       12
       (Pair 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 192 (remaining gas: 1039860.490 units remaining)
+  - location: 192 (remaining gas: 1039867.751 units remaining)
     [ 14
       13
       12
       (Pair 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 192 (remaining gas: 1039860.480 units remaining)
+  - location: 192 (remaining gas: 1039867.741 units remaining)
     [ 15
       14
       13
       12
       (Pair 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 192 (remaining gas: 1039860.470 units remaining)
+  - location: 192 (remaining gas: 1039867.731 units remaining)
     [ 16
       15
       14
@@ -3251,7 +3251,7 @@ trace
       12
       (Pair 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 192 (remaining gas: 1039860.460 units remaining)
+  - location: 192 (remaining gas: 1039867.721 units remaining)
     [ 17
       16
       15
@@ -3260,7 +3260,7 @@ trace
       12
       (Pair 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 192 (remaining gas: 1039860.460 units remaining)
+  - location: 192 (remaining gas: 1039867.721 units remaining)
     [ 17
       16
       15
@@ -3269,36 +3269,36 @@ trace
       12
       (Pair 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 196 (remaining gas: 1039860.408 units remaining)
+  - location: 196 (remaining gas: 1039867.679 units remaining)
     [ 12
       (Pair 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 199 (remaining gas: 1039860.393 units remaining)
+  - location: 199 (remaining gas: 1039867.669 units remaining)
     [ (Pair 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 196 (remaining gas: 1039860.368 units remaining)
+  - location: 196 (remaining gas: 1039867.649 units remaining)
     [ 13
       (Pair 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 196 (remaining gas: 1039860.358 units remaining)
+  - location: 196 (remaining gas: 1039867.639 units remaining)
     [ 14
       13
       (Pair 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 196 (remaining gas: 1039860.348 units remaining)
+  - location: 196 (remaining gas: 1039867.629 units remaining)
     [ 15
       14
       13
       (Pair 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 196 (remaining gas: 1039860.338 units remaining)
+  - location: 196 (remaining gas: 1039867.619 units remaining)
     [ 16
       15
       14
       13
       (Pair 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 196 (remaining gas: 1039860.328 units remaining)
+  - location: 196 (remaining gas: 1039867.609 units remaining)
     [ 17
       16
       15
@@ -3306,7 +3306,7 @@ trace
       13
       (Pair 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 196 (remaining gas: 1039860.328 units remaining)
+  - location: 196 (remaining gas: 1039867.609 units remaining)
     [ 17
       16
       15
@@ -3314,118 +3314,118 @@ trace
       13
       (Pair 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 200 (remaining gas: 1039860.277 units remaining)
+  - location: 200 (remaining gas: 1039867.569 units remaining)
     [ 13
       (Pair 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 203 (remaining gas: 1039860.262 units remaining)
+  - location: 203 (remaining gas: 1039867.559 units remaining)
     [ (Pair 13 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 200 (remaining gas: 1039860.237 units remaining)
+  - location: 200 (remaining gas: 1039867.539 units remaining)
     [ 14
       (Pair 13 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 200 (remaining gas: 1039860.227 units remaining)
+  - location: 200 (remaining gas: 1039867.529 units remaining)
     [ 15
       14
       (Pair 13 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 200 (remaining gas: 1039860.217 units remaining)
+  - location: 200 (remaining gas: 1039867.519 units remaining)
     [ 16
       15
       14
       (Pair 13 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 200 (remaining gas: 1039860.207 units remaining)
+  - location: 200 (remaining gas: 1039867.509 units remaining)
     [ 17
       16
       15
       14
       (Pair 13 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 200 (remaining gas: 1039860.207 units remaining)
+  - location: 200 (remaining gas: 1039867.509 units remaining)
     [ 17
       16
       15
       14
       (Pair 13 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 204 (remaining gas: 1039860.158 units remaining)
+  - location: 204 (remaining gas: 1039867.472 units remaining)
     [ 14
       (Pair 13 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 207 (remaining gas: 1039860.143 units remaining)
+  - location: 207 (remaining gas: 1039867.462 units remaining)
     [ (Pair 14 13 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 204 (remaining gas: 1039860.118 units remaining)
+  - location: 204 (remaining gas: 1039867.442 units remaining)
     [ 15
       (Pair 14 13 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 204 (remaining gas: 1039860.108 units remaining)
+  - location: 204 (remaining gas: 1039867.432 units remaining)
     [ 16
       15
       (Pair 14 13 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 204 (remaining gas: 1039860.098 units remaining)
+  - location: 204 (remaining gas: 1039867.422 units remaining)
     [ 17
       16
       15
       (Pair 14 13 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 204 (remaining gas: 1039860.098 units remaining)
+  - location: 204 (remaining gas: 1039867.422 units remaining)
     [ 17
       16
       15
       (Pair 14 13 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 208 (remaining gas: 1039860.050 units remaining)
+  - location: 208 (remaining gas: 1039867.387 units remaining)
     [ 15
       (Pair 14 13 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 211 (remaining gas: 1039860.035 units remaining)
+  - location: 211 (remaining gas: 1039867.377 units remaining)
     [ (Pair 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 208 (remaining gas: 1039860.010 units remaining)
+  - location: 208 (remaining gas: 1039867.357 units remaining)
     [ 16
       (Pair 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 208 (remaining gas: 1039860 units remaining)
+  - location: 208 (remaining gas: 1039867.347 units remaining)
     [ 17
       16
       (Pair 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 208 (remaining gas: 1039860 units remaining)
+  - location: 208 (remaining gas: 1039867.347 units remaining)
     [ 17
       16
       (Pair 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 212 (remaining gas: 1039859.985 units remaining)
+  - location: 212 (remaining gas: 1039867.337 units remaining)
     [ 16
       (Pair 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 214 (remaining gas: 1039859.970 units remaining)
+  - location: 214 (remaining gas: 1039867.327 units remaining)
     [ (Pair 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 212 (remaining gas: 1039859.940 units remaining)
+  - location: 212 (remaining gas: 1039867.307 units remaining)
     [ 17
       (Pair 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 215 (remaining gas: 1039859.925 units remaining)
+  - location: 215 (remaining gas: 1039867.297 units remaining)
     [ (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1)
       (Pair 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1) ]
-  - location: 218 (remaining gas: 1039859.170 units remaining)
+  - location: 218 (remaining gas: 1039866.542 units remaining)
     [ 0 ]
-  - location: 219 (remaining gas: 1039859.155 units remaining)
+  - location: 219 (remaining gas: 1039866.532 units remaining)
     [ True ]
-  - location: 220 (remaining gas: 1039859.145 units remaining)
+  - location: 220 (remaining gas: 1039866.522 units remaining)
     [  ]
-  - location: 220 (remaining gas: 1039859.130 units remaining)
+  - location: 220 (remaining gas: 1039866.512 units remaining)
     [  ]
-  - location: 226 (remaining gas: 1039859.120 units remaining)
+  - location: 226 (remaining gas: 1039866.502 units remaining)
     [ Unit ]
-  - location: 227 (remaining gas: 1039859.105 units remaining)
+  - location: 227 (remaining gas: 1039866.492 units remaining)
     [ {}
       Unit ]
-  - location: 229 (remaining gas: 1039859.090 units remaining)
+  - location: 229 (remaining gas: 1039866.482 units remaining)
     [ (Pair {} Unit) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dig_eq.tz-Unit-(Pair 2 (Pair 3 (Pair 12 (Pair 16 (Pair .d473151c0f.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dig_eq.tz-Unit-(Pair 2 (Pair 3 (Pair 12 (Pair 16 (Pair .d473151c0f.out
index 08d428d6c23f93b11bdf363026c70e918e7db2b4..1a9ce1edb66afd5a77690ee67ea6072cacee1f9a 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dig_eq.tz-Unit-(Pair 2 (Pair 3 (Pair 12 (Pair 16 (Pair .d473151c0f.out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dig_eq.tz-Unit-(Pair 2 (Pair 3 (Pair 12 (Pair 16 (Pair .d473151c0f.out	
@@ -7,111 +7,111 @@ emitted operations
 big_map diff
   
 trace
-  - location: 24 (remaining gas: 1039868.717 units remaining)
+  - location: 24 (remaining gas: 1039874.637 units remaining)
     [ (Pair (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) Unit) ]
-  - location: 24 (remaining gas: 1039868.707 units remaining)
+  - location: 24 (remaining gas: 1039874.627 units remaining)
     [ (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 25 (remaining gas: 1039868.697 units remaining)
+  - location: 25 (remaining gas: 1039874.617 units remaining)
     [ (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 27 (remaining gas: 1039868.687 units remaining)
+  - location: 27 (remaining gas: 1039874.607 units remaining)
     [ 2
       (Pair 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 28 (remaining gas: 1039868.672 units remaining)
+  - location: 28 (remaining gas: 1039874.597 units remaining)
     [ (Pair 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 30 (remaining gas: 1039868.662 units remaining)
+  - location: 30 (remaining gas: 1039874.587 units remaining)
     [ 3
       (Pair 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 28 (remaining gas: 1039868.632 units remaining)
+  - location: 28 (remaining gas: 1039874.567 units remaining)
     [ 2
       3
       (Pair 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 31 (remaining gas: 1039868.584 units remaining)
+  - location: 31 (remaining gas: 1039874.532 units remaining)
     [ (Pair 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 34 (remaining gas: 1039868.574 units remaining)
+  - location: 34 (remaining gas: 1039874.522 units remaining)
     [ 12
       (Pair 16 10 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 31 (remaining gas: 1039868.549 units remaining)
+  - location: 31 (remaining gas: 1039874.502 units remaining)
     [ 3
       12
       (Pair 16 10 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 31 (remaining gas: 1039868.539 units remaining)
+  - location: 31 (remaining gas: 1039874.492 units remaining)
     [ 2
       3
       12
       (Pair 16 10 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 31 (remaining gas: 1039868.539 units remaining)
+  - location: 31 (remaining gas: 1039874.492 units remaining)
     [ 2
       3
       12
       (Pair 16 10 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 35 (remaining gas: 1039868.490 units remaining)
+  - location: 35 (remaining gas: 1039874.455 units remaining)
     [ (Pair 16 10 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 38 (remaining gas: 1039868.480 units remaining)
+  - location: 38 (remaining gas: 1039874.445 units remaining)
     [ 16
       (Pair 10 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 35 (remaining gas: 1039868.455 units remaining)
+  - location: 35 (remaining gas: 1039874.425 units remaining)
     [ 12
       16
       (Pair 10 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 35 (remaining gas: 1039868.445 units remaining)
+  - location: 35 (remaining gas: 1039874.415 units remaining)
     [ 3
       12
       16
       (Pair 10 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 35 (remaining gas: 1039868.435 units remaining)
+  - location: 35 (remaining gas: 1039874.405 units remaining)
     [ 2
       3
       12
       16
       (Pair 10 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 35 (remaining gas: 1039868.435 units remaining)
+  - location: 35 (remaining gas: 1039874.405 units remaining)
     [ 2
       3
       12
       16
       (Pair 10 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 39 (remaining gas: 1039868.384 units remaining)
+  - location: 39 (remaining gas: 1039874.365 units remaining)
     [ (Pair 10 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 42 (remaining gas: 1039868.374 units remaining)
+  - location: 42 (remaining gas: 1039874.355 units remaining)
     [ 10
       (Pair 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 39 (remaining gas: 1039868.349 units remaining)
+  - location: 39 (remaining gas: 1039874.335 units remaining)
     [ 16
       10
       (Pair 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 39 (remaining gas: 1039868.339 units remaining)
+  - location: 39 (remaining gas: 1039874.325 units remaining)
     [ 12
       16
       10
       (Pair 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 39 (remaining gas: 1039868.329 units remaining)
+  - location: 39 (remaining gas: 1039874.315 units remaining)
     [ 3
       12
       16
       10
       (Pair 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 39 (remaining gas: 1039868.319 units remaining)
+  - location: 39 (remaining gas: 1039874.305 units remaining)
     [ 2
       3
       12
@@ -119,7 +119,7 @@ trace
       10
       (Pair 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 39 (remaining gas: 1039868.319 units remaining)
+  - location: 39 (remaining gas: 1039874.305 units remaining)
     [ 2
       3
       12
@@ -127,32 +127,32 @@ trace
       10
       (Pair 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 43 (remaining gas: 1039868.267 units remaining)
+  - location: 43 (remaining gas: 1039874.263 units remaining)
     [ (Pair 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 46 (remaining gas: 1039868.257 units remaining)
+  - location: 46 (remaining gas: 1039874.253 units remaining)
     [ 14
       (Pair 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 43 (remaining gas: 1039868.232 units remaining)
+  - location: 43 (remaining gas: 1039874.233 units remaining)
     [ 10
       14
       (Pair 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 43 (remaining gas: 1039868.222 units remaining)
+  - location: 43 (remaining gas: 1039874.223 units remaining)
     [ 16
       10
       14
       (Pair 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 43 (remaining gas: 1039868.212 units remaining)
+  - location: 43 (remaining gas: 1039874.213 units remaining)
     [ 12
       16
       10
       14
       (Pair 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 43 (remaining gas: 1039868.202 units remaining)
+  - location: 43 (remaining gas: 1039874.203 units remaining)
     [ 3
       12
       16
@@ -160,7 +160,7 @@ trace
       14
       (Pair 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 43 (remaining gas: 1039868.192 units remaining)
+  - location: 43 (remaining gas: 1039874.193 units remaining)
     [ 2
       3
       12
@@ -169,7 +169,7 @@ trace
       14
       (Pair 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 43 (remaining gas: 1039868.192 units remaining)
+  - location: 43 (remaining gas: 1039874.193 units remaining)
     [ 2
       3
       12
@@ -178,32 +178,32 @@ trace
       14
       (Pair 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 47 (remaining gas: 1039868.138 units remaining)
+  - location: 47 (remaining gas: 1039874.148 units remaining)
     [ (Pair 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 50 (remaining gas: 1039868.128 units remaining)
+  - location: 50 (remaining gas: 1039874.138 units remaining)
     [ 19
       (Pair 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 47 (remaining gas: 1039868.103 units remaining)
+  - location: 47 (remaining gas: 1039874.118 units remaining)
     [ 14
       19
       (Pair 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 47 (remaining gas: 1039868.093 units remaining)
+  - location: 47 (remaining gas: 1039874.108 units remaining)
     [ 10
       14
       19
       (Pair 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 47 (remaining gas: 1039868.083 units remaining)
+  - location: 47 (remaining gas: 1039874.098 units remaining)
     [ 16
       10
       14
       19
       (Pair 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 47 (remaining gas: 1039868.073 units remaining)
+  - location: 47 (remaining gas: 1039874.088 units remaining)
     [ 12
       16
       10
@@ -211,7 +211,7 @@ trace
       19
       (Pair 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 47 (remaining gas: 1039868.063 units remaining)
+  - location: 47 (remaining gas: 1039874.078 units remaining)
     [ 3
       12
       16
@@ -220,7 +220,7 @@ trace
       19
       (Pair 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 47 (remaining gas: 1039868.053 units remaining)
+  - location: 47 (remaining gas: 1039874.068 units remaining)
     [ 2
       3
       12
@@ -230,7 +230,7 @@ trace
       19
       (Pair 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 47 (remaining gas: 1039868.053 units remaining)
+  - location: 47 (remaining gas: 1039874.068 units remaining)
     [ 2
       3
       12
@@ -240,32 +240,32 @@ trace
       19
       (Pair 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 51 (remaining gas: 1039867.998 units remaining)
+  - location: 51 (remaining gas: 1039874.021 units remaining)
     [ (Pair 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 54 (remaining gas: 1039867.988 units remaining)
+  - location: 54 (remaining gas: 1039874.011 units remaining)
     [ 9
       (Pair 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 51 (remaining gas: 1039867.963 units remaining)
+  - location: 51 (remaining gas: 1039873.991 units remaining)
     [ 19
       9
       (Pair 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 51 (remaining gas: 1039867.953 units remaining)
+  - location: 51 (remaining gas: 1039873.981 units remaining)
     [ 14
       19
       9
       (Pair 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 51 (remaining gas: 1039867.943 units remaining)
+  - location: 51 (remaining gas: 1039873.971 units remaining)
     [ 10
       14
       19
       9
       (Pair 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 51 (remaining gas: 1039867.933 units remaining)
+  - location: 51 (remaining gas: 1039873.961 units remaining)
     [ 16
       10
       14
@@ -273,7 +273,7 @@ trace
       9
       (Pair 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 51 (remaining gas: 1039867.923 units remaining)
+  - location: 51 (remaining gas: 1039873.951 units remaining)
     [ 12
       16
       10
@@ -282,7 +282,7 @@ trace
       9
       (Pair 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 51 (remaining gas: 1039867.913 units remaining)
+  - location: 51 (remaining gas: 1039873.941 units remaining)
     [ 3
       12
       16
@@ -292,7 +292,7 @@ trace
       9
       (Pair 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 51 (remaining gas: 1039867.903 units remaining)
+  - location: 51 (remaining gas: 1039873.931 units remaining)
     [ 2
       3
       12
@@ -303,7 +303,7 @@ trace
       9
       (Pair 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 51 (remaining gas: 1039867.903 units remaining)
+  - location: 51 (remaining gas: 1039873.931 units remaining)
     [ 2
       3
       12
@@ -314,32 +314,32 @@ trace
       9
       (Pair 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 55 (remaining gas: 1039867.845 units remaining)
+  - location: 55 (remaining gas: 1039873.880 units remaining)
     [ (Pair 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 58 (remaining gas: 1039867.835 units remaining)
+  - location: 58 (remaining gas: 1039873.870 units remaining)
     [ 18
       (Pair 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 55 (remaining gas: 1039867.810 units remaining)
+  - location: 55 (remaining gas: 1039873.850 units remaining)
     [ 9
       18
       (Pair 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 55 (remaining gas: 1039867.800 units remaining)
+  - location: 55 (remaining gas: 1039873.840 units remaining)
     [ 19
       9
       18
       (Pair 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 55 (remaining gas: 1039867.790 units remaining)
+  - location: 55 (remaining gas: 1039873.830 units remaining)
     [ 14
       19
       9
       18
       (Pair 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 55 (remaining gas: 1039867.780 units remaining)
+  - location: 55 (remaining gas: 1039873.820 units remaining)
     [ 10
       14
       19
@@ -347,7 +347,7 @@ trace
       18
       (Pair 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 55 (remaining gas: 1039867.770 units remaining)
+  - location: 55 (remaining gas: 1039873.810 units remaining)
     [ 16
       10
       14
@@ -356,7 +356,7 @@ trace
       18
       (Pair 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 55 (remaining gas: 1039867.760 units remaining)
+  - location: 55 (remaining gas: 1039873.800 units remaining)
     [ 12
       16
       10
@@ -366,7 +366,7 @@ trace
       18
       (Pair 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 55 (remaining gas: 1039867.750 units remaining)
+  - location: 55 (remaining gas: 1039873.790 units remaining)
     [ 3
       12
       16
@@ -377,7 +377,7 @@ trace
       18
       (Pair 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 55 (remaining gas: 1039867.740 units remaining)
+  - location: 55 (remaining gas: 1039873.780 units remaining)
     [ 2
       3
       12
@@ -389,7 +389,7 @@ trace
       18
       (Pair 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 55 (remaining gas: 1039867.740 units remaining)
+  - location: 55 (remaining gas: 1039873.780 units remaining)
     [ 2
       3
       12
@@ -401,32 +401,32 @@ trace
       18
       (Pair 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 59 (remaining gas: 1039867.681 units remaining)
+  - location: 59 (remaining gas: 1039873.727 units remaining)
     [ (Pair 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 62 (remaining gas: 1039867.671 units remaining)
+  - location: 62 (remaining gas: 1039873.717 units remaining)
     [ 6
       (Pair 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 59 (remaining gas: 1039867.646 units remaining)
+  - location: 59 (remaining gas: 1039873.697 units remaining)
     [ 18
       6
       (Pair 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 59 (remaining gas: 1039867.636 units remaining)
+  - location: 59 (remaining gas: 1039873.687 units remaining)
     [ 9
       18
       6
       (Pair 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 59 (remaining gas: 1039867.626 units remaining)
+  - location: 59 (remaining gas: 1039873.677 units remaining)
     [ 19
       9
       18
       6
       (Pair 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 59 (remaining gas: 1039867.616 units remaining)
+  - location: 59 (remaining gas: 1039873.667 units remaining)
     [ 14
       19
       9
@@ -434,7 +434,7 @@ trace
       6
       (Pair 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 59 (remaining gas: 1039867.606 units remaining)
+  - location: 59 (remaining gas: 1039873.657 units remaining)
     [ 10
       14
       19
@@ -443,7 +443,7 @@ trace
       6
       (Pair 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 59 (remaining gas: 1039867.596 units remaining)
+  - location: 59 (remaining gas: 1039873.647 units remaining)
     [ 16
       10
       14
@@ -453,7 +453,7 @@ trace
       6
       (Pair 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 59 (remaining gas: 1039867.586 units remaining)
+  - location: 59 (remaining gas: 1039873.637 units remaining)
     [ 12
       16
       10
@@ -464,7 +464,7 @@ trace
       6
       (Pair 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 59 (remaining gas: 1039867.576 units remaining)
+  - location: 59 (remaining gas: 1039873.627 units remaining)
     [ 3
       12
       16
@@ -476,7 +476,7 @@ trace
       6
       (Pair 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 59 (remaining gas: 1039867.566 units remaining)
+  - location: 59 (remaining gas: 1039873.617 units remaining)
     [ 2
       3
       12
@@ -489,7 +489,7 @@ trace
       6
       (Pair 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 59 (remaining gas: 1039867.566 units remaining)
+  - location: 59 (remaining gas: 1039873.617 units remaining)
     [ 2
       3
       12
@@ -502,32 +502,32 @@ trace
       6
       (Pair 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 63 (remaining gas: 1039867.505 units remaining)
+  - location: 63 (remaining gas: 1039873.561 units remaining)
     [ (Pair 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 66 (remaining gas: 1039867.495 units remaining)
+  - location: 66 (remaining gas: 1039873.551 units remaining)
     [ 8
       (Pair 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 63 (remaining gas: 1039867.470 units remaining)
+  - location: 63 (remaining gas: 1039873.531 units remaining)
     [ 6
       8
       (Pair 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 63 (remaining gas: 1039867.460 units remaining)
+  - location: 63 (remaining gas: 1039873.521 units remaining)
     [ 18
       6
       8
       (Pair 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 63 (remaining gas: 1039867.450 units remaining)
+  - location: 63 (remaining gas: 1039873.511 units remaining)
     [ 9
       18
       6
       8
       (Pair 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 63 (remaining gas: 1039867.440 units remaining)
+  - location: 63 (remaining gas: 1039873.501 units remaining)
     [ 19
       9
       18
@@ -535,7 +535,7 @@ trace
       8
       (Pair 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 63 (remaining gas: 1039867.430 units remaining)
+  - location: 63 (remaining gas: 1039873.491 units remaining)
     [ 14
       19
       9
@@ -544,7 +544,7 @@ trace
       8
       (Pair 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 63 (remaining gas: 1039867.420 units remaining)
+  - location: 63 (remaining gas: 1039873.481 units remaining)
     [ 10
       14
       19
@@ -554,7 +554,7 @@ trace
       8
       (Pair 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 63 (remaining gas: 1039867.410 units remaining)
+  - location: 63 (remaining gas: 1039873.471 units remaining)
     [ 16
       10
       14
@@ -565,7 +565,7 @@ trace
       8
       (Pair 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 63 (remaining gas: 1039867.400 units remaining)
+  - location: 63 (remaining gas: 1039873.461 units remaining)
     [ 12
       16
       10
@@ -577,7 +577,7 @@ trace
       8
       (Pair 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 63 (remaining gas: 1039867.390 units remaining)
+  - location: 63 (remaining gas: 1039873.451 units remaining)
     [ 3
       12
       16
@@ -590,7 +590,7 @@ trace
       8
       (Pair 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 63 (remaining gas: 1039867.380 units remaining)
+  - location: 63 (remaining gas: 1039873.441 units remaining)
     [ 2
       3
       12
@@ -604,7 +604,7 @@ trace
       8
       (Pair 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 63 (remaining gas: 1039867.380 units remaining)
+  - location: 63 (remaining gas: 1039873.441 units remaining)
     [ 2
       3
       12
@@ -618,32 +618,32 @@ trace
       8
       (Pair 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 67 (remaining gas: 1039867.318 units remaining)
+  - location: 67 (remaining gas: 1039873.383 units remaining)
     [ (Pair 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 70 (remaining gas: 1039867.308 units remaining)
+  - location: 70 (remaining gas: 1039873.373 units remaining)
     [ 11
       (Pair 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 67 (remaining gas: 1039867.283 units remaining)
+  - location: 67 (remaining gas: 1039873.353 units remaining)
     [ 8
       11
       (Pair 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 67 (remaining gas: 1039867.273 units remaining)
+  - location: 67 (remaining gas: 1039873.343 units remaining)
     [ 6
       8
       11
       (Pair 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 67 (remaining gas: 1039867.263 units remaining)
+  - location: 67 (remaining gas: 1039873.333 units remaining)
     [ 18
       6
       8
       11
       (Pair 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 67 (remaining gas: 1039867.253 units remaining)
+  - location: 67 (remaining gas: 1039873.323 units remaining)
     [ 9
       18
       6
@@ -651,7 +651,7 @@ trace
       11
       (Pair 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 67 (remaining gas: 1039867.243 units remaining)
+  - location: 67 (remaining gas: 1039873.313 units remaining)
     [ 19
       9
       18
@@ -660,7 +660,7 @@ trace
       11
       (Pair 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 67 (remaining gas: 1039867.233 units remaining)
+  - location: 67 (remaining gas: 1039873.303 units remaining)
     [ 14
       19
       9
@@ -670,7 +670,7 @@ trace
       11
       (Pair 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 67 (remaining gas: 1039867.223 units remaining)
+  - location: 67 (remaining gas: 1039873.293 units remaining)
     [ 10
       14
       19
@@ -681,7 +681,7 @@ trace
       11
       (Pair 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 67 (remaining gas: 1039867.213 units remaining)
+  - location: 67 (remaining gas: 1039873.283 units remaining)
     [ 16
       10
       14
@@ -693,7 +693,7 @@ trace
       11
       (Pair 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 67 (remaining gas: 1039867.203 units remaining)
+  - location: 67 (remaining gas: 1039873.273 units remaining)
     [ 12
       16
       10
@@ -706,7 +706,7 @@ trace
       11
       (Pair 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 67 (remaining gas: 1039867.193 units remaining)
+  - location: 67 (remaining gas: 1039873.263 units remaining)
     [ 3
       12
       16
@@ -720,7 +720,7 @@ trace
       11
       (Pair 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 67 (remaining gas: 1039867.183 units remaining)
+  - location: 67 (remaining gas: 1039873.253 units remaining)
     [ 2
       3
       12
@@ -735,7 +735,7 @@ trace
       11
       (Pair 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 67 (remaining gas: 1039867.183 units remaining)
+  - location: 67 (remaining gas: 1039873.253 units remaining)
     [ 2
       3
       12
@@ -750,32 +750,32 @@ trace
       11
       (Pair 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 71 (remaining gas: 1039867.119 units remaining)
+  - location: 71 (remaining gas: 1039873.192 units remaining)
     [ (Pair 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 74 (remaining gas: 1039867.109 units remaining)
+  - location: 74 (remaining gas: 1039873.182 units remaining)
     [ 4
       (Pair 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 71 (remaining gas: 1039867.084 units remaining)
+  - location: 71 (remaining gas: 1039873.162 units remaining)
     [ 11
       4
       (Pair 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 71 (remaining gas: 1039867.074 units remaining)
+  - location: 71 (remaining gas: 1039873.152 units remaining)
     [ 8
       11
       4
       (Pair 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 71 (remaining gas: 1039867.064 units remaining)
+  - location: 71 (remaining gas: 1039873.142 units remaining)
     [ 6
       8
       11
       4
       (Pair 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 71 (remaining gas: 1039867.054 units remaining)
+  - location: 71 (remaining gas: 1039873.132 units remaining)
     [ 18
       6
       8
@@ -783,7 +783,7 @@ trace
       4
       (Pair 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 71 (remaining gas: 1039867.044 units remaining)
+  - location: 71 (remaining gas: 1039873.122 units remaining)
     [ 9
       18
       6
@@ -792,7 +792,7 @@ trace
       4
       (Pair 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 71 (remaining gas: 1039867.034 units remaining)
+  - location: 71 (remaining gas: 1039873.112 units remaining)
     [ 19
       9
       18
@@ -802,7 +802,7 @@ trace
       4
       (Pair 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 71 (remaining gas: 1039867.024 units remaining)
+  - location: 71 (remaining gas: 1039873.102 units remaining)
     [ 14
       19
       9
@@ -813,7 +813,7 @@ trace
       4
       (Pair 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 71 (remaining gas: 1039867.014 units remaining)
+  - location: 71 (remaining gas: 1039873.092 units remaining)
     [ 10
       14
       19
@@ -825,7 +825,7 @@ trace
       4
       (Pair 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 71 (remaining gas: 1039867.004 units remaining)
+  - location: 71 (remaining gas: 1039873.082 units remaining)
     [ 16
       10
       14
@@ -838,7 +838,7 @@ trace
       4
       (Pair 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 71 (remaining gas: 1039866.994 units remaining)
+  - location: 71 (remaining gas: 1039873.072 units remaining)
     [ 12
       16
       10
@@ -852,7 +852,7 @@ trace
       4
       (Pair 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 71 (remaining gas: 1039866.984 units remaining)
+  - location: 71 (remaining gas: 1039873.062 units remaining)
     [ 3
       12
       16
@@ -867,7 +867,7 @@ trace
       4
       (Pair 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 71 (remaining gas: 1039866.974 units remaining)
+  - location: 71 (remaining gas: 1039873.052 units remaining)
     [ 2
       3
       12
@@ -883,7 +883,7 @@ trace
       4
       (Pair 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 71 (remaining gas: 1039866.974 units remaining)
+  - location: 71 (remaining gas: 1039873.052 units remaining)
     [ 2
       3
       12
@@ -899,32 +899,32 @@ trace
       4
       (Pair 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 75 (remaining gas: 1039866.909 units remaining)
+  - location: 75 (remaining gas: 1039872.989 units remaining)
     [ (Pair 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 78 (remaining gas: 1039866.899 units remaining)
+  - location: 78 (remaining gas: 1039872.979 units remaining)
     [ 13
       (Pair 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 75 (remaining gas: 1039866.874 units remaining)
+  - location: 75 (remaining gas: 1039872.959 units remaining)
     [ 4
       13
       (Pair 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 75 (remaining gas: 1039866.864 units remaining)
+  - location: 75 (remaining gas: 1039872.949 units remaining)
     [ 11
       4
       13
       (Pair 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 75 (remaining gas: 1039866.854 units remaining)
+  - location: 75 (remaining gas: 1039872.939 units remaining)
     [ 8
       11
       4
       13
       (Pair 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 75 (remaining gas: 1039866.844 units remaining)
+  - location: 75 (remaining gas: 1039872.929 units remaining)
     [ 6
       8
       11
@@ -932,7 +932,7 @@ trace
       13
       (Pair 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 75 (remaining gas: 1039866.834 units remaining)
+  - location: 75 (remaining gas: 1039872.919 units remaining)
     [ 18
       6
       8
@@ -941,7 +941,7 @@ trace
       13
       (Pair 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 75 (remaining gas: 1039866.824 units remaining)
+  - location: 75 (remaining gas: 1039872.909 units remaining)
     [ 9
       18
       6
@@ -951,7 +951,7 @@ trace
       13
       (Pair 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 75 (remaining gas: 1039866.814 units remaining)
+  - location: 75 (remaining gas: 1039872.899 units remaining)
     [ 19
       9
       18
@@ -962,7 +962,7 @@ trace
       13
       (Pair 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 75 (remaining gas: 1039866.804 units remaining)
+  - location: 75 (remaining gas: 1039872.889 units remaining)
     [ 14
       19
       9
@@ -974,7 +974,7 @@ trace
       13
       (Pair 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 75 (remaining gas: 1039866.794 units remaining)
+  - location: 75 (remaining gas: 1039872.879 units remaining)
     [ 10
       14
       19
@@ -987,7 +987,7 @@ trace
       13
       (Pair 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 75 (remaining gas: 1039866.784 units remaining)
+  - location: 75 (remaining gas: 1039872.869 units remaining)
     [ 16
       10
       14
@@ -1001,7 +1001,7 @@ trace
       13
       (Pair 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 75 (remaining gas: 1039866.774 units remaining)
+  - location: 75 (remaining gas: 1039872.859 units remaining)
     [ 12
       16
       10
@@ -1016,7 +1016,7 @@ trace
       13
       (Pair 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 75 (remaining gas: 1039866.764 units remaining)
+  - location: 75 (remaining gas: 1039872.849 units remaining)
     [ 3
       12
       16
@@ -1032,7 +1032,7 @@ trace
       13
       (Pair 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 75 (remaining gas: 1039866.754 units remaining)
+  - location: 75 (remaining gas: 1039872.839 units remaining)
     [ 2
       3
       12
@@ -1049,7 +1049,7 @@ trace
       13
       (Pair 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 75 (remaining gas: 1039866.754 units remaining)
+  - location: 75 (remaining gas: 1039872.839 units remaining)
     [ 2
       3
       12
@@ -1066,32 +1066,32 @@ trace
       13
       (Pair 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 79 (remaining gas: 1039866.687 units remaining)
+  - location: 79 (remaining gas: 1039872.773 units remaining)
     [ (Pair 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 82 (remaining gas: 1039866.677 units remaining)
+  - location: 82 (remaining gas: 1039872.763 units remaining)
     [ 15
       (Pair 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 79 (remaining gas: 1039866.652 units remaining)
+  - location: 79 (remaining gas: 1039872.743 units remaining)
     [ 13
       15
       (Pair 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 79 (remaining gas: 1039866.642 units remaining)
+  - location: 79 (remaining gas: 1039872.733 units remaining)
     [ 4
       13
       15
       (Pair 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 79 (remaining gas: 1039866.632 units remaining)
+  - location: 79 (remaining gas: 1039872.723 units remaining)
     [ 11
       4
       13
       15
       (Pair 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 79 (remaining gas: 1039866.622 units remaining)
+  - location: 79 (remaining gas: 1039872.713 units remaining)
     [ 8
       11
       4
@@ -1099,7 +1099,7 @@ trace
       15
       (Pair 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 79 (remaining gas: 1039866.612 units remaining)
+  - location: 79 (remaining gas: 1039872.703 units remaining)
     [ 6
       8
       11
@@ -1108,7 +1108,7 @@ trace
       15
       (Pair 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 79 (remaining gas: 1039866.602 units remaining)
+  - location: 79 (remaining gas: 1039872.693 units remaining)
     [ 18
       6
       8
@@ -1118,7 +1118,7 @@ trace
       15
       (Pair 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 79 (remaining gas: 1039866.592 units remaining)
+  - location: 79 (remaining gas: 1039872.683 units remaining)
     [ 9
       18
       6
@@ -1129,7 +1129,7 @@ trace
       15
       (Pair 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 79 (remaining gas: 1039866.582 units remaining)
+  - location: 79 (remaining gas: 1039872.673 units remaining)
     [ 19
       9
       18
@@ -1141,7 +1141,7 @@ trace
       15
       (Pair 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 79 (remaining gas: 1039866.572 units remaining)
+  - location: 79 (remaining gas: 1039872.663 units remaining)
     [ 14
       19
       9
@@ -1154,7 +1154,7 @@ trace
       15
       (Pair 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 79 (remaining gas: 1039866.562 units remaining)
+  - location: 79 (remaining gas: 1039872.653 units remaining)
     [ 10
       14
       19
@@ -1168,7 +1168,7 @@ trace
       15
       (Pair 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 79 (remaining gas: 1039866.552 units remaining)
+  - location: 79 (remaining gas: 1039872.643 units remaining)
     [ 16
       10
       14
@@ -1183,7 +1183,7 @@ trace
       15
       (Pair 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 79 (remaining gas: 1039866.542 units remaining)
+  - location: 79 (remaining gas: 1039872.633 units remaining)
     [ 12
       16
       10
@@ -1199,7 +1199,7 @@ trace
       15
       (Pair 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 79 (remaining gas: 1039866.532 units remaining)
+  - location: 79 (remaining gas: 1039872.623 units remaining)
     [ 3
       12
       16
@@ -1216,7 +1216,7 @@ trace
       15
       (Pair 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 79 (remaining gas: 1039866.522 units remaining)
+  - location: 79 (remaining gas: 1039872.613 units remaining)
     [ 2
       3
       12
@@ -1234,7 +1234,7 @@ trace
       15
       (Pair 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 79 (remaining gas: 1039866.522 units remaining)
+  - location: 79 (remaining gas: 1039872.613 units remaining)
     [ 2
       3
       12
@@ -1252,32 +1252,32 @@ trace
       15
       (Pair 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 83 (remaining gas: 1039866.454 units remaining)
+  - location: 83 (remaining gas: 1039872.545 units remaining)
     [ (Pair 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 86 (remaining gas: 1039866.444 units remaining)
+  - location: 86 (remaining gas: 1039872.535 units remaining)
     [ 5
       1
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 83 (remaining gas: 1039866.419 units remaining)
+  - location: 83 (remaining gas: 1039872.515 units remaining)
     [ 15
       5
       1
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 83 (remaining gas: 1039866.409 units remaining)
+  - location: 83 (remaining gas: 1039872.505 units remaining)
     [ 13
       15
       5
       1
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 83 (remaining gas: 1039866.399 units remaining)
+  - location: 83 (remaining gas: 1039872.495 units remaining)
     [ 4
       13
       15
       5
       1
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 83 (remaining gas: 1039866.389 units remaining)
+  - location: 83 (remaining gas: 1039872.485 units remaining)
     [ 11
       4
       13
@@ -1285,7 +1285,7 @@ trace
       5
       1
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 83 (remaining gas: 1039866.379 units remaining)
+  - location: 83 (remaining gas: 1039872.475 units remaining)
     [ 8
       11
       4
@@ -1294,7 +1294,7 @@ trace
       5
       1
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 83 (remaining gas: 1039866.369 units remaining)
+  - location: 83 (remaining gas: 1039872.465 units remaining)
     [ 6
       8
       11
@@ -1304,7 +1304,7 @@ trace
       5
       1
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 83 (remaining gas: 1039866.359 units remaining)
+  - location: 83 (remaining gas: 1039872.455 units remaining)
     [ 18
       6
       8
@@ -1315,7 +1315,7 @@ trace
       5
       1
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 83 (remaining gas: 1039866.349 units remaining)
+  - location: 83 (remaining gas: 1039872.445 units remaining)
     [ 9
       18
       6
@@ -1327,7 +1327,7 @@ trace
       5
       1
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 83 (remaining gas: 1039866.339 units remaining)
+  - location: 83 (remaining gas: 1039872.435 units remaining)
     [ 19
       9
       18
@@ -1340,7 +1340,7 @@ trace
       5
       1
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 83 (remaining gas: 1039866.329 units remaining)
+  - location: 83 (remaining gas: 1039872.425 units remaining)
     [ 14
       19
       9
@@ -1354,7 +1354,7 @@ trace
       5
       1
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 83 (remaining gas: 1039866.319 units remaining)
+  - location: 83 (remaining gas: 1039872.415 units remaining)
     [ 10
       14
       19
@@ -1369,7 +1369,7 @@ trace
       5
       1
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 83 (remaining gas: 1039866.309 units remaining)
+  - location: 83 (remaining gas: 1039872.405 units remaining)
     [ 16
       10
       14
@@ -1385,7 +1385,7 @@ trace
       5
       1
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 83 (remaining gas: 1039866.299 units remaining)
+  - location: 83 (remaining gas: 1039872.395 units remaining)
     [ 12
       16
       10
@@ -1402,7 +1402,7 @@ trace
       5
       1
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 83 (remaining gas: 1039866.289 units remaining)
+  - location: 83 (remaining gas: 1039872.385 units remaining)
     [ 3
       12
       16
@@ -1420,7 +1420,7 @@ trace
       5
       1
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 83 (remaining gas: 1039866.279 units remaining)
+  - location: 83 (remaining gas: 1039872.375 units remaining)
     [ 2
       3
       12
@@ -1439,7 +1439,7 @@ trace
       5
       1
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 83 (remaining gas: 1039866.279 units remaining)
+  - location: 83 (remaining gas: 1039872.375 units remaining)
     [ 2
       3
       12
@@ -1458,7 +1458,7 @@ trace
       5
       1
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 87 (remaining gas: 1039866.219 units remaining)
+  - location: 87 (remaining gas: 1039872.345 units remaining)
     [ 2
       3
       12
@@ -1477,7 +1477,7 @@ trace
       5
       1
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 89 (remaining gas: 1039866.153 units remaining)
+  - location: 89 (remaining gas: 1039872.309 units remaining)
     [ 3
       2
       12
@@ -1496,7 +1496,7 @@ trace
       5
       1
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 91 (remaining gas: 1039866.080 units remaining)
+  - location: 91 (remaining gas: 1039872.266 units remaining)
     [ 12
       3
       2
@@ -1515,7 +1515,7 @@ trace
       5
       1
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 93 (remaining gas: 1039866.001 units remaining)
+  - location: 93 (remaining gas: 1039872.217 units remaining)
     [ 16
       12
       3
@@ -1534,7 +1534,7 @@ trace
       5
       1
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 95 (remaining gas: 1039865.914 units remaining)
+  - location: 95 (remaining gas: 1039872.160 units remaining)
     [ 10
       16
       12
@@ -1553,7 +1553,7 @@ trace
       5
       1
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 97 (remaining gas: 1039865.821 units remaining)
+  - location: 97 (remaining gas: 1039872.097 units remaining)
     [ 14
       10
       16
@@ -1572,7 +1572,7 @@ trace
       5
       1
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 99 (remaining gas: 1039865.721 units remaining)
+  - location: 99 (remaining gas: 1039872.027 units remaining)
     [ 19
       14
       10
@@ -1591,7 +1591,7 @@ trace
       5
       1
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 101 (remaining gas: 1039865.615 units remaining)
+  - location: 101 (remaining gas: 1039871.951 units remaining)
     [ 9
       19
       14
@@ -1610,7 +1610,7 @@ trace
       5
       1
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 103 (remaining gas: 1039865.501 units remaining)
+  - location: 103 (remaining gas: 1039871.867 units remaining)
     [ 18
       9
       19
@@ -1629,7 +1629,7 @@ trace
       5
       1
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 105 (remaining gas: 1039865.381 units remaining)
+  - location: 105 (remaining gas: 1039871.777 units remaining)
     [ 6
       18
       9
@@ -1648,7 +1648,7 @@ trace
       5
       1
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 107 (remaining gas: 1039865.254 units remaining)
+  - location: 107 (remaining gas: 1039871.680 units remaining)
     [ 8
       6
       18
@@ -1667,7 +1667,7 @@ trace
       5
       1
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 109 (remaining gas: 1039865.121 units remaining)
+  - location: 109 (remaining gas: 1039871.577 units remaining)
     [ 11
       8
       6
@@ -1686,7 +1686,7 @@ trace
       5
       1
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 111 (remaining gas: 1039864.980 units remaining)
+  - location: 111 (remaining gas: 1039871.466 units remaining)
     [ 4
       11
       8
@@ -1705,7 +1705,7 @@ trace
       5
       1
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 113 (remaining gas: 1039864.833 units remaining)
+  - location: 113 (remaining gas: 1039871.349 units remaining)
     [ 13
       4
       11
@@ -1724,7 +1724,7 @@ trace
       5
       1
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 115 (remaining gas: 1039864.679 units remaining)
+  - location: 115 (remaining gas: 1039871.225 units remaining)
     [ 15
       13
       4
@@ -1743,7 +1743,7 @@ trace
       5
       1
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 117 (remaining gas: 1039864.519 units remaining)
+  - location: 117 (remaining gas: 1039871.095 units remaining)
     [ 5
       15
       13
@@ -1762,7 +1762,7 @@ trace
       2
       1
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 119 (remaining gas: 1039864.351 units remaining)
+  - location: 119 (remaining gas: 1039870.957 units remaining)
     [ 1
       5
       15
@@ -1781,7 +1781,7 @@ trace
       3
       2
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 121 (remaining gas: 1039864.291 units remaining)
+  - location: 121 (remaining gas: 1039870.927 units remaining)
     [ 1
       5
       15
@@ -1800,7 +1800,7 @@ trace
       3
       2
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 123 (remaining gas: 1039864.225 units remaining)
+  - location: 123 (remaining gas: 1039870.891 units remaining)
     [ 5
       1
       15
@@ -1819,7 +1819,7 @@ trace
       3
       2
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 125 (remaining gas: 1039864.152 units remaining)
+  - location: 125 (remaining gas: 1039870.848 units remaining)
     [ 15
       5
       1
@@ -1838,7 +1838,7 @@ trace
       3
       2
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 127 (remaining gas: 1039864.073 units remaining)
+  - location: 127 (remaining gas: 1039870.799 units remaining)
     [ 13
       15
       5
@@ -1857,7 +1857,7 @@ trace
       3
       2
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 129 (remaining gas: 1039863.986 units remaining)
+  - location: 129 (remaining gas: 1039870.742 units remaining)
     [ 4
       13
       15
@@ -1876,7 +1876,7 @@ trace
       3
       2
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 131 (remaining gas: 1039863.893 units remaining)
+  - location: 131 (remaining gas: 1039870.679 units remaining)
     [ 11
       4
       13
@@ -1895,7 +1895,7 @@ trace
       3
       2
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 133 (remaining gas: 1039863.793 units remaining)
+  - location: 133 (remaining gas: 1039870.609 units remaining)
     [ 8
       11
       4
@@ -1914,7 +1914,7 @@ trace
       3
       2
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 135 (remaining gas: 1039863.687 units remaining)
+  - location: 135 (remaining gas: 1039870.533 units remaining)
     [ 6
       8
       11
@@ -1933,7 +1933,7 @@ trace
       3
       2
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 137 (remaining gas: 1039863.573 units remaining)
+  - location: 137 (remaining gas: 1039870.449 units remaining)
     [ 18
       6
       8
@@ -1952,7 +1952,7 @@ trace
       3
       2
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 139 (remaining gas: 1039863.453 units remaining)
+  - location: 139 (remaining gas: 1039870.359 units remaining)
     [ 9
       18
       6
@@ -1971,7 +1971,7 @@ trace
       3
       2
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 141 (remaining gas: 1039863.326 units remaining)
+  - location: 141 (remaining gas: 1039870.262 units remaining)
     [ 19
       9
       18
@@ -1990,7 +1990,7 @@ trace
       3
       2
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 143 (remaining gas: 1039863.193 units remaining)
+  - location: 143 (remaining gas: 1039870.159 units remaining)
     [ 14
       19
       9
@@ -2009,7 +2009,7 @@ trace
       3
       2
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 145 (remaining gas: 1039863.052 units remaining)
+  - location: 145 (remaining gas: 1039870.048 units remaining)
     [ 10
       14
       19
@@ -2028,7 +2028,7 @@ trace
       3
       2
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 147 (remaining gas: 1039862.905 units remaining)
+  - location: 147 (remaining gas: 1039869.931 units remaining)
     [ 16
       10
       14
@@ -2047,7 +2047,7 @@ trace
       3
       2
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 149 (remaining gas: 1039862.751 units remaining)
+  - location: 149 (remaining gas: 1039869.807 units remaining)
     [ 12
       16
       10
@@ -2066,7 +2066,7 @@ trace
       3
       2
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 151 (remaining gas: 1039862.591 units remaining)
+  - location: 151 (remaining gas: 1039869.677 units remaining)
     [ 3
       12
       16
@@ -2085,7 +2085,7 @@ trace
       1
       2
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 153 (remaining gas: 1039862.423 units remaining)
+  - location: 153 (remaining gas: 1039869.539 units remaining)
     [ 2
       3
       12
@@ -2104,36 +2104,36 @@ trace
       5
       1
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 156 (remaining gas: 1039862.355 units remaining)
+  - location: 156 (remaining gas: 1039869.471 units remaining)
     [ 5
       1
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 159 (remaining gas: 1039862.340 units remaining)
+  - location: 159 (remaining gas: 1039869.461 units remaining)
     [ (Pair 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 156 (remaining gas: 1039862.315 units remaining)
+  - location: 156 (remaining gas: 1039869.441 units remaining)
     [ 15
       (Pair 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 156 (remaining gas: 1039862.305 units remaining)
+  - location: 156 (remaining gas: 1039869.431 units remaining)
     [ 13
       15
       (Pair 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 156 (remaining gas: 1039862.295 units remaining)
+  - location: 156 (remaining gas: 1039869.421 units remaining)
     [ 4
       13
       15
       (Pair 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 156 (remaining gas: 1039862.285 units remaining)
+  - location: 156 (remaining gas: 1039869.411 units remaining)
     [ 11
       4
       13
       15
       (Pair 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 156 (remaining gas: 1039862.275 units remaining)
+  - location: 156 (remaining gas: 1039869.401 units remaining)
     [ 8
       11
       4
@@ -2141,7 +2141,7 @@ trace
       15
       (Pair 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 156 (remaining gas: 1039862.265 units remaining)
+  - location: 156 (remaining gas: 1039869.391 units remaining)
     [ 6
       8
       11
@@ -2150,7 +2150,7 @@ trace
       15
       (Pair 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 156 (remaining gas: 1039862.255 units remaining)
+  - location: 156 (remaining gas: 1039869.381 units remaining)
     [ 18
       6
       8
@@ -2160,7 +2160,7 @@ trace
       15
       (Pair 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 156 (remaining gas: 1039862.245 units remaining)
+  - location: 156 (remaining gas: 1039869.371 units remaining)
     [ 9
       18
       6
@@ -2171,7 +2171,7 @@ trace
       15
       (Pair 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 156 (remaining gas: 1039862.235 units remaining)
+  - location: 156 (remaining gas: 1039869.361 units remaining)
     [ 19
       9
       18
@@ -2183,7 +2183,7 @@ trace
       15
       (Pair 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 156 (remaining gas: 1039862.225 units remaining)
+  - location: 156 (remaining gas: 1039869.351 units remaining)
     [ 14
       19
       9
@@ -2196,7 +2196,7 @@ trace
       15
       (Pair 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 156 (remaining gas: 1039862.215 units remaining)
+  - location: 156 (remaining gas: 1039869.341 units remaining)
     [ 10
       14
       19
@@ -2210,7 +2210,7 @@ trace
       15
       (Pair 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 156 (remaining gas: 1039862.205 units remaining)
+  - location: 156 (remaining gas: 1039869.331 units remaining)
     [ 16
       10
       14
@@ -2225,7 +2225,7 @@ trace
       15
       (Pair 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 156 (remaining gas: 1039862.195 units remaining)
+  - location: 156 (remaining gas: 1039869.321 units remaining)
     [ 12
       16
       10
@@ -2241,7 +2241,7 @@ trace
       15
       (Pair 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 156 (remaining gas: 1039862.185 units remaining)
+  - location: 156 (remaining gas: 1039869.311 units remaining)
     [ 3
       12
       16
@@ -2258,7 +2258,7 @@ trace
       15
       (Pair 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 156 (remaining gas: 1039862.175 units remaining)
+  - location: 156 (remaining gas: 1039869.301 units remaining)
     [ 2
       3
       12
@@ -2276,7 +2276,7 @@ trace
       15
       (Pair 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 156 (remaining gas: 1039862.175 units remaining)
+  - location: 156 (remaining gas: 1039869.301 units remaining)
     [ 2
       3
       12
@@ -2294,36 +2294,36 @@ trace
       15
       (Pair 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 160 (remaining gas: 1039862.108 units remaining)
+  - location: 160 (remaining gas: 1039869.235 units remaining)
     [ 15
       (Pair 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 163 (remaining gas: 1039862.093 units remaining)
+  - location: 163 (remaining gas: 1039869.225 units remaining)
     [ (Pair 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 160 (remaining gas: 1039862.068 units remaining)
+  - location: 160 (remaining gas: 1039869.205 units remaining)
     [ 13
       (Pair 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 160 (remaining gas: 1039862.058 units remaining)
+  - location: 160 (remaining gas: 1039869.195 units remaining)
     [ 4
       13
       (Pair 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 160 (remaining gas: 1039862.048 units remaining)
+  - location: 160 (remaining gas: 1039869.185 units remaining)
     [ 11
       4
       13
       (Pair 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 160 (remaining gas: 1039862.038 units remaining)
+  - location: 160 (remaining gas: 1039869.175 units remaining)
     [ 8
       11
       4
       13
       (Pair 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 160 (remaining gas: 1039862.028 units remaining)
+  - location: 160 (remaining gas: 1039869.165 units remaining)
     [ 6
       8
       11
@@ -2331,7 +2331,7 @@ trace
       13
       (Pair 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 160 (remaining gas: 1039862.018 units remaining)
+  - location: 160 (remaining gas: 1039869.155 units remaining)
     [ 18
       6
       8
@@ -2340,7 +2340,7 @@ trace
       13
       (Pair 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 160 (remaining gas: 1039862.008 units remaining)
+  - location: 160 (remaining gas: 1039869.145 units remaining)
     [ 9
       18
       6
@@ -2350,7 +2350,7 @@ trace
       13
       (Pair 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 160 (remaining gas: 1039861.998 units remaining)
+  - location: 160 (remaining gas: 1039869.135 units remaining)
     [ 19
       9
       18
@@ -2361,7 +2361,7 @@ trace
       13
       (Pair 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 160 (remaining gas: 1039861.988 units remaining)
+  - location: 160 (remaining gas: 1039869.125 units remaining)
     [ 14
       19
       9
@@ -2373,7 +2373,7 @@ trace
       13
       (Pair 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 160 (remaining gas: 1039861.978 units remaining)
+  - location: 160 (remaining gas: 1039869.115 units remaining)
     [ 10
       14
       19
@@ -2386,7 +2386,7 @@ trace
       13
       (Pair 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 160 (remaining gas: 1039861.968 units remaining)
+  - location: 160 (remaining gas: 1039869.105 units remaining)
     [ 16
       10
       14
@@ -2400,7 +2400,7 @@ trace
       13
       (Pair 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 160 (remaining gas: 1039861.958 units remaining)
+  - location: 160 (remaining gas: 1039869.095 units remaining)
     [ 12
       16
       10
@@ -2415,7 +2415,7 @@ trace
       13
       (Pair 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 160 (remaining gas: 1039861.948 units remaining)
+  - location: 160 (remaining gas: 1039869.085 units remaining)
     [ 3
       12
       16
@@ -2431,7 +2431,7 @@ trace
       13
       (Pair 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 160 (remaining gas: 1039861.938 units remaining)
+  - location: 160 (remaining gas: 1039869.075 units remaining)
     [ 2
       3
       12
@@ -2448,7 +2448,7 @@ trace
       13
       (Pair 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 160 (remaining gas: 1039861.938 units remaining)
+  - location: 160 (remaining gas: 1039869.075 units remaining)
     [ 2
       3
       12
@@ -2465,36 +2465,36 @@ trace
       13
       (Pair 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 164 (remaining gas: 1039861.873 units remaining)
+  - location: 164 (remaining gas: 1039869.012 units remaining)
     [ 13
       (Pair 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 167 (remaining gas: 1039861.858 units remaining)
+  - location: 167 (remaining gas: 1039869.002 units remaining)
     [ (Pair 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 164 (remaining gas: 1039861.833 units remaining)
+  - location: 164 (remaining gas: 1039868.982 units remaining)
     [ 4
       (Pair 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 164 (remaining gas: 1039861.823 units remaining)
+  - location: 164 (remaining gas: 1039868.972 units remaining)
     [ 11
       4
       (Pair 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 164 (remaining gas: 1039861.813 units remaining)
+  - location: 164 (remaining gas: 1039868.962 units remaining)
     [ 8
       11
       4
       (Pair 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 164 (remaining gas: 1039861.803 units remaining)
+  - location: 164 (remaining gas: 1039868.952 units remaining)
     [ 6
       8
       11
       4
       (Pair 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 164 (remaining gas: 1039861.793 units remaining)
+  - location: 164 (remaining gas: 1039868.942 units remaining)
     [ 18
       6
       8
@@ -2502,7 +2502,7 @@ trace
       4
       (Pair 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 164 (remaining gas: 1039861.783 units remaining)
+  - location: 164 (remaining gas: 1039868.932 units remaining)
     [ 9
       18
       6
@@ -2511,7 +2511,7 @@ trace
       4
       (Pair 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 164 (remaining gas: 1039861.773 units remaining)
+  - location: 164 (remaining gas: 1039868.922 units remaining)
     [ 19
       9
       18
@@ -2521,7 +2521,7 @@ trace
       4
       (Pair 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 164 (remaining gas: 1039861.763 units remaining)
+  - location: 164 (remaining gas: 1039868.912 units remaining)
     [ 14
       19
       9
@@ -2532,7 +2532,7 @@ trace
       4
       (Pair 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 164 (remaining gas: 1039861.753 units remaining)
+  - location: 164 (remaining gas: 1039868.902 units remaining)
     [ 10
       14
       19
@@ -2544,7 +2544,7 @@ trace
       4
       (Pair 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 164 (remaining gas: 1039861.743 units remaining)
+  - location: 164 (remaining gas: 1039868.892 units remaining)
     [ 16
       10
       14
@@ -2557,7 +2557,7 @@ trace
       4
       (Pair 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 164 (remaining gas: 1039861.733 units remaining)
+  - location: 164 (remaining gas: 1039868.882 units remaining)
     [ 12
       16
       10
@@ -2571,7 +2571,7 @@ trace
       4
       (Pair 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 164 (remaining gas: 1039861.723 units remaining)
+  - location: 164 (remaining gas: 1039868.872 units remaining)
     [ 3
       12
       16
@@ -2586,7 +2586,7 @@ trace
       4
       (Pair 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 164 (remaining gas: 1039861.713 units remaining)
+  - location: 164 (remaining gas: 1039868.862 units remaining)
     [ 2
       3
       12
@@ -2602,7 +2602,7 @@ trace
       4
       (Pair 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 164 (remaining gas: 1039861.713 units remaining)
+  - location: 164 (remaining gas: 1039868.862 units remaining)
     [ 2
       3
       12
@@ -2618,36 +2618,36 @@ trace
       4
       (Pair 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 168 (remaining gas: 1039861.649 units remaining)
+  - location: 168 (remaining gas: 1039868.801 units remaining)
     [ 4
       (Pair 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 171 (remaining gas: 1039861.634 units remaining)
+  - location: 171 (remaining gas: 1039868.791 units remaining)
     [ (Pair 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 168 (remaining gas: 1039861.609 units remaining)
+  - location: 168 (remaining gas: 1039868.771 units remaining)
     [ 11
       (Pair 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 168 (remaining gas: 1039861.599 units remaining)
+  - location: 168 (remaining gas: 1039868.761 units remaining)
     [ 8
       11
       (Pair 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 168 (remaining gas: 1039861.589 units remaining)
+  - location: 168 (remaining gas: 1039868.751 units remaining)
     [ 6
       8
       11
       (Pair 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 168 (remaining gas: 1039861.579 units remaining)
+  - location: 168 (remaining gas: 1039868.741 units remaining)
     [ 18
       6
       8
       11
       (Pair 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 168 (remaining gas: 1039861.569 units remaining)
+  - location: 168 (remaining gas: 1039868.731 units remaining)
     [ 9
       18
       6
@@ -2655,7 +2655,7 @@ trace
       11
       (Pair 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 168 (remaining gas: 1039861.559 units remaining)
+  - location: 168 (remaining gas: 1039868.721 units remaining)
     [ 19
       9
       18
@@ -2664,7 +2664,7 @@ trace
       11
       (Pair 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 168 (remaining gas: 1039861.549 units remaining)
+  - location: 168 (remaining gas: 1039868.711 units remaining)
     [ 14
       19
       9
@@ -2674,7 +2674,7 @@ trace
       11
       (Pair 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 168 (remaining gas: 1039861.539 units remaining)
+  - location: 168 (remaining gas: 1039868.701 units remaining)
     [ 10
       14
       19
@@ -2685,7 +2685,7 @@ trace
       11
       (Pair 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 168 (remaining gas: 1039861.529 units remaining)
+  - location: 168 (remaining gas: 1039868.691 units remaining)
     [ 16
       10
       14
@@ -2697,7 +2697,7 @@ trace
       11
       (Pair 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 168 (remaining gas: 1039861.519 units remaining)
+  - location: 168 (remaining gas: 1039868.681 units remaining)
     [ 12
       16
       10
@@ -2710,7 +2710,7 @@ trace
       11
       (Pair 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 168 (remaining gas: 1039861.509 units remaining)
+  - location: 168 (remaining gas: 1039868.671 units remaining)
     [ 3
       12
       16
@@ -2724,7 +2724,7 @@ trace
       11
       (Pair 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 168 (remaining gas: 1039861.499 units remaining)
+  - location: 168 (remaining gas: 1039868.661 units remaining)
     [ 2
       3
       12
@@ -2739,7 +2739,7 @@ trace
       11
       (Pair 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 168 (remaining gas: 1039861.499 units remaining)
+  - location: 168 (remaining gas: 1039868.661 units remaining)
     [ 2
       3
       12
@@ -2754,36 +2754,36 @@ trace
       11
       (Pair 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 172 (remaining gas: 1039861.437 units remaining)
+  - location: 172 (remaining gas: 1039868.603 units remaining)
     [ 11
       (Pair 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 175 (remaining gas: 1039861.422 units remaining)
+  - location: 175 (remaining gas: 1039868.593 units remaining)
     [ (Pair 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 172 (remaining gas: 1039861.397 units remaining)
+  - location: 172 (remaining gas: 1039868.573 units remaining)
     [ 8
       (Pair 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 172 (remaining gas: 1039861.387 units remaining)
+  - location: 172 (remaining gas: 1039868.563 units remaining)
     [ 6
       8
       (Pair 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 172 (remaining gas: 1039861.377 units remaining)
+  - location: 172 (remaining gas: 1039868.553 units remaining)
     [ 18
       6
       8
       (Pair 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 172 (remaining gas: 1039861.367 units remaining)
+  - location: 172 (remaining gas: 1039868.543 units remaining)
     [ 9
       18
       6
       8
       (Pair 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 172 (remaining gas: 1039861.357 units remaining)
+  - location: 172 (remaining gas: 1039868.533 units remaining)
     [ 19
       9
       18
@@ -2791,7 +2791,7 @@ trace
       8
       (Pair 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 172 (remaining gas: 1039861.347 units remaining)
+  - location: 172 (remaining gas: 1039868.523 units remaining)
     [ 14
       19
       9
@@ -2800,7 +2800,7 @@ trace
       8
       (Pair 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 172 (remaining gas: 1039861.337 units remaining)
+  - location: 172 (remaining gas: 1039868.513 units remaining)
     [ 10
       14
       19
@@ -2810,7 +2810,7 @@ trace
       8
       (Pair 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 172 (remaining gas: 1039861.327 units remaining)
+  - location: 172 (remaining gas: 1039868.503 units remaining)
     [ 16
       10
       14
@@ -2821,7 +2821,7 @@ trace
       8
       (Pair 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 172 (remaining gas: 1039861.317 units remaining)
+  - location: 172 (remaining gas: 1039868.493 units remaining)
     [ 12
       16
       10
@@ -2833,7 +2833,7 @@ trace
       8
       (Pair 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 172 (remaining gas: 1039861.307 units remaining)
+  - location: 172 (remaining gas: 1039868.483 units remaining)
     [ 3
       12
       16
@@ -2846,7 +2846,7 @@ trace
       8
       (Pair 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 172 (remaining gas: 1039861.297 units remaining)
+  - location: 172 (remaining gas: 1039868.473 units remaining)
     [ 2
       3
       12
@@ -2860,7 +2860,7 @@ trace
       8
       (Pair 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 172 (remaining gas: 1039861.297 units remaining)
+  - location: 172 (remaining gas: 1039868.473 units remaining)
     [ 2
       3
       12
@@ -2874,36 +2874,36 @@ trace
       8
       (Pair 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 176 (remaining gas: 1039861.236 units remaining)
+  - location: 176 (remaining gas: 1039868.417 units remaining)
     [ 8
       (Pair 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 179 (remaining gas: 1039861.221 units remaining)
+  - location: 179 (remaining gas: 1039868.407 units remaining)
     [ (Pair 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 176 (remaining gas: 1039861.196 units remaining)
+  - location: 176 (remaining gas: 1039868.387 units remaining)
     [ 6
       (Pair 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 176 (remaining gas: 1039861.186 units remaining)
+  - location: 176 (remaining gas: 1039868.377 units remaining)
     [ 18
       6
       (Pair 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 176 (remaining gas: 1039861.176 units remaining)
+  - location: 176 (remaining gas: 1039868.367 units remaining)
     [ 9
       18
       6
       (Pair 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 176 (remaining gas: 1039861.166 units remaining)
+  - location: 176 (remaining gas: 1039868.357 units remaining)
     [ 19
       9
       18
       6
       (Pair 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 176 (remaining gas: 1039861.156 units remaining)
+  - location: 176 (remaining gas: 1039868.347 units remaining)
     [ 14
       19
       9
@@ -2911,7 +2911,7 @@ trace
       6
       (Pair 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 176 (remaining gas: 1039861.146 units remaining)
+  - location: 176 (remaining gas: 1039868.337 units remaining)
     [ 10
       14
       19
@@ -2920,7 +2920,7 @@ trace
       6
       (Pair 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 176 (remaining gas: 1039861.136 units remaining)
+  - location: 176 (remaining gas: 1039868.327 units remaining)
     [ 16
       10
       14
@@ -2930,7 +2930,7 @@ trace
       6
       (Pair 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 176 (remaining gas: 1039861.126 units remaining)
+  - location: 176 (remaining gas: 1039868.317 units remaining)
     [ 12
       16
       10
@@ -2941,7 +2941,7 @@ trace
       6
       (Pair 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 176 (remaining gas: 1039861.116 units remaining)
+  - location: 176 (remaining gas: 1039868.307 units remaining)
     [ 3
       12
       16
@@ -2953,7 +2953,7 @@ trace
       6
       (Pair 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 176 (remaining gas: 1039861.106 units remaining)
+  - location: 176 (remaining gas: 1039868.297 units remaining)
     [ 2
       3
       12
@@ -2966,7 +2966,7 @@ trace
       6
       (Pair 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 176 (remaining gas: 1039861.106 units remaining)
+  - location: 176 (remaining gas: 1039868.297 units remaining)
     [ 2
       3
       12
@@ -2979,36 +2979,36 @@ trace
       6
       (Pair 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 180 (remaining gas: 1039861.047 units remaining)
+  - location: 180 (remaining gas: 1039868.244 units remaining)
     [ 6
       (Pair 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 183 (remaining gas: 1039861.032 units remaining)
+  - location: 183 (remaining gas: 1039868.234 units remaining)
     [ (Pair 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 180 (remaining gas: 1039861.007 units remaining)
+  - location: 180 (remaining gas: 1039868.214 units remaining)
     [ 18
       (Pair 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 180 (remaining gas: 1039860.997 units remaining)
+  - location: 180 (remaining gas: 1039868.204 units remaining)
     [ 9
       18
       (Pair 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 180 (remaining gas: 1039860.987 units remaining)
+  - location: 180 (remaining gas: 1039868.194 units remaining)
     [ 19
       9
       18
       (Pair 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 180 (remaining gas: 1039860.977 units remaining)
+  - location: 180 (remaining gas: 1039868.184 units remaining)
     [ 14
       19
       9
       18
       (Pair 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 180 (remaining gas: 1039860.967 units remaining)
+  - location: 180 (remaining gas: 1039868.174 units remaining)
     [ 10
       14
       19
@@ -3016,7 +3016,7 @@ trace
       18
       (Pair 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 180 (remaining gas: 1039860.957 units remaining)
+  - location: 180 (remaining gas: 1039868.164 units remaining)
     [ 16
       10
       14
@@ -3025,7 +3025,7 @@ trace
       18
       (Pair 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 180 (remaining gas: 1039860.947 units remaining)
+  - location: 180 (remaining gas: 1039868.154 units remaining)
     [ 12
       16
       10
@@ -3035,7 +3035,7 @@ trace
       18
       (Pair 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 180 (remaining gas: 1039860.937 units remaining)
+  - location: 180 (remaining gas: 1039868.144 units remaining)
     [ 3
       12
       16
@@ -3046,7 +3046,7 @@ trace
       18
       (Pair 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 180 (remaining gas: 1039860.927 units remaining)
+  - location: 180 (remaining gas: 1039868.134 units remaining)
     [ 2
       3
       12
@@ -3058,7 +3058,7 @@ trace
       18
       (Pair 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 180 (remaining gas: 1039860.927 units remaining)
+  - location: 180 (remaining gas: 1039868.134 units remaining)
     [ 2
       3
       12
@@ -3070,36 +3070,36 @@ trace
       18
       (Pair 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 184 (remaining gas: 1039860.869 units remaining)
+  - location: 184 (remaining gas: 1039868.083 units remaining)
     [ 18
       (Pair 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 187 (remaining gas: 1039860.854 units remaining)
+  - location: 187 (remaining gas: 1039868.073 units remaining)
     [ (Pair 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 184 (remaining gas: 1039860.829 units remaining)
+  - location: 184 (remaining gas: 1039868.053 units remaining)
     [ 9
       (Pair 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 184 (remaining gas: 1039860.819 units remaining)
+  - location: 184 (remaining gas: 1039868.043 units remaining)
     [ 19
       9
       (Pair 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 184 (remaining gas: 1039860.809 units remaining)
+  - location: 184 (remaining gas: 1039868.033 units remaining)
     [ 14
       19
       9
       (Pair 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 184 (remaining gas: 1039860.799 units remaining)
+  - location: 184 (remaining gas: 1039868.023 units remaining)
     [ 10
       14
       19
       9
       (Pair 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 184 (remaining gas: 1039860.789 units remaining)
+  - location: 184 (remaining gas: 1039868.013 units remaining)
     [ 16
       10
       14
@@ -3107,7 +3107,7 @@ trace
       9
       (Pair 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 184 (remaining gas: 1039860.779 units remaining)
+  - location: 184 (remaining gas: 1039868.003 units remaining)
     [ 12
       16
       10
@@ -3116,7 +3116,7 @@ trace
       9
       (Pair 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 184 (remaining gas: 1039860.769 units remaining)
+  - location: 184 (remaining gas: 1039867.993 units remaining)
     [ 3
       12
       16
@@ -3126,7 +3126,7 @@ trace
       9
       (Pair 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 184 (remaining gas: 1039860.759 units remaining)
+  - location: 184 (remaining gas: 1039867.983 units remaining)
     [ 2
       3
       12
@@ -3137,7 +3137,7 @@ trace
       9
       (Pair 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 184 (remaining gas: 1039860.759 units remaining)
+  - location: 184 (remaining gas: 1039867.983 units remaining)
     [ 2
       3
       12
@@ -3148,36 +3148,36 @@ trace
       9
       (Pair 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 188 (remaining gas: 1039860.704 units remaining)
+  - location: 188 (remaining gas: 1039867.936 units remaining)
     [ 9
       (Pair 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 191 (remaining gas: 1039860.689 units remaining)
+  - location: 191 (remaining gas: 1039867.926 units remaining)
     [ (Pair 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 188 (remaining gas: 1039860.664 units remaining)
+  - location: 188 (remaining gas: 1039867.906 units remaining)
     [ 19
       (Pair 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 188 (remaining gas: 1039860.654 units remaining)
+  - location: 188 (remaining gas: 1039867.896 units remaining)
     [ 14
       19
       (Pair 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 188 (remaining gas: 1039860.644 units remaining)
+  - location: 188 (remaining gas: 1039867.886 units remaining)
     [ 10
       14
       19
       (Pair 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 188 (remaining gas: 1039860.634 units remaining)
+  - location: 188 (remaining gas: 1039867.876 units remaining)
     [ 16
       10
       14
       19
       (Pair 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 188 (remaining gas: 1039860.624 units remaining)
+  - location: 188 (remaining gas: 1039867.866 units remaining)
     [ 12
       16
       10
@@ -3185,7 +3185,7 @@ trace
       19
       (Pair 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 188 (remaining gas: 1039860.614 units remaining)
+  - location: 188 (remaining gas: 1039867.856 units remaining)
     [ 3
       12
       16
@@ -3194,7 +3194,7 @@ trace
       19
       (Pair 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 188 (remaining gas: 1039860.604 units remaining)
+  - location: 188 (remaining gas: 1039867.846 units remaining)
     [ 2
       3
       12
@@ -3204,7 +3204,7 @@ trace
       19
       (Pair 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 188 (remaining gas: 1039860.604 units remaining)
+  - location: 188 (remaining gas: 1039867.846 units remaining)
     [ 2
       3
       12
@@ -3214,36 +3214,36 @@ trace
       19
       (Pair 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 192 (remaining gas: 1039860.550 units remaining)
+  - location: 192 (remaining gas: 1039867.801 units remaining)
     [ 19
       (Pair 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 195 (remaining gas: 1039860.535 units remaining)
+  - location: 195 (remaining gas: 1039867.791 units remaining)
     [ (Pair 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 192 (remaining gas: 1039860.510 units remaining)
+  - location: 192 (remaining gas: 1039867.771 units remaining)
     [ 14
       (Pair 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 192 (remaining gas: 1039860.500 units remaining)
+  - location: 192 (remaining gas: 1039867.761 units remaining)
     [ 10
       14
       (Pair 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 192 (remaining gas: 1039860.490 units remaining)
+  - location: 192 (remaining gas: 1039867.751 units remaining)
     [ 16
       10
       14
       (Pair 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 192 (remaining gas: 1039860.480 units remaining)
+  - location: 192 (remaining gas: 1039867.741 units remaining)
     [ 12
       16
       10
       14
       (Pair 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 192 (remaining gas: 1039860.470 units remaining)
+  - location: 192 (remaining gas: 1039867.731 units remaining)
     [ 3
       12
       16
@@ -3251,7 +3251,7 @@ trace
       14
       (Pair 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 192 (remaining gas: 1039860.460 units remaining)
+  - location: 192 (remaining gas: 1039867.721 units remaining)
     [ 2
       3
       12
@@ -3260,7 +3260,7 @@ trace
       14
       (Pair 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 192 (remaining gas: 1039860.460 units remaining)
+  - location: 192 (remaining gas: 1039867.721 units remaining)
     [ 2
       3
       12
@@ -3269,36 +3269,36 @@ trace
       14
       (Pair 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 196 (remaining gas: 1039860.408 units remaining)
+  - location: 196 (remaining gas: 1039867.679 units remaining)
     [ 14
       (Pair 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 199 (remaining gas: 1039860.393 units remaining)
+  - location: 199 (remaining gas: 1039867.669 units remaining)
     [ (Pair 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 196 (remaining gas: 1039860.368 units remaining)
+  - location: 196 (remaining gas: 1039867.649 units remaining)
     [ 10
       (Pair 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 196 (remaining gas: 1039860.358 units remaining)
+  - location: 196 (remaining gas: 1039867.639 units remaining)
     [ 16
       10
       (Pair 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 196 (remaining gas: 1039860.348 units remaining)
+  - location: 196 (remaining gas: 1039867.629 units remaining)
     [ 12
       16
       10
       (Pair 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 196 (remaining gas: 1039860.338 units remaining)
+  - location: 196 (remaining gas: 1039867.619 units remaining)
     [ 3
       12
       16
       10
       (Pair 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 196 (remaining gas: 1039860.328 units remaining)
+  - location: 196 (remaining gas: 1039867.609 units remaining)
     [ 2
       3
       12
@@ -3306,7 +3306,7 @@ trace
       10
       (Pair 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 196 (remaining gas: 1039860.328 units remaining)
+  - location: 196 (remaining gas: 1039867.609 units remaining)
     [ 2
       3
       12
@@ -3314,118 +3314,118 @@ trace
       10
       (Pair 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 200 (remaining gas: 1039860.277 units remaining)
+  - location: 200 (remaining gas: 1039867.569 units remaining)
     [ 10
       (Pair 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 203 (remaining gas: 1039860.262 units remaining)
+  - location: 203 (remaining gas: 1039867.559 units remaining)
     [ (Pair 10 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 200 (remaining gas: 1039860.237 units remaining)
+  - location: 200 (remaining gas: 1039867.539 units remaining)
     [ 16
       (Pair 10 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 200 (remaining gas: 1039860.227 units remaining)
+  - location: 200 (remaining gas: 1039867.529 units remaining)
     [ 12
       16
       (Pair 10 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 200 (remaining gas: 1039860.217 units remaining)
+  - location: 200 (remaining gas: 1039867.519 units remaining)
     [ 3
       12
       16
       (Pair 10 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 200 (remaining gas: 1039860.207 units remaining)
+  - location: 200 (remaining gas: 1039867.509 units remaining)
     [ 2
       3
       12
       16
       (Pair 10 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 200 (remaining gas: 1039860.207 units remaining)
+  - location: 200 (remaining gas: 1039867.509 units remaining)
     [ 2
       3
       12
       16
       (Pair 10 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 204 (remaining gas: 1039860.158 units remaining)
+  - location: 204 (remaining gas: 1039867.472 units remaining)
     [ 16
       (Pair 10 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 207 (remaining gas: 1039860.143 units remaining)
+  - location: 207 (remaining gas: 1039867.462 units remaining)
     [ (Pair 16 10 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 204 (remaining gas: 1039860.118 units remaining)
+  - location: 204 (remaining gas: 1039867.442 units remaining)
     [ 12
       (Pair 16 10 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 204 (remaining gas: 1039860.108 units remaining)
+  - location: 204 (remaining gas: 1039867.432 units remaining)
     [ 3
       12
       (Pair 16 10 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 204 (remaining gas: 1039860.098 units remaining)
+  - location: 204 (remaining gas: 1039867.422 units remaining)
     [ 2
       3
       12
       (Pair 16 10 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 204 (remaining gas: 1039860.098 units remaining)
+  - location: 204 (remaining gas: 1039867.422 units remaining)
     [ 2
       3
       12
       (Pair 16 10 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 208 (remaining gas: 1039860.050 units remaining)
+  - location: 208 (remaining gas: 1039867.387 units remaining)
     [ 12
       (Pair 16 10 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 211 (remaining gas: 1039860.035 units remaining)
+  - location: 211 (remaining gas: 1039867.377 units remaining)
     [ (Pair 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 208 (remaining gas: 1039860.010 units remaining)
+  - location: 208 (remaining gas: 1039867.357 units remaining)
     [ 3
       (Pair 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 208 (remaining gas: 1039860 units remaining)
+  - location: 208 (remaining gas: 1039867.347 units remaining)
     [ 2
       3
       (Pair 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 208 (remaining gas: 1039860 units remaining)
+  - location: 208 (remaining gas: 1039867.347 units remaining)
     [ 2
       3
       (Pair 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 212 (remaining gas: 1039859.985 units remaining)
+  - location: 212 (remaining gas: 1039867.337 units remaining)
     [ 3
       (Pair 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 214 (remaining gas: 1039859.970 units remaining)
+  - location: 214 (remaining gas: 1039867.327 units remaining)
     [ (Pair 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 212 (remaining gas: 1039859.940 units remaining)
+  - location: 212 (remaining gas: 1039867.307 units remaining)
     [ 2
       (Pair 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 215 (remaining gas: 1039859.925 units remaining)
+  - location: 215 (remaining gas: 1039867.297 units remaining)
     [ (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1)
       (Pair 2 3 12 16 10 14 19 9 18 6 8 11 4 13 15 5 1) ]
-  - location: 218 (remaining gas: 1039859.170 units remaining)
+  - location: 218 (remaining gas: 1039866.542 units remaining)
     [ 0 ]
-  - location: 219 (remaining gas: 1039859.155 units remaining)
+  - location: 219 (remaining gas: 1039866.532 units remaining)
     [ True ]
-  - location: 220 (remaining gas: 1039859.145 units remaining)
+  - location: 220 (remaining gas: 1039866.522 units remaining)
     [  ]
-  - location: 220 (remaining gas: 1039859.130 units remaining)
+  - location: 220 (remaining gas: 1039866.512 units remaining)
     [  ]
-  - location: 226 (remaining gas: 1039859.120 units remaining)
+  - location: 226 (remaining gas: 1039866.502 units remaining)
     [ Unit ]
-  - location: 227 (remaining gas: 1039859.105 units remaining)
+  - location: 227 (remaining gas: 1039866.492 units remaining)
     [ {}
       Unit ]
-  - location: 229 (remaining gas: 1039859.090 units remaining)
+  - location: 229 (remaining gas: 1039866.482 units remaining)
     [ (Pair {} Unit) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dign.tz-0-(Pair (Pair (Pair (Pair 1 2) 3) 4) 5)-5].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dign.tz-0-(Pair (Pair (Pair (Pair 1 2) 3) 4) 5)-5].out
index 59872a393f88e4a9bdcc41576a284e49c16c811a..0a9d593409365e172609f41419dc277353a43cb4 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dign.tz-0-(Pair (Pair (Pair (Pair 1 2) 3) 4) 5)-5].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dign.tz-0-(Pair (Pair (Pair (Pair 1 2) 3) 4) 5)-5].out	
@@ -7,55 +7,55 @@ emitted operations
 big_map diff
   
 trace
-  - location: 15 (remaining gas: 1039987.135 units remaining)
+  - location: 15 (remaining gas: 1039987.775 units remaining)
     [ (Pair (Pair (Pair (Pair (Pair 1 2) 3) 4) 5) 0) ]
-  - location: 15 (remaining gas: 1039987.125 units remaining)
+  - location: 15 (remaining gas: 1039987.765 units remaining)
     [ (Pair (Pair (Pair (Pair 1 2) 3) 4) 5) ]
-  - location: 16 (remaining gas: 1039987.115 units remaining)
+  - location: 16 (remaining gas: 1039987.755 units remaining)
     [ (Pair (Pair (Pair 1 2) 3) 4)
       5 ]
-  - location: 17 (remaining gas: 1039987.105 units remaining)
+  - location: 17 (remaining gas: 1039987.745 units remaining)
     [ (Pair (Pair 1 2) 3)
       4
       5 ]
-  - location: 18 (remaining gas: 1039987.095 units remaining)
+  - location: 18 (remaining gas: 1039987.735 units remaining)
     [ (Pair 1 2)
       3
       4
       5 ]
-  - location: 19 (remaining gas: 1039987.085 units remaining)
+  - location: 19 (remaining gas: 1039987.725 units remaining)
     [ 1
       2
       3
       4
       5 ]
-  - location: 20 (remaining gas: 1039986.998 units remaining)
+  - location: 20 (remaining gas: 1039987.668 units remaining)
     [ 5
       1
       2
       3
       4 ]
-  - location: 22 (remaining gas: 1039986.983 units remaining)
+  - location: 22 (remaining gas: 1039987.658 units remaining)
     [ 1
       2
       3
       4 ]
-  - location: 24 (remaining gas: 1039986.973 units remaining)
+  - location: 24 (remaining gas: 1039987.648 units remaining)
     [ 2
       3
       4 ]
-  - location: 25 (remaining gas: 1039986.963 units remaining)
+  - location: 25 (remaining gas: 1039987.638 units remaining)
     [ 3
       4 ]
-  - location: 26 (remaining gas: 1039986.953 units remaining)
+  - location: 26 (remaining gas: 1039987.628 units remaining)
     [ 4 ]
-  - location: 27 (remaining gas: 1039986.943 units remaining)
+  - location: 27 (remaining gas: 1039987.618 units remaining)
     [  ]
-  - location: 22 (remaining gas: 1039986.913 units remaining)
+  - location: 22 (remaining gas: 1039987.598 units remaining)
     [ 5 ]
-  - location: 28 (remaining gas: 1039986.898 units remaining)
+  - location: 28 (remaining gas: 1039987.588 units remaining)
     [ {}
       5 ]
-  - location: 30 (remaining gas: 1039986.883 units remaining)
+  - location: 30 (remaining gas: 1039987.578 units remaining)
     [ (Pair {} 5) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dip.tz-(Pair 0 0)-(Pair 1 1)-(Pair 1 2)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dip.tz-(Pair 0 0)-(Pair 1 1)-(Pair 1 2)].out
index 6af54bd224617bb403c44526fda35378bd38e017..3817bf93ef7e46d747ddade529f845df70eff569 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dip.tz-(Pair 0 0)-(Pair 1 1)-(Pair 1 2)].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dip.tz-(Pair 0 0)-(Pair 1 1)-(Pair 1 2)].out	
@@ -7,30 +7,30 @@ emitted operations
 big_map diff
   
 trace
-  - location: 11 (remaining gas: 1039990.723 units remaining)
+  - location: 11 (remaining gas: 1039991.683 units remaining)
     [ (Pair (Pair 1 1) 0 0) ]
-  - location: 11 (remaining gas: 1039990.713 units remaining)
+  - location: 11 (remaining gas: 1039991.673 units remaining)
     [ (Pair 1 1) ]
-  - location: 12 (remaining gas: 1039990.703 units remaining)
+  - location: 12 (remaining gas: 1039991.663 units remaining)
     [ 1
       1 ]
-  - location: 13 (remaining gas: 1039990.693 units remaining)
+  - location: 13 (remaining gas: 1039991.653 units remaining)
     [ 1
       1
       1 ]
-  - location: 14 (remaining gas: 1039990.678 units remaining)
+  - location: 14 (remaining gas: 1039991.643 units remaining)
     [ 1
       1 ]
-  - location: 16 (remaining gas: 1039990.623 units remaining)
+  - location: 16 (remaining gas: 1039991.608 units remaining)
     [ 2 ]
-  - location: 14 (remaining gas: 1039990.593 units remaining)
+  - location: 14 (remaining gas: 1039991.588 units remaining)
     [ 1
       2 ]
-  - location: 17 (remaining gas: 1039990.578 units remaining)
+  - location: 17 (remaining gas: 1039991.578 units remaining)
     [ (Pair 1 2) ]
-  - location: 18 (remaining gas: 1039990.563 units remaining)
+  - location: 18 (remaining gas: 1039991.568 units remaining)
     [ {}
       (Pair 1 2) ]
-  - location: 20 (remaining gas: 1039990.548 units remaining)
+  - location: 20 (remaining gas: 1039991.558 units remaining)
     [ (Pair {} 1 2) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dip.tz-(Pair 0 0)-(Pair 15 9)-(Pair 15 24)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dip.tz-(Pair 0 0)-(Pair 15 9)-(Pair 15 24)].out
index a893c50eb3a503b7ddbb8a68c2dc4b73846916ce..58dacd42936b0c124d32b15728c1a1b5364f60bb 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dip.tz-(Pair 0 0)-(Pair 15 9)-(Pair 15 24)].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dip.tz-(Pair 0 0)-(Pair 15 9)-(Pair 15 24)].out	
@@ -7,30 +7,30 @@ emitted operations
 big_map diff
   
 trace
-  - location: 11 (remaining gas: 1039990.723 units remaining)
+  - location: 11 (remaining gas: 1039991.683 units remaining)
     [ (Pair (Pair 15 9) 0 0) ]
-  - location: 11 (remaining gas: 1039990.713 units remaining)
+  - location: 11 (remaining gas: 1039991.673 units remaining)
     [ (Pair 15 9) ]
-  - location: 12 (remaining gas: 1039990.703 units remaining)
+  - location: 12 (remaining gas: 1039991.663 units remaining)
     [ 15
       9 ]
-  - location: 13 (remaining gas: 1039990.693 units remaining)
+  - location: 13 (remaining gas: 1039991.653 units remaining)
     [ 15
       15
       9 ]
-  - location: 14 (remaining gas: 1039990.678 units remaining)
+  - location: 14 (remaining gas: 1039991.643 units remaining)
     [ 15
       9 ]
-  - location: 16 (remaining gas: 1039990.623 units remaining)
+  - location: 16 (remaining gas: 1039991.608 units remaining)
     [ 24 ]
-  - location: 14 (remaining gas: 1039990.593 units remaining)
+  - location: 14 (remaining gas: 1039991.588 units remaining)
     [ 15
       24 ]
-  - location: 17 (remaining gas: 1039990.578 units remaining)
+  - location: 17 (remaining gas: 1039991.578 units remaining)
     [ (Pair 15 24) ]
-  - location: 18 (remaining gas: 1039990.563 units remaining)
+  - location: 18 (remaining gas: 1039991.568 units remaining)
     [ {}
       (Pair 15 24) ]
-  - location: 20 (remaining gas: 1039990.548 units remaining)
+  - location: 20 (remaining gas: 1039991.558 units remaining)
     [ (Pair {} 15 24) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dipn.tz-0-(Pair (Pair (Pair (Pair 1 2) 3) 4) 5)-6].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dipn.tz-0-(Pair (Pair (Pair (Pair 1 2) 3) 4) 5)-6].out
index cb7c3722fbb01fcd315fec0589489841f5798876..1ad578858e581ec315a7a27298e131380df96c72 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dipn.tz-0-(Pair (Pair (Pair (Pair 1 2) 3) 4) 5)-6].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dipn.tz-0-(Pair (Pair (Pair (Pair 1 2) 3) 4) 5)-6].out	
@@ -7,87 +7,87 @@ emitted operations
 big_map diff
   
 trace
-  - location: 15 (remaining gas: 1039985.975 units remaining)
+  - location: 15 (remaining gas: 1039986.615 units remaining)
     [ (Pair (Pair (Pair (Pair (Pair 1 2) 3) 4) 5) 0) ]
-  - location: 15 (remaining gas: 1039985.965 units remaining)
+  - location: 15 (remaining gas: 1039986.605 units remaining)
     [ (Pair (Pair (Pair (Pair 1 2) 3) 4) 5) ]
-  - location: 16 (remaining gas: 1039985.955 units remaining)
+  - location: 16 (remaining gas: 1039986.595 units remaining)
     [ (Pair (Pair (Pair 1 2) 3) 4)
       5 ]
-  - location: 17 (remaining gas: 1039985.945 units remaining)
+  - location: 17 (remaining gas: 1039986.585 units remaining)
     [ (Pair (Pair 1 2) 3)
       4
       5 ]
-  - location: 18 (remaining gas: 1039985.935 units remaining)
+  - location: 18 (remaining gas: 1039986.575 units remaining)
     [ (Pair 1 2)
       3
       4
       5 ]
-  - location: 19 (remaining gas: 1039985.925 units remaining)
+  - location: 19 (remaining gas: 1039986.565 units remaining)
     [ 1
       2
       3
       4
       5 ]
-  - location: 20 (remaining gas: 1039985.873 units remaining)
+  - location: 20 (remaining gas: 1039986.523 units remaining)
     [  ]
-  - location: 23 (remaining gas: 1039985.863 units remaining)
+  - location: 23 (remaining gas: 1039986.513 units remaining)
     [ 6 ]
-  - location: 20 (remaining gas: 1039985.838 units remaining)
+  - location: 20 (remaining gas: 1039986.493 units remaining)
     [ 5
       6 ]
-  - location: 20 (remaining gas: 1039985.828 units remaining)
+  - location: 20 (remaining gas: 1039986.483 units remaining)
     [ 4
       5
       6 ]
-  - location: 20 (remaining gas: 1039985.818 units remaining)
+  - location: 20 (remaining gas: 1039986.473 units remaining)
     [ 3
       4
       5
       6 ]
-  - location: 20 (remaining gas: 1039985.808 units remaining)
+  - location: 20 (remaining gas: 1039986.463 units remaining)
     [ 2
       3
       4
       5
       6 ]
-  - location: 20 (remaining gas: 1039985.798 units remaining)
+  - location: 20 (remaining gas: 1039986.453 units remaining)
     [ 1
       2
       3
       4
       5
       6 ]
-  - location: 20 (remaining gas: 1039985.798 units remaining)
+  - location: 20 (remaining gas: 1039986.453 units remaining)
     [ 1
       2
       3
       4
       5
       6 ]
-  - location: 26 (remaining gas: 1039985.788 units remaining)
+  - location: 26 (remaining gas: 1039986.443 units remaining)
     [ 2
       3
       4
       5
       6 ]
-  - location: 27 (remaining gas: 1039985.778 units remaining)
+  - location: 27 (remaining gas: 1039986.433 units remaining)
     [ 3
       4
       5
       6 ]
-  - location: 28 (remaining gas: 1039985.768 units remaining)
+  - location: 28 (remaining gas: 1039986.423 units remaining)
     [ 4
       5
       6 ]
-  - location: 29 (remaining gas: 1039985.758 units remaining)
+  - location: 29 (remaining gas: 1039986.413 units remaining)
     [ 5
       6 ]
-  - location: 30 (remaining gas: 1039985.748 units remaining)
+  - location: 30 (remaining gas: 1039986.403 units remaining)
     [ 6 ]
-  - location: 31 (remaining gas: 1039985.733 units remaining)
+  - location: 31 (remaining gas: 1039986.393 units remaining)
     [ {}
       6 ]
-  - location: 33 (remaining gas: 1039985.718 units remaining)
+  - location: 33 (remaining gas: 1039986.383 units remaining)
     [ (Pair {} 6) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dropn.tz-0-(Pair (Pair (Pair (Pair 1 2) 3) 4) 5)-5].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dropn.tz-0-(Pair (Pair (Pair (Pair 1 2) 3) 4) 5)-5].out
index 41e806f2d7517387387dd6499c24a331b033b77e..4ebf7260960b7194777c56ac43ad8455dfaca81a 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dropn.tz-0-(Pair (Pair (Pair (Pair 1 2) 3) 4) 5)-5].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dropn.tz-0-(Pair (Pair (Pair (Pair 1 2) 3) 4) 5)-5].out	
@@ -7,33 +7,33 @@ emitted operations
 big_map diff
   
 trace
-  - location: 15 (remaining gas: 1039990.312 units remaining)
+  - location: 15 (remaining gas: 1039990.952 units remaining)
     [ (Pair (Pair (Pair (Pair (Pair 1 2) 3) 4) 5) 0) ]
-  - location: 15 (remaining gas: 1039990.302 units remaining)
+  - location: 15 (remaining gas: 1039990.942 units remaining)
     [ (Pair (Pair (Pair (Pair 1 2) 3) 4) 5) ]
-  - location: 16 (remaining gas: 1039990.292 units remaining)
+  - location: 16 (remaining gas: 1039990.932 units remaining)
     [ (Pair (Pair (Pair 1 2) 3) 4)
       5 ]
-  - location: 17 (remaining gas: 1039990.282 units remaining)
+  - location: 17 (remaining gas: 1039990.922 units remaining)
     [ (Pair (Pair 1 2) 3)
       4
       5 ]
-  - location: 18 (remaining gas: 1039990.272 units remaining)
+  - location: 18 (remaining gas: 1039990.912 units remaining)
     [ (Pair 1 2)
       3
       4
       5 ]
-  - location: 19 (remaining gas: 1039990.262 units remaining)
+  - location: 19 (remaining gas: 1039990.902 units remaining)
     [ 1
       2
       3
       4
       5 ]
-  - location: 20 (remaining gas: 1039990.192 units remaining)
+  - location: 20 (remaining gas: 1039990.862 units remaining)
     [ 5 ]
-  - location: 22 (remaining gas: 1039990.177 units remaining)
+  - location: 22 (remaining gas: 1039990.852 units remaining)
     [ {}
       5 ]
-  - location: 24 (remaining gas: 1039990.162 units remaining)
+  - location: 24 (remaining gas: 1039990.842 units remaining)
     [ (Pair {} 5) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dugn.tz-0-(Pair (Pair (Pair (Pair 1 2) 3) 4) 5)-1].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dugn.tz-0-(Pair (Pair (Pair (Pair 1 2) 3) 4) 5)-1].out
index e92f19d3bddd355b6bb5c4a7bed4b4c0f4496035..8fd478c7598360d9b65ca924b34686cf0a25d662 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dugn.tz-0-(Pair (Pair (Pair (Pair 1 2) 3) 4) 5)-1].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dugn.tz-0-(Pair (Pair (Pair (Pair 1 2) 3) 4) 5)-1].out	
@@ -7,51 +7,51 @@ emitted operations
 big_map diff
   
 trace
-  - location: 15 (remaining gas: 1039987.901 units remaining)
+  - location: 15 (remaining gas: 1039988.541 units remaining)
     [ (Pair (Pair (Pair (Pair (Pair 1 2) 3) 4) 5) 0) ]
-  - location: 15 (remaining gas: 1039987.891 units remaining)
+  - location: 15 (remaining gas: 1039988.531 units remaining)
     [ (Pair (Pair (Pair (Pair 1 2) 3) 4) 5) ]
-  - location: 16 (remaining gas: 1039987.881 units remaining)
+  - location: 16 (remaining gas: 1039988.521 units remaining)
     [ (Pair (Pair (Pair 1 2) 3) 4)
       5 ]
-  - location: 17 (remaining gas: 1039987.871 units remaining)
+  - location: 17 (remaining gas: 1039988.511 units remaining)
     [ (Pair (Pair 1 2) 3)
       4
       5 ]
-  - location: 18 (remaining gas: 1039987.861 units remaining)
+  - location: 18 (remaining gas: 1039988.501 units remaining)
     [ (Pair 1 2)
       3
       4
       5 ]
-  - location: 19 (remaining gas: 1039987.851 units remaining)
+  - location: 19 (remaining gas: 1039988.491 units remaining)
     [ 1
       2
       3
       4
       5 ]
-  - location: 20 (remaining gas: 1039987.764 units remaining)
+  - location: 20 (remaining gas: 1039988.429 units remaining)
     [ 2
       3
       4
       5
       1 ]
-  - location: 22 (remaining gas: 1039987.754 units remaining)
+  - location: 22 (remaining gas: 1039988.419 units remaining)
     [ 3
       4
       5
       1 ]
-  - location: 23 (remaining gas: 1039987.744 units remaining)
+  - location: 23 (remaining gas: 1039988.409 units remaining)
     [ 4
       5
       1 ]
-  - location: 24 (remaining gas: 1039987.734 units remaining)
+  - location: 24 (remaining gas: 1039988.399 units remaining)
     [ 5
       1 ]
-  - location: 25 (remaining gas: 1039987.724 units remaining)
+  - location: 25 (remaining gas: 1039988.389 units remaining)
     [ 1 ]
-  - location: 26 (remaining gas: 1039987.709 units remaining)
+  - location: 26 (remaining gas: 1039988.379 units remaining)
     [ {}
       1 ]
-  - location: 28 (remaining gas: 1039987.694 units remaining)
+  - location: 28 (remaining gas: 1039988.369 units remaining)
     [ (Pair {} 1) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dup-n.tz-Unit-Unit-Unit].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dup-n.tz-Unit-Unit-Unit].out
index 09cb77db9cd519f5447352ef28d64902f5c2546a..3b25bd616fa1c4832b90c2578ca2cf0c564625cb 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dup-n.tz-Unit-Unit-Unit].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[dup-n.tz-Unit-Unit-Unit].out
@@ -7,38 +7,38 @@ emitted operations
 big_map diff
   
 trace
-  - location: 7 (remaining gas: 1039954.427 units remaining)
+  - location: 7 (remaining gas: 1039955.867 units remaining)
     [ (Pair Unit Unit) ]
-  - location: 7 (remaining gas: 1039954.417 units remaining)
+  - location: 7 (remaining gas: 1039955.857 units remaining)
     [  ]
-  - location: 8 (remaining gas: 1039954.407 units remaining)
+  - location: 8 (remaining gas: 1039955.847 units remaining)
     [ 5 ]
-  - location: 11 (remaining gas: 1039954.397 units remaining)
+  - location: 11 (remaining gas: 1039955.837 units remaining)
     [ 4
       5 ]
-  - location: 14 (remaining gas: 1039954.387 units remaining)
+  - location: 14 (remaining gas: 1039955.827 units remaining)
     [ 3
       4
       5 ]
-  - location: 17 (remaining gas: 1039954.377 units remaining)
+  - location: 17 (remaining gas: 1039955.817 units remaining)
     [ 2
       3
       4
       5 ]
-  - location: 20 (remaining gas: 1039954.367 units remaining)
+  - location: 20 (remaining gas: 1039955.807 units remaining)
     [ 1
       2
       3
       4
       5 ]
-  - location: 23 (remaining gas: 1039954.346 units remaining)
+  - location: 23 (remaining gas: 1039955.786 units remaining)
     [ 1
       1
       2
       3
       4
       5 ]
-  - location: 25 (remaining gas: 1039954.336 units remaining)
+  - location: 25 (remaining gas: 1039955.776 units remaining)
     [ 1
       1
       1
@@ -46,40 +46,40 @@ trace
       3
       4
       5 ]
-  - location: 30 (remaining gas: 1039954.301 units remaining)
+  - location: 30 (remaining gas: 1039955.741 units remaining)
     [ 0
       1
       2
       3
       4
       5 ]
-  - location: 31 (remaining gas: 1039954.286 units remaining)
+  - location: 31 (remaining gas: 1039955.731 units remaining)
     [ True
       1
       2
       3
       4
       5 ]
-  - location: 32 (remaining gas: 1039954.276 units remaining)
+  - location: 32 (remaining gas: 1039955.721 units remaining)
     [ 1
       2
       3
       4
       5 ]
-  - location: 32 (remaining gas: 1039954.261 units remaining)
+  - location: 32 (remaining gas: 1039955.711 units remaining)
     [ 1
       2
       3
       4
       5 ]
-  - location: 38 (remaining gas: 1039954.239 units remaining)
+  - location: 38 (remaining gas: 1039955.689 units remaining)
     [ 2
       1
       2
       3
       4
       5 ]
-  - location: 40 (remaining gas: 1039954.229 units remaining)
+  - location: 40 (remaining gas: 1039955.679 units remaining)
     [ 2
       2
       1
@@ -87,40 +87,40 @@ trace
       3
       4
       5 ]
-  - location: 45 (remaining gas: 1039954.194 units remaining)
+  - location: 45 (remaining gas: 1039955.644 units remaining)
     [ 0
       1
       2
       3
       4
       5 ]
-  - location: 46 (remaining gas: 1039954.179 units remaining)
+  - location: 46 (remaining gas: 1039955.634 units remaining)
     [ True
       1
       2
       3
       4
       5 ]
-  - location: 47 (remaining gas: 1039954.169 units remaining)
+  - location: 47 (remaining gas: 1039955.624 units remaining)
     [ 1
       2
       3
       4
       5 ]
-  - location: 47 (remaining gas: 1039954.154 units remaining)
+  - location: 47 (remaining gas: 1039955.614 units remaining)
     [ 1
       2
       3
       4
       5 ]
-  - location: 53 (remaining gas: 1039954.131 units remaining)
+  - location: 53 (remaining gas: 1039955.591 units remaining)
     [ 3
       1
       2
       3
       4
       5 ]
-  - location: 55 (remaining gas: 1039954.121 units remaining)
+  - location: 55 (remaining gas: 1039955.581 units remaining)
     [ 3
       3
       1
@@ -128,40 +128,40 @@ trace
       3
       4
       5 ]
-  - location: 60 (remaining gas: 1039954.086 units remaining)
+  - location: 60 (remaining gas: 1039955.546 units remaining)
     [ 0
       1
       2
       3
       4
       5 ]
-  - location: 61 (remaining gas: 1039954.071 units remaining)
+  - location: 61 (remaining gas: 1039955.536 units remaining)
     [ True
       1
       2
       3
       4
       5 ]
-  - location: 62 (remaining gas: 1039954.061 units remaining)
+  - location: 62 (remaining gas: 1039955.526 units remaining)
     [ 1
       2
       3
       4
       5 ]
-  - location: 62 (remaining gas: 1039954.046 units remaining)
+  - location: 62 (remaining gas: 1039955.516 units remaining)
     [ 1
       2
       3
       4
       5 ]
-  - location: 68 (remaining gas: 1039954.022 units remaining)
+  - location: 68 (remaining gas: 1039955.492 units remaining)
     [ 4
       1
       2
       3
       4
       5 ]
-  - location: 70 (remaining gas: 1039954.012 units remaining)
+  - location: 70 (remaining gas: 1039955.482 units remaining)
     [ 4
       4
       1
@@ -169,40 +169,40 @@ trace
       3
       4
       5 ]
-  - location: 75 (remaining gas: 1039953.977 units remaining)
+  - location: 75 (remaining gas: 1039955.447 units remaining)
     [ 0
       1
       2
       3
       4
       5 ]
-  - location: 76 (remaining gas: 1039953.962 units remaining)
+  - location: 76 (remaining gas: 1039955.437 units remaining)
     [ True
       1
       2
       3
       4
       5 ]
-  - location: 77 (remaining gas: 1039953.952 units remaining)
+  - location: 77 (remaining gas: 1039955.427 units remaining)
     [ 1
       2
       3
       4
       5 ]
-  - location: 77 (remaining gas: 1039953.937 units remaining)
+  - location: 77 (remaining gas: 1039955.417 units remaining)
     [ 1
       2
       3
       4
       5 ]
-  - location: 83 (remaining gas: 1039953.912 units remaining)
+  - location: 83 (remaining gas: 1039955.392 units remaining)
     [ 5
       1
       2
       3
       4
       5 ]
-  - location: 85 (remaining gas: 1039953.902 units remaining)
+  - location: 85 (remaining gas: 1039955.382 units remaining)
     [ 5
       5
       1
@@ -210,39 +210,39 @@ trace
       3
       4
       5 ]
-  - location: 90 (remaining gas: 1039953.867 units remaining)
+  - location: 90 (remaining gas: 1039955.347 units remaining)
     [ 0
       1
       2
       3
       4
       5 ]
-  - location: 91 (remaining gas: 1039953.852 units remaining)
+  - location: 91 (remaining gas: 1039955.337 units remaining)
     [ True
       1
       2
       3
       4
       5 ]
-  - location: 92 (remaining gas: 1039953.842 units remaining)
+  - location: 92 (remaining gas: 1039955.327 units remaining)
     [ 1
       2
       3
       4
       5 ]
-  - location: 92 (remaining gas: 1039953.827 units remaining)
+  - location: 92 (remaining gas: 1039955.317 units remaining)
     [ 1
       2
       3
       4
       5 ]
-  - location: 98 (remaining gas: 1039953.755 units remaining)
+  - location: 98 (remaining gas: 1039955.275 units remaining)
     [  ]
-  - location: 100 (remaining gas: 1039953.745 units remaining)
+  - location: 100 (remaining gas: 1039955.265 units remaining)
     [ Unit ]
-  - location: 101 (remaining gas: 1039953.730 units remaining)
+  - location: 101 (remaining gas: 1039955.255 units remaining)
     [ {}
       Unit ]
-  - location: 103 (remaining gas: 1039953.715 units remaining)
+  - location: 103 (remaining gas: 1039955.245 units remaining)
     [ (Pair {} Unit) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv.tz-(Pair None None None None)-(Pair -8 2)-(Pair (S.ecc0e72cbb.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv.tz-(Pair None None None None)-(Pair -8 2)-(Pair (S.ecc0e72cbb.out
index 00cb54ca79a2aae9f67e1c6c7bb15f52e9edee74..dac75da4144ec4595d8b938f7597d0ce60734712 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv.tz-(Pair None None None None)-(Pair -8 2)-(Pair (S.ecc0e72cbb.out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv.tz-(Pair None None None None)-(Pair -8 2)-(Pair (S.ecc0e72cbb.out	
@@ -7,136 +7,136 @@ emitted operations
 big_map diff
   
 trace
-  - location: 25 (remaining gas: 1039969.928 units remaining)
+  - location: 25 (remaining gas: 1039973.448 units remaining)
     [ (Pair (Pair -8 2) None None None None) ]
-  - location: 25 (remaining gas: 1039969.918 units remaining)
+  - location: 25 (remaining gas: 1039973.438 units remaining)
     [ (Pair -8 2) ]
-  - location: 26 (remaining gas: 1039969.908 units remaining)
+  - location: 26 (remaining gas: 1039973.428 units remaining)
     [ (Pair -8 2)
       (Pair -8 2) ]
-  - location: 27 (remaining gas: 1039969.898 units remaining)
+  - location: 27 (remaining gas: 1039973.418 units remaining)
     [ -8
       2
       (Pair -8 2) ]
-  - location: 28 (remaining gas: 1039969.873 units remaining)
+  - location: 28 (remaining gas: 1039973.398 units remaining)
     [ 8
       2
       (Pair -8 2) ]
-  - location: 29 (remaining gas: 1039969.858 units remaining)
+  - location: 29 (remaining gas: 1039973.388 units remaining)
     [ 2
       (Pair -8 2) ]
-  - location: 31 (remaining gas: 1039969.833 units remaining)
+  - location: 31 (remaining gas: 1039973.368 units remaining)
     [ 2
       (Pair -8 2) ]
-  - location: 29 (remaining gas: 1039969.803 units remaining)
+  - location: 29 (remaining gas: 1039973.348 units remaining)
     [ 8
       2
       (Pair -8 2) ]
-  - location: 32 (remaining gas: 1039969.663 units remaining)
+  - location: 32 (remaining gas: 1039973.243 units remaining)
     [ (Some (Pair 4 0))
       (Pair -8 2) ]
-  - location: 33 (remaining gas: 1039969.653 units remaining)
+  - location: 33 (remaining gas: 1039973.233 units remaining)
     [ (Pair -8 2)
       (Some (Pair 4 0)) ]
-  - location: 34 (remaining gas: 1039969.643 units remaining)
+  - location: 34 (remaining gas: 1039973.223 units remaining)
     [ (Pair -8 2)
       (Pair -8 2)
       (Some (Pair 4 0)) ]
-  - location: 35 (remaining gas: 1039969.633 units remaining)
+  - location: 35 (remaining gas: 1039973.213 units remaining)
     [ -8
       2
       (Pair -8 2)
       (Some (Pair 4 0)) ]
-  - location: 36 (remaining gas: 1039969.608 units remaining)
+  - location: 36 (remaining gas: 1039973.193 units remaining)
     [ 8
       2
       (Pair -8 2)
       (Some (Pair 4 0)) ]
-  - location: 37 (remaining gas: 1039969.468 units remaining)
+  - location: 37 (remaining gas: 1039973.088 units remaining)
     [ (Some (Pair 4 0))
       (Pair -8 2)
       (Some (Pair 4 0)) ]
-  - location: 38 (remaining gas: 1039969.458 units remaining)
+  - location: 38 (remaining gas: 1039973.078 units remaining)
     [ (Pair -8 2)
       (Some (Pair 4 0))
       (Some (Pair 4 0)) ]
-  - location: 39 (remaining gas: 1039969.448 units remaining)
+  - location: 39 (remaining gas: 1039973.068 units remaining)
     [ (Pair -8 2)
       (Pair -8 2)
       (Some (Pair 4 0))
       (Some (Pair 4 0)) ]
-  - location: 40 (remaining gas: 1039969.438 units remaining)
+  - location: 40 (remaining gas: 1039973.058 units remaining)
     [ -8
       2
       (Pair -8 2)
       (Some (Pair 4 0))
       (Some (Pair 4 0)) ]
-  - location: 41 (remaining gas: 1039969.423 units remaining)
+  - location: 41 (remaining gas: 1039973.048 units remaining)
     [ 2
       (Pair -8 2)
       (Some (Pair 4 0))
       (Some (Pair 4 0)) ]
-  - location: 43 (remaining gas: 1039969.398 units remaining)
+  - location: 43 (remaining gas: 1039973.028 units remaining)
     [ 2
       (Pair -8 2)
       (Some (Pair 4 0))
       (Some (Pair 4 0)) ]
-  - location: 41 (remaining gas: 1039969.368 units remaining)
+  - location: 41 (remaining gas: 1039973.008 units remaining)
     [ -8
       2
       (Pair -8 2)
       (Some (Pair 4 0))
       (Some (Pair 4 0)) ]
-  - location: 44 (remaining gas: 1039969.228 units remaining)
+  - location: 44 (remaining gas: 1039972.903 units remaining)
     [ (Some (Pair -4 0))
       (Pair -8 2)
       (Some (Pair 4 0))
       (Some (Pair 4 0)) ]
-  - location: 45 (remaining gas: 1039969.218 units remaining)
+  - location: 45 (remaining gas: 1039972.893 units remaining)
     [ (Pair -8 2)
       (Some (Pair -4 0))
       (Some (Pair 4 0))
       (Some (Pair 4 0)) ]
-  - location: 46 (remaining gas: 1039969.208 units remaining)
+  - location: 46 (remaining gas: 1039972.883 units remaining)
     [ -8
       2
       (Some (Pair -4 0))
       (Some (Pair 4 0))
       (Some (Pair 4 0)) ]
-  - location: 47 (remaining gas: 1039969.068 units remaining)
+  - location: 47 (remaining gas: 1039972.778 units remaining)
     [ (Some (Pair -4 0))
       (Some (Pair -4 0))
       (Some (Pair 4 0))
       (Some (Pair 4 0)) ]
-  - location: 49 (remaining gas: 1039969.020 units remaining)
+  - location: 49 (remaining gas: 1039972.743 units remaining)
     [ (Some (Pair 4 0))
       (Some (Pair 4 0)) ]
-  - location: 52 (remaining gas: 1039969.005 units remaining)
+  - location: 52 (remaining gas: 1039972.733 units remaining)
     [ (Pair (Some (Pair 4 0)) (Some (Pair 4 0))) ]
-  - location: 49 (remaining gas: 1039968.980 units remaining)
+  - location: 49 (remaining gas: 1039972.713 units remaining)
     [ (Some (Pair -4 0))
       (Pair (Some (Pair 4 0)) (Some (Pair 4 0))) ]
-  - location: 49 (remaining gas: 1039968.970 units remaining)
+  - location: 49 (remaining gas: 1039972.703 units remaining)
     [ (Some (Pair -4 0))
       (Some (Pair -4 0))
       (Pair (Some (Pair 4 0)) (Some (Pair 4 0))) ]
-  - location: 49 (remaining gas: 1039968.970 units remaining)
+  - location: 49 (remaining gas: 1039972.703 units remaining)
     [ (Some (Pair -4 0))
       (Some (Pair -4 0))
       (Pair (Some (Pair 4 0)) (Some (Pair 4 0))) ]
-  - location: 53 (remaining gas: 1039968.955 units remaining)
+  - location: 53 (remaining gas: 1039972.693 units remaining)
     [ (Some (Pair -4 0))
       (Pair (Some (Pair 4 0)) (Some (Pair 4 0))) ]
-  - location: 55 (remaining gas: 1039968.940 units remaining)
+  - location: 55 (remaining gas: 1039972.683 units remaining)
     [ (Pair (Some (Pair -4 0)) (Some (Pair 4 0)) (Some (Pair 4 0))) ]
-  - location: 53 (remaining gas: 1039968.910 units remaining)
+  - location: 53 (remaining gas: 1039972.663 units remaining)
     [ (Some (Pair -4 0))
       (Pair (Some (Pair -4 0)) (Some (Pair 4 0)) (Some (Pair 4 0))) ]
-  - location: 56 (remaining gas: 1039968.895 units remaining)
+  - location: 56 (remaining gas: 1039972.653 units remaining)
     [ (Pair (Some (Pair -4 0)) (Some (Pair -4 0)) (Some (Pair 4 0)) (Some (Pair 4 0))) ]
-  - location: 57 (remaining gas: 1039968.880 units remaining)
+  - location: 57 (remaining gas: 1039972.643 units remaining)
     [ {}
       (Pair (Some (Pair -4 0)) (Some (Pair -4 0)) (Some (Pair 4 0)) (Some (Pair 4 0))) ]
-  - location: 59 (remaining gas: 1039968.865 units remaining)
+  - location: 59 (remaining gas: 1039972.633 units remaining)
     [ (Pair {} (Some (Pair -4 0)) (Some (Pair -4 0)) (Some (Pair 4 0)) (Some (Pair 4 0))) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv.tz-(Pair None None None None)-(Pair 10 -3)-(Pair (.3caea50555.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv.tz-(Pair None None None None)-(Pair 10 -3)-(Pair (.3caea50555.out
index 0e7eafb3e6c8fcbc0f7c7bdd79e84524b76f5152..989b58ff20c52781c1d6bfe13be296ec63281a53 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv.tz-(Pair None None None None)-(Pair 10 -3)-(Pair (.3caea50555.out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv.tz-(Pair None None None None)-(Pair 10 -3)-(Pair (.3caea50555.out	
@@ -7,136 +7,136 @@ emitted operations
 big_map diff
   
 trace
-  - location: 25 (remaining gas: 1039969.928 units remaining)
+  - location: 25 (remaining gas: 1039973.448 units remaining)
     [ (Pair (Pair 10 -3) None None None None) ]
-  - location: 25 (remaining gas: 1039969.918 units remaining)
+  - location: 25 (remaining gas: 1039973.438 units remaining)
     [ (Pair 10 -3) ]
-  - location: 26 (remaining gas: 1039969.908 units remaining)
+  - location: 26 (remaining gas: 1039973.428 units remaining)
     [ (Pair 10 -3)
       (Pair 10 -3) ]
-  - location: 27 (remaining gas: 1039969.898 units remaining)
+  - location: 27 (remaining gas: 1039973.418 units remaining)
     [ 10
       -3
       (Pair 10 -3) ]
-  - location: 28 (remaining gas: 1039969.873 units remaining)
+  - location: 28 (remaining gas: 1039973.398 units remaining)
     [ 10
       -3
       (Pair 10 -3) ]
-  - location: 29 (remaining gas: 1039969.858 units remaining)
+  - location: 29 (remaining gas: 1039973.388 units remaining)
     [ -3
       (Pair 10 -3) ]
-  - location: 31 (remaining gas: 1039969.833 units remaining)
+  - location: 31 (remaining gas: 1039973.368 units remaining)
     [ 3
       (Pair 10 -3) ]
-  - location: 29 (remaining gas: 1039969.803 units remaining)
+  - location: 29 (remaining gas: 1039973.348 units remaining)
     [ 10
       3
       (Pair 10 -3) ]
-  - location: 32 (remaining gas: 1039969.663 units remaining)
+  - location: 32 (remaining gas: 1039973.243 units remaining)
     [ (Some (Pair 3 1))
       (Pair 10 -3) ]
-  - location: 33 (remaining gas: 1039969.653 units remaining)
+  - location: 33 (remaining gas: 1039973.233 units remaining)
     [ (Pair 10 -3)
       (Some (Pair 3 1)) ]
-  - location: 34 (remaining gas: 1039969.643 units remaining)
+  - location: 34 (remaining gas: 1039973.223 units remaining)
     [ (Pair 10 -3)
       (Pair 10 -3)
       (Some (Pair 3 1)) ]
-  - location: 35 (remaining gas: 1039969.633 units remaining)
+  - location: 35 (remaining gas: 1039973.213 units remaining)
     [ 10
       -3
       (Pair 10 -3)
       (Some (Pair 3 1)) ]
-  - location: 36 (remaining gas: 1039969.608 units remaining)
+  - location: 36 (remaining gas: 1039973.193 units remaining)
     [ 10
       -3
       (Pair 10 -3)
       (Some (Pair 3 1)) ]
-  - location: 37 (remaining gas: 1039969.468 units remaining)
+  - location: 37 (remaining gas: 1039973.088 units remaining)
     [ (Some (Pair -3 1))
       (Pair 10 -3)
       (Some (Pair 3 1)) ]
-  - location: 38 (remaining gas: 1039969.458 units remaining)
+  - location: 38 (remaining gas: 1039973.078 units remaining)
     [ (Pair 10 -3)
       (Some (Pair -3 1))
       (Some (Pair 3 1)) ]
-  - location: 39 (remaining gas: 1039969.448 units remaining)
+  - location: 39 (remaining gas: 1039973.068 units remaining)
     [ (Pair 10 -3)
       (Pair 10 -3)
       (Some (Pair -3 1))
       (Some (Pair 3 1)) ]
-  - location: 40 (remaining gas: 1039969.438 units remaining)
+  - location: 40 (remaining gas: 1039973.058 units remaining)
     [ 10
       -3
       (Pair 10 -3)
       (Some (Pair -3 1))
       (Some (Pair 3 1)) ]
-  - location: 41 (remaining gas: 1039969.423 units remaining)
+  - location: 41 (remaining gas: 1039973.048 units remaining)
     [ -3
       (Pair 10 -3)
       (Some (Pair -3 1))
       (Some (Pair 3 1)) ]
-  - location: 43 (remaining gas: 1039969.398 units remaining)
+  - location: 43 (remaining gas: 1039973.028 units remaining)
     [ 3
       (Pair 10 -3)
       (Some (Pair -3 1))
       (Some (Pair 3 1)) ]
-  - location: 41 (remaining gas: 1039969.368 units remaining)
+  - location: 41 (remaining gas: 1039973.008 units remaining)
     [ 10
       3
       (Pair 10 -3)
       (Some (Pair -3 1))
       (Some (Pair 3 1)) ]
-  - location: 44 (remaining gas: 1039969.228 units remaining)
+  - location: 44 (remaining gas: 1039972.903 units remaining)
     [ (Some (Pair 3 1))
       (Pair 10 -3)
       (Some (Pair -3 1))
       (Some (Pair 3 1)) ]
-  - location: 45 (remaining gas: 1039969.218 units remaining)
+  - location: 45 (remaining gas: 1039972.893 units remaining)
     [ (Pair 10 -3)
       (Some (Pair 3 1))
       (Some (Pair -3 1))
       (Some (Pair 3 1)) ]
-  - location: 46 (remaining gas: 1039969.208 units remaining)
+  - location: 46 (remaining gas: 1039972.883 units remaining)
     [ 10
       -3
       (Some (Pair 3 1))
       (Some (Pair -3 1))
       (Some (Pair 3 1)) ]
-  - location: 47 (remaining gas: 1039969.068 units remaining)
+  - location: 47 (remaining gas: 1039972.778 units remaining)
     [ (Some (Pair -3 1))
       (Some (Pair 3 1))
       (Some (Pair -3 1))
       (Some (Pair 3 1)) ]
-  - location: 49 (remaining gas: 1039969.020 units remaining)
+  - location: 49 (remaining gas: 1039972.743 units remaining)
     [ (Some (Pair -3 1))
       (Some (Pair 3 1)) ]
-  - location: 52 (remaining gas: 1039969.005 units remaining)
+  - location: 52 (remaining gas: 1039972.733 units remaining)
     [ (Pair (Some (Pair -3 1)) (Some (Pair 3 1))) ]
-  - location: 49 (remaining gas: 1039968.980 units remaining)
+  - location: 49 (remaining gas: 1039972.713 units remaining)
     [ (Some (Pair 3 1))
       (Pair (Some (Pair -3 1)) (Some (Pair 3 1))) ]
-  - location: 49 (remaining gas: 1039968.970 units remaining)
+  - location: 49 (remaining gas: 1039972.703 units remaining)
     [ (Some (Pair -3 1))
       (Some (Pair 3 1))
       (Pair (Some (Pair -3 1)) (Some (Pair 3 1))) ]
-  - location: 49 (remaining gas: 1039968.970 units remaining)
+  - location: 49 (remaining gas: 1039972.703 units remaining)
     [ (Some (Pair -3 1))
       (Some (Pair 3 1))
       (Pair (Some (Pair -3 1)) (Some (Pair 3 1))) ]
-  - location: 53 (remaining gas: 1039968.955 units remaining)
+  - location: 53 (remaining gas: 1039972.693 units remaining)
     [ (Some (Pair 3 1))
       (Pair (Some (Pair -3 1)) (Some (Pair 3 1))) ]
-  - location: 55 (remaining gas: 1039968.940 units remaining)
+  - location: 55 (remaining gas: 1039972.683 units remaining)
     [ (Pair (Some (Pair 3 1)) (Some (Pair -3 1)) (Some (Pair 3 1))) ]
-  - location: 53 (remaining gas: 1039968.910 units remaining)
+  - location: 53 (remaining gas: 1039972.663 units remaining)
     [ (Some (Pair -3 1))
       (Pair (Some (Pair 3 1)) (Some (Pair -3 1)) (Some (Pair 3 1))) ]
-  - location: 56 (remaining gas: 1039968.895 units remaining)
+  - location: 56 (remaining gas: 1039972.653 units remaining)
     [ (Pair (Some (Pair -3 1)) (Some (Pair 3 1)) (Some (Pair -3 1)) (Some (Pair 3 1))) ]
-  - location: 57 (remaining gas: 1039968.880 units remaining)
+  - location: 57 (remaining gas: 1039972.643 units remaining)
     [ {}
       (Pair (Some (Pair -3 1)) (Some (Pair 3 1)) (Some (Pair -3 1)) (Some (Pair 3 1))) ]
-  - location: 59 (remaining gas: 1039968.865 units remaining)
+  - location: 59 (remaining gas: 1039972.633 units remaining)
     [ (Pair {} (Some (Pair -3 1)) (Some (Pair 3 1)) (Some (Pair -3 1)) (Some (Pair 3 1))) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv.tz-(Pair None None None None)-(Pair 10 0)-(Pair No.f9448c04fb.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv.tz-(Pair None None None None)-(Pair 10 0)-(Pair No.f9448c04fb.out
index 563a089aca935e4beaae8ee09812a5367ecfb68b..e0dd8285cc26741eadb2e5fef93a29c22c55589e 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv.tz-(Pair None None None None)-(Pair 10 0)-(Pair No.f9448c04fb.out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv.tz-(Pair None None None None)-(Pair 10 0)-(Pair No.f9448c04fb.out	
@@ -7,136 +7,136 @@ emitted operations
 big_map diff
   
 trace
-  - location: 25 (remaining gas: 1039969.928 units remaining)
+  - location: 25 (remaining gas: 1039973.448 units remaining)
     [ (Pair (Pair 10 0) None None None None) ]
-  - location: 25 (remaining gas: 1039969.918 units remaining)
+  - location: 25 (remaining gas: 1039973.438 units remaining)
     [ (Pair 10 0) ]
-  - location: 26 (remaining gas: 1039969.908 units remaining)
+  - location: 26 (remaining gas: 1039973.428 units remaining)
     [ (Pair 10 0)
       (Pair 10 0) ]
-  - location: 27 (remaining gas: 1039969.898 units remaining)
+  - location: 27 (remaining gas: 1039973.418 units remaining)
     [ 10
       0
       (Pair 10 0) ]
-  - location: 28 (remaining gas: 1039969.873 units remaining)
+  - location: 28 (remaining gas: 1039973.398 units remaining)
     [ 10
       0
       (Pair 10 0) ]
-  - location: 29 (remaining gas: 1039969.858 units remaining)
+  - location: 29 (remaining gas: 1039973.388 units remaining)
     [ 0
       (Pair 10 0) ]
-  - location: 31 (remaining gas: 1039969.833 units remaining)
+  - location: 31 (remaining gas: 1039973.368 units remaining)
     [ 0
       (Pair 10 0) ]
-  - location: 29 (remaining gas: 1039969.803 units remaining)
+  - location: 29 (remaining gas: 1039973.348 units remaining)
     [ 10
       0
       (Pair 10 0) ]
-  - location: 32 (remaining gas: 1039969.663 units remaining)
+  - location: 32 (remaining gas: 1039973.243 units remaining)
     [ None
       (Pair 10 0) ]
-  - location: 33 (remaining gas: 1039969.653 units remaining)
+  - location: 33 (remaining gas: 1039973.233 units remaining)
     [ (Pair 10 0)
       None ]
-  - location: 34 (remaining gas: 1039969.643 units remaining)
+  - location: 34 (remaining gas: 1039973.223 units remaining)
     [ (Pair 10 0)
       (Pair 10 0)
       None ]
-  - location: 35 (remaining gas: 1039969.633 units remaining)
+  - location: 35 (remaining gas: 1039973.213 units remaining)
     [ 10
       0
       (Pair 10 0)
       None ]
-  - location: 36 (remaining gas: 1039969.608 units remaining)
+  - location: 36 (remaining gas: 1039973.193 units remaining)
     [ 10
       0
       (Pair 10 0)
       None ]
-  - location: 37 (remaining gas: 1039969.468 units remaining)
+  - location: 37 (remaining gas: 1039973.088 units remaining)
     [ None
       (Pair 10 0)
       None ]
-  - location: 38 (remaining gas: 1039969.458 units remaining)
+  - location: 38 (remaining gas: 1039973.078 units remaining)
     [ (Pair 10 0)
       None
       None ]
-  - location: 39 (remaining gas: 1039969.448 units remaining)
+  - location: 39 (remaining gas: 1039973.068 units remaining)
     [ (Pair 10 0)
       (Pair 10 0)
       None
       None ]
-  - location: 40 (remaining gas: 1039969.438 units remaining)
+  - location: 40 (remaining gas: 1039973.058 units remaining)
     [ 10
       0
       (Pair 10 0)
       None
       None ]
-  - location: 41 (remaining gas: 1039969.423 units remaining)
+  - location: 41 (remaining gas: 1039973.048 units remaining)
     [ 0
       (Pair 10 0)
       None
       None ]
-  - location: 43 (remaining gas: 1039969.398 units remaining)
+  - location: 43 (remaining gas: 1039973.028 units remaining)
     [ 0
       (Pair 10 0)
       None
       None ]
-  - location: 41 (remaining gas: 1039969.368 units remaining)
+  - location: 41 (remaining gas: 1039973.008 units remaining)
     [ 10
       0
       (Pair 10 0)
       None
       None ]
-  - location: 44 (remaining gas: 1039969.228 units remaining)
+  - location: 44 (remaining gas: 1039972.903 units remaining)
     [ None
       (Pair 10 0)
       None
       None ]
-  - location: 45 (remaining gas: 1039969.218 units remaining)
+  - location: 45 (remaining gas: 1039972.893 units remaining)
     [ (Pair 10 0)
       None
       None
       None ]
-  - location: 46 (remaining gas: 1039969.208 units remaining)
+  - location: 46 (remaining gas: 1039972.883 units remaining)
     [ 10
       0
       None
       None
       None ]
-  - location: 47 (remaining gas: 1039969.068 units remaining)
+  - location: 47 (remaining gas: 1039972.778 units remaining)
     [ None
       None
       None
       None ]
-  - location: 49 (remaining gas: 1039969.020 units remaining)
+  - location: 49 (remaining gas: 1039972.743 units remaining)
     [ None
       None ]
-  - location: 52 (remaining gas: 1039969.005 units remaining)
+  - location: 52 (remaining gas: 1039972.733 units remaining)
     [ (Pair None None) ]
-  - location: 49 (remaining gas: 1039968.980 units remaining)
+  - location: 49 (remaining gas: 1039972.713 units remaining)
     [ None
       (Pair None None) ]
-  - location: 49 (remaining gas: 1039968.970 units remaining)
+  - location: 49 (remaining gas: 1039972.703 units remaining)
     [ None
       None
       (Pair None None) ]
-  - location: 49 (remaining gas: 1039968.970 units remaining)
+  - location: 49 (remaining gas: 1039972.703 units remaining)
     [ None
       None
       (Pair None None) ]
-  - location: 53 (remaining gas: 1039968.955 units remaining)
+  - location: 53 (remaining gas: 1039972.693 units remaining)
     [ None
       (Pair None None) ]
-  - location: 55 (remaining gas: 1039968.940 units remaining)
+  - location: 55 (remaining gas: 1039972.683 units remaining)
     [ (Pair None None None) ]
-  - location: 53 (remaining gas: 1039968.910 units remaining)
+  - location: 53 (remaining gas: 1039972.663 units remaining)
     [ None
       (Pair None None None) ]
-  - location: 56 (remaining gas: 1039968.895 units remaining)
+  - location: 56 (remaining gas: 1039972.653 units remaining)
     [ (Pair None None None None) ]
-  - location: 57 (remaining gas: 1039968.880 units remaining)
+  - location: 57 (remaining gas: 1039972.643 units remaining)
     [ {}
       (Pair None None None None) ]
-  - location: 59 (remaining gas: 1039968.865 units remaining)
+  - location: 59 (remaining gas: 1039972.633 units remaining)
     [ (Pair {} None None None None) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Left 0))-(Left None)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Left 0))-(Left None)].out
index 8762c57b021666b0ff3b9764c1aef31b39631b8a..5d81a14b0ce4cc116a09ee03a9e8ee5cf02d642c 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Left 0))-(Left None)].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Left 0))-(Left None)].out	
@@ -7,31 +7,31 @@ emitted operations
 big_map diff
   
 trace
-  - location: 19 (remaining gas: 1039982.361 units remaining)
+  - location: 19 (remaining gas: 1039985.721 units remaining)
     [ (Pair (Pair 10 (Left 0)) (Left None)) ]
-  - location: 19 (remaining gas: 1039982.351 units remaining)
+  - location: 19 (remaining gas: 1039985.711 units remaining)
     [ (Pair 10 (Left 0)) ]
-  - location: 20 (remaining gas: 1039982.341 units remaining)
+  - location: 20 (remaining gas: 1039985.701 units remaining)
     [ 10
       (Left 0) ]
-  - location: 21 (remaining gas: 1039982.331 units remaining)
+  - location: 21 (remaining gas: 1039985.691 units remaining)
     [ (Left 0)
       10 ]
-  - location: 22 (remaining gas: 1039982.321 units remaining)
+  - location: 22 (remaining gas: 1039985.681 units remaining)
     [ 0
       10 ]
-  - location: 24 (remaining gas: 1039982.311 units remaining)
+  - location: 24 (remaining gas: 1039985.671 units remaining)
     [ 10
       0 ]
-  - location: 25 (remaining gas: 1039982.171 units remaining)
+  - location: 25 (remaining gas: 1039985.591 units remaining)
     [ None ]
-  - location: 26 (remaining gas: 1039982.156 units remaining)
+  - location: 26 (remaining gas: 1039985.581 units remaining)
     [ (Left None) ]
-  - location: 22 (remaining gas: 1039982.141 units remaining)
+  - location: 22 (remaining gas: 1039985.571 units remaining)
     [ (Left None) ]
-  - location: 39 (remaining gas: 1039982.126 units remaining)
+  - location: 39 (remaining gas: 1039985.561 units remaining)
     [ {}
       (Left None) ]
-  - location: 41 (remaining gas: 1039982.111 units remaining)
+  - location: 41 (remaining gas: 1039985.551 units remaining)
     [ (Pair {} (Left None)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Left 10))-(Left (So.f782cc1dec.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Left 10))-(Left (So.f782cc1dec.out
index 774169e27305eb7f9d616da606164397333bec4e..d435d20411ad3e260252a725224c49d67fcd9cd5 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Left 10))-(Left (So.f782cc1dec.out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Left 10))-(Left (So.f782cc1dec.out	
@@ -7,31 +7,31 @@ emitted operations
 big_map diff
   
 trace
-  - location: 19 (remaining gas: 1039982.361 units remaining)
+  - location: 19 (remaining gas: 1039985.721 units remaining)
     [ (Pair (Pair 10 (Left 10)) (Left None)) ]
-  - location: 19 (remaining gas: 1039982.351 units remaining)
+  - location: 19 (remaining gas: 1039985.711 units remaining)
     [ (Pair 10 (Left 10)) ]
-  - location: 20 (remaining gas: 1039982.341 units remaining)
+  - location: 20 (remaining gas: 1039985.701 units remaining)
     [ 10
       (Left 10) ]
-  - location: 21 (remaining gas: 1039982.331 units remaining)
+  - location: 21 (remaining gas: 1039985.691 units remaining)
     [ (Left 10)
       10 ]
-  - location: 22 (remaining gas: 1039982.321 units remaining)
+  - location: 22 (remaining gas: 1039985.681 units remaining)
     [ 10
       10 ]
-  - location: 24 (remaining gas: 1039982.311 units remaining)
+  - location: 24 (remaining gas: 1039985.671 units remaining)
     [ 10
       10 ]
-  - location: 25 (remaining gas: 1039982.171 units remaining)
+  - location: 25 (remaining gas: 1039985.591 units remaining)
     [ (Some (Pair 1 0)) ]
-  - location: 26 (remaining gas: 1039982.156 units remaining)
+  - location: 26 (remaining gas: 1039985.581 units remaining)
     [ (Left (Some (Pair 1 0))) ]
-  - location: 22 (remaining gas: 1039982.141 units remaining)
+  - location: 22 (remaining gas: 1039985.571 units remaining)
     [ (Left (Some (Pair 1 0))) ]
-  - location: 39 (remaining gas: 1039982.126 units remaining)
+  - location: 39 (remaining gas: 1039985.561 units remaining)
     [ {}
       (Left (Some (Pair 1 0))) ]
-  - location: 41 (remaining gas: 1039982.111 units remaining)
+  - location: 41 (remaining gas: 1039985.551 units remaining)
     [ (Pair {} (Left (Some (Pair 1 0)))) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Left 3))-(Left (Som.016b4db96c.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Left 3))-(Left (Som.016b4db96c.out
index 6b91e21b288316344456fd2fac80372fb7b74956..63172eafb4bd8897b32e64f9c3b8ab8076bea60b 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Left 3))-(Left (Som.016b4db96c.out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Left 3))-(Left (Som.016b4db96c.out	
@@ -7,31 +7,31 @@ emitted operations
 big_map diff
   
 trace
-  - location: 19 (remaining gas: 1039982.361 units remaining)
+  - location: 19 (remaining gas: 1039985.721 units remaining)
     [ (Pair (Pair 10 (Left 3)) (Left None)) ]
-  - location: 19 (remaining gas: 1039982.351 units remaining)
+  - location: 19 (remaining gas: 1039985.711 units remaining)
     [ (Pair 10 (Left 3)) ]
-  - location: 20 (remaining gas: 1039982.341 units remaining)
+  - location: 20 (remaining gas: 1039985.701 units remaining)
     [ 10
       (Left 3) ]
-  - location: 21 (remaining gas: 1039982.331 units remaining)
+  - location: 21 (remaining gas: 1039985.691 units remaining)
     [ (Left 3)
       10 ]
-  - location: 22 (remaining gas: 1039982.321 units remaining)
+  - location: 22 (remaining gas: 1039985.681 units remaining)
     [ 3
       10 ]
-  - location: 24 (remaining gas: 1039982.311 units remaining)
+  - location: 24 (remaining gas: 1039985.671 units remaining)
     [ 10
       3 ]
-  - location: 25 (remaining gas: 1039982.171 units remaining)
+  - location: 25 (remaining gas: 1039985.591 units remaining)
     [ (Some (Pair 3 1)) ]
-  - location: 26 (remaining gas: 1039982.156 units remaining)
+  - location: 26 (remaining gas: 1039985.581 units remaining)
     [ (Left (Some (Pair 3 1))) ]
-  - location: 22 (remaining gas: 1039982.141 units remaining)
+  - location: 22 (remaining gas: 1039985.571 units remaining)
     [ (Left (Some (Pair 3 1))) ]
-  - location: 39 (remaining gas: 1039982.126 units remaining)
+  - location: 39 (remaining gas: 1039985.561 units remaining)
     [ {}
       (Left (Some (Pair 3 1))) ]
-  - location: 41 (remaining gas: 1039982.111 units remaining)
+  - location: 41 (remaining gas: 1039985.551 units remaining)
     [ (Pair {} (Left (Some (Pair 3 1)))) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Right 0))-(Right None)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Right 0))-(Right None)].out
index fc0546765d602e0354f044bcc55682eef9c41290..164bf22861c979af4550e3907955d517e1da8c52 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Right 0))-(Right None)].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Right 0))-(Right None)].out	
@@ -7,31 +7,31 @@ emitted operations
 big_map diff
   
 trace
-  - location: 19 (remaining gas: 1039982.361 units remaining)
+  - location: 19 (remaining gas: 1039985.721 units remaining)
     [ (Pair (Pair 10 (Right 0)) (Left None)) ]
-  - location: 19 (remaining gas: 1039982.351 units remaining)
+  - location: 19 (remaining gas: 1039985.711 units remaining)
     [ (Pair 10 (Right 0)) ]
-  - location: 20 (remaining gas: 1039982.341 units remaining)
+  - location: 20 (remaining gas: 1039985.701 units remaining)
     [ 10
       (Right 0) ]
-  - location: 21 (remaining gas: 1039982.331 units remaining)
+  - location: 21 (remaining gas: 1039985.691 units remaining)
     [ (Right 0)
       10 ]
-  - location: 22 (remaining gas: 1039982.321 units remaining)
+  - location: 22 (remaining gas: 1039985.681 units remaining)
     [ 0
       10 ]
-  - location: 32 (remaining gas: 1039982.311 units remaining)
+  - location: 32 (remaining gas: 1039985.671 units remaining)
     [ 10
       0 ]
-  - location: 33 (remaining gas: 1039982.171 units remaining)
+  - location: 33 (remaining gas: 1039985.601 units remaining)
     [ None ]
-  - location: 34 (remaining gas: 1039982.156 units remaining)
+  - location: 34 (remaining gas: 1039985.591 units remaining)
     [ (Right None) ]
-  - location: 22 (remaining gas: 1039982.141 units remaining)
+  - location: 22 (remaining gas: 1039985.581 units remaining)
     [ (Right None) ]
-  - location: 39 (remaining gas: 1039982.126 units remaining)
+  - location: 39 (remaining gas: 1039985.571 units remaining)
     [ {}
       (Right None) ]
-  - location: 41 (remaining gas: 1039982.111 units remaining)
+  - location: 41 (remaining gas: 1039985.561 units remaining)
     [ (Pair {} (Right None)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Right 10))-(Right (.e705a30e07.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Right 10))-(Right (.e705a30e07.out
index 2a6d724b3589e0948b2214fc3cd8352bfff6c558..9df6e32c0789fdf925995d6e27cf0eacdb10608c 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Right 10))-(Right (.e705a30e07.out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Right 10))-(Right (.e705a30e07.out	
@@ -7,31 +7,31 @@ emitted operations
 big_map diff
   
 trace
-  - location: 19 (remaining gas: 1039982.361 units remaining)
+  - location: 19 (remaining gas: 1039985.721 units remaining)
     [ (Pair (Pair 10 (Right 10)) (Left None)) ]
-  - location: 19 (remaining gas: 1039982.351 units remaining)
+  - location: 19 (remaining gas: 1039985.711 units remaining)
     [ (Pair 10 (Right 10)) ]
-  - location: 20 (remaining gas: 1039982.341 units remaining)
+  - location: 20 (remaining gas: 1039985.701 units remaining)
     [ 10
       (Right 10) ]
-  - location: 21 (remaining gas: 1039982.331 units remaining)
+  - location: 21 (remaining gas: 1039985.691 units remaining)
     [ (Right 10)
       10 ]
-  - location: 22 (remaining gas: 1039982.321 units remaining)
+  - location: 22 (remaining gas: 1039985.681 units remaining)
     [ 10
       10 ]
-  - location: 32 (remaining gas: 1039982.311 units remaining)
+  - location: 32 (remaining gas: 1039985.671 units remaining)
     [ 10
       10 ]
-  - location: 33 (remaining gas: 1039982.171 units remaining)
+  - location: 33 (remaining gas: 1039985.601 units remaining)
     [ (Some (Pair 1 0)) ]
-  - location: 34 (remaining gas: 1039982.156 units remaining)
+  - location: 34 (remaining gas: 1039985.591 units remaining)
     [ (Right (Some (Pair 1 0))) ]
-  - location: 22 (remaining gas: 1039982.141 units remaining)
+  - location: 22 (remaining gas: 1039985.581 units remaining)
     [ (Right (Some (Pair 1 0))) ]
-  - location: 39 (remaining gas: 1039982.126 units remaining)
+  - location: 39 (remaining gas: 1039985.571 units remaining)
     [ {}
       (Right (Some (Pair 1 0))) ]
-  - location: 41 (remaining gas: 1039982.111 units remaining)
+  - location: 41 (remaining gas: 1039985.561 units remaining)
     [ (Pair {} (Right (Some (Pair 1 0)))) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Right 3))-(Right (S.44485eda6a.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Right 3))-(Right (S.44485eda6a.out
index 668510393037c45e738695ea317be704d793cb31..8e5884d6d2cc00ceb4a00b1647251b04e81589a4 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Right 3))-(Right (S.44485eda6a.out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 10 (Right 3))-(Right (S.44485eda6a.out	
@@ -7,31 +7,31 @@ emitted operations
 big_map diff
   
 trace
-  - location: 19 (remaining gas: 1039982.361 units remaining)
+  - location: 19 (remaining gas: 1039985.721 units remaining)
     [ (Pair (Pair 10 (Right 3)) (Left None)) ]
-  - location: 19 (remaining gas: 1039982.351 units remaining)
+  - location: 19 (remaining gas: 1039985.711 units remaining)
     [ (Pair 10 (Right 3)) ]
-  - location: 20 (remaining gas: 1039982.341 units remaining)
+  - location: 20 (remaining gas: 1039985.701 units remaining)
     [ 10
       (Right 3) ]
-  - location: 21 (remaining gas: 1039982.331 units remaining)
+  - location: 21 (remaining gas: 1039985.691 units remaining)
     [ (Right 3)
       10 ]
-  - location: 22 (remaining gas: 1039982.321 units remaining)
+  - location: 22 (remaining gas: 1039985.681 units remaining)
     [ 3
       10 ]
-  - location: 32 (remaining gas: 1039982.311 units remaining)
+  - location: 32 (remaining gas: 1039985.671 units remaining)
     [ 10
       3 ]
-  - location: 33 (remaining gas: 1039982.171 units remaining)
+  - location: 33 (remaining gas: 1039985.601 units remaining)
     [ (Some (Pair 3 1)) ]
-  - location: 34 (remaining gas: 1039982.156 units remaining)
+  - location: 34 (remaining gas: 1039985.591 units remaining)
     [ (Right (Some (Pair 3 1))) ]
-  - location: 22 (remaining gas: 1039982.141 units remaining)
+  - location: 22 (remaining gas: 1039985.581 units remaining)
     [ (Right (Some (Pair 3 1))) ]
-  - location: 39 (remaining gas: 1039982.126 units remaining)
+  - location: 39 (remaining gas: 1039985.571 units remaining)
     [ {}
       (Right (Some (Pair 3 1))) ]
-  - location: 41 (remaining gas: 1039982.111 units remaining)
+  - location: 41 (remaining gas: 1039985.561 units remaining)
     [ (Pair {} (Right (Some (Pair 3 1)))) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 5 (Right 10))-(Right (S.8ab987af15.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 5 (Right 10))-(Right (S.8ab987af15.out
index 103f433bfc7a4e4a2afefa18e8e49bca62d6f466..d7adc1bb0e1a466f260dc181726e051a5c86640d 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 5 (Right 10))-(Right (S.8ab987af15.out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ediv_mutez.tz-(Left None)-(Pair 5 (Right 10))-(Right (S.8ab987af15.out	
@@ -7,31 +7,31 @@ emitted operations
 big_map diff
   
 trace
-  - location: 19 (remaining gas: 1039982.361 units remaining)
+  - location: 19 (remaining gas: 1039985.721 units remaining)
     [ (Pair (Pair 5 (Right 10)) (Left None)) ]
-  - location: 19 (remaining gas: 1039982.351 units remaining)
+  - location: 19 (remaining gas: 1039985.711 units remaining)
     [ (Pair 5 (Right 10)) ]
-  - location: 20 (remaining gas: 1039982.341 units remaining)
+  - location: 20 (remaining gas: 1039985.701 units remaining)
     [ 5
       (Right 10) ]
-  - location: 21 (remaining gas: 1039982.331 units remaining)
+  - location: 21 (remaining gas: 1039985.691 units remaining)
     [ (Right 10)
       5 ]
-  - location: 22 (remaining gas: 1039982.321 units remaining)
+  - location: 22 (remaining gas: 1039985.681 units remaining)
     [ 10
       5 ]
-  - location: 32 (remaining gas: 1039982.311 units remaining)
+  - location: 32 (remaining gas: 1039985.671 units remaining)
     [ 5
       10 ]
-  - location: 33 (remaining gas: 1039982.171 units remaining)
+  - location: 33 (remaining gas: 1039985.601 units remaining)
     [ (Some (Pair 0 5)) ]
-  - location: 34 (remaining gas: 1039982.156 units remaining)
+  - location: 34 (remaining gas: 1039985.591 units remaining)
     [ (Right (Some (Pair 0 5))) ]
-  - location: 22 (remaining gas: 1039982.141 units remaining)
+  - location: 22 (remaining gas: 1039985.581 units remaining)
     [ (Right (Some (Pair 0 5))) ]
-  - location: 39 (remaining gas: 1039982.126 units remaining)
+  - location: 39 (remaining gas: 1039985.571 units remaining)
     [ {}
       (Right (Some (Pair 0 5))) ]
-  - location: 41 (remaining gas: 1039982.111 units remaining)
+  - location: 41 (remaining gas: 1039985.561 units remaining)
     [ (Pair {} (Right (Some (Pair 0 5)))) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[empty_map.tz-{}-Unit-{ Elt \"hello\" \"world\" }].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[empty_map.tz-{}-Unit-{ Elt \"hello\" \"world\" }].out"
index 723cda5f81f85624493da23f5e3fdcf4576a93e8..6a530f682d46677f71753e7ef6272ac65620fc7a 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[empty_map.tz-{}-Unit-{ Elt \"hello\" \"world\" }].out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[empty_map.tz-{}-Unit-{ Elt \"hello\" \"world\" }].out"	
@@ -7,27 +7,27 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (remaining gas: 1039990.071 units remaining)
+  - location: 9 (remaining gas: 1039991.351 units remaining)
     [ (Pair Unit {}) ]
-  - location: 9 (remaining gas: 1039990.061 units remaining)
+  - location: 9 (remaining gas: 1039991.341 units remaining)
     [  ]
-  - location: 10 (remaining gas: 1039989.841 units remaining)
+  - location: 10 (remaining gas: 1039991.121 units remaining)
     [ {} ]
-  - location: 13 (remaining gas: 1039989.831 units remaining)
+  - location: 13 (remaining gas: 1039991.111 units remaining)
     [ "world"
       {} ]
-  - location: 16 (remaining gas: 1039989.816 units remaining)
+  - location: 16 (remaining gas: 1039991.101 units remaining)
     [ (Some "world")
       {} ]
-  - location: 17 (remaining gas: 1039989.806 units remaining)
+  - location: 17 (remaining gas: 1039991.091 units remaining)
     [ "hello"
       (Some "world")
       {} ]
-  - location: 20 (remaining gas: 1039989.716 units remaining)
+  - location: 20 (remaining gas: 1039991.001 units remaining)
     [ { Elt "hello" "world" } ]
-  - location: 21 (remaining gas: 1039989.701 units remaining)
+  - location: 21 (remaining gas: 1039990.991 units remaining)
     [ {}
       { Elt "hello" "world" } ]
-  - location: 23 (remaining gas: 1039989.686 units remaining)
+  - location: 23 (remaining gas: 1039990.981 units remaining)
     [ (Pair {} { Elt "hello" "world" }) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[exec_concat.tz-\"?\"-\"\"-\"_abc\"].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[exec_concat.tz-\"?\"-\"\"-\"_abc\"].out"
index f623674d44b0e56343399561a264bf862ce92203..32ce63c5e4c5f9f95a2a668a67798804cceaf53b 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[exec_concat.tz-\"?\"-\"\"-\"_abc\"].out"
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[exec_concat.tz-\"?\"-\"\"-\"_abc\"].out"
@@ -7,42 +7,42 @@ emitted operations
 big_map diff
   
 trace
-  - location: 7 (remaining gas: 1039987.279 units remaining)
+  - location: 7 (remaining gas: 1039988.559 units remaining)
     [ (Pair "" "?") ]
-  - location: 7 (remaining gas: 1039987.269 units remaining)
+  - location: 7 (remaining gas: 1039988.549 units remaining)
     [ "" ]
-  - location: 8 (remaining gas: 1039987.259 units remaining)
+  - location: 8 (remaining gas: 1039988.539 units remaining)
     [ { PUSH string "_abc" ; NIL string ; SWAP ; CONS ; SWAP ; CONS ; CONCAT }
       "" ]
-  - location: 22 (remaining gas: 1039987.249 units remaining)
+  - location: 22 (remaining gas: 1039988.529 units remaining)
     [ ""
       { PUSH string "_abc" ; NIL string ; SWAP ; CONS ; SWAP ; CONS ; CONCAT } ]
-  - location: 12 (remaining gas: 1039987.239 units remaining)
+  - location: 12 (remaining gas: 1039988.519 units remaining)
     [ "_abc"
       "" ]
-  - location: 15 (remaining gas: 1039987.224 units remaining)
+  - location: 15 (remaining gas: 1039988.509 units remaining)
     [ {}
       "_abc"
       "" ]
-  - location: 17 (remaining gas: 1039987.214 units remaining)
+  - location: 17 (remaining gas: 1039988.499 units remaining)
     [ "_abc"
       {}
       "" ]
-  - location: 18 (remaining gas: 1039987.199 units remaining)
+  - location: 18 (remaining gas: 1039988.489 units remaining)
     [ { "_abc" }
       "" ]
-  - location: 19 (remaining gas: 1039987.189 units remaining)
+  - location: 19 (remaining gas: 1039988.479 units remaining)
     [ ""
       { "_abc" } ]
-  - location: 20 (remaining gas: 1039987.174 units remaining)
+  - location: 20 (remaining gas: 1039988.469 units remaining)
     [ { "" ; "_abc" } ]
-  - location: 21 (remaining gas: 1039987.054 units remaining)
+  - location: 21 (remaining gas: 1039988.349 units remaining)
     [ "_abc" ]
-  - location: 23 (remaining gas: 1039987.024 units remaining)
+  - location: 23 (remaining gas: 1039988.329 units remaining)
     [ "_abc" ]
-  - location: 24 (remaining gas: 1039987.009 units remaining)
+  - location: 24 (remaining gas: 1039988.319 units remaining)
     [ {}
       "_abc" ]
-  - location: 26 (remaining gas: 1039986.994 units remaining)
+  - location: 26 (remaining gas: 1039988.309 units remaining)
     [ (Pair {} "_abc") ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[exec_concat.tz-\"?\"-\"test\"-\"test_abc\"].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[exec_concat.tz-\"?\"-\"test\"-\"test_abc\"].out"
index 22076adb6d63c5f1eefd15a91f440a738dda6594..b2e83dbe65dc94fa7ce2bfb9f5f3ce7e7e676c30 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[exec_concat.tz-\"?\"-\"test\"-\"test_abc\"].out"
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[exec_concat.tz-\"?\"-\"test\"-\"test_abc\"].out"
@@ -7,42 +7,42 @@ emitted operations
 big_map diff
   
 trace
-  - location: 7 (remaining gas: 1039987.239 units remaining)
+  - location: 7 (remaining gas: 1039988.519 units remaining)
     [ (Pair "test" "?") ]
-  - location: 7 (remaining gas: 1039987.229 units remaining)
+  - location: 7 (remaining gas: 1039988.509 units remaining)
     [ "test" ]
-  - location: 8 (remaining gas: 1039987.219 units remaining)
+  - location: 8 (remaining gas: 1039988.499 units remaining)
     [ { PUSH string "_abc" ; NIL string ; SWAP ; CONS ; SWAP ; CONS ; CONCAT }
       "test" ]
-  - location: 22 (remaining gas: 1039987.209 units remaining)
+  - location: 22 (remaining gas: 1039988.489 units remaining)
     [ "test"
       { PUSH string "_abc" ; NIL string ; SWAP ; CONS ; SWAP ; CONS ; CONCAT } ]
-  - location: 12 (remaining gas: 1039987.199 units remaining)
+  - location: 12 (remaining gas: 1039988.479 units remaining)
     [ "_abc"
       "test" ]
-  - location: 15 (remaining gas: 1039987.184 units remaining)
+  - location: 15 (remaining gas: 1039988.469 units remaining)
     [ {}
       "_abc"
       "test" ]
-  - location: 17 (remaining gas: 1039987.174 units remaining)
+  - location: 17 (remaining gas: 1039988.459 units remaining)
     [ "_abc"
       {}
       "test" ]
-  - location: 18 (remaining gas: 1039987.159 units remaining)
+  - location: 18 (remaining gas: 1039988.449 units remaining)
     [ { "_abc" }
       "test" ]
-  - location: 19 (remaining gas: 1039987.149 units remaining)
+  - location: 19 (remaining gas: 1039988.439 units remaining)
     [ "test"
       { "_abc" } ]
-  - location: 20 (remaining gas: 1039987.134 units remaining)
+  - location: 20 (remaining gas: 1039988.429 units remaining)
     [ { "test" ; "_abc" } ]
-  - location: 21 (remaining gas: 1039987.014 units remaining)
+  - location: 21 (remaining gas: 1039988.309 units remaining)
     [ "test_abc" ]
-  - location: 23 (remaining gas: 1039986.984 units remaining)
+  - location: 23 (remaining gas: 1039988.289 units remaining)
     [ "test_abc" ]
-  - location: 24 (remaining gas: 1039986.969 units remaining)
+  - location: 24 (remaining gas: 1039988.279 units remaining)
     [ {}
       "test_abc" ]
-  - location: 26 (remaining gas: 1039986.954 units remaining)
+  - location: 26 (remaining gas: 1039988.269 units remaining)
     [ (Pair {} "test_abc") ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[first.tz-111-{ 1 ; 2 ; 3 ; 4 }-1].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[first.tz-111-{ 1 ; 2 ; 3 ; 4 }-1].out
index 61a0e323bc8f6331d6b097c9626b2a8d22d104dd..091227a57c88252a0fd7bde3586c73b25658f727 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[first.tz-111-{ 1 ; 2 ; 3 ; 4 }-1].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[first.tz-111-{ 1 ; 2 ; 3 ; 4 }-1].out	
@@ -7,24 +7,24 @@ emitted operations
 big_map diff
   
 trace
-  - location: 8 (remaining gas: 1039991.133 units remaining)
+  - location: 8 (remaining gas: 1039991.773 units remaining)
     [ (Pair { 1 ; 2 ; 3 ; 4 } 111) ]
-  - location: 8 (remaining gas: 1039991.123 units remaining)
+  - location: 8 (remaining gas: 1039991.763 units remaining)
     [ { 1 ; 2 ; 3 ; 4 } ]
-  - location: 9 (remaining gas: 1039991.113 units remaining)
+  - location: 9 (remaining gas: 1039991.753 units remaining)
     [ 1
       { 2 ; 3 ; 4 } ]
-  - location: 11 (remaining gas: 1039991.098 units remaining)
+  - location: 11 (remaining gas: 1039991.743 units remaining)
     [ { 2 ; 3 ; 4 } ]
-  - location: 13 (remaining gas: 1039991.088 units remaining)
+  - location: 13 (remaining gas: 1039991.733 units remaining)
     [  ]
-  - location: 11 (remaining gas: 1039991.058 units remaining)
+  - location: 11 (remaining gas: 1039991.713 units remaining)
     [ 1 ]
-  - location: 9 (remaining gas: 1039991.043 units remaining)
+  - location: 9 (remaining gas: 1039991.703 units remaining)
     [ 1 ]
-  - location: 18 (remaining gas: 1039991.028 units remaining)
+  - location: 18 (remaining gas: 1039991.693 units remaining)
     [ {}
       1 ]
-  - location: 20 (remaining gas: 1039991.013 units remaining)
+  - location: 20 (remaining gas: 1039991.683 units remaining)
     [ (Pair {} 1) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[first.tz-111-{ 4 }-4].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[first.tz-111-{ 4 }-4].out
index c027b2ef58697bb12d87af74a40dc124d3bf8385..7865e871f9c9894de81cff576da6c6b674106a05 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[first.tz-111-{ 4 }-4].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[first.tz-111-{ 4 }-4].out	
@@ -7,24 +7,24 @@ emitted operations
 big_map diff
   
 trace
-  - location: 8 (remaining gas: 1039991.433 units remaining)
+  - location: 8 (remaining gas: 1039992.073 units remaining)
     [ (Pair { 4 } 111) ]
-  - location: 8 (remaining gas: 1039991.423 units remaining)
+  - location: 8 (remaining gas: 1039992.063 units remaining)
     [ { 4 } ]
-  - location: 9 (remaining gas: 1039991.413 units remaining)
+  - location: 9 (remaining gas: 1039992.053 units remaining)
     [ 4
       {} ]
-  - location: 11 (remaining gas: 1039991.398 units remaining)
+  - location: 11 (remaining gas: 1039992.043 units remaining)
     [ {} ]
-  - location: 13 (remaining gas: 1039991.388 units remaining)
+  - location: 13 (remaining gas: 1039992.033 units remaining)
     [  ]
-  - location: 11 (remaining gas: 1039991.358 units remaining)
+  - location: 11 (remaining gas: 1039992.013 units remaining)
     [ 4 ]
-  - location: 9 (remaining gas: 1039991.343 units remaining)
+  - location: 9 (remaining gas: 1039992.003 units remaining)
     [ 4 ]
-  - location: 18 (remaining gas: 1039991.328 units remaining)
+  - location: 18 (remaining gas: 1039991.993 units remaining)
     [ {}
       4 ]
-  - location: 20 (remaining gas: 1039991.313 units remaining)
+  - location: 20 (remaining gas: 1039991.983 units remaining)
     [ (Pair {} 4) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair (Some 4) {})-\"hello\"-(Pair .161d86cef6.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair (Some 4) {})-\"hello\"-(Pair .161d86cef6.out"
index 04741a23e71e76bd44572b226c203e91e1f20ee0..59180f11a28bfd219df164f62213ce47244e7f2a 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair (Some 4) {})-\"hello\"-(Pair .161d86cef6.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair (Some 4) {})-\"hello\"-(Pair .161d86cef6.out"	
@@ -7,28 +7,28 @@ emitted operations
 big_map diff
   
 trace
-  - location: 13 (remaining gas: 1039989.801 units remaining)
+  - location: 13 (remaining gas: 1039991.561 units remaining)
     [ (Pair "hello" (Some 4) {}) ]
-  - location: 13 (remaining gas: 1039989.791 units remaining)
+  - location: 13 (remaining gas: 1039991.551 units remaining)
     [ "hello"
       (Pair (Some 4) {}) ]
-  - location: 14 (remaining gas: 1039989.776 units remaining)
+  - location: 14 (remaining gas: 1039991.541 units remaining)
     [ (Pair (Some 4) {}) ]
-  - location: 16 (remaining gas: 1039989.766 units remaining)
+  - location: 16 (remaining gas: 1039991.531 units remaining)
     [ (Some 4)
       {} ]
-  - location: 14 (remaining gas: 1039989.736 units remaining)
+  - location: 14 (remaining gas: 1039991.511 units remaining)
     [ "hello"
       (Some 4)
       {} ]
-  - location: 17 (remaining gas: 1039989.641 units remaining)
+  - location: 17 (remaining gas: 1039991.416 units remaining)
     [ None
       { Elt "hello" 4 } ]
-  - location: 18 (remaining gas: 1039989.626 units remaining)
+  - location: 18 (remaining gas: 1039991.406 units remaining)
     [ (Pair None { Elt "hello" 4 }) ]
-  - location: 19 (remaining gas: 1039989.611 units remaining)
+  - location: 19 (remaining gas: 1039991.396 units remaining)
     [ {}
       (Pair None { Elt "hello" 4 }) ]
-  - location: 21 (remaining gas: 1039989.596 units remaining)
+  - location: 21 (remaining gas: 1039991.386 units remaining)
     [ (Pair {} None { Elt "hello" 4 }) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair (Some 5) { Elt \"hello\" 4 }).684ab7e326.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair (Some 5) { Elt \"hello\" 4 }).684ab7e326.out"
index 81e3d779aa30a5aab5fca881c2115bdf4a3defa0..ab7144a40de7fbdd38e533124f6ab66087eb9dbb 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair (Some 5) { Elt \"hello\" 4 }).684ab7e326.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair (Some 5) { Elt \"hello\" 4 }).684ab7e326.out"	
@@ -7,28 +7,28 @@ emitted operations
 big_map diff
   
 trace
-  - location: 13 (remaining gas: 1039989.477 units remaining)
+  - location: 13 (remaining gas: 1039991.237 units remaining)
     [ (Pair "hi" (Some 5) { Elt "hello" 4 }) ]
-  - location: 13 (remaining gas: 1039989.467 units remaining)
+  - location: 13 (remaining gas: 1039991.227 units remaining)
     [ "hi"
       (Pair (Some 5) { Elt "hello" 4 }) ]
-  - location: 14 (remaining gas: 1039989.452 units remaining)
+  - location: 14 (remaining gas: 1039991.217 units remaining)
     [ (Pair (Some 5) { Elt "hello" 4 }) ]
-  - location: 16 (remaining gas: 1039989.442 units remaining)
+  - location: 16 (remaining gas: 1039991.207 units remaining)
     [ (Some 5)
       { Elt "hello" 4 } ]
-  - location: 14 (remaining gas: 1039989.412 units remaining)
+  - location: 14 (remaining gas: 1039991.187 units remaining)
     [ "hi"
       (Some 5)
       { Elt "hello" 4 } ]
-  - location: 17 (remaining gas: 1039989.320 units remaining)
+  - location: 17 (remaining gas: 1039991.095 units remaining)
     [ None
       { Elt "hello" 4 ; Elt "hi" 5 } ]
-  - location: 18 (remaining gas: 1039989.305 units remaining)
+  - location: 18 (remaining gas: 1039991.085 units remaining)
     [ (Pair None { Elt "hello" 4 ; Elt "hi" 5 }) ]
-  - location: 19 (remaining gas: 1039989.290 units remaining)
+  - location: 19 (remaining gas: 1039991.075 units remaining)
     [ {}
       (Pair None { Elt "hello" 4 ; Elt "hi" 5 }) ]
-  - location: 21 (remaining gas: 1039989.275 units remaining)
+  - location: 21 (remaining gas: 1039991.065 units remaining)
     [ (Pair {} None { Elt "hello" 4 ; Elt "hi" 5 }) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair (Some 5) { Elt \"hello\" 4 }).d49817fb83.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair (Some 5) { Elt \"hello\" 4 }).d49817fb83.out"
index b5cfd0be9663c0d79384a714be10009d73baafa9..a7f88bbee2ebf8e600b3ba6abd676c690a5b49d5 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair (Some 5) { Elt \"hello\" 4 }).d49817fb83.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair (Some 5) { Elt \"hello\" 4 }).d49817fb83.out"	
@@ -7,28 +7,28 @@ emitted operations
 big_map diff
   
 trace
-  - location: 13 (remaining gas: 1039989.447 units remaining)
+  - location: 13 (remaining gas: 1039991.207 units remaining)
     [ (Pair "hello" (Some 5) { Elt "hello" 4 }) ]
-  - location: 13 (remaining gas: 1039989.437 units remaining)
+  - location: 13 (remaining gas: 1039991.197 units remaining)
     [ "hello"
       (Pair (Some 5) { Elt "hello" 4 }) ]
-  - location: 14 (remaining gas: 1039989.422 units remaining)
+  - location: 14 (remaining gas: 1039991.187 units remaining)
     [ (Pair (Some 5) { Elt "hello" 4 }) ]
-  - location: 16 (remaining gas: 1039989.412 units remaining)
+  - location: 16 (remaining gas: 1039991.177 units remaining)
     [ (Some 5)
       { Elt "hello" 4 } ]
-  - location: 14 (remaining gas: 1039989.382 units remaining)
+  - location: 14 (remaining gas: 1039991.157 units remaining)
     [ "hello"
       (Some 5)
       { Elt "hello" 4 } ]
-  - location: 17 (remaining gas: 1039989.272 units remaining)
+  - location: 17 (remaining gas: 1039991.047 units remaining)
     [ (Some 4)
       { Elt "hello" 5 } ]
-  - location: 18 (remaining gas: 1039989.257 units remaining)
+  - location: 18 (remaining gas: 1039991.037 units remaining)
     [ (Pair (Some 4) { Elt "hello" 5 }) ]
-  - location: 19 (remaining gas: 1039989.242 units remaining)
+  - location: 19 (remaining gas: 1039991.027 units remaining)
     [ {}
       (Pair (Some 4) { Elt "hello" 5 }) ]
-  - location: 21 (remaining gas: 1039989.227 units remaining)
+  - location: 21 (remaining gas: 1039991.017 units remaining)
     [ (Pair {} (Some 4) { Elt "hello" 5 }) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair None { Elt \"1\" 1 ;         .6900b1da14.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair None { Elt \"1\" 1 ;         .6900b1da14.out"
index cb7e2b348b541984fb90794fba0a8dace5eb6625..5a32d2bf8049a65c30ed66408a9f1aad944baf89 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair None { Elt \"1\" 1 ;         .6900b1da14.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair None { Elt \"1\" 1 ;         .6900b1da14.out"	
@@ -7,28 +7,28 @@ emitted operations
 big_map diff
   
 trace
-  - location: 13 (remaining gas: 1039989.292 units remaining)
+  - location: 13 (remaining gas: 1039991.052 units remaining)
     [ (Pair "1" None { Elt "1" 1 ; Elt "2" 2 }) ]
-  - location: 13 (remaining gas: 1039989.282 units remaining)
+  - location: 13 (remaining gas: 1039991.042 units remaining)
     [ "1"
       (Pair None { Elt "1" 1 ; Elt "2" 2 }) ]
-  - location: 14 (remaining gas: 1039989.267 units remaining)
+  - location: 14 (remaining gas: 1039991.032 units remaining)
     [ (Pair None { Elt "1" 1 ; Elt "2" 2 }) ]
-  - location: 16 (remaining gas: 1039989.257 units remaining)
+  - location: 16 (remaining gas: 1039991.022 units remaining)
     [ None
       { Elt "1" 1 ; Elt "2" 2 } ]
-  - location: 14 (remaining gas: 1039989.227 units remaining)
+  - location: 14 (remaining gas: 1039991.002 units remaining)
     [ "1"
       None
       { Elt "1" 1 ; Elt "2" 2 } ]
-  - location: 17 (remaining gas: 1039989.138 units remaining)
+  - location: 17 (remaining gas: 1039990.913 units remaining)
     [ (Some 1)
       { Elt "2" 2 } ]
-  - location: 18 (remaining gas: 1039989.123 units remaining)
+  - location: 18 (remaining gas: 1039990.903 units remaining)
     [ (Pair (Some 1) { Elt "2" 2 }) ]
-  - location: 19 (remaining gas: 1039989.108 units remaining)
+  - location: 19 (remaining gas: 1039990.893 units remaining)
     [ {}
       (Pair (Some 1) { Elt "2" 2 }) ]
-  - location: 21 (remaining gas: 1039989.093 units remaining)
+  - location: 21 (remaining gas: 1039990.883 units remaining)
     [ (Pair {} (Some 1) { Elt "2" 2 }) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair None { Elt \"1\" 1 ;         .bca0ede8be.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair None { Elt \"1\" 1 ;         .bca0ede8be.out"
index 7659cdc408b5b4ef3cc33b78e34084a37f7688f8..dde6e35bfdc3b189cf44b4ef1d65724609aa3253 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair None { Elt \"1\" 1 ;         .bca0ede8be.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair None { Elt \"1\" 1 ;         .bca0ede8be.out"	
@@ -7,28 +7,28 @@ emitted operations
 big_map diff
   
 trace
-  - location: 13 (remaining gas: 1039989.292 units remaining)
+  - location: 13 (remaining gas: 1039991.052 units remaining)
     [ (Pair "1" None { Elt "1" 1 ; Elt "2" 2 }) ]
-  - location: 13 (remaining gas: 1039989.282 units remaining)
+  - location: 13 (remaining gas: 1039991.042 units remaining)
     [ "1"
       (Pair None { Elt "1" 1 ; Elt "2" 2 }) ]
-  - location: 14 (remaining gas: 1039989.267 units remaining)
+  - location: 14 (remaining gas: 1039991.032 units remaining)
     [ (Pair None { Elt "1" 1 ; Elt "2" 2 }) ]
-  - location: 16 (remaining gas: 1039989.257 units remaining)
+  - location: 16 (remaining gas: 1039991.022 units remaining)
     [ None
       { Elt "1" 1 ; Elt "2" 2 } ]
-  - location: 14 (remaining gas: 1039989.227 units remaining)
+  - location: 14 (remaining gas: 1039991.002 units remaining)
     [ "1"
       None
       { Elt "1" 1 ; Elt "2" 2 } ]
-  - location: 17 (remaining gas: 1039989.138 units remaining)
+  - location: 17 (remaining gas: 1039990.913 units remaining)
     [ (Some 1)
       { Elt "2" 2 } ]
-  - location: 18 (remaining gas: 1039989.123 units remaining)
+  - location: 18 (remaining gas: 1039990.903 units remaining)
     [ (Pair (Some 1) { Elt "2" 2 }) ]
-  - location: 19 (remaining gas: 1039989.108 units remaining)
+  - location: 19 (remaining gas: 1039990.893 units remaining)
     [ {}
       (Pair (Some 1) { Elt "2" 2 }) ]
-  - location: 21 (remaining gas: 1039989.093 units remaining)
+  - location: 21 (remaining gas: 1039990.883 units remaining)
     [ (Pair {} (Some 1) { Elt "2" 2 }) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair None { Elt \"hello\" 4 })-\"he.c1b4e1d6dc.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair None { Elt \"hello\" 4 })-\"he.c1b4e1d6dc.out"
index a4110c1e65c5a893d1830b3453496bf10c22f314..456f75d3e14a2a7aacdef6f9beb0124927440dfd 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair None { Elt \"hello\" 4 })-\"he.c1b4e1d6dc.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair None { Elt \"hello\" 4 })-\"he.c1b4e1d6dc.out"	
@@ -7,28 +7,28 @@ emitted operations
 big_map diff
   
 trace
-  - location: 13 (remaining gas: 1039989.547 units remaining)
+  - location: 13 (remaining gas: 1039991.307 units remaining)
     [ (Pair "hello" None { Elt "hello" 4 }) ]
-  - location: 13 (remaining gas: 1039989.537 units remaining)
+  - location: 13 (remaining gas: 1039991.297 units remaining)
     [ "hello"
       (Pair None { Elt "hello" 4 }) ]
-  - location: 14 (remaining gas: 1039989.522 units remaining)
+  - location: 14 (remaining gas: 1039991.287 units remaining)
     [ (Pair None { Elt "hello" 4 }) ]
-  - location: 16 (remaining gas: 1039989.512 units remaining)
+  - location: 16 (remaining gas: 1039991.277 units remaining)
     [ None
       { Elt "hello" 4 } ]
-  - location: 14 (remaining gas: 1039989.482 units remaining)
+  - location: 14 (remaining gas: 1039991.257 units remaining)
     [ "hello"
       None
       { Elt "hello" 4 } ]
-  - location: 17 (remaining gas: 1039989.372 units remaining)
+  - location: 17 (remaining gas: 1039991.147 units remaining)
     [ (Some 4)
       {} ]
-  - location: 18 (remaining gas: 1039989.357 units remaining)
+  - location: 18 (remaining gas: 1039991.137 units remaining)
     [ (Pair (Some 4) {}) ]
-  - location: 19 (remaining gas: 1039989.342 units remaining)
+  - location: 19 (remaining gas: 1039991.127 units remaining)
     [ {}
       (Pair (Some 4) {}) ]
-  - location: 21 (remaining gas: 1039989.327 units remaining)
+  - location: 21 (remaining gas: 1039991.117 units remaining)
     [ (Pair {} (Some 4) {}) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair None {})-\"hello\"-(Pair None {})].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair None {})-\"hello\"-(Pair None {})].out"
index 03e11eaf2f5dd6dc4754c13f83b4824670a71f4b..5d6cf951067f1a0ca6185c1ceddfab93a796a0fe 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair None {})-\"hello\"-(Pair None {})].out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_and_update_map.tz-(Pair None {})-\"hello\"-(Pair None {})].out"	
@@ -7,28 +7,28 @@ emitted operations
 big_map diff
   
 trace
-  - location: 13 (remaining gas: 1039989.901 units remaining)
+  - location: 13 (remaining gas: 1039991.661 units remaining)
     [ (Pair "hello" None {}) ]
-  - location: 13 (remaining gas: 1039989.891 units remaining)
+  - location: 13 (remaining gas: 1039991.651 units remaining)
     [ "hello"
       (Pair None {}) ]
-  - location: 14 (remaining gas: 1039989.876 units remaining)
+  - location: 14 (remaining gas: 1039991.641 units remaining)
     [ (Pair None {}) ]
-  - location: 16 (remaining gas: 1039989.866 units remaining)
+  - location: 16 (remaining gas: 1039991.631 units remaining)
     [ None
       {} ]
-  - location: 14 (remaining gas: 1039989.836 units remaining)
+  - location: 14 (remaining gas: 1039991.611 units remaining)
     [ "hello"
       None
       {} ]
-  - location: 17 (remaining gas: 1039989.741 units remaining)
+  - location: 17 (remaining gas: 1039991.516 units remaining)
     [ None
       {} ]
-  - location: 18 (remaining gas: 1039989.726 units remaining)
+  - location: 18 (remaining gas: 1039991.506 units remaining)
     [ (Pair None {}) ]
-  - location: 19 (remaining gas: 1039989.711 units remaining)
+  - location: 19 (remaining gas: 1039991.496 units remaining)
     [ {}
       (Pair None {}) ]
-  - location: 21 (remaining gas: 1039989.696 units remaining)
+  - location: 21 (remaining gas: 1039991.486 units remaining)
     [ (Pair {} None {}) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_map_value.tz-(Pair None { Elt \"1\" \"one\" ;          .bc4127094e.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_map_value.tz-(Pair None { Elt \"1\" \"one\" ;          .bc4127094e.out"
index 43f32db00b528dee55f271cd64a0c42b148c6e4e..3937510093182ef6eda1819b99031363d2d20ca0 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_map_value.tz-(Pair None { Elt \"1\" \"one\" ;          .bc4127094e.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_map_value.tz-(Pair None { Elt \"1\" \"one\" ;          .bc4127094e.out"	
@@ -7,35 +7,35 @@ emitted operations
 big_map diff
   
 trace
-  - location: 12 (remaining gas: 1039986.716 units remaining)
+  - location: 12 (remaining gas: 1039988.316 units remaining)
     [ (Pair "1" None { Elt "1" "one" ; Elt "2" "two" }) ]
-  - location: 12 (remaining gas: 1039986.706 units remaining)
+  - location: 12 (remaining gas: 1039988.306 units remaining)
     [ (Pair "1" None { Elt "1" "one" ; Elt "2" "two" })
       (Pair "1" None { Elt "1" "one" ; Elt "2" "two" }) ]
-  - location: 13 (remaining gas: 1039986.696 units remaining)
+  - location: 13 (remaining gas: 1039988.296 units remaining)
     [ "1"
       (Pair "1" None { Elt "1" "one" ; Elt "2" "two" }) ]
-  - location: 14 (remaining gas: 1039986.681 units remaining)
+  - location: 14 (remaining gas: 1039988.286 units remaining)
     [ (Pair "1" None { Elt "1" "one" ; Elt "2" "two" }) ]
-  - location: 17 (remaining gas: 1039986.671 units remaining)
+  - location: 17 (remaining gas: 1039988.276 units remaining)
     [ (Pair None { Elt "1" "one" ; Elt "2" "two" }) ]
-  - location: 18 (remaining gas: 1039986.661 units remaining)
+  - location: 18 (remaining gas: 1039988.266 units remaining)
     [ { Elt "1" "one" ; Elt "2" "two" } ]
-  - location: 19 (remaining gas: 1039986.651 units remaining)
+  - location: 19 (remaining gas: 1039988.256 units remaining)
     [ { Elt "1" "one" ; Elt "2" "two" }
       { Elt "1" "one" ; Elt "2" "two" } ]
-  - location: 14 (remaining gas: 1039986.621 units remaining)
+  - location: 14 (remaining gas: 1039988.236 units remaining)
     [ "1"
       { Elt "1" "one" ; Elt "2" "two" }
       { Elt "1" "one" ; Elt "2" "two" } ]
-  - location: 20 (remaining gas: 1039986.538 units remaining)
+  - location: 20 (remaining gas: 1039988.153 units remaining)
     [ (Some "one")
       { Elt "1" "one" ; Elt "2" "two" } ]
-  - location: 21 (remaining gas: 1039986.523 units remaining)
+  - location: 21 (remaining gas: 1039988.143 units remaining)
     [ (Pair (Some "one") { Elt "1" "one" ; Elt "2" "two" }) ]
-  - location: 22 (remaining gas: 1039986.508 units remaining)
+  - location: 22 (remaining gas: 1039988.133 units remaining)
     [ {}
       (Pair (Some "one") { Elt "1" "one" ; Elt "2" "two" }) ]
-  - location: 24 (remaining gas: 1039986.493 units remaining)
+  - location: 24 (remaining gas: 1039988.123 units remaining)
     [ (Pair {} (Some "one") { Elt "1" "one" ; Elt "2" "two" }) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_map_value.tz-(Pair None { Elt \"hello\" \"hi\" })-\"\"-(P.0c03056487.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_map_value.tz-(Pair None { Elt \"hello\" \"hi\" })-\"\"-(P.0c03056487.out"
index 8eb283c6fcdaa0998eca50c271d2e5cf9afe268b..1aba8737244f9d936ec0454d229c7d187e7dc232 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_map_value.tz-(Pair None { Elt \"hello\" \"hi\" })-\"\"-(P.0c03056487.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_map_value.tz-(Pair None { Elt \"hello\" \"hi\" })-\"\"-(P.0c03056487.out"	
@@ -7,35 +7,35 @@ emitted operations
 big_map diff
   
 trace
-  - location: 12 (remaining gas: 1039987.075 units remaining)
+  - location: 12 (remaining gas: 1039988.675 units remaining)
     [ (Pair "" None { Elt "hello" "hi" }) ]
-  - location: 12 (remaining gas: 1039987.065 units remaining)
+  - location: 12 (remaining gas: 1039988.665 units remaining)
     [ (Pair "" None { Elt "hello" "hi" })
       (Pair "" None { Elt "hello" "hi" }) ]
-  - location: 13 (remaining gas: 1039987.055 units remaining)
+  - location: 13 (remaining gas: 1039988.655 units remaining)
     [ ""
       (Pair "" None { Elt "hello" "hi" }) ]
-  - location: 14 (remaining gas: 1039987.040 units remaining)
+  - location: 14 (remaining gas: 1039988.645 units remaining)
     [ (Pair "" None { Elt "hello" "hi" }) ]
-  - location: 17 (remaining gas: 1039987.030 units remaining)
+  - location: 17 (remaining gas: 1039988.635 units remaining)
     [ (Pair None { Elt "hello" "hi" }) ]
-  - location: 18 (remaining gas: 1039987.020 units remaining)
+  - location: 18 (remaining gas: 1039988.625 units remaining)
     [ { Elt "hello" "hi" } ]
-  - location: 19 (remaining gas: 1039987.010 units remaining)
+  - location: 19 (remaining gas: 1039988.615 units remaining)
     [ { Elt "hello" "hi" }
       { Elt "hello" "hi" } ]
-  - location: 14 (remaining gas: 1039986.980 units remaining)
+  - location: 14 (remaining gas: 1039988.595 units remaining)
     [ ""
       { Elt "hello" "hi" }
       { Elt "hello" "hi" } ]
-  - location: 20 (remaining gas: 1039986.900 units remaining)
+  - location: 20 (remaining gas: 1039988.515 units remaining)
     [ None
       { Elt "hello" "hi" } ]
-  - location: 21 (remaining gas: 1039986.885 units remaining)
+  - location: 21 (remaining gas: 1039988.505 units remaining)
     [ (Pair None { Elt "hello" "hi" }) ]
-  - location: 22 (remaining gas: 1039986.870 units remaining)
+  - location: 22 (remaining gas: 1039988.495 units remaining)
     [ {}
       (Pair None { Elt "hello" "hi" }) ]
-  - location: 24 (remaining gas: 1039986.855 units remaining)
+  - location: 24 (remaining gas: 1039988.485 units remaining)
     [ (Pair {} None { Elt "hello" "hi" }) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_map_value.tz-(Pair None { Elt \"hello\" \"hi\" })-\"hell.cc45544c66.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_map_value.tz-(Pair None { Elt \"hello\" \"hi\" })-\"hell.cc45544c66.out"
index 99ee022e31d595181f3a4cd8142a352dc4e9891a..b71f61f8138e52e7c21397cee8582cd8e73db3e6 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_map_value.tz-(Pair None { Elt \"hello\" \"hi\" })-\"hell.cc45544c66.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[get_map_value.tz-(Pair None { Elt \"hello\" \"hi\" })-\"hell.cc45544c66.out"	
@@ -7,35 +7,35 @@ emitted operations
 big_map diff
   
 trace
-  - location: 12 (remaining gas: 1039987.025 units remaining)
+  - location: 12 (remaining gas: 1039988.625 units remaining)
     [ (Pair "hello" None { Elt "hello" "hi" }) ]
-  - location: 12 (remaining gas: 1039987.015 units remaining)
+  - location: 12 (remaining gas: 1039988.615 units remaining)
     [ (Pair "hello" None { Elt "hello" "hi" })
       (Pair "hello" None { Elt "hello" "hi" }) ]
-  - location: 13 (remaining gas: 1039987.005 units remaining)
+  - location: 13 (remaining gas: 1039988.605 units remaining)
     [ "hello"
       (Pair "hello" None { Elt "hello" "hi" }) ]
-  - location: 14 (remaining gas: 1039986.990 units remaining)
+  - location: 14 (remaining gas: 1039988.595 units remaining)
     [ (Pair "hello" None { Elt "hello" "hi" }) ]
-  - location: 17 (remaining gas: 1039986.980 units remaining)
+  - location: 17 (remaining gas: 1039988.585 units remaining)
     [ (Pair None { Elt "hello" "hi" }) ]
-  - location: 18 (remaining gas: 1039986.970 units remaining)
+  - location: 18 (remaining gas: 1039988.575 units remaining)
     [ { Elt "hello" "hi" } ]
-  - location: 19 (remaining gas: 1039986.960 units remaining)
+  - location: 19 (remaining gas: 1039988.565 units remaining)
     [ { Elt "hello" "hi" }
       { Elt "hello" "hi" } ]
-  - location: 14 (remaining gas: 1039986.930 units remaining)
+  - location: 14 (remaining gas: 1039988.545 units remaining)
     [ "hello"
       { Elt "hello" "hi" }
       { Elt "hello" "hi" } ]
-  - location: 20 (remaining gas: 1039986.840 units remaining)
+  - location: 20 (remaining gas: 1039988.455 units remaining)
     [ (Some "hi")
       { Elt "hello" "hi" } ]
-  - location: 21 (remaining gas: 1039986.825 units remaining)
+  - location: 21 (remaining gas: 1039988.445 units remaining)
     [ (Pair (Some "hi") { Elt "hello" "hi" }) ]
-  - location: 22 (remaining gas: 1039986.810 units remaining)
+  - location: 22 (remaining gas: 1039988.435 units remaining)
     [ {}
       (Pair (Some "hi") { Elt "hello" "hi" }) ]
-  - location: 24 (remaining gas: 1039986.795 units remaining)
+  - location: 24 (remaining gas: 1039988.425 units remaining)
     [ (Pair {} (Some "hi") { Elt "hello" "hi" }) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[hash_key.tz-None-\"edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAb.613ad6b637.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[hash_key.tz-None-\"edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAb.613ad6b637.out"
index a3b9ef45c25bc34bd538a779801c61b35a14860b..aacf22f25d79e7dcec5bd77fefc6f84fba89497a 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[hash_key.tz-None-\"edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAb.613ad6b637.out"
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[hash_key.tz-None-\"edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAb.613ad6b637.out"
@@ -7,17 +7,17 @@ emitted operations
 big_map diff
   
 trace
-  - location: 8 (remaining gas: 1039668.922 units remaining)
+  - location: 8 (remaining gas: 1039669.722 units remaining)
     [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" None) ]
-  - location: 8 (remaining gas: 1039668.912 units remaining)
+  - location: 8 (remaining gas: 1039669.712 units remaining)
     [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" ]
-  - location: 9 (remaining gas: 1039668.257 units remaining)
+  - location: 9 (remaining gas: 1039669.107 units remaining)
     [ "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx" ]
-  - location: 10 (remaining gas: 1039668.242 units remaining)
+  - location: 10 (remaining gas: 1039669.097 units remaining)
     [ (Some "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx") ]
-  - location: 11 (remaining gas: 1039668.227 units remaining)
+  - location: 11 (remaining gas: 1039669.087 units remaining)
     [ {}
       (Some "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx") ]
-  - location: 13 (remaining gas: 1039668.212 units remaining)
+  - location: 13 (remaining gas: 1039669.077 units remaining)
     [ (Pair {} (Some "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx")) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[hash_key.tz-None-\"edpkuJqtDcA2m2muMxViSM47MPsGQzmyjnNTa.da50984e8d.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[hash_key.tz-None-\"edpkuJqtDcA2m2muMxViSM47MPsGQzmyjnNTa.da50984e8d.out"
index 4eff0f9dee978dbedb99f1085c7c0a82510ecf78..b6ba3bc7d5022a08d0d97e3f1f197be47ad0d5b3 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[hash_key.tz-None-\"edpkuJqtDcA2m2muMxViSM47MPsGQzmyjnNTa.da50984e8d.out"
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[hash_key.tz-None-\"edpkuJqtDcA2m2muMxViSM47MPsGQzmyjnNTa.da50984e8d.out"
@@ -7,17 +7,17 @@ emitted operations
 big_map diff
   
 trace
-  - location: 8 (remaining gas: 1039668.922 units remaining)
+  - location: 8 (remaining gas: 1039669.722 units remaining)
     [ (Pair "edpkuJqtDcA2m2muMxViSM47MPsGQzmyjnNTawUPqR8vZTAMcx61ES" None) ]
-  - location: 8 (remaining gas: 1039668.912 units remaining)
+  - location: 8 (remaining gas: 1039669.712 units remaining)
     [ "edpkuJqtDcA2m2muMxViSM47MPsGQzmyjnNTawUPqR8vZTAMcx61ES" ]
-  - location: 9 (remaining gas: 1039668.257 units remaining)
+  - location: 9 (remaining gas: 1039669.107 units remaining)
     [ "tz1XPTDmvT3vVE5Uunngmixm7gj7zmdbPq6k" ]
-  - location: 10 (remaining gas: 1039668.242 units remaining)
+  - location: 10 (remaining gas: 1039669.097 units remaining)
     [ (Some "tz1XPTDmvT3vVE5Uunngmixm7gj7zmdbPq6k") ]
-  - location: 11 (remaining gas: 1039668.227 units remaining)
+  - location: 11 (remaining gas: 1039669.087 units remaining)
     [ {}
       (Some "tz1XPTDmvT3vVE5Uunngmixm7gj7zmdbPq6k") ]
-  - location: 13 (remaining gas: 1039668.212 units remaining)
+  - location: 13 (remaining gas: 1039669.077 units remaining)
     [ (Pair {} (Some "tz1XPTDmvT3vVE5Uunngmixm7gj7zmdbPq6k")) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[hash_string.tz-0x00-\"12345\"-0xb4c26c20de52a4eaf0d8a340d.2bba28b0bf.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[hash_string.tz-0x00-\"12345\"-0xb4c26c20de52a4eaf0d8a340d.2bba28b0bf.out"
index 57a29f4430c9782ebfd84cae6e199cc6612879d3..a34aaf6acdde24c77fc28eef5f39070c442c16e8 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[hash_string.tz-0x00-\"12345\"-0xb4c26c20de52a4eaf0d8a340d.2bba28b0bf.out"
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[hash_string.tz-0x00-\"12345\"-0xb4c26c20de52a4eaf0d8a340d.2bba28b0bf.out"
@@ -7,17 +7,17 @@ emitted operations
 big_map diff
   
 trace
-  - location: 7 (remaining gas: 1039994.206 units remaining)
+  - location: 7 (remaining gas: 1039994.846 units remaining)
     [ (Pair "12345" 0x00) ]
-  - location: 7 (remaining gas: 1039994.196 units remaining)
+  - location: 7 (remaining gas: 1039994.836 units remaining)
     [ "12345" ]
-  - location: 8 (remaining gas: 1039993.705 units remaining)
+  - location: 8 (remaining gas: 1039994.345 units remaining)
     [ 0x0501000000053132333435 ]
-  - location: 9 (remaining gas: 1039993.263 units remaining)
+  - location: 9 (remaining gas: 1039993.903 units remaining)
     [ 0xb4c26c20de52a4eaf0d8a340db47ad8cb1e74049570859c9a9a3952b204c772f ]
-  - location: 10 (remaining gas: 1039993.248 units remaining)
+  - location: 10 (remaining gas: 1039993.893 units remaining)
     [ {}
       0xb4c26c20de52a4eaf0d8a340db47ad8cb1e74049570859c9a9a3952b204c772f ]
-  - location: 12 (remaining gas: 1039993.233 units remaining)
+  - location: 12 (remaining gas: 1039993.883 units remaining)
     [ (Pair {} 0xb4c26c20de52a4eaf0d8a340db47ad8cb1e74049570859c9a9a3952b204c772f) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[hash_string.tz-0x00-\"abcdefg\"-0x46fdbcb4ea4eadad5615cda.acc82cd954.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[hash_string.tz-0x00-\"abcdefg\"-0x46fdbcb4ea4eadad5615cda.acc82cd954.out"
index 619ef6fc1053bbca52544527a4ca1ca026cab080..137be6ce2e22c2d632f69b4b7caaf4d5ae8dfac3 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[hash_string.tz-0x00-\"abcdefg\"-0x46fdbcb4ea4eadad5615cda.acc82cd954.out"
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[hash_string.tz-0x00-\"abcdefg\"-0x46fdbcb4ea4eadad5615cda.acc82cd954.out"
@@ -7,17 +7,17 @@ emitted operations
 big_map diff
   
 trace
-  - location: 7 (remaining gas: 1039994.186 units remaining)
+  - location: 7 (remaining gas: 1039994.826 units remaining)
     [ (Pair "abcdefg" 0x00) ]
-  - location: 7 (remaining gas: 1039994.176 units remaining)
+  - location: 7 (remaining gas: 1039994.816 units remaining)
     [ "abcdefg" ]
-  - location: 8 (remaining gas: 1039993.619 units remaining)
+  - location: 8 (remaining gas: 1039994.259 units remaining)
     [ 0x05010000000761626364656667 ]
-  - location: 9 (remaining gas: 1039993.175 units remaining)
+  - location: 9 (remaining gas: 1039993.815 units remaining)
     [ 0x46fdbcb4ea4eadad5615cdaa17d67f783e01e21149ce2b27de497600b4cd8f4e ]
-  - location: 10 (remaining gas: 1039993.160 units remaining)
+  - location: 10 (remaining gas: 1039993.805 units remaining)
     [ {}
       0x46fdbcb4ea4eadad5615cdaa17d67f783e01e21149ce2b27de497600b4cd8f4e ]
-  - location: 12 (remaining gas: 1039993.145 units remaining)
+  - location: 12 (remaining gas: 1039993.795 units remaining)
     [ (Pair {} 0x46fdbcb4ea4eadad5615cdaa17d67f783e01e21149ce2b27de497600b4cd8f4e) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[if.tz-None-False-(Some False)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[if.tz-None-False-(Some False)].out
index d8df31a0d46862f14f2c078235a960372de2bb26..99eb3ee98657b98baa8f68c3270099a1e6d3844a 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[if.tz-None-False-(Some False)].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[if.tz-None-False-(Some False)].out	
@@ -7,21 +7,21 @@ emitted operations
 big_map diff
   
 trace
-  - location: 8 (remaining gas: 1039991.405 units remaining)
+  - location: 8 (remaining gas: 1039992.365 units remaining)
     [ (Pair False None) ]
-  - location: 8 (remaining gas: 1039991.395 units remaining)
+  - location: 8 (remaining gas: 1039992.355 units remaining)
     [ False ]
-  - location: 9 (remaining gas: 1039991.385 units remaining)
+  - location: 9 (remaining gas: 1039992.345 units remaining)
     [  ]
-  - location: 15 (remaining gas: 1039991.375 units remaining)
+  - location: 15 (remaining gas: 1039992.335 units remaining)
     [ False ]
-  - location: 9 (remaining gas: 1039991.360 units remaining)
+  - location: 9 (remaining gas: 1039992.325 units remaining)
     [ False ]
-  - location: 18 (remaining gas: 1039991.345 units remaining)
+  - location: 18 (remaining gas: 1039992.315 units remaining)
     [ (Some False) ]
-  - location: 19 (remaining gas: 1039991.330 units remaining)
+  - location: 19 (remaining gas: 1039992.305 units remaining)
     [ {}
       (Some False) ]
-  - location: 21 (remaining gas: 1039991.315 units remaining)
+  - location: 21 (remaining gas: 1039992.295 units remaining)
     [ (Pair {} (Some False)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[if.tz-None-True-(Some True)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[if.tz-None-True-(Some True)].out
index 6e0f70b965b5f254b4d720884272d22e86f1545f..b384ce5fb3661ca9ed9c92192f108a2f55d178be 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[if.tz-None-True-(Some True)].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[if.tz-None-True-(Some True)].out	
@@ -7,21 +7,21 @@ emitted operations
 big_map diff
   
 trace
-  - location: 8 (remaining gas: 1039991.405 units remaining)
+  - location: 8 (remaining gas: 1039992.365 units remaining)
     [ (Pair True None) ]
-  - location: 8 (remaining gas: 1039991.395 units remaining)
+  - location: 8 (remaining gas: 1039992.355 units remaining)
     [ True ]
-  - location: 9 (remaining gas: 1039991.385 units remaining)
+  - location: 9 (remaining gas: 1039992.345 units remaining)
     [  ]
-  - location: 11 (remaining gas: 1039991.375 units remaining)
+  - location: 11 (remaining gas: 1039992.335 units remaining)
     [ True ]
-  - location: 9 (remaining gas: 1039991.360 units remaining)
+  - location: 9 (remaining gas: 1039992.325 units remaining)
     [ True ]
-  - location: 18 (remaining gas: 1039991.345 units remaining)
+  - location: 18 (remaining gas: 1039992.315 units remaining)
     [ (Some True) ]
-  - location: 19 (remaining gas: 1039991.330 units remaining)
+  - location: 19 (remaining gas: 1039992.305 units remaining)
     [ {}
       (Some True) ]
-  - location: 21 (remaining gas: 1039991.315 units remaining)
+  - location: 21 (remaining gas: 1039992.295 units remaining)
     [ (Pair {} (Some True)) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[if_some.tz-\"?\"-(Some \"hello\")-\"hello\"].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[if_some.tz-\"?\"-(Some \"hello\")-\"hello\"].out"
index c53a481acfe1bf54728cef049df9e668fb103c30..ddd027753686e9f23c269791912b0590cbc2d112 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[if_some.tz-\"?\"-(Some \"hello\")-\"hello\"].out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[if_some.tz-\"?\"-(Some \"hello\")-\"hello\"].out"	
@@ -7,17 +7,17 @@ emitted operations
 big_map diff
   
 trace
-  - location: 8 (remaining gas: 1039992.511 units remaining)
+  - location: 8 (remaining gas: 1039993.311 units remaining)
     [ (Pair (Some "hello") "?") ]
-  - location: 8 (remaining gas: 1039992.501 units remaining)
+  - location: 8 (remaining gas: 1039993.301 units remaining)
     [ (Some "hello") ]
-  - location: 10 (remaining gas: 1039992.491 units remaining)
+  - location: 10 (remaining gas: 1039993.291 units remaining)
     [ "hello" ]
-  - location: 10 (remaining gas: 1039992.476 units remaining)
+  - location: 10 (remaining gas: 1039993.281 units remaining)
     [ "hello" ]
-  - location: 16 (remaining gas: 1039992.461 units remaining)
+  - location: 16 (remaining gas: 1039993.271 units remaining)
     [ {}
       "hello" ]
-  - location: 18 (remaining gas: 1039992.446 units remaining)
+  - location: 18 (remaining gas: 1039993.261 units remaining)
     [ (Pair {} "hello") ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[if_some.tz-\"?\"-None-\"\"].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[if_some.tz-\"?\"-None-\"\"].out"
index c6078e341ccfa20973de8bc23d4cdafce561d18b..03b7cf21ad4326bde2b9125312d2d6a35d210ae8 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[if_some.tz-\"?\"-None-\"\"].out"
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[if_some.tz-\"?\"-None-\"\"].out"
@@ -7,19 +7,19 @@ emitted operations
 big_map diff
   
 trace
-  - location: 8 (remaining gas: 1039992.675 units remaining)
+  - location: 8 (remaining gas: 1039993.475 units remaining)
     [ (Pair None "?") ]
-  - location: 8 (remaining gas: 1039992.665 units remaining)
+  - location: 8 (remaining gas: 1039993.465 units remaining)
     [ None ]
-  - location: 10 (remaining gas: 1039992.655 units remaining)
+  - location: 10 (remaining gas: 1039993.455 units remaining)
     [  ]
-  - location: 12 (remaining gas: 1039992.645 units remaining)
+  - location: 12 (remaining gas: 1039993.445 units remaining)
     [ "" ]
-  - location: 10 (remaining gas: 1039992.630 units remaining)
+  - location: 10 (remaining gas: 1039993.435 units remaining)
     [ "" ]
-  - location: 16 (remaining gas: 1039992.615 units remaining)
+  - location: 16 (remaining gas: 1039993.425 units remaining)
     [ {}
       "" ]
-  - location: 18 (remaining gas: 1039992.600 units remaining)
+  - location: 18 (remaining gas: 1039993.415 units remaining)
     [ (Pair {} "") ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[int.tz-None-0-(Some 0)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[int.tz-None-0-(Some 0)].out
index 8d78b6c68596e2a1c4f93231a01a51f240d94d4a..3e7e6aac1008e81b6c710b7d113186eb4ab562b3 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[int.tz-None-0-(Some 0)].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[int.tz-None-0-(Some 0)].out	
@@ -7,17 +7,17 @@ emitted operations
 big_map diff
   
 trace
-  - location: 8 (remaining gas: 1039993.922 units remaining)
+  - location: 8 (remaining gas: 1039994.722 units remaining)
     [ (Pair 0 None) ]
-  - location: 8 (remaining gas: 1039993.912 units remaining)
+  - location: 8 (remaining gas: 1039994.712 units remaining)
     [ 0 ]
-  - location: 9 (remaining gas: 1039993.897 units remaining)
+  - location: 9 (remaining gas: 1039994.702 units remaining)
     [ 0 ]
-  - location: 10 (remaining gas: 1039993.882 units remaining)
+  - location: 10 (remaining gas: 1039994.692 units remaining)
     [ (Some 0) ]
-  - location: 11 (remaining gas: 1039993.867 units remaining)
+  - location: 11 (remaining gas: 1039994.682 units remaining)
     [ {}
       (Some 0) ]
-  - location: 13 (remaining gas: 1039993.852 units remaining)
+  - location: 13 (remaining gas: 1039994.672 units remaining)
     [ (Pair {} (Some 0)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[int.tz-None-1-(Some 1)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[int.tz-None-1-(Some 1)].out
index 52562caf6018ed3d359b24658bdb122645c88abf..f9a82cbb25b3407f8ebe3f4b71f1d27e681b34f2 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[int.tz-None-1-(Some 1)].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[int.tz-None-1-(Some 1)].out	
@@ -7,17 +7,17 @@ emitted operations
 big_map diff
   
 trace
-  - location: 8 (remaining gas: 1039993.922 units remaining)
+  - location: 8 (remaining gas: 1039994.722 units remaining)
     [ (Pair 1 None) ]
-  - location: 8 (remaining gas: 1039993.912 units remaining)
+  - location: 8 (remaining gas: 1039994.712 units remaining)
     [ 1 ]
-  - location: 9 (remaining gas: 1039993.897 units remaining)
+  - location: 9 (remaining gas: 1039994.702 units remaining)
     [ 1 ]
-  - location: 10 (remaining gas: 1039993.882 units remaining)
+  - location: 10 (remaining gas: 1039994.692 units remaining)
     [ (Some 1) ]
-  - location: 11 (remaining gas: 1039993.867 units remaining)
+  - location: 11 (remaining gas: 1039994.682 units remaining)
     [ {}
       (Some 1) ]
-  - location: 13 (remaining gas: 1039993.852 units remaining)
+  - location: 13 (remaining gas: 1039994.672 units remaining)
     [ (Pair {} (Some 1)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[int.tz-None-9999-(Some 9999)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[int.tz-None-9999-(Some 9999)].out
index 27184d1204ac15e2e894dba854c18f3a9cf638bb..174547fc600c0dc31b7f9c876d6903f8e97fe91e 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[int.tz-None-9999-(Some 9999)].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[int.tz-None-9999-(Some 9999)].out	
@@ -7,17 +7,17 @@ emitted operations
 big_map diff
   
 trace
-  - location: 8 (remaining gas: 1039993.922 units remaining)
+  - location: 8 (remaining gas: 1039994.722 units remaining)
     [ (Pair 9999 None) ]
-  - location: 8 (remaining gas: 1039993.912 units remaining)
+  - location: 8 (remaining gas: 1039994.712 units remaining)
     [ 9999 ]
-  - location: 9 (remaining gas: 1039993.897 units remaining)
+  - location: 9 (remaining gas: 1039994.702 units remaining)
     [ 9999 ]
-  - location: 10 (remaining gas: 1039993.882 units remaining)
+  - location: 10 (remaining gas: 1039994.692 units remaining)
     [ (Some 9999) ]
-  - location: 11 (remaining gas: 1039993.867 units remaining)
+  - location: 11 (remaining gas: 1039994.682 units remaining)
     [ {}
       (Some 9999) ]
-  - location: 13 (remaining gas: 1039993.852 units remaining)
+  - location: 13 (remaining gas: 1039994.672 units remaining)
     [ (Pair {} (Some 9999)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[keccak.tz-None-0x48656c6c6f2c20776f726c6421-(Some 0xb6e.34c02678c9.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[keccak.tz-None-0x48656c6c6f2c20776f726c6421-(Some 0xb6e.34c02678c9.out
index 0fc27b979846b6e3ba4072385c89c8d7f13f8b42..3120fd252a6e5e6291da886136525c53fd9c23da 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[keccak.tz-None-0x48656c6c6f2c20776f726c6421-(Some 0xb6e.34c02678c9.out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[keccak.tz-None-0x48656c6c6f2c20776f726c6421-(Some 0xb6e.34c02678c9.out	
@@ -7,18 +7,18 @@ emitted operations
 big_map diff
   
 trace
-  - location: 8 (remaining gas: 1039993.922 units remaining)
+  - location: 8 (remaining gas: 1039994.722 units remaining)
     [ (Pair 0x48656c6c6f2c20776f726c6421 None) ]
-  - location: 8 (remaining gas: 1039993.912 units remaining)
+  - location: 8 (remaining gas: 1039994.712 units remaining)
     [ 0x48656c6c6f2c20776f726c6421 ]
-  - location: 9 (remaining gas: 1039992.455 units remaining)
+  - location: 9 (remaining gas: 1039993.255 units remaining)
     [ 0xb6e16d27ac5ab427a7f68900ac5559ce272dc6c37c82b3e052246c82244c50e4 ]
-  - location: 10 (remaining gas: 1039992.440 units remaining)
+  - location: 10 (remaining gas: 1039993.245 units remaining)
     [ (Some 0xb6e16d27ac5ab427a7f68900ac5559ce272dc6c37c82b3e052246c82244c50e4) ]
-  - location: 11 (remaining gas: 1039992.425 units remaining)
+  - location: 11 (remaining gas: 1039993.235 units remaining)
     [ {}
       (Some 0xb6e16d27ac5ab427a7f68900ac5559ce272dc6c37c82b3e052246c82244c50e4) ]
-  - location: 13 (remaining gas: 1039992.410 units remaining)
+  - location: 13 (remaining gas: 1039993.225 units remaining)
     [ (Pair {}
             (Some 0xb6e16d27ac5ab427a7f68900ac5559ce272dc6c37c82b3e052246c82244c50e4)) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[left_right.tz-(Left \"X\")-(Left True)-(Right True)].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[left_right.tz-(Left \"X\")-(Left True)-(Right True)].out"
index 295ccfc446f06ae7bb8bb88d65dc8a5fdbe250ee..f566320c161bdae7932c8630d1865aa83500d152 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[left_right.tz-(Left \"X\")-(Left True)-(Right True)].out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[left_right.tz-(Left \"X\")-(Left True)-(Right True)].out"	
@@ -7,19 +7,19 @@ emitted operations
 big_map diff
   
 trace
-  - location: 11 (remaining gas: 1039991.046 units remaining)
+  - location: 11 (remaining gas: 1039992.486 units remaining)
     [ (Pair (Left True) (Left "X")) ]
-  - location: 11 (remaining gas: 1039991.036 units remaining)
+  - location: 11 (remaining gas: 1039992.476 units remaining)
     [ (Left True) ]
-  - location: 12 (remaining gas: 1039991.026 units remaining)
+  - location: 12 (remaining gas: 1039992.466 units remaining)
     [ True ]
-  - location: 14 (remaining gas: 1039991.011 units remaining)
+  - location: 14 (remaining gas: 1039992.456 units remaining)
     [ (Right True) ]
-  - location: 12 (remaining gas: 1039990.996 units remaining)
+  - location: 12 (remaining gas: 1039992.446 units remaining)
     [ (Right True) ]
-  - location: 19 (remaining gas: 1039990.981 units remaining)
+  - location: 19 (remaining gas: 1039992.436 units remaining)
     [ {}
       (Right True) ]
-  - location: 21 (remaining gas: 1039990.966 units remaining)
+  - location: 21 (remaining gas: 1039992.426 units remaining)
     [ (Pair {} (Right True)) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[left_right.tz-(Left \"X\")-(Right \"a\")-(Left \"a\")].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[left_right.tz-(Left \"X\")-(Right \"a\")-(Left \"a\")].out"
index 30c50c6b4e048152e02180a6958922f706f15e61..47798746b55286eb381c36149a9c170437900fd5 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[left_right.tz-(Left \"X\")-(Right \"a\")-(Left \"a\")].out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[left_right.tz-(Left \"X\")-(Right \"a\")-(Left \"a\")].out"	
@@ -7,19 +7,19 @@ emitted operations
 big_map diff
   
 trace
-  - location: 11 (remaining gas: 1039991.022 units remaining)
+  - location: 11 (remaining gas: 1039992.462 units remaining)
     [ (Pair (Right "a") (Left "X")) ]
-  - location: 11 (remaining gas: 1039991.012 units remaining)
+  - location: 11 (remaining gas: 1039992.452 units remaining)
     [ (Right "a") ]
-  - location: 12 (remaining gas: 1039991.002 units remaining)
+  - location: 12 (remaining gas: 1039992.442 units remaining)
     [ "a" ]
-  - location: 17 (remaining gas: 1039990.987 units remaining)
+  - location: 17 (remaining gas: 1039992.432 units remaining)
     [ (Left "a") ]
-  - location: 12 (remaining gas: 1039990.972 units remaining)
+  - location: 12 (remaining gas: 1039992.422 units remaining)
     [ (Left "a") ]
-  - location: 19 (remaining gas: 1039990.957 units remaining)
+  - location: 19 (remaining gas: 1039992.412 units remaining)
     [ {}
       (Left "a") ]
-  - location: 21 (remaining gas: 1039990.942 units remaining)
+  - location: 21 (remaining gas: 1039992.402 units remaining)
     [ (Pair {} (Left "a")) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[level.tz-111-Unit-1].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[level.tz-111-Unit-1].out
index 95e375d860c46a5d9111a221fc7e137f07bc5747..f3992e56cdbba9ce371ac6f865684546da24b298 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[level.tz-111-Unit-1].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[level.tz-111-Unit-1].out
@@ -7,15 +7,15 @@ emitted operations
 big_map diff
   
 trace
-  - location: 7 (remaining gas: 1039994.913 units remaining)
+  - location: 7 (remaining gas: 1039995.553 units remaining)
     [ (Pair Unit 111) ]
-  - location: 7 (remaining gas: 1039994.903 units remaining)
+  - location: 7 (remaining gas: 1039995.543 units remaining)
     [  ]
-  - location: 8 (remaining gas: 1039994.888 units remaining)
+  - location: 8 (remaining gas: 1039995.533 units remaining)
     [ 1 ]
-  - location: 9 (remaining gas: 1039994.873 units remaining)
+  - location: 9 (remaining gas: 1039995.523 units remaining)
     [ {}
       1 ]
-  - location: 11 (remaining gas: 1039994.858 units remaining)
+  - location: 11 (remaining gas: 1039995.513 units remaining)
     [ (Pair {} 1) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat.tz-\"abc\"-{ \"d\" ; \"e\" ; \"f\" }-\"abcdef\"].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat.tz-\"abc\"-{ \"d\" ; \"e\" ; \"f\" }-\"abcdef\"].out"
index 32df68e1197991cc1fd7292bbfcbac9f095c39a8..860fd1753fd406135b02d2516e34f2f4dc119992 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat.tz-\"abc\"-{ \"d\" ; \"e\" ; \"f\" }-\"abcdef\"].out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat.tz-\"abc\"-{ \"d\" ; \"e\" ; \"f\" }-\"abcdef\"].out"	
@@ -7,21 +7,21 @@ emitted operations
 big_map diff
   
 trace
-  - location: 8 (remaining gas: 1039992.953 units remaining)
+  - location: 8 (remaining gas: 1039993.753 units remaining)
     [ (Pair { "d" ; "e" ; "f" } "abc") ]
-  - location: 8 (remaining gas: 1039992.943 units remaining)
+  - location: 8 (remaining gas: 1039993.743 units remaining)
     [ { "d" ; "e" ; "f" }
       "abc" ]
-  - location: 9 (remaining gas: 1039992.933 units remaining)
+  - location: 9 (remaining gas: 1039993.733 units remaining)
     [ "abc"
       { "d" ; "e" ; "f" } ]
-  - location: 10 (remaining gas: 1039992.918 units remaining)
+  - location: 10 (remaining gas: 1039993.723 units remaining)
     [ { "abc" ; "d" ; "e" ; "f" } ]
-  - location: 11 (remaining gas: 1039992.778 units remaining)
+  - location: 11 (remaining gas: 1039993.583 units remaining)
     [ "abcdef" ]
-  - location: 12 (remaining gas: 1039992.763 units remaining)
+  - location: 12 (remaining gas: 1039993.573 units remaining)
     [ {}
       "abcdef" ]
-  - location: 14 (remaining gas: 1039992.748 units remaining)
+  - location: 14 (remaining gas: 1039993.563 units remaining)
     [ (Pair {} "abcdef") ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat.tz-\"abc\"-{}-\"abc\"].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat.tz-\"abc\"-{}-\"abc\"].out"
index ae0ad05d967603a3c8cf125c0ede98e0786c9627..40b49bf327ef468330f2fcb3ed3b0ccdecee4cc7 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat.tz-\"abc\"-{}-\"abc\"].out"
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat.tz-\"abc\"-{}-\"abc\"].out"
@@ -7,21 +7,21 @@ emitted operations
 big_map diff
   
 trace
-  - location: 8 (remaining gas: 1039993.325 units remaining)
+  - location: 8 (remaining gas: 1039994.125 units remaining)
     [ (Pair {} "abc") ]
-  - location: 8 (remaining gas: 1039993.315 units remaining)
+  - location: 8 (remaining gas: 1039994.115 units remaining)
     [ {}
       "abc" ]
-  - location: 9 (remaining gas: 1039993.305 units remaining)
+  - location: 9 (remaining gas: 1039994.105 units remaining)
     [ "abc"
       {} ]
-  - location: 10 (remaining gas: 1039993.290 units remaining)
+  - location: 10 (remaining gas: 1039994.095 units remaining)
     [ { "abc" } ]
-  - location: 11 (remaining gas: 1039993.180 units remaining)
+  - location: 11 (remaining gas: 1039993.985 units remaining)
     [ "abc" ]
-  - location: 12 (remaining gas: 1039993.165 units remaining)
+  - location: 12 (remaining gas: 1039993.975 units remaining)
     [ {}
       "abc" ]
-  - location: 14 (remaining gas: 1039993.150 units remaining)
+  - location: 14 (remaining gas: 1039993.965 units remaining)
     [ (Pair {} "abc") ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat_bytes.tz-0x-{ 0x00 ; 0x11 ; 0x00 }-0x001100].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat_bytes.tz-0x-{ 0x00 ; 0x11 ; 0x00 }-0x001100].out
index 60fae6ae4be368437c33af743c6361c5d2bdb524..6abc7fe8613d223220ae3a307361b683f0e2d8ed 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat_bytes.tz-0x-{ 0x00 ; 0x11 ; 0x00 }-0x001100].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat_bytes.tz-0x-{ 0x00 ; 0x11 ; 0x00 }-0x001100].out	
@@ -7,21 +7,21 @@ emitted operations
 big_map diff
   
 trace
-  - location: 8 (remaining gas: 1039993.069 units remaining)
+  - location: 8 (remaining gas: 1039993.869 units remaining)
     [ (Pair { 0x00 ; 0x11 ; 0x00 } 0x) ]
-  - location: 8 (remaining gas: 1039993.059 units remaining)
+  - location: 8 (remaining gas: 1039993.859 units remaining)
     [ { 0x00 ; 0x11 ; 0x00 }
       0x ]
-  - location: 9 (remaining gas: 1039993.049 units remaining)
+  - location: 9 (remaining gas: 1039993.849 units remaining)
     [ 0x
       { 0x00 ; 0x11 ; 0x00 } ]
-  - location: 10 (remaining gas: 1039993.034 units remaining)
+  - location: 10 (remaining gas: 1039993.839 units remaining)
     [ { 0x ; 0x00 ; 0x11 ; 0x00 } ]
-  - location: 11 (remaining gas: 1039992.894 units remaining)
+  - location: 11 (remaining gas: 1039993.699 units remaining)
     [ 0x001100 ]
-  - location: 12 (remaining gas: 1039992.879 units remaining)
+  - location: 12 (remaining gas: 1039993.689 units remaining)
     [ {}
       0x001100 ]
-  - location: 14 (remaining gas: 1039992.864 units remaining)
+  - location: 14 (remaining gas: 1039993.679 units remaining)
     [ (Pair {} 0x001100) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat_bytes.tz-0x-{}-0x].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat_bytes.tz-0x-{}-0x].out
index 501f7618cf55b935efc738121b631f9bca9c639c..77a314911a5fa8ade6cb0644cad32653fcacd795 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat_bytes.tz-0x-{}-0x].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat_bytes.tz-0x-{}-0x].out
@@ -7,21 +7,21 @@ emitted operations
 big_map diff
   
 trace
-  - location: 8 (remaining gas: 1039993.369 units remaining)
+  - location: 8 (remaining gas: 1039994.169 units remaining)
     [ (Pair {} 0x) ]
-  - location: 8 (remaining gas: 1039993.359 units remaining)
+  - location: 8 (remaining gas: 1039994.159 units remaining)
     [ {}
       0x ]
-  - location: 9 (remaining gas: 1039993.349 units remaining)
+  - location: 9 (remaining gas: 1039994.149 units remaining)
     [ 0x
       {} ]
-  - location: 10 (remaining gas: 1039993.334 units remaining)
+  - location: 10 (remaining gas: 1039994.139 units remaining)
     [ { 0x } ]
-  - location: 11 (remaining gas: 1039993.224 units remaining)
+  - location: 11 (remaining gas: 1039994.029 units remaining)
     [ 0x ]
-  - location: 12 (remaining gas: 1039993.209 units remaining)
+  - location: 12 (remaining gas: 1039994.019 units remaining)
     [ {}
       0x ]
-  - location: 14 (remaining gas: 1039993.194 units remaining)
+  - location: 14 (remaining gas: 1039994.009 units remaining)
     [ (Pair {} 0x) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat_bytes.tz-0x00ab-{ 0xcd ; 0xef ; 0x00 }-0x00abcdef00].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat_bytes.tz-0x00ab-{ 0xcd ; 0xef ; 0x00 }-0x00abcdef00].out
index b3fc3387aba86ac3092cd37999ebf67ec6075f5e..22ca32d7086ed3672bdeffc36eced1d4ae70d2c0 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat_bytes.tz-0x00ab-{ 0xcd ; 0xef ; 0x00 }-0x00abcdef00].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat_bytes.tz-0x00ab-{ 0xcd ; 0xef ; 0x00 }-0x00abcdef00].out	
@@ -7,21 +7,21 @@ emitted operations
 big_map diff
   
 trace
-  - location: 8 (remaining gas: 1039993.069 units remaining)
+  - location: 8 (remaining gas: 1039993.869 units remaining)
     [ (Pair { 0xcd ; 0xef ; 0x00 } 0x00ab) ]
-  - location: 8 (remaining gas: 1039993.059 units remaining)
+  - location: 8 (remaining gas: 1039993.859 units remaining)
     [ { 0xcd ; 0xef ; 0x00 }
       0x00ab ]
-  - location: 9 (remaining gas: 1039993.049 units remaining)
+  - location: 9 (remaining gas: 1039993.849 units remaining)
     [ 0x00ab
       { 0xcd ; 0xef ; 0x00 } ]
-  - location: 10 (remaining gas: 1039993.034 units remaining)
+  - location: 10 (remaining gas: 1039993.839 units remaining)
     [ { 0x00ab ; 0xcd ; 0xef ; 0x00 } ]
-  - location: 11 (remaining gas: 1039992.894 units remaining)
+  - location: 11 (remaining gas: 1039993.699 units remaining)
     [ 0x00abcdef00 ]
-  - location: 12 (remaining gas: 1039992.879 units remaining)
+  - location: 12 (remaining gas: 1039993.689 units remaining)
     [ {}
       0x00abcdef00 ]
-  - location: 14 (remaining gas: 1039992.864 units remaining)
+  - location: 14 (remaining gas: 1039993.679 units remaining)
     [ (Pair {} 0x00abcdef00) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat_bytes.tz-0xabcd-{}-0xabcd].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat_bytes.tz-0xabcd-{}-0xabcd].out
index f2c72061d75e30a6bfeddfee6ae8f2538672d1d0..bfec653c1a0bd99ff68db7cc52b129e279581422 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat_bytes.tz-0xabcd-{}-0xabcd].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_concat_bytes.tz-0xabcd-{}-0xabcd].out
@@ -7,21 +7,21 @@ emitted operations
 big_map diff
   
 trace
-  - location: 8 (remaining gas: 1039993.369 units remaining)
+  - location: 8 (remaining gas: 1039994.169 units remaining)
     [ (Pair {} 0xabcd) ]
-  - location: 8 (remaining gas: 1039993.359 units remaining)
+  - location: 8 (remaining gas: 1039994.159 units remaining)
     [ {}
       0xabcd ]
-  - location: 9 (remaining gas: 1039993.349 units remaining)
+  - location: 9 (remaining gas: 1039994.149 units remaining)
     [ 0xabcd
       {} ]
-  - location: 10 (remaining gas: 1039993.334 units remaining)
+  - location: 10 (remaining gas: 1039994.139 units remaining)
     [ { 0xabcd } ]
-  - location: 11 (remaining gas: 1039993.224 units remaining)
+  - location: 11 (remaining gas: 1039994.029 units remaining)
     [ 0xabcd ]
-  - location: 12 (remaining gas: 1039993.209 units remaining)
+  - location: 12 (remaining gas: 1039994.019 units remaining)
     [ {}
       0xabcd ]
-  - location: 14 (remaining gas: 1039993.194 units remaining)
+  - location: 14 (remaining gas: 1039994.009 units remaining)
     [ (Pair {} 0xabcd) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id.tz-{\"\"}-{ \"1\" ; \"2\" ; \"3\" }-{ \"1\" ; \"2\" ; \"3\" }].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id.tz-{\"\"}-{ \"1\" ; \"2\" ; \"3\" }-{ \"1\" ; \"2\" ; \"3\" }].out"
index 9b2b3897a9ae204f93be20080824a688de29f8fe..8303218cddfd9787cf2cc5904402500a03b2eff1 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id.tz-{\"\"}-{ \"1\" ; \"2\" ; \"3\" }-{ \"1\" ; \"2\" ; \"3\" }].out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id.tz-{\"\"}-{ \"1\" ; \"2\" ; \"3\" }-{ \"1\" ; \"2\" ; \"3\" }].out"	
@@ -7,13 +7,13 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (remaining gas: 1039994.504 units remaining)
+  - location: 9 (remaining gas: 1039995.304 units remaining)
     [ (Pair { "1" ; "2" ; "3" } { "" }) ]
-  - location: 9 (remaining gas: 1039994.494 units remaining)
+  - location: 9 (remaining gas: 1039995.294 units remaining)
     [ { "1" ; "2" ; "3" } ]
-  - location: 10 (remaining gas: 1039994.479 units remaining)
+  - location: 10 (remaining gas: 1039995.284 units remaining)
     [ {}
       { "1" ; "2" ; "3" } ]
-  - location: 12 (remaining gas: 1039994.464 units remaining)
+  - location: 12 (remaining gas: 1039995.274 units remaining)
     [ (Pair {} { "1" ; "2" ; "3" }) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id.tz-{\"\"}-{ \"a\" ; \"b\" ; \"c\" }-{ \"a\" ; \"b\" ; \"c\" }].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id.tz-{\"\"}-{ \"a\" ; \"b\" ; \"c\" }-{ \"a\" ; \"b\" ; \"c\" }].out"
index 321c62f44f7385db6407ba1c33b723f7e00af88d..6d9ade7b2eef3daa6575c54e8f7483b74c424d8c 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id.tz-{\"\"}-{ \"a\" ; \"b\" ; \"c\" }-{ \"a\" ; \"b\" ; \"c\" }].out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id.tz-{\"\"}-{ \"a\" ; \"b\" ; \"c\" }-{ \"a\" ; \"b\" ; \"c\" }].out"	
@@ -7,13 +7,13 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (remaining gas: 1039994.504 units remaining)
+  - location: 9 (remaining gas: 1039995.304 units remaining)
     [ (Pair { "a" ; "b" ; "c" } { "" }) ]
-  - location: 9 (remaining gas: 1039994.494 units remaining)
+  - location: 9 (remaining gas: 1039995.294 units remaining)
     [ { "a" ; "b" ; "c" } ]
-  - location: 10 (remaining gas: 1039994.479 units remaining)
+  - location: 10 (remaining gas: 1039995.284 units remaining)
     [ {}
       { "a" ; "b" ; "c" } ]
-  - location: 12 (remaining gas: 1039994.464 units remaining)
+  - location: 12 (remaining gas: 1039995.274 units remaining)
     [ (Pair {} { "a" ; "b" ; "c" }) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id.tz-{\"\"}-{}-{}].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id.tz-{\"\"}-{}-{}].out"
index cbc61ea2041f32759f5b26e2c59fc8bd070e41e1..6160beffe4a7ebfa97c7c87066ce816e9904e625 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id.tz-{\"\"}-{}-{}].out"
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id.tz-{\"\"}-{}-{}].out"
@@ -7,13 +7,13 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (remaining gas: 1039994.876 units remaining)
+  - location: 9 (remaining gas: 1039995.676 units remaining)
     [ (Pair {} { "" }) ]
-  - location: 9 (remaining gas: 1039994.866 units remaining)
+  - location: 9 (remaining gas: 1039995.666 units remaining)
     [ {} ]
-  - location: 10 (remaining gas: 1039994.851 units remaining)
+  - location: 10 (remaining gas: 1039995.656 units remaining)
     [ {}
       {} ]
-  - location: 12 (remaining gas: 1039994.836 units remaining)
+  - location: 12 (remaining gas: 1039995.646 units remaining)
     [ (Pair {} {}) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id_map.tz-{\"\"}-{ \"1\" ; \"2\" ; \"3\" }-{ \"1\" ; \"2\" ; \"3\" }].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id_map.tz-{\"\"}-{ \"1\" ; \"2\" ; \"3\" }-{ \"1\" ; \"2\" ; \"3\" }].out"
index 4dc13bce4cb73ec5c69441095a0a8356f2d5d5fc..fee41e3c5d89be4e047c3828adf757f906c6f870 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id_map.tz-{\"\"}-{ \"1\" ; \"2\" ; \"3\" }-{ \"1\" ; \"2\" ; \"3\" }].out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id_map.tz-{\"\"}-{ \"1\" ; \"2\" ; \"3\" }-{ \"1\" ; \"2\" ; \"3\" }].out"	
@@ -7,21 +7,21 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (remaining gas: 1039993.528 units remaining)
+  - location: 9 (remaining gas: 1039994.328 units remaining)
     [ (Pair { "1" ; "2" ; "3" } { "" }) ]
-  - location: 9 (remaining gas: 1039993.518 units remaining)
+  - location: 9 (remaining gas: 1039994.318 units remaining)
     [ { "1" ; "2" ; "3" } ]
-  - location: 10 (remaining gas: 1039993.518 units remaining)
+  - location: 10 (remaining gas: 1039994.318 units remaining)
     [ "1" ]
-  - location: 10 (remaining gas: 1039993.503 units remaining)
+  - location: 10 (remaining gas: 1039994.308 units remaining)
     [ "2" ]
-  - location: 10 (remaining gas: 1039993.488 units remaining)
+  - location: 10 (remaining gas: 1039994.298 units remaining)
     [ "3" ]
-  - location: 10 (remaining gas: 1039993.473 units remaining)
+  - location: 10 (remaining gas: 1039994.288 units remaining)
     [ { "1" ; "2" ; "3" } ]
-  - location: 12 (remaining gas: 1039993.458 units remaining)
+  - location: 12 (remaining gas: 1039994.278 units remaining)
     [ {}
       { "1" ; "2" ; "3" } ]
-  - location: 14 (remaining gas: 1039993.443 units remaining)
+  - location: 14 (remaining gas: 1039994.268 units remaining)
     [ (Pair {} { "1" ; "2" ; "3" }) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id_map.tz-{\"\"}-{ \"a\" ; \"b\" ; \"c\" }-{ \"a\" ; \"b\" ; \"c\" }].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id_map.tz-{\"\"}-{ \"a\" ; \"b\" ; \"c\" }-{ \"a\" ; \"b\" ; \"c\" }].out"
index f34b9468ad552c0d62d5dc3957d2b534e7672aff..716f12dfe0849df8731907b522d39e8d49b40ee7 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id_map.tz-{\"\"}-{ \"a\" ; \"b\" ; \"c\" }-{ \"a\" ; \"b\" ; \"c\" }].out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id_map.tz-{\"\"}-{ \"a\" ; \"b\" ; \"c\" }-{ \"a\" ; \"b\" ; \"c\" }].out"	
@@ -7,21 +7,21 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (remaining gas: 1039993.528 units remaining)
+  - location: 9 (remaining gas: 1039994.328 units remaining)
     [ (Pair { "a" ; "b" ; "c" } { "" }) ]
-  - location: 9 (remaining gas: 1039993.518 units remaining)
+  - location: 9 (remaining gas: 1039994.318 units remaining)
     [ { "a" ; "b" ; "c" } ]
-  - location: 10 (remaining gas: 1039993.518 units remaining)
+  - location: 10 (remaining gas: 1039994.318 units remaining)
     [ "a" ]
-  - location: 10 (remaining gas: 1039993.503 units remaining)
+  - location: 10 (remaining gas: 1039994.308 units remaining)
     [ "b" ]
-  - location: 10 (remaining gas: 1039993.488 units remaining)
+  - location: 10 (remaining gas: 1039994.298 units remaining)
     [ "c" ]
-  - location: 10 (remaining gas: 1039993.473 units remaining)
+  - location: 10 (remaining gas: 1039994.288 units remaining)
     [ { "a" ; "b" ; "c" } ]
-  - location: 12 (remaining gas: 1039993.458 units remaining)
+  - location: 12 (remaining gas: 1039994.278 units remaining)
     [ {}
       { "a" ; "b" ; "c" } ]
-  - location: 14 (remaining gas: 1039993.443 units remaining)
+  - location: 14 (remaining gas: 1039994.268 units remaining)
     [ (Pair {} { "a" ; "b" ; "c" }) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id_map.tz-{\"\"}-{}-{}].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id_map.tz-{\"\"}-{}-{}].out"
index e16e18c591c768dc64e75ef9b6f8c2ec13aaa58a..0bfaf343ded3d9f08ad0e7decf11b887eb5551d6 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id_map.tz-{\"\"}-{}-{}].out"
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_id_map.tz-{\"\"}-{}-{}].out"
@@ -7,15 +7,15 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (remaining gas: 1039993.900 units remaining)
+  - location: 9 (remaining gas: 1039994.700 units remaining)
     [ (Pair {} { "" }) ]
-  - location: 9 (remaining gas: 1039993.890 units remaining)
+  - location: 9 (remaining gas: 1039994.690 units remaining)
     [ {} ]
-  - location: 10 (remaining gas: 1039993.890 units remaining)
+  - location: 10 (remaining gas: 1039994.690 units remaining)
     [ {} ]
-  - location: 12 (remaining gas: 1039993.875 units remaining)
+  - location: 12 (remaining gas: 1039994.680 units remaining)
     [ {}
       {} ]
-  - location: 14 (remaining gas: 1039993.860 units remaining)
+  - location: 14 (remaining gas: 1039994.670 units remaining)
     [ (Pair {} {}) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_iter.tz-0-{ 10 ; 2 ; 1 }-20].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_iter.tz-0-{ 10 ; 2 ; 1 }-20].out
index 3f1e5986ff8add0b3577964162b7ae1421fae41a..c0510703b4dc5cd27dc31388897c86d9adc4cc5b 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_iter.tz-0-{ 10 ; 2 ; 1 }-20].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_iter.tz-0-{ 10 ; 2 ; 1 }-20].out	
@@ -7,36 +7,36 @@ emitted operations
 big_map diff
   
 trace
-  - location: 8 (remaining gas: 1039991.883 units remaining)
+  - location: 8 (remaining gas: 1039992.683 units remaining)
     [ (Pair { 10 ; 2 ; 1 } 0) ]
-  - location: 8 (remaining gas: 1039991.873 units remaining)
+  - location: 8 (remaining gas: 1039992.673 units remaining)
     [ { 10 ; 2 ; 1 } ]
-  - location: 9 (remaining gas: 1039991.863 units remaining)
+  - location: 9 (remaining gas: 1039992.663 units remaining)
     [ 1
       { 10 ; 2 ; 1 } ]
-  - location: 12 (remaining gas: 1039991.853 units remaining)
+  - location: 12 (remaining gas: 1039992.653 units remaining)
     [ { 10 ; 2 ; 1 }
       1 ]
-  - location: 13 (remaining gas: 1039991.853 units remaining)
+  - location: 13 (remaining gas: 1039992.653 units remaining)
     [ 10
       1 ]
-  - location: 15 (remaining gas: 1039991.749 units remaining)
+  - location: 15 (remaining gas: 1039992.594 units remaining)
     [ 10 ]
-  - location: 13 (remaining gas: 1039991.734 units remaining)
+  - location: 13 (remaining gas: 1039992.584 units remaining)
     [ 2
       10 ]
-  - location: 15 (remaining gas: 1039991.630 units remaining)
+  - location: 15 (remaining gas: 1039992.525 units remaining)
     [ 20 ]
-  - location: 13 (remaining gas: 1039991.615 units remaining)
+  - location: 13 (remaining gas: 1039992.515 units remaining)
     [ 1
       20 ]
-  - location: 15 (remaining gas: 1039991.511 units remaining)
+  - location: 15 (remaining gas: 1039992.456 units remaining)
     [ 20 ]
-  - location: 13 (remaining gas: 1039991.496 units remaining)
+  - location: 13 (remaining gas: 1039992.446 units remaining)
     [ 20 ]
-  - location: 16 (remaining gas: 1039991.481 units remaining)
+  - location: 16 (remaining gas: 1039992.436 units remaining)
     [ {}
       20 ]
-  - location: 18 (remaining gas: 1039991.466 units remaining)
+  - location: 18 (remaining gas: 1039992.426 units remaining)
     [ (Pair {} 20) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_iter.tz-0-{ 3 ; 6 ; 9 }-162].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_iter.tz-0-{ 3 ; 6 ; 9 }-162].out
index 450e37fb004b2310a7bfdeddb907449ce80ab0bf..e7e8d686fc4c52e5ecb59d95f3101fc91ddaf3a6 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_iter.tz-0-{ 3 ; 6 ; 9 }-162].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_iter.tz-0-{ 3 ; 6 ; 9 }-162].out	
@@ -7,36 +7,36 @@ emitted operations
 big_map diff
   
 trace
-  - location: 8 (remaining gas: 1039991.883 units remaining)
+  - location: 8 (remaining gas: 1039992.683 units remaining)
     [ (Pair { 3 ; 6 ; 9 } 0) ]
-  - location: 8 (remaining gas: 1039991.873 units remaining)
+  - location: 8 (remaining gas: 1039992.673 units remaining)
     [ { 3 ; 6 ; 9 } ]
-  - location: 9 (remaining gas: 1039991.863 units remaining)
+  - location: 9 (remaining gas: 1039992.663 units remaining)
     [ 1
       { 3 ; 6 ; 9 } ]
-  - location: 12 (remaining gas: 1039991.853 units remaining)
+  - location: 12 (remaining gas: 1039992.653 units remaining)
     [ { 3 ; 6 ; 9 }
       1 ]
-  - location: 13 (remaining gas: 1039991.853 units remaining)
+  - location: 13 (remaining gas: 1039992.653 units remaining)
     [ 3
       1 ]
-  - location: 15 (remaining gas: 1039991.749 units remaining)
+  - location: 15 (remaining gas: 1039992.594 units remaining)
     [ 3 ]
-  - location: 13 (remaining gas: 1039991.734 units remaining)
+  - location: 13 (remaining gas: 1039992.584 units remaining)
     [ 6
       3 ]
-  - location: 15 (remaining gas: 1039991.630 units remaining)
+  - location: 15 (remaining gas: 1039992.525 units remaining)
     [ 18 ]
-  - location: 13 (remaining gas: 1039991.615 units remaining)
+  - location: 13 (remaining gas: 1039992.515 units remaining)
     [ 9
       18 ]
-  - location: 15 (remaining gas: 1039991.511 units remaining)
+  - location: 15 (remaining gas: 1039992.456 units remaining)
     [ 162 ]
-  - location: 13 (remaining gas: 1039991.496 units remaining)
+  - location: 13 (remaining gas: 1039992.446 units remaining)
     [ 162 ]
-  - location: 16 (remaining gas: 1039991.481 units remaining)
+  - location: 16 (remaining gas: 1039992.436 units remaining)
     [ {}
       162 ]
-  - location: 18 (remaining gas: 1039991.466 units remaining)
+  - location: 18 (remaining gas: 1039992.426 units remaining)
     [ (Pair {} 162) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_map_block.tz-{0}-{ 1 ; 1 ; 1 ; 1 }-{ 1 ; 2 ; 3 ; 4 }].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_map_block.tz-{0}-{ 1 ; 1 ; 1 ; 1 }-{ 1 ; 2 ; 3 ; 4 }].out
index a45d7de5a9ffbe06255fa635010e351a70e3b6a6..d8be07275f69d3bbd0a28fc7c55add9420274050 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_map_block.tz-{0}-{ 1 ; 1 ; 1 ; 1 }-{ 1 ; 2 ; 3 ; 4 }].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_map_block.tz-{0}-{ 1 ; 1 ; 1 ; 1 }-{ 1 ; 2 ; 3 ; 4 }].out	
@@ -7,130 +7,130 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (remaining gas: 1039985.979 units remaining)
+  - location: 9 (remaining gas: 1039986.939 units remaining)
     [ (Pair { 1 ; 1 ; 1 ; 1 } { 0 }) ]
-  - location: 9 (remaining gas: 1039985.969 units remaining)
+  - location: 9 (remaining gas: 1039986.929 units remaining)
     [ { 1 ; 1 ; 1 ; 1 } ]
-  - location: 10 (remaining gas: 1039985.959 units remaining)
+  - location: 10 (remaining gas: 1039986.919 units remaining)
     [ 0
       { 1 ; 1 ; 1 ; 1 } ]
-  - location: 13 (remaining gas: 1039985.949 units remaining)
+  - location: 13 (remaining gas: 1039986.909 units remaining)
     [ { 1 ; 1 ; 1 ; 1 }
       0 ]
-  - location: 14 (remaining gas: 1039985.949 units remaining)
+  - location: 14 (remaining gas: 1039986.909 units remaining)
     [ 1
       0 ]
-  - location: 16 (remaining gas: 1039985.934 units remaining)
+  - location: 16 (remaining gas: 1039986.899 units remaining)
     [ 0 ]
-  - location: 18 (remaining gas: 1039985.924 units remaining)
+  - location: 18 (remaining gas: 1039986.889 units remaining)
     [ 0
       0 ]
-  - location: 16 (remaining gas: 1039985.894 units remaining)
+  - location: 16 (remaining gas: 1039986.869 units remaining)
     [ 1
       0
       0 ]
-  - location: 19 (remaining gas: 1039985.839 units remaining)
+  - location: 19 (remaining gas: 1039986.834 units remaining)
     [ 1
       0 ]
-  - location: 20 (remaining gas: 1039985.824 units remaining)
+  - location: 20 (remaining gas: 1039986.824 units remaining)
     [ 0 ]
-  - location: 22 (remaining gas: 1039985.814 units remaining)
+  - location: 22 (remaining gas: 1039986.814 units remaining)
     [ 1
       0 ]
-  - location: 25 (remaining gas: 1039985.759 units remaining)
+  - location: 25 (remaining gas: 1039986.779 units remaining)
     [ 1 ]
-  - location: 20 (remaining gas: 1039985.729 units remaining)
+  - location: 20 (remaining gas: 1039986.759 units remaining)
     [ 1
       1 ]
-  - location: 14 (remaining gas: 1039985.714 units remaining)
+  - location: 14 (remaining gas: 1039986.749 units remaining)
     [ 1
       1 ]
-  - location: 16 (remaining gas: 1039985.699 units remaining)
+  - location: 16 (remaining gas: 1039986.739 units remaining)
     [ 1 ]
-  - location: 18 (remaining gas: 1039985.689 units remaining)
+  - location: 18 (remaining gas: 1039986.729 units remaining)
     [ 1
       1 ]
-  - location: 16 (remaining gas: 1039985.659 units remaining)
+  - location: 16 (remaining gas: 1039986.709 units remaining)
     [ 1
       1
       1 ]
-  - location: 19 (remaining gas: 1039985.604 units remaining)
+  - location: 19 (remaining gas: 1039986.674 units remaining)
     [ 2
       1 ]
-  - location: 20 (remaining gas: 1039985.589 units remaining)
+  - location: 20 (remaining gas: 1039986.664 units remaining)
     [ 1 ]
-  - location: 22 (remaining gas: 1039985.579 units remaining)
+  - location: 22 (remaining gas: 1039986.654 units remaining)
     [ 1
       1 ]
-  - location: 25 (remaining gas: 1039985.524 units remaining)
+  - location: 25 (remaining gas: 1039986.619 units remaining)
     [ 2 ]
-  - location: 20 (remaining gas: 1039985.494 units remaining)
+  - location: 20 (remaining gas: 1039986.599 units remaining)
     [ 2
       2 ]
-  - location: 14 (remaining gas: 1039985.479 units remaining)
+  - location: 14 (remaining gas: 1039986.589 units remaining)
     [ 1
       2 ]
-  - location: 16 (remaining gas: 1039985.464 units remaining)
+  - location: 16 (remaining gas: 1039986.579 units remaining)
     [ 2 ]
-  - location: 18 (remaining gas: 1039985.454 units remaining)
+  - location: 18 (remaining gas: 1039986.569 units remaining)
     [ 2
       2 ]
-  - location: 16 (remaining gas: 1039985.424 units remaining)
+  - location: 16 (remaining gas: 1039986.549 units remaining)
     [ 1
       2
       2 ]
-  - location: 19 (remaining gas: 1039985.369 units remaining)
+  - location: 19 (remaining gas: 1039986.514 units remaining)
     [ 3
       2 ]
-  - location: 20 (remaining gas: 1039985.354 units remaining)
+  - location: 20 (remaining gas: 1039986.504 units remaining)
     [ 2 ]
-  - location: 22 (remaining gas: 1039985.344 units remaining)
+  - location: 22 (remaining gas: 1039986.494 units remaining)
     [ 1
       2 ]
-  - location: 25 (remaining gas: 1039985.289 units remaining)
+  - location: 25 (remaining gas: 1039986.459 units remaining)
     [ 3 ]
-  - location: 20 (remaining gas: 1039985.259 units remaining)
+  - location: 20 (remaining gas: 1039986.439 units remaining)
     [ 3
       3 ]
-  - location: 14 (remaining gas: 1039985.244 units remaining)
+  - location: 14 (remaining gas: 1039986.429 units remaining)
     [ 1
       3 ]
-  - location: 16 (remaining gas: 1039985.229 units remaining)
+  - location: 16 (remaining gas: 1039986.419 units remaining)
     [ 3 ]
-  - location: 18 (remaining gas: 1039985.219 units remaining)
+  - location: 18 (remaining gas: 1039986.409 units remaining)
     [ 3
       3 ]
-  - location: 16 (remaining gas: 1039985.189 units remaining)
+  - location: 16 (remaining gas: 1039986.389 units remaining)
     [ 1
       3
       3 ]
-  - location: 19 (remaining gas: 1039985.134 units remaining)
+  - location: 19 (remaining gas: 1039986.354 units remaining)
     [ 4
       3 ]
-  - location: 20 (remaining gas: 1039985.119 units remaining)
+  - location: 20 (remaining gas: 1039986.344 units remaining)
     [ 3 ]
-  - location: 22 (remaining gas: 1039985.109 units remaining)
+  - location: 22 (remaining gas: 1039986.334 units remaining)
     [ 1
       3 ]
-  - location: 25 (remaining gas: 1039985.054 units remaining)
+  - location: 25 (remaining gas: 1039986.299 units remaining)
     [ 4 ]
-  - location: 20 (remaining gas: 1039985.024 units remaining)
+  - location: 20 (remaining gas: 1039986.279 units remaining)
     [ 4
       4 ]
-  - location: 14 (remaining gas: 1039985.009 units remaining)
+  - location: 14 (remaining gas: 1039986.269 units remaining)
     [ { 1 ; 2 ; 3 ; 4 }
       4 ]
-  - location: 26 (remaining gas: 1039984.994 units remaining)
+  - location: 26 (remaining gas: 1039986.259 units remaining)
     [ {}
       { 1 ; 2 ; 3 ; 4 }
       4 ]
-  - location: 28 (remaining gas: 1039984.979 units remaining)
+  - location: 28 (remaining gas: 1039986.249 units remaining)
     [ (Pair {} { 1 ; 2 ; 3 ; 4 })
       4 ]
-  - location: 29 (remaining gas: 1039984.964 units remaining)
+  - location: 29 (remaining gas: 1039986.239 units remaining)
     [ 4 ]
-  - location: 31 (remaining gas: 1039984.954 units remaining)
+  - location: 31 (remaining gas: 1039986.229 units remaining)
     [  ]
-  - location: 29 (remaining gas: 1039984.924 units remaining)
+  - location: 29 (remaining gas: 1039986.209 units remaining)
     [ (Pair {} { 1 ; 2 ; 3 ; 4 }) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_map_block.tz-{0}-{ 1 ; 2 ; 3 ; 0 }-{ 1 ; 3 ; 5 ; 3 }].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_map_block.tz-{0}-{ 1 ; 2 ; 3 ; 0 }-{ 1 ; 3 ; 5 ; 3 }].out
index e1aaec5aedc5d02b9a53dc1b4ddacc40491ec7e6..6e0910a95c809b64853cb88b80a6ba2875fd4de9 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_map_block.tz-{0}-{ 1 ; 2 ; 3 ; 0 }-{ 1 ; 3 ; 5 ; 3 }].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_map_block.tz-{0}-{ 1 ; 2 ; 3 ; 0 }-{ 1 ; 3 ; 5 ; 3 }].out	
@@ -7,130 +7,130 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (remaining gas: 1039985.979 units remaining)
+  - location: 9 (remaining gas: 1039986.939 units remaining)
     [ (Pair { 1 ; 2 ; 3 ; 0 } { 0 }) ]
-  - location: 9 (remaining gas: 1039985.969 units remaining)
+  - location: 9 (remaining gas: 1039986.929 units remaining)
     [ { 1 ; 2 ; 3 ; 0 } ]
-  - location: 10 (remaining gas: 1039985.959 units remaining)
+  - location: 10 (remaining gas: 1039986.919 units remaining)
     [ 0
       { 1 ; 2 ; 3 ; 0 } ]
-  - location: 13 (remaining gas: 1039985.949 units remaining)
+  - location: 13 (remaining gas: 1039986.909 units remaining)
     [ { 1 ; 2 ; 3 ; 0 }
       0 ]
-  - location: 14 (remaining gas: 1039985.949 units remaining)
+  - location: 14 (remaining gas: 1039986.909 units remaining)
     [ 1
       0 ]
-  - location: 16 (remaining gas: 1039985.934 units remaining)
+  - location: 16 (remaining gas: 1039986.899 units remaining)
     [ 0 ]
-  - location: 18 (remaining gas: 1039985.924 units remaining)
+  - location: 18 (remaining gas: 1039986.889 units remaining)
     [ 0
       0 ]
-  - location: 16 (remaining gas: 1039985.894 units remaining)
+  - location: 16 (remaining gas: 1039986.869 units remaining)
     [ 1
       0
       0 ]
-  - location: 19 (remaining gas: 1039985.839 units remaining)
+  - location: 19 (remaining gas: 1039986.834 units remaining)
     [ 1
       0 ]
-  - location: 20 (remaining gas: 1039985.824 units remaining)
+  - location: 20 (remaining gas: 1039986.824 units remaining)
     [ 0 ]
-  - location: 22 (remaining gas: 1039985.814 units remaining)
+  - location: 22 (remaining gas: 1039986.814 units remaining)
     [ 1
       0 ]
-  - location: 25 (remaining gas: 1039985.759 units remaining)
+  - location: 25 (remaining gas: 1039986.779 units remaining)
     [ 1 ]
-  - location: 20 (remaining gas: 1039985.729 units remaining)
+  - location: 20 (remaining gas: 1039986.759 units remaining)
     [ 1
       1 ]
-  - location: 14 (remaining gas: 1039985.714 units remaining)
+  - location: 14 (remaining gas: 1039986.749 units remaining)
     [ 2
       1 ]
-  - location: 16 (remaining gas: 1039985.699 units remaining)
+  - location: 16 (remaining gas: 1039986.739 units remaining)
     [ 1 ]
-  - location: 18 (remaining gas: 1039985.689 units remaining)
+  - location: 18 (remaining gas: 1039986.729 units remaining)
     [ 1
       1 ]
-  - location: 16 (remaining gas: 1039985.659 units remaining)
+  - location: 16 (remaining gas: 1039986.709 units remaining)
     [ 2
       1
       1 ]
-  - location: 19 (remaining gas: 1039985.604 units remaining)
+  - location: 19 (remaining gas: 1039986.674 units remaining)
     [ 3
       1 ]
-  - location: 20 (remaining gas: 1039985.589 units remaining)
+  - location: 20 (remaining gas: 1039986.664 units remaining)
     [ 1 ]
-  - location: 22 (remaining gas: 1039985.579 units remaining)
+  - location: 22 (remaining gas: 1039986.654 units remaining)
     [ 1
       1 ]
-  - location: 25 (remaining gas: 1039985.524 units remaining)
+  - location: 25 (remaining gas: 1039986.619 units remaining)
     [ 2 ]
-  - location: 20 (remaining gas: 1039985.494 units remaining)
+  - location: 20 (remaining gas: 1039986.599 units remaining)
     [ 3
       2 ]
-  - location: 14 (remaining gas: 1039985.479 units remaining)
+  - location: 14 (remaining gas: 1039986.589 units remaining)
     [ 3
       2 ]
-  - location: 16 (remaining gas: 1039985.464 units remaining)
+  - location: 16 (remaining gas: 1039986.579 units remaining)
     [ 2 ]
-  - location: 18 (remaining gas: 1039985.454 units remaining)
+  - location: 18 (remaining gas: 1039986.569 units remaining)
     [ 2
       2 ]
-  - location: 16 (remaining gas: 1039985.424 units remaining)
+  - location: 16 (remaining gas: 1039986.549 units remaining)
     [ 3
       2
       2 ]
-  - location: 19 (remaining gas: 1039985.369 units remaining)
+  - location: 19 (remaining gas: 1039986.514 units remaining)
     [ 5
       2 ]
-  - location: 20 (remaining gas: 1039985.354 units remaining)
+  - location: 20 (remaining gas: 1039986.504 units remaining)
     [ 2 ]
-  - location: 22 (remaining gas: 1039985.344 units remaining)
+  - location: 22 (remaining gas: 1039986.494 units remaining)
     [ 1
       2 ]
-  - location: 25 (remaining gas: 1039985.289 units remaining)
+  - location: 25 (remaining gas: 1039986.459 units remaining)
     [ 3 ]
-  - location: 20 (remaining gas: 1039985.259 units remaining)
+  - location: 20 (remaining gas: 1039986.439 units remaining)
     [ 5
       3 ]
-  - location: 14 (remaining gas: 1039985.244 units remaining)
+  - location: 14 (remaining gas: 1039986.429 units remaining)
     [ 0
       3 ]
-  - location: 16 (remaining gas: 1039985.229 units remaining)
+  - location: 16 (remaining gas: 1039986.419 units remaining)
     [ 3 ]
-  - location: 18 (remaining gas: 1039985.219 units remaining)
+  - location: 18 (remaining gas: 1039986.409 units remaining)
     [ 3
       3 ]
-  - location: 16 (remaining gas: 1039985.189 units remaining)
+  - location: 16 (remaining gas: 1039986.389 units remaining)
     [ 0
       3
       3 ]
-  - location: 19 (remaining gas: 1039985.134 units remaining)
+  - location: 19 (remaining gas: 1039986.354 units remaining)
     [ 3
       3 ]
-  - location: 20 (remaining gas: 1039985.119 units remaining)
+  - location: 20 (remaining gas: 1039986.344 units remaining)
     [ 3 ]
-  - location: 22 (remaining gas: 1039985.109 units remaining)
+  - location: 22 (remaining gas: 1039986.334 units remaining)
     [ 1
       3 ]
-  - location: 25 (remaining gas: 1039985.054 units remaining)
+  - location: 25 (remaining gas: 1039986.299 units remaining)
     [ 4 ]
-  - location: 20 (remaining gas: 1039985.024 units remaining)
+  - location: 20 (remaining gas: 1039986.279 units remaining)
     [ 3
       4 ]
-  - location: 14 (remaining gas: 1039985.009 units remaining)
+  - location: 14 (remaining gas: 1039986.269 units remaining)
     [ { 1 ; 3 ; 5 ; 3 }
       4 ]
-  - location: 26 (remaining gas: 1039984.994 units remaining)
+  - location: 26 (remaining gas: 1039986.259 units remaining)
     [ {}
       { 1 ; 3 ; 5 ; 3 }
       4 ]
-  - location: 28 (remaining gas: 1039984.979 units remaining)
+  - location: 28 (remaining gas: 1039986.249 units remaining)
     [ (Pair {} { 1 ; 3 ; 5 ; 3 })
       4 ]
-  - location: 29 (remaining gas: 1039984.964 units remaining)
+  - location: 29 (remaining gas: 1039986.239 units remaining)
     [ 4 ]
-  - location: 31 (remaining gas: 1039984.954 units remaining)
+  - location: 31 (remaining gas: 1039986.229 units remaining)
     [  ]
-  - location: 29 (remaining gas: 1039984.924 units remaining)
+  - location: 29 (remaining gas: 1039986.209 units remaining)
     [ (Pair {} { 1 ; 3 ; 5 ; 3 }) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_map_block.tz-{0}-{}-{}].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_map_block.tz-{0}-{}-{}].out
index 348f8127a8d2c246f2af0dd3ca20805bd78ce285..ab21a8bb1aab48fdafc0a17031e5efd427066970 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_map_block.tz-{0}-{}-{}].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_map_block.tz-{0}-{}-{}].out
@@ -7,30 +7,30 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (remaining gas: 1039986.379 units remaining)
+  - location: 9 (remaining gas: 1039987.339 units remaining)
     [ (Pair {} { 0 }) ]
-  - location: 9 (remaining gas: 1039986.369 units remaining)
+  - location: 9 (remaining gas: 1039987.329 units remaining)
     [ {} ]
-  - location: 10 (remaining gas: 1039986.359 units remaining)
+  - location: 10 (remaining gas: 1039987.319 units remaining)
     [ 0
       {} ]
-  - location: 13 (remaining gas: 1039986.349 units remaining)
+  - location: 13 (remaining gas: 1039987.309 units remaining)
     [ {}
       0 ]
-  - location: 14 (remaining gas: 1039986.349 units remaining)
+  - location: 14 (remaining gas: 1039987.309 units remaining)
     [ {}
       0 ]
-  - location: 26 (remaining gas: 1039986.334 units remaining)
+  - location: 26 (remaining gas: 1039987.299 units remaining)
     [ {}
       {}
       0 ]
-  - location: 28 (remaining gas: 1039986.319 units remaining)
+  - location: 28 (remaining gas: 1039987.289 units remaining)
     [ (Pair {} {})
       0 ]
-  - location: 29 (remaining gas: 1039986.304 units remaining)
+  - location: 29 (remaining gas: 1039987.279 units remaining)
     [ 0 ]
-  - location: 31 (remaining gas: 1039986.294 units remaining)
+  - location: 31 (remaining gas: 1039987.269 units remaining)
     [  ]
-  - location: 29 (remaining gas: 1039986.264 units remaining)
+  - location: 29 (remaining gas: 1039987.249 units remaining)
     [ (Pair {} {}) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_size.tz-111-{ 1 ; 2 ; 3 ; 4 ; 5 ; 6 }-6].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_size.tz-111-{ 1 ; 2 ; 3 ; 4 ; 5 ; 6 }-6].out
index fcd637c1b31d6bb04b9b2fe571e30ab04aef44ef..8d05d69adf1229bd59abce9372617f19a7354f5b 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_size.tz-111-{ 1 ; 2 ; 3 ; 4 ; 5 ; 6 }-6].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_size.tz-111-{ 1 ; 2 ; 3 ; 4 ; 5 ; 6 }-6].out	
@@ -7,15 +7,15 @@ emitted operations
 big_map diff
   
 trace
-  - location: 8 (remaining gas: 1039994.185 units remaining)
+  - location: 8 (remaining gas: 1039994.825 units remaining)
     [ (Pair { 1 ; 2 ; 3 ; 4 ; 5 ; 6 } 111) ]
-  - location: 8 (remaining gas: 1039994.175 units remaining)
+  - location: 8 (remaining gas: 1039994.815 units remaining)
     [ { 1 ; 2 ; 3 ; 4 ; 5 ; 6 } ]
-  - location: 9 (remaining gas: 1039994.160 units remaining)
+  - location: 9 (remaining gas: 1039994.805 units remaining)
     [ 6 ]
-  - location: 10 (remaining gas: 1039994.145 units remaining)
+  - location: 10 (remaining gas: 1039994.795 units remaining)
     [ {}
       6 ]
-  - location: 12 (remaining gas: 1039994.130 units remaining)
+  - location: 12 (remaining gas: 1039994.785 units remaining)
     [ (Pair {} 6) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_size.tz-111-{ 1 ; 2 ; 3 }-3].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_size.tz-111-{ 1 ; 2 ; 3 }-3].out
index 381694882c3725a8b28db87fda9d8fc36762f0da..fbb0d9bd3dd13bf3bb3c3e3a1508f9646fdfc1f4 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_size.tz-111-{ 1 ; 2 ; 3 }-3].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_size.tz-111-{ 1 ; 2 ; 3 }-3].out	
@@ -7,15 +7,15 @@ emitted operations
 big_map diff
   
 trace
-  - location: 8 (remaining gas: 1039994.485 units remaining)
+  - location: 8 (remaining gas: 1039995.125 units remaining)
     [ (Pair { 1 ; 2 ; 3 } 111) ]
-  - location: 8 (remaining gas: 1039994.475 units remaining)
+  - location: 8 (remaining gas: 1039995.115 units remaining)
     [ { 1 ; 2 ; 3 } ]
-  - location: 9 (remaining gas: 1039994.460 units remaining)
+  - location: 9 (remaining gas: 1039995.105 units remaining)
     [ 3 ]
-  - location: 10 (remaining gas: 1039994.445 units remaining)
+  - location: 10 (remaining gas: 1039995.095 units remaining)
     [ {}
       3 ]
-  - location: 12 (remaining gas: 1039994.430 units remaining)
+  - location: 12 (remaining gas: 1039995.085 units remaining)
     [ (Pair {} 3) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_size.tz-111-{ 1 }-1].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_size.tz-111-{ 1 }-1].out
index 4cd5d366db7d2f44f72e31aa25b399d800850dd2..d7974ea29b3578beef748e2a171965d40d05fb31 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_size.tz-111-{ 1 }-1].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_size.tz-111-{ 1 }-1].out	
@@ -7,15 +7,15 @@ emitted operations
 big_map diff
   
 trace
-  - location: 8 (remaining gas: 1039994.685 units remaining)
+  - location: 8 (remaining gas: 1039995.325 units remaining)
     [ (Pair { 1 } 111) ]
-  - location: 8 (remaining gas: 1039994.675 units remaining)
+  - location: 8 (remaining gas: 1039995.315 units remaining)
     [ { 1 } ]
-  - location: 9 (remaining gas: 1039994.660 units remaining)
+  - location: 9 (remaining gas: 1039995.305 units remaining)
     [ 1 ]
-  - location: 10 (remaining gas: 1039994.645 units remaining)
+  - location: 10 (remaining gas: 1039995.295 units remaining)
     [ {}
       1 ]
-  - location: 12 (remaining gas: 1039994.630 units remaining)
+  - location: 12 (remaining gas: 1039995.285 units remaining)
     [ (Pair {} 1) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_size.tz-111-{}-0].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_size.tz-111-{}-0].out
index 057263b03eaa0905d6392105cc3d7fa635b45e34..879528f7724cf337a71827f37a21c072e1cc89d9 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_size.tz-111-{}-0].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[list_size.tz-111-{}-0].out
@@ -7,15 +7,15 @@ emitted operations
 big_map diff
   
 trace
-  - location: 8 (remaining gas: 1039994.785 units remaining)
+  - location: 8 (remaining gas: 1039995.425 units remaining)
     [ (Pair {} 111) ]
-  - location: 8 (remaining gas: 1039994.775 units remaining)
+  - location: 8 (remaining gas: 1039995.415 units remaining)
     [ {} ]
-  - location: 9 (remaining gas: 1039994.760 units remaining)
+  - location: 9 (remaining gas: 1039995.405 units remaining)
     [ 0 ]
-  - location: 10 (remaining gas: 1039994.745 units remaining)
+  - location: 10 (remaining gas: 1039995.395 units remaining)
     [ {}
       0 ]
-  - location: 12 (remaining gas: 1039994.730 units remaining)
+  - location: 12 (remaining gas: 1039995.385 units remaining)
     [ (Pair {} 0) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[loop_left.tz-{\"\"}-{ \"c\" ; \"b\" ; \"a\" }-{ \"a\" ; \"b\" ; \"c\" }].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[loop_left.tz-{\"\"}-{ \"c\" ; \"b\" ; \"a\" }-{ \"a\" ; \"b\" ; \"c\" }].out"
index 5afa3a66f44218308d34b0f80000439511f794be..7ab7d183f173362025dcafb286656f51fea2ba7a 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[loop_left.tz-{\"\"}-{ \"c\" ; \"b\" ; \"a\" }-{ \"a\" ; \"b\" ; \"c\" }].out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[loop_left.tz-{\"\"}-{ \"c\" ; \"b\" ; \"a\" }-{ \"a\" ; \"b\" ; \"c\" }].out"	
@@ -7,157 +7,157 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (remaining gas: 1039978.215 units remaining)
+  - location: 9 (remaining gas: 1039981.735 units remaining)
     [ (Pair { "c" ; "b" ; "a" } { "" }) ]
-  - location: 9 (remaining gas: 1039978.205 units remaining)
+  - location: 9 (remaining gas: 1039981.725 units remaining)
     [ { "c" ; "b" ; "a" } ]
-  - location: 10 (remaining gas: 1039978.190 units remaining)
+  - location: 10 (remaining gas: 1039981.715 units remaining)
     [ {}
       { "c" ; "b" ; "a" } ]
-  - location: 12 (remaining gas: 1039978.180 units remaining)
+  - location: 12 (remaining gas: 1039981.705 units remaining)
     [ { "c" ; "b" ; "a" }
       {} ]
-  - location: 13 (remaining gas: 1039978.165 units remaining)
+  - location: 13 (remaining gas: 1039981.695 units remaining)
     [ (Pair { "c" ; "b" ; "a" } {}) ]
-  - location: 14 (remaining gas: 1039978.150 units remaining)
+  - location: 14 (remaining gas: 1039981.685 units remaining)
     [ (Left (Pair { "c" ; "b" ; "a" } {})) ]
-  - location: 17 (remaining gas: 1039978.150 units remaining)
+  - location: 17 (remaining gas: 1039981.685 units remaining)
     [ (Pair { "c" ; "b" ; "a" } {}) ]
-  - location: 19 (remaining gas: 1039978.140 units remaining)
+  - location: 19 (remaining gas: 1039981.675 units remaining)
     [ (Pair { "c" ; "b" ; "a" } {})
       (Pair { "c" ; "b" ; "a" } {}) ]
-  - location: 20 (remaining gas: 1039978.130 units remaining)
+  - location: 20 (remaining gas: 1039981.665 units remaining)
     [ { "c" ; "b" ; "a" }
       (Pair { "c" ; "b" ; "a" } {}) ]
-  - location: 21 (remaining gas: 1039978.115 units remaining)
+  - location: 21 (remaining gas: 1039981.655 units remaining)
     [ (Pair { "c" ; "b" ; "a" } {}) ]
-  - location: 23 (remaining gas: 1039978.105 units remaining)
+  - location: 23 (remaining gas: 1039981.645 units remaining)
     [ {} ]
-  - location: 21 (remaining gas: 1039978.075 units remaining)
+  - location: 21 (remaining gas: 1039981.625 units remaining)
     [ { "c" ; "b" ; "a" }
       {} ]
-  - location: 24 (remaining gas: 1039978.065 units remaining)
+  - location: 24 (remaining gas: 1039981.615 units remaining)
     [ "c"
       { "b" ; "a" }
       {} ]
-  - location: 26 (remaining gas: 1039978.055 units remaining)
+  - location: 26 (remaining gas: 1039981.605 units remaining)
     [ { "b" ; "a" }
       "c"
       {} ]
-  - location: 27 (remaining gas: 1039978.040 units remaining)
+  - location: 27 (remaining gas: 1039981.595 units remaining)
     [ "c"
       {} ]
-  - location: 29 (remaining gas: 1039978.025 units remaining)
+  - location: 29 (remaining gas: 1039981.585 units remaining)
     [ { "c" } ]
-  - location: 27 (remaining gas: 1039977.995 units remaining)
+  - location: 27 (remaining gas: 1039981.565 units remaining)
     [ { "b" ; "a" }
       { "c" } ]
-  - location: 30 (remaining gas: 1039977.980 units remaining)
+  - location: 30 (remaining gas: 1039981.555 units remaining)
     [ (Pair { "b" ; "a" } { "c" }) ]
-  - location: 31 (remaining gas: 1039977.965 units remaining)
+  - location: 31 (remaining gas: 1039981.545 units remaining)
     [ (Left (Pair { "b" ; "a" } { "c" })) ]
-  - location: 24 (remaining gas: 1039977.950 units remaining)
+  - location: 24 (remaining gas: 1039981.535 units remaining)
     [ (Left (Pair { "b" ; "a" } { "c" })) ]
-  - location: 17 (remaining gas: 1039977.935 units remaining)
+  - location: 17 (remaining gas: 1039981.525 units remaining)
     [ (Pair { "b" ; "a" } { "c" }) ]
-  - location: 19 (remaining gas: 1039977.925 units remaining)
+  - location: 19 (remaining gas: 1039981.515 units remaining)
     [ (Pair { "b" ; "a" } { "c" })
       (Pair { "b" ; "a" } { "c" }) ]
-  - location: 20 (remaining gas: 1039977.915 units remaining)
+  - location: 20 (remaining gas: 1039981.505 units remaining)
     [ { "b" ; "a" }
       (Pair { "b" ; "a" } { "c" }) ]
-  - location: 21 (remaining gas: 1039977.900 units remaining)
+  - location: 21 (remaining gas: 1039981.495 units remaining)
     [ (Pair { "b" ; "a" } { "c" }) ]
-  - location: 23 (remaining gas: 1039977.890 units remaining)
+  - location: 23 (remaining gas: 1039981.485 units remaining)
     [ { "c" } ]
-  - location: 21 (remaining gas: 1039977.860 units remaining)
+  - location: 21 (remaining gas: 1039981.465 units remaining)
     [ { "b" ; "a" }
       { "c" } ]
-  - location: 24 (remaining gas: 1039977.850 units remaining)
+  - location: 24 (remaining gas: 1039981.455 units remaining)
     [ "b"
       { "a" }
       { "c" } ]
-  - location: 26 (remaining gas: 1039977.840 units remaining)
+  - location: 26 (remaining gas: 1039981.445 units remaining)
     [ { "a" }
       "b"
       { "c" } ]
-  - location: 27 (remaining gas: 1039977.825 units remaining)
+  - location: 27 (remaining gas: 1039981.435 units remaining)
     [ "b"
       { "c" } ]
-  - location: 29 (remaining gas: 1039977.810 units remaining)
+  - location: 29 (remaining gas: 1039981.425 units remaining)
     [ { "b" ; "c" } ]
-  - location: 27 (remaining gas: 1039977.780 units remaining)
+  - location: 27 (remaining gas: 1039981.405 units remaining)
     [ { "a" }
       { "b" ; "c" } ]
-  - location: 30 (remaining gas: 1039977.765 units remaining)
+  - location: 30 (remaining gas: 1039981.395 units remaining)
     [ (Pair { "a" } { "b" ; "c" }) ]
-  - location: 31 (remaining gas: 1039977.750 units remaining)
+  - location: 31 (remaining gas: 1039981.385 units remaining)
     [ (Left (Pair { "a" } { "b" ; "c" })) ]
-  - location: 24 (remaining gas: 1039977.735 units remaining)
+  - location: 24 (remaining gas: 1039981.375 units remaining)
     [ (Left (Pair { "a" } { "b" ; "c" })) ]
-  - location: 17 (remaining gas: 1039977.720 units remaining)
+  - location: 17 (remaining gas: 1039981.365 units remaining)
     [ (Pair { "a" } { "b" ; "c" }) ]
-  - location: 19 (remaining gas: 1039977.710 units remaining)
+  - location: 19 (remaining gas: 1039981.355 units remaining)
     [ (Pair { "a" } { "b" ; "c" })
       (Pair { "a" } { "b" ; "c" }) ]
-  - location: 20 (remaining gas: 1039977.700 units remaining)
+  - location: 20 (remaining gas: 1039981.345 units remaining)
     [ { "a" }
       (Pair { "a" } { "b" ; "c" }) ]
-  - location: 21 (remaining gas: 1039977.685 units remaining)
+  - location: 21 (remaining gas: 1039981.335 units remaining)
     [ (Pair { "a" } { "b" ; "c" }) ]
-  - location: 23 (remaining gas: 1039977.675 units remaining)
+  - location: 23 (remaining gas: 1039981.325 units remaining)
     [ { "b" ; "c" } ]
-  - location: 21 (remaining gas: 1039977.645 units remaining)
+  - location: 21 (remaining gas: 1039981.305 units remaining)
     [ { "a" }
       { "b" ; "c" } ]
-  - location: 24 (remaining gas: 1039977.635 units remaining)
+  - location: 24 (remaining gas: 1039981.295 units remaining)
     [ "a"
       {}
       { "b" ; "c" } ]
-  - location: 26 (remaining gas: 1039977.625 units remaining)
+  - location: 26 (remaining gas: 1039981.285 units remaining)
     [ {}
       "a"
       { "b" ; "c" } ]
-  - location: 27 (remaining gas: 1039977.610 units remaining)
+  - location: 27 (remaining gas: 1039981.275 units remaining)
     [ "a"
       { "b" ; "c" } ]
-  - location: 29 (remaining gas: 1039977.595 units remaining)
+  - location: 29 (remaining gas: 1039981.265 units remaining)
     [ { "a" ; "b" ; "c" } ]
-  - location: 27 (remaining gas: 1039977.565 units remaining)
+  - location: 27 (remaining gas: 1039981.245 units remaining)
     [ {}
       { "a" ; "b" ; "c" } ]
-  - location: 30 (remaining gas: 1039977.550 units remaining)
+  - location: 30 (remaining gas: 1039981.235 units remaining)
     [ (Pair {} { "a" ; "b" ; "c" }) ]
-  - location: 31 (remaining gas: 1039977.535 units remaining)
+  - location: 31 (remaining gas: 1039981.225 units remaining)
     [ (Left (Pair {} { "a" ; "b" ; "c" })) ]
-  - location: 24 (remaining gas: 1039977.520 units remaining)
+  - location: 24 (remaining gas: 1039981.215 units remaining)
     [ (Left (Pair {} { "a" ; "b" ; "c" })) ]
-  - location: 17 (remaining gas: 1039977.505 units remaining)
+  - location: 17 (remaining gas: 1039981.205 units remaining)
     [ (Pair {} { "a" ; "b" ; "c" }) ]
-  - location: 19 (remaining gas: 1039977.495 units remaining)
+  - location: 19 (remaining gas: 1039981.195 units remaining)
     [ (Pair {} { "a" ; "b" ; "c" })
       (Pair {} { "a" ; "b" ; "c" }) ]
-  - location: 20 (remaining gas: 1039977.485 units remaining)
+  - location: 20 (remaining gas: 1039981.185 units remaining)
     [ {}
       (Pair {} { "a" ; "b" ; "c" }) ]
-  - location: 21 (remaining gas: 1039977.470 units remaining)
+  - location: 21 (remaining gas: 1039981.175 units remaining)
     [ (Pair {} { "a" ; "b" ; "c" }) ]
-  - location: 23 (remaining gas: 1039977.460 units remaining)
+  - location: 23 (remaining gas: 1039981.165 units remaining)
     [ { "a" ; "b" ; "c" } ]
-  - location: 21 (remaining gas: 1039977.430 units remaining)
+  - location: 21 (remaining gas: 1039981.145 units remaining)
     [ {}
       { "a" ; "b" ; "c" } ]
-  - location: 24 (remaining gas: 1039977.420 units remaining)
+  - location: 24 (remaining gas: 1039981.135 units remaining)
     [ { "a" ; "b" ; "c" } ]
-  - location: 35 (remaining gas: 1039977.405 units remaining)
+  - location: 35 (remaining gas: 1039981.125 units remaining)
     [ (Right { "a" ; "b" ; "c" }) ]
-  - location: 24 (remaining gas: 1039977.390 units remaining)
+  - location: 24 (remaining gas: 1039981.115 units remaining)
     [ (Right { "a" ; "b" ; "c" }) ]
-  - location: 17 (remaining gas: 1039977.375 units remaining)
+  - location: 17 (remaining gas: 1039981.105 units remaining)
     [ { "a" ; "b" ; "c" } ]
-  - location: 41 (remaining gas: 1039977.360 units remaining)
+  - location: 41 (remaining gas: 1039981.095 units remaining)
     [ {}
       { "a" ; "b" ; "c" } ]
-  - location: 43 (remaining gas: 1039977.345 units remaining)
+  - location: 43 (remaining gas: 1039981.085 units remaining)
     [ (Pair {} { "a" ; "b" ; "c" }) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[loop_left.tz-{\"\"}-{}-{}].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[loop_left.tz-{\"\"}-{}-{}].out"
index 6b410f8c35f88912ad6654a9fbc19ea992e4834b..0f3de780eecb97a47fe1e0b7981a5edcaa2dd692 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[loop_left.tz-{\"\"}-{}-{}].out"
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[loop_left.tz-{\"\"}-{}-{}].out"
@@ -7,46 +7,46 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (remaining gas: 1039978.587 units remaining)
+  - location: 9 (remaining gas: 1039982.107 units remaining)
     [ (Pair {} { "" }) ]
-  - location: 9 (remaining gas: 1039978.577 units remaining)
+  - location: 9 (remaining gas: 1039982.097 units remaining)
     [ {} ]
-  - location: 10 (remaining gas: 1039978.562 units remaining)
+  - location: 10 (remaining gas: 1039982.087 units remaining)
     [ {}
       {} ]
-  - location: 12 (remaining gas: 1039978.552 units remaining)
+  - location: 12 (remaining gas: 1039982.077 units remaining)
     [ {}
       {} ]
-  - location: 13 (remaining gas: 1039978.537 units remaining)
+  - location: 13 (remaining gas: 1039982.067 units remaining)
     [ (Pair {} {}) ]
-  - location: 14 (remaining gas: 1039978.522 units remaining)
+  - location: 14 (remaining gas: 1039982.057 units remaining)
     [ (Left (Pair {} {})) ]
-  - location: 17 (remaining gas: 1039978.522 units remaining)
+  - location: 17 (remaining gas: 1039982.057 units remaining)
     [ (Pair {} {}) ]
-  - location: 19 (remaining gas: 1039978.512 units remaining)
+  - location: 19 (remaining gas: 1039982.047 units remaining)
     [ (Pair {} {})
       (Pair {} {}) ]
-  - location: 20 (remaining gas: 1039978.502 units remaining)
+  - location: 20 (remaining gas: 1039982.037 units remaining)
     [ {}
       (Pair {} {}) ]
-  - location: 21 (remaining gas: 1039978.487 units remaining)
+  - location: 21 (remaining gas: 1039982.027 units remaining)
     [ (Pair {} {}) ]
-  - location: 23 (remaining gas: 1039978.477 units remaining)
+  - location: 23 (remaining gas: 1039982.017 units remaining)
     [ {} ]
-  - location: 21 (remaining gas: 1039978.447 units remaining)
+  - location: 21 (remaining gas: 1039981.997 units remaining)
     [ {}
       {} ]
-  - location: 24 (remaining gas: 1039978.437 units remaining)
+  - location: 24 (remaining gas: 1039981.987 units remaining)
     [ {} ]
-  - location: 35 (remaining gas: 1039978.422 units remaining)
+  - location: 35 (remaining gas: 1039981.977 units remaining)
     [ (Right {}) ]
-  - location: 24 (remaining gas: 1039978.407 units remaining)
+  - location: 24 (remaining gas: 1039981.967 units remaining)
     [ (Right {}) ]
-  - location: 17 (remaining gas: 1039978.392 units remaining)
+  - location: 17 (remaining gas: 1039981.957 units remaining)
     [ {} ]
-  - location: 41 (remaining gas: 1039978.377 units remaining)
+  - location: 41 (remaining gas: 1039981.947 units remaining)
     [ {}
       {} ]
-  - location: 43 (remaining gas: 1039978.362 units remaining)
+  - location: 43 (remaining gas: 1039981.937 units remaining)
     [ (Pair {} {}) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_id.tz-{}-{ Elt 0 0 ; Elt 3 4 }-{ Elt 0 0 ; Elt 3 4 }].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_id.tz-{}-{ Elt 0 0 ; Elt 3 4 }-{ Elt 0 0 ; Elt 3 4 }].out
index 0b7d5de7273b8ba507eb07084b3bd9f56095a1be..24d91426a762088e920439d081d3071392aa25c8 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_id.tz-{}-{ Elt 0 0 ; Elt 3 4 }-{ Elt 0 0 ; Elt 3 4 }].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_id.tz-{}-{ Elt 0 0 ; Elt 3 4 }-{ Elt 0 0 ; Elt 3 4 }].out	
@@ -7,13 +7,13 @@ emitted operations
 big_map diff
   
 trace
-  - location: 11 (remaining gas: 1039993.874 units remaining)
+  - location: 11 (remaining gas: 1039994.834 units remaining)
     [ (Pair { Elt 0 0 ; Elt 3 4 } {}) ]
-  - location: 11 (remaining gas: 1039993.864 units remaining)
+  - location: 11 (remaining gas: 1039994.824 units remaining)
     [ { Elt 0 0 ; Elt 3 4 } ]
-  - location: 12 (remaining gas: 1039993.849 units remaining)
+  - location: 12 (remaining gas: 1039994.814 units remaining)
     [ {}
       { Elt 0 0 ; Elt 3 4 } ]
-  - location: 14 (remaining gas: 1039993.834 units remaining)
+  - location: 14 (remaining gas: 1039994.804 units remaining)
     [ (Pair {} { Elt 0 0 ; Elt 3 4 }) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_id.tz-{}-{ Elt 0 0 }-{ Elt 0 0 }].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_id.tz-{}-{ Elt 0 0 }-{ Elt 0 0 }].out
index 58efa01ae02e0fc5a2326848783bcd5f65a7a5e1..1241a8993b2d108fd47ac4c733a642e5c91ec718 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_id.tz-{}-{ Elt 0 0 }-{ Elt 0 0 }].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_id.tz-{}-{ Elt 0 0 }-{ Elt 0 0 }].out	
@@ -7,13 +7,13 @@ emitted operations
 big_map diff
   
 trace
-  - location: 11 (remaining gas: 1039994.189 units remaining)
+  - location: 11 (remaining gas: 1039995.149 units remaining)
     [ (Pair { Elt 0 0 } {}) ]
-  - location: 11 (remaining gas: 1039994.179 units remaining)
+  - location: 11 (remaining gas: 1039995.139 units remaining)
     [ { Elt 0 0 } ]
-  - location: 12 (remaining gas: 1039994.164 units remaining)
+  - location: 12 (remaining gas: 1039995.129 units remaining)
     [ {}
       { Elt 0 0 } ]
-  - location: 14 (remaining gas: 1039994.149 units remaining)
+  - location: 14 (remaining gas: 1039995.119 units remaining)
     [ (Pair {} { Elt 0 0 }) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_id.tz-{}-{ Elt 0 1 }-{ Elt 0 1 }].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_id.tz-{}-{ Elt 0 1 }-{ Elt 0 1 }].out
index fc97ae4ac76e1ce458a71e633017c2fc4959f0aa..030c26b7a3250b3baa7f69d8a6addde8f7804a03 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_id.tz-{}-{ Elt 0 1 }-{ Elt 0 1 }].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_id.tz-{}-{ Elt 0 1 }-{ Elt 0 1 }].out	
@@ -7,13 +7,13 @@ emitted operations
 big_map diff
   
 trace
-  - location: 11 (remaining gas: 1039994.189 units remaining)
+  - location: 11 (remaining gas: 1039995.149 units remaining)
     [ (Pair { Elt 0 1 } {}) ]
-  - location: 11 (remaining gas: 1039994.179 units remaining)
+  - location: 11 (remaining gas: 1039995.139 units remaining)
     [ { Elt 0 1 } ]
-  - location: 12 (remaining gas: 1039994.164 units remaining)
+  - location: 12 (remaining gas: 1039995.129 units remaining)
     [ {}
       { Elt 0 1 } ]
-  - location: 14 (remaining gas: 1039994.149 units remaining)
+  - location: 14 (remaining gas: 1039995.119 units remaining)
     [ (Pair {} { Elt 0 1 }) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_iter.tz-(Pair 0 0)-{ Elt 0 100 ; Elt 2 100 }-(Pair 2 200)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_iter.tz-(Pair 0 0)-{ Elt 0 100 ; Elt 2 100 }-(Pair 2 200)].out
index b12e7e9edc4c2aa46cc80604bd54f6803c261d1a..802a64042c7e4032bac957912b2965fc0e2b1747 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_iter.tz-(Pair 0 0)-{ Elt 0 100 ; Elt 2 100 }-(Pair 2 200)].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_iter.tz-(Pair 0 0)-{ Elt 0 100 ; Elt 2 100 }-(Pair 2 200)].out	
@@ -7,146 +7,146 @@ emitted operations
 big_map diff
   
 trace
-  - location: 11 (remaining gas: 1039978.684 units remaining)
+  - location: 11 (remaining gas: 1039980.124 units remaining)
     [ (Pair { Elt 0 100 ; Elt 2 100 } 0 0) ]
-  - location: 11 (remaining gas: 1039978.674 units remaining)
+  - location: 11 (remaining gas: 1039980.114 units remaining)
     [ { Elt 0 100 ; Elt 2 100 } ]
-  - location: 12 (remaining gas: 1039978.664 units remaining)
+  - location: 12 (remaining gas: 1039980.104 units remaining)
     [ 0
       { Elt 0 100 ; Elt 2 100 } ]
-  - location: 15 (remaining gas: 1039978.654 units remaining)
+  - location: 15 (remaining gas: 1039980.094 units remaining)
     [ 0
       0
       { Elt 0 100 ; Elt 2 100 } ]
-  - location: 18 (remaining gas: 1039978.639 units remaining)
+  - location: 18 (remaining gas: 1039980.084 units remaining)
     [ (Pair 0 0)
       { Elt 0 100 ; Elt 2 100 } ]
-  - location: 19 (remaining gas: 1039978.629 units remaining)
+  - location: 19 (remaining gas: 1039980.074 units remaining)
     [ { Elt 0 100 ; Elt 2 100 }
       (Pair 0 0) ]
-  - location: 20 (remaining gas: 1039978.629 units remaining)
+  - location: 20 (remaining gas: 1039980.074 units remaining)
     [ (Pair 0 100)
       (Pair 0 0) ]
-  - location: 22 (remaining gas: 1039978.614 units remaining)
+  - location: 22 (remaining gas: 1039980.064 units remaining)
     [ (Pair 0 0) ]
-  - location: 24 (remaining gas: 1039978.604 units remaining)
+  - location: 24 (remaining gas: 1039980.054 units remaining)
     [ (Pair 0 0)
       (Pair 0 0) ]
-  - location: 25 (remaining gas: 1039978.594 units remaining)
+  - location: 25 (remaining gas: 1039980.044 units remaining)
     [ 0
       (Pair 0 0) ]
-  - location: 26 (remaining gas: 1039978.579 units remaining)
+  - location: 26 (remaining gas: 1039980.034 units remaining)
     [ (Pair 0 0) ]
-  - location: 28 (remaining gas: 1039978.569 units remaining)
+  - location: 28 (remaining gas: 1039980.024 units remaining)
     [ 0 ]
-  - location: 26 (remaining gas: 1039978.539 units remaining)
+  - location: 26 (remaining gas: 1039980.004 units remaining)
     [ 0
       0 ]
-  - location: 22 (remaining gas: 1039978.509 units remaining)
+  - location: 22 (remaining gas: 1039979.984 units remaining)
     [ (Pair 0 100)
       0
       0 ]
-  - location: 29 (remaining gas: 1039978.499 units remaining)
+  - location: 29 (remaining gas: 1039979.974 units remaining)
     [ (Pair 0 100)
       (Pair 0 100)
       0
       0 ]
-  - location: 30 (remaining gas: 1039978.484 units remaining)
+  - location: 30 (remaining gas: 1039979.964 units remaining)
     [ (Pair 0 100)
       0
       0 ]
-  - location: 32 (remaining gas: 1039978.474 units remaining)
+  - location: 32 (remaining gas: 1039979.954 units remaining)
     [ 0
       0
       0 ]
-  - location: 33 (remaining gas: 1039978.419 units remaining)
+  - location: 33 (remaining gas: 1039979.919 units remaining)
     [ 0
       0 ]
-  - location: 30 (remaining gas: 1039978.389 units remaining)
+  - location: 30 (remaining gas: 1039979.899 units remaining)
     [ (Pair 0 100)
       0
       0 ]
-  - location: 34 (remaining gas: 1039978.379 units remaining)
+  - location: 34 (remaining gas: 1039979.889 units remaining)
     [ 0
       (Pair 0 100)
       0 ]
-  - location: 35 (remaining gas: 1039978.364 units remaining)
+  - location: 35 (remaining gas: 1039979.879 units remaining)
     [ (Pair 0 100)
       0 ]
-  - location: 37 (remaining gas: 1039978.354 units remaining)
+  - location: 37 (remaining gas: 1039979.869 units remaining)
     [ 100
       0 ]
-  - location: 38 (remaining gas: 1039978.299 units remaining)
+  - location: 38 (remaining gas: 1039979.834 units remaining)
     [ 100 ]
-  - location: 35 (remaining gas: 1039978.269 units remaining)
+  - location: 35 (remaining gas: 1039979.814 units remaining)
     [ 0
       100 ]
-  - location: 39 (remaining gas: 1039978.254 units remaining)
+  - location: 39 (remaining gas: 1039979.804 units remaining)
     [ (Pair 0 100) ]
-  - location: 20 (remaining gas: 1039978.239 units remaining)
+  - location: 20 (remaining gas: 1039979.794 units remaining)
     [ (Pair 2 100)
       (Pair 0 100) ]
-  - location: 22 (remaining gas: 1039978.224 units remaining)
+  - location: 22 (remaining gas: 1039979.784 units remaining)
     [ (Pair 0 100) ]
-  - location: 24 (remaining gas: 1039978.214 units remaining)
+  - location: 24 (remaining gas: 1039979.774 units remaining)
     [ (Pair 0 100)
       (Pair 0 100) ]
-  - location: 25 (remaining gas: 1039978.204 units remaining)
+  - location: 25 (remaining gas: 1039979.764 units remaining)
     [ 0
       (Pair 0 100) ]
-  - location: 26 (remaining gas: 1039978.189 units remaining)
+  - location: 26 (remaining gas: 1039979.754 units remaining)
     [ (Pair 0 100) ]
-  - location: 28 (remaining gas: 1039978.179 units remaining)
+  - location: 28 (remaining gas: 1039979.744 units remaining)
     [ 100 ]
-  - location: 26 (remaining gas: 1039978.149 units remaining)
+  - location: 26 (remaining gas: 1039979.724 units remaining)
     [ 0
       100 ]
-  - location: 22 (remaining gas: 1039978.119 units remaining)
+  - location: 22 (remaining gas: 1039979.704 units remaining)
     [ (Pair 2 100)
       0
       100 ]
-  - location: 29 (remaining gas: 1039978.109 units remaining)
+  - location: 29 (remaining gas: 1039979.694 units remaining)
     [ (Pair 2 100)
       (Pair 2 100)
       0
       100 ]
-  - location: 30 (remaining gas: 1039978.094 units remaining)
+  - location: 30 (remaining gas: 1039979.684 units remaining)
     [ (Pair 2 100)
       0
       100 ]
-  - location: 32 (remaining gas: 1039978.084 units remaining)
+  - location: 32 (remaining gas: 1039979.674 units remaining)
     [ 2
       0
       100 ]
-  - location: 33 (remaining gas: 1039978.029 units remaining)
+  - location: 33 (remaining gas: 1039979.639 units remaining)
     [ 2
       100 ]
-  - location: 30 (remaining gas: 1039977.999 units remaining)
+  - location: 30 (remaining gas: 1039979.619 units remaining)
     [ (Pair 2 100)
       2
       100 ]
-  - location: 34 (remaining gas: 1039977.989 units remaining)
+  - location: 34 (remaining gas: 1039979.609 units remaining)
     [ 2
       (Pair 2 100)
       100 ]
-  - location: 35 (remaining gas: 1039977.974 units remaining)
+  - location: 35 (remaining gas: 1039979.599 units remaining)
     [ (Pair 2 100)
       100 ]
-  - location: 37 (remaining gas: 1039977.964 units remaining)
+  - location: 37 (remaining gas: 1039979.589 units remaining)
     [ 100
       100 ]
-  - location: 38 (remaining gas: 1039977.909 units remaining)
+  - location: 38 (remaining gas: 1039979.554 units remaining)
     [ 200 ]
-  - location: 35 (remaining gas: 1039977.879 units remaining)
+  - location: 35 (remaining gas: 1039979.534 units remaining)
     [ 2
       200 ]
-  - location: 39 (remaining gas: 1039977.864 units remaining)
+  - location: 39 (remaining gas: 1039979.524 units remaining)
     [ (Pair 2 200) ]
-  - location: 20 (remaining gas: 1039977.849 units remaining)
+  - location: 20 (remaining gas: 1039979.514 units remaining)
     [ (Pair 2 200) ]
-  - location: 40 (remaining gas: 1039977.834 units remaining)
+  - location: 40 (remaining gas: 1039979.504 units remaining)
     [ {}
       (Pair 2 200) ]
-  - location: 42 (remaining gas: 1039977.819 units remaining)
+  - location: 42 (remaining gas: 1039979.494 units remaining)
     [ (Pair {} 2 200) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_iter.tz-(Pair 0 0)-{ Elt 1 1 ; Elt 2 100 }-(Pair 3 101)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_iter.tz-(Pair 0 0)-{ Elt 1 1 ; Elt 2 100 }-(Pair 3 101)].out
index adf09e43f4f3cb062a56efd3399f9517cf54d0b2..645cbfa6bba55abe68f0529782460b3b90629092 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_iter.tz-(Pair 0 0)-{ Elt 1 1 ; Elt 2 100 }-(Pair 3 101)].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_iter.tz-(Pair 0 0)-{ Elt 1 1 ; Elt 2 100 }-(Pair 3 101)].out	
@@ -7,146 +7,146 @@ emitted operations
 big_map diff
   
 trace
-  - location: 11 (remaining gas: 1039978.684 units remaining)
+  - location: 11 (remaining gas: 1039980.124 units remaining)
     [ (Pair { Elt 1 1 ; Elt 2 100 } 0 0) ]
-  - location: 11 (remaining gas: 1039978.674 units remaining)
+  - location: 11 (remaining gas: 1039980.114 units remaining)
     [ { Elt 1 1 ; Elt 2 100 } ]
-  - location: 12 (remaining gas: 1039978.664 units remaining)
+  - location: 12 (remaining gas: 1039980.104 units remaining)
     [ 0
       { Elt 1 1 ; Elt 2 100 } ]
-  - location: 15 (remaining gas: 1039978.654 units remaining)
+  - location: 15 (remaining gas: 1039980.094 units remaining)
     [ 0
       0
       { Elt 1 1 ; Elt 2 100 } ]
-  - location: 18 (remaining gas: 1039978.639 units remaining)
+  - location: 18 (remaining gas: 1039980.084 units remaining)
     [ (Pair 0 0)
       { Elt 1 1 ; Elt 2 100 } ]
-  - location: 19 (remaining gas: 1039978.629 units remaining)
+  - location: 19 (remaining gas: 1039980.074 units remaining)
     [ { Elt 1 1 ; Elt 2 100 }
       (Pair 0 0) ]
-  - location: 20 (remaining gas: 1039978.629 units remaining)
+  - location: 20 (remaining gas: 1039980.074 units remaining)
     [ (Pair 1 1)
       (Pair 0 0) ]
-  - location: 22 (remaining gas: 1039978.614 units remaining)
+  - location: 22 (remaining gas: 1039980.064 units remaining)
     [ (Pair 0 0) ]
-  - location: 24 (remaining gas: 1039978.604 units remaining)
+  - location: 24 (remaining gas: 1039980.054 units remaining)
     [ (Pair 0 0)
       (Pair 0 0) ]
-  - location: 25 (remaining gas: 1039978.594 units remaining)
+  - location: 25 (remaining gas: 1039980.044 units remaining)
     [ 0
       (Pair 0 0) ]
-  - location: 26 (remaining gas: 1039978.579 units remaining)
+  - location: 26 (remaining gas: 1039980.034 units remaining)
     [ (Pair 0 0) ]
-  - location: 28 (remaining gas: 1039978.569 units remaining)
+  - location: 28 (remaining gas: 1039980.024 units remaining)
     [ 0 ]
-  - location: 26 (remaining gas: 1039978.539 units remaining)
+  - location: 26 (remaining gas: 1039980.004 units remaining)
     [ 0
       0 ]
-  - location: 22 (remaining gas: 1039978.509 units remaining)
+  - location: 22 (remaining gas: 1039979.984 units remaining)
     [ (Pair 1 1)
       0
       0 ]
-  - location: 29 (remaining gas: 1039978.499 units remaining)
+  - location: 29 (remaining gas: 1039979.974 units remaining)
     [ (Pair 1 1)
       (Pair 1 1)
       0
       0 ]
-  - location: 30 (remaining gas: 1039978.484 units remaining)
+  - location: 30 (remaining gas: 1039979.964 units remaining)
     [ (Pair 1 1)
       0
       0 ]
-  - location: 32 (remaining gas: 1039978.474 units remaining)
+  - location: 32 (remaining gas: 1039979.954 units remaining)
     [ 1
       0
       0 ]
-  - location: 33 (remaining gas: 1039978.419 units remaining)
+  - location: 33 (remaining gas: 1039979.919 units remaining)
     [ 1
       0 ]
-  - location: 30 (remaining gas: 1039978.389 units remaining)
+  - location: 30 (remaining gas: 1039979.899 units remaining)
     [ (Pair 1 1)
       1
       0 ]
-  - location: 34 (remaining gas: 1039978.379 units remaining)
+  - location: 34 (remaining gas: 1039979.889 units remaining)
     [ 1
       (Pair 1 1)
       0 ]
-  - location: 35 (remaining gas: 1039978.364 units remaining)
+  - location: 35 (remaining gas: 1039979.879 units remaining)
     [ (Pair 1 1)
       0 ]
-  - location: 37 (remaining gas: 1039978.354 units remaining)
+  - location: 37 (remaining gas: 1039979.869 units remaining)
     [ 1
       0 ]
-  - location: 38 (remaining gas: 1039978.299 units remaining)
+  - location: 38 (remaining gas: 1039979.834 units remaining)
     [ 1 ]
-  - location: 35 (remaining gas: 1039978.269 units remaining)
+  - location: 35 (remaining gas: 1039979.814 units remaining)
     [ 1
       1 ]
-  - location: 39 (remaining gas: 1039978.254 units remaining)
+  - location: 39 (remaining gas: 1039979.804 units remaining)
     [ (Pair 1 1) ]
-  - location: 20 (remaining gas: 1039978.239 units remaining)
+  - location: 20 (remaining gas: 1039979.794 units remaining)
     [ (Pair 2 100)
       (Pair 1 1) ]
-  - location: 22 (remaining gas: 1039978.224 units remaining)
+  - location: 22 (remaining gas: 1039979.784 units remaining)
     [ (Pair 1 1) ]
-  - location: 24 (remaining gas: 1039978.214 units remaining)
+  - location: 24 (remaining gas: 1039979.774 units remaining)
     [ (Pair 1 1)
       (Pair 1 1) ]
-  - location: 25 (remaining gas: 1039978.204 units remaining)
+  - location: 25 (remaining gas: 1039979.764 units remaining)
     [ 1
       (Pair 1 1) ]
-  - location: 26 (remaining gas: 1039978.189 units remaining)
+  - location: 26 (remaining gas: 1039979.754 units remaining)
     [ (Pair 1 1) ]
-  - location: 28 (remaining gas: 1039978.179 units remaining)
+  - location: 28 (remaining gas: 1039979.744 units remaining)
     [ 1 ]
-  - location: 26 (remaining gas: 1039978.149 units remaining)
+  - location: 26 (remaining gas: 1039979.724 units remaining)
     [ 1
       1 ]
-  - location: 22 (remaining gas: 1039978.119 units remaining)
+  - location: 22 (remaining gas: 1039979.704 units remaining)
     [ (Pair 2 100)
       1
       1 ]
-  - location: 29 (remaining gas: 1039978.109 units remaining)
+  - location: 29 (remaining gas: 1039979.694 units remaining)
     [ (Pair 2 100)
       (Pair 2 100)
       1
       1 ]
-  - location: 30 (remaining gas: 1039978.094 units remaining)
+  - location: 30 (remaining gas: 1039979.684 units remaining)
     [ (Pair 2 100)
       1
       1 ]
-  - location: 32 (remaining gas: 1039978.084 units remaining)
+  - location: 32 (remaining gas: 1039979.674 units remaining)
     [ 2
       1
       1 ]
-  - location: 33 (remaining gas: 1039978.029 units remaining)
+  - location: 33 (remaining gas: 1039979.639 units remaining)
     [ 3
       1 ]
-  - location: 30 (remaining gas: 1039977.999 units remaining)
+  - location: 30 (remaining gas: 1039979.619 units remaining)
     [ (Pair 2 100)
       3
       1 ]
-  - location: 34 (remaining gas: 1039977.989 units remaining)
+  - location: 34 (remaining gas: 1039979.609 units remaining)
     [ 3
       (Pair 2 100)
       1 ]
-  - location: 35 (remaining gas: 1039977.974 units remaining)
+  - location: 35 (remaining gas: 1039979.599 units remaining)
     [ (Pair 2 100)
       1 ]
-  - location: 37 (remaining gas: 1039977.964 units remaining)
+  - location: 37 (remaining gas: 1039979.589 units remaining)
     [ 100
       1 ]
-  - location: 38 (remaining gas: 1039977.909 units remaining)
+  - location: 38 (remaining gas: 1039979.554 units remaining)
     [ 101 ]
-  - location: 35 (remaining gas: 1039977.879 units remaining)
+  - location: 35 (remaining gas: 1039979.534 units remaining)
     [ 3
       101 ]
-  - location: 39 (remaining gas: 1039977.864 units remaining)
+  - location: 39 (remaining gas: 1039979.524 units remaining)
     [ (Pair 3 101) ]
-  - location: 20 (remaining gas: 1039977.849 units remaining)
+  - location: 20 (remaining gas: 1039979.514 units remaining)
     [ (Pair 3 101) ]
-  - location: 40 (remaining gas: 1039977.834 units remaining)
+  - location: 40 (remaining gas: 1039979.504 units remaining)
     [ {}
       (Pair 3 101) ]
-  - location: 42 (remaining gas: 1039977.819 units remaining)
+  - location: 42 (remaining gas: 1039979.494 units remaining)
     [ (Pair {} 3 101) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_map.tz-{ Elt \"bar\" 5 ; Elt \"foo\" 1 }-15-{ Elt \"bar\".12b9d73d5a.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_map.tz-{ Elt \"bar\" 5 ; Elt \"foo\" 1 }-15-{ Elt \"bar\".12b9d73d5a.out"
index c98bbb1f73e55c2c230d87c2e761748283307551..dee8dc59a271beafc546e0d34e30fe7d06d5c6ba 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_map.tz-{ Elt \"bar\" 5 ; Elt \"foo\" 1 }-15-{ Elt \"bar\".12b9d73d5a.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_map.tz-{ Elt \"bar\" 5 ; Elt \"foo\" 1 }-15-{ Elt \"bar\".12b9d73d5a.out"	
@@ -7,62 +7,62 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (remaining gas: 1039988.198 units remaining)
+  - location: 9 (remaining gas: 1039989.318 units remaining)
     [ (Pair 15 { Elt "bar" 5 ; Elt "foo" 1 }) ]
-  - location: 9 (remaining gas: 1039988.188 units remaining)
+  - location: 9 (remaining gas: 1039989.308 units remaining)
     [ 15
       { Elt "bar" 5 ; Elt "foo" 1 } ]
-  - location: 10 (remaining gas: 1039988.178 units remaining)
+  - location: 10 (remaining gas: 1039989.298 units remaining)
     [ { Elt "bar" 5 ; Elt "foo" 1 }
       15 ]
-  - location: 11 (remaining gas: 1039988.178 units remaining)
+  - location: 11 (remaining gas: 1039989.298 units remaining)
     [ (Pair "bar" 5)
       15 ]
-  - location: 13 (remaining gas: 1039988.168 units remaining)
+  - location: 13 (remaining gas: 1039989.288 units remaining)
     [ 5
       15 ]
-  - location: 14 (remaining gas: 1039988.153 units remaining)
+  - location: 14 (remaining gas: 1039989.278 units remaining)
     [ 15 ]
-  - location: 16 (remaining gas: 1039988.143 units remaining)
+  - location: 16 (remaining gas: 1039989.268 units remaining)
     [ 15
       15 ]
-  - location: 14 (remaining gas: 1039988.113 units remaining)
+  - location: 14 (remaining gas: 1039989.248 units remaining)
     [ 5
       15
       15 ]
-  - location: 17 (remaining gas: 1039988.058 units remaining)
+  - location: 17 (remaining gas: 1039989.213 units remaining)
     [ 20
       15 ]
-  - location: 11 (remaining gas: 1039988.043 units remaining)
+  - location: 11 (remaining gas: 1039989.203 units remaining)
     [ (Pair "foo" 1)
       15 ]
-  - location: 13 (remaining gas: 1039988.033 units remaining)
+  - location: 13 (remaining gas: 1039989.193 units remaining)
     [ 1
       15 ]
-  - location: 14 (remaining gas: 1039988.018 units remaining)
+  - location: 14 (remaining gas: 1039989.183 units remaining)
     [ 15 ]
-  - location: 16 (remaining gas: 1039988.008 units remaining)
+  - location: 16 (remaining gas: 1039989.173 units remaining)
     [ 15
       15 ]
-  - location: 14 (remaining gas: 1039987.978 units remaining)
+  - location: 14 (remaining gas: 1039989.153 units remaining)
     [ 1
       15
       15 ]
-  - location: 17 (remaining gas: 1039987.923 units remaining)
+  - location: 17 (remaining gas: 1039989.118 units remaining)
     [ 16
       15 ]
-  - location: 11 (remaining gas: 1039987.908 units remaining)
+  - location: 11 (remaining gas: 1039989.108 units remaining)
     [ { Elt "bar" 20 ; Elt "foo" 16 }
       15 ]
-  - location: 18 (remaining gas: 1039987.893 units remaining)
+  - location: 18 (remaining gas: 1039989.098 units remaining)
     [ 15 ]
-  - location: 20 (remaining gas: 1039987.883 units remaining)
+  - location: 20 (remaining gas: 1039989.088 units remaining)
     [  ]
-  - location: 18 (remaining gas: 1039987.853 units remaining)
+  - location: 18 (remaining gas: 1039989.068 units remaining)
     [ { Elt "bar" 20 ; Elt "foo" 16 } ]
-  - location: 21 (remaining gas: 1039987.838 units remaining)
+  - location: 21 (remaining gas: 1039989.058 units remaining)
     [ {}
       { Elt "bar" 20 ; Elt "foo" 16 } ]
-  - location: 23 (remaining gas: 1039987.823 units remaining)
+  - location: 23 (remaining gas: 1039989.048 units remaining)
     [ (Pair {} { Elt "bar" 20 ; Elt "foo" 16 }) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_map.tz-{ Elt \"foo\" 1 }-10-{ Elt \"foo\" 11 }].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_map.tz-{ Elt \"foo\" 1 }-10-{ Elt \"foo\" 11 }].out"
index 81ce1603cd6fb8d56a217a44df09dbe4ddb6c613..78d431164c61d43345726a9a84cda346ff426776 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_map.tz-{ Elt \"foo\" 1 }-10-{ Elt \"foo\" 11 }].out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_map.tz-{ Elt \"foo\" 1 }-10-{ Elt \"foo\" 11 }].out"	
@@ -7,44 +7,44 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (remaining gas: 1039988.569 units remaining)
+  - location: 9 (remaining gas: 1039989.689 units remaining)
     [ (Pair 10 { Elt "foo" 1 }) ]
-  - location: 9 (remaining gas: 1039988.559 units remaining)
+  - location: 9 (remaining gas: 1039989.679 units remaining)
     [ 10
       { Elt "foo" 1 } ]
-  - location: 10 (remaining gas: 1039988.549 units remaining)
+  - location: 10 (remaining gas: 1039989.669 units remaining)
     [ { Elt "foo" 1 }
       10 ]
-  - location: 11 (remaining gas: 1039988.549 units remaining)
+  - location: 11 (remaining gas: 1039989.669 units remaining)
     [ (Pair "foo" 1)
       10 ]
-  - location: 13 (remaining gas: 1039988.539 units remaining)
+  - location: 13 (remaining gas: 1039989.659 units remaining)
     [ 1
       10 ]
-  - location: 14 (remaining gas: 1039988.524 units remaining)
+  - location: 14 (remaining gas: 1039989.649 units remaining)
     [ 10 ]
-  - location: 16 (remaining gas: 1039988.514 units remaining)
+  - location: 16 (remaining gas: 1039989.639 units remaining)
     [ 10
       10 ]
-  - location: 14 (remaining gas: 1039988.484 units remaining)
+  - location: 14 (remaining gas: 1039989.619 units remaining)
     [ 1
       10
       10 ]
-  - location: 17 (remaining gas: 1039988.429 units remaining)
+  - location: 17 (remaining gas: 1039989.584 units remaining)
     [ 11
       10 ]
-  - location: 11 (remaining gas: 1039988.414 units remaining)
+  - location: 11 (remaining gas: 1039989.574 units remaining)
     [ { Elt "foo" 11 }
       10 ]
-  - location: 18 (remaining gas: 1039988.399 units remaining)
+  - location: 18 (remaining gas: 1039989.564 units remaining)
     [ 10 ]
-  - location: 20 (remaining gas: 1039988.389 units remaining)
+  - location: 20 (remaining gas: 1039989.554 units remaining)
     [  ]
-  - location: 18 (remaining gas: 1039988.359 units remaining)
+  - location: 18 (remaining gas: 1039989.534 units remaining)
     [ { Elt "foo" 11 } ]
-  - location: 21 (remaining gas: 1039988.344 units remaining)
+  - location: 21 (remaining gas: 1039989.524 units remaining)
     [ {}
       { Elt "foo" 11 } ]
-  - location: 23 (remaining gas: 1039988.329 units remaining)
+  - location: 23 (remaining gas: 1039989.514 units remaining)
     [ (Pair {} { Elt "foo" 11 }) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_map.tz-{}-10-{}].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_map.tz-{}-10-{}].out
index 9a6196b356c01a8e91497c28d6ea0fb04d214a7f..5a9fc6c62e4d9e060ff8cd019bcd148122e4d86f 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_map.tz-{}-10-{}].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_map.tz-{}-10-{}].out
@@ -7,26 +7,26 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (remaining gas: 1039988.899 units remaining)
+  - location: 9 (remaining gas: 1039990.019 units remaining)
     [ (Pair 10 {}) ]
-  - location: 9 (remaining gas: 1039988.889 units remaining)
+  - location: 9 (remaining gas: 1039990.009 units remaining)
     [ 10
       {} ]
-  - location: 10 (remaining gas: 1039988.879 units remaining)
+  - location: 10 (remaining gas: 1039989.999 units remaining)
     [ {}
       10 ]
-  - location: 11 (remaining gas: 1039988.879 units remaining)
+  - location: 11 (remaining gas: 1039989.999 units remaining)
     [ {}
       10 ]
-  - location: 18 (remaining gas: 1039988.864 units remaining)
+  - location: 18 (remaining gas: 1039989.989 units remaining)
     [ 10 ]
-  - location: 20 (remaining gas: 1039988.854 units remaining)
+  - location: 20 (remaining gas: 1039989.979 units remaining)
     [  ]
-  - location: 18 (remaining gas: 1039988.824 units remaining)
+  - location: 18 (remaining gas: 1039989.959 units remaining)
     [ {} ]
-  - location: 21 (remaining gas: 1039988.809 units remaining)
+  - location: 21 (remaining gas: 1039989.949 units remaining)
     [ {}
       {} ]
-  - location: 23 (remaining gas: 1039988.794 units remaining)
+  - location: 23 (remaining gas: 1039989.939 units remaining)
     [ (Pair {} {}) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 0 1 } None)-1-(Pair { Elt 0 .7396e5f090.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 0 1 } None)-1-(Pair { Elt 0 .7396e5f090.out
index 7d5ed86e98b1a143a9c143aa9d78480eda8e7821..52f96d51b6c004f809f91e93760f9e37d55e1087 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 0 1 } None)-1-(Pair { Elt 0 .7396e5f090.out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 0 1 } None)-1-(Pair { Elt 0 .7396e5f090.out	
@@ -7,36 +7,36 @@ emitted operations
 big_map diff
   
 trace
-  - location: 12 (remaining gas: 1039988.189 units remaining)
+  - location: 12 (remaining gas: 1039989.789 units remaining)
     [ (Pair 1 { Elt 0 1 } None) ]
-  - location: 12 (remaining gas: 1039988.179 units remaining)
+  - location: 12 (remaining gas: 1039989.779 units remaining)
     [ 1
       (Pair { Elt 0 1 } None) ]
-  - location: 13 (remaining gas: 1039988.164 units remaining)
+  - location: 13 (remaining gas: 1039989.769 units remaining)
     [ (Pair { Elt 0 1 } None) ]
-  - location: 15 (remaining gas: 1039988.154 units remaining)
+  - location: 15 (remaining gas: 1039989.759 units remaining)
     [ { Elt 0 1 } ]
-  - location: 16 (remaining gas: 1039988.144 units remaining)
+  - location: 16 (remaining gas: 1039989.749 units remaining)
     [ { Elt 0 1 }
       { Elt 0 1 } ]
-  - location: 13 (remaining gas: 1039988.114 units remaining)
+  - location: 13 (remaining gas: 1039989.729 units remaining)
     [ 1
       { Elt 0 1 }
       { Elt 0 1 } ]
-  - location: 17 (remaining gas: 1039988.034 units remaining)
+  - location: 17 (remaining gas: 1039989.649 units remaining)
     [ False
       { Elt 0 1 } ]
-  - location: 18 (remaining gas: 1039988.019 units remaining)
+  - location: 18 (remaining gas: 1039989.639 units remaining)
     [ (Some False)
       { Elt 0 1 } ]
-  - location: 19 (remaining gas: 1039988.009 units remaining)
+  - location: 19 (remaining gas: 1039989.629 units remaining)
     [ { Elt 0 1 }
       (Some False) ]
-  - location: 20 (remaining gas: 1039987.994 units remaining)
+  - location: 20 (remaining gas: 1039989.619 units remaining)
     [ (Pair { Elt 0 1 } (Some False)) ]
-  - location: 21 (remaining gas: 1039987.979 units remaining)
+  - location: 21 (remaining gas: 1039989.609 units remaining)
     [ {}
       (Pair { Elt 0 1 } (Some False)) ]
-  - location: 23 (remaining gas: 1039987.964 units remaining)
+  - location: 23 (remaining gas: 1039989.599 units remaining)
     [ (Pair {} { Elt 0 1 } (Some False)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 1 0 } None)-1-(Pair { Elt 1 .cef8ce601a.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 1 0 } None)-1-(Pair { Elt 1 .cef8ce601a.out
index cbacdad1f97ae352175603691d8d092498f79ef7..5dd4c9482c2eaa4361f5b643d17011811e044e83 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 1 0 } None)-1-(Pair { Elt 1 .cef8ce601a.out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 1 0 } None)-1-(Pair { Elt 1 .cef8ce601a.out	
@@ -7,36 +7,36 @@ emitted operations
 big_map diff
   
 trace
-  - location: 12 (remaining gas: 1039988.189 units remaining)
+  - location: 12 (remaining gas: 1039989.789 units remaining)
     [ (Pair 1 { Elt 1 0 } None) ]
-  - location: 12 (remaining gas: 1039988.179 units remaining)
+  - location: 12 (remaining gas: 1039989.779 units remaining)
     [ 1
       (Pair { Elt 1 0 } None) ]
-  - location: 13 (remaining gas: 1039988.164 units remaining)
+  - location: 13 (remaining gas: 1039989.769 units remaining)
     [ (Pair { Elt 1 0 } None) ]
-  - location: 15 (remaining gas: 1039988.154 units remaining)
+  - location: 15 (remaining gas: 1039989.759 units remaining)
     [ { Elt 1 0 } ]
-  - location: 16 (remaining gas: 1039988.144 units remaining)
+  - location: 16 (remaining gas: 1039989.749 units remaining)
     [ { Elt 1 0 }
       { Elt 1 0 } ]
-  - location: 13 (remaining gas: 1039988.114 units remaining)
+  - location: 13 (remaining gas: 1039989.729 units remaining)
     [ 1
       { Elt 1 0 }
       { Elt 1 0 } ]
-  - location: 17 (remaining gas: 1039988.034 units remaining)
+  - location: 17 (remaining gas: 1039989.649 units remaining)
     [ True
       { Elt 1 0 } ]
-  - location: 18 (remaining gas: 1039988.019 units remaining)
+  - location: 18 (remaining gas: 1039989.639 units remaining)
     [ (Some True)
       { Elt 1 0 } ]
-  - location: 19 (remaining gas: 1039988.009 units remaining)
+  - location: 19 (remaining gas: 1039989.629 units remaining)
     [ { Elt 1 0 }
       (Some True) ]
-  - location: 20 (remaining gas: 1039987.994 units remaining)
+  - location: 20 (remaining gas: 1039989.619 units remaining)
     [ (Pair { Elt 1 0 } (Some True)) ]
-  - location: 21 (remaining gas: 1039987.979 units remaining)
+  - location: 21 (remaining gas: 1039989.609 units remaining)
     [ {}
       (Pair { Elt 1 0 } (Some True)) ]
-  - location: 23 (remaining gas: 1039987.964 units remaining)
+  - location: 23 (remaining gas: 1039989.599 units remaining)
     [ (Pair {} { Elt 1 0 } (Some True)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-1-(Pa.1a55a5bfa5.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-1-(Pa.1a55a5bfa5.out
index da441ba37fc4f4ee79bad0752d68423e7319d900..7dd53b0ab7115614c40f5146275dafd907801111 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-1-(Pa.1a55a5bfa5.out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-1-(Pa.1a55a5bfa5.out	
@@ -7,36 +7,36 @@ emitted operations
 big_map diff
   
 trace
-  - location: 12 (remaining gas: 1039987.874 units remaining)
+  - location: 12 (remaining gas: 1039989.474 units remaining)
     [ (Pair 1 { Elt 1 4 ; Elt 2 11 } None) ]
-  - location: 12 (remaining gas: 1039987.864 units remaining)
+  - location: 12 (remaining gas: 1039989.464 units remaining)
     [ 1
       (Pair { Elt 1 4 ; Elt 2 11 } None) ]
-  - location: 13 (remaining gas: 1039987.849 units remaining)
+  - location: 13 (remaining gas: 1039989.454 units remaining)
     [ (Pair { Elt 1 4 ; Elt 2 11 } None) ]
-  - location: 15 (remaining gas: 1039987.839 units remaining)
+  - location: 15 (remaining gas: 1039989.444 units remaining)
     [ { Elt 1 4 ; Elt 2 11 } ]
-  - location: 16 (remaining gas: 1039987.829 units remaining)
+  - location: 16 (remaining gas: 1039989.434 units remaining)
     [ { Elt 1 4 ; Elt 2 11 }
       { Elt 1 4 ; Elt 2 11 } ]
-  - location: 13 (remaining gas: 1039987.799 units remaining)
+  - location: 13 (remaining gas: 1039989.414 units remaining)
     [ 1
       { Elt 1 4 ; Elt 2 11 }
       { Elt 1 4 ; Elt 2 11 } ]
-  - location: 17 (remaining gas: 1039987.719 units remaining)
+  - location: 17 (remaining gas: 1039989.334 units remaining)
     [ True
       { Elt 1 4 ; Elt 2 11 } ]
-  - location: 18 (remaining gas: 1039987.704 units remaining)
+  - location: 18 (remaining gas: 1039989.324 units remaining)
     [ (Some True)
       { Elt 1 4 ; Elt 2 11 } ]
-  - location: 19 (remaining gas: 1039987.694 units remaining)
+  - location: 19 (remaining gas: 1039989.314 units remaining)
     [ { Elt 1 4 ; Elt 2 11 }
       (Some True) ]
-  - location: 20 (remaining gas: 1039987.679 units remaining)
+  - location: 20 (remaining gas: 1039989.304 units remaining)
     [ (Pair { Elt 1 4 ; Elt 2 11 } (Some True)) ]
-  - location: 21 (remaining gas: 1039987.664 units remaining)
+  - location: 21 (remaining gas: 1039989.294 units remaining)
     [ {}
       (Pair { Elt 1 4 ; Elt 2 11 } (Some True)) ]
-  - location: 23 (remaining gas: 1039987.649 units remaining)
+  - location: 23 (remaining gas: 1039989.284 units remaining)
     [ (Pair {} { Elt 1 4 ; Elt 2 11 } (Some True)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-2-(Pa.89cc24d256.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-2-(Pa.89cc24d256.out
index ef08e927de4be510bc66799d4d72f677765d9292..de6c5f2e573977be610041dac65efc203565ff4e 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-2-(Pa.89cc24d256.out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-2-(Pa.89cc24d256.out	
@@ -7,36 +7,36 @@ emitted operations
 big_map diff
   
 trace
-  - location: 12 (remaining gas: 1039987.874 units remaining)
+  - location: 12 (remaining gas: 1039989.474 units remaining)
     [ (Pair 2 { Elt 1 4 ; Elt 2 11 } None) ]
-  - location: 12 (remaining gas: 1039987.864 units remaining)
+  - location: 12 (remaining gas: 1039989.464 units remaining)
     [ 2
       (Pair { Elt 1 4 ; Elt 2 11 } None) ]
-  - location: 13 (remaining gas: 1039987.849 units remaining)
+  - location: 13 (remaining gas: 1039989.454 units remaining)
     [ (Pair { Elt 1 4 ; Elt 2 11 } None) ]
-  - location: 15 (remaining gas: 1039987.839 units remaining)
+  - location: 15 (remaining gas: 1039989.444 units remaining)
     [ { Elt 1 4 ; Elt 2 11 } ]
-  - location: 16 (remaining gas: 1039987.829 units remaining)
+  - location: 16 (remaining gas: 1039989.434 units remaining)
     [ { Elt 1 4 ; Elt 2 11 }
       { Elt 1 4 ; Elt 2 11 } ]
-  - location: 13 (remaining gas: 1039987.799 units remaining)
+  - location: 13 (remaining gas: 1039989.414 units remaining)
     [ 2
       { Elt 1 4 ; Elt 2 11 }
       { Elt 1 4 ; Elt 2 11 } ]
-  - location: 17 (remaining gas: 1039987.719 units remaining)
+  - location: 17 (remaining gas: 1039989.334 units remaining)
     [ True
       { Elt 1 4 ; Elt 2 11 } ]
-  - location: 18 (remaining gas: 1039987.704 units remaining)
+  - location: 18 (remaining gas: 1039989.324 units remaining)
     [ (Some True)
       { Elt 1 4 ; Elt 2 11 } ]
-  - location: 19 (remaining gas: 1039987.694 units remaining)
+  - location: 19 (remaining gas: 1039989.314 units remaining)
     [ { Elt 1 4 ; Elt 2 11 }
       (Some True) ]
-  - location: 20 (remaining gas: 1039987.679 units remaining)
+  - location: 20 (remaining gas: 1039989.304 units remaining)
     [ (Pair { Elt 1 4 ; Elt 2 11 } (Some True)) ]
-  - location: 21 (remaining gas: 1039987.664 units remaining)
+  - location: 21 (remaining gas: 1039989.294 units remaining)
     [ {}
       (Pair { Elt 1 4 ; Elt 2 11 } (Some True)) ]
-  - location: 23 (remaining gas: 1039987.649 units remaining)
+  - location: 23 (remaining gas: 1039989.284 units remaining)
     [ (Pair {} { Elt 1 4 ; Elt 2 11 } (Some True)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-3-(Pa.2fba3165c0.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-3-(Pa.2fba3165c0.out
index 4dc0e84ef2ea737e69f7e1eb8b86a5bece986f54..8f67b8fbcfbd2e364f5eb5cfe0faab517346c29a 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-3-(Pa.2fba3165c0.out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair { Elt 1 4 ; Elt 2 11 } None)-3-(Pa.2fba3165c0.out	
@@ -7,36 +7,36 @@ emitted operations
 big_map diff
   
 trace
-  - location: 12 (remaining gas: 1039987.874 units remaining)
+  - location: 12 (remaining gas: 1039989.474 units remaining)
     [ (Pair 3 { Elt 1 4 ; Elt 2 11 } None) ]
-  - location: 12 (remaining gas: 1039987.864 units remaining)
+  - location: 12 (remaining gas: 1039989.464 units remaining)
     [ 3
       (Pair { Elt 1 4 ; Elt 2 11 } None) ]
-  - location: 13 (remaining gas: 1039987.849 units remaining)
+  - location: 13 (remaining gas: 1039989.454 units remaining)
     [ (Pair { Elt 1 4 ; Elt 2 11 } None) ]
-  - location: 15 (remaining gas: 1039987.839 units remaining)
+  - location: 15 (remaining gas: 1039989.444 units remaining)
     [ { Elt 1 4 ; Elt 2 11 } ]
-  - location: 16 (remaining gas: 1039987.829 units remaining)
+  - location: 16 (remaining gas: 1039989.434 units remaining)
     [ { Elt 1 4 ; Elt 2 11 }
       { Elt 1 4 ; Elt 2 11 } ]
-  - location: 13 (remaining gas: 1039987.799 units remaining)
+  - location: 13 (remaining gas: 1039989.414 units remaining)
     [ 3
       { Elt 1 4 ; Elt 2 11 }
       { Elt 1 4 ; Elt 2 11 } ]
-  - location: 17 (remaining gas: 1039987.719 units remaining)
+  - location: 17 (remaining gas: 1039989.334 units remaining)
     [ False
       { Elt 1 4 ; Elt 2 11 } ]
-  - location: 18 (remaining gas: 1039987.704 units remaining)
+  - location: 18 (remaining gas: 1039989.324 units remaining)
     [ (Some False)
       { Elt 1 4 ; Elt 2 11 } ]
-  - location: 19 (remaining gas: 1039987.694 units remaining)
+  - location: 19 (remaining gas: 1039989.314 units remaining)
     [ { Elt 1 4 ; Elt 2 11 }
       (Some False) ]
-  - location: 20 (remaining gas: 1039987.679 units remaining)
+  - location: 20 (remaining gas: 1039989.304 units remaining)
     [ (Pair { Elt 1 4 ; Elt 2 11 } (Some False)) ]
-  - location: 21 (remaining gas: 1039987.664 units remaining)
+  - location: 21 (remaining gas: 1039989.294 units remaining)
     [ {}
       (Pair { Elt 1 4 ; Elt 2 11 } (Some False)) ]
-  - location: 23 (remaining gas: 1039987.649 units remaining)
+  - location: 23 (remaining gas: 1039989.284 units remaining)
     [ (Pair {} { Elt 1 4 ; Elt 2 11 } (Some False)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair {} None)-1-(Pair {} (Some False))].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair {} None)-1-(Pair {} (Some False))].out
index bf61731d858841b3165b49d3bf5997aa77ed49c0..e79cc1059765de0ed7d6ff3f89735530d1ed03b8 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair {} None)-1-(Pair {} (Some False))].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_nat.tz-(Pair {} None)-1-(Pair {} (Some False))].out	
@@ -7,36 +7,36 @@ emitted operations
 big_map diff
   
 trace
-  - location: 12 (remaining gas: 1039988.469 units remaining)
+  - location: 12 (remaining gas: 1039990.069 units remaining)
     [ (Pair 1 {} None) ]
-  - location: 12 (remaining gas: 1039988.459 units remaining)
+  - location: 12 (remaining gas: 1039990.059 units remaining)
     [ 1
       (Pair {} None) ]
-  - location: 13 (remaining gas: 1039988.444 units remaining)
+  - location: 13 (remaining gas: 1039990.049 units remaining)
     [ (Pair {} None) ]
-  - location: 15 (remaining gas: 1039988.434 units remaining)
+  - location: 15 (remaining gas: 1039990.039 units remaining)
     [ {} ]
-  - location: 16 (remaining gas: 1039988.424 units remaining)
+  - location: 16 (remaining gas: 1039990.029 units remaining)
     [ {}
       {} ]
-  - location: 13 (remaining gas: 1039988.394 units remaining)
+  - location: 13 (remaining gas: 1039990.009 units remaining)
     [ 1
       {}
       {} ]
-  - location: 17 (remaining gas: 1039988.314 units remaining)
+  - location: 17 (remaining gas: 1039989.929 units remaining)
     [ False
       {} ]
-  - location: 18 (remaining gas: 1039988.299 units remaining)
+  - location: 18 (remaining gas: 1039989.919 units remaining)
     [ (Some False)
       {} ]
-  - location: 19 (remaining gas: 1039988.289 units remaining)
+  - location: 19 (remaining gas: 1039989.909 units remaining)
     [ {}
       (Some False) ]
-  - location: 20 (remaining gas: 1039988.274 units remaining)
+  - location: 20 (remaining gas: 1039989.899 units remaining)
     [ (Pair {} (Some False)) ]
-  - location: 21 (remaining gas: 1039988.259 units remaining)
+  - location: 21 (remaining gas: 1039989.889 units remaining)
     [ {}
       (Pair {} (Some False)) ]
-  - location: 23 (remaining gas: 1039988.244 units remaining)
+  - location: 23 (remaining gas: 1039989.879 units remaining)
     [ (Pair {} {} (Some False)) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 11 } .6d625e02a5.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 11 } .6d625e02a5.out"
index 0a592ef820dd85c360cd0f76868144d0010c1772..4b191273fe396960eca169fe42e939af7dd4fa10 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 11 } .6d625e02a5.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 11 } .6d625e02a5.out"	
@@ -7,36 +7,36 @@ emitted operations
 big_map diff
   
 trace
-  - location: 12 (remaining gas: 1039987.724 units remaining)
+  - location: 12 (remaining gas: 1039989.324 units remaining)
     [ (Pair "bar" { Elt "bar" 4 ; Elt "foo" 11 } None) ]
-  - location: 12 (remaining gas: 1039987.714 units remaining)
+  - location: 12 (remaining gas: 1039989.314 units remaining)
     [ "bar"
       (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) ]
-  - location: 13 (remaining gas: 1039987.699 units remaining)
+  - location: 13 (remaining gas: 1039989.304 units remaining)
     [ (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) ]
-  - location: 15 (remaining gas: 1039987.689 units remaining)
+  - location: 15 (remaining gas: 1039989.294 units remaining)
     [ { Elt "bar" 4 ; Elt "foo" 11 } ]
-  - location: 16 (remaining gas: 1039987.679 units remaining)
+  - location: 16 (remaining gas: 1039989.284 units remaining)
     [ { Elt "bar" 4 ; Elt "foo" 11 }
       { Elt "bar" 4 ; Elt "foo" 11 } ]
-  - location: 13 (remaining gas: 1039987.649 units remaining)
+  - location: 13 (remaining gas: 1039989.264 units remaining)
     [ "bar"
       { Elt "bar" 4 ; Elt "foo" 11 }
       { Elt "bar" 4 ; Elt "foo" 11 } ]
-  - location: 17 (remaining gas: 1039987.560 units remaining)
+  - location: 17 (remaining gas: 1039989.175 units remaining)
     [ True
       { Elt "bar" 4 ; Elt "foo" 11 } ]
-  - location: 18 (remaining gas: 1039987.545 units remaining)
+  - location: 18 (remaining gas: 1039989.165 units remaining)
     [ (Some True)
       { Elt "bar" 4 ; Elt "foo" 11 } ]
-  - location: 19 (remaining gas: 1039987.535 units remaining)
+  - location: 19 (remaining gas: 1039989.155 units remaining)
     [ { Elt "bar" 4 ; Elt "foo" 11 }
       (Some True) ]
-  - location: 20 (remaining gas: 1039987.520 units remaining)
+  - location: 20 (remaining gas: 1039989.145 units remaining)
     [ (Pair { Elt "bar" 4 ; Elt "foo" 11 } (Some True)) ]
-  - location: 21 (remaining gas: 1039987.505 units remaining)
+  - location: 21 (remaining gas: 1039989.135 units remaining)
     [ {}
       (Pair { Elt "bar" 4 ; Elt "foo" 11 } (Some True)) ]
-  - location: 23 (remaining gas: 1039987.490 units remaining)
+  - location: 23 (remaining gas: 1039989.125 units remaining)
     [ (Pair {} { Elt "bar" 4 ; Elt "foo" 11 } (Some True)) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 11 } .a7e3837a82.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 11 } .a7e3837a82.out"
index d8e170dca9349aadb3f4f48c31e62edac46951cb..b31d0cedd459e2e08a3391ffa7733a559f797ff0 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 11 } .a7e3837a82.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 11 } .a7e3837a82.out"	
@@ -7,36 +7,36 @@ emitted operations
 big_map diff
   
 trace
-  - location: 12 (remaining gas: 1039987.724 units remaining)
+  - location: 12 (remaining gas: 1039989.324 units remaining)
     [ (Pair "foo" { Elt "bar" 4 ; Elt "foo" 11 } None) ]
-  - location: 12 (remaining gas: 1039987.714 units remaining)
+  - location: 12 (remaining gas: 1039989.314 units remaining)
     [ "foo"
       (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) ]
-  - location: 13 (remaining gas: 1039987.699 units remaining)
+  - location: 13 (remaining gas: 1039989.304 units remaining)
     [ (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) ]
-  - location: 15 (remaining gas: 1039987.689 units remaining)
+  - location: 15 (remaining gas: 1039989.294 units remaining)
     [ { Elt "bar" 4 ; Elt "foo" 11 } ]
-  - location: 16 (remaining gas: 1039987.679 units remaining)
+  - location: 16 (remaining gas: 1039989.284 units remaining)
     [ { Elt "bar" 4 ; Elt "foo" 11 }
       { Elt "bar" 4 ; Elt "foo" 11 } ]
-  - location: 13 (remaining gas: 1039987.649 units remaining)
+  - location: 13 (remaining gas: 1039989.264 units remaining)
     [ "foo"
       { Elt "bar" 4 ; Elt "foo" 11 }
       { Elt "bar" 4 ; Elt "foo" 11 } ]
-  - location: 17 (remaining gas: 1039987.560 units remaining)
+  - location: 17 (remaining gas: 1039989.175 units remaining)
     [ True
       { Elt "bar" 4 ; Elt "foo" 11 } ]
-  - location: 18 (remaining gas: 1039987.545 units remaining)
+  - location: 18 (remaining gas: 1039989.165 units remaining)
     [ (Some True)
       { Elt "bar" 4 ; Elt "foo" 11 } ]
-  - location: 19 (remaining gas: 1039987.535 units remaining)
+  - location: 19 (remaining gas: 1039989.155 units remaining)
     [ { Elt "bar" 4 ; Elt "foo" 11 }
       (Some True) ]
-  - location: 20 (remaining gas: 1039987.520 units remaining)
+  - location: 20 (remaining gas: 1039989.145 units remaining)
     [ (Pair { Elt "bar" 4 ; Elt "foo" 11 } (Some True)) ]
-  - location: 21 (remaining gas: 1039987.505 units remaining)
+  - location: 21 (remaining gas: 1039989.135 units remaining)
     [ {}
       (Pair { Elt "bar" 4 ; Elt "foo" 11 } (Some True)) ]
-  - location: 23 (remaining gas: 1039987.490 units remaining)
+  - location: 23 (remaining gas: 1039989.125 units remaining)
     [ (Pair {} { Elt "bar" 4 ; Elt "foo" 11 } (Some True)) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 11 } .c7716fe79e.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 11 } .c7716fe79e.out"
index 9fedfb7799258135a407e9fa9a55cb699c0a9989..2fbe176afceae989248799eafeb5733663c5428b 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 11 } .c7716fe79e.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"bar\" 4 ; Elt \"foo\" 11 } .c7716fe79e.out"	
@@ -7,36 +7,36 @@ emitted operations
 big_map diff
   
 trace
-  - location: 12 (remaining gas: 1039987.724 units remaining)
+  - location: 12 (remaining gas: 1039989.324 units remaining)
     [ (Pair "baz" { Elt "bar" 4 ; Elt "foo" 11 } None) ]
-  - location: 12 (remaining gas: 1039987.714 units remaining)
+  - location: 12 (remaining gas: 1039989.314 units remaining)
     [ "baz"
       (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) ]
-  - location: 13 (remaining gas: 1039987.699 units remaining)
+  - location: 13 (remaining gas: 1039989.304 units remaining)
     [ (Pair { Elt "bar" 4 ; Elt "foo" 11 } None) ]
-  - location: 15 (remaining gas: 1039987.689 units remaining)
+  - location: 15 (remaining gas: 1039989.294 units remaining)
     [ { Elt "bar" 4 ; Elt "foo" 11 } ]
-  - location: 16 (remaining gas: 1039987.679 units remaining)
+  - location: 16 (remaining gas: 1039989.284 units remaining)
     [ { Elt "bar" 4 ; Elt "foo" 11 }
       { Elt "bar" 4 ; Elt "foo" 11 } ]
-  - location: 13 (remaining gas: 1039987.649 units remaining)
+  - location: 13 (remaining gas: 1039989.264 units remaining)
     [ "baz"
       { Elt "bar" 4 ; Elt "foo" 11 }
       { Elt "bar" 4 ; Elt "foo" 11 } ]
-  - location: 17 (remaining gas: 1039987.560 units remaining)
+  - location: 17 (remaining gas: 1039989.175 units remaining)
     [ False
       { Elt "bar" 4 ; Elt "foo" 11 } ]
-  - location: 18 (remaining gas: 1039987.545 units remaining)
+  - location: 18 (remaining gas: 1039989.165 units remaining)
     [ (Some False)
       { Elt "bar" 4 ; Elt "foo" 11 } ]
-  - location: 19 (remaining gas: 1039987.535 units remaining)
+  - location: 19 (remaining gas: 1039989.155 units remaining)
     [ { Elt "bar" 4 ; Elt "foo" 11 }
       (Some False) ]
-  - location: 20 (remaining gas: 1039987.520 units remaining)
+  - location: 20 (remaining gas: 1039989.145 units remaining)
     [ (Pair { Elt "bar" 4 ; Elt "foo" 11 } (Some False)) ]
-  - location: 21 (remaining gas: 1039987.505 units remaining)
+  - location: 21 (remaining gas: 1039989.135 units remaining)
     [ {}
       (Pair { Elt "bar" 4 ; Elt "foo" 11 } (Some False)) ]
-  - location: 23 (remaining gas: 1039987.490 units remaining)
+  - location: 23 (remaining gas: 1039989.125 units remaining)
     [ (Pair {} { Elt "bar" 4 ; Elt "foo" 11 } (Some False)) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"foo\" 0 } None)-\"foo\"-(Pa.7861a3b1e2.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"foo\" 0 } None)-\"foo\"-(Pa.7861a3b1e2.out"
index 0ed3adee0eb836c870895faa1498978c218606f5..865cf42f5d8d66cbc3e1c9bd2657194e3db4fff2 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"foo\" 0 } None)-\"foo\"-(Pa.7861a3b1e2.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"foo\" 0 } None)-\"foo\"-(Pa.7861a3b1e2.out"	
@@ -7,36 +7,36 @@ emitted operations
 big_map diff
   
 trace
-  - location: 12 (remaining gas: 1039988.095 units remaining)
+  - location: 12 (remaining gas: 1039989.695 units remaining)
     [ (Pair "foo" { Elt "foo" 0 } None) ]
-  - location: 12 (remaining gas: 1039988.085 units remaining)
+  - location: 12 (remaining gas: 1039989.685 units remaining)
     [ "foo"
       (Pair { Elt "foo" 0 } None) ]
-  - location: 13 (remaining gas: 1039988.070 units remaining)
+  - location: 13 (remaining gas: 1039989.675 units remaining)
     [ (Pair { Elt "foo" 0 } None) ]
-  - location: 15 (remaining gas: 1039988.060 units remaining)
+  - location: 15 (remaining gas: 1039989.665 units remaining)
     [ { Elt "foo" 0 } ]
-  - location: 16 (remaining gas: 1039988.050 units remaining)
+  - location: 16 (remaining gas: 1039989.655 units remaining)
     [ { Elt "foo" 0 }
       { Elt "foo" 0 } ]
-  - location: 13 (remaining gas: 1039988.020 units remaining)
+  - location: 13 (remaining gas: 1039989.635 units remaining)
     [ "foo"
       { Elt "foo" 0 }
       { Elt "foo" 0 } ]
-  - location: 17 (remaining gas: 1039987.934 units remaining)
+  - location: 17 (remaining gas: 1039989.549 units remaining)
     [ True
       { Elt "foo" 0 } ]
-  - location: 18 (remaining gas: 1039987.919 units remaining)
+  - location: 18 (remaining gas: 1039989.539 units remaining)
     [ (Some True)
       { Elt "foo" 0 } ]
-  - location: 19 (remaining gas: 1039987.909 units remaining)
+  - location: 19 (remaining gas: 1039989.529 units remaining)
     [ { Elt "foo" 0 }
       (Some True) ]
-  - location: 20 (remaining gas: 1039987.894 units remaining)
+  - location: 20 (remaining gas: 1039989.519 units remaining)
     [ (Pair { Elt "foo" 0 } (Some True)) ]
-  - location: 21 (remaining gas: 1039987.879 units remaining)
+  - location: 21 (remaining gas: 1039989.509 units remaining)
     [ {}
       (Pair { Elt "foo" 0 } (Some True)) ]
-  - location: 23 (remaining gas: 1039987.864 units remaining)
+  - location: 23 (remaining gas: 1039989.499 units remaining)
     [ (Pair {} { Elt "foo" 0 } (Some True)) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"foo\" 1 } None)-\"bar\"-(Pa.fa8366e8a8.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"foo\" 1 } None)-\"bar\"-(Pa.fa8366e8a8.out"
index a583632d9a858635d14939582552b618c985a769..9ef4743f2ae67e9356c767df1104bf74b2650e90 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"foo\" 1 } None)-\"bar\"-(Pa.fa8366e8a8.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair { Elt \"foo\" 1 } None)-\"bar\"-(Pa.fa8366e8a8.out"	
@@ -7,36 +7,36 @@ emitted operations
 big_map diff
   
 trace
-  - location: 12 (remaining gas: 1039988.095 units remaining)
+  - location: 12 (remaining gas: 1039989.695 units remaining)
     [ (Pair "bar" { Elt "foo" 1 } None) ]
-  - location: 12 (remaining gas: 1039988.085 units remaining)
+  - location: 12 (remaining gas: 1039989.685 units remaining)
     [ "bar"
       (Pair { Elt "foo" 1 } None) ]
-  - location: 13 (remaining gas: 1039988.070 units remaining)
+  - location: 13 (remaining gas: 1039989.675 units remaining)
     [ (Pair { Elt "foo" 1 } None) ]
-  - location: 15 (remaining gas: 1039988.060 units remaining)
+  - location: 15 (remaining gas: 1039989.665 units remaining)
     [ { Elt "foo" 1 } ]
-  - location: 16 (remaining gas: 1039988.050 units remaining)
+  - location: 16 (remaining gas: 1039989.655 units remaining)
     [ { Elt "foo" 1 }
       { Elt "foo" 1 } ]
-  - location: 13 (remaining gas: 1039988.020 units remaining)
+  - location: 13 (remaining gas: 1039989.635 units remaining)
     [ "bar"
       { Elt "foo" 1 }
       { Elt "foo" 1 } ]
-  - location: 17 (remaining gas: 1039987.934 units remaining)
+  - location: 17 (remaining gas: 1039989.549 units remaining)
     [ False
       { Elt "foo" 1 } ]
-  - location: 18 (remaining gas: 1039987.919 units remaining)
+  - location: 18 (remaining gas: 1039989.539 units remaining)
     [ (Some False)
       { Elt "foo" 1 } ]
-  - location: 19 (remaining gas: 1039987.909 units remaining)
+  - location: 19 (remaining gas: 1039989.529 units remaining)
     [ { Elt "foo" 1 }
       (Some False) ]
-  - location: 20 (remaining gas: 1039987.894 units remaining)
+  - location: 20 (remaining gas: 1039989.519 units remaining)
     [ (Pair { Elt "foo" 1 } (Some False)) ]
-  - location: 21 (remaining gas: 1039987.879 units remaining)
+  - location: 21 (remaining gas: 1039989.509 units remaining)
     [ {}
       (Pair { Elt "foo" 1 } (Some False)) ]
-  - location: 23 (remaining gas: 1039987.864 units remaining)
+  - location: 23 (remaining gas: 1039989.499 units remaining)
     [ (Pair {} { Elt "foo" 1 } (Some False)) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair {} None)-\"bar\"-(Pair {} (Some False))].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair {} None)-\"bar\"-(Pair {} (Some False))].out"
index 60857074b35982248c327df1f1779d62986f16c2..7103620f8c2c4c1aa763b8903bbdf05432c771ae 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair {} None)-\"bar\"-(Pair {} (Some False))].out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_mem_string.tz-(Pair {} None)-\"bar\"-(Pair {} (Some False))].out"	
@@ -7,36 +7,36 @@ emitted operations
 big_map diff
   
 trace
-  - location: 12 (remaining gas: 1039988.425 units remaining)
+  - location: 12 (remaining gas: 1039990.025 units remaining)
     [ (Pair "bar" {} None) ]
-  - location: 12 (remaining gas: 1039988.415 units remaining)
+  - location: 12 (remaining gas: 1039990.015 units remaining)
     [ "bar"
       (Pair {} None) ]
-  - location: 13 (remaining gas: 1039988.400 units remaining)
+  - location: 13 (remaining gas: 1039990.005 units remaining)
     [ (Pair {} None) ]
-  - location: 15 (remaining gas: 1039988.390 units remaining)
+  - location: 15 (remaining gas: 1039989.995 units remaining)
     [ {} ]
-  - location: 16 (remaining gas: 1039988.380 units remaining)
+  - location: 16 (remaining gas: 1039989.985 units remaining)
     [ {}
       {} ]
-  - location: 13 (remaining gas: 1039988.350 units remaining)
+  - location: 13 (remaining gas: 1039989.965 units remaining)
     [ "bar"
       {}
       {} ]
-  - location: 17 (remaining gas: 1039988.267 units remaining)
+  - location: 17 (remaining gas: 1039989.882 units remaining)
     [ False
       {} ]
-  - location: 18 (remaining gas: 1039988.252 units remaining)
+  - location: 18 (remaining gas: 1039989.872 units remaining)
     [ (Some False)
       {} ]
-  - location: 19 (remaining gas: 1039988.242 units remaining)
+  - location: 19 (remaining gas: 1039989.862 units remaining)
     [ {}
       (Some False) ]
-  - location: 20 (remaining gas: 1039988.227 units remaining)
+  - location: 20 (remaining gas: 1039989.852 units remaining)
     [ (Pair {} (Some False)) ]
-  - location: 21 (remaining gas: 1039988.212 units remaining)
+  - location: 21 (remaining gas: 1039989.842 units remaining)
     [ {}
       (Pair {} (Some False)) ]
-  - location: 23 (remaining gas: 1039988.197 units remaining)
+  - location: 23 (remaining gas: 1039989.832 units remaining)
     [ (Pair {} {} (Some False)) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_size.tz-111-{ Elt \"a\" 1 ; Elt \"b\" 2 ; Elt \"c\" 3 ;  .1da2c2c3fa.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_size.tz-111-{ Elt \"a\" 1 ; Elt \"b\" 2 ; Elt \"c\" 3 ;  .1da2c2c3fa.out"
index 69c50c7059ae424f786b70f48ffb9e5916473b22..9c4f7ec0c3adcd90765f3cf9be7ce22c8c882252 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_size.tz-111-{ Elt \"a\" 1 ; Elt \"b\" 2 ; Elt \"c\" 3 ;  .1da2c2c3fa.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_size.tz-111-{ Elt \"a\" 1 ; Elt \"b\" 2 ; Elt \"c\" 3 ;  .1da2c2c3fa.out"	
@@ -7,15 +7,15 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (remaining gas: 1039992.624 units remaining)
+  - location: 9 (remaining gas: 1039993.264 units remaining)
     [ (Pair { Elt "a" 1 ; Elt "b" 2 ; Elt "c" 3 ; Elt "d" 4 ; Elt "e" 5 ; Elt "f" 6 } 111) ]
-  - location: 9 (remaining gas: 1039992.614 units remaining)
+  - location: 9 (remaining gas: 1039993.254 units remaining)
     [ { Elt "a" 1 ; Elt "b" 2 ; Elt "c" 3 ; Elt "d" 4 ; Elt "e" 5 ; Elt "f" 6 } ]
-  - location: 10 (remaining gas: 1039992.599 units remaining)
+  - location: 10 (remaining gas: 1039993.244 units remaining)
     [ 6 ]
-  - location: 11 (remaining gas: 1039992.584 units remaining)
+  - location: 11 (remaining gas: 1039993.234 units remaining)
     [ {}
       6 ]
-  - location: 13 (remaining gas: 1039992.569 units remaining)
+  - location: 13 (remaining gas: 1039993.224 units remaining)
     [ (Pair {} 6) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_size.tz-111-{ Elt \"a\" 1 ; Elt \"b\" 2 ; Elt \"c\" 3 }-3].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_size.tz-111-{ Elt \"a\" 1 ; Elt \"b\" 2 ; Elt \"c\" 3 }-3].out"
index f1f4dd1842642e0ee87c5469866ad7b19b9c10d5..81c88527451cac3f82e304841726abcd978dd2df 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_size.tz-111-{ Elt \"a\" 1 ; Elt \"b\" 2 ; Elt \"c\" 3 }-3].out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_size.tz-111-{ Elt \"a\" 1 ; Elt \"b\" 2 ; Elt \"c\" 3 }-3].out"	
@@ -7,15 +7,15 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (remaining gas: 1039993.663 units remaining)
+  - location: 9 (remaining gas: 1039994.303 units remaining)
     [ (Pair { Elt "a" 1 ; Elt "b" 2 ; Elt "c" 3 } 111) ]
-  - location: 9 (remaining gas: 1039993.653 units remaining)
+  - location: 9 (remaining gas: 1039994.293 units remaining)
     [ { Elt "a" 1 ; Elt "b" 2 ; Elt "c" 3 } ]
-  - location: 10 (remaining gas: 1039993.638 units remaining)
+  - location: 10 (remaining gas: 1039994.283 units remaining)
     [ 3 ]
-  - location: 11 (remaining gas: 1039993.623 units remaining)
+  - location: 11 (remaining gas: 1039994.273 units remaining)
     [ {}
       3 ]
-  - location: 13 (remaining gas: 1039993.608 units remaining)
+  - location: 13 (remaining gas: 1039994.263 units remaining)
     [ (Pair {} 3) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_size.tz-111-{ Elt \"a\" 1 }-1].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_size.tz-111-{ Elt \"a\" 1 }-1].out"
index 4212065c24bb1db83621f34a044486d611240a05..a3eac3ae3612b02527fd2d82220eaadecba768cd 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_size.tz-111-{ Elt \"a\" 1 }-1].out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_size.tz-111-{ Elt \"a\" 1 }-1].out"	
@@ -7,15 +7,15 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (remaining gas: 1039994.351 units remaining)
+  - location: 9 (remaining gas: 1039994.991 units remaining)
     [ (Pair { Elt "a" 1 } 111) ]
-  - location: 9 (remaining gas: 1039994.341 units remaining)
+  - location: 9 (remaining gas: 1039994.981 units remaining)
     [ { Elt "a" 1 } ]
-  - location: 10 (remaining gas: 1039994.326 units remaining)
+  - location: 10 (remaining gas: 1039994.971 units remaining)
     [ 1 ]
-  - location: 11 (remaining gas: 1039994.311 units remaining)
+  - location: 11 (remaining gas: 1039994.961 units remaining)
     [ {}
       1 ]
-  - location: 13 (remaining gas: 1039994.296 units remaining)
+  - location: 13 (remaining gas: 1039994.951 units remaining)
     [ (Pair {} 1) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_size.tz-111-{}-0].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_size.tz-111-{}-0].out
index e33dd2106d079d2a20d09b2497e45922650b1617..37be8ce4156a6af5ba13460055610b9ce40c7faa 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_size.tz-111-{}-0].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[map_size.tz-111-{}-0].out
@@ -7,15 +7,15 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (remaining gas: 1039994.657 units remaining)
+  - location: 9 (remaining gas: 1039995.297 units remaining)
     [ (Pair {} 111) ]
-  - location: 9 (remaining gas: 1039994.647 units remaining)
+  - location: 9 (remaining gas: 1039995.287 units remaining)
     [ {} ]
-  - location: 10 (remaining gas: 1039994.632 units remaining)
+  - location: 10 (remaining gas: 1039995.277 units remaining)
     [ 0 ]
-  - location: 11 (remaining gas: 1039994.617 units remaining)
+  - location: 11 (remaining gas: 1039995.267 units remaining)
     [ {}
       0 ]
-  - location: 13 (remaining gas: 1039994.602 units remaining)
+  - location: 13 (remaining gas: 1039995.257 units remaining)
     [ (Pair {} 0) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[mul.tz-Unit-Unit-Unit].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[mul.tz-Unit-Unit-Unit].out
index a729ad3caa93e43e1062218d9252f7ceb7891081..a068ba3161054b6df67fa4feec78757c70568319 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[mul.tz-Unit-Unit-Unit].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[mul.tz-Unit-Unit-Unit].out
@@ -7,125 +7,125 @@ emitted operations
 big_map diff
   
 trace
-  - location: 7 (remaining gas: 1039944.811 units remaining)
+  - location: 7 (remaining gas: 1039946.411 units remaining)
     [ (Pair Unit Unit) ]
-  - location: 7 (remaining gas: 1039944.801 units remaining)
+  - location: 7 (remaining gas: 1039946.401 units remaining)
     [ Unit ]
-  - location: 8 (remaining gas: 1039944.791 units remaining)
+  - location: 8 (remaining gas: 1039946.391 units remaining)
     [  ]
-  - location: 9 (remaining gas: 1039944.781 units remaining)
+  - location: 9 (remaining gas: 1039946.381 units remaining)
     [ 7987 ]
-  - location: 12 (remaining gas: 1039944.771 units remaining)
+  - location: 12 (remaining gas: 1039946.371 units remaining)
     [ 10
       7987 ]
-  - location: 15 (remaining gas: 1039944.771 units remaining)
+  - location: 15 (remaining gas: 1039946.371 units remaining)
     [ 79870 ]
-  - location: 16 (remaining gas: 1039944.761 units remaining)
+  - location: 16 (remaining gas: 1039946.361 units remaining)
     [ 79870
       79870 ]
-  - location: 19 (remaining gas: 1039944.726 units remaining)
+  - location: 19 (remaining gas: 1039946.326 units remaining)
     [ 0 ]
-  - location: 21 (remaining gas: 1039944.711 units remaining)
+  - location: 21 (remaining gas: 1039946.316 units remaining)
     [ True ]
-  - location: 22 (remaining gas: 1039944.701 units remaining)
+  - location: 22 (remaining gas: 1039946.306 units remaining)
     [  ]
-  - location: 22 (remaining gas: 1039944.686 units remaining)
+  - location: 22 (remaining gas: 1039946.296 units remaining)
     [  ]
-  - location: 28 (remaining gas: 1039944.676 units remaining)
+  - location: 28 (remaining gas: 1039946.286 units remaining)
     [ 10 ]
-  - location: 31 (remaining gas: 1039944.666 units remaining)
+  - location: 31 (remaining gas: 1039946.276 units remaining)
     [ 7987
       10 ]
-  - location: 34 (remaining gas: 1039944.666 units remaining)
+  - location: 34 (remaining gas: 1039946.276 units remaining)
     [ 79870 ]
-  - location: 35 (remaining gas: 1039944.656 units remaining)
+  - location: 35 (remaining gas: 1039946.266 units remaining)
     [ 79870
       79870 ]
-  - location: 38 (remaining gas: 1039944.621 units remaining)
+  - location: 38 (remaining gas: 1039946.231 units remaining)
     [ 0 ]
-  - location: 40 (remaining gas: 1039944.606 units remaining)
+  - location: 40 (remaining gas: 1039946.221 units remaining)
     [ True ]
-  - location: 41 (remaining gas: 1039944.596 units remaining)
+  - location: 41 (remaining gas: 1039946.211 units remaining)
     [  ]
-  - location: 41 (remaining gas: 1039944.581 units remaining)
+  - location: 41 (remaining gas: 1039946.201 units remaining)
     [  ]
-  - location: 47 (remaining gas: 1039944.571 units remaining)
+  - location: 47 (remaining gas: 1039946.191 units remaining)
     [ 10 ]
-  - location: 50 (remaining gas: 1039944.561 units remaining)
+  - location: 50 (remaining gas: 1039946.181 units remaining)
     [ -7987
       10 ]
-  - location: 53 (remaining gas: 1039944.455 units remaining)
+  - location: 53 (remaining gas: 1039946.120 units remaining)
     [ -79870 ]
-  - location: 54 (remaining gas: 1039944.445 units remaining)
+  - location: 54 (remaining gas: 1039946.110 units remaining)
     [ -79870
       -79870 ]
-  - location: 57 (remaining gas: 1039944.410 units remaining)
+  - location: 57 (remaining gas: 1039946.075 units remaining)
     [ 0 ]
-  - location: 59 (remaining gas: 1039944.395 units remaining)
+  - location: 59 (remaining gas: 1039946.065 units remaining)
     [ True ]
-  - location: 60 (remaining gas: 1039944.385 units remaining)
+  - location: 60 (remaining gas: 1039946.055 units remaining)
     [  ]
-  - location: 60 (remaining gas: 1039944.370 units remaining)
+  - location: 60 (remaining gas: 1039946.045 units remaining)
     [  ]
-  - location: 66 (remaining gas: 1039944.360 units remaining)
+  - location: 66 (remaining gas: 1039946.035 units remaining)
     [ 10 ]
-  - location: 69 (remaining gas: 1039944.350 units remaining)
+  - location: 69 (remaining gas: 1039946.025 units remaining)
     [ -7987
       10 ]
-  - location: 72 (remaining gas: 1039944.244 units remaining)
+  - location: 72 (remaining gas: 1039945.964 units remaining)
     [ -79870 ]
-  - location: 73 (remaining gas: 1039944.234 units remaining)
+  - location: 73 (remaining gas: 1039945.954 units remaining)
     [ -79870
       -79870 ]
-  - location: 76 (remaining gas: 1039944.199 units remaining)
+  - location: 76 (remaining gas: 1039945.919 units remaining)
     [ 0 ]
-  - location: 78 (remaining gas: 1039944.184 units remaining)
+  - location: 78 (remaining gas: 1039945.909 units remaining)
     [ True ]
-  - location: 79 (remaining gas: 1039944.174 units remaining)
+  - location: 79 (remaining gas: 1039945.899 units remaining)
     [  ]
-  - location: 79 (remaining gas: 1039944.159 units remaining)
+  - location: 79 (remaining gas: 1039945.889 units remaining)
     [  ]
-  - location: 85 (remaining gas: 1039944.149 units remaining)
+  - location: 85 (remaining gas: 1039945.879 units remaining)
     [ -10 ]
-  - location: 88 (remaining gas: 1039944.139 units remaining)
+  - location: 88 (remaining gas: 1039945.869 units remaining)
     [ 7987
       -10 ]
-  - location: 91 (remaining gas: 1039944.033 units remaining)
+  - location: 91 (remaining gas: 1039945.808 units remaining)
     [ -79870 ]
-  - location: 92 (remaining gas: 1039944.023 units remaining)
+  - location: 92 (remaining gas: 1039945.798 units remaining)
     [ -79870
       -79870 ]
-  - location: 95 (remaining gas: 1039943.988 units remaining)
+  - location: 95 (remaining gas: 1039945.763 units remaining)
     [ 0 ]
-  - location: 97 (remaining gas: 1039943.973 units remaining)
+  - location: 97 (remaining gas: 1039945.753 units remaining)
     [ True ]
-  - location: 98 (remaining gas: 1039943.963 units remaining)
+  - location: 98 (remaining gas: 1039945.743 units remaining)
     [  ]
-  - location: 98 (remaining gas: 1039943.948 units remaining)
+  - location: 98 (remaining gas: 1039945.733 units remaining)
     [  ]
-  - location: 104 (remaining gas: 1039943.938 units remaining)
+  - location: 104 (remaining gas: 1039945.723 units remaining)
     [ 10 ]
-  - location: 107 (remaining gas: 1039943.928 units remaining)
+  - location: 107 (remaining gas: 1039945.713 units remaining)
     [ 7987
       10 ]
-  - location: 110 (remaining gas: 1039943.822 units remaining)
+  - location: 110 (remaining gas: 1039945.652 units remaining)
     [ 79870 ]
-  - location: 111 (remaining gas: 1039943.812 units remaining)
+  - location: 111 (remaining gas: 1039945.642 units remaining)
     [ 79870
       79870 ]
-  - location: 114 (remaining gas: 1039943.777 units remaining)
+  - location: 114 (remaining gas: 1039945.607 units remaining)
     [ 0 ]
-  - location: 116 (remaining gas: 1039943.762 units remaining)
+  - location: 116 (remaining gas: 1039945.597 units remaining)
     [ True ]
-  - location: 117 (remaining gas: 1039943.752 units remaining)
+  - location: 117 (remaining gas: 1039945.587 units remaining)
     [  ]
-  - location: 117 (remaining gas: 1039943.737 units remaining)
+  - location: 117 (remaining gas: 1039945.577 units remaining)
     [  ]
-  - location: 123 (remaining gas: 1039943.727 units remaining)
+  - location: 123 (remaining gas: 1039945.567 units remaining)
     [ Unit ]
-  - location: 124 (remaining gas: 1039943.712 units remaining)
+  - location: 124 (remaining gas: 1039945.557 units remaining)
     [ {}
       Unit ]
-  - location: 126 (remaining gas: 1039943.697 units remaining)
+  - location: 126 (remaining gas: 1039945.547 units remaining)
     [ (Pair {} Unit) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[mutez_to_bls12_381_fr.tz-0x00-257-0x0101000000000000000.be11332c7f.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[mutez_to_bls12_381_fr.tz-0x00-257-0x0101000000000000000.be11332c7f.out
index 067e01755134f35d379ae70d1f0bc3814a2d3566..2e0d3017871409791db79db8fcd9f46b12baf703 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[mutez_to_bls12_381_fr.tz-0x00-257-0x0101000000000000000.be11332c7f.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[mutez_to_bls12_381_fr.tz-0x00-257-0x0101000000000000000.be11332c7f.out
@@ -7,32 +7,32 @@ emitted operations
 big_map diff
   
 trace
-  - location: 7 (remaining gas: 1039987.903 units remaining)
+  - location: 7 (remaining gas: 1039988.603 units remaining)
     [ (Pair 257 0x0000000000000000000000000000000000000000000000000000000000000000) ]
-  - location: 7 (remaining gas: 1039987.893 units remaining)
+  - location: 7 (remaining gas: 1039988.593 units remaining)
     [ 257 ]
-  - location: 8 (remaining gas: 1039987.883 units remaining)
+  - location: 8 (remaining gas: 1039988.583 units remaining)
     [ 1
       257 ]
-  - location: 11 (remaining gas: 1039987.873 units remaining)
+  - location: 11 (remaining gas: 1039988.573 units remaining)
     [ 257
       1 ]
-  - location: 12 (remaining gas: 1039987.733 units remaining)
+  - location: 12 (remaining gas: 1039988.493 units remaining)
     [ (Some (Pair 257 0)) ]
-  - location: 14 (remaining gas: 1039987.723 units remaining)
+  - location: 14 (remaining gas: 1039988.483 units remaining)
     [ (Pair 257 0) ]
-  - location: 14 (remaining gas: 1039987.708 units remaining)
+  - location: 14 (remaining gas: 1039988.473 units remaining)
     [ (Pair 257 0) ]
-  - location: 20 (remaining gas: 1039987.698 units remaining)
+  - location: 20 (remaining gas: 1039988.463 units remaining)
     [ 257 ]
-  - location: 21 (remaining gas: 1039987.688 units remaining)
+  - location: 21 (remaining gas: 1039988.453 units remaining)
     [ 0x0100000000000000000000000000000000000000000000000000000000000000
       257 ]
-  - location: 24 (remaining gas: 1039987.356 units remaining)
+  - location: 24 (remaining gas: 1039988.186 units remaining)
     [ 0x0101000000000000000000000000000000000000000000000000000000000000 ]
-  - location: 25 (remaining gas: 1039987.341 units remaining)
+  - location: 25 (remaining gas: 1039988.176 units remaining)
     [ {}
       0x0101000000000000000000000000000000000000000000000000000000000000 ]
-  - location: 27 (remaining gas: 1039987.326 units remaining)
+  - location: 27 (remaining gas: 1039988.166 units remaining)
     [ (Pair {} 0x0101000000000000000000000000000000000000000000000000000000000000) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[mutez_to_bls12_381_fr.tz-0x02-16-0x10000000000000000000.8230fb4fac.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[mutez_to_bls12_381_fr.tz-0x02-16-0x10000000000000000000.8230fb4fac.out
index 979b6be4d862d17714b4f247d8a45d41ece091ad..fbf46d175e978952910a467394a571bf192073d5 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[mutez_to_bls12_381_fr.tz-0x02-16-0x10000000000000000000.8230fb4fac.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[mutez_to_bls12_381_fr.tz-0x02-16-0x10000000000000000000.8230fb4fac.out
@@ -7,32 +7,32 @@ emitted operations
 big_map diff
   
 trace
-  - location: 7 (remaining gas: 1039987.903 units remaining)
+  - location: 7 (remaining gas: 1039988.603 units remaining)
     [ (Pair 16 0x0200000000000000000000000000000000000000000000000000000000000000) ]
-  - location: 7 (remaining gas: 1039987.893 units remaining)
+  - location: 7 (remaining gas: 1039988.593 units remaining)
     [ 16 ]
-  - location: 8 (remaining gas: 1039987.883 units remaining)
+  - location: 8 (remaining gas: 1039988.583 units remaining)
     [ 1
       16 ]
-  - location: 11 (remaining gas: 1039987.873 units remaining)
+  - location: 11 (remaining gas: 1039988.573 units remaining)
     [ 16
       1 ]
-  - location: 12 (remaining gas: 1039987.733 units remaining)
+  - location: 12 (remaining gas: 1039988.493 units remaining)
     [ (Some (Pair 16 0)) ]
-  - location: 14 (remaining gas: 1039987.723 units remaining)
+  - location: 14 (remaining gas: 1039988.483 units remaining)
     [ (Pair 16 0) ]
-  - location: 14 (remaining gas: 1039987.708 units remaining)
+  - location: 14 (remaining gas: 1039988.473 units remaining)
     [ (Pair 16 0) ]
-  - location: 20 (remaining gas: 1039987.698 units remaining)
+  - location: 20 (remaining gas: 1039988.463 units remaining)
     [ 16 ]
-  - location: 21 (remaining gas: 1039987.688 units remaining)
+  - location: 21 (remaining gas: 1039988.453 units remaining)
     [ 0x0100000000000000000000000000000000000000000000000000000000000000
       16 ]
-  - location: 24 (remaining gas: 1039987.357 units remaining)
+  - location: 24 (remaining gas: 1039988.187 units remaining)
     [ 0x1000000000000000000000000000000000000000000000000000000000000000 ]
-  - location: 25 (remaining gas: 1039987.342 units remaining)
+  - location: 25 (remaining gas: 1039988.177 units remaining)
     [ {}
       0x1000000000000000000000000000000000000000000000000000000000000000 ]
-  - location: 27 (remaining gas: 1039987.327 units remaining)
+  - location: 27 (remaining gas: 1039988.167 units remaining)
     [ (Pair {} 0x1000000000000000000000000000000000000000000000000000000000000000) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Left -2)-2].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Left -2)-2].out
index 648d7c7419de7dc29fde10caeebc2b6cfda58da7..d96f68642cc3aa1d94321770de75e6934423bfb8 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Left -2)-2].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Left -2)-2].out	
@@ -7,19 +7,19 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (remaining gas: 1039992.671 units remaining)
+  - location: 9 (remaining gas: 1039993.471 units remaining)
     [ (Pair (Left -2) 0) ]
-  - location: 9 (remaining gas: 1039992.661 units remaining)
+  - location: 9 (remaining gas: 1039993.461 units remaining)
     [ (Left -2) ]
-  - location: 10 (remaining gas: 1039992.651 units remaining)
+  - location: 10 (remaining gas: 1039993.451 units remaining)
     [ -2 ]
-  - location: 12 (remaining gas: 1039992.611 units remaining)
+  - location: 12 (remaining gas: 1039993.426 units remaining)
     [ 2 ]
-  - location: 10 (remaining gas: 1039992.596 units remaining)
+  - location: 10 (remaining gas: 1039993.416 units remaining)
     [ 2 ]
-  - location: 15 (remaining gas: 1039992.581 units remaining)
+  - location: 15 (remaining gas: 1039993.406 units remaining)
     [ {}
       2 ]
-  - location: 17 (remaining gas: 1039992.566 units remaining)
+  - location: 17 (remaining gas: 1039993.396 units remaining)
     [ (Pair {} 2) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Left 0)-0].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Left 0)-0].out
index 327a08473222e580a49cb695a3c78ebd146ecbb7..fd744c3d504d4006e682743b54efa08c25582688 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Left 0)-0].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Left 0)-0].out	
@@ -7,19 +7,19 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (remaining gas: 1039992.671 units remaining)
+  - location: 9 (remaining gas: 1039993.471 units remaining)
     [ (Pair (Left 0) 0) ]
-  - location: 9 (remaining gas: 1039992.661 units remaining)
+  - location: 9 (remaining gas: 1039993.461 units remaining)
     [ (Left 0) ]
-  - location: 10 (remaining gas: 1039992.651 units remaining)
+  - location: 10 (remaining gas: 1039993.451 units remaining)
     [ 0 ]
-  - location: 12 (remaining gas: 1039992.611 units remaining)
+  - location: 12 (remaining gas: 1039993.426 units remaining)
     [ 0 ]
-  - location: 10 (remaining gas: 1039992.596 units remaining)
+  - location: 10 (remaining gas: 1039993.416 units remaining)
     [ 0 ]
-  - location: 15 (remaining gas: 1039992.581 units remaining)
+  - location: 15 (remaining gas: 1039993.406 units remaining)
     [ {}
       0 ]
-  - location: 17 (remaining gas: 1039992.566 units remaining)
+  - location: 17 (remaining gas: 1039993.396 units remaining)
     [ (Pair {} 0) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Left 2)--2].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Left 2)--2].out
index fe7f4bd2ec57161f040e96d7cc182d142a070612..34844535474ef478aba7e486d548e1898eed60b5 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Left 2)--2].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Left 2)--2].out	
@@ -7,19 +7,19 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (remaining gas: 1039992.671 units remaining)
+  - location: 9 (remaining gas: 1039993.471 units remaining)
     [ (Pair (Left 2) 0) ]
-  - location: 9 (remaining gas: 1039992.661 units remaining)
+  - location: 9 (remaining gas: 1039993.461 units remaining)
     [ (Left 2) ]
-  - location: 10 (remaining gas: 1039992.651 units remaining)
+  - location: 10 (remaining gas: 1039993.451 units remaining)
     [ 2 ]
-  - location: 12 (remaining gas: 1039992.611 units remaining)
+  - location: 12 (remaining gas: 1039993.426 units remaining)
     [ -2 ]
-  - location: 10 (remaining gas: 1039992.596 units remaining)
+  - location: 10 (remaining gas: 1039993.416 units remaining)
     [ -2 ]
-  - location: 15 (remaining gas: 1039992.581 units remaining)
+  - location: 15 (remaining gas: 1039993.406 units remaining)
     [ {}
       -2 ]
-  - location: 17 (remaining gas: 1039992.566 units remaining)
+  - location: 17 (remaining gas: 1039993.396 units remaining)
     [ (Pair {} -2) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Right 0)-0].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Right 0)-0].out
index fd5844e4a6756e89015dda3c6fa44309f0105df8..1df71c175d428d6010a9e09524f44a5482fe6bb0 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Right 0)-0].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Right 0)-0].out	
@@ -7,19 +7,19 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (remaining gas: 1039992.671 units remaining)
+  - location: 9 (remaining gas: 1039993.471 units remaining)
     [ (Pair (Right 0) 0) ]
-  - location: 9 (remaining gas: 1039992.661 units remaining)
+  - location: 9 (remaining gas: 1039993.461 units remaining)
     [ (Right 0) ]
-  - location: 10 (remaining gas: 1039992.651 units remaining)
+  - location: 10 (remaining gas: 1039993.451 units remaining)
     [ 0 ]
-  - location: 14 (remaining gas: 1039992.611 units remaining)
+  - location: 14 (remaining gas: 1039993.426 units remaining)
     [ 0 ]
-  - location: 10 (remaining gas: 1039992.596 units remaining)
+  - location: 10 (remaining gas: 1039993.416 units remaining)
     [ 0 ]
-  - location: 15 (remaining gas: 1039992.581 units remaining)
+  - location: 15 (remaining gas: 1039993.406 units remaining)
     [ {}
       0 ]
-  - location: 17 (remaining gas: 1039992.566 units remaining)
+  - location: 17 (remaining gas: 1039993.396 units remaining)
     [ (Pair {} 0) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Right 2)--2].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Right 2)--2].out
index b806c7ca16d475ba002bed298b9f2689ee933a2b..e730efe3dcbfc4687f59d988b8e0db877546267c 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Right 2)--2].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[neg.tz-0-(Right 2)--2].out	
@@ -7,19 +7,19 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (remaining gas: 1039992.671 units remaining)
+  - location: 9 (remaining gas: 1039993.471 units remaining)
     [ (Pair (Right 2) 0) ]
-  - location: 9 (remaining gas: 1039992.661 units remaining)
+  - location: 9 (remaining gas: 1039993.461 units remaining)
     [ (Right 2) ]
-  - location: 10 (remaining gas: 1039992.651 units remaining)
+  - location: 10 (remaining gas: 1039993.451 units remaining)
     [ 2 ]
-  - location: 14 (remaining gas: 1039992.611 units remaining)
+  - location: 14 (remaining gas: 1039993.426 units remaining)
     [ -2 ]
-  - location: 10 (remaining gas: 1039992.596 units remaining)
+  - location: 10 (remaining gas: 1039993.416 units remaining)
     [ -2 ]
-  - location: 15 (remaining gas: 1039992.581 units remaining)
+  - location: 15 (remaining gas: 1039993.406 units remaining)
     [ {}
       -2 ]
-  - location: 17 (remaining gas: 1039992.566 units remaining)
+  - location: 17 (remaining gas: 1039993.396 units remaining)
     [ (Pair {} -2) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[none.tz-Some 10-Unit-None].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[none.tz-Some 10-Unit-None].out
index e299682e5d22467de6377674a38df8eb5a661383..f33349181fb3fada8c34b7959b75c9bf78665e7c 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[none.tz-Some 10-Unit-None].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[none.tz-Some 10-Unit-None].out	
@@ -7,15 +7,15 @@ emitted operations
 big_map diff
   
 trace
-  - location: 8 (remaining gas: 1039994.292 units remaining)
+  - location: 8 (remaining gas: 1039995.092 units remaining)
     [ (Pair Unit (Some 10)) ]
-  - location: 8 (remaining gas: 1039994.282 units remaining)
+  - location: 8 (remaining gas: 1039995.082 units remaining)
     [  ]
-  - location: 9 (remaining gas: 1039994.267 units remaining)
+  - location: 9 (remaining gas: 1039995.072 units remaining)
     [ None ]
-  - location: 11 (remaining gas: 1039994.252 units remaining)
+  - location: 11 (remaining gas: 1039995.062 units remaining)
     [ {}
       None ]
-  - location: 13 (remaining gas: 1039994.237 units remaining)
+  - location: 13 (remaining gas: 1039995.052 units remaining)
     [ (Pair {} None) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not.tz-None-False-(Some True)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not.tz-None-False-(Some True)].out
index 5379d4d3e3f6333afd6e538119544004ba562180..5aa9eb56ef1d7b1e2e1a319bd447905f1cd18226 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not.tz-None-False-(Some True)].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not.tz-None-False-(Some True)].out	
@@ -7,17 +7,17 @@ emitted operations
 big_map diff
   
 trace
-  - location: 8 (remaining gas: 1039993.922 units remaining)
+  - location: 8 (remaining gas: 1039994.722 units remaining)
     [ (Pair False None) ]
-  - location: 8 (remaining gas: 1039993.912 units remaining)
+  - location: 8 (remaining gas: 1039994.712 units remaining)
     [ False ]
-  - location: 9 (remaining gas: 1039993.902 units remaining)
+  - location: 9 (remaining gas: 1039994.702 units remaining)
     [ True ]
-  - location: 10 (remaining gas: 1039993.887 units remaining)
+  - location: 10 (remaining gas: 1039994.692 units remaining)
     [ (Some True) ]
-  - location: 11 (remaining gas: 1039993.872 units remaining)
+  - location: 11 (remaining gas: 1039994.682 units remaining)
     [ {}
       (Some True) ]
-  - location: 13 (remaining gas: 1039993.857 units remaining)
+  - location: 13 (remaining gas: 1039994.672 units remaining)
     [ (Pair {} (Some True)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not.tz-None-True-(Some False)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not.tz-None-True-(Some False)].out
index 8a42e4ddfc1ef7d848e984ef114933cfac4983f1..6fbfaa4939226c3ade362c9ac2c06e301709a3cc 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not.tz-None-True-(Some False)].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not.tz-None-True-(Some False)].out	
@@ -7,17 +7,17 @@ emitted operations
 big_map diff
   
 trace
-  - location: 8 (remaining gas: 1039993.922 units remaining)
+  - location: 8 (remaining gas: 1039994.722 units remaining)
     [ (Pair True None) ]
-  - location: 8 (remaining gas: 1039993.912 units remaining)
+  - location: 8 (remaining gas: 1039994.712 units remaining)
     [ True ]
-  - location: 9 (remaining gas: 1039993.902 units remaining)
+  - location: 9 (remaining gas: 1039994.702 units remaining)
     [ False ]
-  - location: 10 (remaining gas: 1039993.887 units remaining)
+  - location: 10 (remaining gas: 1039994.692 units remaining)
     [ (Some False) ]
-  - location: 11 (remaining gas: 1039993.872 units remaining)
+  - location: 11 (remaining gas: 1039994.682 units remaining)
     [ {}
       (Some False) ]
-  - location: 13 (remaining gas: 1039993.857 units remaining)
+  - location: 13 (remaining gas: 1039994.672 units remaining)
     [ (Pair {} (Some False)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left -8)-(Some 7)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left -8)-(Some 7)].out
index c39edfa424d06cf0e94ad7ecc3f78127389be808..20d65a11f832a854f190c8abbf0305d82068a9c4 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left -8)-(Some 7)].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left -8)-(Some 7)].out	
@@ -7,21 +7,21 @@ emitted operations
 big_map diff
   
 trace
-  - location: 10 (remaining gas: 1039991.670 units remaining)
+  - location: 10 (remaining gas: 1039992.630 units remaining)
     [ (Pair (Left -8) None) ]
-  - location: 10 (remaining gas: 1039991.660 units remaining)
+  - location: 10 (remaining gas: 1039992.620 units remaining)
     [ (Left -8) ]
-  - location: 11 (remaining gas: 1039991.650 units remaining)
+  - location: 11 (remaining gas: 1039992.610 units remaining)
     [ -8 ]
-  - location: 13 (remaining gas: 1039991.600 units remaining)
+  - location: 13 (remaining gas: 1039992.585 units remaining)
     [ 7 ]
-  - location: 11 (remaining gas: 1039991.585 units remaining)
+  - location: 11 (remaining gas: 1039992.575 units remaining)
     [ 7 ]
-  - location: 16 (remaining gas: 1039991.570 units remaining)
+  - location: 16 (remaining gas: 1039992.565 units remaining)
     [ (Some 7) ]
-  - location: 17 (remaining gas: 1039991.555 units remaining)
+  - location: 17 (remaining gas: 1039992.555 units remaining)
     [ {}
       (Some 7) ]
-  - location: 19 (remaining gas: 1039991.540 units remaining)
+  - location: 19 (remaining gas: 1039992.545 units remaining)
     [ (Pair {} (Some 7)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left -9)-(Some 8)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left -9)-(Some 8)].out
index 31de7c291f189906e6dc995ee866454d44698b13..78b9406dd832edffa4fd5871fa2c900d63a1c634 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left -9)-(Some 8)].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left -9)-(Some 8)].out	
@@ -7,21 +7,21 @@ emitted operations
 big_map diff
   
 trace
-  - location: 10 (remaining gas: 1039991.670 units remaining)
+  - location: 10 (remaining gas: 1039992.630 units remaining)
     [ (Pair (Left -9) None) ]
-  - location: 10 (remaining gas: 1039991.660 units remaining)
+  - location: 10 (remaining gas: 1039992.620 units remaining)
     [ (Left -9) ]
-  - location: 11 (remaining gas: 1039991.650 units remaining)
+  - location: 11 (remaining gas: 1039992.610 units remaining)
     [ -9 ]
-  - location: 13 (remaining gas: 1039991.600 units remaining)
+  - location: 13 (remaining gas: 1039992.585 units remaining)
     [ 8 ]
-  - location: 11 (remaining gas: 1039991.585 units remaining)
+  - location: 11 (remaining gas: 1039992.575 units remaining)
     [ 8 ]
-  - location: 16 (remaining gas: 1039991.570 units remaining)
+  - location: 16 (remaining gas: 1039992.565 units remaining)
     [ (Some 8) ]
-  - location: 17 (remaining gas: 1039991.555 units remaining)
+  - location: 17 (remaining gas: 1039992.555 units remaining)
     [ {}
       (Some 8) ]
-  - location: 19 (remaining gas: 1039991.540 units remaining)
+  - location: 19 (remaining gas: 1039992.545 units remaining)
     [ (Pair {} (Some 8)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left 0)-(Some -1)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left 0)-(Some -1)].out
index 1a402e6d1a8e4442ffb744fd9669d0d6926d0f9b..46483b2e3036b7cd04d9e17a82f257fc946421ab 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left 0)-(Some -1)].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left 0)-(Some -1)].out	
@@ -7,21 +7,21 @@ emitted operations
 big_map diff
   
 trace
-  - location: 10 (remaining gas: 1039991.670 units remaining)
+  - location: 10 (remaining gas: 1039992.630 units remaining)
     [ (Pair (Left 0) None) ]
-  - location: 10 (remaining gas: 1039991.660 units remaining)
+  - location: 10 (remaining gas: 1039992.620 units remaining)
     [ (Left 0) ]
-  - location: 11 (remaining gas: 1039991.650 units remaining)
+  - location: 11 (remaining gas: 1039992.610 units remaining)
     [ 0 ]
-  - location: 13 (remaining gas: 1039991.600 units remaining)
+  - location: 13 (remaining gas: 1039992.585 units remaining)
     [ -1 ]
-  - location: 11 (remaining gas: 1039991.585 units remaining)
+  - location: 11 (remaining gas: 1039992.575 units remaining)
     [ -1 ]
-  - location: 16 (remaining gas: 1039991.570 units remaining)
+  - location: 16 (remaining gas: 1039992.565 units remaining)
     [ (Some -1) ]
-  - location: 17 (remaining gas: 1039991.555 units remaining)
+  - location: 17 (remaining gas: 1039992.555 units remaining)
     [ {}
       (Some -1) ]
-  - location: 19 (remaining gas: 1039991.540 units remaining)
+  - location: 19 (remaining gas: 1039992.545 units remaining)
     [ (Pair {} (Some -1)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left 7)-(Some -8)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left 7)-(Some -8)].out
index f7fa9cb29f011ae6d9593de40938c197d142c1cb..9813886ed5c5ddc36f965981f15df464345c1042 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left 7)-(Some -8)].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left 7)-(Some -8)].out	
@@ -7,21 +7,21 @@ emitted operations
 big_map diff
   
 trace
-  - location: 10 (remaining gas: 1039991.670 units remaining)
+  - location: 10 (remaining gas: 1039992.630 units remaining)
     [ (Pair (Left 7) None) ]
-  - location: 10 (remaining gas: 1039991.660 units remaining)
+  - location: 10 (remaining gas: 1039992.620 units remaining)
     [ (Left 7) ]
-  - location: 11 (remaining gas: 1039991.650 units remaining)
+  - location: 11 (remaining gas: 1039992.610 units remaining)
     [ 7 ]
-  - location: 13 (remaining gas: 1039991.600 units remaining)
+  - location: 13 (remaining gas: 1039992.585 units remaining)
     [ -8 ]
-  - location: 11 (remaining gas: 1039991.585 units remaining)
+  - location: 11 (remaining gas: 1039992.575 units remaining)
     [ -8 ]
-  - location: 16 (remaining gas: 1039991.570 units remaining)
+  - location: 16 (remaining gas: 1039992.565 units remaining)
     [ (Some -8) ]
-  - location: 17 (remaining gas: 1039991.555 units remaining)
+  - location: 17 (remaining gas: 1039992.555 units remaining)
     [ {}
       (Some -8) ]
-  - location: 19 (remaining gas: 1039991.540 units remaining)
+  - location: 19 (remaining gas: 1039992.545 units remaining)
     [ (Pair {} (Some -8)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left 8)-(Some -9)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left 8)-(Some -9)].out
index 068d965db6a69d392b9a10981b2246e2a85521de..c764d1cda1048b68bb871e94b3dde8b64a98a78f 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left 8)-(Some -9)].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Left 8)-(Some -9)].out	
@@ -7,21 +7,21 @@ emitted operations
 big_map diff
   
 trace
-  - location: 10 (remaining gas: 1039991.670 units remaining)
+  - location: 10 (remaining gas: 1039992.630 units remaining)
     [ (Pair (Left 8) None) ]
-  - location: 10 (remaining gas: 1039991.660 units remaining)
+  - location: 10 (remaining gas: 1039992.620 units remaining)
     [ (Left 8) ]
-  - location: 11 (remaining gas: 1039991.650 units remaining)
+  - location: 11 (remaining gas: 1039992.610 units remaining)
     [ 8 ]
-  - location: 13 (remaining gas: 1039991.600 units remaining)
+  - location: 13 (remaining gas: 1039992.585 units remaining)
     [ -9 ]
-  - location: 11 (remaining gas: 1039991.585 units remaining)
+  - location: 11 (remaining gas: 1039992.575 units remaining)
     [ -9 ]
-  - location: 16 (remaining gas: 1039991.570 units remaining)
+  - location: 16 (remaining gas: 1039992.565 units remaining)
     [ (Some -9) ]
-  - location: 17 (remaining gas: 1039991.555 units remaining)
+  - location: 17 (remaining gas: 1039992.555 units remaining)
     [ {}
       (Some -9) ]
-  - location: 19 (remaining gas: 1039991.540 units remaining)
+  - location: 19 (remaining gas: 1039992.545 units remaining)
     [ (Pair {} (Some -9)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Right 0)-(Some -1)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Right 0)-(Some -1)].out
index 1dccb9d286c6a1e98bbe7bd15b3df72bf0a9029b..bef51f0db31bc6477e5ba2bc0164af5b13a71cca 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Right 0)-(Some -1)].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Right 0)-(Some -1)].out	
@@ -7,21 +7,21 @@ emitted operations
 big_map diff
   
 trace
-  - location: 10 (remaining gas: 1039991.670 units remaining)
+  - location: 10 (remaining gas: 1039992.630 units remaining)
     [ (Pair (Right 0) None) ]
-  - location: 10 (remaining gas: 1039991.660 units remaining)
+  - location: 10 (remaining gas: 1039992.620 units remaining)
     [ (Right 0) ]
-  - location: 11 (remaining gas: 1039991.650 units remaining)
+  - location: 11 (remaining gas: 1039992.610 units remaining)
     [ 0 ]
-  - location: 15 (remaining gas: 1039991.600 units remaining)
+  - location: 15 (remaining gas: 1039992.585 units remaining)
     [ -1 ]
-  - location: 11 (remaining gas: 1039991.585 units remaining)
+  - location: 11 (remaining gas: 1039992.575 units remaining)
     [ -1 ]
-  - location: 16 (remaining gas: 1039991.570 units remaining)
+  - location: 16 (remaining gas: 1039992.565 units remaining)
     [ (Some -1) ]
-  - location: 17 (remaining gas: 1039991.555 units remaining)
+  - location: 17 (remaining gas: 1039992.555 units remaining)
     [ {}
       (Some -1) ]
-  - location: 19 (remaining gas: 1039991.540 units remaining)
+  - location: 19 (remaining gas: 1039992.545 units remaining)
     [ (Pair {} (Some -1)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Right 7)-(Some -8)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Right 7)-(Some -8)].out
index 92252f8a95b7fe36983e94f27efa87dc1bce4029..e4671c92658a88c2aaa690c0ce44c1d064ba0e28 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Right 7)-(Some -8)].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Right 7)-(Some -8)].out	
@@ -7,21 +7,21 @@ emitted operations
 big_map diff
   
 trace
-  - location: 10 (remaining gas: 1039991.670 units remaining)
+  - location: 10 (remaining gas: 1039992.630 units remaining)
     [ (Pair (Right 7) None) ]
-  - location: 10 (remaining gas: 1039991.660 units remaining)
+  - location: 10 (remaining gas: 1039992.620 units remaining)
     [ (Right 7) ]
-  - location: 11 (remaining gas: 1039991.650 units remaining)
+  - location: 11 (remaining gas: 1039992.610 units remaining)
     [ 7 ]
-  - location: 15 (remaining gas: 1039991.600 units remaining)
+  - location: 15 (remaining gas: 1039992.585 units remaining)
     [ -8 ]
-  - location: 11 (remaining gas: 1039991.585 units remaining)
+  - location: 11 (remaining gas: 1039992.575 units remaining)
     [ -8 ]
-  - location: 16 (remaining gas: 1039991.570 units remaining)
+  - location: 16 (remaining gas: 1039992.565 units remaining)
     [ (Some -8) ]
-  - location: 17 (remaining gas: 1039991.555 units remaining)
+  - location: 17 (remaining gas: 1039992.555 units remaining)
     [ {}
       (Some -8) ]
-  - location: 19 (remaining gas: 1039991.540 units remaining)
+  - location: 19 (remaining gas: 1039992.545 units remaining)
     [ (Pair {} (Some -8)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Right 8)-(Some -9)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Right 8)-(Some -9)].out
index e6289e7b68851ca9e35d36c367b9d54dbb7bbd2b..a4ff668f416bb9b2ea36d8854315048fb5b5ac5b 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Right 8)-(Some -9)].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[not_binary.tz-None-(Right 8)-(Some -9)].out	
@@ -7,21 +7,21 @@ emitted operations
 big_map diff
   
 trace
-  - location: 10 (remaining gas: 1039991.670 units remaining)
+  - location: 10 (remaining gas: 1039992.630 units remaining)
     [ (Pair (Right 8) None) ]
-  - location: 10 (remaining gas: 1039991.660 units remaining)
+  - location: 10 (remaining gas: 1039992.620 units remaining)
     [ (Right 8) ]
-  - location: 11 (remaining gas: 1039991.650 units remaining)
+  - location: 11 (remaining gas: 1039992.610 units remaining)
     [ 8 ]
-  - location: 15 (remaining gas: 1039991.600 units remaining)
+  - location: 15 (remaining gas: 1039992.585 units remaining)
     [ -9 ]
-  - location: 11 (remaining gas: 1039991.585 units remaining)
+  - location: 11 (remaining gas: 1039992.575 units remaining)
     [ -9 ]
-  - location: 16 (remaining gas: 1039991.570 units remaining)
+  - location: 16 (remaining gas: 1039992.565 units remaining)
     [ (Some -9) ]
-  - location: 17 (remaining gas: 1039991.555 units remaining)
+  - location: 17 (remaining gas: 1039992.555 units remaining)
     [ {}
       (Some -9) ]
-  - location: 19 (remaining gas: 1039991.540 units remaining)
+  - location: 19 (remaining gas: 1039992.545 units remaining)
     [ (Pair {} (Some -9)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or.tz-None-(Pair False False)-(Some False)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or.tz-None-(Pair False False)-(Some False)].out
index 8759d876c46fc72bc0e8ea0d0599c02912b6aa7d..01ff3f3c01b66d50d5ad94c85022ff0816a2f7a5 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or.tz-None-(Pair False False)-(Some False)].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or.tz-None-(Pair False False)-(Some False)].out	
@@ -7,29 +7,29 @@ emitted operations
 big_map diff
   
 trace
-  - location: 10 (remaining gas: 1039990.680 units remaining)
+  - location: 10 (remaining gas: 1039991.480 units remaining)
     [ (Pair (Pair False False) None) ]
-  - location: 10 (remaining gas: 1039990.670 units remaining)
+  - location: 10 (remaining gas: 1039991.470 units remaining)
     [ (Pair False False) ]
-  - location: 11 (remaining gas: 1039990.660 units remaining)
+  - location: 11 (remaining gas: 1039991.460 units remaining)
     [ (Pair False False)
       (Pair False False) ]
-  - location: 12 (remaining gas: 1039990.650 units remaining)
+  - location: 12 (remaining gas: 1039991.450 units remaining)
     [ False
       (Pair False False) ]
-  - location: 13 (remaining gas: 1039990.640 units remaining)
+  - location: 13 (remaining gas: 1039991.440 units remaining)
     [ (Pair False False)
       False ]
-  - location: 14 (remaining gas: 1039990.630 units remaining)
+  - location: 14 (remaining gas: 1039991.430 units remaining)
     [ False
       False ]
-  - location: 15 (remaining gas: 1039990.615 units remaining)
+  - location: 15 (remaining gas: 1039991.420 units remaining)
     [ False ]
-  - location: 16 (remaining gas: 1039990.600 units remaining)
+  - location: 16 (remaining gas: 1039991.410 units remaining)
     [ (Some False) ]
-  - location: 17 (remaining gas: 1039990.585 units remaining)
+  - location: 17 (remaining gas: 1039991.400 units remaining)
     [ {}
       (Some False) ]
-  - location: 19 (remaining gas: 1039990.570 units remaining)
+  - location: 19 (remaining gas: 1039991.390 units remaining)
     [ (Pair {} (Some False)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or.tz-None-(Pair False True)-(Some True)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or.tz-None-(Pair False True)-(Some True)].out
index a8393663ba6f5a094cb003d3c0b7df00f3ba73fa..cdd8145e5d50d7bb1e7d467e82f475d72aa9946a 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or.tz-None-(Pair False True)-(Some True)].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or.tz-None-(Pair False True)-(Some True)].out	
@@ -7,29 +7,29 @@ emitted operations
 big_map diff
   
 trace
-  - location: 10 (remaining gas: 1039990.680 units remaining)
+  - location: 10 (remaining gas: 1039991.480 units remaining)
     [ (Pair (Pair False True) None) ]
-  - location: 10 (remaining gas: 1039990.670 units remaining)
+  - location: 10 (remaining gas: 1039991.470 units remaining)
     [ (Pair False True) ]
-  - location: 11 (remaining gas: 1039990.660 units remaining)
+  - location: 11 (remaining gas: 1039991.460 units remaining)
     [ (Pair False True)
       (Pair False True) ]
-  - location: 12 (remaining gas: 1039990.650 units remaining)
+  - location: 12 (remaining gas: 1039991.450 units remaining)
     [ False
       (Pair False True) ]
-  - location: 13 (remaining gas: 1039990.640 units remaining)
+  - location: 13 (remaining gas: 1039991.440 units remaining)
     [ (Pair False True)
       False ]
-  - location: 14 (remaining gas: 1039990.630 units remaining)
+  - location: 14 (remaining gas: 1039991.430 units remaining)
     [ True
       False ]
-  - location: 15 (remaining gas: 1039990.615 units remaining)
+  - location: 15 (remaining gas: 1039991.420 units remaining)
     [ True ]
-  - location: 16 (remaining gas: 1039990.600 units remaining)
+  - location: 16 (remaining gas: 1039991.410 units remaining)
     [ (Some True) ]
-  - location: 17 (remaining gas: 1039990.585 units remaining)
+  - location: 17 (remaining gas: 1039991.400 units remaining)
     [ {}
       (Some True) ]
-  - location: 19 (remaining gas: 1039990.570 units remaining)
+  - location: 19 (remaining gas: 1039991.390 units remaining)
     [ (Pair {} (Some True)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or.tz-None-(Pair True False)-(Some True)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or.tz-None-(Pair True False)-(Some True)].out
index 9153103621241dedd408a4eab69305e5ada1199c..3faa65bc7a91d8b062067ca86c1b4b5f2ca581bc 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or.tz-None-(Pair True False)-(Some True)].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or.tz-None-(Pair True False)-(Some True)].out	
@@ -7,29 +7,29 @@ emitted operations
 big_map diff
   
 trace
-  - location: 10 (remaining gas: 1039990.680 units remaining)
+  - location: 10 (remaining gas: 1039991.480 units remaining)
     [ (Pair (Pair True False) None) ]
-  - location: 10 (remaining gas: 1039990.670 units remaining)
+  - location: 10 (remaining gas: 1039991.470 units remaining)
     [ (Pair True False) ]
-  - location: 11 (remaining gas: 1039990.660 units remaining)
+  - location: 11 (remaining gas: 1039991.460 units remaining)
     [ (Pair True False)
       (Pair True False) ]
-  - location: 12 (remaining gas: 1039990.650 units remaining)
+  - location: 12 (remaining gas: 1039991.450 units remaining)
     [ True
       (Pair True False) ]
-  - location: 13 (remaining gas: 1039990.640 units remaining)
+  - location: 13 (remaining gas: 1039991.440 units remaining)
     [ (Pair True False)
       True ]
-  - location: 14 (remaining gas: 1039990.630 units remaining)
+  - location: 14 (remaining gas: 1039991.430 units remaining)
     [ False
       True ]
-  - location: 15 (remaining gas: 1039990.615 units remaining)
+  - location: 15 (remaining gas: 1039991.420 units remaining)
     [ True ]
-  - location: 16 (remaining gas: 1039990.600 units remaining)
+  - location: 16 (remaining gas: 1039991.410 units remaining)
     [ (Some True) ]
-  - location: 17 (remaining gas: 1039990.585 units remaining)
+  - location: 17 (remaining gas: 1039991.400 units remaining)
     [ {}
       (Some True) ]
-  - location: 19 (remaining gas: 1039990.570 units remaining)
+  - location: 19 (remaining gas: 1039991.390 units remaining)
     [ (Pair {} (Some True)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or.tz-None-(Pair True True)-(Some True)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or.tz-None-(Pair True True)-(Some True)].out
index 8b9317c87b31d2c2bdd371d505c99bb185aacd7f..41073064def005dca70fa39dd813591256d12645 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or.tz-None-(Pair True True)-(Some True)].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or.tz-None-(Pair True True)-(Some True)].out	
@@ -7,29 +7,29 @@ emitted operations
 big_map diff
   
 trace
-  - location: 10 (remaining gas: 1039990.680 units remaining)
+  - location: 10 (remaining gas: 1039991.480 units remaining)
     [ (Pair (Pair True True) None) ]
-  - location: 10 (remaining gas: 1039990.670 units remaining)
+  - location: 10 (remaining gas: 1039991.470 units remaining)
     [ (Pair True True) ]
-  - location: 11 (remaining gas: 1039990.660 units remaining)
+  - location: 11 (remaining gas: 1039991.460 units remaining)
     [ (Pair True True)
       (Pair True True) ]
-  - location: 12 (remaining gas: 1039990.650 units remaining)
+  - location: 12 (remaining gas: 1039991.450 units remaining)
     [ True
       (Pair True True) ]
-  - location: 13 (remaining gas: 1039990.640 units remaining)
+  - location: 13 (remaining gas: 1039991.440 units remaining)
     [ (Pair True True)
       True ]
-  - location: 14 (remaining gas: 1039990.630 units remaining)
+  - location: 14 (remaining gas: 1039991.430 units remaining)
     [ True
       True ]
-  - location: 15 (remaining gas: 1039990.615 units remaining)
+  - location: 15 (remaining gas: 1039991.420 units remaining)
     [ True ]
-  - location: 16 (remaining gas: 1039990.600 units remaining)
+  - location: 16 (remaining gas: 1039991.410 units remaining)
     [ (Some True) ]
-  - location: 17 (remaining gas: 1039990.585 units remaining)
+  - location: 17 (remaining gas: 1039991.400 units remaining)
     [ {}
       (Some True) ]
-  - location: 19 (remaining gas: 1039990.570 units remaining)
+  - location: 19 (remaining gas: 1039991.390 units remaining)
     [ (Pair {} (Some True)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 0 8)-(Some 8)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 0 8)-(Some 8)].out
index 807dd3877e24597f85da3c346a5731c82ca51f98..b5ce21370bee1f26453a8e1a599db37cf47258dd 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 0 8)-(Some 8)].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 0 8)-(Some 8)].out	
@@ -7,20 +7,20 @@ emitted operations
 big_map diff
   
 trace
-  - location: 10 (remaining gas: 1039992.789 units remaining)
+  - location: 10 (remaining gas: 1039993.589 units remaining)
     [ (Pair (Pair 0 8) None) ]
-  - location: 10 (remaining gas: 1039992.779 units remaining)
+  - location: 10 (remaining gas: 1039993.579 units remaining)
     [ (Pair 0 8) ]
-  - location: 11 (remaining gas: 1039992.769 units remaining)
+  - location: 11 (remaining gas: 1039993.569 units remaining)
     [ 0
       8 ]
-  - location: 12 (remaining gas: 1039992.714 units remaining)
+  - location: 12 (remaining gas: 1039993.534 units remaining)
     [ 8 ]
-  - location: 13 (remaining gas: 1039992.699 units remaining)
+  - location: 13 (remaining gas: 1039993.524 units remaining)
     [ (Some 8) ]
-  - location: 14 (remaining gas: 1039992.684 units remaining)
+  - location: 14 (remaining gas: 1039993.514 units remaining)
     [ {}
       (Some 8) ]
-  - location: 16 (remaining gas: 1039992.669 units remaining)
+  - location: 16 (remaining gas: 1039993.504 units remaining)
     [ (Pair {} (Some 8)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 14 1)-(Some 15)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 14 1)-(Some 15)].out
index 95988010344a9ca33b445d9aa2cb775207159741..3bad3400943246df33f926f031bb04f442f123c6 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 14 1)-(Some 15)].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 14 1)-(Some 15)].out	
@@ -7,20 +7,20 @@ emitted operations
 big_map diff
   
 trace
-  - location: 10 (remaining gas: 1039992.789 units remaining)
+  - location: 10 (remaining gas: 1039993.589 units remaining)
     [ (Pair (Pair 14 1) None) ]
-  - location: 10 (remaining gas: 1039992.779 units remaining)
+  - location: 10 (remaining gas: 1039993.579 units remaining)
     [ (Pair 14 1) ]
-  - location: 11 (remaining gas: 1039992.769 units remaining)
+  - location: 11 (remaining gas: 1039993.569 units remaining)
     [ 14
       1 ]
-  - location: 12 (remaining gas: 1039992.714 units remaining)
+  - location: 12 (remaining gas: 1039993.534 units remaining)
     [ 15 ]
-  - location: 13 (remaining gas: 1039992.699 units remaining)
+  - location: 13 (remaining gas: 1039993.524 units remaining)
     [ (Some 15) ]
-  - location: 14 (remaining gas: 1039992.684 units remaining)
+  - location: 14 (remaining gas: 1039993.514 units remaining)
     [ {}
       (Some 15) ]
-  - location: 16 (remaining gas: 1039992.669 units remaining)
+  - location: 16 (remaining gas: 1039993.504 units remaining)
     [ (Pair {} (Some 15)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 15 4)-(Some 15)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 15 4)-(Some 15)].out
index b8605f1a082ffb97bb7ea36acd0f06579447c5d8..06c67355b9543fc9fb8770fa711923554300c49a 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 15 4)-(Some 15)].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 15 4)-(Some 15)].out	
@@ -7,20 +7,20 @@ emitted operations
 big_map diff
   
 trace
-  - location: 10 (remaining gas: 1039992.789 units remaining)
+  - location: 10 (remaining gas: 1039993.589 units remaining)
     [ (Pair (Pair 15 4) None) ]
-  - location: 10 (remaining gas: 1039992.779 units remaining)
+  - location: 10 (remaining gas: 1039993.579 units remaining)
     [ (Pair 15 4) ]
-  - location: 11 (remaining gas: 1039992.769 units remaining)
+  - location: 11 (remaining gas: 1039993.569 units remaining)
     [ 15
       4 ]
-  - location: 12 (remaining gas: 1039992.714 units remaining)
+  - location: 12 (remaining gas: 1039993.534 units remaining)
     [ 15 ]
-  - location: 13 (remaining gas: 1039992.699 units remaining)
+  - location: 13 (remaining gas: 1039993.524 units remaining)
     [ (Some 15) ]
-  - location: 14 (remaining gas: 1039992.684 units remaining)
+  - location: 14 (remaining gas: 1039993.514 units remaining)
     [ {}
       (Some 15) ]
-  - location: 16 (remaining gas: 1039992.669 units remaining)
+  - location: 16 (remaining gas: 1039993.504 units remaining)
     [ (Pair {} (Some 15)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 4 8)-(Some 12)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 4 8)-(Some 12)].out
index 5b84b6362c93cfcb9bde4d1d884951388c562dac..f48d6c443f79ec40a9b9a91877bd235d7f1131ad 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 4 8)-(Some 12)].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 4 8)-(Some 12)].out	
@@ -7,20 +7,20 @@ emitted operations
 big_map diff
   
 trace
-  - location: 10 (remaining gas: 1039992.789 units remaining)
+  - location: 10 (remaining gas: 1039993.589 units remaining)
     [ (Pair (Pair 4 8) None) ]
-  - location: 10 (remaining gas: 1039992.779 units remaining)
+  - location: 10 (remaining gas: 1039993.579 units remaining)
     [ (Pair 4 8) ]
-  - location: 11 (remaining gas: 1039992.769 units remaining)
+  - location: 11 (remaining gas: 1039993.569 units remaining)
     [ 4
       8 ]
-  - location: 12 (remaining gas: 1039992.714 units remaining)
+  - location: 12 (remaining gas: 1039993.534 units remaining)
     [ 12 ]
-  - location: 13 (remaining gas: 1039992.699 units remaining)
+  - location: 13 (remaining gas: 1039993.524 units remaining)
     [ (Some 12) ]
-  - location: 14 (remaining gas: 1039992.684 units remaining)
+  - location: 14 (remaining gas: 1039993.514 units remaining)
     [ {}
       (Some 12) ]
-  - location: 16 (remaining gas: 1039992.669 units remaining)
+  - location: 16 (remaining gas: 1039993.504 units remaining)
     [ (Pair {} (Some 12)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 7 7)-(Some 7)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 7 7)-(Some 7)].out
index 0a35709f92009c4d67e666e2bd83dbf313eda26d..dc793471feb6e578badde863dee8b88ca527c5a5 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 7 7)-(Some 7)].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 7 7)-(Some 7)].out	
@@ -7,20 +7,20 @@ emitted operations
 big_map diff
   
 trace
-  - location: 10 (remaining gas: 1039992.789 units remaining)
+  - location: 10 (remaining gas: 1039993.589 units remaining)
     [ (Pair (Pair 7 7) None) ]
-  - location: 10 (remaining gas: 1039992.779 units remaining)
+  - location: 10 (remaining gas: 1039993.579 units remaining)
     [ (Pair 7 7) ]
-  - location: 11 (remaining gas: 1039992.769 units remaining)
+  - location: 11 (remaining gas: 1039993.569 units remaining)
     [ 7
       7 ]
-  - location: 12 (remaining gas: 1039992.714 units remaining)
+  - location: 12 (remaining gas: 1039993.534 units remaining)
     [ 7 ]
-  - location: 13 (remaining gas: 1039992.699 units remaining)
+  - location: 13 (remaining gas: 1039993.524 units remaining)
     [ (Some 7) ]
-  - location: 14 (remaining gas: 1039992.684 units remaining)
+  - location: 14 (remaining gas: 1039993.514 units remaining)
     [ {}
       (Some 7) ]
-  - location: 16 (remaining gas: 1039992.669 units remaining)
+  - location: 16 (remaining gas: 1039993.504 units remaining)
     [ (Pair {} (Some 7)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 8 0)-(Some 8)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 8 0)-(Some 8)].out
index 114f5acbf86ab3916591a0fdc49573822c9df0b9..815674bf0410b088cf7b598aed139161e1c58cfe 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 8 0)-(Some 8)].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[or_binary.tz-None-(Pair 8 0)-(Some 8)].out	
@@ -7,20 +7,20 @@ emitted operations
 big_map diff
   
 trace
-  - location: 10 (remaining gas: 1039992.789 units remaining)
+  - location: 10 (remaining gas: 1039993.589 units remaining)
     [ (Pair (Pair 8 0) None) ]
-  - location: 10 (remaining gas: 1039992.779 units remaining)
+  - location: 10 (remaining gas: 1039993.579 units remaining)
     [ (Pair 8 0) ]
-  - location: 11 (remaining gas: 1039992.769 units remaining)
+  - location: 11 (remaining gas: 1039993.569 units remaining)
     [ 8
       0 ]
-  - location: 12 (remaining gas: 1039992.714 units remaining)
+  - location: 12 (remaining gas: 1039993.534 units remaining)
     [ 8 ]
-  - location: 13 (remaining gas: 1039992.699 units remaining)
+  - location: 13 (remaining gas: 1039993.524 units remaining)
     [ (Some 8) ]
-  - location: 14 (remaining gas: 1039992.684 units remaining)
+  - location: 14 (remaining gas: 1039993.514 units remaining)
     [ {}
       (Some 8) ]
-  - location: 16 (remaining gas: 1039992.669 units remaining)
+  - location: 16 (remaining gas: 1039993.504 units remaining)
     [ (Pair {} (Some 8)) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[packunpack_rev.tz-Unit-(Pair -1  (Pair 1 (Pair \"foobar\".368bdfd73a.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[packunpack_rev.tz-Unit-(Pair -1  (Pair 1 (Pair \"foobar\".368bdfd73a.out"
index 9a880b24c80050cd0c96f66f50812c8bcf57f89e..41d46b43c106d45873e8dd1d2c60b8df4669b57f 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[packunpack_rev.tz-Unit-(Pair -1  (Pair 1 (Pair \"foobar\".368bdfd73a.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[packunpack_rev.tz-Unit-(Pair -1  (Pair 1 (Pair \"foobar\".368bdfd73a.out"	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 16 (remaining gas: 1039194.495 units remaining)
+  - location: 16 (remaining gas: 1039839.245 units remaining)
     [ (Pair (Pair -1
                   1
                   "foobar"
@@ -18,7 +18,7 @@ trace
                   "2019-09-09T08:35:33Z"
                   "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             Unit) ]
-  - location: 16 (remaining gas: 1039194.485 units remaining)
+  - location: 16 (remaining gas: 1039839.235 units remaining)
     [ (Pair -1
             1
             "foobar"
@@ -28,7 +28,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 17 (remaining gas: 1039194.475 units remaining)
+  - location: 17 (remaining gas: 1039839.225 units remaining)
     [ (Pair -1
             1
             "foobar"
@@ -47,7 +47,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 18 (remaining gas: 1039194.465 units remaining)
+  - location: 18 (remaining gas: 1039839.215 units remaining)
     [ -1
       (Pair -1
             1
@@ -58,7 +58,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 19 (remaining gas: 1039194.450 units remaining)
+  - location: 19 (remaining gas: 1039839.205 units remaining)
     [ (Pair -1
             1
             "foobar"
@@ -68,7 +68,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 21 (remaining gas: 1039194.440 units remaining)
+  - location: 21 (remaining gas: 1039839.195 units remaining)
     [ -1
       (Pair 1
             "foobar"
@@ -78,7 +78,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 19 (remaining gas: 1039194.410 units remaining)
+  - location: 19 (remaining gas: 1039839.175 units remaining)
     [ -1
       -1
       (Pair 1
@@ -89,7 +89,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 22 (remaining gas: 1039194.183 units remaining)
+  - location: 22 (remaining gas: 1039838.948 units remaining)
     [ 0x050041
       -1
       (Pair 1
@@ -100,7 +100,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 23 (remaining gas: 1039193.763 units remaining)
+  - location: 23 (remaining gas: 1039838.528 units remaining)
     [ (Some -1)
       -1
       (Pair 1
@@ -111,7 +111,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 26 (remaining gas: 1039193.753 units remaining)
+  - location: 26 (remaining gas: 1039838.518 units remaining)
     [ -1
       -1
       (Pair 1
@@ -122,7 +122,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 26 (remaining gas: 1039193.738 units remaining)
+  - location: 26 (remaining gas: 1039838.508 units remaining)
     [ -1
       -1
       (Pair 1
@@ -133,7 +133,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 34 (remaining gas: 1039193.703 units remaining)
+  - location: 34 (remaining gas: 1039838.473 units remaining)
     [ 0
       (Pair 1
             "foobar"
@@ -143,7 +143,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 35 (remaining gas: 1039193.688 units remaining)
+  - location: 35 (remaining gas: 1039838.463 units remaining)
     [ True
       (Pair 1
             "foobar"
@@ -153,7 +153,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 36 (remaining gas: 1039193.678 units remaining)
+  - location: 36 (remaining gas: 1039838.453 units remaining)
     [ (Pair 1
             "foobar"
             0x00aabbcc
@@ -162,7 +162,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 36 (remaining gas: 1039193.663 units remaining)
+  - location: 36 (remaining gas: 1039838.443 units remaining)
     [ (Pair 1
             "foobar"
             0x00aabbcc
@@ -171,7 +171,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 42 (remaining gas: 1039193.653 units remaining)
+  - location: 42 (remaining gas: 1039838.433 units remaining)
     [ (Pair 1
             "foobar"
             0x00aabbcc
@@ -188,7 +188,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 43 (remaining gas: 1039193.643 units remaining)
+  - location: 43 (remaining gas: 1039838.423 units remaining)
     [ 1
       (Pair 1
             "foobar"
@@ -198,7 +198,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 44 (remaining gas: 1039193.628 units remaining)
+  - location: 44 (remaining gas: 1039838.413 units remaining)
     [ (Pair 1
             "foobar"
             0x00aabbcc
@@ -207,7 +207,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 46 (remaining gas: 1039193.618 units remaining)
+  - location: 46 (remaining gas: 1039838.403 units remaining)
     [ 1
       (Pair "foobar"
             0x00aabbcc
@@ -216,7 +216,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 44 (remaining gas: 1039193.588 units remaining)
+  - location: 44 (remaining gas: 1039838.383 units remaining)
     [ 1
       1
       (Pair "foobar"
@@ -226,7 +226,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 47 (remaining gas: 1039193.361 units remaining)
+  - location: 47 (remaining gas: 1039838.156 units remaining)
     [ 0x050001
       1
       (Pair "foobar"
@@ -236,7 +236,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 48 (remaining gas: 1039192.941 units remaining)
+  - location: 48 (remaining gas: 1039837.736 units remaining)
     [ (Some 1)
       1
       (Pair "foobar"
@@ -246,7 +246,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 51 (remaining gas: 1039192.931 units remaining)
+  - location: 51 (remaining gas: 1039837.726 units remaining)
     [ 1
       1
       (Pair "foobar"
@@ -256,7 +256,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 51 (remaining gas: 1039192.916 units remaining)
+  - location: 51 (remaining gas: 1039837.716 units remaining)
     [ 1
       1
       (Pair "foobar"
@@ -266,7 +266,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 59 (remaining gas: 1039192.881 units remaining)
+  - location: 59 (remaining gas: 1039837.681 units remaining)
     [ 0
       (Pair "foobar"
             0x00aabbcc
@@ -275,7 +275,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 60 (remaining gas: 1039192.866 units remaining)
+  - location: 60 (remaining gas: 1039837.671 units remaining)
     [ True
       (Pair "foobar"
             0x00aabbcc
@@ -284,7 +284,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 61 (remaining gas: 1039192.856 units remaining)
+  - location: 61 (remaining gas: 1039837.661 units remaining)
     [ (Pair "foobar"
             0x00aabbcc
             1000
@@ -292,7 +292,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 61 (remaining gas: 1039192.841 units remaining)
+  - location: 61 (remaining gas: 1039837.651 units remaining)
     [ (Pair "foobar"
             0x00aabbcc
             1000
@@ -300,7 +300,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 67 (remaining gas: 1039192.831 units remaining)
+  - location: 67 (remaining gas: 1039837.641 units remaining)
     [ (Pair "foobar"
             0x00aabbcc
             1000
@@ -315,7 +315,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 68 (remaining gas: 1039192.821 units remaining)
+  - location: 68 (remaining gas: 1039837.631 units remaining)
     [ "foobar"
       (Pair "foobar"
             0x00aabbcc
@@ -324,7 +324,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 69 (remaining gas: 1039192.806 units remaining)
+  - location: 69 (remaining gas: 1039837.621 units remaining)
     [ (Pair "foobar"
             0x00aabbcc
             1000
@@ -332,7 +332,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 71 (remaining gas: 1039192.796 units remaining)
+  - location: 71 (remaining gas: 1039837.611 units remaining)
     [ "foobar"
       (Pair 0x00aabbcc
             1000
@@ -340,7 +340,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 69 (remaining gas: 1039192.766 units remaining)
+  - location: 69 (remaining gas: 1039837.591 units remaining)
     [ "foobar"
       "foobar"
       (Pair 0x00aabbcc
@@ -349,7 +349,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 72 (remaining gas: 1039192.242 units remaining)
+  - location: 72 (remaining gas: 1039837.067 units remaining)
     [ 0x050100000006666f6f626172
       "foobar"
       (Pair 0x00aabbcc
@@ -358,7 +358,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 73 (remaining gas: 1039191.567 units remaining)
+  - location: 73 (remaining gas: 1039836.392 units remaining)
     [ (Some "foobar")
       "foobar"
       (Pair 0x00aabbcc
@@ -367,7 +367,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 76 (remaining gas: 1039191.557 units remaining)
+  - location: 76 (remaining gas: 1039836.382 units remaining)
     [ "foobar"
       "foobar"
       (Pair 0x00aabbcc
@@ -376,7 +376,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 76 (remaining gas: 1039191.542 units remaining)
+  - location: 76 (remaining gas: 1039836.372 units remaining)
     [ "foobar"
       "foobar"
       (Pair 0x00aabbcc
@@ -385,7 +385,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 84 (remaining gas: 1039191.507 units remaining)
+  - location: 84 (remaining gas: 1039836.337 units remaining)
     [ 0
       (Pair 0x00aabbcc
             1000
@@ -393,7 +393,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 85 (remaining gas: 1039191.492 units remaining)
+  - location: 85 (remaining gas: 1039836.327 units remaining)
     [ True
       (Pair 0x00aabbcc
             1000
@@ -401,21 +401,21 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 86 (remaining gas: 1039191.482 units remaining)
+  - location: 86 (remaining gas: 1039836.317 units remaining)
     [ (Pair 0x00aabbcc
             1000
             False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 86 (remaining gas: 1039191.467 units remaining)
+  - location: 86 (remaining gas: 1039836.307 units remaining)
     [ (Pair 0x00aabbcc
             1000
             False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 92 (remaining gas: 1039191.457 units remaining)
+  - location: 92 (remaining gas: 1039836.297 units remaining)
     [ (Pair 0x00aabbcc
             1000
             False
@@ -428,7 +428,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 93 (remaining gas: 1039191.447 units remaining)
+  - location: 93 (remaining gas: 1039836.287 units remaining)
     [ 0x00aabbcc
       (Pair 0x00aabbcc
             1000
@@ -436,21 +436,21 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 94 (remaining gas: 1039191.432 units remaining)
+  - location: 94 (remaining gas: 1039836.277 units remaining)
     [ (Pair 0x00aabbcc
             1000
             False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 96 (remaining gas: 1039191.422 units remaining)
+  - location: 96 (remaining gas: 1039836.267 units remaining)
     [ 0x00aabbcc
       (Pair 1000
             False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 94 (remaining gas: 1039191.392 units remaining)
+  - location: 94 (remaining gas: 1039836.247 units remaining)
     [ 0x00aabbcc
       0x00aabbcc
       (Pair 1000
@@ -458,7 +458,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 97 (remaining gas: 1039190.934 units remaining)
+  - location: 97 (remaining gas: 1039835.789 units remaining)
     [ 0x050a0000000400aabbcc
       0x00aabbcc
       (Pair 1000
@@ -466,7 +466,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 98 (remaining gas: 1039190.373 units remaining)
+  - location: 98 (remaining gas: 1039835.228 units remaining)
     [ (Some 0x00aabbcc)
       0x00aabbcc
       (Pair 1000
@@ -474,7 +474,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 101 (remaining gas: 1039190.363 units remaining)
+  - location: 101 (remaining gas: 1039835.218 units remaining)
     [ 0x00aabbcc
       0x00aabbcc
       (Pair 1000
@@ -482,7 +482,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 101 (remaining gas: 1039190.348 units remaining)
+  - location: 101 (remaining gas: 1039835.208 units remaining)
     [ 0x00aabbcc
       0x00aabbcc
       (Pair 1000
@@ -490,33 +490,33 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 109 (remaining gas: 1039190.313 units remaining)
+  - location: 109 (remaining gas: 1039835.173 units remaining)
     [ 0
       (Pair 1000
             False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 110 (remaining gas: 1039190.298 units remaining)
+  - location: 110 (remaining gas: 1039835.163 units remaining)
     [ True
       (Pair 1000
             False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 111 (remaining gas: 1039190.288 units remaining)
+  - location: 111 (remaining gas: 1039835.153 units remaining)
     [ (Pair 1000
             False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 111 (remaining gas: 1039190.273 units remaining)
+  - location: 111 (remaining gas: 1039835.143 units remaining)
     [ (Pair 1000
             False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 117 (remaining gas: 1039190.263 units remaining)
+  - location: 117 (remaining gas: 1039835.133 units remaining)
     [ (Pair 1000
             False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
@@ -527,83 +527,83 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 118 (remaining gas: 1039190.253 units remaining)
+  - location: 118 (remaining gas: 1039835.123 units remaining)
     [ 1000
       (Pair 1000
             False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 119 (remaining gas: 1039190.238 units remaining)
+  - location: 119 (remaining gas: 1039835.113 units remaining)
     [ (Pair 1000
             False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 121 (remaining gas: 1039190.228 units remaining)
+  - location: 121 (remaining gas: 1039835.103 units remaining)
     [ 1000
       (Pair False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 119 (remaining gas: 1039190.198 units remaining)
+  - location: 119 (remaining gas: 1039835.083 units remaining)
     [ 1000
       1000
       (Pair False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 122 (remaining gas: 1039189.938 units remaining)
+  - location: 122 (remaining gas: 1039834.823 units remaining)
     [ 0x0500a80f
       1000
       (Pair False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 123 (remaining gas: 1039189.498 units remaining)
+  - location: 123 (remaining gas: 1039834.383 units remaining)
     [ (Some 1000)
       1000
       (Pair False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 126 (remaining gas: 1039189.488 units remaining)
+  - location: 126 (remaining gas: 1039834.373 units remaining)
     [ 1000
       1000
       (Pair False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 126 (remaining gas: 1039189.473 units remaining)
+  - location: 126 (remaining gas: 1039834.363 units remaining)
     [ 1000
       1000
       (Pair False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 134 (remaining gas: 1039189.438 units remaining)
+  - location: 134 (remaining gas: 1039834.328 units remaining)
     [ 0
       (Pair False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 135 (remaining gas: 1039189.423 units remaining)
+  - location: 135 (remaining gas: 1039834.318 units remaining)
     [ True
       (Pair False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 136 (remaining gas: 1039189.413 units remaining)
+  - location: 136 (remaining gas: 1039834.308 units remaining)
     [ (Pair False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 136 (remaining gas: 1039189.398 units remaining)
+  - location: 136 (remaining gas: 1039834.298 units remaining)
     [ (Pair False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 142 (remaining gas: 1039189.388 units remaining)
+  - location: 142 (remaining gas: 1039834.288 units remaining)
     [ (Pair False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
@@ -612,234 +612,234 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 143 (remaining gas: 1039189.378 units remaining)
+  - location: 143 (remaining gas: 1039834.278 units remaining)
     [ False
       (Pair False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 144 (remaining gas: 1039189.363 units remaining)
+  - location: 144 (remaining gas: 1039834.268 units remaining)
     [ (Pair False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 146 (remaining gas: 1039189.353 units remaining)
+  - location: 146 (remaining gas: 1039834.258 units remaining)
     [ False
       (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 144 (remaining gas: 1039189.323 units remaining)
+  - location: 144 (remaining gas: 1039834.238 units remaining)
     [ False
       False
       (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 147 (remaining gas: 1039189.096 units remaining)
+  - location: 147 (remaining gas: 1039834.011 units remaining)
     [ 0x050303
       False
       (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 148 (remaining gas: 1039188.676 units remaining)
+  - location: 148 (remaining gas: 1039833.591 units remaining)
     [ (Some False)
       False
       (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 151 (remaining gas: 1039188.666 units remaining)
+  - location: 151 (remaining gas: 1039833.581 units remaining)
     [ False
       False
       (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 151 (remaining gas: 1039188.651 units remaining)
+  - location: 151 (remaining gas: 1039833.571 units remaining)
     [ False
       False
       (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 159 (remaining gas: 1039188.616 units remaining)
+  - location: 159 (remaining gas: 1039833.536 units remaining)
     [ 0
       (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 160 (remaining gas: 1039188.601 units remaining)
+  - location: 160 (remaining gas: 1039833.526 units remaining)
     [ True
       (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 161 (remaining gas: 1039188.591 units remaining)
+  - location: 161 (remaining gas: 1039833.516 units remaining)
     [ (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 161 (remaining gas: 1039188.576 units remaining)
+  - location: 161 (remaining gas: 1039833.506 units remaining)
     [ (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 167 (remaining gas: 1039188.566 units remaining)
+  - location: 167 (remaining gas: 1039833.496 units remaining)
     [ (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
       (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 168 (remaining gas: 1039188.556 units remaining)
+  - location: 168 (remaining gas: 1039833.486 units remaining)
     [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
       (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 169 (remaining gas: 1039188.541 units remaining)
+  - location: 169 (remaining gas: 1039833.476 units remaining)
     [ (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 171 (remaining gas: 1039188.531 units remaining)
+  - location: 171 (remaining gas: 1039833.466 units remaining)
     [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
       (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 169 (remaining gas: 1039188.501 units remaining)
+  - location: 169 (remaining gas: 1039833.446 units remaining)
     [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
       (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 172 (remaining gas: 1039187.411 units remaining)
+  - location: 172 (remaining gas: 1039832.356 units remaining)
     [ 0x050a0000001500bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
       (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 173 (remaining gas: 1039186.458 units remaining)
+  - location: 173 (remaining gas: 1039831.403 units remaining)
     [ (Some "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
       (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 176 (remaining gas: 1039186.448 units remaining)
+  - location: 176 (remaining gas: 1039831.393 units remaining)
     [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
       (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 176 (remaining gas: 1039186.433 units remaining)
+  - location: 176 (remaining gas: 1039831.383 units remaining)
     [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
       (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 184 (remaining gas: 1039186.397 units remaining)
+  - location: 184 (remaining gas: 1039831.347 units remaining)
     [ 0
       (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 185 (remaining gas: 1039186.382 units remaining)
+  - location: 185 (remaining gas: 1039831.337 units remaining)
     [ True
       (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 186 (remaining gas: 1039186.372 units remaining)
+  - location: 186 (remaining gas: 1039831.327 units remaining)
     [ (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 186 (remaining gas: 1039186.357 units remaining)
+  - location: 186 (remaining gas: 1039831.317 units remaining)
     [ (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 192 (remaining gas: 1039186.347 units remaining)
+  - location: 192 (remaining gas: 1039831.307 units remaining)
     [ (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
       (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 193 (remaining gas: 1039186.337 units remaining)
+  - location: 193 (remaining gas: 1039831.297 units remaining)
     [ "2019-09-09T08:35:33Z"
       (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 194 (remaining gas: 1039186.322 units remaining)
+  - location: 194 (remaining gas: 1039831.287 units remaining)
     [ (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 196 (remaining gas: 1039186.312 units remaining)
+  - location: 196 (remaining gas: 1039831.277 units remaining)
     [ "2019-09-09T08:35:33Z"
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 194 (remaining gas: 1039186.282 units remaining)
+  - location: 194 (remaining gas: 1039831.257 units remaining)
     [ "2019-09-09T08:35:33Z"
       "2019-09-09T08:35:33Z"
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 197 (remaining gas: 1039185.923 units remaining)
+  - location: 197 (remaining gas: 1039830.898 units remaining)
     [ 0x050095bbb0d70b
       "2019-09-09T08:35:33Z"
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 198 (remaining gas: 1039185.423 units remaining)
+  - location: 198 (remaining gas: 1039830.398 units remaining)
     [ (Some "2019-09-09T08:35:33Z")
       "2019-09-09T08:35:33Z"
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 201 (remaining gas: 1039185.413 units remaining)
+  - location: 201 (remaining gas: 1039830.388 units remaining)
     [ "2019-09-09T08:35:33Z"
       "2019-09-09T08:35:33Z"
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 201 (remaining gas: 1039185.398 units remaining)
+  - location: 201 (remaining gas: 1039830.378 units remaining)
     [ "2019-09-09T08:35:33Z"
       "2019-09-09T08:35:33Z"
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 209 (remaining gas: 1039185.363 units remaining)
+  - location: 209 (remaining gas: 1039830.343 units remaining)
     [ 0
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 210 (remaining gas: 1039185.348 units remaining)
+  - location: 210 (remaining gas: 1039830.333 units remaining)
     [ True
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 211 (remaining gas: 1039185.338 units remaining)
+  - location: 211 (remaining gas: 1039830.323 units remaining)
     [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 211 (remaining gas: 1039185.323 units remaining)
+  - location: 211 (remaining gas: 1039830.313 units remaining)
     [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 217 (remaining gas: 1039185.313 units remaining)
+  - location: 217 (remaining gas: 1039830.303 units remaining)
     [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 218 (remaining gas: 1039174.360 units remaining)
+  - location: 218 (remaining gas: 1039829.180 units remaining)
     [ 0x050a000000160000bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 219 (remaining gas: 1038523.437 units remaining)
+  - location: 219 (remaining gas: 1039828.207 units remaining)
     [ (Some "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 222 (remaining gas: 1038523.427 units remaining)
+  - location: 222 (remaining gas: 1039828.197 units remaining)
     [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 222 (remaining gas: 1038523.412 units remaining)
+  - location: 222 (remaining gas: 1039828.187 units remaining)
     [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 230 (remaining gas: 1038523.376 units remaining)
+  - location: 230 (remaining gas: 1039828.151 units remaining)
     [ 0 ]
-  - location: 231 (remaining gas: 1038523.361 units remaining)
+  - location: 231 (remaining gas: 1039828.141 units remaining)
     [ True ]
-  - location: 232 (remaining gas: 1038523.351 units remaining)
+  - location: 232 (remaining gas: 1039828.131 units remaining)
     [  ]
-  - location: 232 (remaining gas: 1038523.336 units remaining)
+  - location: 232 (remaining gas: 1039828.121 units remaining)
     [  ]
-  - location: 238 (remaining gas: 1038523.326 units remaining)
+  - location: 238 (remaining gas: 1039828.111 units remaining)
     [ 0 ]
-  - location: 241 (remaining gas: 1038523.099 units remaining)
+  - location: 241 (remaining gas: 1039827.884 units remaining)
     [ 0x050000 ]
-  - location: 242 (remaining gas: 1038522.679 units remaining)
+  - location: 242 (remaining gas: 1039827.464 units remaining)
     [ (Some 0) ]
-  - location: 245 (remaining gas: 1038522.669 units remaining)
+  - location: 245 (remaining gas: 1039827.454 units remaining)
     [ 0 ]
-  - location: 245 (remaining gas: 1038522.654 units remaining)
+  - location: 245 (remaining gas: 1039827.444 units remaining)
     [ 0 ]
-  - location: 251 (remaining gas: 1038522.644 units remaining)
+  - location: 251 (remaining gas: 1039827.434 units remaining)
     [  ]
-  - location: 252 (remaining gas: 1038522.634 units remaining)
+  - location: 252 (remaining gas: 1039827.424 units remaining)
     [ -1 ]
-  - location: 255 (remaining gas: 1038522.407 units remaining)
+  - location: 255 (remaining gas: 1039827.197 units remaining)
     [ 0x050041 ]
-  - location: 256 (remaining gas: 1038426.087 units remaining)
+  - location: 256 (remaining gas: 1039730.877 units remaining)
     [ None ]
-  - location: 259 (remaining gas: 1038426.077 units remaining)
+  - location: 259 (remaining gas: 1039730.867 units remaining)
     [  ]
-  - location: 259 (remaining gas: 1038426.062 units remaining)
+  - location: 259 (remaining gas: 1039730.857 units remaining)
     [  ]
-  - location: 265 (remaining gas: 1038426.052 units remaining)
+  - location: 265 (remaining gas: 1039730.847 units remaining)
     [ 0x ]
-  - location: 268 (remaining gas: 1038425.792 units remaining)
+  - location: 268 (remaining gas: 1039730.587 units remaining)
     [ None ]
-  - location: 271 (remaining gas: 1038425.782 units remaining)
+  - location: 271 (remaining gas: 1039730.577 units remaining)
     [  ]
-  - location: 271 (remaining gas: 1038425.767 units remaining)
+  - location: 271 (remaining gas: 1039730.567 units remaining)
     [  ]
-  - location: 277 (remaining gas: 1038425.757 units remaining)
+  - location: 277 (remaining gas: 1039730.557 units remaining)
     [ 0x04 ]
-  - location: 280 (remaining gas: 1038425.477 units remaining)
+  - location: 280 (remaining gas: 1039730.277 units remaining)
     [ None ]
-  - location: 283 (remaining gas: 1038425.467 units remaining)
+  - location: 283 (remaining gas: 1039730.267 units remaining)
     [  ]
-  - location: 283 (remaining gas: 1038425.452 units remaining)
+  - location: 283 (remaining gas: 1039730.257 units remaining)
     [  ]
-  - location: 289 (remaining gas: 1038425.442 units remaining)
+  - location: 289 (remaining gas: 1039730.247 units remaining)
     [ 0x05 ]
-  - location: 292 (remaining gas: 1038425.162 units remaining)
+  - location: 292 (remaining gas: 1039729.967 units remaining)
     [ None ]
-  - location: 295 (remaining gas: 1038425.152 units remaining)
+  - location: 295 (remaining gas: 1039729.957 units remaining)
     [  ]
-  - location: 295 (remaining gas: 1038425.137 units remaining)
+  - location: 295 (remaining gas: 1039729.947 units remaining)
     [  ]
-  - location: 301 (remaining gas: 1038425.127 units remaining)
+  - location: 301 (remaining gas: 1039729.937 units remaining)
     [ Unit ]
-  - location: 302 (remaining gas: 1038425.112 units remaining)
+  - location: 302 (remaining gas: 1039729.927 units remaining)
     [ {}
       Unit ]
-  - location: 304 (remaining gas: 1038425.097 units remaining)
+  - location: 304 (remaining gas: 1039729.917 units remaining)
     [ (Pair {} Unit) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[packunpack_rev.tz-Unit-(Pair -1  (Pair 1 (Pair \"foobar\".735d9ae802.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[packunpack_rev.tz-Unit-(Pair -1  (Pair 1 (Pair \"foobar\".735d9ae802.out"
index c82856dce796f99b1d9b2b61308f098377b36929..407a43602c766f0fe123b2464fd70ab412ae25ad 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[packunpack_rev.tz-Unit-(Pair -1  (Pair 1 (Pair \"foobar\".735d9ae802.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[packunpack_rev.tz-Unit-(Pair -1  (Pair 1 (Pair \"foobar\".735d9ae802.out"	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 16 (remaining gas: 1039194.495 units remaining)
+  - location: 16 (remaining gas: 1039839.245 units remaining)
     [ (Pair (Pair -1
                   1
                   "foobar"
@@ -18,7 +18,7 @@ trace
                   "2019-09-09T08:35:33Z"
                   "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             Unit) ]
-  - location: 16 (remaining gas: 1039194.485 units remaining)
+  - location: 16 (remaining gas: 1039839.235 units remaining)
     [ (Pair -1
             1
             "foobar"
@@ -28,7 +28,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 17 (remaining gas: 1039194.475 units remaining)
+  - location: 17 (remaining gas: 1039839.225 units remaining)
     [ (Pair -1
             1
             "foobar"
@@ -47,7 +47,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 18 (remaining gas: 1039194.465 units remaining)
+  - location: 18 (remaining gas: 1039839.215 units remaining)
     [ -1
       (Pair -1
             1
@@ -58,7 +58,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 19 (remaining gas: 1039194.450 units remaining)
+  - location: 19 (remaining gas: 1039839.205 units remaining)
     [ (Pair -1
             1
             "foobar"
@@ -68,7 +68,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 21 (remaining gas: 1039194.440 units remaining)
+  - location: 21 (remaining gas: 1039839.195 units remaining)
     [ -1
       (Pair 1
             "foobar"
@@ -78,7 +78,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 19 (remaining gas: 1039194.410 units remaining)
+  - location: 19 (remaining gas: 1039839.175 units remaining)
     [ -1
       -1
       (Pair 1
@@ -89,7 +89,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 22 (remaining gas: 1039194.183 units remaining)
+  - location: 22 (remaining gas: 1039838.948 units remaining)
     [ 0x050041
       -1
       (Pair 1
@@ -100,7 +100,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 23 (remaining gas: 1039193.763 units remaining)
+  - location: 23 (remaining gas: 1039838.528 units remaining)
     [ (Some -1)
       -1
       (Pair 1
@@ -111,7 +111,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 26 (remaining gas: 1039193.753 units remaining)
+  - location: 26 (remaining gas: 1039838.518 units remaining)
     [ -1
       -1
       (Pair 1
@@ -122,7 +122,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 26 (remaining gas: 1039193.738 units remaining)
+  - location: 26 (remaining gas: 1039838.508 units remaining)
     [ -1
       -1
       (Pair 1
@@ -133,7 +133,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 34 (remaining gas: 1039193.703 units remaining)
+  - location: 34 (remaining gas: 1039838.473 units remaining)
     [ 0
       (Pair 1
             "foobar"
@@ -143,7 +143,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 35 (remaining gas: 1039193.688 units remaining)
+  - location: 35 (remaining gas: 1039838.463 units remaining)
     [ True
       (Pair 1
             "foobar"
@@ -153,7 +153,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 36 (remaining gas: 1039193.678 units remaining)
+  - location: 36 (remaining gas: 1039838.453 units remaining)
     [ (Pair 1
             "foobar"
             0x00aabbcc
@@ -162,7 +162,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 36 (remaining gas: 1039193.663 units remaining)
+  - location: 36 (remaining gas: 1039838.443 units remaining)
     [ (Pair 1
             "foobar"
             0x00aabbcc
@@ -171,7 +171,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 42 (remaining gas: 1039193.653 units remaining)
+  - location: 42 (remaining gas: 1039838.433 units remaining)
     [ (Pair 1
             "foobar"
             0x00aabbcc
@@ -188,7 +188,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 43 (remaining gas: 1039193.643 units remaining)
+  - location: 43 (remaining gas: 1039838.423 units remaining)
     [ 1
       (Pair 1
             "foobar"
@@ -198,7 +198,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 44 (remaining gas: 1039193.628 units remaining)
+  - location: 44 (remaining gas: 1039838.413 units remaining)
     [ (Pair 1
             "foobar"
             0x00aabbcc
@@ -207,7 +207,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 46 (remaining gas: 1039193.618 units remaining)
+  - location: 46 (remaining gas: 1039838.403 units remaining)
     [ 1
       (Pair "foobar"
             0x00aabbcc
@@ -216,7 +216,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 44 (remaining gas: 1039193.588 units remaining)
+  - location: 44 (remaining gas: 1039838.383 units remaining)
     [ 1
       1
       (Pair "foobar"
@@ -226,7 +226,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 47 (remaining gas: 1039193.361 units remaining)
+  - location: 47 (remaining gas: 1039838.156 units remaining)
     [ 0x050001
       1
       (Pair "foobar"
@@ -236,7 +236,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 48 (remaining gas: 1039192.941 units remaining)
+  - location: 48 (remaining gas: 1039837.736 units remaining)
     [ (Some 1)
       1
       (Pair "foobar"
@@ -246,7 +246,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 51 (remaining gas: 1039192.931 units remaining)
+  - location: 51 (remaining gas: 1039837.726 units remaining)
     [ 1
       1
       (Pair "foobar"
@@ -256,7 +256,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 51 (remaining gas: 1039192.916 units remaining)
+  - location: 51 (remaining gas: 1039837.716 units remaining)
     [ 1
       1
       (Pair "foobar"
@@ -266,7 +266,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 59 (remaining gas: 1039192.881 units remaining)
+  - location: 59 (remaining gas: 1039837.681 units remaining)
     [ 0
       (Pair "foobar"
             0x00aabbcc
@@ -275,7 +275,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 60 (remaining gas: 1039192.866 units remaining)
+  - location: 60 (remaining gas: 1039837.671 units remaining)
     [ True
       (Pair "foobar"
             0x00aabbcc
@@ -284,7 +284,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 61 (remaining gas: 1039192.856 units remaining)
+  - location: 61 (remaining gas: 1039837.661 units remaining)
     [ (Pair "foobar"
             0x00aabbcc
             1000
@@ -292,7 +292,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 61 (remaining gas: 1039192.841 units remaining)
+  - location: 61 (remaining gas: 1039837.651 units remaining)
     [ (Pair "foobar"
             0x00aabbcc
             1000
@@ -300,7 +300,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 67 (remaining gas: 1039192.831 units remaining)
+  - location: 67 (remaining gas: 1039837.641 units remaining)
     [ (Pair "foobar"
             0x00aabbcc
             1000
@@ -315,7 +315,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 68 (remaining gas: 1039192.821 units remaining)
+  - location: 68 (remaining gas: 1039837.631 units remaining)
     [ "foobar"
       (Pair "foobar"
             0x00aabbcc
@@ -324,7 +324,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 69 (remaining gas: 1039192.806 units remaining)
+  - location: 69 (remaining gas: 1039837.621 units remaining)
     [ (Pair "foobar"
             0x00aabbcc
             1000
@@ -332,7 +332,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 71 (remaining gas: 1039192.796 units remaining)
+  - location: 71 (remaining gas: 1039837.611 units remaining)
     [ "foobar"
       (Pair 0x00aabbcc
             1000
@@ -340,7 +340,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 69 (remaining gas: 1039192.766 units remaining)
+  - location: 69 (remaining gas: 1039837.591 units remaining)
     [ "foobar"
       "foobar"
       (Pair 0x00aabbcc
@@ -349,7 +349,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 72 (remaining gas: 1039192.242 units remaining)
+  - location: 72 (remaining gas: 1039837.067 units remaining)
     [ 0x050100000006666f6f626172
       "foobar"
       (Pair 0x00aabbcc
@@ -358,7 +358,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 73 (remaining gas: 1039191.567 units remaining)
+  - location: 73 (remaining gas: 1039836.392 units remaining)
     [ (Some "foobar")
       "foobar"
       (Pair 0x00aabbcc
@@ -367,7 +367,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 76 (remaining gas: 1039191.557 units remaining)
+  - location: 76 (remaining gas: 1039836.382 units remaining)
     [ "foobar"
       "foobar"
       (Pair 0x00aabbcc
@@ -376,7 +376,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 76 (remaining gas: 1039191.542 units remaining)
+  - location: 76 (remaining gas: 1039836.372 units remaining)
     [ "foobar"
       "foobar"
       (Pair 0x00aabbcc
@@ -385,7 +385,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 84 (remaining gas: 1039191.507 units remaining)
+  - location: 84 (remaining gas: 1039836.337 units remaining)
     [ 0
       (Pair 0x00aabbcc
             1000
@@ -393,7 +393,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 85 (remaining gas: 1039191.492 units remaining)
+  - location: 85 (remaining gas: 1039836.327 units remaining)
     [ True
       (Pair 0x00aabbcc
             1000
@@ -401,21 +401,21 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 86 (remaining gas: 1039191.482 units remaining)
+  - location: 86 (remaining gas: 1039836.317 units remaining)
     [ (Pair 0x00aabbcc
             1000
             False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 86 (remaining gas: 1039191.467 units remaining)
+  - location: 86 (remaining gas: 1039836.307 units remaining)
     [ (Pair 0x00aabbcc
             1000
             False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 92 (remaining gas: 1039191.457 units remaining)
+  - location: 92 (remaining gas: 1039836.297 units remaining)
     [ (Pair 0x00aabbcc
             1000
             False
@@ -428,7 +428,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 93 (remaining gas: 1039191.447 units remaining)
+  - location: 93 (remaining gas: 1039836.287 units remaining)
     [ 0x00aabbcc
       (Pair 0x00aabbcc
             1000
@@ -436,21 +436,21 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 94 (remaining gas: 1039191.432 units remaining)
+  - location: 94 (remaining gas: 1039836.277 units remaining)
     [ (Pair 0x00aabbcc
             1000
             False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 96 (remaining gas: 1039191.422 units remaining)
+  - location: 96 (remaining gas: 1039836.267 units remaining)
     [ 0x00aabbcc
       (Pair 1000
             False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 94 (remaining gas: 1039191.392 units remaining)
+  - location: 94 (remaining gas: 1039836.247 units remaining)
     [ 0x00aabbcc
       0x00aabbcc
       (Pair 1000
@@ -458,7 +458,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 97 (remaining gas: 1039190.934 units remaining)
+  - location: 97 (remaining gas: 1039835.789 units remaining)
     [ 0x050a0000000400aabbcc
       0x00aabbcc
       (Pair 1000
@@ -466,7 +466,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 98 (remaining gas: 1039190.373 units remaining)
+  - location: 98 (remaining gas: 1039835.228 units remaining)
     [ (Some 0x00aabbcc)
       0x00aabbcc
       (Pair 1000
@@ -474,7 +474,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 101 (remaining gas: 1039190.363 units remaining)
+  - location: 101 (remaining gas: 1039835.218 units remaining)
     [ 0x00aabbcc
       0x00aabbcc
       (Pair 1000
@@ -482,7 +482,7 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 101 (remaining gas: 1039190.348 units remaining)
+  - location: 101 (remaining gas: 1039835.208 units remaining)
     [ 0x00aabbcc
       0x00aabbcc
       (Pair 1000
@@ -490,33 +490,33 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 109 (remaining gas: 1039190.313 units remaining)
+  - location: 109 (remaining gas: 1039835.173 units remaining)
     [ 0
       (Pair 1000
             False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 110 (remaining gas: 1039190.298 units remaining)
+  - location: 110 (remaining gas: 1039835.163 units remaining)
     [ True
       (Pair 1000
             False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 111 (remaining gas: 1039190.288 units remaining)
+  - location: 111 (remaining gas: 1039835.153 units remaining)
     [ (Pair 1000
             False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 111 (remaining gas: 1039190.273 units remaining)
+  - location: 111 (remaining gas: 1039835.143 units remaining)
     [ (Pair 1000
             False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 117 (remaining gas: 1039190.263 units remaining)
+  - location: 117 (remaining gas: 1039835.133 units remaining)
     [ (Pair 1000
             False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
@@ -527,83 +527,83 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 118 (remaining gas: 1039190.253 units remaining)
+  - location: 118 (remaining gas: 1039835.123 units remaining)
     [ 1000
       (Pair 1000
             False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 119 (remaining gas: 1039190.238 units remaining)
+  - location: 119 (remaining gas: 1039835.113 units remaining)
     [ (Pair 1000
             False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 121 (remaining gas: 1039190.228 units remaining)
+  - location: 121 (remaining gas: 1039835.103 units remaining)
     [ 1000
       (Pair False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 119 (remaining gas: 1039190.198 units remaining)
+  - location: 119 (remaining gas: 1039835.083 units remaining)
     [ 1000
       1000
       (Pair False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 122 (remaining gas: 1039189.938 units remaining)
+  - location: 122 (remaining gas: 1039834.823 units remaining)
     [ 0x0500a80f
       1000
       (Pair False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 123 (remaining gas: 1039189.498 units remaining)
+  - location: 123 (remaining gas: 1039834.383 units remaining)
     [ (Some 1000)
       1000
       (Pair False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 126 (remaining gas: 1039189.488 units remaining)
+  - location: 126 (remaining gas: 1039834.373 units remaining)
     [ 1000
       1000
       (Pair False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 126 (remaining gas: 1039189.473 units remaining)
+  - location: 126 (remaining gas: 1039834.363 units remaining)
     [ 1000
       1000
       (Pair False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 134 (remaining gas: 1039189.438 units remaining)
+  - location: 134 (remaining gas: 1039834.328 units remaining)
     [ 0
       (Pair False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 135 (remaining gas: 1039189.423 units remaining)
+  - location: 135 (remaining gas: 1039834.318 units remaining)
     [ True
       (Pair False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 136 (remaining gas: 1039189.413 units remaining)
+  - location: 136 (remaining gas: 1039834.308 units remaining)
     [ (Pair False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 136 (remaining gas: 1039189.398 units remaining)
+  - location: 136 (remaining gas: 1039834.298 units remaining)
     [ (Pair False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 142 (remaining gas: 1039189.388 units remaining)
+  - location: 142 (remaining gas: 1039834.288 units remaining)
     [ (Pair False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
@@ -612,234 +612,234 @@ trace
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 143 (remaining gas: 1039189.378 units remaining)
+  - location: 143 (remaining gas: 1039834.278 units remaining)
     [ False
       (Pair False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 144 (remaining gas: 1039189.363 units remaining)
+  - location: 144 (remaining gas: 1039834.268 units remaining)
     [ (Pair False
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 146 (remaining gas: 1039189.353 units remaining)
+  - location: 146 (remaining gas: 1039834.258 units remaining)
     [ False
       (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 144 (remaining gas: 1039189.323 units remaining)
+  - location: 144 (remaining gas: 1039834.238 units remaining)
     [ False
       False
       (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 147 (remaining gas: 1039189.096 units remaining)
+  - location: 147 (remaining gas: 1039834.011 units remaining)
     [ 0x050303
       False
       (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 148 (remaining gas: 1039188.676 units remaining)
+  - location: 148 (remaining gas: 1039833.591 units remaining)
     [ (Some False)
       False
       (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 151 (remaining gas: 1039188.666 units remaining)
+  - location: 151 (remaining gas: 1039833.581 units remaining)
     [ False
       False
       (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 151 (remaining gas: 1039188.651 units remaining)
+  - location: 151 (remaining gas: 1039833.571 units remaining)
     [ False
       False
       (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 159 (remaining gas: 1039188.616 units remaining)
+  - location: 159 (remaining gas: 1039833.536 units remaining)
     [ 0
       (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 160 (remaining gas: 1039188.601 units remaining)
+  - location: 160 (remaining gas: 1039833.526 units remaining)
     [ True
       (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 161 (remaining gas: 1039188.591 units remaining)
+  - location: 161 (remaining gas: 1039833.516 units remaining)
     [ (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 161 (remaining gas: 1039188.576 units remaining)
+  - location: 161 (remaining gas: 1039833.506 units remaining)
     [ (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 167 (remaining gas: 1039188.566 units remaining)
+  - location: 167 (remaining gas: 1039833.496 units remaining)
     [ (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
       (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 168 (remaining gas: 1039188.556 units remaining)
+  - location: 168 (remaining gas: 1039833.486 units remaining)
     [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
       (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 169 (remaining gas: 1039188.541 units remaining)
+  - location: 169 (remaining gas: 1039833.476 units remaining)
     [ (Pair "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
             "2019-09-09T08:35:33Z"
             "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 171 (remaining gas: 1039188.531 units remaining)
+  - location: 171 (remaining gas: 1039833.466 units remaining)
     [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
       (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 169 (remaining gas: 1039188.501 units remaining)
+  - location: 169 (remaining gas: 1039833.446 units remaining)
     [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
       (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 172 (remaining gas: 1039187.411 units remaining)
+  - location: 172 (remaining gas: 1039832.356 units remaining)
     [ 0x050a0000001500bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
       (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 173 (remaining gas: 1039186.458 units remaining)
+  - location: 173 (remaining gas: 1039831.403 units remaining)
     [ (Some "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
       (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 176 (remaining gas: 1039186.448 units remaining)
+  - location: 176 (remaining gas: 1039831.393 units remaining)
     [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
       (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 176 (remaining gas: 1039186.433 units remaining)
+  - location: 176 (remaining gas: 1039831.383 units remaining)
     [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
       (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 184 (remaining gas: 1039186.397 units remaining)
+  - location: 184 (remaining gas: 1039831.347 units remaining)
     [ 0
       (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 185 (remaining gas: 1039186.382 units remaining)
+  - location: 185 (remaining gas: 1039831.337 units remaining)
     [ True
       (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 186 (remaining gas: 1039186.372 units remaining)
+  - location: 186 (remaining gas: 1039831.327 units remaining)
     [ (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 186 (remaining gas: 1039186.357 units remaining)
+  - location: 186 (remaining gas: 1039831.317 units remaining)
     [ (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 192 (remaining gas: 1039186.347 units remaining)
+  - location: 192 (remaining gas: 1039831.307 units remaining)
     [ (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
       (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 193 (remaining gas: 1039186.337 units remaining)
+  - location: 193 (remaining gas: 1039831.297 units remaining)
     [ "2019-09-09T08:35:33Z"
       (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 194 (remaining gas: 1039186.322 units remaining)
+  - location: 194 (remaining gas: 1039831.287 units remaining)
     [ (Pair "2019-09-09T08:35:33Z" "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5") ]
-  - location: 196 (remaining gas: 1039186.312 units remaining)
+  - location: 196 (remaining gas: 1039831.277 units remaining)
     [ "2019-09-09T08:35:33Z"
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 194 (remaining gas: 1039186.282 units remaining)
+  - location: 194 (remaining gas: 1039831.257 units remaining)
     [ "2019-09-09T08:35:33Z"
       "2019-09-09T08:35:33Z"
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 197 (remaining gas: 1039185.923 units remaining)
+  - location: 197 (remaining gas: 1039830.898 units remaining)
     [ 0x050095bbb0d70b
       "2019-09-09T08:35:33Z"
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 198 (remaining gas: 1039185.423 units remaining)
+  - location: 198 (remaining gas: 1039830.398 units remaining)
     [ (Some "2019-09-09T08:35:33Z")
       "2019-09-09T08:35:33Z"
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 201 (remaining gas: 1039185.413 units remaining)
+  - location: 201 (remaining gas: 1039830.388 units remaining)
     [ "2019-09-09T08:35:33Z"
       "2019-09-09T08:35:33Z"
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 201 (remaining gas: 1039185.398 units remaining)
+  - location: 201 (remaining gas: 1039830.378 units remaining)
     [ "2019-09-09T08:35:33Z"
       "2019-09-09T08:35:33Z"
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 209 (remaining gas: 1039185.363 units remaining)
+  - location: 209 (remaining gas: 1039830.343 units remaining)
     [ 0
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 210 (remaining gas: 1039185.348 units remaining)
+  - location: 210 (remaining gas: 1039830.333 units remaining)
     [ True
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 211 (remaining gas: 1039185.338 units remaining)
+  - location: 211 (remaining gas: 1039830.323 units remaining)
     [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 211 (remaining gas: 1039185.323 units remaining)
+  - location: 211 (remaining gas: 1039830.313 units remaining)
     [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 217 (remaining gas: 1039185.313 units remaining)
+  - location: 217 (remaining gas: 1039830.303 units remaining)
     [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 218 (remaining gas: 1039174.360 units remaining)
+  - location: 218 (remaining gas: 1039829.180 units remaining)
     [ 0x050a000000160000bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 219 (remaining gas: 1038523.437 units remaining)
+  - location: 219 (remaining gas: 1039828.207 units remaining)
     [ (Some "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 222 (remaining gas: 1038523.427 units remaining)
+  - location: 222 (remaining gas: 1039828.197 units remaining)
     [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 222 (remaining gas: 1038523.412 units remaining)
+  - location: 222 (remaining gas: 1039828.187 units remaining)
     [ "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"
       "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5" ]
-  - location: 230 (remaining gas: 1038523.376 units remaining)
+  - location: 230 (remaining gas: 1039828.151 units remaining)
     [ 0 ]
-  - location: 231 (remaining gas: 1038523.361 units remaining)
+  - location: 231 (remaining gas: 1039828.141 units remaining)
     [ True ]
-  - location: 232 (remaining gas: 1038523.351 units remaining)
+  - location: 232 (remaining gas: 1039828.131 units remaining)
     [  ]
-  - location: 232 (remaining gas: 1038523.336 units remaining)
+  - location: 232 (remaining gas: 1039828.121 units remaining)
     [  ]
-  - location: 238 (remaining gas: 1038523.326 units remaining)
+  - location: 238 (remaining gas: 1039828.111 units remaining)
     [ 0 ]
-  - location: 241 (remaining gas: 1038523.099 units remaining)
+  - location: 241 (remaining gas: 1039827.884 units remaining)
     [ 0x050000 ]
-  - location: 242 (remaining gas: 1038522.679 units remaining)
+  - location: 242 (remaining gas: 1039827.464 units remaining)
     [ (Some 0) ]
-  - location: 245 (remaining gas: 1038522.669 units remaining)
+  - location: 245 (remaining gas: 1039827.454 units remaining)
     [ 0 ]
-  - location: 245 (remaining gas: 1038522.654 units remaining)
+  - location: 245 (remaining gas: 1039827.444 units remaining)
     [ 0 ]
-  - location: 251 (remaining gas: 1038522.644 units remaining)
+  - location: 251 (remaining gas: 1039827.434 units remaining)
     [  ]
-  - location: 252 (remaining gas: 1038522.634 units remaining)
+  - location: 252 (remaining gas: 1039827.424 units remaining)
     [ -1 ]
-  - location: 255 (remaining gas: 1038522.407 units remaining)
+  - location: 255 (remaining gas: 1039827.197 units remaining)
     [ 0x050041 ]
-  - location: 256 (remaining gas: 1038426.087 units remaining)
+  - location: 256 (remaining gas: 1039730.877 units remaining)
     [ None ]
-  - location: 259 (remaining gas: 1038426.077 units remaining)
+  - location: 259 (remaining gas: 1039730.867 units remaining)
     [  ]
-  - location: 259 (remaining gas: 1038426.062 units remaining)
+  - location: 259 (remaining gas: 1039730.857 units remaining)
     [  ]
-  - location: 265 (remaining gas: 1038426.052 units remaining)
+  - location: 265 (remaining gas: 1039730.847 units remaining)
     [ 0x ]
-  - location: 268 (remaining gas: 1038425.792 units remaining)
+  - location: 268 (remaining gas: 1039730.587 units remaining)
     [ None ]
-  - location: 271 (remaining gas: 1038425.782 units remaining)
+  - location: 271 (remaining gas: 1039730.577 units remaining)
     [  ]
-  - location: 271 (remaining gas: 1038425.767 units remaining)
+  - location: 271 (remaining gas: 1039730.567 units remaining)
     [  ]
-  - location: 277 (remaining gas: 1038425.757 units remaining)
+  - location: 277 (remaining gas: 1039730.557 units remaining)
     [ 0x04 ]
-  - location: 280 (remaining gas: 1038425.477 units remaining)
+  - location: 280 (remaining gas: 1039730.277 units remaining)
     [ None ]
-  - location: 283 (remaining gas: 1038425.467 units remaining)
+  - location: 283 (remaining gas: 1039730.267 units remaining)
     [  ]
-  - location: 283 (remaining gas: 1038425.452 units remaining)
+  - location: 283 (remaining gas: 1039730.257 units remaining)
     [  ]
-  - location: 289 (remaining gas: 1038425.442 units remaining)
+  - location: 289 (remaining gas: 1039730.247 units remaining)
     [ 0x05 ]
-  - location: 292 (remaining gas: 1038425.162 units remaining)
+  - location: 292 (remaining gas: 1039729.967 units remaining)
     [ None ]
-  - location: 295 (remaining gas: 1038425.152 units remaining)
+  - location: 295 (remaining gas: 1039729.957 units remaining)
     [  ]
-  - location: 295 (remaining gas: 1038425.137 units remaining)
+  - location: 295 (remaining gas: 1039729.947 units remaining)
     [  ]
-  - location: 301 (remaining gas: 1038425.127 units remaining)
+  - location: 301 (remaining gas: 1039729.937 units remaining)
     [ Unit ]
-  - location: 302 (remaining gas: 1038425.112 units remaining)
+  - location: 302 (remaining gas: 1039729.927 units remaining)
     [ {}
       Unit ]
-  - location: 304 (remaining gas: 1038425.097 units remaining)
+  - location: 304 (remaining gas: 1039729.917 units remaining)
     [ (Pair {} Unit) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[packunpack_rev_cty.tz-Unit-(Pair \"edpkuBknW28nW72KG6RoH.1ac5de50fb.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[packunpack_rev_cty.tz-Unit-(Pair \"edpkuBknW28nW72KG6RoH.1ac5de50fb.out"
index 7c652a6bf780a0be3a6c54815e9b7a8ac0f7075c..27b2235d0d9c5b95b133d96864c1f210559499bd 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[packunpack_rev_cty.tz-Unit-(Pair \"edpkuBknW28nW72KG6RoH.1ac5de50fb.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[packunpack_rev_cty.tz-Unit-(Pair \"edpkuBknW28nW72KG6RoH.1ac5de50fb.out"	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 28 (remaining gas: 1039485.138 units remaining)
+  - location: 28 (remaining gas: 1039487.538 units remaining)
     [ (Pair (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
                   Unit
                   "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
@@ -19,7 +19,7 @@ trace
                   { Elt 0 "foo" ; Elt 1 "bar" }
                   { PACK })
             Unit) ]
-  - location: 28 (remaining gas: 1039485.128 units remaining)
+  - location: 28 (remaining gas: 1039487.528 units remaining)
     [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             Unit
             "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
@@ -30,7 +30,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 29 (remaining gas: 1039485.118 units remaining)
+  - location: 29 (remaining gas: 1039487.518 units remaining)
     [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             Unit
             "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
@@ -51,7 +51,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 30 (remaining gas: 1039485.108 units remaining)
+  - location: 30 (remaining gas: 1039487.508 units remaining)
     [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
       (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             Unit
@@ -63,7 +63,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 31 (remaining gas: 1039485.093 units remaining)
+  - location: 31 (remaining gas: 1039487.498 units remaining)
     [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             Unit
             "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
@@ -74,7 +74,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 33 (remaining gas: 1039485.083 units remaining)
+  - location: 33 (remaining gas: 1039487.488 units remaining)
     [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
       (Pair Unit
             "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
@@ -85,7 +85,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 31 (remaining gas: 1039485.053 units remaining)
+  - location: 31 (remaining gas: 1039487.468 units remaining)
     [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
       "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
       (Pair Unit
@@ -97,7 +97,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 34 (remaining gas: 1039483.181 units remaining)
+  - location: 34 (remaining gas: 1039485.596 units remaining)
     [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f
       "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
       (Pair Unit
@@ -109,7 +109,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 35 (remaining gas: 1039483.166 units remaining)
+  - location: 35 (remaining gas: 1039485.586 units remaining)
     [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
       (Pair Unit
             "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
@@ -120,7 +120,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 37 (remaining gas: 1039481.294 units remaining)
+  - location: 37 (remaining gas: 1039483.714 units remaining)
     [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f
       (Pair Unit
             "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
@@ -131,7 +131,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 38 (remaining gas: 1039160.150 units remaining)
+  - location: 38 (remaining gas: 1039162.570 units remaining)
     [ (Some "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav")
       (Pair Unit
             "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
@@ -142,7 +142,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 41 (remaining gas: 1039160.140 units remaining)
+  - location: 41 (remaining gas: 1039162.560 units remaining)
     [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
       (Pair Unit
             "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
@@ -153,7 +153,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 41 (remaining gas: 1039160.125 units remaining)
+  - location: 41 (remaining gas: 1039162.550 units remaining)
     [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
       (Pair Unit
             "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
@@ -164,7 +164,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 47 (remaining gas: 1039158.253 units remaining)
+  - location: 47 (remaining gas: 1039160.678 units remaining)
     [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f
       (Pair Unit
             "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
@@ -175,7 +175,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 35 (remaining gas: 1039158.223 units remaining)
+  - location: 35 (remaining gas: 1039160.658 units remaining)
     [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f
       0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f
       (Pair Unit
@@ -187,7 +187,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 50 (remaining gas: 1039158.188 units remaining)
+  - location: 50 (remaining gas: 1039160.623 units remaining)
     [ 0
       (Pair Unit
             "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
@@ -198,7 +198,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 51 (remaining gas: 1039158.173 units remaining)
+  - location: 51 (remaining gas: 1039160.613 units remaining)
     [ True
       (Pair Unit
             "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
@@ -209,7 +209,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 52 (remaining gas: 1039158.163 units remaining)
+  - location: 52 (remaining gas: 1039160.603 units remaining)
     [ (Pair Unit
             "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
             (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7")
@@ -219,7 +219,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 52 (remaining gas: 1039158.148 units remaining)
+  - location: 52 (remaining gas: 1039160.593 units remaining)
     [ (Pair Unit
             "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
             (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7")
@@ -229,7 +229,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 58 (remaining gas: 1039158.138 units remaining)
+  - location: 58 (remaining gas: 1039160.583 units remaining)
     [ (Pair Unit
             "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
             (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7")
@@ -248,7 +248,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 59 (remaining gas: 1039158.128 units remaining)
+  - location: 59 (remaining gas: 1039160.573 units remaining)
     [ Unit
       (Pair Unit
             "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
@@ -259,7 +259,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 60 (remaining gas: 1039158.113 units remaining)
+  - location: 60 (remaining gas: 1039160.563 units remaining)
     [ (Pair Unit
             "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
             (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7")
@@ -269,7 +269,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 62 (remaining gas: 1039158.103 units remaining)
+  - location: 62 (remaining gas: 1039160.553 units remaining)
     [ Unit
       (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
             (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7")
@@ -279,7 +279,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 60 (remaining gas: 1039158.073 units remaining)
+  - location: 60 (remaining gas: 1039160.533 units remaining)
     [ Unit
       Unit
       (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
@@ -290,7 +290,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 63 (remaining gas: 1039157.846 units remaining)
+  - location: 63 (remaining gas: 1039160.306 units remaining)
     [ 0x05030b
       Unit
       (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
@@ -301,7 +301,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 64 (remaining gas: 1039157.831 units remaining)
+  - location: 64 (remaining gas: 1039160.296 units remaining)
     [ Unit
       (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
             (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7")
@@ -311,7 +311,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 66 (remaining gas: 1039157.604 units remaining)
+  - location: 66 (remaining gas: 1039160.069 units remaining)
     [ 0x05030b
       (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
             (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7")
@@ -321,7 +321,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 67 (remaining gas: 1039157.184 units remaining)
+  - location: 67 (remaining gas: 1039159.649 units remaining)
     [ (Some Unit)
       (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
             (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7")
@@ -331,7 +331,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 70 (remaining gas: 1039157.174 units remaining)
+  - location: 70 (remaining gas: 1039159.639 units remaining)
     [ Unit
       (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
             (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7")
@@ -341,7 +341,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 70 (remaining gas: 1039157.159 units remaining)
+  - location: 70 (remaining gas: 1039159.629 units remaining)
     [ Unit
       (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
             (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7")
@@ -351,7 +351,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 76 (remaining gas: 1039156.932 units remaining)
+  - location: 76 (remaining gas: 1039159.402 units remaining)
     [ 0x05030b
       (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
             (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7")
@@ -361,7 +361,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 64 (remaining gas: 1039156.902 units remaining)
+  - location: 64 (remaining gas: 1039159.382 units remaining)
     [ 0x05030b
       0x05030b
       (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
@@ -372,7 +372,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 79 (remaining gas: 1039156.867 units remaining)
+  - location: 79 (remaining gas: 1039159.347 units remaining)
     [ 0
       (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
             (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7")
@@ -382,7 +382,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 80 (remaining gas: 1039156.852 units remaining)
+  - location: 80 (remaining gas: 1039159.337 units remaining)
     [ True
       (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
             (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7")
@@ -392,7 +392,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 81 (remaining gas: 1039156.842 units remaining)
+  - location: 81 (remaining gas: 1039159.327 units remaining)
     [ (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
             (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7")
             { Unit }
@@ -401,7 +401,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 81 (remaining gas: 1039156.827 units remaining)
+  - location: 81 (remaining gas: 1039159.317 units remaining)
     [ (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
             (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7")
             { Unit }
@@ -410,7 +410,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 87 (remaining gas: 1039156.817 units remaining)
+  - location: 87 (remaining gas: 1039159.307 units remaining)
     [ (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
             (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7")
             { Unit }
@@ -427,7 +427,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 88 (remaining gas: 1039156.807 units remaining)
+  - location: 88 (remaining gas: 1039159.297 units remaining)
     [ "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
       (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
             (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7")
@@ -437,7 +437,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 89 (remaining gas: 1039156.792 units remaining)
+  - location: 89 (remaining gas: 1039159.287 units remaining)
     [ (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
             (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7")
             { Unit }
@@ -446,7 +446,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 91 (remaining gas: 1039156.782 units remaining)
+  - location: 91 (remaining gas: 1039159.277 units remaining)
     [ "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
       (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7")
             { Unit }
@@ -455,7 +455,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 89 (remaining gas: 1039156.752 units remaining)
+  - location: 89 (remaining gas: 1039159.257 units remaining)
     [ "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
       "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
       (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7")
@@ -465,7 +465,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 92 (remaining gas: 1039154.265 units remaining)
+  - location: 92 (remaining gas: 1039156.770 units remaining)
     [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306
       "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
       (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7")
@@ -475,7 +475,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 93 (remaining gas: 1039154.250 units remaining)
+  - location: 93 (remaining gas: 1039156.760 units remaining)
     [ "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
       (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7")
             { Unit }
@@ -484,7 +484,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 95 (remaining gas: 1039151.763 units remaining)
+  - location: 95 (remaining gas: 1039154.273 units remaining)
     [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306
       (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7")
             { Unit }
@@ -493,7 +493,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 96 (remaining gas: 1039149.960 units remaining)
+  - location: 96 (remaining gas: 1039152.470 units remaining)
     [ (Some "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe")
       (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7")
             { Unit }
@@ -502,7 +502,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 99 (remaining gas: 1039149.950 units remaining)
+  - location: 99 (remaining gas: 1039152.460 units remaining)
     [ "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe"
       (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7")
             { Unit }
@@ -511,7 +511,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 99 (remaining gas: 1039149.935 units remaining)
+  - location: 99 (remaining gas: 1039152.450 units remaining)
     [ "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe"
       (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7")
             { Unit }
@@ -520,7 +520,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 105 (remaining gas: 1039147.448 units remaining)
+  - location: 105 (remaining gas: 1039149.963 units remaining)
     [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306
       (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7")
             { Unit }
@@ -529,7 +529,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 93 (remaining gas: 1039147.418 units remaining)
+  - location: 93 (remaining gas: 1039149.943 units remaining)
     [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306
       0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306
       (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7")
@@ -539,7 +539,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 108 (remaining gas: 1039147.382 units remaining)
+  - location: 108 (remaining gas: 1039149.907 units remaining)
     [ 0
       (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7")
             { Unit }
@@ -548,7 +548,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 109 (remaining gas: 1039147.367 units remaining)
+  - location: 109 (remaining gas: 1039149.897 units remaining)
     [ True
       (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7")
             { Unit }
@@ -557,7 +557,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 110 (remaining gas: 1039147.357 units remaining)
+  - location: 110 (remaining gas: 1039149.887 units remaining)
     [ (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7")
             { Unit }
             { True }
@@ -565,7 +565,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 110 (remaining gas: 1039147.342 units remaining)
+  - location: 110 (remaining gas: 1039149.877 units remaining)
     [ (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7")
             { Unit }
             { True }
@@ -573,7 +573,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 116 (remaining gas: 1039147.332 units remaining)
+  - location: 116 (remaining gas: 1039149.867 units remaining)
     [ (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7")
             { Unit }
             { True }
@@ -588,7 +588,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 117 (remaining gas: 1039147.322 units remaining)
+  - location: 117 (remaining gas: 1039149.857 units remaining)
     [ (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7")
       (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7")
             { Unit }
@@ -597,7 +597,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 118 (remaining gas: 1039147.307 units remaining)
+  - location: 118 (remaining gas: 1039149.847 units remaining)
     [ (Pair (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7")
             { Unit }
             { True }
@@ -605,7 +605,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 120 (remaining gas: 1039147.297 units remaining)
+  - location: 120 (remaining gas: 1039149.837 units remaining)
     [ (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7")
       (Pair { Unit }
             { True }
@@ -613,7 +613,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 118 (remaining gas: 1039147.267 units remaining)
+  - location: 118 (remaining gas: 1039149.817 units remaining)
     [ (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7")
       (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7")
       (Pair { Unit }
@@ -622,7 +622,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 121 (remaining gas: 1039144.618 units remaining)
+  - location: 121 (remaining gas: 1039147.168 units remaining)
     [ 0x0505090a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306
       (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7")
       (Pair { Unit }
@@ -631,7 +631,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 122 (remaining gas: 1039144.603 units remaining)
+  - location: 122 (remaining gas: 1039147.158 units remaining)
     [ (Some "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7")
       (Pair { Unit }
             { True }
@@ -639,7 +639,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 124 (remaining gas: 1039141.954 units remaining)
+  - location: 124 (remaining gas: 1039144.509 units remaining)
     [ 0x0505090a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306
       (Pair { Unit }
             { True }
@@ -647,7 +647,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 125 (remaining gas: 1039140.010 units remaining)
+  - location: 125 (remaining gas: 1039142.565 units remaining)
     [ (Some (Some "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe"))
       (Pair { Unit }
             { True }
@@ -655,7 +655,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 129 (remaining gas: 1039140 units remaining)
+  - location: 129 (remaining gas: 1039142.555 units remaining)
     [ (Some "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe")
       (Pair { Unit }
             { True }
@@ -663,7 +663,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 129 (remaining gas: 1039139.985 units remaining)
+  - location: 129 (remaining gas: 1039142.545 units remaining)
     [ (Some "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe")
       (Pair { Unit }
             { True }
@@ -671,7 +671,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 135 (remaining gas: 1039137.336 units remaining)
+  - location: 135 (remaining gas: 1039139.896 units remaining)
     [ 0x0505090a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306
       (Pair { Unit }
             { True }
@@ -679,7 +679,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 122 (remaining gas: 1039137.306 units remaining)
+  - location: 122 (remaining gas: 1039139.876 units remaining)
     [ 0x0505090a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306
       0x0505090a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306
       (Pair { Unit }
@@ -688,7 +688,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 138 (remaining gas: 1039137.270 units remaining)
+  - location: 138 (remaining gas: 1039139.840 units remaining)
     [ 0
       (Pair { Unit }
             { True }
@@ -696,7 +696,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 139 (remaining gas: 1039137.255 units remaining)
+  - location: 139 (remaining gas: 1039139.830 units remaining)
     [ True
       (Pair { Unit }
             { True }
@@ -704,21 +704,21 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 140 (remaining gas: 1039137.245 units remaining)
+  - location: 140 (remaining gas: 1039139.820 units remaining)
     [ (Pair { Unit }
             { True }
             (Pair 19 10)
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 140 (remaining gas: 1039137.230 units remaining)
+  - location: 140 (remaining gas: 1039139.810 units remaining)
     [ (Pair { Unit }
             { True }
             (Pair 19 10)
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 146 (remaining gas: 1039137.220 units remaining)
+  - location: 146 (remaining gas: 1039139.800 units remaining)
     [ (Pair { Unit }
             { True }
             (Pair 19 10)
@@ -731,7 +731,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 147 (remaining gas: 1039137.210 units remaining)
+  - location: 147 (remaining gas: 1039139.790 units remaining)
     [ { Unit }
       (Pair { Unit }
             { True }
@@ -739,21 +739,21 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 148 (remaining gas: 1039137.195 units remaining)
+  - location: 148 (remaining gas: 1039139.780 units remaining)
     [ (Pair { Unit }
             { True }
             (Pair 19 10)
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 150 (remaining gas: 1039137.185 units remaining)
+  - location: 150 (remaining gas: 1039139.770 units remaining)
     [ { Unit }
       (Pair { True }
             (Pair 19 10)
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 148 (remaining gas: 1039137.155 units remaining)
+  - location: 148 (remaining gas: 1039139.750 units remaining)
     [ { Unit }
       { Unit }
       (Pair { True }
@@ -761,7 +761,7 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 151 (remaining gas: 1039136.667 units remaining)
+  - location: 151 (remaining gas: 1039139.262 units remaining)
     [ 0x050200000002030b
       { Unit }
       (Pair { True }
@@ -769,49 +769,49 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 152 (remaining gas: 1039136.652 units remaining)
+  - location: 152 (remaining gas: 1039139.252 units remaining)
     [ { Unit }
       (Pair { True }
             (Pair 19 10)
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 154 (remaining gas: 1039136.164 units remaining)
+  - location: 154 (remaining gas: 1039138.764 units remaining)
     [ 0x050200000002030b
       (Pair { True }
             (Pair 19 10)
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 155 (remaining gas: 1039135.543 units remaining)
+  - location: 155 (remaining gas: 1039138.143 units remaining)
     [ (Some { Unit })
       (Pair { True }
             (Pair 19 10)
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 159 (remaining gas: 1039135.533 units remaining)
+  - location: 159 (remaining gas: 1039138.133 units remaining)
     [ { Unit }
       (Pair { True }
             (Pair 19 10)
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 159 (remaining gas: 1039135.518 units remaining)
+  - location: 159 (remaining gas: 1039138.123 units remaining)
     [ { Unit }
       (Pair { True }
             (Pair 19 10)
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 165 (remaining gas: 1039135.030 units remaining)
+  - location: 165 (remaining gas: 1039137.635 units remaining)
     [ 0x050200000002030b
       (Pair { True }
             (Pair 19 10)
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 152 (remaining gas: 1039135 units remaining)
+  - location: 152 (remaining gas: 1039137.615 units remaining)
     [ 0x050200000002030b
       0x050200000002030b
       (Pair { True }
@@ -819,33 +819,33 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 168 (remaining gas: 1039134.965 units remaining)
+  - location: 168 (remaining gas: 1039137.580 units remaining)
     [ 0
       (Pair { True }
             (Pair 19 10)
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 169 (remaining gas: 1039134.950 units remaining)
+  - location: 169 (remaining gas: 1039137.570 units remaining)
     [ True
       (Pair { True }
             (Pair 19 10)
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 170 (remaining gas: 1039134.940 units remaining)
+  - location: 170 (remaining gas: 1039137.560 units remaining)
     [ (Pair { True }
             (Pair 19 10)
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 170 (remaining gas: 1039134.925 units remaining)
+  - location: 170 (remaining gas: 1039137.550 units remaining)
     [ (Pair { True }
             (Pair 19 10)
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 176 (remaining gas: 1039134.915 units remaining)
+  - location: 176 (remaining gas: 1039137.540 units remaining)
     [ (Pair { True }
             (Pair 19 10)
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
@@ -856,105 +856,105 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 177 (remaining gas: 1039134.905 units remaining)
+  - location: 177 (remaining gas: 1039137.530 units remaining)
     [ { True }
       (Pair { True }
             (Pair 19 10)
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 178 (remaining gas: 1039134.890 units remaining)
+  - location: 178 (remaining gas: 1039137.520 units remaining)
     [ (Pair { True }
             (Pair 19 10)
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 180 (remaining gas: 1039134.880 units remaining)
+  - location: 180 (remaining gas: 1039137.510 units remaining)
     [ { True }
       (Pair (Pair 19 10)
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 178 (remaining gas: 1039134.850 units remaining)
+  - location: 178 (remaining gas: 1039137.490 units remaining)
     [ { True }
       { True }
       (Pair (Pair 19 10)
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 181 (remaining gas: 1039134.362 units remaining)
+  - location: 181 (remaining gas: 1039137.002 units remaining)
     [ 0x050200000002030a
       { True }
       (Pair (Pair 19 10)
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 182 (remaining gas: 1039134.347 units remaining)
+  - location: 182 (remaining gas: 1039136.992 units remaining)
     [ { True }
       (Pair (Pair 19 10)
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 184 (remaining gas: 1039133.859 units remaining)
+  - location: 184 (remaining gas: 1039136.504 units remaining)
     [ 0x050200000002030a
       (Pair (Pair 19 10)
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 185 (remaining gas: 1039133.106 units remaining)
+  - location: 185 (remaining gas: 1039135.751 units remaining)
     [ (Some { True })
       (Pair (Pair 19 10)
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 189 (remaining gas: 1039133.096 units remaining)
+  - location: 189 (remaining gas: 1039135.741 units remaining)
     [ { True }
       (Pair (Pair 19 10)
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 189 (remaining gas: 1039133.081 units remaining)
+  - location: 189 (remaining gas: 1039135.731 units remaining)
     [ { True }
       (Pair (Pair 19 10)
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 195 (remaining gas: 1039132.593 units remaining)
+  - location: 195 (remaining gas: 1039135.243 units remaining)
     [ 0x050200000002030a
       (Pair (Pair 19 10)
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 182 (remaining gas: 1039132.563 units remaining)
+  - location: 182 (remaining gas: 1039135.223 units remaining)
     [ 0x050200000002030a
       0x050200000002030a
       (Pair (Pair 19 10)
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 198 (remaining gas: 1039132.528 units remaining)
+  - location: 198 (remaining gas: 1039135.188 units remaining)
     [ 0
       (Pair (Pair 19 10)
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 199 (remaining gas: 1039132.513 units remaining)
+  - location: 199 (remaining gas: 1039135.178 units remaining)
     [ True
       (Pair (Pair 19 10)
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 200 (remaining gas: 1039132.503 units remaining)
+  - location: 200 (remaining gas: 1039135.168 units remaining)
     [ (Pair (Pair 19 10)
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 200 (remaining gas: 1039132.488 units remaining)
+  - location: 200 (remaining gas: 1039135.158 units remaining)
     [ (Pair (Pair 19 10)
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 206 (remaining gas: 1039132.478 units remaining)
+  - location: 206 (remaining gas: 1039135.148 units remaining)
     [ (Pair (Pair 19 10)
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
@@ -963,232 +963,232 @@ trace
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 207 (remaining gas: 1039132.468 units remaining)
+  - location: 207 (remaining gas: 1039135.138 units remaining)
     [ (Pair 19 10)
       (Pair (Pair 19 10)
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 208 (remaining gas: 1039132.453 units remaining)
+  - location: 208 (remaining gas: 1039135.128 units remaining)
     [ (Pair (Pair 19 10)
             (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 210 (remaining gas: 1039132.443 units remaining)
+  - location: 210 (remaining gas: 1039135.118 units remaining)
     [ (Pair 19 10)
       (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 208 (remaining gas: 1039132.413 units remaining)
+  - location: 208 (remaining gas: 1039135.098 units remaining)
     [ (Pair 19 10)
       (Pair 19 10)
       (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 211 (remaining gas: 1039131.862 units remaining)
+  - location: 211 (remaining gas: 1039134.547 units remaining)
     [ 0x0507070013000a
       (Pair 19 10)
       (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 212 (remaining gas: 1039131.847 units remaining)
+  - location: 212 (remaining gas: 1039134.537 units remaining)
     [ (Pair 19 10)
       (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 214 (remaining gas: 1039131.296 units remaining)
+  - location: 214 (remaining gas: 1039133.986 units remaining)
     [ 0x0507070013000a
       (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 215 (remaining gas: 1039130.596 units remaining)
+  - location: 215 (remaining gas: 1039133.286 units remaining)
     [ (Some (Pair 19 10))
       (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 220 (remaining gas: 1039130.586 units remaining)
+  - location: 220 (remaining gas: 1039133.276 units remaining)
     [ (Pair 19 10)
       (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 220 (remaining gas: 1039130.571 units remaining)
+  - location: 220 (remaining gas: 1039133.266 units remaining)
     [ (Pair 19 10)
       (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 226 (remaining gas: 1039130.020 units remaining)
+  - location: 226 (remaining gas: 1039132.715 units remaining)
     [ 0x0507070013000a
       (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 212 (remaining gas: 1039129.990 units remaining)
+  - location: 212 (remaining gas: 1039132.695 units remaining)
     [ 0x0507070013000a
       0x0507070013000a
       (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 229 (remaining gas: 1039129.955 units remaining)
+  - location: 229 (remaining gas: 1039132.660 units remaining)
     [ 0
       (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 230 (remaining gas: 1039129.940 units remaining)
+  - location: 230 (remaining gas: 1039132.650 units remaining)
     [ True
       (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 231 (remaining gas: 1039129.930 units remaining)
+  - location: 231 (remaining gas: 1039132.640 units remaining)
     [ (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 231 (remaining gas: 1039129.915 units remaining)
+  - location: 231 (remaining gas: 1039132.630 units remaining)
     [ (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 237 (remaining gas: 1039129.905 units remaining)
+  - location: 237 (remaining gas: 1039132.620 units remaining)
     [ (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK })
       (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 238 (remaining gas: 1039129.895 units remaining)
+  - location: 238 (remaining gas: 1039132.610 units remaining)
     [ (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
       (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 239 (remaining gas: 1039129.880 units remaining)
+  - location: 239 (remaining gas: 1039132.600 units remaining)
     [ (Pair (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
             { Elt 0 "foo" ; Elt 1 "bar" }
             { PACK }) ]
-  - location: 241 (remaining gas: 1039129.870 units remaining)
+  - location: 241 (remaining gas: 1039132.590 units remaining)
     [ (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
       (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ]
-  - location: 239 (remaining gas: 1039129.840 units remaining)
+  - location: 239 (remaining gas: 1039132.570 units remaining)
     [ (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
       (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
       (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ]
-  - location: 242 (remaining gas: 1039128.588 units remaining)
+  - location: 242 (remaining gas: 1039131.318 units remaining)
     [ 0x0505050a0000001500bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a
       (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
       (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ]
-  - location: 243 (remaining gas: 1039128.573 units remaining)
+  - location: 243 (remaining gas: 1039131.308 units remaining)
     [ (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
       (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ]
-  - location: 245 (remaining gas: 1039127.321 units remaining)
+  - location: 245 (remaining gas: 1039130.056 units remaining)
     [ 0x0505050a0000001500bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a
       (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ]
-  - location: 246 (remaining gas: 1039126.228 units remaining)
+  - location: 246 (remaining gas: 1039128.963 units remaining)
     [ (Some (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5"))
       (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ]
-  - location: 251 (remaining gas: 1039126.218 units remaining)
+  - location: 251 (remaining gas: 1039128.953 units remaining)
     [ (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
       (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ]
-  - location: 251 (remaining gas: 1039126.203 units remaining)
+  - location: 251 (remaining gas: 1039128.943 units remaining)
     [ (Left "tz1cxcwwnzENRdhe2Kb8ZdTrdNy4bFNyScx5")
       (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ]
-  - location: 257 (remaining gas: 1039124.951 units remaining)
+  - location: 257 (remaining gas: 1039127.691 units remaining)
     [ 0x0505050a0000001500bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a
       (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ]
-  - location: 243 (remaining gas: 1039124.921 units remaining)
+  - location: 243 (remaining gas: 1039127.671 units remaining)
     [ 0x0505050a0000001500bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a
       0x0505050a0000001500bdfe3885e846fdea23c9acbe3bb1cfcca9c03e4a
       (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ]
-  - location: 260 (remaining gas: 1039124.886 units remaining)
+  - location: 260 (remaining gas: 1039127.636 units remaining)
     [ 0
       (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ]
-  - location: 261 (remaining gas: 1039124.871 units remaining)
+  - location: 261 (remaining gas: 1039127.626 units remaining)
     [ True
       (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ]
-  - location: 262 (remaining gas: 1039124.861 units remaining)
+  - location: 262 (remaining gas: 1039127.616 units remaining)
     [ (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ]
-  - location: 262 (remaining gas: 1039124.846 units remaining)
+  - location: 262 (remaining gas: 1039127.606 units remaining)
     [ (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ]
-  - location: 268 (remaining gas: 1039124.836 units remaining)
+  - location: 268 (remaining gas: 1039127.596 units remaining)
     [ (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK })
       (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ]
-  - location: 269 (remaining gas: 1039124.826 units remaining)
+  - location: 269 (remaining gas: 1039127.586 units remaining)
     [ { Elt 0 "foo" ; Elt 1 "bar" }
       (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ]
-  - location: 270 (remaining gas: 1039124.811 units remaining)
+  - location: 270 (remaining gas: 1039127.576 units remaining)
     [ (Pair { Elt 0 "foo" ; Elt 1 "bar" } { PACK }) ]
-  - location: 272 (remaining gas: 1039124.801 units remaining)
+  - location: 272 (remaining gas: 1039127.566 units remaining)
     [ { Elt 0 "foo" ; Elt 1 "bar" }
       { PACK } ]
-  - location: 270 (remaining gas: 1039124.771 units remaining)
+  - location: 270 (remaining gas: 1039127.546 units remaining)
     [ { Elt 0 "foo" ; Elt 1 "bar" }
       { Elt 0 "foo" ; Elt 1 "bar" }
       { PACK } ]
-  - location: 273 (remaining gas: 1039123.166 units remaining)
+  - location: 273 (remaining gas: 1039125.941 units remaining)
     [ 0x050200000018070400000100000003666f6f070400010100000003626172
       { Elt 0 "foo" ; Elt 1 "bar" }
       { PACK } ]
-  - location: 274 (remaining gas: 1039123.151 units remaining)
+  - location: 274 (remaining gas: 1039125.931 units remaining)
     [ { Elt 0 "foo" ; Elt 1 "bar" }
       { PACK } ]
-  - location: 276 (remaining gas: 1039121.546 units remaining)
+  - location: 276 (remaining gas: 1039124.326 units remaining)
     [ 0x050200000018070400000100000003666f6f070400010100000003626172
       { PACK } ]
-  - location: 277 (remaining gas: 1039119.900 units remaining)
+  - location: 277 (remaining gas: 1039122.680 units remaining)
     [ (Some { Elt 0 "foo" ; Elt 1 "bar" })
       { PACK } ]
-  - location: 282 (remaining gas: 1039119.890 units remaining)
+  - location: 282 (remaining gas: 1039122.670 units remaining)
     [ { Elt 0 "foo" ; Elt 1 "bar" }
       { PACK } ]
-  - location: 282 (remaining gas: 1039119.875 units remaining)
+  - location: 282 (remaining gas: 1039122.660 units remaining)
     [ { Elt 0 "foo" ; Elt 1 "bar" }
       { PACK } ]
-  - location: 288 (remaining gas: 1039118.270 units remaining)
+  - location: 288 (remaining gas: 1039121.055 units remaining)
     [ 0x050200000018070400000100000003666f6f070400010100000003626172
       { PACK } ]
-  - location: 274 (remaining gas: 1039118.240 units remaining)
+  - location: 274 (remaining gas: 1039121.035 units remaining)
     [ 0x050200000018070400000100000003666f6f070400010100000003626172
       0x050200000018070400000100000003666f6f070400010100000003626172
       { PACK } ]
-  - location: 291 (remaining gas: 1039118.205 units remaining)
+  - location: 291 (remaining gas: 1039121 units remaining)
     [ 0
       { PACK } ]
-  - location: 292 (remaining gas: 1039118.190 units remaining)
+  - location: 292 (remaining gas: 1039120.990 units remaining)
     [ True
       { PACK } ]
-  - location: 293 (remaining gas: 1039118.180 units remaining)
+  - location: 293 (remaining gas: 1039120.980 units remaining)
     [ { PACK } ]
-  - location: 293 (remaining gas: 1039118.165 units remaining)
+  - location: 293 (remaining gas: 1039120.970 units remaining)
     [ { PACK } ]
-  - location: 299 (remaining gas: 1039118.155 units remaining)
+  - location: 299 (remaining gas: 1039120.960 units remaining)
     [ { PACK }
       { PACK } ]
-  - location: 300 (remaining gas: 1039117.482 units remaining)
+  - location: 300 (remaining gas: 1039120.287 units remaining)
     [ 0x050200000002030c
       { PACK } ]
-  - location: 301 (remaining gas: 1039117.467 units remaining)
+  - location: 301 (remaining gas: 1039120.277 units remaining)
     [ { PACK } ]
-  - location: 303 (remaining gas: 1039116.794 units remaining)
+  - location: 303 (remaining gas: 1039119.604 units remaining)
     [ 0x050200000002030c ]
-  - location: 304 (remaining gas: 1039115.613 units remaining)
+  - location: 304 (remaining gas: 1039118.583 units remaining)
     [ (Some { PACK }) ]
-  - location: 309 (remaining gas: 1039115.603 units remaining)
+  - location: 309 (remaining gas: 1039118.573 units remaining)
     [ { PACK } ]
-  - location: 309 (remaining gas: 1039115.588 units remaining)
+  - location: 309 (remaining gas: 1039118.563 units remaining)
     [ { PACK } ]
-  - location: 315 (remaining gas: 1039114.915 units remaining)
+  - location: 315 (remaining gas: 1039117.890 units remaining)
     [ 0x050200000002030c ]
-  - location: 301 (remaining gas: 1039114.885 units remaining)
+  - location: 301 (remaining gas: 1039117.870 units remaining)
     [ 0x050200000002030c
       0x050200000002030c ]
-  - location: 318 (remaining gas: 1039114.850 units remaining)
+  - location: 318 (remaining gas: 1039117.835 units remaining)
     [ 0 ]
-  - location: 319 (remaining gas: 1039114.835 units remaining)
+  - location: 319 (remaining gas: 1039117.825 units remaining)
     [ True ]
-  - location: 320 (remaining gas: 1039114.825 units remaining)
+  - location: 320 (remaining gas: 1039117.815 units remaining)
     [  ]
-  - location: 320 (remaining gas: 1039114.810 units remaining)
+  - location: 320 (remaining gas: 1039117.805 units remaining)
     [  ]
-  - location: 326 (remaining gas: 1039114.800 units remaining)
+  - location: 326 (remaining gas: 1039117.795 units remaining)
     [ Unit ]
-  - location: 327 (remaining gas: 1039114.785 units remaining)
+  - location: 327 (remaining gas: 1039117.785 units remaining)
     [ {}
       Unit ]
-  - location: 329 (remaining gas: 1039114.770 units remaining)
+  - location: 329 (remaining gas: 1039117.775 units remaining)
     [ (Pair {} Unit) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[packunpack_rev_cty.tz-Unit-(Pair \"edpkuBknW28nW72KG6RoH.4e20b52378.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[packunpack_rev_cty.tz-Unit-(Pair \"edpkuBknW28nW72KG6RoH.4e20b52378.out"
index 6c4cc7b0b1451ba179709bc616320b93150896a5..d4c700d750a22a4077f91273cd606f57f866208a 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[packunpack_rev_cty.tz-Unit-(Pair \"edpkuBknW28nW72KG6RoH.4e20b52378.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[packunpack_rev_cty.tz-Unit-(Pair \"edpkuBknW28nW72KG6RoH.4e20b52378.out"	
@@ -7,7 +7,7 @@ emitted operations
 big_map diff
   
 trace
-  - location: 28 (remaining gas: 1039494.873 units remaining)
+  - location: 28 (remaining gas: 1039496.543 units remaining)
     [ (Pair (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
                   Unit
                   "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
@@ -19,7 +19,7 @@ trace
                   {}
                   { DUP ; DROP ; PACK })
             Unit) ]
-  - location: 28 (remaining gas: 1039494.863 units remaining)
+  - location: 28 (remaining gas: 1039496.533 units remaining)
     [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             Unit
             "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
@@ -30,7 +30,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 29 (remaining gas: 1039494.853 units remaining)
+  - location: 29 (remaining gas: 1039496.523 units remaining)
     [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             Unit
             "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
@@ -51,7 +51,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 30 (remaining gas: 1039494.843 units remaining)
+  - location: 30 (remaining gas: 1039496.513 units remaining)
     [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
       (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             Unit
@@ -63,7 +63,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 31 (remaining gas: 1039494.828 units remaining)
+  - location: 31 (remaining gas: 1039496.503 units remaining)
     [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
             Unit
             "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
@@ -74,7 +74,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 33 (remaining gas: 1039494.818 units remaining)
+  - location: 33 (remaining gas: 1039496.493 units remaining)
     [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
       (Pair Unit
             "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
@@ -85,7 +85,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 31 (remaining gas: 1039494.788 units remaining)
+  - location: 31 (remaining gas: 1039496.473 units remaining)
     [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
       "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
       (Pair Unit
@@ -97,7 +97,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 34 (remaining gas: 1039492.916 units remaining)
+  - location: 34 (remaining gas: 1039494.601 units remaining)
     [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f
       "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
       (Pair Unit
@@ -109,7 +109,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 35 (remaining gas: 1039492.901 units remaining)
+  - location: 35 (remaining gas: 1039494.591 units remaining)
     [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
       (Pair Unit
             "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
@@ -120,7 +120,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 37 (remaining gas: 1039491.029 units remaining)
+  - location: 37 (remaining gas: 1039492.719 units remaining)
     [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f
       (Pair Unit
             "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
@@ -131,7 +131,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 38 (remaining gas: 1039169.885 units remaining)
+  - location: 38 (remaining gas: 1039171.575 units remaining)
     [ (Some "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav")
       (Pair Unit
             "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
@@ -142,7 +142,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 41 (remaining gas: 1039169.875 units remaining)
+  - location: 41 (remaining gas: 1039171.565 units remaining)
     [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
       (Pair Unit
             "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
@@ -153,7 +153,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 41 (remaining gas: 1039169.860 units remaining)
+  - location: 41 (remaining gas: 1039171.555 units remaining)
     [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"
       (Pair Unit
             "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
@@ -164,7 +164,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 47 (remaining gas: 1039167.988 units remaining)
+  - location: 47 (remaining gas: 1039169.683 units remaining)
     [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f
       (Pair Unit
             "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
@@ -175,7 +175,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 35 (remaining gas: 1039167.958 units remaining)
+  - location: 35 (remaining gas: 1039169.663 units remaining)
     [ 0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f
       0x050a00000021004798d2cc98473d7e250c898885718afd2e4efbcb1a1595ab9730761ed830de0f
       (Pair Unit
@@ -187,7 +187,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 50 (remaining gas: 1039167.923 units remaining)
+  - location: 50 (remaining gas: 1039169.628 units remaining)
     [ 0
       (Pair Unit
             "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
@@ -198,7 +198,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 51 (remaining gas: 1039167.908 units remaining)
+  - location: 51 (remaining gas: 1039169.618 units remaining)
     [ True
       (Pair Unit
             "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
@@ -209,7 +209,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 52 (remaining gas: 1039167.898 units remaining)
+  - location: 52 (remaining gas: 1039169.608 units remaining)
     [ (Pair Unit
             "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
             None
@@ -219,7 +219,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 52 (remaining gas: 1039167.883 units remaining)
+  - location: 52 (remaining gas: 1039169.598 units remaining)
     [ (Pair Unit
             "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
             None
@@ -229,7 +229,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 58 (remaining gas: 1039167.873 units remaining)
+  - location: 58 (remaining gas: 1039169.588 units remaining)
     [ (Pair Unit
             "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
             None
@@ -248,7 +248,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 59 (remaining gas: 1039167.863 units remaining)
+  - location: 59 (remaining gas: 1039169.578 units remaining)
     [ Unit
       (Pair Unit
             "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
@@ -259,7 +259,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 60 (remaining gas: 1039167.848 units remaining)
+  - location: 60 (remaining gas: 1039169.568 units remaining)
     [ (Pair Unit
             "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
             None
@@ -269,7 +269,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 62 (remaining gas: 1039167.838 units remaining)
+  - location: 62 (remaining gas: 1039169.558 units remaining)
     [ Unit
       (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
             None
@@ -279,7 +279,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 60 (remaining gas: 1039167.808 units remaining)
+  - location: 60 (remaining gas: 1039169.538 units remaining)
     [ Unit
       Unit
       (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
@@ -290,7 +290,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 63 (remaining gas: 1039167.581 units remaining)
+  - location: 63 (remaining gas: 1039169.311 units remaining)
     [ 0x05030b
       Unit
       (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
@@ -301,7 +301,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 64 (remaining gas: 1039167.566 units remaining)
+  - location: 64 (remaining gas: 1039169.301 units remaining)
     [ Unit
       (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
             None
@@ -311,7 +311,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 66 (remaining gas: 1039167.339 units remaining)
+  - location: 66 (remaining gas: 1039169.074 units remaining)
     [ 0x05030b
       (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
             None
@@ -321,7 +321,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 67 (remaining gas: 1039166.919 units remaining)
+  - location: 67 (remaining gas: 1039168.654 units remaining)
     [ (Some Unit)
       (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
             None
@@ -331,7 +331,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 70 (remaining gas: 1039166.909 units remaining)
+  - location: 70 (remaining gas: 1039168.644 units remaining)
     [ Unit
       (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
             None
@@ -341,7 +341,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 70 (remaining gas: 1039166.894 units remaining)
+  - location: 70 (remaining gas: 1039168.634 units remaining)
     [ Unit
       (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
             None
@@ -351,7 +351,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 76 (remaining gas: 1039166.667 units remaining)
+  - location: 76 (remaining gas: 1039168.407 units remaining)
     [ 0x05030b
       (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
             None
@@ -361,7 +361,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 64 (remaining gas: 1039166.637 units remaining)
+  - location: 64 (remaining gas: 1039168.387 units remaining)
     [ 0x05030b
       0x05030b
       (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
@@ -372,7 +372,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 79 (remaining gas: 1039166.602 units remaining)
+  - location: 79 (remaining gas: 1039168.352 units remaining)
     [ 0
       (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
             None
@@ -382,7 +382,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 80 (remaining gas: 1039166.587 units remaining)
+  - location: 80 (remaining gas: 1039168.342 units remaining)
     [ True
       (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
             None
@@ -392,7 +392,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 81 (remaining gas: 1039166.577 units remaining)
+  - location: 81 (remaining gas: 1039168.332 units remaining)
     [ (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
             None
             {}
@@ -401,7 +401,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 81 (remaining gas: 1039166.562 units remaining)
+  - location: 81 (remaining gas: 1039168.322 units remaining)
     [ (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
             None
             {}
@@ -410,7 +410,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 87 (remaining gas: 1039166.552 units remaining)
+  - location: 87 (remaining gas: 1039168.312 units remaining)
     [ (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
             None
             {}
@@ -427,7 +427,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 88 (remaining gas: 1039166.542 units remaining)
+  - location: 88 (remaining gas: 1039168.302 units remaining)
     [ "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
       (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
             None
@@ -437,7 +437,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 89 (remaining gas: 1039166.527 units remaining)
+  - location: 89 (remaining gas: 1039168.292 units remaining)
     [ (Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
             None
             {}
@@ -446,7 +446,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 91 (remaining gas: 1039166.517 units remaining)
+  - location: 91 (remaining gas: 1039168.282 units remaining)
     [ "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
       (Pair None
             {}
@@ -455,7 +455,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 89 (remaining gas: 1039166.487 units remaining)
+  - location: 89 (remaining gas: 1039168.262 units remaining)
     [ "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
       "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
       (Pair None
@@ -465,7 +465,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 92 (remaining gas: 1039164 units remaining)
+  - location: 92 (remaining gas: 1039165.775 units remaining)
     [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306
       "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
       (Pair None
@@ -475,7 +475,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 93 (remaining gas: 1039163.985 units remaining)
+  - location: 93 (remaining gas: 1039165.765 units remaining)
     [ "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7"
       (Pair None
             {}
@@ -484,7 +484,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 95 (remaining gas: 1039161.498 units remaining)
+  - location: 95 (remaining gas: 1039163.278 units remaining)
     [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306
       (Pair None
             {}
@@ -493,7 +493,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 96 (remaining gas: 1039159.695 units remaining)
+  - location: 96 (remaining gas: 1039161.475 units remaining)
     [ (Some "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe")
       (Pair None
             {}
@@ -502,7 +502,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 99 (remaining gas: 1039159.685 units remaining)
+  - location: 99 (remaining gas: 1039161.465 units remaining)
     [ "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe"
       (Pair None
             {}
@@ -511,7 +511,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 99 (remaining gas: 1039159.670 units remaining)
+  - location: 99 (remaining gas: 1039161.455 units remaining)
     [ "sigXeXB5JD5TaLb3xgTPKjgf9W45judiCmNP9UBdZBdmtHSGBxL1M8ZSUb6LpjGP2MdfUBTB4WHs5APnvyRV1LooU6QHJuDe"
       (Pair None
             {}
@@ -520,7 +520,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 105 (remaining gas: 1039157.183 units remaining)
+  - location: 105 (remaining gas: 1039158.968 units remaining)
     [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306
       (Pair None
             {}
@@ -529,7 +529,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 93 (remaining gas: 1039157.153 units remaining)
+  - location: 93 (remaining gas: 1039158.948 units remaining)
     [ 0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306
       0x050a0000004049d47dba27bd76208b092f3e500f64818920c817491b8b9094f28c2c2b9c6721b257b8878ce47182122b8ea84aeacd84a8aa28cb1f1fe48a26355a7bca4b8306
       (Pair None
@@ -539,7 +539,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 108 (remaining gas: 1039157.117 units remaining)
+  - location: 108 (remaining gas: 1039158.912 units remaining)
     [ 0
       (Pair None
             {}
@@ -548,7 +548,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 109 (remaining gas: 1039157.102 units remaining)
+  - location: 109 (remaining gas: 1039158.902 units remaining)
     [ True
       (Pair None
             {}
@@ -557,7 +557,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 110 (remaining gas: 1039157.092 units remaining)
+  - location: 110 (remaining gas: 1039158.892 units remaining)
     [ (Pair None
             {}
             {}
@@ -565,7 +565,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 110 (remaining gas: 1039157.077 units remaining)
+  - location: 110 (remaining gas: 1039158.882 units remaining)
     [ (Pair None
             {}
             {}
@@ -573,7 +573,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 116 (remaining gas: 1039157.067 units remaining)
+  - location: 116 (remaining gas: 1039158.872 units remaining)
     [ (Pair None
             {}
             {}
@@ -588,7 +588,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 117 (remaining gas: 1039157.057 units remaining)
+  - location: 117 (remaining gas: 1039158.862 units remaining)
     [ None
       (Pair None
             {}
@@ -597,7 +597,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 118 (remaining gas: 1039157.042 units remaining)
+  - location: 118 (remaining gas: 1039158.852 units remaining)
     [ (Pair None
             {}
             {}
@@ -605,7 +605,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 120 (remaining gas: 1039157.032 units remaining)
+  - location: 120 (remaining gas: 1039158.842 units remaining)
     [ None
       (Pair {}
             {}
@@ -613,7 +613,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 118 (remaining gas: 1039157.002 units remaining)
+  - location: 118 (remaining gas: 1039158.822 units remaining)
     [ None
       None
       (Pair {}
@@ -622,7 +622,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 121 (remaining gas: 1039156.775 units remaining)
+  - location: 121 (remaining gas: 1039158.595 units remaining)
     [ 0x050306
       None
       (Pair {}
@@ -631,7 +631,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 122 (remaining gas: 1039156.760 units remaining)
+  - location: 122 (remaining gas: 1039158.585 units remaining)
     [ None
       (Pair {}
             {}
@@ -639,7 +639,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 124 (remaining gas: 1039156.533 units remaining)
+  - location: 124 (remaining gas: 1039158.358 units remaining)
     [ 0x050306
       (Pair {}
             {}
@@ -647,7 +647,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 125 (remaining gas: 1039156.113 units remaining)
+  - location: 125 (remaining gas: 1039157.938 units remaining)
     [ (Some None)
       (Pair {}
             {}
@@ -655,7 +655,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 129 (remaining gas: 1039156.103 units remaining)
+  - location: 129 (remaining gas: 1039157.928 units remaining)
     [ None
       (Pair {}
             {}
@@ -663,7 +663,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 129 (remaining gas: 1039156.088 units remaining)
+  - location: 129 (remaining gas: 1039157.918 units remaining)
     [ None
       (Pair {}
             {}
@@ -671,7 +671,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 135 (remaining gas: 1039155.861 units remaining)
+  - location: 135 (remaining gas: 1039157.691 units remaining)
     [ 0x050306
       (Pair {}
             {}
@@ -679,7 +679,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 122 (remaining gas: 1039155.831 units remaining)
+  - location: 122 (remaining gas: 1039157.671 units remaining)
     [ 0x050306
       0x050306
       (Pair {}
@@ -688,7 +688,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 138 (remaining gas: 1039155.796 units remaining)
+  - location: 138 (remaining gas: 1039157.636 units remaining)
     [ 0
       (Pair {}
             {}
@@ -696,7 +696,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 139 (remaining gas: 1039155.781 units remaining)
+  - location: 139 (remaining gas: 1039157.626 units remaining)
     [ True
       (Pair {}
             {}
@@ -704,21 +704,21 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 140 (remaining gas: 1039155.771 units remaining)
+  - location: 140 (remaining gas: 1039157.616 units remaining)
     [ (Pair {}
             {}
             (Pair 40 -10)
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 140 (remaining gas: 1039155.756 units remaining)
+  - location: 140 (remaining gas: 1039157.606 units remaining)
     [ (Pair {}
             {}
             (Pair 40 -10)
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 146 (remaining gas: 1039155.746 units remaining)
+  - location: 146 (remaining gas: 1039157.596 units remaining)
     [ (Pair {}
             {}
             (Pair 40 -10)
@@ -731,7 +731,7 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 147 (remaining gas: 1039155.736 units remaining)
+  - location: 147 (remaining gas: 1039157.586 units remaining)
     [ {}
       (Pair {}
             {}
@@ -739,294 +739,294 @@ trace
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 148 (remaining gas: 1039155.721 units remaining)
+  - location: 148 (remaining gas: 1039157.576 units remaining)
     [ (Pair {}
             {}
             (Pair 40 -10)
             (Right "2019-09-09T08:35:33Z")
             {}
             { DUP ; DROP ; PACK }) ]
-  - location: 150 (remaining gas: 1039155.711 units remaining)
+  - location: 150 (remaining gas: 1039157.566 units remaining)
     [ {}
       (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 148 (remaining gas: 1039155.681 units remaining)
+  - location: 148 (remaining gas: 1039157.546 units remaining)
     [ {}
       {}
       (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 151 (remaining gas: 1039155.355 units remaining)
+  - location: 151 (remaining gas: 1039157.220 units remaining)
     [ 0x050200000000
       {}
       (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 152 (remaining gas: 1039155.340 units remaining)
+  - location: 152 (remaining gas: 1039157.210 units remaining)
     [ {}
       (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 154 (remaining gas: 1039155.014 units remaining)
+  - location: 154 (remaining gas: 1039156.884 units remaining)
     [ 0x050200000000
       (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 155 (remaining gas: 1039154.534 units remaining)
+  - location: 155 (remaining gas: 1039156.404 units remaining)
     [ (Some {})
       (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 159 (remaining gas: 1039154.524 units remaining)
+  - location: 159 (remaining gas: 1039156.394 units remaining)
     [ {}
       (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 159 (remaining gas: 1039154.509 units remaining)
+  - location: 159 (remaining gas: 1039156.384 units remaining)
     [ {}
       (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 165 (remaining gas: 1039154.183 units remaining)
+  - location: 165 (remaining gas: 1039156.058 units remaining)
     [ 0x050200000000
       (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 152 (remaining gas: 1039154.153 units remaining)
+  - location: 152 (remaining gas: 1039156.038 units remaining)
     [ 0x050200000000
       0x050200000000
       (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 168 (remaining gas: 1039154.118 units remaining)
+  - location: 168 (remaining gas: 1039156.003 units remaining)
     [ 0
       (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 169 (remaining gas: 1039154.103 units remaining)
+  - location: 169 (remaining gas: 1039155.993 units remaining)
     [ True
       (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 170 (remaining gas: 1039154.093 units remaining)
+  - location: 170 (remaining gas: 1039155.983 units remaining)
     [ (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 170 (remaining gas: 1039154.078 units remaining)
+  - location: 170 (remaining gas: 1039155.973 units remaining)
     [ (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 176 (remaining gas: 1039154.068 units remaining)
+  - location: 176 (remaining gas: 1039155.963 units remaining)
     [ (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK })
       (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 177 (remaining gas: 1039154.058 units remaining)
+  - location: 177 (remaining gas: 1039155.953 units remaining)
     [ {}
       (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 178 (remaining gas: 1039154.043 units remaining)
+  - location: 178 (remaining gas: 1039155.943 units remaining)
     [ (Pair {} (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 180 (remaining gas: 1039154.033 units remaining)
+  - location: 180 (remaining gas: 1039155.933 units remaining)
     [ {}
       (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 178 (remaining gas: 1039154.003 units remaining)
+  - location: 178 (remaining gas: 1039155.913 units remaining)
     [ {}
       {}
       (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 181 (remaining gas: 1039153.677 units remaining)
+  - location: 181 (remaining gas: 1039155.587 units remaining)
     [ 0x050200000000
       {}
       (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 182 (remaining gas: 1039153.662 units remaining)
+  - location: 182 (remaining gas: 1039155.577 units remaining)
     [ {}
       (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 184 (remaining gas: 1039153.336 units remaining)
+  - location: 184 (remaining gas: 1039155.251 units remaining)
     [ 0x050200000000
       (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 185 (remaining gas: 1039152.856 units remaining)
+  - location: 185 (remaining gas: 1039154.771 units remaining)
     [ (Some {})
       (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 189 (remaining gas: 1039152.846 units remaining)
+  - location: 189 (remaining gas: 1039154.761 units remaining)
     [ {}
       (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 189 (remaining gas: 1039152.831 units remaining)
+  - location: 189 (remaining gas: 1039154.751 units remaining)
     [ {}
       (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 195 (remaining gas: 1039152.505 units remaining)
+  - location: 195 (remaining gas: 1039154.425 units remaining)
     [ 0x050200000000
       (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 182 (remaining gas: 1039152.475 units remaining)
+  - location: 182 (remaining gas: 1039154.405 units remaining)
     [ 0x050200000000
       0x050200000000
       (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 198 (remaining gas: 1039152.440 units remaining)
+  - location: 198 (remaining gas: 1039154.370 units remaining)
     [ 0
       (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 199 (remaining gas: 1039152.425 units remaining)
+  - location: 199 (remaining gas: 1039154.360 units remaining)
     [ True
       (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 200 (remaining gas: 1039152.415 units remaining)
+  - location: 200 (remaining gas: 1039154.350 units remaining)
     [ (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 200 (remaining gas: 1039152.400 units remaining)
+  - location: 200 (remaining gas: 1039154.340 units remaining)
     [ (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 206 (remaining gas: 1039152.390 units remaining)
+  - location: 206 (remaining gas: 1039154.330 units remaining)
     [ (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK })
       (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 207 (remaining gas: 1039152.380 units remaining)
+  - location: 207 (remaining gas: 1039154.320 units remaining)
     [ (Pair 40 -10)
       (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 208 (remaining gas: 1039152.365 units remaining)
+  - location: 208 (remaining gas: 1039154.310 units remaining)
     [ (Pair (Pair 40 -10) (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 210 (remaining gas: 1039152.355 units remaining)
+  - location: 210 (remaining gas: 1039154.300 units remaining)
     [ (Pair 40 -10)
       (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 208 (remaining gas: 1039152.325 units remaining)
+  - location: 208 (remaining gas: 1039154.280 units remaining)
     [ (Pair 40 -10)
       (Pair 40 -10)
       (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 211 (remaining gas: 1039151.774 units remaining)
+  - location: 211 (remaining gas: 1039153.729 units remaining)
     [ 0x0507070028004a
       (Pair 40 -10)
       (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 212 (remaining gas: 1039151.759 units remaining)
+  - location: 212 (remaining gas: 1039153.719 units remaining)
     [ (Pair 40 -10)
       (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 214 (remaining gas: 1039151.208 units remaining)
+  - location: 214 (remaining gas: 1039153.168 units remaining)
     [ 0x0507070028004a
       (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 215 (remaining gas: 1039150.508 units remaining)
+  - location: 215 (remaining gas: 1039152.468 units remaining)
     [ (Some (Pair 40 -10))
       (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 220 (remaining gas: 1039150.498 units remaining)
+  - location: 220 (remaining gas: 1039152.458 units remaining)
     [ (Pair 40 -10)
       (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 220 (remaining gas: 1039150.483 units remaining)
+  - location: 220 (remaining gas: 1039152.448 units remaining)
     [ (Pair 40 -10)
       (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 226 (remaining gas: 1039149.932 units remaining)
+  - location: 226 (remaining gas: 1039151.897 units remaining)
     [ 0x0507070028004a
       (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 212 (remaining gas: 1039149.902 units remaining)
+  - location: 212 (remaining gas: 1039151.877 units remaining)
     [ 0x0507070028004a
       0x0507070028004a
       (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 229 (remaining gas: 1039149.867 units remaining)
+  - location: 229 (remaining gas: 1039151.842 units remaining)
     [ 0
       (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 230 (remaining gas: 1039149.852 units remaining)
+  - location: 230 (remaining gas: 1039151.832 units remaining)
     [ True
       (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 231 (remaining gas: 1039149.842 units remaining)
+  - location: 231 (remaining gas: 1039151.822 units remaining)
     [ (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 231 (remaining gas: 1039149.827 units remaining)
+  - location: 231 (remaining gas: 1039151.812 units remaining)
     [ (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 237 (remaining gas: 1039149.817 units remaining)
+  - location: 237 (remaining gas: 1039151.802 units remaining)
     [ (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK })
       (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 238 (remaining gas: 1039149.807 units remaining)
+  - location: 238 (remaining gas: 1039151.792 units remaining)
     [ (Right "2019-09-09T08:35:33Z")
       (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 239 (remaining gas: 1039149.792 units remaining)
+  - location: 239 (remaining gas: 1039151.782 units remaining)
     [ (Pair (Right "2019-09-09T08:35:33Z") {} { DUP ; DROP ; PACK }) ]
-  - location: 241 (remaining gas: 1039149.782 units remaining)
+  - location: 241 (remaining gas: 1039151.772 units remaining)
     [ (Right "2019-09-09T08:35:33Z")
       (Pair {} { DUP ; DROP ; PACK }) ]
-  - location: 239 (remaining gas: 1039149.752 units remaining)
+  - location: 239 (remaining gas: 1039151.752 units remaining)
     [ (Right "2019-09-09T08:35:33Z")
       (Right "2019-09-09T08:35:33Z")
       (Pair {} { DUP ; DROP ; PACK }) ]
-  - location: 242 (remaining gas: 1039149.231 units remaining)
+  - location: 242 (remaining gas: 1039151.231 units remaining)
     [ 0x0505080095bbb0d70b
       (Right "2019-09-09T08:35:33Z")
       (Pair {} { DUP ; DROP ; PACK }) ]
-  - location: 243 (remaining gas: 1039149.216 units remaining)
+  - location: 243 (remaining gas: 1039151.221 units remaining)
     [ (Right "2019-09-09T08:35:33Z")
       (Pair {} { DUP ; DROP ; PACK }) ]
-  - location: 245 (remaining gas: 1039148.695 units remaining)
+  - location: 245 (remaining gas: 1039150.700 units remaining)
     [ 0x0505080095bbb0d70b
       (Pair {} { DUP ; DROP ; PACK }) ]
-  - location: 246 (remaining gas: 1039148.054 units remaining)
+  - location: 246 (remaining gas: 1039150.059 units remaining)
     [ (Some (Right "2019-09-09T08:35:33Z"))
       (Pair {} { DUP ; DROP ; PACK }) ]
-  - location: 251 (remaining gas: 1039148.044 units remaining)
+  - location: 251 (remaining gas: 1039150.049 units remaining)
     [ (Right "2019-09-09T08:35:33Z")
       (Pair {} { DUP ; DROP ; PACK }) ]
-  - location: 251 (remaining gas: 1039148.029 units remaining)
+  - location: 251 (remaining gas: 1039150.039 units remaining)
     [ (Right "2019-09-09T08:35:33Z")
       (Pair {} { DUP ; DROP ; PACK }) ]
-  - location: 257 (remaining gas: 1039147.508 units remaining)
+  - location: 257 (remaining gas: 1039149.518 units remaining)
     [ 0x0505080095bbb0d70b
       (Pair {} { DUP ; DROP ; PACK }) ]
-  - location: 243 (remaining gas: 1039147.478 units remaining)
+  - location: 243 (remaining gas: 1039149.498 units remaining)
     [ 0x0505080095bbb0d70b
       0x0505080095bbb0d70b
       (Pair {} { DUP ; DROP ; PACK }) ]
-  - location: 260 (remaining gas: 1039147.443 units remaining)
+  - location: 260 (remaining gas: 1039149.463 units remaining)
     [ 0
       (Pair {} { DUP ; DROP ; PACK }) ]
-  - location: 261 (remaining gas: 1039147.428 units remaining)
+  - location: 261 (remaining gas: 1039149.453 units remaining)
     [ True
       (Pair {} { DUP ; DROP ; PACK }) ]
-  - location: 262 (remaining gas: 1039147.418 units remaining)
+  - location: 262 (remaining gas: 1039149.443 units remaining)
     [ (Pair {} { DUP ; DROP ; PACK }) ]
-  - location: 262 (remaining gas: 1039147.403 units remaining)
+  - location: 262 (remaining gas: 1039149.433 units remaining)
     [ (Pair {} { DUP ; DROP ; PACK }) ]
-  - location: 268 (remaining gas: 1039147.393 units remaining)
+  - location: 268 (remaining gas: 1039149.423 units remaining)
     [ (Pair {} { DUP ; DROP ; PACK })
       (Pair {} { DUP ; DROP ; PACK }) ]
-  - location: 269 (remaining gas: 1039147.383 units remaining)
+  - location: 269 (remaining gas: 1039149.413 units remaining)
     [ {}
       (Pair {} { DUP ; DROP ; PACK }) ]
-  - location: 270 (remaining gas: 1039147.368 units remaining)
+  - location: 270 (remaining gas: 1039149.403 units remaining)
     [ (Pair {} { DUP ; DROP ; PACK }) ]
-  - location: 272 (remaining gas: 1039147.358 units remaining)
+  - location: 272 (remaining gas: 1039149.393 units remaining)
     [ {}
       { DUP ; DROP ; PACK } ]
-  - location: 270 (remaining gas: 1039147.328 units remaining)
+  - location: 270 (remaining gas: 1039149.373 units remaining)
     [ {}
       {}
       { DUP ; DROP ; PACK } ]
-  - location: 273 (remaining gas: 1039147.002 units remaining)
+  - location: 273 (remaining gas: 1039149.047 units remaining)
     [ 0x050200000000
       {}
       { DUP ; DROP ; PACK } ]
-  - location: 274 (remaining gas: 1039146.987 units remaining)
+  - location: 274 (remaining gas: 1039149.037 units remaining)
     [ {}
       { DUP ; DROP ; PACK } ]
-  - location: 276 (remaining gas: 1039146.661 units remaining)
+  - location: 276 (remaining gas: 1039148.711 units remaining)
     [ 0x050200000000
       { DUP ; DROP ; PACK } ]
-  - location: 277 (remaining gas: 1039146.181 units remaining)
+  - location: 277 (remaining gas: 1039148.231 units remaining)
     [ (Some {})
       { DUP ; DROP ; PACK } ]
-  - location: 282 (remaining gas: 1039146.171 units remaining)
+  - location: 282 (remaining gas: 1039148.221 units remaining)
     [ {}
       { DUP ; DROP ; PACK } ]
-  - location: 282 (remaining gas: 1039146.156 units remaining)
+  - location: 282 (remaining gas: 1039148.211 units remaining)
     [ {}
       { DUP ; DROP ; PACK } ]
-  - location: 288 (remaining gas: 1039145.830 units remaining)
+  - location: 288 (remaining gas: 1039147.885 units remaining)
     [ 0x050200000000
       { DUP ; DROP ; PACK } ]
-  - location: 274 (remaining gas: 1039145.800 units remaining)
+  - location: 274 (remaining gas: 1039147.865 units remaining)
     [ 0x050200000000
       0x050200000000
       { DUP ; DROP ; PACK } ]
-  - location: 291 (remaining gas: 1039145.765 units remaining)
+  - location: 291 (remaining gas: 1039147.830 units remaining)
     [ 0
       { DUP ; DROP ; PACK } ]
-  - location: 292 (remaining gas: 1039145.750 units remaining)
+  - location: 292 (remaining gas: 1039147.820 units remaining)
     [ True
       { DUP ; DROP ; PACK } ]
-  - location: 293 (remaining gas: 1039145.740 units remaining)
+  - location: 293 (remaining gas: 1039147.810 units remaining)
     [ { DUP ; DROP ; PACK } ]
-  - location: 293 (remaining gas: 1039145.725 units remaining)
+  - location: 293 (remaining gas: 1039147.800 units remaining)
     [ { DUP ; DROP ; PACK } ]
-  - location: 299 (remaining gas: 1039145.715 units remaining)
+  - location: 299 (remaining gas: 1039147.790 units remaining)
     [ { DUP ; DROP ; PACK }
       { DUP ; DROP ; PACK } ]
-  - location: 300 (remaining gas: 1039144.578 units remaining)
+  - location: 300 (remaining gas: 1039146.653 units remaining)
     [ 0x05020000000603210320030c
       { DUP ; DROP ; PACK } ]
-  - location: 301 (remaining gas: 1039144.563 units remaining)
+  - location: 301 (remaining gas: 1039146.643 units remaining)
     [ { DUP ; DROP ; PACK } ]
-  - location: 303 (remaining gas: 1039143.426 units remaining)
+  - location: 303 (remaining gas: 1039145.506 units remaining)
     [ 0x05020000000603210320030c ]
-  - location: 304 (remaining gas: 1039141.185 units remaining)
+  - location: 304 (remaining gas: 1039143.425 units remaining)
     [ (Some { DUP ; DROP ; PACK }) ]
-  - location: 309 (remaining gas: 1039141.175 units remaining)
+  - location: 309 (remaining gas: 1039143.415 units remaining)
     [ { DUP ; DROP ; PACK } ]
-  - location: 309 (remaining gas: 1039141.160 units remaining)
+  - location: 309 (remaining gas: 1039143.405 units remaining)
     [ { DUP ; DROP ; PACK } ]
-  - location: 315 (remaining gas: 1039140.023 units remaining)
+  - location: 315 (remaining gas: 1039142.268 units remaining)
     [ 0x05020000000603210320030c ]
-  - location: 301 (remaining gas: 1039139.993 units remaining)
+  - location: 301 (remaining gas: 1039142.248 units remaining)
     [ 0x05020000000603210320030c
       0x05020000000603210320030c ]
-  - location: 318 (remaining gas: 1039139.958 units remaining)
+  - location: 318 (remaining gas: 1039142.213 units remaining)
     [ 0 ]
-  - location: 319 (remaining gas: 1039139.943 units remaining)
+  - location: 319 (remaining gas: 1039142.203 units remaining)
     [ True ]
-  - location: 320 (remaining gas: 1039139.933 units remaining)
+  - location: 320 (remaining gas: 1039142.193 units remaining)
     [  ]
-  - location: 320 (remaining gas: 1039139.918 units remaining)
+  - location: 320 (remaining gas: 1039142.183 units remaining)
     [  ]
-  - location: 326 (remaining gas: 1039139.908 units remaining)
+  - location: 326 (remaining gas: 1039142.173 units remaining)
     [ Unit ]
-  - location: 327 (remaining gas: 1039139.893 units remaining)
+  - location: 327 (remaining gas: 1039142.163 units remaining)
     [ {}
       Unit ]
-  - location: 329 (remaining gas: 1039139.878 units remaining)
+  - location: 329 (remaining gas: 1039142.153 units remaining)
     [ (Pair {} Unit) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pair_id.tz-None-(Pair False False)-(Some (Pair False False))].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pair_id.tz-None-(Pair False False)-(Some (Pair False False))].out
index 0dd91e57cd64b68d6397713f21ef1d322daa27b6..4fc53272b74bddf40c268992547da9cb56fd966a 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pair_id.tz-None-(Pair False False)-(Some (Pair False False))].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pair_id.tz-None-(Pair False False)-(Some (Pair False False))].out	
@@ -7,15 +7,15 @@ emitted operations
 big_map diff
   
 trace
-  - location: 12 (remaining gas: 1039993.199 units remaining)
+  - location: 12 (remaining gas: 1039994.319 units remaining)
     [ (Pair (Pair False False) None) ]
-  - location: 12 (remaining gas: 1039993.189 units remaining)
+  - location: 12 (remaining gas: 1039994.309 units remaining)
     [ (Pair False False) ]
-  - location: 13 (remaining gas: 1039993.174 units remaining)
+  - location: 13 (remaining gas: 1039994.299 units remaining)
     [ (Some (Pair False False)) ]
-  - location: 14 (remaining gas: 1039993.159 units remaining)
+  - location: 14 (remaining gas: 1039994.289 units remaining)
     [ {}
       (Some (Pair False False)) ]
-  - location: 16 (remaining gas: 1039993.144 units remaining)
+  - location: 16 (remaining gas: 1039994.279 units remaining)
     [ (Pair {} (Some (Pair False False))) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pair_id.tz-None-(Pair False True)-(Some (Pair False True))].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pair_id.tz-None-(Pair False True)-(Some (Pair False True))].out
index f2a264e6fe3d36da399f37aa8c478a9806107d0a..37ca66061f52021e19290340a3489edc4efe585a 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pair_id.tz-None-(Pair False True)-(Some (Pair False True))].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pair_id.tz-None-(Pair False True)-(Some (Pair False True))].out	
@@ -7,15 +7,15 @@ emitted operations
 big_map diff
   
 trace
-  - location: 12 (remaining gas: 1039993.199 units remaining)
+  - location: 12 (remaining gas: 1039994.319 units remaining)
     [ (Pair (Pair False True) None) ]
-  - location: 12 (remaining gas: 1039993.189 units remaining)
+  - location: 12 (remaining gas: 1039994.309 units remaining)
     [ (Pair False True) ]
-  - location: 13 (remaining gas: 1039993.174 units remaining)
+  - location: 13 (remaining gas: 1039994.299 units remaining)
     [ (Some (Pair False True)) ]
-  - location: 14 (remaining gas: 1039993.159 units remaining)
+  - location: 14 (remaining gas: 1039994.289 units remaining)
     [ {}
       (Some (Pair False True)) ]
-  - location: 16 (remaining gas: 1039993.144 units remaining)
+  - location: 16 (remaining gas: 1039994.279 units remaining)
     [ (Pair {} (Some (Pair False True))) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pair_id.tz-None-(Pair True False)-(Some (Pair True False))].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pair_id.tz-None-(Pair True False)-(Some (Pair True False))].out
index 663c034cce5a861d850f12e41ed13cebacc0f1ae..e357e35f3126498093ac2993575b2f8fabc7fadf 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pair_id.tz-None-(Pair True False)-(Some (Pair True False))].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pair_id.tz-None-(Pair True False)-(Some (Pair True False))].out	
@@ -7,15 +7,15 @@ emitted operations
 big_map diff
   
 trace
-  - location: 12 (remaining gas: 1039993.199 units remaining)
+  - location: 12 (remaining gas: 1039994.319 units remaining)
     [ (Pair (Pair True False) None) ]
-  - location: 12 (remaining gas: 1039993.189 units remaining)
+  - location: 12 (remaining gas: 1039994.309 units remaining)
     [ (Pair True False) ]
-  - location: 13 (remaining gas: 1039993.174 units remaining)
+  - location: 13 (remaining gas: 1039994.299 units remaining)
     [ (Some (Pair True False)) ]
-  - location: 14 (remaining gas: 1039993.159 units remaining)
+  - location: 14 (remaining gas: 1039994.289 units remaining)
     [ {}
       (Some (Pair True False)) ]
-  - location: 16 (remaining gas: 1039993.144 units remaining)
+  - location: 16 (remaining gas: 1039994.279 units remaining)
     [ (Pair {} (Some (Pair True False))) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pair_id.tz-None-(Pair True True)-(Some (Pair True True))].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pair_id.tz-None-(Pair True True)-(Some (Pair True True))].out
index 882f34a0f304bbf574061c0c4379e093448d4d64..ba00b857dcc566d4e5eff707e333759573119659 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pair_id.tz-None-(Pair True True)-(Some (Pair True True))].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pair_id.tz-None-(Pair True True)-(Some (Pair True True))].out	
@@ -7,15 +7,15 @@ emitted operations
 big_map diff
   
 trace
-  - location: 12 (remaining gas: 1039993.199 units remaining)
+  - location: 12 (remaining gas: 1039994.319 units remaining)
     [ (Pair (Pair True True) None) ]
-  - location: 12 (remaining gas: 1039993.189 units remaining)
+  - location: 12 (remaining gas: 1039994.309 units remaining)
     [ (Pair True True) ]
-  - location: 13 (remaining gas: 1039993.174 units remaining)
+  - location: 13 (remaining gas: 1039994.299 units remaining)
     [ (Some (Pair True True)) ]
-  - location: 14 (remaining gas: 1039993.159 units remaining)
+  - location: 14 (remaining gas: 1039994.289 units remaining)
     [ {}
       (Some (Pair True True)) ]
-  - location: 16 (remaining gas: 1039993.144 units remaining)
+  - location: 16 (remaining gas: 1039994.279 units remaining)
     [ (Pair {} (Some (Pair True True))) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pexec.tz-14-38-52].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pexec.tz-14-38-52].out
index 8b9161261a6c2b9f3b1f84d4bc7eab31c05b8e3e..e1c85df4081c7260f8f41b70e1c7d67541b4c20c 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pexec.tz-14-38-52].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pexec.tz-14-38-52].out
@@ -7,41 +7,41 @@ emitted operations
 big_map diff
   
 trace
-  - location: 7 (remaining gas: 1039989.319 units remaining)
+  - location: 7 (remaining gas: 1039990.439 units remaining)
     [ (Pair 38 14) ]
-  - location: 7 (remaining gas: 1039989.309 units remaining)
+  - location: 7 (remaining gas: 1039990.429 units remaining)
     [ { UNPAIR ; ADD }
       (Pair 38 14) ]
-  - location: 15 (remaining gas: 1039989.299 units remaining)
+  - location: 15 (remaining gas: 1039990.419 units remaining)
     [ (Pair 38 14)
       { UNPAIR ; ADD } ]
-  - location: 16 (remaining gas: 1039989.289 units remaining)
+  - location: 16 (remaining gas: 1039990.409 units remaining)
     [ 38
       14
       { UNPAIR ; ADD } ]
-  - location: 17 (remaining gas: 1039989.274 units remaining)
+  - location: 17 (remaining gas: 1039990.399 units remaining)
     [ 14
       { UNPAIR ; ADD } ]
-  - location: 19 (remaining gas: 1039989.049 units remaining)
+  - location: 19 (remaining gas: 1039990.194 units remaining)
     [ { PUSH nat 14 ; PAIR ; { UNPAIR ; ADD } } ]
-  - location: 17 (remaining gas: 1039989.019 units remaining)
+  - location: 17 (remaining gas: 1039990.174 units remaining)
     [ 38
       { PUSH nat 14 ; PAIR ; { UNPAIR ; ADD } } ]
-  - location: 12 (remaining gas: 1039989.009 units remaining)
+  - location: 12 (remaining gas: 1039990.164 units remaining)
     [ 14
       38 ]
-  - location: 12 (remaining gas: 1039988.994 units remaining)
+  - location: 12 (remaining gas: 1039990.154 units remaining)
     [ (Pair 14 38) ]
-  - location: 13 (remaining gas: 1039988.984 units remaining)
+  - location: 13 (remaining gas: 1039990.144 units remaining)
     [ 14
       38 ]
-  - location: 14 (remaining gas: 1039988.929 units remaining)
+  - location: 14 (remaining gas: 1039990.109 units remaining)
     [ 52 ]
-  - location: 20 (remaining gas: 1039988.899 units remaining)
+  - location: 20 (remaining gas: 1039990.089 units remaining)
     [ 52 ]
-  - location: 21 (remaining gas: 1039988.884 units remaining)
+  - location: 21 (remaining gas: 1039990.079 units remaining)
     [ {}
       52 ]
-  - location: 23 (remaining gas: 1039988.869 units remaining)
+  - location: 23 (remaining gas: 1039990.069 units remaining)
     [ (Pair {} 52) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pexec_2.tz-{ 0 ; 1 ; 2 ; 3}-4-{ 0 ; 7 ; 14 ; 21 }].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pexec_2.tz-{ 0 ; 1 ; 2 ; 3}-4-{ 0 ; 7 ; 14 ; 21 }].out
index b136801776fb549a43ebcc356d1001987040133f..721e613fd8a18db8e214b0bae8f59bd91beac125 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pexec_2.tz-{ 0 ; 1 ; 2 ; 3}-4-{ 0 ; 7 ; 14 ; 21 }].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[pexec_2.tz-{ 0 ; 1 ; 2 ; 3}-4-{ 0 ; 7 ; 14 ; 21 }].out	
@@ -7,53 +7,53 @@ emitted operations
 big_map diff
   
 trace
-  - location: 8 (remaining gas: 1039979.991 units remaining)
+  - location: 8 (remaining gas: 1039981.911 units remaining)
     [ (Pair 4 { 0 ; 1 ; 2 ; 3 }) ]
-  - location: 8 (remaining gas: 1039979.981 units remaining)
+  - location: 8 (remaining gas: 1039981.901 units remaining)
     [ 4
       { 0 ; 1 ; 2 ; 3 } ]
-  - location: 9 (remaining gas: 1039979.971 units remaining)
+  - location: 9 (remaining gas: 1039981.891 units remaining)
     [ { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL }
       4
       { 0 ; 1 ; 2 ; 3 } ]
-  - location: 23 (remaining gas: 1039979.961 units remaining)
+  - location: 23 (remaining gas: 1039981.881 units remaining)
     [ 4
       { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL }
       { 0 ; 1 ; 2 ; 3 } ]
-  - location: 24 (remaining gas: 1039979.736 units remaining)
+  - location: 24 (remaining gas: 1039981.676 units remaining)
     [ { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } }
       { 0 ; 1 ; 2 ; 3 } ]
-  - location: 25 (remaining gas: 1039979.726 units remaining)
+  - location: 25 (remaining gas: 1039981.666 units remaining)
     [ 3
       { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } }
       { 0 ; 1 ; 2 ; 3 } ]
-  - location: 28 (remaining gas: 1039979.501 units remaining)
+  - location: 28 (remaining gas: 1039981.461 units remaining)
     [ { PUSH int 3 ;
         PAIR ;
         { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } }
       { 0 ; 1 ; 2 ; 3 } ]
-  - location: 29 (remaining gas: 1039979.491 units remaining)
+  - location: 29 (remaining gas: 1039981.451 units remaining)
     [ { 0 ; 1 ; 2 ; 3 }
       { PUSH int 3 ;
         PAIR ;
         { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ]
-  - location: 30 (remaining gas: 1039979.491 units remaining)
+  - location: 30 (remaining gas: 1039981.451 units remaining)
     [ 0
       { PUSH int 3 ;
         PAIR ;
         { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ]
-  - location: 32 (remaining gas: 1039979.476 units remaining)
+  - location: 32 (remaining gas: 1039981.441 units remaining)
     [ { PUSH int 3 ;
         PAIR ;
         { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ]
-  - location: 34 (remaining gas: 1039979.466 units remaining)
+  - location: 34 (remaining gas: 1039981.431 units remaining)
     [ { PUSH int 3 ;
         PAIR ;
         { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } }
       { PUSH int 3 ;
         PAIR ;
         { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ]
-  - location: 32 (remaining gas: 1039979.436 units remaining)
+  - location: 32 (remaining gas: 1039981.411 units remaining)
     [ 0
       { PUSH int 3 ;
         PAIR ;
@@ -61,55 +61,55 @@ trace
       { PUSH int 3 ;
         PAIR ;
         { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ]
-  - location: 16 (remaining gas: 1039979.426 units remaining)
+  - location: 16 (remaining gas: 1039981.401 units remaining)
     [ 3
       0 ]
-  - location: 16 (remaining gas: 1039979.411 units remaining)
+  - location: 16 (remaining gas: 1039981.391 units remaining)
     [ (Pair 3 0) ]
-  - location: 16 (remaining gas: 1039979.401 units remaining)
+  - location: 16 (remaining gas: 1039981.381 units remaining)
     [ 4
       (Pair 3 0) ]
-  - location: 16 (remaining gas: 1039979.386 units remaining)
+  - location: 16 (remaining gas: 1039981.371 units remaining)
     [ (Pair 4 3 0) ]
-  - location: 17 (remaining gas: 1039979.376 units remaining)
+  - location: 17 (remaining gas: 1039981.361 units remaining)
     [ 4
       (Pair 3 0) ]
-  - location: 18 (remaining gas: 1039979.361 units remaining)
+  - location: 18 (remaining gas: 1039981.351 units remaining)
     [ (Pair 3 0) ]
-  - location: 20 (remaining gas: 1039979.351 units remaining)
+  - location: 20 (remaining gas: 1039981.341 units remaining)
     [ 3
       0 ]
-  - location: 18 (remaining gas: 1039979.321 units remaining)
+  - location: 18 (remaining gas: 1039981.321 units remaining)
     [ 4
       3
       0 ]
-  - location: 21 (remaining gas: 1039979.266 units remaining)
+  - location: 21 (remaining gas: 1039981.286 units remaining)
     [ 7
       0 ]
-  - location: 22 (remaining gas: 1039979.165 units remaining)
+  - location: 22 (remaining gas: 1039981.230 units remaining)
     [ 0 ]
-  - location: 35 (remaining gas: 1039979.135 units remaining)
+  - location: 35 (remaining gas: 1039981.210 units remaining)
     [ 0
       { PUSH int 3 ;
         PAIR ;
         { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ]
-  - location: 30 (remaining gas: 1039979.120 units remaining)
+  - location: 30 (remaining gas: 1039981.200 units remaining)
     [ 1
       { PUSH int 3 ;
         PAIR ;
         { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ]
-  - location: 32 (remaining gas: 1039979.105 units remaining)
+  - location: 32 (remaining gas: 1039981.190 units remaining)
     [ { PUSH int 3 ;
         PAIR ;
         { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ]
-  - location: 34 (remaining gas: 1039979.095 units remaining)
+  - location: 34 (remaining gas: 1039981.180 units remaining)
     [ { PUSH int 3 ;
         PAIR ;
         { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } }
       { PUSH int 3 ;
         PAIR ;
         { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ]
-  - location: 32 (remaining gas: 1039979.065 units remaining)
+  - location: 32 (remaining gas: 1039981.160 units remaining)
     [ 1
       { PUSH int 3 ;
         PAIR ;
@@ -117,55 +117,55 @@ trace
       { PUSH int 3 ;
         PAIR ;
         { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ]
-  - location: 16 (remaining gas: 1039979.055 units remaining)
+  - location: 16 (remaining gas: 1039981.150 units remaining)
     [ 3
       1 ]
-  - location: 16 (remaining gas: 1039979.040 units remaining)
+  - location: 16 (remaining gas: 1039981.140 units remaining)
     [ (Pair 3 1) ]
-  - location: 16 (remaining gas: 1039979.030 units remaining)
+  - location: 16 (remaining gas: 1039981.130 units remaining)
     [ 4
       (Pair 3 1) ]
-  - location: 16 (remaining gas: 1039979.015 units remaining)
+  - location: 16 (remaining gas: 1039981.120 units remaining)
     [ (Pair 4 3 1) ]
-  - location: 17 (remaining gas: 1039979.005 units remaining)
+  - location: 17 (remaining gas: 1039981.110 units remaining)
     [ 4
       (Pair 3 1) ]
-  - location: 18 (remaining gas: 1039978.990 units remaining)
+  - location: 18 (remaining gas: 1039981.100 units remaining)
     [ (Pair 3 1) ]
-  - location: 20 (remaining gas: 1039978.980 units remaining)
+  - location: 20 (remaining gas: 1039981.090 units remaining)
     [ 3
       1 ]
-  - location: 18 (remaining gas: 1039978.950 units remaining)
+  - location: 18 (remaining gas: 1039981.070 units remaining)
     [ 4
       3
       1 ]
-  - location: 21 (remaining gas: 1039978.895 units remaining)
+  - location: 21 (remaining gas: 1039981.035 units remaining)
     [ 7
       1 ]
-  - location: 22 (remaining gas: 1039978.791 units remaining)
+  - location: 22 (remaining gas: 1039980.976 units remaining)
     [ 7 ]
-  - location: 35 (remaining gas: 1039978.761 units remaining)
+  - location: 35 (remaining gas: 1039980.956 units remaining)
     [ 7
       { PUSH int 3 ;
         PAIR ;
         { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ]
-  - location: 30 (remaining gas: 1039978.746 units remaining)
+  - location: 30 (remaining gas: 1039980.946 units remaining)
     [ 2
       { PUSH int 3 ;
         PAIR ;
         { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ]
-  - location: 32 (remaining gas: 1039978.731 units remaining)
+  - location: 32 (remaining gas: 1039980.936 units remaining)
     [ { PUSH int 3 ;
         PAIR ;
         { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ]
-  - location: 34 (remaining gas: 1039978.721 units remaining)
+  - location: 34 (remaining gas: 1039980.926 units remaining)
     [ { PUSH int 3 ;
         PAIR ;
         { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } }
       { PUSH int 3 ;
         PAIR ;
         { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ]
-  - location: 32 (remaining gas: 1039978.691 units remaining)
+  - location: 32 (remaining gas: 1039980.906 units remaining)
     [ 2
       { PUSH int 3 ;
         PAIR ;
@@ -173,55 +173,55 @@ trace
       { PUSH int 3 ;
         PAIR ;
         { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ]
-  - location: 16 (remaining gas: 1039978.681 units remaining)
+  - location: 16 (remaining gas: 1039980.896 units remaining)
     [ 3
       2 ]
-  - location: 16 (remaining gas: 1039978.666 units remaining)
+  - location: 16 (remaining gas: 1039980.886 units remaining)
     [ (Pair 3 2) ]
-  - location: 16 (remaining gas: 1039978.656 units remaining)
+  - location: 16 (remaining gas: 1039980.876 units remaining)
     [ 4
       (Pair 3 2) ]
-  - location: 16 (remaining gas: 1039978.641 units remaining)
+  - location: 16 (remaining gas: 1039980.866 units remaining)
     [ (Pair 4 3 2) ]
-  - location: 17 (remaining gas: 1039978.631 units remaining)
+  - location: 17 (remaining gas: 1039980.856 units remaining)
     [ 4
       (Pair 3 2) ]
-  - location: 18 (remaining gas: 1039978.616 units remaining)
+  - location: 18 (remaining gas: 1039980.846 units remaining)
     [ (Pair 3 2) ]
-  - location: 20 (remaining gas: 1039978.606 units remaining)
+  - location: 20 (remaining gas: 1039980.836 units remaining)
     [ 3
       2 ]
-  - location: 18 (remaining gas: 1039978.576 units remaining)
+  - location: 18 (remaining gas: 1039980.816 units remaining)
     [ 4
       3
       2 ]
-  - location: 21 (remaining gas: 1039978.521 units remaining)
+  - location: 21 (remaining gas: 1039980.781 units remaining)
     [ 7
       2 ]
-  - location: 22 (remaining gas: 1039978.417 units remaining)
+  - location: 22 (remaining gas: 1039980.722 units remaining)
     [ 14 ]
-  - location: 35 (remaining gas: 1039978.387 units remaining)
+  - location: 35 (remaining gas: 1039980.702 units remaining)
     [ 14
       { PUSH int 3 ;
         PAIR ;
         { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ]
-  - location: 30 (remaining gas: 1039978.372 units remaining)
+  - location: 30 (remaining gas: 1039980.692 units remaining)
     [ 3
       { PUSH int 3 ;
         PAIR ;
         { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ]
-  - location: 32 (remaining gas: 1039978.357 units remaining)
+  - location: 32 (remaining gas: 1039980.682 units remaining)
     [ { PUSH int 3 ;
         PAIR ;
         { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ]
-  - location: 34 (remaining gas: 1039978.347 units remaining)
+  - location: 34 (remaining gas: 1039980.672 units remaining)
     [ { PUSH int 3 ;
         PAIR ;
         { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } }
       { PUSH int 3 ;
         PAIR ;
         { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ]
-  - location: 32 (remaining gas: 1039978.317 units remaining)
+  - location: 32 (remaining gas: 1039980.652 units remaining)
     [ 3
       { PUSH int 3 ;
         PAIR ;
@@ -229,54 +229,54 @@ trace
       { PUSH int 3 ;
         PAIR ;
         { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ]
-  - location: 16 (remaining gas: 1039978.307 units remaining)
+  - location: 16 (remaining gas: 1039980.642 units remaining)
     [ 3
       3 ]
-  - location: 16 (remaining gas: 1039978.292 units remaining)
+  - location: 16 (remaining gas: 1039980.632 units remaining)
     [ (Pair 3 3) ]
-  - location: 16 (remaining gas: 1039978.282 units remaining)
+  - location: 16 (remaining gas: 1039980.622 units remaining)
     [ 4
       (Pair 3 3) ]
-  - location: 16 (remaining gas: 1039978.267 units remaining)
+  - location: 16 (remaining gas: 1039980.612 units remaining)
     [ (Pair 4 3 3) ]
-  - location: 17 (remaining gas: 1039978.257 units remaining)
+  - location: 17 (remaining gas: 1039980.602 units remaining)
     [ 4
       (Pair 3 3) ]
-  - location: 18 (remaining gas: 1039978.242 units remaining)
+  - location: 18 (remaining gas: 1039980.592 units remaining)
     [ (Pair 3 3) ]
-  - location: 20 (remaining gas: 1039978.232 units remaining)
+  - location: 20 (remaining gas: 1039980.582 units remaining)
     [ 3
       3 ]
-  - location: 18 (remaining gas: 1039978.202 units remaining)
+  - location: 18 (remaining gas: 1039980.562 units remaining)
     [ 4
       3
       3 ]
-  - location: 21 (remaining gas: 1039978.147 units remaining)
+  - location: 21 (remaining gas: 1039980.527 units remaining)
     [ 7
       3 ]
-  - location: 22 (remaining gas: 1039978.043 units remaining)
+  - location: 22 (remaining gas: 1039980.468 units remaining)
     [ 21 ]
-  - location: 35 (remaining gas: 1039978.013 units remaining)
+  - location: 35 (remaining gas: 1039980.448 units remaining)
     [ 21
       { PUSH int 3 ;
         PAIR ;
         { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ]
-  - location: 30 (remaining gas: 1039977.998 units remaining)
+  - location: 30 (remaining gas: 1039980.438 units remaining)
     [ { 0 ; 7 ; 14 ; 21 }
       { PUSH int 3 ;
         PAIR ;
         { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ]
-  - location: 36 (remaining gas: 1039977.983 units remaining)
+  - location: 36 (remaining gas: 1039980.428 units remaining)
     [ { PUSH int 3 ;
         PAIR ;
         { PUSH int 4 ; PAIR ; { UNPAIR ; DIP { UNPAIR } ; ADD ; MUL } } } ]
-  - location: 38 (remaining gas: 1039977.973 units remaining)
+  - location: 38 (remaining gas: 1039980.418 units remaining)
     [  ]
-  - location: 36 (remaining gas: 1039977.943 units remaining)
+  - location: 36 (remaining gas: 1039980.398 units remaining)
     [ { 0 ; 7 ; 14 ; 21 } ]
-  - location: 39 (remaining gas: 1039977.928 units remaining)
+  - location: 39 (remaining gas: 1039980.388 units remaining)
     [ {}
       { 0 ; 7 ; 14 ; 21 } ]
-  - location: 41 (remaining gas: 1039977.913 units remaining)
+  - location: 41 (remaining gas: 1039980.378 units remaining)
     [ (Pair {} { 0 ; 7 ; 14 ; 21 }) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ret_int.tz-None-Unit-(Some 300)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ret_int.tz-None-Unit-(Some 300)].out
index 451110077bedc745810c0cdab8772ba928d63cec..682bb5f14abf443b398106e7699e72a79c8ff772 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ret_int.tz-None-Unit-(Some 300)].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[ret_int.tz-None-Unit-(Some 300)].out	
@@ -7,17 +7,17 @@ emitted operations
 big_map diff
   
 trace
-  - location: 8 (remaining gas: 1039993.506 units remaining)
+  - location: 8 (remaining gas: 1039994.306 units remaining)
     [ (Pair Unit None) ]
-  - location: 8 (remaining gas: 1039993.496 units remaining)
+  - location: 8 (remaining gas: 1039994.296 units remaining)
     [  ]
-  - location: 9 (remaining gas: 1039993.486 units remaining)
+  - location: 9 (remaining gas: 1039994.286 units remaining)
     [ 300 ]
-  - location: 12 (remaining gas: 1039993.471 units remaining)
+  - location: 12 (remaining gas: 1039994.276 units remaining)
     [ (Some 300) ]
-  - location: 13 (remaining gas: 1039993.456 units remaining)
+  - location: 13 (remaining gas: 1039994.266 units remaining)
     [ {}
       (Some 300) ]
-  - location: 15 (remaining gas: 1039993.441 units remaining)
+  - location: 15 (remaining gas: 1039994.256 units remaining)
     [ (Pair {} (Some 300)) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[reverse.tz-{\"\"}-{ \"c\" ; \"b\" ; \"a\" }-{ \"a\" ; \"b\" ; \"c\" }].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[reverse.tz-{\"\"}-{ \"c\" ; \"b\" ; \"a\" }-{ \"a\" ; \"b\" ; \"c\" }].out"
index 0b9ec8b7b86672011472395b981362e8b98f610e..b2b01b412dc365cac7ee06ef482074f795c8a55d 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[reverse.tz-{\"\"}-{ \"c\" ; \"b\" ; \"a\" }-{ \"a\" ; \"b\" ; \"c\" }].out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[reverse.tz-{\"\"}-{ \"c\" ; \"b\" ; \"a\" }-{ \"a\" ; \"b\" ; \"c\" }].out"	
@@ -7,36 +7,36 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (remaining gas: 1039991.077 units remaining)
+  - location: 9 (remaining gas: 1039992.357 units remaining)
     [ (Pair { "c" ; "b" ; "a" } { "" }) ]
-  - location: 9 (remaining gas: 1039991.067 units remaining)
+  - location: 9 (remaining gas: 1039992.347 units remaining)
     [ { "c" ; "b" ; "a" } ]
-  - location: 10 (remaining gas: 1039991.052 units remaining)
+  - location: 10 (remaining gas: 1039992.337 units remaining)
     [ {}
       { "c" ; "b" ; "a" } ]
-  - location: 12 (remaining gas: 1039991.042 units remaining)
+  - location: 12 (remaining gas: 1039992.327 units remaining)
     [ { "c" ; "b" ; "a" }
       {} ]
-  - location: 13 (remaining gas: 1039991.042 units remaining)
+  - location: 13 (remaining gas: 1039992.327 units remaining)
     [ "c"
       {} ]
-  - location: 15 (remaining gas: 1039991.027 units remaining)
+  - location: 15 (remaining gas: 1039992.317 units remaining)
     [ { "c" } ]
-  - location: 13 (remaining gas: 1039991.012 units remaining)
+  - location: 13 (remaining gas: 1039992.307 units remaining)
     [ "b"
       { "c" } ]
-  - location: 15 (remaining gas: 1039990.997 units remaining)
+  - location: 15 (remaining gas: 1039992.297 units remaining)
     [ { "b" ; "c" } ]
-  - location: 13 (remaining gas: 1039990.982 units remaining)
+  - location: 13 (remaining gas: 1039992.287 units remaining)
     [ "a"
       { "b" ; "c" } ]
-  - location: 15 (remaining gas: 1039990.967 units remaining)
+  - location: 15 (remaining gas: 1039992.277 units remaining)
     [ { "a" ; "b" ; "c" } ]
-  - location: 13 (remaining gas: 1039990.952 units remaining)
+  - location: 13 (remaining gas: 1039992.267 units remaining)
     [ { "a" ; "b" ; "c" } ]
-  - location: 16 (remaining gas: 1039990.937 units remaining)
+  - location: 16 (remaining gas: 1039992.257 units remaining)
     [ {}
       { "a" ; "b" ; "c" } ]
-  - location: 18 (remaining gas: 1039990.922 units remaining)
+  - location: 18 (remaining gas: 1039992.247 units remaining)
     [ (Pair {} { "a" ; "b" ; "c" }) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[reverse.tz-{\"\"}-{}-{}].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[reverse.tz-{\"\"}-{}-{}].out"
index 84832dc1b68ba0a98118b01befdb4a94cd6bd984..17b87c6cb4da18d42e9d82c52b0fc6d6e1cd61bd 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[reverse.tz-{\"\"}-{}-{}].out"
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[reverse.tz-{\"\"}-{}-{}].out"
@@ -7,21 +7,21 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (remaining gas: 1039991.449 units remaining)
+  - location: 9 (remaining gas: 1039992.729 units remaining)
     [ (Pair {} { "" }) ]
-  - location: 9 (remaining gas: 1039991.439 units remaining)
+  - location: 9 (remaining gas: 1039992.719 units remaining)
     [ {} ]
-  - location: 10 (remaining gas: 1039991.424 units remaining)
+  - location: 10 (remaining gas: 1039992.709 units remaining)
     [ {}
       {} ]
-  - location: 12 (remaining gas: 1039991.414 units remaining)
+  - location: 12 (remaining gas: 1039992.699 units remaining)
     [ {}
       {} ]
-  - location: 13 (remaining gas: 1039991.414 units remaining)
+  - location: 13 (remaining gas: 1039992.699 units remaining)
     [ {} ]
-  - location: 16 (remaining gas: 1039991.399 units remaining)
+  - location: 16 (remaining gas: 1039992.689 units remaining)
     [ {}
       {} ]
-  - location: 18 (remaining gas: 1039991.384 units remaining)
+  - location: 18 (remaining gas: 1039992.679 units remaining)
     [ (Pair {} {}) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[reverse_loop.tz-{\"\"}-{ \"c\" ; \"b\" ; \"a\" }-{ \"a\" ; \"b\" ; \"c\" }].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[reverse_loop.tz-{\"\"}-{ \"c\" ; \"b\" ; \"a\" }-{ \"a\" ; \"b\" ; \"c\" }].out"
index bd5c7b413628499e0ba819847b9a0b2998708c7b..1d22a8e2e4ae777615cb6c632254ad49ec18ea6e 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[reverse_loop.tz-{\"\"}-{ \"c\" ; \"b\" ; \"a\" }-{ \"a\" ; \"b\" ; \"c\" }].out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[reverse_loop.tz-{\"\"}-{ \"c\" ; \"b\" ; \"a\" }-{ \"a\" ; \"b\" ; \"c\" }].out"	
@@ -7,125 +7,125 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (remaining gas: 1039982.652 units remaining)
+  - location: 9 (remaining gas: 1039985.212 units remaining)
     [ (Pair { "c" ; "b" ; "a" } { "" }) ]
-  - location: 9 (remaining gas: 1039982.642 units remaining)
+  - location: 9 (remaining gas: 1039985.202 units remaining)
     [ { "c" ; "b" ; "a" } ]
-  - location: 10 (remaining gas: 1039982.627 units remaining)
+  - location: 10 (remaining gas: 1039985.192 units remaining)
     [ {}
       { "c" ; "b" ; "a" } ]
-  - location: 12 (remaining gas: 1039982.617 units remaining)
+  - location: 12 (remaining gas: 1039985.182 units remaining)
     [ { "c" ; "b" ; "a" }
       {} ]
-  - location: 13 (remaining gas: 1039982.607 units remaining)
+  - location: 13 (remaining gas: 1039985.172 units remaining)
     [ True
       { "c" ; "b" ; "a" }
       {} ]
-  - location: 16 (remaining gas: 1039982.607 units remaining)
+  - location: 16 (remaining gas: 1039985.172 units remaining)
     [ { "c" ; "b" ; "a" }
       {} ]
-  - location: 18 (remaining gas: 1039982.597 units remaining)
+  - location: 18 (remaining gas: 1039985.162 units remaining)
     [ "c"
       { "b" ; "a" }
       {} ]
-  - location: 20 (remaining gas: 1039982.587 units remaining)
+  - location: 20 (remaining gas: 1039985.152 units remaining)
     [ { "b" ; "a" }
       "c"
       {} ]
-  - location: 21 (remaining gas: 1039982.572 units remaining)
+  - location: 21 (remaining gas: 1039985.142 units remaining)
     [ "c"
       {} ]
-  - location: 23 (remaining gas: 1039982.557 units remaining)
+  - location: 23 (remaining gas: 1039985.132 units remaining)
     [ { "c" } ]
-  - location: 21 (remaining gas: 1039982.527 units remaining)
+  - location: 21 (remaining gas: 1039985.112 units remaining)
     [ { "b" ; "a" }
       { "c" } ]
-  - location: 24 (remaining gas: 1039982.517 units remaining)
+  - location: 24 (remaining gas: 1039985.102 units remaining)
     [ True
       { "b" ; "a" }
       { "c" } ]
-  - location: 18 (remaining gas: 1039982.502 units remaining)
+  - location: 18 (remaining gas: 1039985.092 units remaining)
     [ True
       { "b" ; "a" }
       { "c" } ]
-  - location: 16 (remaining gas: 1039982.487 units remaining)
+  - location: 16 (remaining gas: 1039985.082 units remaining)
     [ { "b" ; "a" }
       { "c" } ]
-  - location: 18 (remaining gas: 1039982.477 units remaining)
+  - location: 18 (remaining gas: 1039985.072 units remaining)
     [ "b"
       { "a" }
       { "c" } ]
-  - location: 20 (remaining gas: 1039982.467 units remaining)
+  - location: 20 (remaining gas: 1039985.062 units remaining)
     [ { "a" }
       "b"
       { "c" } ]
-  - location: 21 (remaining gas: 1039982.452 units remaining)
+  - location: 21 (remaining gas: 1039985.052 units remaining)
     [ "b"
       { "c" } ]
-  - location: 23 (remaining gas: 1039982.437 units remaining)
+  - location: 23 (remaining gas: 1039985.042 units remaining)
     [ { "b" ; "c" } ]
-  - location: 21 (remaining gas: 1039982.407 units remaining)
+  - location: 21 (remaining gas: 1039985.022 units remaining)
     [ { "a" }
       { "b" ; "c" } ]
-  - location: 24 (remaining gas: 1039982.397 units remaining)
+  - location: 24 (remaining gas: 1039985.012 units remaining)
     [ True
       { "a" }
       { "b" ; "c" } ]
-  - location: 18 (remaining gas: 1039982.382 units remaining)
+  - location: 18 (remaining gas: 1039985.002 units remaining)
     [ True
       { "a" }
       { "b" ; "c" } ]
-  - location: 16 (remaining gas: 1039982.367 units remaining)
+  - location: 16 (remaining gas: 1039984.992 units remaining)
     [ { "a" }
       { "b" ; "c" } ]
-  - location: 18 (remaining gas: 1039982.357 units remaining)
+  - location: 18 (remaining gas: 1039984.982 units remaining)
     [ "a"
       {}
       { "b" ; "c" } ]
-  - location: 20 (remaining gas: 1039982.347 units remaining)
+  - location: 20 (remaining gas: 1039984.972 units remaining)
     [ {}
       "a"
       { "b" ; "c" } ]
-  - location: 21 (remaining gas: 1039982.332 units remaining)
+  - location: 21 (remaining gas: 1039984.962 units remaining)
     [ "a"
       { "b" ; "c" } ]
-  - location: 23 (remaining gas: 1039982.317 units remaining)
+  - location: 23 (remaining gas: 1039984.952 units remaining)
     [ { "a" ; "b" ; "c" } ]
-  - location: 21 (remaining gas: 1039982.287 units remaining)
+  - location: 21 (remaining gas: 1039984.932 units remaining)
     [ {}
       { "a" ; "b" ; "c" } ]
-  - location: 24 (remaining gas: 1039982.277 units remaining)
+  - location: 24 (remaining gas: 1039984.922 units remaining)
     [ True
       {}
       { "a" ; "b" ; "c" } ]
-  - location: 18 (remaining gas: 1039982.262 units remaining)
+  - location: 18 (remaining gas: 1039984.912 units remaining)
     [ True
       {}
       { "a" ; "b" ; "c" } ]
-  - location: 16 (remaining gas: 1039982.247 units remaining)
+  - location: 16 (remaining gas: 1039984.902 units remaining)
     [ {}
       { "a" ; "b" ; "c" } ]
-  - location: 18 (remaining gas: 1039982.237 units remaining)
+  - location: 18 (remaining gas: 1039984.892 units remaining)
     [ { "a" ; "b" ; "c" } ]
-  - location: 28 (remaining gas: 1039982.222 units remaining)
+  - location: 28 (remaining gas: 1039984.882 units remaining)
     [ {}
       { "a" ; "b" ; "c" } ]
-  - location: 30 (remaining gas: 1039982.212 units remaining)
+  - location: 30 (remaining gas: 1039984.872 units remaining)
     [ False
       {}
       { "a" ; "b" ; "c" } ]
-  - location: 18 (remaining gas: 1039982.197 units remaining)
+  - location: 18 (remaining gas: 1039984.862 units remaining)
     [ False
       {}
       { "a" ; "b" ; "c" } ]
-  - location: 16 (remaining gas: 1039982.182 units remaining)
+  - location: 16 (remaining gas: 1039984.852 units remaining)
     [ {}
       { "a" ; "b" ; "c" } ]
-  - location: 33 (remaining gas: 1039982.172 units remaining)
+  - location: 33 (remaining gas: 1039984.842 units remaining)
     [ { "a" ; "b" ; "c" } ]
-  - location: 34 (remaining gas: 1039982.157 units remaining)
+  - location: 34 (remaining gas: 1039984.832 units remaining)
     [ {}
       { "a" ; "b" ; "c" } ]
-  - location: 36 (remaining gas: 1039982.142 units remaining)
+  - location: 36 (remaining gas: 1039984.822 units remaining)
     [ (Pair {} { "a" ; "b" ; "c" }) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[reverse_loop.tz-{\"\"}-{}-{}].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[reverse_loop.tz-{\"\"}-{}-{}].out"
index 060c28b594a19a934a409775e7f00859cda30ca6..85ba3b4e9829f6c3b7b9c9d256b39fbc49815c7b 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[reverse_loop.tz-{\"\"}-{}-{}].out"
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[reverse_loop.tz-{\"\"}-{}-{}].out"
@@ -7,44 +7,44 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (remaining gas: 1039983.024 units remaining)
+  - location: 9 (remaining gas: 1039985.584 units remaining)
     [ (Pair {} { "" }) ]
-  - location: 9 (remaining gas: 1039983.014 units remaining)
+  - location: 9 (remaining gas: 1039985.574 units remaining)
     [ {} ]
-  - location: 10 (remaining gas: 1039982.999 units remaining)
+  - location: 10 (remaining gas: 1039985.564 units remaining)
     [ {}
       {} ]
-  - location: 12 (remaining gas: 1039982.989 units remaining)
+  - location: 12 (remaining gas: 1039985.554 units remaining)
     [ {}
       {} ]
-  - location: 13 (remaining gas: 1039982.979 units remaining)
+  - location: 13 (remaining gas: 1039985.544 units remaining)
     [ True
       {}
       {} ]
-  - location: 16 (remaining gas: 1039982.979 units remaining)
+  - location: 16 (remaining gas: 1039985.544 units remaining)
     [ {}
       {} ]
-  - location: 18 (remaining gas: 1039982.969 units remaining)
+  - location: 18 (remaining gas: 1039985.534 units remaining)
     [ {} ]
-  - location: 28 (remaining gas: 1039982.954 units remaining)
+  - location: 28 (remaining gas: 1039985.524 units remaining)
     [ {}
       {} ]
-  - location: 30 (remaining gas: 1039982.944 units remaining)
+  - location: 30 (remaining gas: 1039985.514 units remaining)
     [ False
       {}
       {} ]
-  - location: 18 (remaining gas: 1039982.929 units remaining)
+  - location: 18 (remaining gas: 1039985.504 units remaining)
     [ False
       {}
       {} ]
-  - location: 16 (remaining gas: 1039982.914 units remaining)
+  - location: 16 (remaining gas: 1039985.494 units remaining)
     [ {}
       {} ]
-  - location: 33 (remaining gas: 1039982.904 units remaining)
+  - location: 33 (remaining gas: 1039985.484 units remaining)
     [ {} ]
-  - location: 34 (remaining gas: 1039982.889 units remaining)
+  - location: 34 (remaining gas: 1039985.474 units remaining)
     [ {}
       {} ]
-  - location: 36 (remaining gas: 1039982.874 units remaining)
+  - location: 36 (remaining gas: 1039985.464 units remaining)
     [ (Pair {} {}) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sapling_empty_state.tz-{}-Unit-0].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sapling_empty_state.tz-{}-Unit-0].out
index 89efe9aaa882d518e34af4a419d94046ad913f25..7be46b0c0268eb40ea40bbbf1204116c0570fab7 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sapling_empty_state.tz-{}-Unit-0].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sapling_empty_state.tz-{}-Unit-0].out
@@ -7,15 +7,15 @@ emitted operations
 big_map diff
   
 trace
-  - location: 8 (remaining gas: 1039994.822 units remaining)
+  - location: 8 (remaining gas: 1039995.462 units remaining)
     [ (Pair Unit {}) ]
-  - location: 8 (remaining gas: 1039994.812 units remaining)
+  - location: 8 (remaining gas: 1039995.452 units remaining)
     [  ]
-  - location: 9 (remaining gas: 1039994.797 units remaining)
+  - location: 9 (remaining gas: 1039995.442 units remaining)
     [ {} ]
-  - location: 11 (remaining gas: 1039994.782 units remaining)
+  - location: 11 (remaining gas: 1039995.432 units remaining)
     [ {}
       {} ]
-  - location: 13 (remaining gas: 1039994.767 units remaining)
+  - location: 13 (remaining gas: 1039995.422 units remaining)
     [ (Pair {} {}) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[self_address.tz-Unit-Unit-Unit].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[self_address.tz-Unit-Unit-Unit].out
index 804eb5df3cbf2d83ef7c32c8aeaa3425313322f5..89c0be8856178678c66b210f3371c32840bdb9c6 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[self_address.tz-Unit-Unit-Unit].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[self_address.tz-Unit-Unit-Unit].out
@@ -7,40 +7,40 @@ emitted operations
 big_map diff
   
 trace
-  - location: 7 (remaining gas: 1039984.314 units remaining)
+  - location: 7 (remaining gas: 1039985.434 units remaining)
     [ (Pair Unit Unit) ]
-  - location: 7 (remaining gas: 1039984.304 units remaining)
+  - location: 7 (remaining gas: 1039985.424 units remaining)
     [  ]
-  - location: 8 (remaining gas: 1039984.294 units remaining)
+  - location: 8 (remaining gas: 1039985.414 units remaining)
     [ { DROP ; SELF_ADDRESS } ]
-  - location: 14 (remaining gas: 1039984.284 units remaining)
+  - location: 14 (remaining gas: 1039985.404 units remaining)
     [ Unit
       { DROP ; SELF_ADDRESS } ]
-  - location: 12 (remaining gas: 1039984.274 units remaining)
+  - location: 12 (remaining gas: 1039985.394 units remaining)
     [  ]
-  - location: 13 (remaining gas: 1039984.259 units remaining)
+  - location: 13 (remaining gas: 1039985.384 units remaining)
     [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" ]
-  - location: 15 (remaining gas: 1039984.229 units remaining)
+  - location: 15 (remaining gas: 1039985.364 units remaining)
     [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" ]
-  - location: 16 (remaining gas: 1039984.214 units remaining)
+  - location: 16 (remaining gas: 1039985.354 units remaining)
     [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi"
       "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" ]
-  - location: 17 (remaining gas: 1039984.204 units remaining)
+  - location: 17 (remaining gas: 1039985.344 units remaining)
     [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi"
       "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" ]
-  - location: 20 (remaining gas: 1039984.168 units remaining)
+  - location: 20 (remaining gas: 1039985.308 units remaining)
     [ 0 ]
-  - location: 21 (remaining gas: 1039984.153 units remaining)
+  - location: 21 (remaining gas: 1039985.298 units remaining)
     [ True ]
-  - location: 22 (remaining gas: 1039984.143 units remaining)
+  - location: 22 (remaining gas: 1039985.288 units remaining)
     [  ]
-  - location: 22 (remaining gas: 1039984.128 units remaining)
+  - location: 22 (remaining gas: 1039985.278 units remaining)
     [  ]
-  - location: 28 (remaining gas: 1039984.118 units remaining)
+  - location: 28 (remaining gas: 1039985.268 units remaining)
     [ Unit ]
-  - location: 29 (remaining gas: 1039984.103 units remaining)
+  - location: 29 (remaining gas: 1039985.258 units remaining)
     [ {}
       Unit ]
-  - location: 31 (remaining gas: 1039984.088 units remaining)
+  - location: 31 (remaining gas: 1039985.248 units remaining)
     [ (Pair {} Unit) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[self_with_default_entrypoint.tz-Unit-Unit-Unit].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[self_with_default_entrypoint.tz-Unit-Unit-Unit].out
index ad21c5d7bdb2dd4596c14cff073be1f177083b25..3e3ecd3be6860fd273e1e516c0b3ce013b8a0e79 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[self_with_default_entrypoint.tz-Unit-Unit-Unit].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[self_with_default_entrypoint.tz-Unit-Unit-Unit].out
@@ -7,41 +7,41 @@ emitted operations
 big_map diff
   
 trace
-  - location: 13 (remaining gas: 1039982.800 units remaining)
+  - location: 13 (remaining gas: 1039983.600 units remaining)
     [ (Pair (Right (Left Unit)) Unit) ]
-  - location: 13 (remaining gas: 1039982.790 units remaining)
+  - location: 13 (remaining gas: 1039983.590 units remaining)
     [  ]
-  - location: 14 (remaining gas: 1039982.775 units remaining)
+  - location: 14 (remaining gas: 1039983.580 units remaining)
     [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" ]
-  - location: 15 (remaining gas: 1039982.765 units remaining)
+  - location: 15 (remaining gas: 1039983.570 units remaining)
     [  ]
-  - location: 16 (remaining gas: 1039982.750 units remaining)
+  - location: 16 (remaining gas: 1039983.560 units remaining)
     [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi%A" ]
-  - location: 17 (remaining gas: 1039982.740 units remaining)
+  - location: 17 (remaining gas: 1039983.550 units remaining)
     [  ]
-  - location: 18 (remaining gas: 1039982.725 units remaining)
+  - location: 18 (remaining gas: 1039983.540 units remaining)
     [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" ]
-  - location: 19 (remaining gas: 1039971.772 units remaining)
+  - location: 19 (remaining gas: 1039982.417 units remaining)
     [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ]
-  - location: 20 (remaining gas: 1039971.757 units remaining)
+  - location: 20 (remaining gas: 1039982.407 units remaining)
     [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi"
       0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ]
-  - location: 21 (remaining gas: 1039960.804 units remaining)
+  - location: 21 (remaining gas: 1039981.284 units remaining)
     [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600
       0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ]
-  - location: 24 (remaining gas: 1039960.769 units remaining)
+  - location: 24 (remaining gas: 1039981.249 units remaining)
     [ 0 ]
-  - location: 25 (remaining gas: 1039960.754 units remaining)
+  - location: 25 (remaining gas: 1039981.239 units remaining)
     [ True ]
-  - location: 26 (remaining gas: 1039960.744 units remaining)
+  - location: 26 (remaining gas: 1039981.229 units remaining)
     [  ]
-  - location: 26 (remaining gas: 1039960.729 units remaining)
+  - location: 26 (remaining gas: 1039981.219 units remaining)
     [  ]
-  - location: 32 (remaining gas: 1039960.719 units remaining)
+  - location: 32 (remaining gas: 1039981.209 units remaining)
     [ Unit ]
-  - location: 33 (remaining gas: 1039960.704 units remaining)
+  - location: 33 (remaining gas: 1039981.199 units remaining)
     [ {}
       Unit ]
-  - location: 35 (remaining gas: 1039960.689 units remaining)
+  - location: 35 (remaining gas: 1039981.189 units remaining)
     [ (Pair {} Unit) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[self_with_entrypoint.tz-Unit-Left (Left 0)-Unit].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[self_with_entrypoint.tz-Unit-Left (Left 0)-Unit].out
index a420bd8e48564a82618851d9db3a22078f88d7bd..5d1d920f06bc73a3fd2c0d5a62cd7f6e13319757 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[self_with_entrypoint.tz-Unit-Left (Left 0)-Unit].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[self_with_entrypoint.tz-Unit-Left (Left 0)-Unit].out	
@@ -7,87 +7,87 @@ emitted operations
 big_map diff
   
 trace
-  - location: 13 (remaining gas: 1039952.851 units remaining)
+  - location: 13 (remaining gas: 1039957.971 units remaining)
     [ (Pair (Left (Left 0)) Unit) ]
-  - location: 13 (remaining gas: 1039952.841 units remaining)
+  - location: 13 (remaining gas: 1039957.961 units remaining)
     [  ]
-  - location: 14 (remaining gas: 1039952.826 units remaining)
+  - location: 14 (remaining gas: 1039957.951 units remaining)
     [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi%A" ]
-  - location: 15 (remaining gas: 1039941.840 units remaining)
+  - location: 15 (remaining gas: 1039956.795 units remaining)
     [ 0x050a00000017011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe60041 ]
-  - location: 16 (remaining gas: 1039941.825 units remaining)
+  - location: 16 (remaining gas: 1039956.785 units remaining)
     [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi"
       0x050a00000017011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe60041 ]
-  - location: 17 (remaining gas: 1039930.872 units remaining)
+  - location: 17 (remaining gas: 1039955.662 units remaining)
     [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600
       0x050a00000017011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe60041 ]
-  - location: 18 (remaining gas: 1039930.862 units remaining)
+  - location: 18 (remaining gas: 1039955.652 units remaining)
     [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600
       0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600
       0x050a00000017011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe60041 ]
-  - location: 19 (remaining gas: 1039930.847 units remaining)
+  - location: 19 (remaining gas: 1039955.642 units remaining)
     [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600
       0x050a00000017011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe60041 ]
-  - location: 21 (remaining gas: 1039930.837 units remaining)
+  - location: 21 (remaining gas: 1039955.632 units remaining)
     [ 0x050a00000017011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe60041
       0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ]
-  - location: 19 (remaining gas: 1039930.807 units remaining)
+  - location: 19 (remaining gas: 1039955.612 units remaining)
     [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600
       0x050a00000017011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe60041
       0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ]
-  - location: 24 (remaining gas: 1039930.772 units remaining)
+  - location: 24 (remaining gas: 1039955.577 units remaining)
     [ -1
       0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ]
-  - location: 25 (remaining gas: 1039930.757 units remaining)
+  - location: 25 (remaining gas: 1039955.567 units remaining)
     [ True
       0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ]
-  - location: 26 (remaining gas: 1039930.747 units remaining)
+  - location: 26 (remaining gas: 1039955.557 units remaining)
     [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ]
-  - location: 26 (remaining gas: 1039930.732 units remaining)
+  - location: 26 (remaining gas: 1039955.547 units remaining)
     [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ]
-  - location: 32 (remaining gas: 1039930.717 units remaining)
+  - location: 32 (remaining gas: 1039955.537 units remaining)
     [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi"
       0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ]
-  - location: 33 (remaining gas: 1039919.764 units remaining)
+  - location: 33 (remaining gas: 1039954.414 units remaining)
     [ 0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600
       0x050a00000016011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600 ]
-  - location: 36 (remaining gas: 1039919.729 units remaining)
+  - location: 36 (remaining gas: 1039954.379 units remaining)
     [ 0 ]
-  - location: 37 (remaining gas: 1039919.714 units remaining)
+  - location: 37 (remaining gas: 1039954.369 units remaining)
     [ True ]
-  - location: 38 (remaining gas: 1039919.704 units remaining)
+  - location: 38 (remaining gas: 1039954.359 units remaining)
     [  ]
-  - location: 38 (remaining gas: 1039919.689 units remaining)
+  - location: 38 (remaining gas: 1039954.349 units remaining)
     [  ]
-  - location: 44 (remaining gas: 1039919.674 units remaining)
+  - location: 44 (remaining gas: 1039954.339 units remaining)
     [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi%A" ]
-  - location: 48 (remaining gas: 1039919.664 units remaining)
+  - location: 48 (remaining gas: 1039954.329 units remaining)
     [  ]
-  - location: 49 (remaining gas: 1039919.649 units remaining)
+  - location: 49 (remaining gas: 1039954.319 units remaining)
     [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi%B" ]
-  - location: 53 (remaining gas: 1039919.639 units remaining)
+  - location: 53 (remaining gas: 1039954.309 units remaining)
     [  ]
-  - location: 54 (remaining gas: 1039919.624 units remaining)
+  - location: 54 (remaining gas: 1039954.299 units remaining)
     [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi%maybe_C" ]
-  - location: 60 (remaining gas: 1039919.614 units remaining)
+  - location: 60 (remaining gas: 1039954.289 units remaining)
     [  ]
-  - location: 61 (remaining gas: 1039919.599 units remaining)
+  - location: 61 (remaining gas: 1039954.279 units remaining)
     [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi%Z" ]
-  - location: 65 (remaining gas: 1039919.589 units remaining)
+  - location: 65 (remaining gas: 1039954.269 units remaining)
     [  ]
-  - location: 66 (remaining gas: 1039919.574 units remaining)
+  - location: 66 (remaining gas: 1039954.259 units remaining)
     [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" ]
-  - location: 76 (remaining gas: 1039919.564 units remaining)
+  - location: 76 (remaining gas: 1039954.249 units remaining)
     [  ]
-  - location: 77 (remaining gas: 1039919.549 units remaining)
+  - location: 77 (remaining gas: 1039954.239 units remaining)
     [ "KT1BEqzn5Wx8uJrZNvuS9DVHmLvG9td3fDLi" ]
-  - location: 87 (remaining gas: 1039919.539 units remaining)
+  - location: 87 (remaining gas: 1039954.229 units remaining)
     [  ]
-  - location: 88 (remaining gas: 1039919.529 units remaining)
+  - location: 88 (remaining gas: 1039954.219 units remaining)
     [ Unit ]
-  - location: 89 (remaining gas: 1039919.514 units remaining)
+  - location: 89 (remaining gas: 1039954.209 units remaining)
     [ {}
       Unit ]
-  - location: 91 (remaining gas: 1039919.499 units remaining)
+  - location: 91 (remaining gas: 1039954.199 units remaining)
     [ (Pair {} Unit) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_car.tz-(Pair \"hello\" 0)-\"\"-(Pair \"\" 0)].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_car.tz-(Pair \"hello\" 0)-\"\"-(Pair \"\" 0)].out"
index ceda319585c26ab64c4b65cace52485b9bcf01c7..6a36e86fe0b9afee37a52acaa6610d1dfb7ec6de 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_car.tz-(Pair \"hello\" 0)-\"\"-(Pair \"\" 0)].out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_car.tz-(Pair \"hello\" 0)-\"\"-(Pair \"\" 0)].out"	
@@ -7,43 +7,43 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (remaining gas: 1039987.526 units remaining)
+  - location: 9 (remaining gas: 1039988.486 units remaining)
     [ (Pair "" "hello" 0) ]
-  - location: 9 (remaining gas: 1039987.516 units remaining)
+  - location: 9 (remaining gas: 1039988.476 units remaining)
     [ (Pair "" "hello" 0)
       (Pair "" "hello" 0) ]
-  - location: 10 (remaining gas: 1039987.506 units remaining)
+  - location: 10 (remaining gas: 1039988.466 units remaining)
     [ (Pair "hello" 0)
       (Pair "" "hello" 0) ]
-  - location: 11 (remaining gas: 1039987.491 units remaining)
+  - location: 11 (remaining gas: 1039988.456 units remaining)
     [ (Pair "" "hello" 0) ]
-  - location: 13 (remaining gas: 1039987.481 units remaining)
+  - location: 13 (remaining gas: 1039988.446 units remaining)
     [ "" ]
-  - location: 11 (remaining gas: 1039987.451 units remaining)
+  - location: 11 (remaining gas: 1039988.426 units remaining)
     [ (Pair "hello" 0)
       "" ]
-  - location: 15 (remaining gas: 1039987.441 units remaining)
+  - location: 15 (remaining gas: 1039988.416 units remaining)
     [ (Pair "hello" 0)
       (Pair "hello" 0)
       "" ]
-  - location: 16 (remaining gas: 1039987.431 units remaining)
+  - location: 16 (remaining gas: 1039988.406 units remaining)
     [ "hello"
       (Pair "hello" 0)
       "" ]
-  - location: 17 (remaining gas: 1039987.421 units remaining)
+  - location: 17 (remaining gas: 1039988.396 units remaining)
     [ (Pair "hello" 0)
       "" ]
-  - location: 18 (remaining gas: 1039987.411 units remaining)
+  - location: 18 (remaining gas: 1039988.386 units remaining)
     [ 0
       "" ]
-  - location: 19 (remaining gas: 1039987.401 units remaining)
+  - location: 19 (remaining gas: 1039988.376 units remaining)
     [ ""
       0 ]
-  - location: 20 (remaining gas: 1039987.386 units remaining)
+  - location: 20 (remaining gas: 1039988.366 units remaining)
     [ (Pair "" 0) ]
-  - location: 21 (remaining gas: 1039987.371 units remaining)
+  - location: 21 (remaining gas: 1039988.356 units remaining)
     [ {}
       (Pair "" 0) ]
-  - location: 23 (remaining gas: 1039987.356 units remaining)
+  - location: 23 (remaining gas: 1039988.346 units remaining)
     [ (Pair {} "" 0) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_car.tz-(Pair \"hello\" 0)-\"abc\"-(Pair \"abc\" 0)].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_car.tz-(Pair \"hello\" 0)-\"abc\"-(Pair \"abc\" 0)].out"
index 10141984c9bbb3e2b13d0b9bb19ae97f92ff917a..5ac12fd30132d4fb3ca5421617c08288a99612a3 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_car.tz-(Pair \"hello\" 0)-\"abc\"-(Pair \"abc\" 0)].out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_car.tz-(Pair \"hello\" 0)-\"abc\"-(Pair \"abc\" 0)].out"	
@@ -7,43 +7,43 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (remaining gas: 1039987.496 units remaining)
+  - location: 9 (remaining gas: 1039988.456 units remaining)
     [ (Pair "abc" "hello" 0) ]
-  - location: 9 (remaining gas: 1039987.486 units remaining)
+  - location: 9 (remaining gas: 1039988.446 units remaining)
     [ (Pair "abc" "hello" 0)
       (Pair "abc" "hello" 0) ]
-  - location: 10 (remaining gas: 1039987.476 units remaining)
+  - location: 10 (remaining gas: 1039988.436 units remaining)
     [ (Pair "hello" 0)
       (Pair "abc" "hello" 0) ]
-  - location: 11 (remaining gas: 1039987.461 units remaining)
+  - location: 11 (remaining gas: 1039988.426 units remaining)
     [ (Pair "abc" "hello" 0) ]
-  - location: 13 (remaining gas: 1039987.451 units remaining)
+  - location: 13 (remaining gas: 1039988.416 units remaining)
     [ "abc" ]
-  - location: 11 (remaining gas: 1039987.421 units remaining)
+  - location: 11 (remaining gas: 1039988.396 units remaining)
     [ (Pair "hello" 0)
       "abc" ]
-  - location: 15 (remaining gas: 1039987.411 units remaining)
+  - location: 15 (remaining gas: 1039988.386 units remaining)
     [ (Pair "hello" 0)
       (Pair "hello" 0)
       "abc" ]
-  - location: 16 (remaining gas: 1039987.401 units remaining)
+  - location: 16 (remaining gas: 1039988.376 units remaining)
     [ "hello"
       (Pair "hello" 0)
       "abc" ]
-  - location: 17 (remaining gas: 1039987.391 units remaining)
+  - location: 17 (remaining gas: 1039988.366 units remaining)
     [ (Pair "hello" 0)
       "abc" ]
-  - location: 18 (remaining gas: 1039987.381 units remaining)
+  - location: 18 (remaining gas: 1039988.356 units remaining)
     [ 0
       "abc" ]
-  - location: 19 (remaining gas: 1039987.371 units remaining)
+  - location: 19 (remaining gas: 1039988.346 units remaining)
     [ "abc"
       0 ]
-  - location: 20 (remaining gas: 1039987.356 units remaining)
+  - location: 20 (remaining gas: 1039988.336 units remaining)
     [ (Pair "abc" 0) ]
-  - location: 21 (remaining gas: 1039987.341 units remaining)
+  - location: 21 (remaining gas: 1039988.326 units remaining)
     [ {}
       (Pair "abc" 0) ]
-  - location: 23 (remaining gas: 1039987.326 units remaining)
+  - location: 23 (remaining gas: 1039988.316 units remaining)
     [ (Pair {} "abc" 0) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_car.tz-(Pair \"hello\" 0)-\"world\"-(Pair \"world\" 0)].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_car.tz-(Pair \"hello\" 0)-\"world\"-(Pair \"world\" 0)].out"
index 8f34d88600fceb8d1d10b3c4406f8079243034f1..2e43cd357d7b434cfec64b4faefaf0304aea76f3 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_car.tz-(Pair \"hello\" 0)-\"world\"-(Pair \"world\" 0)].out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_car.tz-(Pair \"hello\" 0)-\"world\"-(Pair \"world\" 0)].out"	
@@ -7,43 +7,43 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (remaining gas: 1039987.476 units remaining)
+  - location: 9 (remaining gas: 1039988.436 units remaining)
     [ (Pair "world" "hello" 0) ]
-  - location: 9 (remaining gas: 1039987.466 units remaining)
+  - location: 9 (remaining gas: 1039988.426 units remaining)
     [ (Pair "world" "hello" 0)
       (Pair "world" "hello" 0) ]
-  - location: 10 (remaining gas: 1039987.456 units remaining)
+  - location: 10 (remaining gas: 1039988.416 units remaining)
     [ (Pair "hello" 0)
       (Pair "world" "hello" 0) ]
-  - location: 11 (remaining gas: 1039987.441 units remaining)
+  - location: 11 (remaining gas: 1039988.406 units remaining)
     [ (Pair "world" "hello" 0) ]
-  - location: 13 (remaining gas: 1039987.431 units remaining)
+  - location: 13 (remaining gas: 1039988.396 units remaining)
     [ "world" ]
-  - location: 11 (remaining gas: 1039987.401 units remaining)
+  - location: 11 (remaining gas: 1039988.376 units remaining)
     [ (Pair "hello" 0)
       "world" ]
-  - location: 15 (remaining gas: 1039987.391 units remaining)
+  - location: 15 (remaining gas: 1039988.366 units remaining)
     [ (Pair "hello" 0)
       (Pair "hello" 0)
       "world" ]
-  - location: 16 (remaining gas: 1039987.381 units remaining)
+  - location: 16 (remaining gas: 1039988.356 units remaining)
     [ "hello"
       (Pair "hello" 0)
       "world" ]
-  - location: 17 (remaining gas: 1039987.371 units remaining)
+  - location: 17 (remaining gas: 1039988.346 units remaining)
     [ (Pair "hello" 0)
       "world" ]
-  - location: 18 (remaining gas: 1039987.361 units remaining)
+  - location: 18 (remaining gas: 1039988.336 units remaining)
     [ 0
       "world" ]
-  - location: 19 (remaining gas: 1039987.351 units remaining)
+  - location: 19 (remaining gas: 1039988.326 units remaining)
     [ "world"
       0 ]
-  - location: 20 (remaining gas: 1039987.336 units remaining)
+  - location: 20 (remaining gas: 1039988.316 units remaining)
     [ (Pair "world" 0) ]
-  - location: 21 (remaining gas: 1039987.321 units remaining)
+  - location: 21 (remaining gas: 1039988.306 units remaining)
     [ {}
       (Pair "world" 0) ]
-  - location: 23 (remaining gas: 1039987.306 units remaining)
+  - location: 23 (remaining gas: 1039988.296 units remaining)
     [ (Pair {} "world" 0) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_cdr.tz-(Pair \"hello\" 0)-1-(Pair \"hello\" 1)].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_cdr.tz-(Pair \"hello\" 0)-1-(Pair \"hello\" 1)].out"
index 073f8d7f7c82dccfe0a041798a183be4a9503edd..3f77e4d45e99dd1226e897e73a96bb5c326ed65f 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_cdr.tz-(Pair \"hello\" 0)-1-(Pair \"hello\" 1)].out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_cdr.tz-(Pair \"hello\" 0)-1-(Pair \"hello\" 1)].out"	
@@ -7,40 +7,40 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (remaining gas: 1039988.143 units remaining)
+  - location: 9 (remaining gas: 1039989.103 units remaining)
     [ (Pair 1 "hello" 0) ]
-  - location: 9 (remaining gas: 1039988.133 units remaining)
+  - location: 9 (remaining gas: 1039989.093 units remaining)
     [ (Pair 1 "hello" 0)
       (Pair 1 "hello" 0) ]
-  - location: 10 (remaining gas: 1039988.123 units remaining)
+  - location: 10 (remaining gas: 1039989.083 units remaining)
     [ (Pair "hello" 0)
       (Pair 1 "hello" 0) ]
-  - location: 11 (remaining gas: 1039988.108 units remaining)
+  - location: 11 (remaining gas: 1039989.073 units remaining)
     [ (Pair 1 "hello" 0) ]
-  - location: 13 (remaining gas: 1039988.098 units remaining)
+  - location: 13 (remaining gas: 1039989.063 units remaining)
     [ 1 ]
-  - location: 11 (remaining gas: 1039988.068 units remaining)
+  - location: 11 (remaining gas: 1039989.043 units remaining)
     [ (Pair "hello" 0)
       1 ]
-  - location: 15 (remaining gas: 1039988.058 units remaining)
+  - location: 15 (remaining gas: 1039989.033 units remaining)
     [ (Pair "hello" 0)
       (Pair "hello" 0)
       1 ]
-  - location: 16 (remaining gas: 1039988.048 units remaining)
+  - location: 16 (remaining gas: 1039989.023 units remaining)
     [ 0
       (Pair "hello" 0)
       1 ]
-  - location: 17 (remaining gas: 1039988.038 units remaining)
+  - location: 17 (remaining gas: 1039989.013 units remaining)
     [ (Pair "hello" 0)
       1 ]
-  - location: 18 (remaining gas: 1039988.028 units remaining)
+  - location: 18 (remaining gas: 1039989.003 units remaining)
     [ "hello"
       1 ]
-  - location: 19 (remaining gas: 1039988.013 units remaining)
+  - location: 19 (remaining gas: 1039988.993 units remaining)
     [ (Pair "hello" 1) ]
-  - location: 20 (remaining gas: 1039987.998 units remaining)
+  - location: 20 (remaining gas: 1039988.983 units remaining)
     [ {}
       (Pair "hello" 1) ]
-  - location: 22 (remaining gas: 1039987.983 units remaining)
+  - location: 22 (remaining gas: 1039988.973 units remaining)
     [ (Pair {} "hello" 1) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_cdr.tz-(Pair \"hello\" 500)-3-(Pair \"hello\" 3)].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_cdr.tz-(Pair \"hello\" 500)-3-(Pair \"hello\" 3)].out"
index 2388c06208b9124832280fdd2c2f26080eb11aa6..2bf8cbb177bb4538765ad0fe5d2c514b639fb631 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_cdr.tz-(Pair \"hello\" 500)-3-(Pair \"hello\" 3)].out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_cdr.tz-(Pair \"hello\" 500)-3-(Pair \"hello\" 3)].out"	
@@ -7,40 +7,40 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (remaining gas: 1039988.143 units remaining)
+  - location: 9 (remaining gas: 1039989.103 units remaining)
     [ (Pair 3 "hello" 500) ]
-  - location: 9 (remaining gas: 1039988.133 units remaining)
+  - location: 9 (remaining gas: 1039989.093 units remaining)
     [ (Pair 3 "hello" 500)
       (Pair 3 "hello" 500) ]
-  - location: 10 (remaining gas: 1039988.123 units remaining)
+  - location: 10 (remaining gas: 1039989.083 units remaining)
     [ (Pair "hello" 500)
       (Pair 3 "hello" 500) ]
-  - location: 11 (remaining gas: 1039988.108 units remaining)
+  - location: 11 (remaining gas: 1039989.073 units remaining)
     [ (Pair 3 "hello" 500) ]
-  - location: 13 (remaining gas: 1039988.098 units remaining)
+  - location: 13 (remaining gas: 1039989.063 units remaining)
     [ 3 ]
-  - location: 11 (remaining gas: 1039988.068 units remaining)
+  - location: 11 (remaining gas: 1039989.043 units remaining)
     [ (Pair "hello" 500)
       3 ]
-  - location: 15 (remaining gas: 1039988.058 units remaining)
+  - location: 15 (remaining gas: 1039989.033 units remaining)
     [ (Pair "hello" 500)
       (Pair "hello" 500)
       3 ]
-  - location: 16 (remaining gas: 1039988.048 units remaining)
+  - location: 16 (remaining gas: 1039989.023 units remaining)
     [ 500
       (Pair "hello" 500)
       3 ]
-  - location: 17 (remaining gas: 1039988.038 units remaining)
+  - location: 17 (remaining gas: 1039989.013 units remaining)
     [ (Pair "hello" 500)
       3 ]
-  - location: 18 (remaining gas: 1039988.028 units remaining)
+  - location: 18 (remaining gas: 1039989.003 units remaining)
     [ "hello"
       3 ]
-  - location: 19 (remaining gas: 1039988.013 units remaining)
+  - location: 19 (remaining gas: 1039988.993 units remaining)
     [ (Pair "hello" 3) ]
-  - location: 20 (remaining gas: 1039987.998 units remaining)
+  - location: 20 (remaining gas: 1039988.983 units remaining)
     [ {}
       (Pair "hello" 3) ]
-  - location: 22 (remaining gas: 1039987.983 units remaining)
+  - location: 22 (remaining gas: 1039988.973 units remaining)
     [ (Pair {} "hello" 3) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_cdr.tz-(Pair \"hello\" 7)-100-(Pair \"hello\" 100)].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_cdr.tz-(Pair \"hello\" 7)-100-(Pair \"hello\" 100)].out"
index 4450ab560b891903114a2bb31ee54da74d999690..8e141d47f54c9b2b8c4b167cfc63445d83a19359 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_cdr.tz-(Pair \"hello\" 7)-100-(Pair \"hello\" 100)].out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_cdr.tz-(Pair \"hello\" 7)-100-(Pair \"hello\" 100)].out"	
@@ -7,40 +7,40 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (remaining gas: 1039988.143 units remaining)
+  - location: 9 (remaining gas: 1039989.103 units remaining)
     [ (Pair 100 "hello" 7) ]
-  - location: 9 (remaining gas: 1039988.133 units remaining)
+  - location: 9 (remaining gas: 1039989.093 units remaining)
     [ (Pair 100 "hello" 7)
       (Pair 100 "hello" 7) ]
-  - location: 10 (remaining gas: 1039988.123 units remaining)
+  - location: 10 (remaining gas: 1039989.083 units remaining)
     [ (Pair "hello" 7)
       (Pair 100 "hello" 7) ]
-  - location: 11 (remaining gas: 1039988.108 units remaining)
+  - location: 11 (remaining gas: 1039989.073 units remaining)
     [ (Pair 100 "hello" 7) ]
-  - location: 13 (remaining gas: 1039988.098 units remaining)
+  - location: 13 (remaining gas: 1039989.063 units remaining)
     [ 100 ]
-  - location: 11 (remaining gas: 1039988.068 units remaining)
+  - location: 11 (remaining gas: 1039989.043 units remaining)
     [ (Pair "hello" 7)
       100 ]
-  - location: 15 (remaining gas: 1039988.058 units remaining)
+  - location: 15 (remaining gas: 1039989.033 units remaining)
     [ (Pair "hello" 7)
       (Pair "hello" 7)
       100 ]
-  - location: 16 (remaining gas: 1039988.048 units remaining)
+  - location: 16 (remaining gas: 1039989.023 units remaining)
     [ 7
       (Pair "hello" 7)
       100 ]
-  - location: 17 (remaining gas: 1039988.038 units remaining)
+  - location: 17 (remaining gas: 1039989.013 units remaining)
     [ (Pair "hello" 7)
       100 ]
-  - location: 18 (remaining gas: 1039988.028 units remaining)
+  - location: 18 (remaining gas: 1039989.003 units remaining)
     [ "hello"
       100 ]
-  - location: 19 (remaining gas: 1039988.013 units remaining)
+  - location: 19 (remaining gas: 1039988.993 units remaining)
     [ (Pair "hello" 100) ]
-  - location: 20 (remaining gas: 1039987.998 units remaining)
+  - location: 20 (remaining gas: 1039988.983 units remaining)
     [ {}
       (Pair "hello" 100) ]
-  - location: 22 (remaining gas: 1039987.983 units remaining)
+  - location: 22 (remaining gas: 1039988.973 units remaining)
     [ (Pair {} "hello" 100) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_id.tz-{}-{ \"a\" ; \"b\" ; \"c\" }-{ \"a\" ; \"b\" ; \"c\" }].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_id.tz-{}-{ \"a\" ; \"b\" ; \"c\" }-{ \"a\" ; \"b\" ; \"c\" }].out"
index fec10f248a0422db80390f68846d9359bc836dc2..f1f6860538104840db2503d953d5119f0fff59a5 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_id.tz-{}-{ \"a\" ; \"b\" ; \"c\" }-{ \"a\" ; \"b\" ; \"c\" }].out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_id.tz-{}-{ \"a\" ; \"b\" ; \"c\" }-{ \"a\" ; \"b\" ; \"c\" }].out"	
@@ -7,13 +7,13 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (remaining gas: 1039994.146 units remaining)
+  - location: 9 (remaining gas: 1039994.946 units remaining)
     [ (Pair { "a" ; "b" ; "c" } {}) ]
-  - location: 9 (remaining gas: 1039994.136 units remaining)
+  - location: 9 (remaining gas: 1039994.936 units remaining)
     [ { "a" ; "b" ; "c" } ]
-  - location: 10 (remaining gas: 1039994.121 units remaining)
+  - location: 10 (remaining gas: 1039994.926 units remaining)
     [ {}
       { "a" ; "b" ; "c" } ]
-  - location: 12 (remaining gas: 1039994.106 units remaining)
+  - location: 12 (remaining gas: 1039994.916 units remaining)
     [ (Pair {} { "a" ; "b" ; "c" }) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_id.tz-{}-{ \"asdf\" ; \"bcde\" }-{ \"asdf\" ; \"bcde\" }].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_id.tz-{}-{ \"asdf\" ; \"bcde\" }-{ \"asdf\" ; \"bcde\" }].out"
index 391ead53bdeb04d6ae86ad4b144dc77e41abbf5a..c9256754943656aac8ba573ad13ee0e7ceb287eb 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_id.tz-{}-{ \"asdf\" ; \"bcde\" }-{ \"asdf\" ; \"bcde\" }].out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_id.tz-{}-{ \"asdf\" ; \"bcde\" }-{ \"asdf\" ; \"bcde\" }].out"	
@@ -7,13 +7,13 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (remaining gas: 1039994.363 units remaining)
+  - location: 9 (remaining gas: 1039995.163 units remaining)
     [ (Pair { "asdf" ; "bcde" } {}) ]
-  - location: 9 (remaining gas: 1039994.353 units remaining)
+  - location: 9 (remaining gas: 1039995.153 units remaining)
     [ { "asdf" ; "bcde" } ]
-  - location: 10 (remaining gas: 1039994.338 units remaining)
+  - location: 10 (remaining gas: 1039995.143 units remaining)
     [ {}
       { "asdf" ; "bcde" } ]
-  - location: 12 (remaining gas: 1039994.323 units remaining)
+  - location: 12 (remaining gas: 1039995.133 units remaining)
     [ (Pair {} { "asdf" ; "bcde" }) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_id.tz-{}-{}-{}].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_id.tz-{}-{}-{}].out
index 9ff27af11f13e301e89fe294b69e9a4c4a964a24..d70c03eb6357f2aae5e29b057718c554b330f00f 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_id.tz-{}-{}-{}].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_id.tz-{}-{}-{}].out
@@ -7,13 +7,13 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (remaining gas: 1039994.990 units remaining)
+  - location: 9 (remaining gas: 1039995.790 units remaining)
     [ (Pair {} {}) ]
-  - location: 9 (remaining gas: 1039994.980 units remaining)
+  - location: 9 (remaining gas: 1039995.780 units remaining)
     [ {} ]
-  - location: 10 (remaining gas: 1039994.965 units remaining)
+  - location: 10 (remaining gas: 1039995.770 units remaining)
     [ {}
       {} ]
-  - location: 12 (remaining gas: 1039994.950 units remaining)
+  - location: 12 (remaining gas: 1039995.760 units remaining)
     [ (Pair {} {}) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_iter.tz-111-{ -100 ; 1 ; 2 ; 3 }--94].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_iter.tz-111-{ -100 ; 1 ; 2 ; 3 }--94].out
index 1da7eb41c41cbfa22ae73cfbe67b9bf1320b22d0..f125b052ece1e9f26acc0f4bb43a0471a1d06075 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_iter.tz-111-{ -100 ; 1 ; 2 ; 3 }--94].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_iter.tz-111-{ -100 ; 1 ; 2 ; 3 }--94].out	
@@ -7,41 +7,41 @@ emitted operations
 big_map diff
   
 trace
-  - location: 8 (remaining gas: 1039991.113 units remaining)
+  - location: 8 (remaining gas: 1039991.913 units remaining)
     [ (Pair { -100 ; 1 ; 2 ; 3 } 111) ]
-  - location: 8 (remaining gas: 1039991.103 units remaining)
+  - location: 8 (remaining gas: 1039991.903 units remaining)
     [ { -100 ; 1 ; 2 ; 3 } ]
-  - location: 9 (remaining gas: 1039991.093 units remaining)
+  - location: 9 (remaining gas: 1039991.893 units remaining)
     [ 0
       { -100 ; 1 ; 2 ; 3 } ]
-  - location: 12 (remaining gas: 1039991.083 units remaining)
+  - location: 12 (remaining gas: 1039991.883 units remaining)
     [ { -100 ; 1 ; 2 ; 3 }
       0 ]
-  - location: 13 (remaining gas: 1039991.083 units remaining)
+  - location: 13 (remaining gas: 1039991.883 units remaining)
     [ -100
       0 ]
-  - location: 15 (remaining gas: 1039991.028 units remaining)
+  - location: 15 (remaining gas: 1039991.848 units remaining)
     [ -100 ]
-  - location: 13 (remaining gas: 1039991.013 units remaining)
+  - location: 13 (remaining gas: 1039991.838 units remaining)
     [ 1
       -100 ]
-  - location: 15 (remaining gas: 1039990.958 units remaining)
+  - location: 15 (remaining gas: 1039991.803 units remaining)
     [ -99 ]
-  - location: 13 (remaining gas: 1039990.943 units remaining)
+  - location: 13 (remaining gas: 1039991.793 units remaining)
     [ 2
       -99 ]
-  - location: 15 (remaining gas: 1039990.888 units remaining)
+  - location: 15 (remaining gas: 1039991.758 units remaining)
     [ -97 ]
-  - location: 13 (remaining gas: 1039990.873 units remaining)
+  - location: 13 (remaining gas: 1039991.748 units remaining)
     [ 3
       -97 ]
-  - location: 15 (remaining gas: 1039990.818 units remaining)
+  - location: 15 (remaining gas: 1039991.713 units remaining)
     [ -94 ]
-  - location: 13 (remaining gas: 1039990.803 units remaining)
+  - location: 13 (remaining gas: 1039991.703 units remaining)
     [ -94 ]
-  - location: 16 (remaining gas: 1039990.788 units remaining)
+  - location: 16 (remaining gas: 1039991.693 units remaining)
     [ {}
       -94 ]
-  - location: 18 (remaining gas: 1039990.773 units remaining)
+  - location: 18 (remaining gas: 1039991.683 units remaining)
     [ (Pair {} -94) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_iter.tz-111-{ 1 }-1].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_iter.tz-111-{ 1 }-1].out
index a6e45cca3d3533da96efac8775299cdf61e3115b..fe6897e93e5fcdf674b53f10eda1acae9cd88b3c 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_iter.tz-111-{ 1 }-1].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_iter.tz-111-{ 1 }-1].out	
@@ -7,26 +7,26 @@ emitted operations
 big_map diff
   
 trace
-  - location: 8 (remaining gas: 1039991.908 units remaining)
+  - location: 8 (remaining gas: 1039992.708 units remaining)
     [ (Pair { 1 } 111) ]
-  - location: 8 (remaining gas: 1039991.898 units remaining)
+  - location: 8 (remaining gas: 1039992.698 units remaining)
     [ { 1 } ]
-  - location: 9 (remaining gas: 1039991.888 units remaining)
+  - location: 9 (remaining gas: 1039992.688 units remaining)
     [ 0
       { 1 } ]
-  - location: 12 (remaining gas: 1039991.878 units remaining)
+  - location: 12 (remaining gas: 1039992.678 units remaining)
     [ { 1 }
       0 ]
-  - location: 13 (remaining gas: 1039991.878 units remaining)
+  - location: 13 (remaining gas: 1039992.678 units remaining)
     [ 1
       0 ]
-  - location: 15 (remaining gas: 1039991.823 units remaining)
+  - location: 15 (remaining gas: 1039992.643 units remaining)
     [ 1 ]
-  - location: 13 (remaining gas: 1039991.808 units remaining)
+  - location: 13 (remaining gas: 1039992.633 units remaining)
     [ 1 ]
-  - location: 16 (remaining gas: 1039991.793 units remaining)
+  - location: 16 (remaining gas: 1039992.623 units remaining)
     [ {}
       1 ]
-  - location: 18 (remaining gas: 1039991.778 units remaining)
+  - location: 18 (remaining gas: 1039992.613 units remaining)
     [ (Pair {} 1) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_iter.tz-111-{}-0].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_iter.tz-111-{}-0].out
index 24742b6625b576befe7c8d89f97435fbfcd195af..7a270359b1289a2ee04a22141e7583cabb3d24f5 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_iter.tz-111-{}-0].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_iter.tz-111-{}-0].out
@@ -7,21 +7,21 @@ emitted operations
 big_map diff
   
 trace
-  - location: 8 (remaining gas: 1039992.138 units remaining)
+  - location: 8 (remaining gas: 1039992.938 units remaining)
     [ (Pair {} 111) ]
-  - location: 8 (remaining gas: 1039992.128 units remaining)
+  - location: 8 (remaining gas: 1039992.928 units remaining)
     [ {} ]
-  - location: 9 (remaining gas: 1039992.118 units remaining)
+  - location: 9 (remaining gas: 1039992.918 units remaining)
     [ 0
       {} ]
-  - location: 12 (remaining gas: 1039992.108 units remaining)
+  - location: 12 (remaining gas: 1039992.908 units remaining)
     [ {}
       0 ]
-  - location: 13 (remaining gas: 1039992.108 units remaining)
+  - location: 13 (remaining gas: 1039992.908 units remaining)
     [ 0 ]
-  - location: 16 (remaining gas: 1039992.093 units remaining)
+  - location: 16 (remaining gas: 1039992.898 units remaining)
     [ {}
       0 ]
-  - location: 18 (remaining gas: 1039992.078 units remaining)
+  - location: 18 (remaining gas: 1039992.888 units remaining)
     [ (Pair {} 0) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_member.tz-(Pair { \"Hello\" ; \"World\" } None)-\"\"-(Pai.3d2044726e.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_member.tz-(Pair { \"Hello\" ; \"World\" } None)-\"\"-(Pai.3d2044726e.out"
index 50b827071662d242bcbd4a444e54839baab2d601..8fca9269dc8727ca1708306515e2bbc084fa2b56 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_member.tz-(Pair { \"Hello\" ; \"World\" } None)-\"\"-(Pai.3d2044726e.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_member.tz-(Pair { \"Hello\" ; \"World\" } None)-\"\"-(Pai.3d2044726e.out"	
@@ -7,55 +7,55 @@ emitted operations
 big_map diff
   
 trace
-  - location: 11 (remaining gas: 1039983.438 units remaining)
+  - location: 11 (remaining gas: 1039984.878 units remaining)
     [ (Pair "" { "Hello" ; "World" } None) ]
-  - location: 11 (remaining gas: 1039983.428 units remaining)
+  - location: 11 (remaining gas: 1039984.868 units remaining)
     [ (Pair "" { "Hello" ; "World" } None)
       (Pair "" { "Hello" ; "World" } None) ]
-  - location: 12 (remaining gas: 1039983.418 units remaining)
+  - location: 12 (remaining gas: 1039984.858 units remaining)
     [ (Pair "" { "Hello" ; "World" } None)
       (Pair "" { "Hello" ; "World" } None)
       (Pair "" { "Hello" ; "World" } None) ]
-  - location: 13 (remaining gas: 1039983.408 units remaining)
+  - location: 13 (remaining gas: 1039984.848 units remaining)
     [ ""
       (Pair "" { "Hello" ; "World" } None)
       (Pair "" { "Hello" ; "World" } None) ]
-  - location: 14 (remaining gas: 1039983.393 units remaining)
+  - location: 14 (remaining gas: 1039984.838 units remaining)
     [ (Pair "" { "Hello" ; "World" } None)
       (Pair "" { "Hello" ; "World" } None) ]
-  - location: 17 (remaining gas: 1039983.383 units remaining)
+  - location: 17 (remaining gas: 1039984.828 units remaining)
     [ (Pair { "Hello" ; "World" } None)
       (Pair "" { "Hello" ; "World" } None) ]
-  - location: 18 (remaining gas: 1039983.373 units remaining)
+  - location: 18 (remaining gas: 1039984.818 units remaining)
     [ { "Hello" ; "World" }
       (Pair "" { "Hello" ; "World" } None) ]
-  - location: 14 (remaining gas: 1039983.343 units remaining)
+  - location: 14 (remaining gas: 1039984.798 units remaining)
     [ ""
       { "Hello" ; "World" }
       (Pair "" { "Hello" ; "World" } None) ]
-  - location: 19 (remaining gas: 1039983.228 units remaining)
+  - location: 19 (remaining gas: 1039984.683 units remaining)
     [ False
       (Pair "" { "Hello" ; "World" } None) ]
-  - location: 20 (remaining gas: 1039983.213 units remaining)
+  - location: 20 (remaining gas: 1039984.673 units remaining)
     [ (Some False)
       (Pair "" { "Hello" ; "World" } None) ]
-  - location: 21 (remaining gas: 1039983.198 units remaining)
+  - location: 21 (remaining gas: 1039984.663 units remaining)
     [ (Pair "" { "Hello" ; "World" } None) ]
-  - location: 24 (remaining gas: 1039983.188 units remaining)
+  - location: 24 (remaining gas: 1039984.653 units remaining)
     [ (Pair { "Hello" ; "World" } None) ]
-  - location: 25 (remaining gas: 1039983.178 units remaining)
+  - location: 25 (remaining gas: 1039984.643 units remaining)
     [ { "Hello" ; "World" } ]
-  - location: 21 (remaining gas: 1039983.148 units remaining)
+  - location: 21 (remaining gas: 1039984.623 units remaining)
     [ (Some False)
       { "Hello" ; "World" } ]
-  - location: 26 (remaining gas: 1039983.138 units remaining)
+  - location: 26 (remaining gas: 1039984.613 units remaining)
     [ { "Hello" ; "World" }
       (Some False) ]
-  - location: 27 (remaining gas: 1039983.123 units remaining)
+  - location: 27 (remaining gas: 1039984.603 units remaining)
     [ (Pair { "Hello" ; "World" } (Some False)) ]
-  - location: 28 (remaining gas: 1039983.108 units remaining)
+  - location: 28 (remaining gas: 1039984.593 units remaining)
     [ {}
       (Pair { "Hello" ; "World" } (Some False)) ]
-  - location: 30 (remaining gas: 1039983.093 units remaining)
+  - location: 30 (remaining gas: 1039984.583 units remaining)
     [ (Pair {} { "Hello" ; "World" } (Some False)) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_member.tz-(Pair { \"Hi\" } None)-\"Hi\"-(Pair { \"Hi\" } .564beb9251.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_member.tz-(Pair { \"Hi\" } None)-\"Hi\"-(Pair { \"Hi\" } .564beb9251.out"
index 480a793d539484330124d6210ffb3ff34804f49c..4ef7261f71efefa25d0c6b5af6ff3015cee5161d 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_member.tz-(Pair { \"Hi\" } None)-\"Hi\"-(Pair { \"Hi\" } .564beb9251.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_member.tz-(Pair { \"Hi\" } None)-\"Hi\"-(Pair { \"Hi\" } .564beb9251.out"	
@@ -7,55 +7,55 @@ emitted operations
 big_map diff
   
 trace
-  - location: 11 (remaining gas: 1039983.803 units remaining)
+  - location: 11 (remaining gas: 1039985.243 units remaining)
     [ (Pair "Hi" { "Hi" } None) ]
-  - location: 11 (remaining gas: 1039983.793 units remaining)
+  - location: 11 (remaining gas: 1039985.233 units remaining)
     [ (Pair "Hi" { "Hi" } None)
       (Pair "Hi" { "Hi" } None) ]
-  - location: 12 (remaining gas: 1039983.783 units remaining)
+  - location: 12 (remaining gas: 1039985.223 units remaining)
     [ (Pair "Hi" { "Hi" } None)
       (Pair "Hi" { "Hi" } None)
       (Pair "Hi" { "Hi" } None) ]
-  - location: 13 (remaining gas: 1039983.773 units remaining)
+  - location: 13 (remaining gas: 1039985.213 units remaining)
     [ "Hi"
       (Pair "Hi" { "Hi" } None)
       (Pair "Hi" { "Hi" } None) ]
-  - location: 14 (remaining gas: 1039983.758 units remaining)
+  - location: 14 (remaining gas: 1039985.203 units remaining)
     [ (Pair "Hi" { "Hi" } None)
       (Pair "Hi" { "Hi" } None) ]
-  - location: 17 (remaining gas: 1039983.748 units remaining)
+  - location: 17 (remaining gas: 1039985.193 units remaining)
     [ (Pair { "Hi" } None)
       (Pair "Hi" { "Hi" } None) ]
-  - location: 18 (remaining gas: 1039983.738 units remaining)
+  - location: 18 (remaining gas: 1039985.183 units remaining)
     [ { "Hi" }
       (Pair "Hi" { "Hi" } None) ]
-  - location: 14 (remaining gas: 1039983.708 units remaining)
+  - location: 14 (remaining gas: 1039985.163 units remaining)
     [ "Hi"
       { "Hi" }
       (Pair "Hi" { "Hi" } None) ]
-  - location: 19 (remaining gas: 1039983.589 units remaining)
+  - location: 19 (remaining gas: 1039985.044 units remaining)
     [ True
       (Pair "Hi" { "Hi" } None) ]
-  - location: 20 (remaining gas: 1039983.574 units remaining)
+  - location: 20 (remaining gas: 1039985.034 units remaining)
     [ (Some True)
       (Pair "Hi" { "Hi" } None) ]
-  - location: 21 (remaining gas: 1039983.559 units remaining)
+  - location: 21 (remaining gas: 1039985.024 units remaining)
     [ (Pair "Hi" { "Hi" } None) ]
-  - location: 24 (remaining gas: 1039983.549 units remaining)
+  - location: 24 (remaining gas: 1039985.014 units remaining)
     [ (Pair { "Hi" } None) ]
-  - location: 25 (remaining gas: 1039983.539 units remaining)
+  - location: 25 (remaining gas: 1039985.004 units remaining)
     [ { "Hi" } ]
-  - location: 21 (remaining gas: 1039983.509 units remaining)
+  - location: 21 (remaining gas: 1039984.984 units remaining)
     [ (Some True)
       { "Hi" } ]
-  - location: 26 (remaining gas: 1039983.499 units remaining)
+  - location: 26 (remaining gas: 1039984.974 units remaining)
     [ { "Hi" }
       (Some True) ]
-  - location: 27 (remaining gas: 1039983.484 units remaining)
+  - location: 27 (remaining gas: 1039984.964 units remaining)
     [ (Pair { "Hi" } (Some True)) ]
-  - location: 28 (remaining gas: 1039983.469 units remaining)
+  - location: 28 (remaining gas: 1039984.954 units remaining)
     [ {}
       (Pair { "Hi" } (Some True)) ]
-  - location: 30 (remaining gas: 1039983.454 units remaining)
+  - location: 30 (remaining gas: 1039984.944 units remaining)
     [ (Pair {} { "Hi" } (Some True)) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_member.tz-(Pair {} None)-\"Hi\"-(Pair {} (Some False))].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_member.tz-(Pair {} None)-\"Hi\"-(Pair {} (Some False))].out"
index fc85ea4d937de233f3ab2ee60530c65195b0ba89..284b999fdb48b1b07aa02929e0be870c7a419e2f 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_member.tz-(Pair {} None)-\"Hi\"-(Pair {} (Some False))].out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_member.tz-(Pair {} None)-\"Hi\"-(Pair {} (Some False))].out"	
@@ -7,55 +7,55 @@ emitted operations
 big_map diff
   
 trace
-  - location: 11 (remaining gas: 1039984.071 units remaining)
+  - location: 11 (remaining gas: 1039985.511 units remaining)
     [ (Pair "Hi" {} None) ]
-  - location: 11 (remaining gas: 1039984.061 units remaining)
+  - location: 11 (remaining gas: 1039985.501 units remaining)
     [ (Pair "Hi" {} None)
       (Pair "Hi" {} None) ]
-  - location: 12 (remaining gas: 1039984.051 units remaining)
+  - location: 12 (remaining gas: 1039985.491 units remaining)
     [ (Pair "Hi" {} None)
       (Pair "Hi" {} None)
       (Pair "Hi" {} None) ]
-  - location: 13 (remaining gas: 1039984.041 units remaining)
+  - location: 13 (remaining gas: 1039985.481 units remaining)
     [ "Hi"
       (Pair "Hi" {} None)
       (Pair "Hi" {} None) ]
-  - location: 14 (remaining gas: 1039984.026 units remaining)
+  - location: 14 (remaining gas: 1039985.471 units remaining)
     [ (Pair "Hi" {} None)
       (Pair "Hi" {} None) ]
-  - location: 17 (remaining gas: 1039984.016 units remaining)
+  - location: 17 (remaining gas: 1039985.461 units remaining)
     [ (Pair {} None)
       (Pair "Hi" {} None) ]
-  - location: 18 (remaining gas: 1039984.006 units remaining)
+  - location: 18 (remaining gas: 1039985.451 units remaining)
     [ {}
       (Pair "Hi" {} None) ]
-  - location: 14 (remaining gas: 1039983.976 units remaining)
+  - location: 14 (remaining gas: 1039985.431 units remaining)
     [ "Hi"
       {}
       (Pair "Hi" {} None) ]
-  - location: 19 (remaining gas: 1039983.859 units remaining)
+  - location: 19 (remaining gas: 1039985.314 units remaining)
     [ False
       (Pair "Hi" {} None) ]
-  - location: 20 (remaining gas: 1039983.844 units remaining)
+  - location: 20 (remaining gas: 1039985.304 units remaining)
     [ (Some False)
       (Pair "Hi" {} None) ]
-  - location: 21 (remaining gas: 1039983.829 units remaining)
+  - location: 21 (remaining gas: 1039985.294 units remaining)
     [ (Pair "Hi" {} None) ]
-  - location: 24 (remaining gas: 1039983.819 units remaining)
+  - location: 24 (remaining gas: 1039985.284 units remaining)
     [ (Pair {} None) ]
-  - location: 25 (remaining gas: 1039983.809 units remaining)
+  - location: 25 (remaining gas: 1039985.274 units remaining)
     [ {} ]
-  - location: 21 (remaining gas: 1039983.779 units remaining)
+  - location: 21 (remaining gas: 1039985.254 units remaining)
     [ (Some False)
       {} ]
-  - location: 26 (remaining gas: 1039983.769 units remaining)
+  - location: 26 (remaining gas: 1039985.244 units remaining)
     [ {}
       (Some False) ]
-  - location: 27 (remaining gas: 1039983.754 units remaining)
+  - location: 27 (remaining gas: 1039985.234 units remaining)
     [ (Pair {} (Some False)) ]
-  - location: 28 (remaining gas: 1039983.739 units remaining)
+  - location: 28 (remaining gas: 1039985.224 units remaining)
     [ {}
       (Pair {} (Some False)) ]
-  - location: 30 (remaining gas: 1039983.724 units remaining)
+  - location: 30 (remaining gas: 1039985.214 units remaining)
     [ (Pair {} {} (Some False)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_size.tz-111-{ 1 ; 2 ; 3 ; 4 ; 5 ; 6 }-6].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_size.tz-111-{ 1 ; 2 ; 3 ; 4 ; 5 ; 6 }-6].out
index 26bd557e88c3e27282f891355c94b88858a19662..35f62dd05bf0daef3064079942207ff6bcbac970 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_size.tz-111-{ 1 ; 2 ; 3 ; 4 ; 5 ; 6 }-6].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_size.tz-111-{ 1 ; 2 ; 3 ; 4 ; 5 ; 6 }-6].out	
@@ -7,15 +7,15 @@ emitted operations
 big_map diff
   
 trace
-  - location: 8 (remaining gas: 1039993.230 units remaining)
+  - location: 8 (remaining gas: 1039993.870 units remaining)
     [ (Pair { 1 ; 2 ; 3 ; 4 ; 5 ; 6 } 111) ]
-  - location: 8 (remaining gas: 1039993.220 units remaining)
+  - location: 8 (remaining gas: 1039993.860 units remaining)
     [ { 1 ; 2 ; 3 ; 4 ; 5 ; 6 } ]
-  - location: 9 (remaining gas: 1039993.205 units remaining)
+  - location: 9 (remaining gas: 1039993.850 units remaining)
     [ 6 ]
-  - location: 10 (remaining gas: 1039993.190 units remaining)
+  - location: 10 (remaining gas: 1039993.840 units remaining)
     [ {}
       6 ]
-  - location: 12 (remaining gas: 1039993.175 units remaining)
+  - location: 12 (remaining gas: 1039993.830 units remaining)
     [ (Pair {} 6) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_size.tz-111-{ 1 ; 2 ; 3 }-3].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_size.tz-111-{ 1 ; 2 ; 3 }-3].out
index 27c2a87c79fdd9bce3a7199e842c2fd7f0f3d7ec..88fcd5005747dfc3750794206d55a8e9d0e6ac51 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_size.tz-111-{ 1 ; 2 ; 3 }-3].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_size.tz-111-{ 1 ; 2 ; 3 }-3].out	
@@ -7,15 +7,15 @@ emitted operations
 big_map diff
   
 trace
-  - location: 8 (remaining gas: 1039994.025 units remaining)
+  - location: 8 (remaining gas: 1039994.665 units remaining)
     [ (Pair { 1 ; 2 ; 3 } 111) ]
-  - location: 8 (remaining gas: 1039994.015 units remaining)
+  - location: 8 (remaining gas: 1039994.655 units remaining)
     [ { 1 ; 2 ; 3 } ]
-  - location: 9 (remaining gas: 1039994 units remaining)
+  - location: 9 (remaining gas: 1039994.645 units remaining)
     [ 3 ]
-  - location: 10 (remaining gas: 1039993.985 units remaining)
+  - location: 10 (remaining gas: 1039994.635 units remaining)
     [ {}
       3 ]
-  - location: 12 (remaining gas: 1039993.970 units remaining)
+  - location: 12 (remaining gas: 1039994.625 units remaining)
     [ (Pair {} 3) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_size.tz-111-{ 1 }-1].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_size.tz-111-{ 1 }-1].out
index af1de3c0a01aed2ef7746824af0cd5e48992c405..f2be0f7ec376a22c5687a78f794eb8d2f15b3a5e 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_size.tz-111-{ 1 }-1].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_size.tz-111-{ 1 }-1].out	
@@ -7,15 +7,15 @@ emitted operations
 big_map diff
   
 trace
-  - location: 8 (remaining gas: 1039994.555 units remaining)
+  - location: 8 (remaining gas: 1039995.195 units remaining)
     [ (Pair { 1 } 111) ]
-  - location: 8 (remaining gas: 1039994.545 units remaining)
+  - location: 8 (remaining gas: 1039995.185 units remaining)
     [ { 1 } ]
-  - location: 9 (remaining gas: 1039994.530 units remaining)
+  - location: 9 (remaining gas: 1039995.175 units remaining)
     [ 1 ]
-  - location: 10 (remaining gas: 1039994.515 units remaining)
+  - location: 10 (remaining gas: 1039995.165 units remaining)
     [ {}
       1 ]
-  - location: 12 (remaining gas: 1039994.500 units remaining)
+  - location: 12 (remaining gas: 1039995.155 units remaining)
     [ (Pair {} 1) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_size.tz-111-{}-0].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_size.tz-111-{}-0].out
index 6ec6da4ab1ca4d1d7362b8ab22866330924ce375..0176917e292f8db481b3302cbf00de028be6ef81 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_size.tz-111-{}-0].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[set_size.tz-111-{}-0].out
@@ -7,15 +7,15 @@ emitted operations
 big_map diff
   
 trace
-  - location: 8 (remaining gas: 1039994.785 units remaining)
+  - location: 8 (remaining gas: 1039995.425 units remaining)
     [ (Pair {} 111) ]
-  - location: 8 (remaining gas: 1039994.775 units remaining)
+  - location: 8 (remaining gas: 1039995.415 units remaining)
     [ {} ]
-  - location: 9 (remaining gas: 1039994.760 units remaining)
+  - location: 9 (remaining gas: 1039995.405 units remaining)
     [ 0 ]
-  - location: 10 (remaining gas: 1039994.745 units remaining)
+  - location: 10 (remaining gas: 1039995.395 units remaining)
     [ {}
       0 ]
-  - location: 12 (remaining gas: 1039994.730 units remaining)
+  - location: 12 (remaining gas: 1039995.385 units remaining)
     [ (Pair {} 0) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sha3.tz-None-0x48656c6c6f2c20776f726c6421-(Some 0xf345a.a07ae9dddf.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sha3.tz-None-0x48656c6c6f2c20776f726c6421-(Some 0xf345a.a07ae9dddf.out
index 9cd744f70b5abcd07e55f06ef7b18086192aeb7b..e57337d8f624d60ee0ad299d23996b54f2d66d43 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sha3.tz-None-0x48656c6c6f2c20776f726c6421-(Some 0xf345a.a07ae9dddf.out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sha3.tz-None-0x48656c6c6f2c20776f726c6421-(Some 0xf345a.a07ae9dddf.out	
@@ -7,18 +7,18 @@ emitted operations
 big_map diff
   
 trace
-  - location: 8 (remaining gas: 1039993.922 units remaining)
+  - location: 8 (remaining gas: 1039994.722 units remaining)
     [ (Pair 0x48656c6c6f2c20776f726c6421 None) ]
-  - location: 8 (remaining gas: 1039993.912 units remaining)
+  - location: 8 (remaining gas: 1039994.712 units remaining)
     [ 0x48656c6c6f2c20776f726c6421 ]
-  - location: 9 (remaining gas: 1039992.455 units remaining)
+  - location: 9 (remaining gas: 1039993.255 units remaining)
     [ 0xf345a219da005ebe9c1a1eaad97bbf38a10c8473e41d0af7fb617caa0c6aa722 ]
-  - location: 10 (remaining gas: 1039992.440 units remaining)
+  - location: 10 (remaining gas: 1039993.245 units remaining)
     [ (Some 0xf345a219da005ebe9c1a1eaad97bbf38a10c8473e41d0af7fb617caa0c6aa722) ]
-  - location: 11 (remaining gas: 1039992.425 units remaining)
+  - location: 11 (remaining gas: 1039993.235 units remaining)
     [ {}
       (Some 0xf345a219da005ebe9c1a1eaad97bbf38a10c8473e41d0af7fb617caa0c6aa722) ]
-  - location: 13 (remaining gas: 1039992.410 units remaining)
+  - location: 13 (remaining gas: 1039993.225 units remaining)
     [ (Pair {}
             (Some 0xf345a219da005ebe9c1a1eaad97bbf38a10c8473e41d0af7fb617caa0c6aa722)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 0 0))-(Some 0)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 0 0))-(Some 0)].out
index ab4af12cc6915d416929727dd3a00cfa2debaf20..9bb7b629c40b9abdb3b02e92baf4cc323d171361 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 0 0))-(Some 0)].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 0 0))-(Some 0)].out	
@@ -7,24 +7,24 @@ emitted operations
 big_map diff
   
 trace
-  - location: 14 (remaining gas: 1039989.734 units remaining)
+  - location: 14 (remaining gas: 1039990.694 units remaining)
     [ (Pair (Left (Pair 0 0)) None) ]
-  - location: 14 (remaining gas: 1039989.724 units remaining)
+  - location: 14 (remaining gas: 1039990.684 units remaining)
     [ (Left (Pair 0 0)) ]
-  - location: 15 (remaining gas: 1039989.714 units remaining)
+  - location: 15 (remaining gas: 1039990.674 units remaining)
     [ (Pair 0 0) ]
-  - location: 17 (remaining gas: 1039989.704 units remaining)
+  - location: 17 (remaining gas: 1039990.664 units remaining)
     [ 0
       0 ]
-  - location: 18 (remaining gas: 1039989.704 units remaining)
+  - location: 18 (remaining gas: 1039990.664 units remaining)
     [ 0 ]
-  - location: 15 (remaining gas: 1039989.689 units remaining)
+  - location: 15 (remaining gas: 1039990.654 units remaining)
     [ 0 ]
-  - location: 22 (remaining gas: 1039989.674 units remaining)
+  - location: 22 (remaining gas: 1039990.644 units remaining)
     [ (Some 0) ]
-  - location: 23 (remaining gas: 1039989.659 units remaining)
+  - location: 23 (remaining gas: 1039990.634 units remaining)
     [ {}
       (Some 0) ]
-  - location: 25 (remaining gas: 1039989.644 units remaining)
+  - location: 25 (remaining gas: 1039990.624 units remaining)
     [ (Pair {} (Some 0)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 0 1))-(Some 0)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 0 1))-(Some 0)].out
index 5e39383025f9c0950501a0502fde83848329126d..035d6a4e57c7e7c3acf771ba765be04005cafe6f 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 0 1))-(Some 0)].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 0 1))-(Some 0)].out	
@@ -7,24 +7,24 @@ emitted operations
 big_map diff
   
 trace
-  - location: 14 (remaining gas: 1039989.734 units remaining)
+  - location: 14 (remaining gas: 1039990.694 units remaining)
     [ (Pair (Left (Pair 0 1)) None) ]
-  - location: 14 (remaining gas: 1039989.724 units remaining)
+  - location: 14 (remaining gas: 1039990.684 units remaining)
     [ (Left (Pair 0 1)) ]
-  - location: 15 (remaining gas: 1039989.714 units remaining)
+  - location: 15 (remaining gas: 1039990.674 units remaining)
     [ (Pair 0 1) ]
-  - location: 17 (remaining gas: 1039989.704 units remaining)
+  - location: 17 (remaining gas: 1039990.664 units remaining)
     [ 0
       1 ]
-  - location: 18 (remaining gas: 1039989.704 units remaining)
+  - location: 18 (remaining gas: 1039990.664 units remaining)
     [ 0 ]
-  - location: 15 (remaining gas: 1039989.689 units remaining)
+  - location: 15 (remaining gas: 1039990.654 units remaining)
     [ 0 ]
-  - location: 22 (remaining gas: 1039989.674 units remaining)
+  - location: 22 (remaining gas: 1039990.644 units remaining)
     [ (Some 0) ]
-  - location: 23 (remaining gas: 1039989.659 units remaining)
+  - location: 23 (remaining gas: 1039990.634 units remaining)
     [ {}
       (Some 0) ]
-  - location: 25 (remaining gas: 1039989.644 units remaining)
+  - location: 25 (remaining gas: 1039990.624 units remaining)
     [ (Pair {} (Some 0)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 1 2))-(Some 4)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 1 2))-(Some 4)].out
index a30dc6026f1373c9ec6c1b04b648e88dea8c3209..8bcf5515773eb0a63e022a2cb1b6bdaaeea8e979 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 1 2))-(Some 4)].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 1 2))-(Some 4)].out	
@@ -7,24 +7,24 @@ emitted operations
 big_map diff
   
 trace
-  - location: 14 (remaining gas: 1039989.734 units remaining)
+  - location: 14 (remaining gas: 1039990.694 units remaining)
     [ (Pair (Left (Pair 1 2)) None) ]
-  - location: 14 (remaining gas: 1039989.724 units remaining)
+  - location: 14 (remaining gas: 1039990.684 units remaining)
     [ (Left (Pair 1 2)) ]
-  - location: 15 (remaining gas: 1039989.714 units remaining)
+  - location: 15 (remaining gas: 1039990.674 units remaining)
     [ (Pair 1 2) ]
-  - location: 17 (remaining gas: 1039989.704 units remaining)
+  - location: 17 (remaining gas: 1039990.664 units remaining)
     [ 1
       2 ]
-  - location: 18 (remaining gas: 1039989.704 units remaining)
+  - location: 18 (remaining gas: 1039990.664 units remaining)
     [ 4 ]
-  - location: 15 (remaining gas: 1039989.689 units remaining)
+  - location: 15 (remaining gas: 1039990.654 units remaining)
     [ 4 ]
-  - location: 22 (remaining gas: 1039989.674 units remaining)
+  - location: 22 (remaining gas: 1039990.644 units remaining)
     [ (Some 4) ]
-  - location: 23 (remaining gas: 1039989.659 units remaining)
+  - location: 23 (remaining gas: 1039990.634 units remaining)
     [ {}
       (Some 4) ]
-  - location: 25 (remaining gas: 1039989.644 units remaining)
+  - location: 25 (remaining gas: 1039990.624 units remaining)
     [ (Pair {} (Some 4)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 15 2))-(Some 60)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 15 2))-(Some 60)].out
index 7c7c35535a54ed0a9faf9c96483c350c3136ac28..1c4a8c5b5c5a10d82b56e92a6191ef7157370c67 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 15 2))-(Some 60)].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 15 2))-(Some 60)].out	
@@ -7,24 +7,24 @@ emitted operations
 big_map diff
   
 trace
-  - location: 14 (remaining gas: 1039989.734 units remaining)
+  - location: 14 (remaining gas: 1039990.694 units remaining)
     [ (Pair (Left (Pair 15 2)) None) ]
-  - location: 14 (remaining gas: 1039989.724 units remaining)
+  - location: 14 (remaining gas: 1039990.684 units remaining)
     [ (Left (Pair 15 2)) ]
-  - location: 15 (remaining gas: 1039989.714 units remaining)
+  - location: 15 (remaining gas: 1039990.674 units remaining)
     [ (Pair 15 2) ]
-  - location: 17 (remaining gas: 1039989.704 units remaining)
+  - location: 17 (remaining gas: 1039990.664 units remaining)
     [ 15
       2 ]
-  - location: 18 (remaining gas: 1039989.704 units remaining)
+  - location: 18 (remaining gas: 1039990.664 units remaining)
     [ 60 ]
-  - location: 15 (remaining gas: 1039989.689 units remaining)
+  - location: 15 (remaining gas: 1039990.654 units remaining)
     [ 60 ]
-  - location: 22 (remaining gas: 1039989.674 units remaining)
+  - location: 22 (remaining gas: 1039990.644 units remaining)
     [ (Some 60) ]
-  - location: 23 (remaining gas: 1039989.659 units remaining)
+  - location: 23 (remaining gas: 1039990.634 units remaining)
     [ {}
       (Some 60) ]
-  - location: 25 (remaining gas: 1039989.644 units remaining)
+  - location: 25 (remaining gas: 1039990.624 units remaining)
     [ (Pair {} (Some 60)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 8 1))-(Some 16)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 8 1))-(Some 16)].out
index 11cbe2c6f9b80ec2fc5cdeed8212ce7123199990..9de9ed1864782c26be517f4cae7579fedb25dfb4 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 8 1))-(Some 16)].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Left (Pair 8 1))-(Some 16)].out	
@@ -7,24 +7,24 @@ emitted operations
 big_map diff
   
 trace
-  - location: 14 (remaining gas: 1039989.734 units remaining)
+  - location: 14 (remaining gas: 1039990.694 units remaining)
     [ (Pair (Left (Pair 8 1)) None) ]
-  - location: 14 (remaining gas: 1039989.724 units remaining)
+  - location: 14 (remaining gas: 1039990.684 units remaining)
     [ (Left (Pair 8 1)) ]
-  - location: 15 (remaining gas: 1039989.714 units remaining)
+  - location: 15 (remaining gas: 1039990.674 units remaining)
     [ (Pair 8 1) ]
-  - location: 17 (remaining gas: 1039989.704 units remaining)
+  - location: 17 (remaining gas: 1039990.664 units remaining)
     [ 8
       1 ]
-  - location: 18 (remaining gas: 1039989.704 units remaining)
+  - location: 18 (remaining gas: 1039990.664 units remaining)
     [ 16 ]
-  - location: 15 (remaining gas: 1039989.689 units remaining)
+  - location: 15 (remaining gas: 1039990.654 units remaining)
     [ 16 ]
-  - location: 22 (remaining gas: 1039989.674 units remaining)
+  - location: 22 (remaining gas: 1039990.644 units remaining)
     [ (Some 16) ]
-  - location: 23 (remaining gas: 1039989.659 units remaining)
+  - location: 23 (remaining gas: 1039990.634 units remaining)
     [ {}
       (Some 16) ]
-  - location: 25 (remaining gas: 1039989.644 units remaining)
+  - location: 25 (remaining gas: 1039990.624 units remaining)
     [ (Pair {} (Some 16)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 0 0))-(Some 0)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 0 0))-(Some 0)].out
index 557f9cd5e389adcba867fc877cc3fa8ec44342a5..68e182c29dd8a6caa4693c148979c80f4a479b64 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 0 0))-(Some 0)].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 0 0))-(Some 0)].out	
@@ -7,24 +7,24 @@ emitted operations
 big_map diff
   
 trace
-  - location: 14 (remaining gas: 1039989.734 units remaining)
+  - location: 14 (remaining gas: 1039990.694 units remaining)
     [ (Pair (Right (Pair 0 0)) None) ]
-  - location: 14 (remaining gas: 1039989.724 units remaining)
+  - location: 14 (remaining gas: 1039990.684 units remaining)
     [ (Right (Pair 0 0)) ]
-  - location: 15 (remaining gas: 1039989.714 units remaining)
+  - location: 15 (remaining gas: 1039990.674 units remaining)
     [ (Pair 0 0) ]
-  - location: 20 (remaining gas: 1039989.704 units remaining)
+  - location: 20 (remaining gas: 1039990.664 units remaining)
     [ 0
       0 ]
-  - location: 21 (remaining gas: 1039989.704 units remaining)
+  - location: 21 (remaining gas: 1039990.664 units remaining)
     [ 0 ]
-  - location: 15 (remaining gas: 1039989.689 units remaining)
+  - location: 15 (remaining gas: 1039990.654 units remaining)
     [ 0 ]
-  - location: 22 (remaining gas: 1039989.674 units remaining)
+  - location: 22 (remaining gas: 1039990.644 units remaining)
     [ (Some 0) ]
-  - location: 23 (remaining gas: 1039989.659 units remaining)
+  - location: 23 (remaining gas: 1039990.634 units remaining)
     [ {}
       (Some 0) ]
-  - location: 25 (remaining gas: 1039989.644 units remaining)
+  - location: 25 (remaining gas: 1039990.624 units remaining)
     [ (Pair {} (Some 0)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 0 1))-(Some 0)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 0 1))-(Some 0)].out
index 159e255d00a9f88750027d846c5db0a330499358..383ef4579fe276654252eff87c9553d7aceff2c6 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 0 1))-(Some 0)].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 0 1))-(Some 0)].out	
@@ -7,24 +7,24 @@ emitted operations
 big_map diff
   
 trace
-  - location: 14 (remaining gas: 1039989.734 units remaining)
+  - location: 14 (remaining gas: 1039990.694 units remaining)
     [ (Pair (Right (Pair 0 1)) None) ]
-  - location: 14 (remaining gas: 1039989.724 units remaining)
+  - location: 14 (remaining gas: 1039990.684 units remaining)
     [ (Right (Pair 0 1)) ]
-  - location: 15 (remaining gas: 1039989.714 units remaining)
+  - location: 15 (remaining gas: 1039990.674 units remaining)
     [ (Pair 0 1) ]
-  - location: 20 (remaining gas: 1039989.704 units remaining)
+  - location: 20 (remaining gas: 1039990.664 units remaining)
     [ 0
       1 ]
-  - location: 21 (remaining gas: 1039989.704 units remaining)
+  - location: 21 (remaining gas: 1039990.664 units remaining)
     [ 0 ]
-  - location: 15 (remaining gas: 1039989.689 units remaining)
+  - location: 15 (remaining gas: 1039990.654 units remaining)
     [ 0 ]
-  - location: 22 (remaining gas: 1039989.674 units remaining)
+  - location: 22 (remaining gas: 1039990.644 units remaining)
     [ (Some 0) ]
-  - location: 23 (remaining gas: 1039989.659 units remaining)
+  - location: 23 (remaining gas: 1039990.634 units remaining)
     [ {}
       (Some 0) ]
-  - location: 25 (remaining gas: 1039989.644 units remaining)
+  - location: 25 (remaining gas: 1039990.624 units remaining)
     [ (Pair {} (Some 0)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 1 2))-(Some 0)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 1 2))-(Some 0)].out
index b23677af5aded3aaa191363a56756a4148fd5d6b..e679b4406281a9ecb7948072a4e595f38c4b287f 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 1 2))-(Some 0)].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 1 2))-(Some 0)].out	
@@ -7,24 +7,24 @@ emitted operations
 big_map diff
   
 trace
-  - location: 14 (remaining gas: 1039989.734 units remaining)
+  - location: 14 (remaining gas: 1039990.694 units remaining)
     [ (Pair (Right (Pair 1 2)) None) ]
-  - location: 14 (remaining gas: 1039989.724 units remaining)
+  - location: 14 (remaining gas: 1039990.684 units remaining)
     [ (Right (Pair 1 2)) ]
-  - location: 15 (remaining gas: 1039989.714 units remaining)
+  - location: 15 (remaining gas: 1039990.674 units remaining)
     [ (Pair 1 2) ]
-  - location: 20 (remaining gas: 1039989.704 units remaining)
+  - location: 20 (remaining gas: 1039990.664 units remaining)
     [ 1
       2 ]
-  - location: 21 (remaining gas: 1039989.704 units remaining)
+  - location: 21 (remaining gas: 1039990.664 units remaining)
     [ 0 ]
-  - location: 15 (remaining gas: 1039989.689 units remaining)
+  - location: 15 (remaining gas: 1039990.654 units remaining)
     [ 0 ]
-  - location: 22 (remaining gas: 1039989.674 units remaining)
+  - location: 22 (remaining gas: 1039990.644 units remaining)
     [ (Some 0) ]
-  - location: 23 (remaining gas: 1039989.659 units remaining)
+  - location: 23 (remaining gas: 1039990.634 units remaining)
     [ {}
       (Some 0) ]
-  - location: 25 (remaining gas: 1039989.644 units remaining)
+  - location: 25 (remaining gas: 1039990.624 units remaining)
     [ (Pair {} (Some 0)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 15 2))-(Some 3)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 15 2))-(Some 3)].out
index 198179776ab9ff37e40fca77f95537cdf93790a9..d8b1b904f68793e05ab3da307e17a7d5fc0cdd17 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 15 2))-(Some 3)].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 15 2))-(Some 3)].out	
@@ -7,24 +7,24 @@ emitted operations
 big_map diff
   
 trace
-  - location: 14 (remaining gas: 1039989.734 units remaining)
+  - location: 14 (remaining gas: 1039990.694 units remaining)
     [ (Pair (Right (Pair 15 2)) None) ]
-  - location: 14 (remaining gas: 1039989.724 units remaining)
+  - location: 14 (remaining gas: 1039990.684 units remaining)
     [ (Right (Pair 15 2)) ]
-  - location: 15 (remaining gas: 1039989.714 units remaining)
+  - location: 15 (remaining gas: 1039990.674 units remaining)
     [ (Pair 15 2) ]
-  - location: 20 (remaining gas: 1039989.704 units remaining)
+  - location: 20 (remaining gas: 1039990.664 units remaining)
     [ 15
       2 ]
-  - location: 21 (remaining gas: 1039989.704 units remaining)
+  - location: 21 (remaining gas: 1039990.664 units remaining)
     [ 3 ]
-  - location: 15 (remaining gas: 1039989.689 units remaining)
+  - location: 15 (remaining gas: 1039990.654 units remaining)
     [ 3 ]
-  - location: 22 (remaining gas: 1039989.674 units remaining)
+  - location: 22 (remaining gas: 1039990.644 units remaining)
     [ (Some 3) ]
-  - location: 23 (remaining gas: 1039989.659 units remaining)
+  - location: 23 (remaining gas: 1039990.634 units remaining)
     [ {}
       (Some 3) ]
-  - location: 25 (remaining gas: 1039989.644 units remaining)
+  - location: 25 (remaining gas: 1039990.624 units remaining)
     [ (Pair {} (Some 3)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 8 1))-(Some 4)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 8 1))-(Some 4)].out
index b42c39958124063f5b6871d70b866fdb2ed717cc..52449bff3695d013501a6f9dacb767be8a0a55e9 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 8 1))-(Some 4)].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[shifts.tz-None-(Right (Pair 8 1))-(Some 4)].out	
@@ -7,24 +7,24 @@ emitted operations
 big_map diff
   
 trace
-  - location: 14 (remaining gas: 1039989.734 units remaining)
+  - location: 14 (remaining gas: 1039990.694 units remaining)
     [ (Pair (Right (Pair 8 1)) None) ]
-  - location: 14 (remaining gas: 1039989.724 units remaining)
+  - location: 14 (remaining gas: 1039990.684 units remaining)
     [ (Right (Pair 8 1)) ]
-  - location: 15 (remaining gas: 1039989.714 units remaining)
+  - location: 15 (remaining gas: 1039990.674 units remaining)
     [ (Pair 8 1) ]
-  - location: 20 (remaining gas: 1039989.704 units remaining)
+  - location: 20 (remaining gas: 1039990.664 units remaining)
     [ 8
       1 ]
-  - location: 21 (remaining gas: 1039989.704 units remaining)
+  - location: 21 (remaining gas: 1039990.664 units remaining)
     [ 4 ]
-  - location: 15 (remaining gas: 1039989.689 units remaining)
+  - location: 15 (remaining gas: 1039990.654 units remaining)
     [ 4 ]
-  - location: 22 (remaining gas: 1039989.674 units remaining)
+  - location: 22 (remaining gas: 1039990.644 units remaining)
     [ (Some 4) ]
-  - location: 23 (remaining gas: 1039989.659 units remaining)
+  - location: 23 (remaining gas: 1039990.634 units remaining)
     [ {}
       (Some 4) ]
-  - location: 25 (remaining gas: 1039989.644 units remaining)
+  - location: 25 (remaining gas: 1039990.624 units remaining)
     [ (Pair {} (Some 4)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-None-Pair 0 0-None].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-None-Pair 0 0-None].out
index e4409471003b11e89a17d4237195dee426cb4ce8..5313099973627316b829b210943c14b023af901e 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-None-Pair 0 0-None].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-None-Pair 0 0-None].out	
@@ -7,25 +7,25 @@ emitted operations
 big_map diff
   
 trace
-  - location: 10 (remaining gas: 1039989.187 units remaining)
+  - location: 10 (remaining gas: 1039990.307 units remaining)
     [ (Pair (Pair 0 0) None) ]
-  - location: 10 (remaining gas: 1039989.177 units remaining)
+  - location: 10 (remaining gas: 1039990.297 units remaining)
     [ (Pair 0 0)
       None ]
-  - location: 11 (remaining gas: 1039989.167 units remaining)
+  - location: 11 (remaining gas: 1039990.287 units remaining)
     [ None
       (Pair 0 0) ]
-  - location: 13 (remaining gas: 1039989.157 units remaining)
+  - location: 13 (remaining gas: 1039990.277 units remaining)
     [ (Pair 0 0) ]
-  - location: 15 (remaining gas: 1039989.147 units remaining)
+  - location: 15 (remaining gas: 1039990.267 units remaining)
     [  ]
-  - location: 16 (remaining gas: 1039989.132 units remaining)
+  - location: 16 (remaining gas: 1039990.257 units remaining)
     [ None ]
-  - location: 13 (remaining gas: 1039989.117 units remaining)
+  - location: 13 (remaining gas: 1039990.247 units remaining)
     [ None ]
-  - location: 22 (remaining gas: 1039989.102 units remaining)
+  - location: 22 (remaining gas: 1039990.237 units remaining)
     [ {}
       None ]
-  - location: 24 (remaining gas: 1039989.087 units remaining)
+  - location: 24 (remaining gas: 1039990.227 units remaining)
     [ (Pair {} None) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 0 0-(Some \"\")].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 0 0-(Some \"\")].out"
index 7d87964a2a7794cab70d6e662f3677900f03b471..5120d9098c731c6faab28b7e69de7ab7a469aad4 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 0 0-(Some \"\")].out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 0 0-(Some \"\")].out"	
@@ -7,31 +7,31 @@ emitted operations
 big_map diff
   
 trace
-  - location: 10 (remaining gas: 1039989.043 units remaining)
+  - location: 10 (remaining gas: 1039990.163 units remaining)
     [ (Pair (Pair 0 0) (Some "Foo")) ]
-  - location: 10 (remaining gas: 1039989.033 units remaining)
+  - location: 10 (remaining gas: 1039990.153 units remaining)
     [ (Pair 0 0)
       (Some "Foo") ]
-  - location: 11 (remaining gas: 1039989.023 units remaining)
+  - location: 11 (remaining gas: 1039990.143 units remaining)
     [ (Some "Foo")
       (Pair 0 0) ]
-  - location: 13 (remaining gas: 1039989.013 units remaining)
+  - location: 13 (remaining gas: 1039990.133 units remaining)
     [ "Foo"
       (Pair 0 0) ]
-  - location: 19 (remaining gas: 1039989.003 units remaining)
+  - location: 19 (remaining gas: 1039990.123 units remaining)
     [ (Pair 0 0)
       "Foo" ]
-  - location: 20 (remaining gas: 1039988.993 units remaining)
+  - location: 20 (remaining gas: 1039990.113 units remaining)
     [ 0
       0
       "Foo" ]
-  - location: 21 (remaining gas: 1039988.953 units remaining)
+  - location: 21 (remaining gas: 1039990.088 units remaining)
     [ (Some "") ]
-  - location: 13 (remaining gas: 1039988.938 units remaining)
+  - location: 13 (remaining gas: 1039990.078 units remaining)
     [ (Some "") ]
-  - location: 22 (remaining gas: 1039988.923 units remaining)
+  - location: 22 (remaining gas: 1039990.068 units remaining)
     [ {}
       (Some "") ]
-  - location: 24 (remaining gas: 1039988.908 units remaining)
+  - location: 24 (remaining gas: 1039990.058 units remaining)
     [ (Pair {} (Some "")) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 0 10-None].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 0 10-None].out"
index ce324ac41797efc6f329f236ddcb4799733e72c8..84a38e9cfd5d25dca4009e8f1fc2cbfad84fb7d0 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 0 10-None].out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 0 10-None].out"	
@@ -7,31 +7,31 @@ emitted operations
 big_map diff
   
 trace
-  - location: 10 (remaining gas: 1039989.043 units remaining)
+  - location: 10 (remaining gas: 1039990.163 units remaining)
     [ (Pair (Pair 0 10) (Some "Foo")) ]
-  - location: 10 (remaining gas: 1039989.033 units remaining)
+  - location: 10 (remaining gas: 1039990.153 units remaining)
     [ (Pair 0 10)
       (Some "Foo") ]
-  - location: 11 (remaining gas: 1039989.023 units remaining)
+  - location: 11 (remaining gas: 1039990.143 units remaining)
     [ (Some "Foo")
       (Pair 0 10) ]
-  - location: 13 (remaining gas: 1039989.013 units remaining)
+  - location: 13 (remaining gas: 1039990.133 units remaining)
     [ "Foo"
       (Pair 0 10) ]
-  - location: 19 (remaining gas: 1039989.003 units remaining)
+  - location: 19 (remaining gas: 1039990.123 units remaining)
     [ (Pair 0 10)
       "Foo" ]
-  - location: 20 (remaining gas: 1039988.993 units remaining)
+  - location: 20 (remaining gas: 1039990.113 units remaining)
     [ 0
       10
       "Foo" ]
-  - location: 21 (remaining gas: 1039988.953 units remaining)
+  - location: 21 (remaining gas: 1039990.088 units remaining)
     [ None ]
-  - location: 13 (remaining gas: 1039988.938 units remaining)
+  - location: 13 (remaining gas: 1039990.078 units remaining)
     [ None ]
-  - location: 22 (remaining gas: 1039988.923 units remaining)
+  - location: 22 (remaining gas: 1039990.068 units remaining)
     [ {}
       None ]
-  - location: 24 (remaining gas: 1039988.908 units remaining)
+  - location: 24 (remaining gas: 1039990.058 units remaining)
     [ (Pair {} None) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 0 2-(Some \"Fo\")].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 0 2-(Some \"Fo\")].out"
index 799a413e97d8eb7fe797a923f5a5adf0190e4dff..31483c34d03f1141d9152ce5bcc3fa34a2430f7c 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 0 2-(Some \"Fo\")].out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 0 2-(Some \"Fo\")].out"	
@@ -7,31 +7,31 @@ emitted operations
 big_map diff
   
 trace
-  - location: 10 (remaining gas: 1039989.043 units remaining)
+  - location: 10 (remaining gas: 1039990.163 units remaining)
     [ (Pair (Pair 0 2) (Some "Foo")) ]
-  - location: 10 (remaining gas: 1039989.033 units remaining)
+  - location: 10 (remaining gas: 1039990.153 units remaining)
     [ (Pair 0 2)
       (Some "Foo") ]
-  - location: 11 (remaining gas: 1039989.023 units remaining)
+  - location: 11 (remaining gas: 1039990.143 units remaining)
     [ (Some "Foo")
       (Pair 0 2) ]
-  - location: 13 (remaining gas: 1039989.013 units remaining)
+  - location: 13 (remaining gas: 1039990.133 units remaining)
     [ "Foo"
       (Pair 0 2) ]
-  - location: 19 (remaining gas: 1039989.003 units remaining)
+  - location: 19 (remaining gas: 1039990.123 units remaining)
     [ (Pair 0 2)
       "Foo" ]
-  - location: 20 (remaining gas: 1039988.993 units remaining)
+  - location: 20 (remaining gas: 1039990.113 units remaining)
     [ 0
       2
       "Foo" ]
-  - location: 21 (remaining gas: 1039988.953 units remaining)
+  - location: 21 (remaining gas: 1039990.088 units remaining)
     [ (Some "Fo") ]
-  - location: 13 (remaining gas: 1039988.938 units remaining)
+  - location: 13 (remaining gas: 1039990.078 units remaining)
     [ (Some "Fo") ]
-  - location: 22 (remaining gas: 1039988.923 units remaining)
+  - location: 22 (remaining gas: 1039990.068 units remaining)
     [ {}
       (Some "Fo") ]
-  - location: 24 (remaining gas: 1039988.908 units remaining)
+  - location: 24 (remaining gas: 1039990.058 units remaining)
     [ (Pair {} (Some "Fo")) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 1 1-(Some \"o\")].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 1 1-(Some \"o\")].out"
index 9a67ca952b39995a7dac9c121332d507e662d647..61f6318c243027014305f403c414ca5986aa8910 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 1 1-(Some \"o\")].out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 1 1-(Some \"o\")].out"	
@@ -7,31 +7,31 @@ emitted operations
 big_map diff
   
 trace
-  - location: 10 (remaining gas: 1039989.043 units remaining)
+  - location: 10 (remaining gas: 1039990.163 units remaining)
     [ (Pair (Pair 1 1) (Some "Foo")) ]
-  - location: 10 (remaining gas: 1039989.033 units remaining)
+  - location: 10 (remaining gas: 1039990.153 units remaining)
     [ (Pair 1 1)
       (Some "Foo") ]
-  - location: 11 (remaining gas: 1039989.023 units remaining)
+  - location: 11 (remaining gas: 1039990.143 units remaining)
     [ (Some "Foo")
       (Pair 1 1) ]
-  - location: 13 (remaining gas: 1039989.013 units remaining)
+  - location: 13 (remaining gas: 1039990.133 units remaining)
     [ "Foo"
       (Pair 1 1) ]
-  - location: 19 (remaining gas: 1039989.003 units remaining)
+  - location: 19 (remaining gas: 1039990.123 units remaining)
     [ (Pair 1 1)
       "Foo" ]
-  - location: 20 (remaining gas: 1039988.993 units remaining)
+  - location: 20 (remaining gas: 1039990.113 units remaining)
     [ 1
       1
       "Foo" ]
-  - location: 21 (remaining gas: 1039988.953 units remaining)
+  - location: 21 (remaining gas: 1039990.088 units remaining)
     [ (Some "o") ]
-  - location: 13 (remaining gas: 1039988.938 units remaining)
+  - location: 13 (remaining gas: 1039990.078 units remaining)
     [ (Some "o") ]
-  - location: 22 (remaining gas: 1039988.923 units remaining)
+  - location: 22 (remaining gas: 1039990.068 units remaining)
     [ {}
       (Some "o") ]
-  - location: 24 (remaining gas: 1039988.908 units remaining)
+  - location: 24 (remaining gas: 1039990.058 units remaining)
     [ (Pair {} (Some "o")) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 1 3-None].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 1 3-None].out"
index 5fedf911f0008999445d355aa35331a92582e33b..28b6a60219da286ab4bd7d74cfa2a8e3ec486c34 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 1 3-None].out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 1 3-None].out"	
@@ -7,31 +7,31 @@ emitted operations
 big_map diff
   
 trace
-  - location: 10 (remaining gas: 1039989.043 units remaining)
+  - location: 10 (remaining gas: 1039990.163 units remaining)
     [ (Pair (Pair 1 3) (Some "Foo")) ]
-  - location: 10 (remaining gas: 1039989.033 units remaining)
+  - location: 10 (remaining gas: 1039990.153 units remaining)
     [ (Pair 1 3)
       (Some "Foo") ]
-  - location: 11 (remaining gas: 1039989.023 units remaining)
+  - location: 11 (remaining gas: 1039990.143 units remaining)
     [ (Some "Foo")
       (Pair 1 3) ]
-  - location: 13 (remaining gas: 1039989.013 units remaining)
+  - location: 13 (remaining gas: 1039990.133 units remaining)
     [ "Foo"
       (Pair 1 3) ]
-  - location: 19 (remaining gas: 1039989.003 units remaining)
+  - location: 19 (remaining gas: 1039990.123 units remaining)
     [ (Pair 1 3)
       "Foo" ]
-  - location: 20 (remaining gas: 1039988.993 units remaining)
+  - location: 20 (remaining gas: 1039990.113 units remaining)
     [ 1
       3
       "Foo" ]
-  - location: 21 (remaining gas: 1039988.953 units remaining)
+  - location: 21 (remaining gas: 1039990.088 units remaining)
     [ None ]
-  - location: 13 (remaining gas: 1039988.938 units remaining)
+  - location: 13 (remaining gas: 1039990.078 units remaining)
     [ None ]
-  - location: 22 (remaining gas: 1039988.923 units remaining)
+  - location: 22 (remaining gas: 1039990.068 units remaining)
     [ {}
       None ]
-  - location: 24 (remaining gas: 1039988.908 units remaining)
+  - location: 24 (remaining gas: 1039990.058 units remaining)
     [ (Pair {} None) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 10 5-None].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 10 5-None].out"
index 42f566755141361eac62e98a991d66baf01813c0..dd3606d18b3acf263ece4ac98a863796d8a2f599 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 10 5-None].out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some \"Foo\"-Pair 10 5-None].out"	
@@ -7,31 +7,31 @@ emitted operations
 big_map diff
   
 trace
-  - location: 10 (remaining gas: 1039989.043 units remaining)
+  - location: 10 (remaining gas: 1039990.163 units remaining)
     [ (Pair (Pair 10 5) (Some "Foo")) ]
-  - location: 10 (remaining gas: 1039989.033 units remaining)
+  - location: 10 (remaining gas: 1039990.153 units remaining)
     [ (Pair 10 5)
       (Some "Foo") ]
-  - location: 11 (remaining gas: 1039989.023 units remaining)
+  - location: 11 (remaining gas: 1039990.143 units remaining)
     [ (Some "Foo")
       (Pair 10 5) ]
-  - location: 13 (remaining gas: 1039989.013 units remaining)
+  - location: 13 (remaining gas: 1039990.133 units remaining)
     [ "Foo"
       (Pair 10 5) ]
-  - location: 19 (remaining gas: 1039989.003 units remaining)
+  - location: 19 (remaining gas: 1039990.123 units remaining)
     [ (Pair 10 5)
       "Foo" ]
-  - location: 20 (remaining gas: 1039988.993 units remaining)
+  - location: 20 (remaining gas: 1039990.113 units remaining)
     [ 10
       5
       "Foo" ]
-  - location: 21 (remaining gas: 1039988.953 units remaining)
+  - location: 21 (remaining gas: 1039990.088 units remaining)
     [ None ]
-  - location: 13 (remaining gas: 1039988.938 units remaining)
+  - location: 13 (remaining gas: 1039990.078 units remaining)
     [ None ]
-  - location: 22 (remaining gas: 1039988.923 units remaining)
+  - location: 22 (remaining gas: 1039990.068 units remaining)
     [ {}
       None ]
-  - location: 24 (remaining gas: 1039988.908 units remaining)
+  - location: 24 (remaining gas: 1039990.058 units remaining)
     [ (Pair {} None) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some\"FooFooFooFooFooFooFooFooFooFooFooFooFooFo.c508d67bb0.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some\"FooFooFooFooFooFooFooFooFooFooFooFooFooFo.c508d67bb0.out"
index 212de830fbb0257f6965ff804e72a057b4757e1a..f9a79a1a16ba1ac26e834e0c14cf26584225c48c 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some\"FooFooFooFooFooFooFooFooFooFooFooFooFooFo.c508d67bb0.out"
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice.tz-Some\"FooFooFooFooFooFooFooFooFooFooFooFooFooFo.c508d67bb0.out"
@@ -7,32 +7,32 @@ emitted operations
 big_map diff
   
 trace
-  - location: 10 (remaining gas: 1039929.073 units remaining)
+  - location: 10 (remaining gas: 1039930.193 units remaining)
     [ (Pair (Pair 1 10000)
             (Some "FooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFoo")) ]
-  - location: 10 (remaining gas: 1039929.063 units remaining)
+  - location: 10 (remaining gas: 1039930.183 units remaining)
     [ (Pair 1 10000)
       (Some "FooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFoo") ]
-  - location: 11 (remaining gas: 1039929.053 units remaining)
+  - location: 11 (remaining gas: 1039930.173 units remaining)
     [ (Some "FooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFoo")
       (Pair 1 10000) ]
-  - location: 13 (remaining gas: 1039929.043 units remaining)
+  - location: 13 (remaining gas: 1039930.163 units remaining)
     [ "FooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFoo"
       (Pair 1 10000) ]
-  - location: 19 (remaining gas: 1039929.033 units remaining)
+  - location: 19 (remaining gas: 1039930.153 units remaining)
     [ (Pair 1 10000)
       "FooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFoo" ]
-  - location: 20 (remaining gas: 1039929.023 units remaining)
+  - location: 20 (remaining gas: 1039930.143 units remaining)
     [ 1
       10000
       "FooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFooFoo" ]
-  - location: 21 (remaining gas: 1039928.608 units remaining)
+  - location: 21 (remaining gas: 1039929.743 units remaining)
     [ None ]
-  - location: 13 (remaining gas: 1039928.593 units remaining)
+  - location: 13 (remaining gas: 1039929.733 units remaining)
     [ None ]
-  - location: 22 (remaining gas: 1039928.578 units remaining)
+  - location: 22 (remaining gas: 1039929.723 units remaining)
     [ {}
       None ]
-  - location: 24 (remaining gas: 1039928.563 units remaining)
+  - location: 24 (remaining gas: 1039929.713 units remaining)
     [ (Pair {} None) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-None-Pair 0 1-None].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-None-Pair 0 1-None].out
index 1a1f00f3fdf7bb892fd3c1e912de99f271f3aa9b..c4a3f24965f9033c3d934b227b731fd0d96a9c1b 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-None-Pair 0 1-None].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-None-Pair 0 1-None].out	
@@ -7,25 +7,25 @@ emitted operations
 big_map diff
   
 trace
-  - location: 10 (remaining gas: 1039989.187 units remaining)
+  - location: 10 (remaining gas: 1039990.307 units remaining)
     [ (Pair (Pair 0 1) None) ]
-  - location: 10 (remaining gas: 1039989.177 units remaining)
+  - location: 10 (remaining gas: 1039990.297 units remaining)
     [ (Pair 0 1)
       None ]
-  - location: 11 (remaining gas: 1039989.167 units remaining)
+  - location: 11 (remaining gas: 1039990.287 units remaining)
     [ None
       (Pair 0 1) ]
-  - location: 13 (remaining gas: 1039989.157 units remaining)
+  - location: 13 (remaining gas: 1039990.277 units remaining)
     [ (Pair 0 1) ]
-  - location: 15 (remaining gas: 1039989.147 units remaining)
+  - location: 15 (remaining gas: 1039990.267 units remaining)
     [  ]
-  - location: 16 (remaining gas: 1039989.132 units remaining)
+  - location: 16 (remaining gas: 1039990.257 units remaining)
     [ None ]
-  - location: 13 (remaining gas: 1039989.117 units remaining)
+  - location: 13 (remaining gas: 1039990.247 units remaining)
     [ None ]
-  - location: 22 (remaining gas: 1039989.102 units remaining)
+  - location: 22 (remaining gas: 1039990.237 units remaining)
     [ {}
       None ]
-  - location: 24 (remaining gas: 1039989.087 units remaining)
+  - location: 24 (remaining gas: 1039990.227 units remaining)
     [ (Pair {} None) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 0 0-(Some 0x)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 0 0-(Some 0x)].out
index 86d8be48f9513434ffe016a41c7294c5c444cd3a..6f85dce1a1734aa17938db838966aa6c0a5d145c 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 0 0-(Some 0x)].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 0 0-(Some 0x)].out	
@@ -7,31 +7,31 @@ emitted operations
 big_map diff
   
 trace
-  - location: 10 (remaining gas: 1039989.087 units remaining)
+  - location: 10 (remaining gas: 1039990.207 units remaining)
     [ (Pair (Pair 0 0) (Some 0xaabbcc)) ]
-  - location: 10 (remaining gas: 1039989.077 units remaining)
+  - location: 10 (remaining gas: 1039990.197 units remaining)
     [ (Pair 0 0)
       (Some 0xaabbcc) ]
-  - location: 11 (remaining gas: 1039989.067 units remaining)
+  - location: 11 (remaining gas: 1039990.187 units remaining)
     [ (Some 0xaabbcc)
       (Pair 0 0) ]
-  - location: 13 (remaining gas: 1039989.057 units remaining)
+  - location: 13 (remaining gas: 1039990.177 units remaining)
     [ 0xaabbcc
       (Pair 0 0) ]
-  - location: 19 (remaining gas: 1039989.047 units remaining)
+  - location: 19 (remaining gas: 1039990.167 units remaining)
     [ (Pair 0 0)
       0xaabbcc ]
-  - location: 20 (remaining gas: 1039989.037 units remaining)
+  - location: 20 (remaining gas: 1039990.157 units remaining)
     [ 0
       0
       0xaabbcc ]
-  - location: 21 (remaining gas: 1039988.997 units remaining)
+  - location: 21 (remaining gas: 1039990.132 units remaining)
     [ (Some 0x) ]
-  - location: 13 (remaining gas: 1039988.982 units remaining)
+  - location: 13 (remaining gas: 1039990.122 units remaining)
     [ (Some 0x) ]
-  - location: 22 (remaining gas: 1039988.967 units remaining)
+  - location: 22 (remaining gas: 1039990.112 units remaining)
     [ {}
       (Some 0x) ]
-  - location: 24 (remaining gas: 1039988.952 units remaining)
+  - location: 24 (remaining gas: 1039990.102 units remaining)
     [ (Pair {} (Some 0x)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 0 1-(Some 0xaa)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 0 1-(Some 0xaa)].out
index 3039b4f4bc7f815c931dca0193b20d67ec946c75..5da1fe12d1715f4f66e78f603c317f6066f5a5a6 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 0 1-(Some 0xaa)].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 0 1-(Some 0xaa)].out	
@@ -7,31 +7,31 @@ emitted operations
 big_map diff
   
 trace
-  - location: 10 (remaining gas: 1039989.087 units remaining)
+  - location: 10 (remaining gas: 1039990.207 units remaining)
     [ (Pair (Pair 0 1) (Some 0xaabbcc)) ]
-  - location: 10 (remaining gas: 1039989.077 units remaining)
+  - location: 10 (remaining gas: 1039990.197 units remaining)
     [ (Pair 0 1)
       (Some 0xaabbcc) ]
-  - location: 11 (remaining gas: 1039989.067 units remaining)
+  - location: 11 (remaining gas: 1039990.187 units remaining)
     [ (Some 0xaabbcc)
       (Pair 0 1) ]
-  - location: 13 (remaining gas: 1039989.057 units remaining)
+  - location: 13 (remaining gas: 1039990.177 units remaining)
     [ 0xaabbcc
       (Pair 0 1) ]
-  - location: 19 (remaining gas: 1039989.047 units remaining)
+  - location: 19 (remaining gas: 1039990.167 units remaining)
     [ (Pair 0 1)
       0xaabbcc ]
-  - location: 20 (remaining gas: 1039989.037 units remaining)
+  - location: 20 (remaining gas: 1039990.157 units remaining)
     [ 0
       1
       0xaabbcc ]
-  - location: 21 (remaining gas: 1039988.997 units remaining)
+  - location: 21 (remaining gas: 1039990.132 units remaining)
     [ (Some 0xaa) ]
-  - location: 13 (remaining gas: 1039988.982 units remaining)
+  - location: 13 (remaining gas: 1039990.122 units remaining)
     [ (Some 0xaa) ]
-  - location: 22 (remaining gas: 1039988.967 units remaining)
+  - location: 22 (remaining gas: 1039990.112 units remaining)
     [ {}
       (Some 0xaa) ]
-  - location: 24 (remaining gas: 1039988.952 units remaining)
+  - location: 24 (remaining gas: 1039990.102 units remaining)
     [ (Pair {} (Some 0xaa)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 1 1-(Some 0xbb)0].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 1 1-(Some 0xbb)0].out
index d2e9f1b61a7d4f85945a383fdc39c1a9e67661c3..c596b6eb507e729101f331349570755c482074fc 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 1 1-(Some 0xbb)0].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 1 1-(Some 0xbb)0].out	
@@ -7,31 +7,31 @@ emitted operations
 big_map diff
   
 trace
-  - location: 10 (remaining gas: 1039989.087 units remaining)
+  - location: 10 (remaining gas: 1039990.207 units remaining)
     [ (Pair (Pair 1 1) (Some 0xaabbcc)) ]
-  - location: 10 (remaining gas: 1039989.077 units remaining)
+  - location: 10 (remaining gas: 1039990.197 units remaining)
     [ (Pair 1 1)
       (Some 0xaabbcc) ]
-  - location: 11 (remaining gas: 1039989.067 units remaining)
+  - location: 11 (remaining gas: 1039990.187 units remaining)
     [ (Some 0xaabbcc)
       (Pair 1 1) ]
-  - location: 13 (remaining gas: 1039989.057 units remaining)
+  - location: 13 (remaining gas: 1039990.177 units remaining)
     [ 0xaabbcc
       (Pair 1 1) ]
-  - location: 19 (remaining gas: 1039989.047 units remaining)
+  - location: 19 (remaining gas: 1039990.167 units remaining)
     [ (Pair 1 1)
       0xaabbcc ]
-  - location: 20 (remaining gas: 1039989.037 units remaining)
+  - location: 20 (remaining gas: 1039990.157 units remaining)
     [ 1
       1
       0xaabbcc ]
-  - location: 21 (remaining gas: 1039988.997 units remaining)
+  - location: 21 (remaining gas: 1039990.132 units remaining)
     [ (Some 0xbb) ]
-  - location: 13 (remaining gas: 1039988.982 units remaining)
+  - location: 13 (remaining gas: 1039990.122 units remaining)
     [ (Some 0xbb) ]
-  - location: 22 (remaining gas: 1039988.967 units remaining)
+  - location: 22 (remaining gas: 1039990.112 units remaining)
     [ {}
       (Some 0xbb) ]
-  - location: 24 (remaining gas: 1039988.952 units remaining)
+  - location: 24 (remaining gas: 1039990.102 units remaining)
     [ (Pair {} (Some 0xbb)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 1 1-(Some 0xbb)1].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 1 1-(Some 0xbb)1].out
index 073076249b651034380b0a1e95bd756dbe0c48c8..120f0881f65a3601b2c5f18d37246e2fa2503575 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 1 1-(Some 0xbb)1].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 1 1-(Some 0xbb)1].out	
@@ -7,31 +7,31 @@ emitted operations
 big_map diff
   
 trace
-  - location: 10 (remaining gas: 1039989.087 units remaining)
+  - location: 10 (remaining gas: 1039990.207 units remaining)
     [ (Pair (Pair 1 1) (Some 0xaabbcc)) ]
-  - location: 10 (remaining gas: 1039989.077 units remaining)
+  - location: 10 (remaining gas: 1039990.197 units remaining)
     [ (Pair 1 1)
       (Some 0xaabbcc) ]
-  - location: 11 (remaining gas: 1039989.067 units remaining)
+  - location: 11 (remaining gas: 1039990.187 units remaining)
     [ (Some 0xaabbcc)
       (Pair 1 1) ]
-  - location: 13 (remaining gas: 1039989.057 units remaining)
+  - location: 13 (remaining gas: 1039990.177 units remaining)
     [ 0xaabbcc
       (Pair 1 1) ]
-  - location: 19 (remaining gas: 1039989.047 units remaining)
+  - location: 19 (remaining gas: 1039990.167 units remaining)
     [ (Pair 1 1)
       0xaabbcc ]
-  - location: 20 (remaining gas: 1039989.037 units remaining)
+  - location: 20 (remaining gas: 1039990.157 units remaining)
     [ 1
       1
       0xaabbcc ]
-  - location: 21 (remaining gas: 1039988.997 units remaining)
+  - location: 21 (remaining gas: 1039990.132 units remaining)
     [ (Some 0xbb) ]
-  - location: 13 (remaining gas: 1039988.982 units remaining)
+  - location: 13 (remaining gas: 1039990.122 units remaining)
     [ (Some 0xbb) ]
-  - location: 22 (remaining gas: 1039988.967 units remaining)
+  - location: 22 (remaining gas: 1039990.112 units remaining)
     [ {}
       (Some 0xbb) ]
-  - location: 24 (remaining gas: 1039988.952 units remaining)
+  - location: 24 (remaining gas: 1039990.102 units remaining)
     [ (Pair {} (Some 0xbb)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 1 2-(Some 0xbbcc)].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 1 2-(Some 0xbbcc)].out
index 633f5be93332551c99e029e15dadf39555463b09..57f5bbd526dec49879cd0dc9daa4d282275a8b02 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 1 2-(Some 0xbbcc)].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 1 2-(Some 0xbbcc)].out	
@@ -7,31 +7,31 @@ emitted operations
 big_map diff
   
 trace
-  - location: 10 (remaining gas: 1039989.087 units remaining)
+  - location: 10 (remaining gas: 1039990.207 units remaining)
     [ (Pair (Pair 1 2) (Some 0xaabbcc)) ]
-  - location: 10 (remaining gas: 1039989.077 units remaining)
+  - location: 10 (remaining gas: 1039990.197 units remaining)
     [ (Pair 1 2)
       (Some 0xaabbcc) ]
-  - location: 11 (remaining gas: 1039989.067 units remaining)
+  - location: 11 (remaining gas: 1039990.187 units remaining)
     [ (Some 0xaabbcc)
       (Pair 1 2) ]
-  - location: 13 (remaining gas: 1039989.057 units remaining)
+  - location: 13 (remaining gas: 1039990.177 units remaining)
     [ 0xaabbcc
       (Pair 1 2) ]
-  - location: 19 (remaining gas: 1039989.047 units remaining)
+  - location: 19 (remaining gas: 1039990.167 units remaining)
     [ (Pair 1 2)
       0xaabbcc ]
-  - location: 20 (remaining gas: 1039989.037 units remaining)
+  - location: 20 (remaining gas: 1039990.157 units remaining)
     [ 1
       2
       0xaabbcc ]
-  - location: 21 (remaining gas: 1039988.997 units remaining)
+  - location: 21 (remaining gas: 1039990.132 units remaining)
     [ (Some 0xbbcc) ]
-  - location: 13 (remaining gas: 1039988.982 units remaining)
+  - location: 13 (remaining gas: 1039990.122 units remaining)
     [ (Some 0xbbcc) ]
-  - location: 22 (remaining gas: 1039988.967 units remaining)
+  - location: 22 (remaining gas: 1039990.112 units remaining)
     [ {}
       (Some 0xbbcc) ]
-  - location: 24 (remaining gas: 1039988.952 units remaining)
+  - location: 24 (remaining gas: 1039990.102 units remaining)
     [ (Pair {} (Some 0xbbcc)) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 1 3-None].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 1 3-None].out
index 85ba2f15559f0cb2bc7548897f958ab2681c0053..6b822b5b7e583ba6245b3a121b2d1f559ecef835 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 1 3-None].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbcc-Pair 1 3-None].out	
@@ -7,31 +7,31 @@ emitted operations
 big_map diff
   
 trace
-  - location: 10 (remaining gas: 1039989.087 units remaining)
+  - location: 10 (remaining gas: 1039990.207 units remaining)
     [ (Pair (Pair 1 3) (Some 0xaabbcc)) ]
-  - location: 10 (remaining gas: 1039989.077 units remaining)
+  - location: 10 (remaining gas: 1039990.197 units remaining)
     [ (Pair 1 3)
       (Some 0xaabbcc) ]
-  - location: 11 (remaining gas: 1039989.067 units remaining)
+  - location: 11 (remaining gas: 1039990.187 units remaining)
     [ (Some 0xaabbcc)
       (Pair 1 3) ]
-  - location: 13 (remaining gas: 1039989.057 units remaining)
+  - location: 13 (remaining gas: 1039990.177 units remaining)
     [ 0xaabbcc
       (Pair 1 3) ]
-  - location: 19 (remaining gas: 1039989.047 units remaining)
+  - location: 19 (remaining gas: 1039990.167 units remaining)
     [ (Pair 1 3)
       0xaabbcc ]
-  - location: 20 (remaining gas: 1039989.037 units remaining)
+  - location: 20 (remaining gas: 1039990.157 units remaining)
     [ 1
       3
       0xaabbcc ]
-  - location: 21 (remaining gas: 1039988.997 units remaining)
+  - location: 21 (remaining gas: 1039990.132 units remaining)
     [ None ]
-  - location: 13 (remaining gas: 1039988.982 units remaining)
+  - location: 13 (remaining gas: 1039990.122 units remaining)
     [ None ]
-  - location: 22 (remaining gas: 1039988.967 units remaining)
+  - location: 22 (remaining gas: 1039990.112 units remaining)
     [ {}
       None ]
-  - location: 24 (remaining gas: 1039988.952 units remaining)
+  - location: 24 (remaining gas: 1039990.102 units remaining)
     [ (Pair {} None) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbccaabbccaabbccaabbccaabbccaab.df5895de85.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbccaabbccaabbccaabbccaabbccaab.df5895de85.out
index 38e9efd1809d2b431a248be2e747fb59af61a79c..455023dc4c5a107d86ee6f22e2f067730efccf41 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbccaabbccaabbccaabbccaabbccaab.df5895de85.out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[slice_bytes.tz-Some 0xaabbccaabbccaabbccaabbccaabbccaab.df5895de85.out	
@@ -7,32 +7,32 @@ emitted operations
 big_map diff
   
 trace
-  - location: 10 (remaining gas: 1039989.087 units remaining)
+  - location: 10 (remaining gas: 1039990.207 units remaining)
     [ (Pair (Pair 1 10000)
             (Some 0xaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbcc)) ]
-  - location: 10 (remaining gas: 1039989.077 units remaining)
+  - location: 10 (remaining gas: 1039990.197 units remaining)
     [ (Pair 1 10000)
       (Some 0xaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbcc) ]
-  - location: 11 (remaining gas: 1039989.067 units remaining)
+  - location: 11 (remaining gas: 1039990.187 units remaining)
     [ (Some 0xaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbcc)
       (Pair 1 10000) ]
-  - location: 13 (remaining gas: 1039989.057 units remaining)
+  - location: 13 (remaining gas: 1039990.177 units remaining)
     [ 0xaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbcc
       (Pair 1 10000) ]
-  - location: 19 (remaining gas: 1039989.047 units remaining)
+  - location: 19 (remaining gas: 1039990.167 units remaining)
     [ (Pair 1 10000)
       0xaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbcc ]
-  - location: 20 (remaining gas: 1039989.037 units remaining)
+  - location: 20 (remaining gas: 1039990.157 units remaining)
     [ 1
       10000
       0xaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbccaabbcc ]
-  - location: 21 (remaining gas: 1039988.622 units remaining)
+  - location: 21 (remaining gas: 1039989.757 units remaining)
     [ None ]
-  - location: 13 (remaining gas: 1039988.607 units remaining)
+  - location: 13 (remaining gas: 1039989.747 units remaining)
     [ None ]
-  - location: 22 (remaining gas: 1039988.592 units remaining)
+  - location: 22 (remaining gas: 1039989.737 units remaining)
     [ {}
       None ]
-  - location: 24 (remaining gas: 1039988.577 units remaining)
+  - location: 24 (remaining gas: 1039989.727 units remaining)
     [ (Pair {} None) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[str_id.tz-None-\"Hello\"-(Some \"Hello\")].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[str_id.tz-None-\"Hello\"-(Some \"Hello\")].out"
index 292f6abd502e9e6bbd7e34841f54b085b091160d..9392fa5f2d9af25b7a7793b1d2b3aeb9773cc775 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[str_id.tz-None-\"Hello\"-(Some \"Hello\")].out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[str_id.tz-None-\"Hello\"-(Some \"Hello\")].out"	
@@ -7,15 +7,15 @@ emitted operations
 big_map diff
   
 trace
-  - location: 8 (remaining gas: 1039994.456 units remaining)
+  - location: 8 (remaining gas: 1039995.256 units remaining)
     [ (Pair "Hello" None) ]
-  - location: 8 (remaining gas: 1039994.446 units remaining)
+  - location: 8 (remaining gas: 1039995.246 units remaining)
     [ "Hello" ]
-  - location: 9 (remaining gas: 1039994.431 units remaining)
+  - location: 9 (remaining gas: 1039995.236 units remaining)
     [ (Some "Hello") ]
-  - location: 10 (remaining gas: 1039994.416 units remaining)
+  - location: 10 (remaining gas: 1039995.226 units remaining)
     [ {}
       (Some "Hello") ]
-  - location: 12 (remaining gas: 1039994.401 units remaining)
+  - location: 12 (remaining gas: 1039995.216 units remaining)
     [ (Pair {} (Some "Hello")) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[str_id.tz-None-\"abcd\"-(Some \"abcd\")].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[str_id.tz-None-\"abcd\"-(Some \"abcd\")].out"
index 1b3003f262a78dee9a8ff91e6dcaf409e0042844..563fccd94db945e3d04de2d418d52fab81bf7020 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[str_id.tz-None-\"abcd\"-(Some \"abcd\")].out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[str_id.tz-None-\"abcd\"-(Some \"abcd\")].out"	
@@ -7,15 +7,15 @@ emitted operations
 big_map diff
   
 trace
-  - location: 8 (remaining gas: 1039994.466 units remaining)
+  - location: 8 (remaining gas: 1039995.266 units remaining)
     [ (Pair "abcd" None) ]
-  - location: 8 (remaining gas: 1039994.456 units remaining)
+  - location: 8 (remaining gas: 1039995.256 units remaining)
     [ "abcd" ]
-  - location: 9 (remaining gas: 1039994.441 units remaining)
+  - location: 9 (remaining gas: 1039995.246 units remaining)
     [ (Some "abcd") ]
-  - location: 10 (remaining gas: 1039994.426 units remaining)
+  - location: 10 (remaining gas: 1039995.236 units remaining)
     [ {}
       (Some "abcd") ]
-  - location: 12 (remaining gas: 1039994.411 units remaining)
+  - location: 12 (remaining gas: 1039995.226 units remaining)
     [ (Pair {} (Some "abcd")) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sub_timestamp_delta.tz-111-(Pair 100 -100)-\"1970-01-01T00:03:20Z\"].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sub_timestamp_delta.tz-111-(Pair 100 -100)-\"1970-01-01T00:03:20Z\"].out"
index 2f5bb7e4657ef925b5994741bfbb556f91e39413..0c319de51a7390bebd2c7d4cba30cc84e40b4d55 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sub_timestamp_delta.tz-111-(Pair 100 -100)-\"1970-01-01T00:03:20Z\"].out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sub_timestamp_delta.tz-111-(Pair 100 -100)-\"1970-01-01T00:03:20Z\"].out"	
@@ -7,28 +7,28 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (remaining gas: 1039991.518 units remaining)
+  - location: 9 (remaining gas: 1039992.158 units remaining)
     [ (Pair (Pair "1970-01-01T00:01:40Z" -100) "1970-01-01T00:01:51Z") ]
-  - location: 9 (remaining gas: 1039991.508 units remaining)
+  - location: 9 (remaining gas: 1039992.148 units remaining)
     [ (Pair "1970-01-01T00:01:40Z" -100) ]
-  - location: 10 (remaining gas: 1039991.498 units remaining)
+  - location: 10 (remaining gas: 1039992.138 units remaining)
     [ (Pair "1970-01-01T00:01:40Z" -100)
       (Pair "1970-01-01T00:01:40Z" -100) ]
-  - location: 11 (remaining gas: 1039991.488 units remaining)
+  - location: 11 (remaining gas: 1039992.128 units remaining)
     [ "1970-01-01T00:01:40Z"
       (Pair "1970-01-01T00:01:40Z" -100) ]
-  - location: 12 (remaining gas: 1039991.473 units remaining)
+  - location: 12 (remaining gas: 1039992.118 units remaining)
     [ (Pair "1970-01-01T00:01:40Z" -100) ]
-  - location: 14 (remaining gas: 1039991.463 units remaining)
+  - location: 14 (remaining gas: 1039992.108 units remaining)
     [ -100 ]
-  - location: 12 (remaining gas: 1039991.433 units remaining)
+  - location: 12 (remaining gas: 1039992.088 units remaining)
     [ "1970-01-01T00:01:40Z"
       -100 ]
-  - location: 15 (remaining gas: 1039991.378 units remaining)
+  - location: 15 (remaining gas: 1039992.053 units remaining)
     [ "1970-01-01T00:03:20Z" ]
-  - location: 16 (remaining gas: 1039991.363 units remaining)
+  - location: 16 (remaining gas: 1039992.043 units remaining)
     [ {}
       "1970-01-01T00:03:20Z" ]
-  - location: 18 (remaining gas: 1039991.348 units remaining)
+  - location: 18 (remaining gas: 1039992.033 units remaining)
     [ (Pair {} "1970-01-01T00:03:20Z") ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sub_timestamp_delta.tz-111-(Pair 100 100)-\"1970-01-01T00:00:00Z\"].out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sub_timestamp_delta.tz-111-(Pair 100 100)-\"1970-01-01T00:00:00Z\"].out"
index 294fb0a0425478f9c18ae7898945a178793a05a6..55f1bbbd72dd4c4e69b69eba1fac8244615724b1 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sub_timestamp_delta.tz-111-(Pair 100 100)-\"1970-01-01T00:00:00Z\"].out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sub_timestamp_delta.tz-111-(Pair 100 100)-\"1970-01-01T00:00:00Z\"].out"	
@@ -7,28 +7,28 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (remaining gas: 1039991.518 units remaining)
+  - location: 9 (remaining gas: 1039992.158 units remaining)
     [ (Pair (Pair "1970-01-01T00:01:40Z" 100) "1970-01-01T00:01:51Z") ]
-  - location: 9 (remaining gas: 1039991.508 units remaining)
+  - location: 9 (remaining gas: 1039992.148 units remaining)
     [ (Pair "1970-01-01T00:01:40Z" 100) ]
-  - location: 10 (remaining gas: 1039991.498 units remaining)
+  - location: 10 (remaining gas: 1039992.138 units remaining)
     [ (Pair "1970-01-01T00:01:40Z" 100)
       (Pair "1970-01-01T00:01:40Z" 100) ]
-  - location: 11 (remaining gas: 1039991.488 units remaining)
+  - location: 11 (remaining gas: 1039992.128 units remaining)
     [ "1970-01-01T00:01:40Z"
       (Pair "1970-01-01T00:01:40Z" 100) ]
-  - location: 12 (remaining gas: 1039991.473 units remaining)
+  - location: 12 (remaining gas: 1039992.118 units remaining)
     [ (Pair "1970-01-01T00:01:40Z" 100) ]
-  - location: 14 (remaining gas: 1039991.463 units remaining)
+  - location: 14 (remaining gas: 1039992.108 units remaining)
     [ 100 ]
-  - location: 12 (remaining gas: 1039991.433 units remaining)
+  - location: 12 (remaining gas: 1039992.088 units remaining)
     [ "1970-01-01T00:01:40Z"
       100 ]
-  - location: 15 (remaining gas: 1039991.378 units remaining)
+  - location: 15 (remaining gas: 1039992.053 units remaining)
     [ "1970-01-01T00:00:00Z" ]
-  - location: 16 (remaining gas: 1039991.363 units remaining)
+  - location: 16 (remaining gas: 1039992.043 units remaining)
     [ {}
       "1970-01-01T00:00:00Z" ]
-  - location: 18 (remaining gas: 1039991.348 units remaining)
+  - location: 18 (remaining gas: 1039992.033 units remaining)
     [ (Pair {} "1970-01-01T00:00:00Z") ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sub_timestamp_delta.tz-111-(Pair 100 200000000000000000.3db82d2c25.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sub_timestamp_delta.tz-111-(Pair 100 200000000000000000.3db82d2c25.out
index 08ab30c7399ae13bd2d49e7c2876c5e8da3eda5d..10c9576da7a5dfe46882b7b3b7eec5a374aa66e0 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sub_timestamp_delta.tz-111-(Pair 100 200000000000000000.3db82d2c25.out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[sub_timestamp_delta.tz-111-(Pair 100 200000000000000000.3db82d2c25.out	
@@ -7,28 +7,28 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (remaining gas: 1039991.518 units remaining)
+  - location: 9 (remaining gas: 1039992.158 units remaining)
     [ (Pair (Pair "1970-01-01T00:01:40Z" 2000000000000000000) "1970-01-01T00:01:51Z") ]
-  - location: 9 (remaining gas: 1039991.508 units remaining)
+  - location: 9 (remaining gas: 1039992.148 units remaining)
     [ (Pair "1970-01-01T00:01:40Z" 2000000000000000000) ]
-  - location: 10 (remaining gas: 1039991.498 units remaining)
+  - location: 10 (remaining gas: 1039992.138 units remaining)
     [ (Pair "1970-01-01T00:01:40Z" 2000000000000000000)
       (Pair "1970-01-01T00:01:40Z" 2000000000000000000) ]
-  - location: 11 (remaining gas: 1039991.488 units remaining)
+  - location: 11 (remaining gas: 1039992.128 units remaining)
     [ "1970-01-01T00:01:40Z"
       (Pair "1970-01-01T00:01:40Z" 2000000000000000000) ]
-  - location: 12 (remaining gas: 1039991.473 units remaining)
+  - location: 12 (remaining gas: 1039992.118 units remaining)
     [ (Pair "1970-01-01T00:01:40Z" 2000000000000000000) ]
-  - location: 14 (remaining gas: 1039991.463 units remaining)
+  - location: 14 (remaining gas: 1039992.108 units remaining)
     [ 2000000000000000000 ]
-  - location: 12 (remaining gas: 1039991.433 units remaining)
+  - location: 12 (remaining gas: 1039992.088 units remaining)
     [ "1970-01-01T00:01:40Z"
       2000000000000000000 ]
-  - location: 15 (remaining gas: 1039991.378 units remaining)
+  - location: 15 (remaining gas: 1039992.053 units remaining)
     [ -1999999999999999900 ]
-  - location: 16 (remaining gas: 1039991.363 units remaining)
+  - location: 16 (remaining gas: 1039992.043 units remaining)
     [ {}
       -1999999999999999900 ]
-  - location: 18 (remaining gas: 1039991.348 units remaining)
+  - location: 18 (remaining gas: 1039992.033 units remaining)
     [ (Pair {} -1999999999999999900) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[tez_add_sub.tz-None-(Pair 2000000 1000000)-(Some (Pair .b461aa042b.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[tez_add_sub.tz-None-(Pair 2000000 1000000)-(Some (Pair .b461aa042b.out
index 3a7f4b6efb51fc39169fe1b4818ccb06caca1cf9..e53d8e3e912369efa20c164f284b4d4fb196d8bd 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[tez_add_sub.tz-None-(Pair 2000000 1000000)-(Some (Pair .b461aa042b.out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[tez_add_sub.tz-None-(Pair 2000000 1000000)-(Some (Pair .b461aa042b.out	
@@ -7,65 +7,65 @@ emitted operations
 big_map diff
   
 trace
-  - location: 12 (remaining gas: 1039980.850 units remaining)
+  - location: 12 (remaining gas: 1039981.970 units remaining)
     [ (Pair (Pair 2000000 1000000) None) ]
-  - location: 12 (remaining gas: 1039980.840 units remaining)
+  - location: 12 (remaining gas: 1039981.960 units remaining)
     [ (Pair 2000000 1000000) ]
-  - location: 13 (remaining gas: 1039980.830 units remaining)
+  - location: 13 (remaining gas: 1039981.950 units remaining)
     [ (Pair 2000000 1000000)
       (Pair 2000000 1000000) ]
-  - location: 14 (remaining gas: 1039980.820 units remaining)
+  - location: 14 (remaining gas: 1039981.940 units remaining)
     [ (Pair 2000000 1000000)
       (Pair 2000000 1000000)
       (Pair 2000000 1000000) ]
-  - location: 15 (remaining gas: 1039980.810 units remaining)
+  - location: 15 (remaining gas: 1039981.930 units remaining)
     [ 2000000
       (Pair 2000000 1000000)
       (Pair 2000000 1000000) ]
-  - location: 16 (remaining gas: 1039980.795 units remaining)
+  - location: 16 (remaining gas: 1039981.920 units remaining)
     [ (Pair 2000000 1000000)
       (Pair 2000000 1000000) ]
-  - location: 18 (remaining gas: 1039980.785 units remaining)
+  - location: 18 (remaining gas: 1039981.910 units remaining)
     [ 1000000
       (Pair 2000000 1000000) ]
-  - location: 16 (remaining gas: 1039980.755 units remaining)
+  - location: 16 (remaining gas: 1039981.890 units remaining)
     [ 2000000
       1000000
       (Pair 2000000 1000000) ]
-  - location: 19 (remaining gas: 1039980.735 units remaining)
+  - location: 19 (remaining gas: 1039981.870 units remaining)
     [ 3000000
       (Pair 2000000 1000000) ]
-  - location: 20 (remaining gas: 1039980.720 units remaining)
+  - location: 20 (remaining gas: 1039981.860 units remaining)
     [ (Pair 2000000 1000000) ]
-  - location: 22 (remaining gas: 1039980.710 units remaining)
+  - location: 22 (remaining gas: 1039981.850 units remaining)
     [ (Pair 2000000 1000000)
       (Pair 2000000 1000000) ]
-  - location: 23 (remaining gas: 1039980.700 units remaining)
+  - location: 23 (remaining gas: 1039981.840 units remaining)
     [ 2000000
       (Pair 2000000 1000000) ]
-  - location: 24 (remaining gas: 1039980.685 units remaining)
+  - location: 24 (remaining gas: 1039981.830 units remaining)
     [ (Pair 2000000 1000000) ]
-  - location: 26 (remaining gas: 1039980.675 units remaining)
+  - location: 26 (remaining gas: 1039981.820 units remaining)
     [ 1000000 ]
-  - location: 24 (remaining gas: 1039980.645 units remaining)
+  - location: 24 (remaining gas: 1039981.800 units remaining)
     [ 2000000
       1000000 ]
-  - location: 27 (remaining gas: 1039980.625 units remaining)
+  - location: 27 (remaining gas: 1039981.785 units remaining)
     [ (Some 1000000) ]
-  - location: 29 (remaining gas: 1039980.615 units remaining)
+  - location: 29 (remaining gas: 1039981.775 units remaining)
     [ 1000000 ]
-  - location: 29 (remaining gas: 1039980.600 units remaining)
+  - location: 29 (remaining gas: 1039981.765 units remaining)
     [ 1000000 ]
-  - location: 20 (remaining gas: 1039980.570 units remaining)
+  - location: 20 (remaining gas: 1039981.745 units remaining)
     [ 3000000
       1000000 ]
-  - location: 35 (remaining gas: 1039980.555 units remaining)
+  - location: 35 (remaining gas: 1039981.735 units remaining)
     [ (Pair 3000000 1000000) ]
-  - location: 36 (remaining gas: 1039980.540 units remaining)
+  - location: 36 (remaining gas: 1039981.725 units remaining)
     [ (Some (Pair 3000000 1000000)) ]
-  - location: 37 (remaining gas: 1039980.525 units remaining)
+  - location: 37 (remaining gas: 1039981.715 units remaining)
     [ {}
       (Some (Pair 3000000 1000000)) ]
-  - location: 39 (remaining gas: 1039980.510 units remaining)
+  - location: 39 (remaining gas: 1039981.705 units remaining)
     [ (Pair {} (Some (Pair 3000000 1000000))) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[tez_add_sub.tz-None-(Pair 2310000 1010000)-(Some (Pair .1e8cf7679c.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[tez_add_sub.tz-None-(Pair 2310000 1010000)-(Some (Pair .1e8cf7679c.out
index 72eab80d558c96c0d5f7d6cfa6c40f200984d01f..e56f950b5b50af86560a4ea364cc726d5530c58d 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[tez_add_sub.tz-None-(Pair 2310000 1010000)-(Some (Pair .1e8cf7679c.out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[tez_add_sub.tz-None-(Pair 2310000 1010000)-(Some (Pair .1e8cf7679c.out	
@@ -7,65 +7,65 @@ emitted operations
 big_map diff
   
 trace
-  - location: 12 (remaining gas: 1039980.850 units remaining)
+  - location: 12 (remaining gas: 1039981.970 units remaining)
     [ (Pair (Pair 2310000 1010000) None) ]
-  - location: 12 (remaining gas: 1039980.840 units remaining)
+  - location: 12 (remaining gas: 1039981.960 units remaining)
     [ (Pair 2310000 1010000) ]
-  - location: 13 (remaining gas: 1039980.830 units remaining)
+  - location: 13 (remaining gas: 1039981.950 units remaining)
     [ (Pair 2310000 1010000)
       (Pair 2310000 1010000) ]
-  - location: 14 (remaining gas: 1039980.820 units remaining)
+  - location: 14 (remaining gas: 1039981.940 units remaining)
     [ (Pair 2310000 1010000)
       (Pair 2310000 1010000)
       (Pair 2310000 1010000) ]
-  - location: 15 (remaining gas: 1039980.810 units remaining)
+  - location: 15 (remaining gas: 1039981.930 units remaining)
     [ 2310000
       (Pair 2310000 1010000)
       (Pair 2310000 1010000) ]
-  - location: 16 (remaining gas: 1039980.795 units remaining)
+  - location: 16 (remaining gas: 1039981.920 units remaining)
     [ (Pair 2310000 1010000)
       (Pair 2310000 1010000) ]
-  - location: 18 (remaining gas: 1039980.785 units remaining)
+  - location: 18 (remaining gas: 1039981.910 units remaining)
     [ 1010000
       (Pair 2310000 1010000) ]
-  - location: 16 (remaining gas: 1039980.755 units remaining)
+  - location: 16 (remaining gas: 1039981.890 units remaining)
     [ 2310000
       1010000
       (Pair 2310000 1010000) ]
-  - location: 19 (remaining gas: 1039980.735 units remaining)
+  - location: 19 (remaining gas: 1039981.870 units remaining)
     [ 3320000
       (Pair 2310000 1010000) ]
-  - location: 20 (remaining gas: 1039980.720 units remaining)
+  - location: 20 (remaining gas: 1039981.860 units remaining)
     [ (Pair 2310000 1010000) ]
-  - location: 22 (remaining gas: 1039980.710 units remaining)
+  - location: 22 (remaining gas: 1039981.850 units remaining)
     [ (Pair 2310000 1010000)
       (Pair 2310000 1010000) ]
-  - location: 23 (remaining gas: 1039980.700 units remaining)
+  - location: 23 (remaining gas: 1039981.840 units remaining)
     [ 2310000
       (Pair 2310000 1010000) ]
-  - location: 24 (remaining gas: 1039980.685 units remaining)
+  - location: 24 (remaining gas: 1039981.830 units remaining)
     [ (Pair 2310000 1010000) ]
-  - location: 26 (remaining gas: 1039980.675 units remaining)
+  - location: 26 (remaining gas: 1039981.820 units remaining)
     [ 1010000 ]
-  - location: 24 (remaining gas: 1039980.645 units remaining)
+  - location: 24 (remaining gas: 1039981.800 units remaining)
     [ 2310000
       1010000 ]
-  - location: 27 (remaining gas: 1039980.625 units remaining)
+  - location: 27 (remaining gas: 1039981.785 units remaining)
     [ (Some 1300000) ]
-  - location: 29 (remaining gas: 1039980.615 units remaining)
+  - location: 29 (remaining gas: 1039981.775 units remaining)
     [ 1300000 ]
-  - location: 29 (remaining gas: 1039980.600 units remaining)
+  - location: 29 (remaining gas: 1039981.765 units remaining)
     [ 1300000 ]
-  - location: 20 (remaining gas: 1039980.570 units remaining)
+  - location: 20 (remaining gas: 1039981.745 units remaining)
     [ 3320000
       1300000 ]
-  - location: 35 (remaining gas: 1039980.555 units remaining)
+  - location: 35 (remaining gas: 1039981.735 units remaining)
     [ (Pair 3320000 1300000) ]
-  - location: 36 (remaining gas: 1039980.540 units remaining)
+  - location: 36 (remaining gas: 1039981.725 units remaining)
     [ (Some (Pair 3320000 1300000)) ]
-  - location: 37 (remaining gas: 1039980.525 units remaining)
+  - location: 37 (remaining gas: 1039981.715 units remaining)
     [ {}
       (Some (Pair 3320000 1300000)) ]
-  - location: 39 (remaining gas: 1039980.510 units remaining)
+  - location: 39 (remaining gas: 1039981.705 units remaining)
     [ (Pair {} (Some (Pair 3320000 1300000))) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[uncomb.tz-0-(Pair 1 4 2)-142].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[uncomb.tz-0-(Pair 1 4 2)-142].out
index 8cdabbee9cfd0af3a6219123844ad5cc503ddf60..1694cb96743a7dcfb92cd81f3701d851e417bc8f 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[uncomb.tz-0-(Pair 1 4 2)-142].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[uncomb.tz-0-(Pair 1 4 2)-142].out	
@@ -7,44 +7,44 @@ emitted operations
 big_map diff
   
 trace
-  - location: 10 (remaining gas: 1039988.811 units remaining)
+  - location: 10 (remaining gas: 1039989.451 units remaining)
     [ (Pair (Pair 1 4 2) 0) ]
-  - location: 10 (remaining gas: 1039988.801 units remaining)
+  - location: 10 (remaining gas: 1039989.441 units remaining)
     [ (Pair 1 4 2) ]
-  - location: 11 (remaining gas: 1039988.764 units remaining)
+  - location: 11 (remaining gas: 1039989.404 units remaining)
     [ 1
       4
       2 ]
-  - location: 13 (remaining gas: 1039988.754 units remaining)
+  - location: 13 (remaining gas: 1039989.394 units remaining)
     [ 100
       1
       4
       2 ]
-  - location: 16 (remaining gas: 1039988.650 units remaining)
+  - location: 16 (remaining gas: 1039989.335 units remaining)
     [ 100
       4
       2 ]
-  - location: 17 (remaining gas: 1039988.640 units remaining)
+  - location: 17 (remaining gas: 1039989.325 units remaining)
     [ 4
       100
       2 ]
-  - location: 18 (remaining gas: 1039988.630 units remaining)
+  - location: 18 (remaining gas: 1039989.315 units remaining)
     [ 10
       4
       100
       2 ]
-  - location: 21 (remaining gas: 1039988.526 units remaining)
+  - location: 21 (remaining gas: 1039989.256 units remaining)
     [ 40
       100
       2 ]
-  - location: 22 (remaining gas: 1039988.471 units remaining)
+  - location: 22 (remaining gas: 1039989.221 units remaining)
     [ 140
       2 ]
-  - location: 23 (remaining gas: 1039988.416 units remaining)
+  - location: 23 (remaining gas: 1039989.186 units remaining)
     [ 142 ]
-  - location: 24 (remaining gas: 1039988.401 units remaining)
+  - location: 24 (remaining gas: 1039989.176 units remaining)
     [ {}
       142 ]
-  - location: 26 (remaining gas: 1039988.386 units remaining)
+  - location: 26 (remaining gas: 1039989.166 units remaining)
     [ (Pair {} 142) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[unpair.tz-Unit-Unit-Unit].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[unpair.tz-Unit-Unit-Unit].out
index ea4954b2e765d2fa7d94b82b36468669ae5e2482..cd538ac185a43c205055b69d8214b98adf07bc91 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[unpair.tz-Unit-Unit-Unit].out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[unpair.tz-Unit-Unit-Unit].out
@@ -7,456 +7,456 @@ emitted operations
 big_map diff
   
 trace
-  - location: 7 (remaining gas: 1039873.054 units remaining)
+  - location: 7 (remaining gas: 1039873.694 units remaining)
     [ (Pair Unit Unit) ]
-  - location: 7 (remaining gas: 1039873.044 units remaining)
+  - location: 7 (remaining gas: 1039873.684 units remaining)
     [  ]
-  - location: 8 (remaining gas: 1039873.034 units remaining)
+  - location: 8 (remaining gas: 1039873.674 units remaining)
     [ Unit ]
-  - location: 9 (remaining gas: 1039873.024 units remaining)
+  - location: 9 (remaining gas: 1039873.664 units remaining)
     [ Unit
       Unit ]
-  - location: 10 (remaining gas: 1039873.009 units remaining)
+  - location: 10 (remaining gas: 1039873.654 units remaining)
     [ (Pair Unit Unit) ]
-  - location: 11 (remaining gas: 1039872.999 units remaining)
+  - location: 11 (remaining gas: 1039873.644 units remaining)
     [ Unit
       Unit ]
-  - location: 12 (remaining gas: 1039872.934 units remaining)
+  - location: 12 (remaining gas: 1039873.609 units remaining)
     [  ]
-  - location: 14 (remaining gas: 1039872.924 units remaining)
+  - location: 14 (remaining gas: 1039873.599 units remaining)
     [ Unit ]
-  - location: 15 (remaining gas: 1039872.914 units remaining)
+  - location: 15 (remaining gas: 1039873.589 units remaining)
     [ Unit
       Unit ]
-  - location: 16 (remaining gas: 1039872.899 units remaining)
+  - location: 16 (remaining gas: 1039873.579 units remaining)
     [ (Pair Unit Unit) ]
-  - location: 17 (remaining gas: 1039872.889 units remaining)
+  - location: 17 (remaining gas: 1039873.569 units remaining)
     [ Unit
       Unit ]
-  - location: 18 (remaining gas: 1039872.824 units remaining)
+  - location: 18 (remaining gas: 1039873.534 units remaining)
     [  ]
-  - location: 20 (remaining gas: 1039872.814 units remaining)
+  - location: 20 (remaining gas: 1039873.524 units remaining)
     [ Unit ]
-  - location: 21 (remaining gas: 1039872.804 units remaining)
+  - location: 21 (remaining gas: 1039873.514 units remaining)
     [ Unit
       Unit ]
-  - location: 22 (remaining gas: 1039872.789 units remaining)
+  - location: 22 (remaining gas: 1039873.504 units remaining)
     [ (Pair Unit Unit) ]
-  - location: 23 (remaining gas: 1039872.779 units remaining)
+  - location: 23 (remaining gas: 1039873.494 units remaining)
     [ (Pair Unit Unit)
       (Pair Unit Unit) ]
-  - location: 24 (remaining gas: 1039872.769 units remaining)
+  - location: 24 (remaining gas: 1039873.484 units remaining)
     [ Unit
       Unit
       (Pair Unit Unit) ]
-  - location: 25 (remaining gas: 1039872.704 units remaining)
+  - location: 25 (remaining gas: 1039873.449 units remaining)
     [ (Pair Unit Unit) ]
-  - location: 27 (remaining gas: 1039872.694 units remaining)
+  - location: 27 (remaining gas: 1039873.439 units remaining)
     [ (Pair Unit Unit)
       (Pair Unit Unit) ]
-  - location: 28 (remaining gas: 1039872.684 units remaining)
+  - location: 28 (remaining gas: 1039873.429 units remaining)
     [ Unit
       Unit
       (Pair Unit Unit) ]
-  - location: 29 (remaining gas: 1039872.619 units remaining)
+  - location: 29 (remaining gas: 1039873.394 units remaining)
     [ (Pair Unit Unit) ]
-  - location: 31 (remaining gas: 1039872.609 units remaining)
+  - location: 31 (remaining gas: 1039873.384 units remaining)
     [ (Pair Unit Unit)
       (Pair Unit Unit) ]
-  - location: 32 (remaining gas: 1039872.599 units remaining)
+  - location: 32 (remaining gas: 1039873.374 units remaining)
     [ Unit
       Unit
       (Pair Unit Unit) ]
-  - location: 33 (remaining gas: 1039872.534 units remaining)
+  - location: 33 (remaining gas: 1039873.339 units remaining)
     [ (Pair Unit Unit) ]
-  - location: 35 (remaining gas: 1039872.524 units remaining)
+  - location: 35 (remaining gas: 1039873.329 units remaining)
     [ (Pair Unit Unit)
       (Pair Unit Unit) ]
-  - location: 36 (remaining gas: 1039872.514 units remaining)
+  - location: 36 (remaining gas: 1039873.319 units remaining)
     [ Unit
       Unit
       (Pair Unit Unit) ]
-  - location: 37 (remaining gas: 1039872.449 units remaining)
+  - location: 37 (remaining gas: 1039873.284 units remaining)
     [ (Pair Unit Unit) ]
-  - location: 39 (remaining gas: 1039872.439 units remaining)
+  - location: 39 (remaining gas: 1039873.274 units remaining)
     [ (Pair Unit Unit)
       (Pair Unit Unit) ]
-  - location: 40 (remaining gas: 1039872.429 units remaining)
+  - location: 40 (remaining gas: 1039873.264 units remaining)
     [ Unit
       Unit
       (Pair Unit Unit) ]
-  - location: 41 (remaining gas: 1039872.364 units remaining)
+  - location: 41 (remaining gas: 1039873.229 units remaining)
     [ (Pair Unit Unit) ]
-  - location: 43 (remaining gas: 1039872.354 units remaining)
+  - location: 43 (remaining gas: 1039873.219 units remaining)
     [ (Pair Unit Unit)
       (Pair Unit Unit) ]
-  - location: 44 (remaining gas: 1039872.344 units remaining)
+  - location: 44 (remaining gas: 1039873.209 units remaining)
     [ Unit
       Unit
       (Pair Unit Unit) ]
-  - location: 45 (remaining gas: 1039872.279 units remaining)
+  - location: 45 (remaining gas: 1039873.174 units remaining)
     [ (Pair Unit Unit) ]
-  - location: 47 (remaining gas: 1039872.269 units remaining)
+  - location: 47 (remaining gas: 1039873.164 units remaining)
     [ (Pair Unit Unit)
       (Pair Unit Unit) ]
-  - location: 48 (remaining gas: 1039872.259 units remaining)
+  - location: 48 (remaining gas: 1039873.154 units remaining)
     [ Unit
       Unit
       (Pair Unit Unit) ]
-  - location: 49 (remaining gas: 1039872.194 units remaining)
+  - location: 49 (remaining gas: 1039873.119 units remaining)
     [ (Pair Unit Unit) ]
-  - location: 51 (remaining gas: 1039872.184 units remaining)
+  - location: 51 (remaining gas: 1039873.109 units remaining)
     [ (Pair Unit Unit)
       (Pair Unit Unit) ]
-  - location: 52 (remaining gas: 1039872.174 units remaining)
+  - location: 52 (remaining gas: 1039873.099 units remaining)
     [ Unit
       Unit
       (Pair Unit Unit) ]
-  - location: 53 (remaining gas: 1039872.109 units remaining)
+  - location: 53 (remaining gas: 1039873.064 units remaining)
     [ (Pair Unit Unit) ]
-  - location: 55 (remaining gas: 1039872.099 units remaining)
+  - location: 55 (remaining gas: 1039873.054 units remaining)
     [ (Pair Unit Unit)
       (Pair Unit Unit) ]
-  - location: 56 (remaining gas: 1039872.089 units remaining)
+  - location: 56 (remaining gas: 1039873.044 units remaining)
     [ Unit
       Unit
       (Pair Unit Unit) ]
-  - location: 57 (remaining gas: 1039872.024 units remaining)
+  - location: 57 (remaining gas: 1039873.009 units remaining)
     [ (Pair Unit Unit) ]
-  - location: 59 (remaining gas: 1039872.014 units remaining)
+  - location: 59 (remaining gas: 1039872.999 units remaining)
     [ (Pair Unit Unit)
       (Pair Unit Unit) ]
-  - location: 60 (remaining gas: 1039872.004 units remaining)
+  - location: 60 (remaining gas: 1039872.989 units remaining)
     [ Unit
       Unit
       (Pair Unit Unit) ]
-  - location: 61 (remaining gas: 1039871.939 units remaining)
+  - location: 61 (remaining gas: 1039872.954 units remaining)
     [ (Pair Unit Unit) ]
-  - location: 63 (remaining gas: 1039871.929 units remaining)
+  - location: 63 (remaining gas: 1039872.944 units remaining)
     [ (Pair Unit Unit)
       (Pair Unit Unit) ]
-  - location: 64 (remaining gas: 1039871.919 units remaining)
+  - location: 64 (remaining gas: 1039872.934 units remaining)
     [ Unit
       Unit
       (Pair Unit Unit) ]
-  - location: 65 (remaining gas: 1039871.854 units remaining)
+  - location: 65 (remaining gas: 1039872.899 units remaining)
     [ (Pair Unit Unit) ]
-  - location: 67 (remaining gas: 1039871.844 units remaining)
+  - location: 67 (remaining gas: 1039872.889 units remaining)
     [ (Pair Unit Unit)
       (Pair Unit Unit) ]
-  - location: 68 (remaining gas: 1039871.834 units remaining)
+  - location: 68 (remaining gas: 1039872.879 units remaining)
     [ Unit
       Unit
       (Pair Unit Unit) ]
-  - location: 69 (remaining gas: 1039871.769 units remaining)
+  - location: 69 (remaining gas: 1039872.844 units remaining)
     [ (Pair Unit Unit) ]
-  - location: 71 (remaining gas: 1039871.759 units remaining)
+  - location: 71 (remaining gas: 1039872.834 units remaining)
     [  ]
-  - location: 72 (remaining gas: 1039871.749 units remaining)
+  - location: 72 (remaining gas: 1039872.824 units remaining)
     [ Unit ]
-  - location: 73 (remaining gas: 1039871.739 units remaining)
+  - location: 73 (remaining gas: 1039872.814 units remaining)
     [ Unit
       Unit ]
-  - location: 74 (remaining gas: 1039871.724 units remaining)
+  - location: 74 (remaining gas: 1039872.804 units remaining)
     [ (Pair Unit Unit) ]
-  - location: 75 (remaining gas: 1039871.714 units remaining)
+  - location: 75 (remaining gas: 1039872.794 units remaining)
     [ (Pair Unit Unit)
       (Pair Unit Unit) ]
-  - location: 76 (remaining gas: 1039871.704 units remaining)
+  - location: 76 (remaining gas: 1039872.784 units remaining)
     [ Unit
       Unit
       (Pair Unit Unit) ]
-  - location: 77 (remaining gas: 1039871.639 units remaining)
+  - location: 77 (remaining gas: 1039872.749 units remaining)
     [ (Pair Unit Unit) ]
-  - location: 79 (remaining gas: 1039871.629 units remaining)
+  - location: 79 (remaining gas: 1039872.739 units remaining)
     [ (Pair Unit Unit)
       (Pair Unit Unit) ]
-  - location: 80 (remaining gas: 1039871.619 units remaining)
+  - location: 80 (remaining gas: 1039872.729 units remaining)
     [ Unit
       Unit
       (Pair Unit Unit) ]
-  - location: 81 (remaining gas: 1039871.554 units remaining)
+  - location: 81 (remaining gas: 1039872.694 units remaining)
     [ (Pair Unit Unit) ]
-  - location: 83 (remaining gas: 1039871.544 units remaining)
+  - location: 83 (remaining gas: 1039872.684 units remaining)
     [ (Pair Unit Unit)
       (Pair Unit Unit) ]
-  - location: 84 (remaining gas: 1039871.534 units remaining)
+  - location: 84 (remaining gas: 1039872.674 units remaining)
     [ Unit
       Unit
       (Pair Unit Unit) ]
-  - location: 85 (remaining gas: 1039871.469 units remaining)
+  - location: 85 (remaining gas: 1039872.639 units remaining)
     [ (Pair Unit Unit) ]
-  - location: 87 (remaining gas: 1039871.459 units remaining)
+  - location: 87 (remaining gas: 1039872.629 units remaining)
     [ (Pair Unit Unit)
       (Pair Unit Unit) ]
-  - location: 88 (remaining gas: 1039871.449 units remaining)
+  - location: 88 (remaining gas: 1039872.619 units remaining)
     [ Unit
       Unit
       (Pair Unit Unit) ]
-  - location: 89 (remaining gas: 1039871.384 units remaining)
+  - location: 89 (remaining gas: 1039872.584 units remaining)
     [ (Pair Unit Unit) ]
-  - location: 91 (remaining gas: 1039871.374 units remaining)
+  - location: 91 (remaining gas: 1039872.574 units remaining)
     [ (Pair Unit Unit)
       (Pair Unit Unit) ]
-  - location: 92 (remaining gas: 1039871.364 units remaining)
+  - location: 92 (remaining gas: 1039872.564 units remaining)
     [ Unit
       Unit
       (Pair Unit Unit) ]
-  - location: 93 (remaining gas: 1039871.299 units remaining)
+  - location: 93 (remaining gas: 1039872.529 units remaining)
     [ (Pair Unit Unit) ]
-  - location: 95 (remaining gas: 1039871.289 units remaining)
+  - location: 95 (remaining gas: 1039872.519 units remaining)
     [ (Pair Unit Unit)
       (Pair Unit Unit) ]
-  - location: 96 (remaining gas: 1039871.279 units remaining)
+  - location: 96 (remaining gas: 1039872.509 units remaining)
     [ Unit
       Unit
       (Pair Unit Unit) ]
-  - location: 97 (remaining gas: 1039871.214 units remaining)
+  - location: 97 (remaining gas: 1039872.474 units remaining)
     [ (Pair Unit Unit) ]
-  - location: 99 (remaining gas: 1039871.204 units remaining)
+  - location: 99 (remaining gas: 1039872.464 units remaining)
     [ (Pair Unit Unit)
       (Pair Unit Unit) ]
-  - location: 100 (remaining gas: 1039871.194 units remaining)
+  - location: 100 (remaining gas: 1039872.454 units remaining)
     [ Unit
       Unit
       (Pair Unit Unit) ]
-  - location: 101 (remaining gas: 1039871.129 units remaining)
+  - location: 101 (remaining gas: 1039872.419 units remaining)
     [ (Pair Unit Unit) ]
-  - location: 103 (remaining gas: 1039871.119 units remaining)
+  - location: 103 (remaining gas: 1039872.409 units remaining)
     [ (Pair Unit Unit)
       (Pair Unit Unit) ]
-  - location: 104 (remaining gas: 1039871.109 units remaining)
+  - location: 104 (remaining gas: 1039872.399 units remaining)
     [ Unit
       Unit
       (Pair Unit Unit) ]
-  - location: 105 (remaining gas: 1039871.044 units remaining)
+  - location: 105 (remaining gas: 1039872.364 units remaining)
     [ (Pair Unit Unit) ]
-  - location: 107 (remaining gas: 1039871.034 units remaining)
+  - location: 107 (remaining gas: 1039872.354 units remaining)
     [ (Pair Unit Unit)
       (Pair Unit Unit) ]
-  - location: 108 (remaining gas: 1039871.024 units remaining)
+  - location: 108 (remaining gas: 1039872.344 units remaining)
     [ Unit
       Unit
       (Pair Unit Unit) ]
-  - location: 109 (remaining gas: 1039870.959 units remaining)
+  - location: 109 (remaining gas: 1039872.309 units remaining)
     [ (Pair Unit Unit) ]
-  - location: 111 (remaining gas: 1039870.949 units remaining)
+  - location: 111 (remaining gas: 1039872.299 units remaining)
     [ (Pair Unit Unit)
       (Pair Unit Unit) ]
-  - location: 112 (remaining gas: 1039870.939 units remaining)
+  - location: 112 (remaining gas: 1039872.289 units remaining)
     [ Unit
       Unit
       (Pair Unit Unit) ]
-  - location: 113 (remaining gas: 1039870.874 units remaining)
+  - location: 113 (remaining gas: 1039872.254 units remaining)
     [ (Pair Unit Unit) ]
-  - location: 115 (remaining gas: 1039870.864 units remaining)
+  - location: 115 (remaining gas: 1039872.244 units remaining)
     [ (Pair Unit Unit)
       (Pair Unit Unit) ]
-  - location: 116 (remaining gas: 1039870.854 units remaining)
+  - location: 116 (remaining gas: 1039872.234 units remaining)
     [ Unit
       Unit
       (Pair Unit Unit) ]
-  - location: 117 (remaining gas: 1039870.789 units remaining)
+  - location: 117 (remaining gas: 1039872.199 units remaining)
     [ (Pair Unit Unit) ]
-  - location: 119 (remaining gas: 1039870.779 units remaining)
+  - location: 119 (remaining gas: 1039872.189 units remaining)
     [ (Pair Unit Unit)
       (Pair Unit Unit) ]
-  - location: 120 (remaining gas: 1039870.769 units remaining)
+  - location: 120 (remaining gas: 1039872.179 units remaining)
     [ Unit
       Unit
       (Pair Unit Unit) ]
-  - location: 121 (remaining gas: 1039870.704 units remaining)
+  - location: 121 (remaining gas: 1039872.144 units remaining)
     [ (Pair Unit Unit) ]
-  - location: 123 (remaining gas: 1039870.694 units remaining)
+  - location: 123 (remaining gas: 1039872.134 units remaining)
     [  ]
-  - location: 124 (remaining gas: 1039870.684 units remaining)
+  - location: 124 (remaining gas: 1039872.124 units remaining)
     [ Unit ]
-  - location: 125 (remaining gas: 1039870.674 units remaining)
+  - location: 125 (remaining gas: 1039872.114 units remaining)
     [ Unit
       Unit ]
-  - location: 126 (remaining gas: 1039870.659 units remaining)
+  - location: 126 (remaining gas: 1039872.104 units remaining)
     [ (Pair Unit Unit) ]
-  - location: 127 (remaining gas: 1039870.649 units remaining)
+  - location: 127 (remaining gas: 1039872.094 units remaining)
     [ (Pair Unit Unit)
       (Pair Unit Unit) ]
-  - location: 128 (remaining gas: 1039870.639 units remaining)
+  - location: 128 (remaining gas: 1039872.084 units remaining)
     [ Unit
       Unit
       (Pair Unit Unit) ]
-  - location: 129 (remaining gas: 1039870.574 units remaining)
+  - location: 129 (remaining gas: 1039872.049 units remaining)
     [ (Pair Unit Unit) ]
-  - location: 131 (remaining gas: 1039870.564 units remaining)
+  - location: 131 (remaining gas: 1039872.039 units remaining)
     [ (Pair Unit Unit)
       (Pair Unit Unit) ]
-  - location: 132 (remaining gas: 1039870.554 units remaining)
+  - location: 132 (remaining gas: 1039872.029 units remaining)
     [ Unit
       Unit
       (Pair Unit Unit) ]
-  - location: 133 (remaining gas: 1039870.489 units remaining)
+  - location: 133 (remaining gas: 1039871.994 units remaining)
     [ (Pair Unit Unit) ]
-  - location: 135 (remaining gas: 1039870.479 units remaining)
+  - location: 135 (remaining gas: 1039871.984 units remaining)
     [ (Pair Unit Unit)
       (Pair Unit Unit) ]
-  - location: 136 (remaining gas: 1039870.469 units remaining)
+  - location: 136 (remaining gas: 1039871.974 units remaining)
     [ Unit
       Unit
       (Pair Unit Unit) ]
-  - location: 137 (remaining gas: 1039870.404 units remaining)
+  - location: 137 (remaining gas: 1039871.939 units remaining)
     [ (Pair Unit Unit) ]
-  - location: 139 (remaining gas: 1039870.394 units remaining)
+  - location: 139 (remaining gas: 1039871.929 units remaining)
     [ (Pair Unit Unit)
       (Pair Unit Unit) ]
-  - location: 140 (remaining gas: 1039870.384 units remaining)
+  - location: 140 (remaining gas: 1039871.919 units remaining)
     [ Unit
       Unit
       (Pair Unit Unit) ]
-  - location: 141 (remaining gas: 1039870.319 units remaining)
+  - location: 141 (remaining gas: 1039871.884 units remaining)
     [ (Pair Unit Unit) ]
-  - location: 143 (remaining gas: 1039870.309 units remaining)
+  - location: 143 (remaining gas: 1039871.874 units remaining)
     [ (Pair Unit Unit)
       (Pair Unit Unit) ]
-  - location: 144 (remaining gas: 1039870.299 units remaining)
+  - location: 144 (remaining gas: 1039871.864 units remaining)
     [ Unit
       Unit
       (Pair Unit Unit) ]
-  - location: 145 (remaining gas: 1039870.234 units remaining)
+  - location: 145 (remaining gas: 1039871.829 units remaining)
     [ (Pair Unit Unit) ]
-  - location: 147 (remaining gas: 1039870.224 units remaining)
+  - location: 147 (remaining gas: 1039871.819 units remaining)
     [ (Pair Unit Unit)
       (Pair Unit Unit) ]
-  - location: 148 (remaining gas: 1039870.214 units remaining)
+  - location: 148 (remaining gas: 1039871.809 units remaining)
     [ Unit
       Unit
       (Pair Unit Unit) ]
-  - location: 149 (remaining gas: 1039870.149 units remaining)
+  - location: 149 (remaining gas: 1039871.774 units remaining)
     [ (Pair Unit Unit) ]
-  - location: 151 (remaining gas: 1039870.139 units remaining)
+  - location: 151 (remaining gas: 1039871.764 units remaining)
     [ (Pair Unit Unit)
       (Pair Unit Unit) ]
-  - location: 152 (remaining gas: 1039870.129 units remaining)
+  - location: 152 (remaining gas: 1039871.754 units remaining)
     [ Unit
       Unit
       (Pair Unit Unit) ]
-  - location: 153 (remaining gas: 1039870.064 units remaining)
+  - location: 153 (remaining gas: 1039871.719 units remaining)
     [ (Pair Unit Unit) ]
-  - location: 155 (remaining gas: 1039870.054 units remaining)
+  - location: 155 (remaining gas: 1039871.709 units remaining)
     [ (Pair Unit Unit)
       (Pair Unit Unit) ]
-  - location: 156 (remaining gas: 1039870.044 units remaining)
+  - location: 156 (remaining gas: 1039871.699 units remaining)
     [ Unit
       Unit
       (Pair Unit Unit) ]
-  - location: 157 (remaining gas: 1039869.979 units remaining)
+  - location: 157 (remaining gas: 1039871.664 units remaining)
     [ (Pair Unit Unit) ]
-  - location: 159 (remaining gas: 1039869.969 units remaining)
+  - location: 159 (remaining gas: 1039871.654 units remaining)
     [ (Pair Unit Unit)
       (Pair Unit Unit) ]
-  - location: 160 (remaining gas: 1039869.959 units remaining)
+  - location: 160 (remaining gas: 1039871.644 units remaining)
     [ Unit
       Unit
       (Pair Unit Unit) ]
-  - location: 161 (remaining gas: 1039869.894 units remaining)
+  - location: 161 (remaining gas: 1039871.609 units remaining)
     [ (Pair Unit Unit) ]
-  - location: 163 (remaining gas: 1039869.884 units remaining)
+  - location: 163 (remaining gas: 1039871.599 units remaining)
     [ (Pair Unit Unit)
       (Pair Unit Unit) ]
-  - location: 164 (remaining gas: 1039869.874 units remaining)
+  - location: 164 (remaining gas: 1039871.589 units remaining)
     [ Unit
       Unit
       (Pair Unit Unit) ]
-  - location: 165 (remaining gas: 1039869.809 units remaining)
+  - location: 165 (remaining gas: 1039871.554 units remaining)
     [ (Pair Unit Unit) ]
-  - location: 167 (remaining gas: 1039869.799 units remaining)
+  - location: 167 (remaining gas: 1039871.544 units remaining)
     [ (Pair Unit Unit)
       (Pair Unit Unit) ]
-  - location: 168 (remaining gas: 1039869.789 units remaining)
+  - location: 168 (remaining gas: 1039871.534 units remaining)
     [ Unit
       Unit
       (Pair Unit Unit) ]
-  - location: 169 (remaining gas: 1039869.724 units remaining)
+  - location: 169 (remaining gas: 1039871.499 units remaining)
     [ (Pair Unit Unit) ]
-  - location: 171 (remaining gas: 1039869.714 units remaining)
+  - location: 171 (remaining gas: 1039871.489 units remaining)
     [ (Pair Unit Unit)
       (Pair Unit Unit) ]
-  - location: 172 (remaining gas: 1039869.704 units remaining)
+  - location: 172 (remaining gas: 1039871.479 units remaining)
     [ Unit
       Unit
       (Pair Unit Unit) ]
-  - location: 173 (remaining gas: 1039869.639 units remaining)
+  - location: 173 (remaining gas: 1039871.444 units remaining)
     [ (Pair Unit Unit) ]
-  - location: 175 (remaining gas: 1039869.629 units remaining)
+  - location: 175 (remaining gas: 1039871.434 units remaining)
     [  ]
-  - location: 176 (remaining gas: 1039869.619 units remaining)
+  - location: 176 (remaining gas: 1039871.424 units remaining)
     [ Unit ]
-  - location: 177 (remaining gas: 1039869.609 units remaining)
+  - location: 177 (remaining gas: 1039871.414 units remaining)
     [ Unit
       Unit ]
-  - location: 178 (remaining gas: 1039869.594 units remaining)
+  - location: 178 (remaining gas: 1039871.404 units remaining)
     [ (Pair Unit Unit) ]
-  - location: 179 (remaining gas: 1039869.584 units remaining)
+  - location: 179 (remaining gas: 1039871.394 units remaining)
     [ (Pair Unit Unit)
       (Pair Unit Unit) ]
-  - location: 180 (remaining gas: 1039869.574 units remaining)
+  - location: 180 (remaining gas: 1039871.384 units remaining)
     [ Unit
       Unit
       (Pair Unit Unit) ]
-  - location: 181 (remaining gas: 1039869.509 units remaining)
+  - location: 181 (remaining gas: 1039871.349 units remaining)
     [ (Pair Unit Unit) ]
-  - location: 183 (remaining gas: 1039869.499 units remaining)
+  - location: 183 (remaining gas: 1039871.339 units remaining)
     [ (Pair Unit Unit)
       (Pair Unit Unit) ]
-  - location: 184 (remaining gas: 1039869.489 units remaining)
+  - location: 184 (remaining gas: 1039871.329 units remaining)
     [ Unit
       Unit
       (Pair Unit Unit) ]
-  - location: 185 (remaining gas: 1039869.424 units remaining)
+  - location: 185 (remaining gas: 1039871.294 units remaining)
     [ (Pair Unit Unit) ]
-  - location: 187 (remaining gas: 1039869.414 units remaining)
+  - location: 187 (remaining gas: 1039871.284 units remaining)
     [ (Pair Unit Unit)
       (Pair Unit Unit) ]
-  - location: 188 (remaining gas: 1039869.404 units remaining)
+  - location: 188 (remaining gas: 1039871.274 units remaining)
     [ Unit
       Unit
       (Pair Unit Unit) ]
-  - location: 189 (remaining gas: 1039869.339 units remaining)
+  - location: 189 (remaining gas: 1039871.239 units remaining)
     [ (Pair Unit Unit) ]
-  - location: 191 (remaining gas: 1039869.329 units remaining)
+  - location: 191 (remaining gas: 1039871.229 units remaining)
     [ (Pair Unit Unit)
       (Pair Unit Unit) ]
-  - location: 192 (remaining gas: 1039869.319 units remaining)
+  - location: 192 (remaining gas: 1039871.219 units remaining)
     [ Unit
       Unit
       (Pair Unit Unit) ]
-  - location: 193 (remaining gas: 1039869.254 units remaining)
+  - location: 193 (remaining gas: 1039871.184 units remaining)
     [ (Pair Unit Unit) ]
-  - location: 195 (remaining gas: 1039869.244 units remaining)
+  - location: 195 (remaining gas: 1039871.174 units remaining)
     [ (Pair Unit Unit)
       (Pair Unit Unit) ]
-  - location: 196 (remaining gas: 1039869.234 units remaining)
+  - location: 196 (remaining gas: 1039871.164 units remaining)
     [ Unit
       Unit
       (Pair Unit Unit) ]
-  - location: 197 (remaining gas: 1039869.169 units remaining)
+  - location: 197 (remaining gas: 1039871.129 units remaining)
     [ (Pair Unit Unit) ]
-  - location: 199 (remaining gas: 1039869.159 units remaining)
+  - location: 199 (remaining gas: 1039871.119 units remaining)
     [  ]
-  - location: 200 (remaining gas: 1039869.149 units remaining)
+  - location: 200 (remaining gas: 1039871.109 units remaining)
     [ Unit ]
-  - location: 201 (remaining gas: 1039869.139 units remaining)
+  - location: 201 (remaining gas: 1039871.099 units remaining)
     [ Unit
       Unit ]
-  - location: 202 (remaining gas: 1039869.124 units remaining)
+  - location: 202 (remaining gas: 1039871.089 units remaining)
     [ (Pair Unit Unit) ]
-  - location: 203 (remaining gas: 1039869.114 units remaining)
+  - location: 203 (remaining gas: 1039871.079 units remaining)
     [ Unit
       Unit ]
-  - location: 204 (remaining gas: 1039869.049 units remaining)
+  - location: 204 (remaining gas: 1039871.044 units remaining)
     [  ]
-  - location: 206 (remaining gas: 1039869.039 units remaining)
+  - location: 206 (remaining gas: 1039871.034 units remaining)
     [ Unit ]
-  - location: 207 (remaining gas: 1039869.024 units remaining)
+  - location: 207 (remaining gas: 1039871.024 units remaining)
     [ {}
       Unit ]
-  - location: 209 (remaining gas: 1039869.009 units remaining)
+  - location: 209 (remaining gas: 1039871.014 units remaining)
     [ (Pair {} Unit) ]
 
diff --git "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[voting_power.tz-(Pair 0 0)-\"edpkuBknW28nW72KG6RoHtYW7p1.b42f8370be.out" "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[voting_power.tz-(Pair 0 0)-\"edpkuBknW28nW72KG6RoHtYW7p1.b42f8370be.out"
index aa3a4c4c7292c8725f6be911a03aab5b92e989a3..dd776850a59895572fb44c15c125ce4c0098bcee 100644
--- "a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[voting_power.tz-(Pair 0 0)-\"edpkuBknW28nW72KG6RoHtYW7p1.b42f8370be.out"	
+++ "b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[voting_power.tz-(Pair 0 0)-\"edpkuBknW28nW72KG6RoHtYW7p1.b42f8370be.out"	
@@ -7,26 +7,26 @@ emitted operations
 big_map diff
   
 trace
-  - location: 9 (remaining gas: 1039666.288 units remaining)
+  - location: 9 (remaining gas: 1039667.248 units remaining)
     [ (Pair "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" 0 0) ]
-  - location: 9 (remaining gas: 1039666.278 units remaining)
+  - location: 9 (remaining gas: 1039667.238 units remaining)
     [ "edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav" ]
-  - location: 10 (remaining gas: 1039665.623 units remaining)
+  - location: 10 (remaining gas: 1039666.633 units remaining)
     [ "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx" ]
-  - location: 11 (remaining gas: 1039445.077 units remaining)
+  - location: 11 (remaining gas: 1039446.087 units remaining)
     [ 4000000000000 ]
-  - location: 12 (remaining gas: 1039445.062 units remaining)
+  - location: 12 (remaining gas: 1039446.077 units remaining)
     [  ]
-  - location: 14 (remaining gas: 1039234.676 units remaining)
+  - location: 14 (remaining gas: 1039235.691 units remaining)
     [ 20000000000000 ]
-  - location: 12 (remaining gas: 1039234.646 units remaining)
+  - location: 12 (remaining gas: 1039235.671 units remaining)
     [ 4000000000000
       20000000000000 ]
-  - location: 15 (remaining gas: 1039234.631 units remaining)
+  - location: 15 (remaining gas: 1039235.661 units remaining)
     [ (Pair 4000000000000 20000000000000) ]
-  - location: 16 (remaining gas: 1039234.616 units remaining)
+  - location: 16 (remaining gas: 1039235.651 units remaining)
     [ {}
       (Pair 4000000000000 20000000000000) ]
-  - location: 18 (remaining gas: 1039234.601 units remaining)
+  - location: 18 (remaining gas: 1039235.641 units remaining)
     [ (Pair {} 4000000000000 20000000000000) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Left (Pair False False)-(Some (Left False))].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Left (Pair False False)-(Some (Left False))].out
index 29978c17408963c2d3ebc5ca188a08964b2c2039..1b4db2d3c86c093d7d4dee4cedb1973843d2f1dd 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Left (Pair False False)-(Some (Left False))].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Left (Pair False False)-(Some (Left False))].out	
@@ -7,26 +7,26 @@ emitted operations
 big_map diff
   
 trace
-  - location: 16 (remaining gas: 1039986.879 units remaining)
+  - location: 16 (remaining gas: 1039988.479 units remaining)
     [ (Pair (Left (Pair False False)) None) ]
-  - location: 16 (remaining gas: 1039986.869 units remaining)
+  - location: 16 (remaining gas: 1039988.469 units remaining)
     [ (Left (Pair False False)) ]
-  - location: 17 (remaining gas: 1039986.859 units remaining)
+  - location: 17 (remaining gas: 1039988.459 units remaining)
     [ (Pair False False) ]
-  - location: 19 (remaining gas: 1039986.849 units remaining)
+  - location: 19 (remaining gas: 1039988.449 units remaining)
     [ False
       False ]
-  - location: 20 (remaining gas: 1039986.829 units remaining)
+  - location: 20 (remaining gas: 1039988.434 units remaining)
     [ False ]
-  - location: 21 (remaining gas: 1039986.814 units remaining)
+  - location: 21 (remaining gas: 1039988.424 units remaining)
     [ (Left False) ]
-  - location: 17 (remaining gas: 1039986.799 units remaining)
+  - location: 17 (remaining gas: 1039988.414 units remaining)
     [ (Left False) ]
-  - location: 28 (remaining gas: 1039986.784 units remaining)
+  - location: 28 (remaining gas: 1039988.404 units remaining)
     [ (Some (Left False)) ]
-  - location: 29 (remaining gas: 1039986.769 units remaining)
+  - location: 29 (remaining gas: 1039988.394 units remaining)
     [ {}
       (Some (Left False)) ]
-  - location: 31 (remaining gas: 1039986.754 units remaining)
+  - location: 31 (remaining gas: 1039988.384 units remaining)
     [ (Pair {} (Some (Left False))) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Left (Pair False True)-(Some (Left True))].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Left (Pair False True)-(Some (Left True))].out
index 600868698be58136e4e6590ca9198436df0e4de2..fb65502e0a2f6ca1ec54f7442cb998b179679007 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Left (Pair False True)-(Some (Left True))].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Left (Pair False True)-(Some (Left True))].out	
@@ -7,26 +7,26 @@ emitted operations
 big_map diff
   
 trace
-  - location: 16 (remaining gas: 1039986.879 units remaining)
+  - location: 16 (remaining gas: 1039988.479 units remaining)
     [ (Pair (Left (Pair False True)) None) ]
-  - location: 16 (remaining gas: 1039986.869 units remaining)
+  - location: 16 (remaining gas: 1039988.469 units remaining)
     [ (Left (Pair False True)) ]
-  - location: 17 (remaining gas: 1039986.859 units remaining)
+  - location: 17 (remaining gas: 1039988.459 units remaining)
     [ (Pair False True) ]
-  - location: 19 (remaining gas: 1039986.849 units remaining)
+  - location: 19 (remaining gas: 1039988.449 units remaining)
     [ False
       True ]
-  - location: 20 (remaining gas: 1039986.829 units remaining)
+  - location: 20 (remaining gas: 1039988.434 units remaining)
     [ True ]
-  - location: 21 (remaining gas: 1039986.814 units remaining)
+  - location: 21 (remaining gas: 1039988.424 units remaining)
     [ (Left True) ]
-  - location: 17 (remaining gas: 1039986.799 units remaining)
+  - location: 17 (remaining gas: 1039988.414 units remaining)
     [ (Left True) ]
-  - location: 28 (remaining gas: 1039986.784 units remaining)
+  - location: 28 (remaining gas: 1039988.404 units remaining)
     [ (Some (Left True)) ]
-  - location: 29 (remaining gas: 1039986.769 units remaining)
+  - location: 29 (remaining gas: 1039988.394 units remaining)
     [ {}
       (Some (Left True)) ]
-  - location: 31 (remaining gas: 1039986.754 units remaining)
+  - location: 31 (remaining gas: 1039988.384 units remaining)
     [ (Pair {} (Some (Left True))) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Left (Pair True False)-(Some (Left True))].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Left (Pair True False)-(Some (Left True))].out
index b901f661416dfb3b4775cd34482b44cc197dd4cb..9ec679a522277fb6c140c69d8c2b1d681d1a26a3 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Left (Pair True False)-(Some (Left True))].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Left (Pair True False)-(Some (Left True))].out	
@@ -7,26 +7,26 @@ emitted operations
 big_map diff
   
 trace
-  - location: 16 (remaining gas: 1039986.879 units remaining)
+  - location: 16 (remaining gas: 1039988.479 units remaining)
     [ (Pair (Left (Pair True False)) None) ]
-  - location: 16 (remaining gas: 1039986.869 units remaining)
+  - location: 16 (remaining gas: 1039988.469 units remaining)
     [ (Left (Pair True False)) ]
-  - location: 17 (remaining gas: 1039986.859 units remaining)
+  - location: 17 (remaining gas: 1039988.459 units remaining)
     [ (Pair True False) ]
-  - location: 19 (remaining gas: 1039986.849 units remaining)
+  - location: 19 (remaining gas: 1039988.449 units remaining)
     [ True
       False ]
-  - location: 20 (remaining gas: 1039986.829 units remaining)
+  - location: 20 (remaining gas: 1039988.434 units remaining)
     [ True ]
-  - location: 21 (remaining gas: 1039986.814 units remaining)
+  - location: 21 (remaining gas: 1039988.424 units remaining)
     [ (Left True) ]
-  - location: 17 (remaining gas: 1039986.799 units remaining)
+  - location: 17 (remaining gas: 1039988.414 units remaining)
     [ (Left True) ]
-  - location: 28 (remaining gas: 1039986.784 units remaining)
+  - location: 28 (remaining gas: 1039988.404 units remaining)
     [ (Some (Left True)) ]
-  - location: 29 (remaining gas: 1039986.769 units remaining)
+  - location: 29 (remaining gas: 1039988.394 units remaining)
     [ {}
       (Some (Left True)) ]
-  - location: 31 (remaining gas: 1039986.754 units remaining)
+  - location: 31 (remaining gas: 1039988.384 units remaining)
     [ (Pair {} (Some (Left True))) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Left (Pair True True)-(Some (Left False))].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Left (Pair True True)-(Some (Left False))].out
index 4acddd90fd4681a502f889cad229d4ce9f773f2b..d4f5f81b04ef42391152b26b989dd4eb5d8445a5 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Left (Pair True True)-(Some (Left False))].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Left (Pair True True)-(Some (Left False))].out	
@@ -7,26 +7,26 @@ emitted operations
 big_map diff
   
 trace
-  - location: 16 (remaining gas: 1039986.879 units remaining)
+  - location: 16 (remaining gas: 1039988.479 units remaining)
     [ (Pair (Left (Pair True True)) None) ]
-  - location: 16 (remaining gas: 1039986.869 units remaining)
+  - location: 16 (remaining gas: 1039988.469 units remaining)
     [ (Left (Pair True True)) ]
-  - location: 17 (remaining gas: 1039986.859 units remaining)
+  - location: 17 (remaining gas: 1039988.459 units remaining)
     [ (Pair True True) ]
-  - location: 19 (remaining gas: 1039986.849 units remaining)
+  - location: 19 (remaining gas: 1039988.449 units remaining)
     [ True
       True ]
-  - location: 20 (remaining gas: 1039986.829 units remaining)
+  - location: 20 (remaining gas: 1039988.434 units remaining)
     [ False ]
-  - location: 21 (remaining gas: 1039986.814 units remaining)
+  - location: 21 (remaining gas: 1039988.424 units remaining)
     [ (Left False) ]
-  - location: 17 (remaining gas: 1039986.799 units remaining)
+  - location: 17 (remaining gas: 1039988.414 units remaining)
     [ (Left False) ]
-  - location: 28 (remaining gas: 1039986.784 units remaining)
+  - location: 28 (remaining gas: 1039988.404 units remaining)
     [ (Some (Left False)) ]
-  - location: 29 (remaining gas: 1039986.769 units remaining)
+  - location: 29 (remaining gas: 1039988.394 units remaining)
     [ {}
       (Some (Left False)) ]
-  - location: 31 (remaining gas: 1039986.754 units remaining)
+  - location: 31 (remaining gas: 1039988.384 units remaining)
     [ (Pair {} (Some (Left False))) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 0 0)-(Some (Right 0))].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 0 0)-(Some (Right 0))].out
index ce3ea936ac7ae027dcdda7431bcc89d6e9e627e2..a3ccecc92d9f2e9099cd2df864e7a110f85738a0 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 0 0)-(Some (Right 0))].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 0 0)-(Some (Right 0))].out	
@@ -7,26 +7,26 @@ emitted operations
 big_map diff
   
 trace
-  - location: 16 (remaining gas: 1039986.879 units remaining)
+  - location: 16 (remaining gas: 1039988.479 units remaining)
     [ (Pair (Right (Pair 0 0)) None) ]
-  - location: 16 (remaining gas: 1039986.869 units remaining)
+  - location: 16 (remaining gas: 1039988.469 units remaining)
     [ (Right (Pair 0 0)) ]
-  - location: 17 (remaining gas: 1039986.859 units remaining)
+  - location: 17 (remaining gas: 1039988.459 units remaining)
     [ (Pair 0 0) ]
-  - location: 24 (remaining gas: 1039986.849 units remaining)
+  - location: 24 (remaining gas: 1039988.449 units remaining)
     [ 0
       0 ]
-  - location: 25 (remaining gas: 1039986.794 units remaining)
+  - location: 25 (remaining gas: 1039988.414 units remaining)
     [ 0 ]
-  - location: 26 (remaining gas: 1039986.779 units remaining)
+  - location: 26 (remaining gas: 1039988.404 units remaining)
     [ (Right 0) ]
-  - location: 17 (remaining gas: 1039986.764 units remaining)
+  - location: 17 (remaining gas: 1039988.394 units remaining)
     [ (Right 0) ]
-  - location: 28 (remaining gas: 1039986.749 units remaining)
+  - location: 28 (remaining gas: 1039988.384 units remaining)
     [ (Some (Right 0)) ]
-  - location: 29 (remaining gas: 1039986.734 units remaining)
+  - location: 29 (remaining gas: 1039988.374 units remaining)
     [ {}
       (Some (Right 0)) ]
-  - location: 31 (remaining gas: 1039986.719 units remaining)
+  - location: 31 (remaining gas: 1039988.364 units remaining)
     [ (Pair {} (Some (Right 0))) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 0 1)-(Some (Right 1))].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 0 1)-(Some (Right 1))].out
index 1004a7a1bba38acca742788e527389b00b7f9d85..53c99e0ab45bd6d4494d8f94fd597cc68ad0cf10 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 0 1)-(Some (Right 1))].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 0 1)-(Some (Right 1))].out	
@@ -7,26 +7,26 @@ emitted operations
 big_map diff
   
 trace
-  - location: 16 (remaining gas: 1039986.879 units remaining)
+  - location: 16 (remaining gas: 1039988.479 units remaining)
     [ (Pair (Right (Pair 0 1)) None) ]
-  - location: 16 (remaining gas: 1039986.869 units remaining)
+  - location: 16 (remaining gas: 1039988.469 units remaining)
     [ (Right (Pair 0 1)) ]
-  - location: 17 (remaining gas: 1039986.859 units remaining)
+  - location: 17 (remaining gas: 1039988.459 units remaining)
     [ (Pair 0 1) ]
-  - location: 24 (remaining gas: 1039986.849 units remaining)
+  - location: 24 (remaining gas: 1039988.449 units remaining)
     [ 0
       1 ]
-  - location: 25 (remaining gas: 1039986.794 units remaining)
+  - location: 25 (remaining gas: 1039988.414 units remaining)
     [ 1 ]
-  - location: 26 (remaining gas: 1039986.779 units remaining)
+  - location: 26 (remaining gas: 1039988.404 units remaining)
     [ (Right 1) ]
-  - location: 17 (remaining gas: 1039986.764 units remaining)
+  - location: 17 (remaining gas: 1039988.394 units remaining)
     [ (Right 1) ]
-  - location: 28 (remaining gas: 1039986.749 units remaining)
+  - location: 28 (remaining gas: 1039988.384 units remaining)
     [ (Some (Right 1)) ]
-  - location: 29 (remaining gas: 1039986.734 units remaining)
+  - location: 29 (remaining gas: 1039988.374 units remaining)
     [ {}
       (Some (Right 1)) ]
-  - location: 31 (remaining gas: 1039986.719 units remaining)
+  - location: 31 (remaining gas: 1039988.364 units remaining)
     [ (Pair {} (Some (Right 1))) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 1 0)-(Some (Right 1))].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 1 0)-(Some (Right 1))].out
index aab41153d262a35be85c8693ea862dd537ac5d2a..861722fa99ae6ed9d98745336efe12827143ab69 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 1 0)-(Some (Right 1))].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 1 0)-(Some (Right 1))].out	
@@ -7,26 +7,26 @@ emitted operations
 big_map diff
   
 trace
-  - location: 16 (remaining gas: 1039986.879 units remaining)
+  - location: 16 (remaining gas: 1039988.479 units remaining)
     [ (Pair (Right (Pair 1 0)) None) ]
-  - location: 16 (remaining gas: 1039986.869 units remaining)
+  - location: 16 (remaining gas: 1039988.469 units remaining)
     [ (Right (Pair 1 0)) ]
-  - location: 17 (remaining gas: 1039986.859 units remaining)
+  - location: 17 (remaining gas: 1039988.459 units remaining)
     [ (Pair 1 0) ]
-  - location: 24 (remaining gas: 1039986.849 units remaining)
+  - location: 24 (remaining gas: 1039988.449 units remaining)
     [ 1
       0 ]
-  - location: 25 (remaining gas: 1039986.794 units remaining)
+  - location: 25 (remaining gas: 1039988.414 units remaining)
     [ 1 ]
-  - location: 26 (remaining gas: 1039986.779 units remaining)
+  - location: 26 (remaining gas: 1039988.404 units remaining)
     [ (Right 1) ]
-  - location: 17 (remaining gas: 1039986.764 units remaining)
+  - location: 17 (remaining gas: 1039988.394 units remaining)
     [ (Right 1) ]
-  - location: 28 (remaining gas: 1039986.749 units remaining)
+  - location: 28 (remaining gas: 1039988.384 units remaining)
     [ (Some (Right 1)) ]
-  - location: 29 (remaining gas: 1039986.734 units remaining)
+  - location: 29 (remaining gas: 1039988.374 units remaining)
     [ {}
       (Some (Right 1)) ]
-  - location: 31 (remaining gas: 1039986.719 units remaining)
+  - location: 31 (remaining gas: 1039988.364 units remaining)
     [ (Pair {} (Some (Right 1))) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 1 1)-(Some (Right 0))].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 1 1)-(Some (Right 0))].out
index a1a1aa64c702c71bd8fbc5b09f0b61e4655620f1..a9002c7fb280f21ef6b8558b3f3e0b01f2171408 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 1 1)-(Some (Right 0))].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 1 1)-(Some (Right 0))].out	
@@ -7,26 +7,26 @@ emitted operations
 big_map diff
   
 trace
-  - location: 16 (remaining gas: 1039986.879 units remaining)
+  - location: 16 (remaining gas: 1039988.479 units remaining)
     [ (Pair (Right (Pair 1 1)) None) ]
-  - location: 16 (remaining gas: 1039986.869 units remaining)
+  - location: 16 (remaining gas: 1039988.469 units remaining)
     [ (Right (Pair 1 1)) ]
-  - location: 17 (remaining gas: 1039986.859 units remaining)
+  - location: 17 (remaining gas: 1039988.459 units remaining)
     [ (Pair 1 1) ]
-  - location: 24 (remaining gas: 1039986.849 units remaining)
+  - location: 24 (remaining gas: 1039988.449 units remaining)
     [ 1
       1 ]
-  - location: 25 (remaining gas: 1039986.794 units remaining)
+  - location: 25 (remaining gas: 1039988.414 units remaining)
     [ 0 ]
-  - location: 26 (remaining gas: 1039986.779 units remaining)
+  - location: 26 (remaining gas: 1039988.404 units remaining)
     [ (Right 0) ]
-  - location: 17 (remaining gas: 1039986.764 units remaining)
+  - location: 17 (remaining gas: 1039988.394 units remaining)
     [ (Right 0) ]
-  - location: 28 (remaining gas: 1039986.749 units remaining)
+  - location: 28 (remaining gas: 1039988.384 units remaining)
     [ (Some (Right 0)) ]
-  - location: 29 (remaining gas: 1039986.734 units remaining)
+  - location: 29 (remaining gas: 1039988.374 units remaining)
     [ {}
       (Some (Right 0)) ]
-  - location: 31 (remaining gas: 1039986.719 units remaining)
+  - location: 31 (remaining gas: 1039988.364 units remaining)
     [ (Pair {} (Some (Right 0))) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 42 21)-(Some (Right 63))].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 42 21)-(Some (Right 63))].out
index 9fea08a8fc395d9b01ca974a93c24b63c7a27746..0c28491dd0f0eb33efb3ad26f2f58aca995d2783 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 42 21)-(Some (Right 63))].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 42 21)-(Some (Right 63))].out	
@@ -7,26 +7,26 @@ emitted operations
 big_map diff
   
 trace
-  - location: 16 (remaining gas: 1039986.879 units remaining)
+  - location: 16 (remaining gas: 1039988.479 units remaining)
     [ (Pair (Right (Pair 42 21)) None) ]
-  - location: 16 (remaining gas: 1039986.869 units remaining)
+  - location: 16 (remaining gas: 1039988.469 units remaining)
     [ (Right (Pair 42 21)) ]
-  - location: 17 (remaining gas: 1039986.859 units remaining)
+  - location: 17 (remaining gas: 1039988.459 units remaining)
     [ (Pair 42 21) ]
-  - location: 24 (remaining gas: 1039986.849 units remaining)
+  - location: 24 (remaining gas: 1039988.449 units remaining)
     [ 42
       21 ]
-  - location: 25 (remaining gas: 1039986.794 units remaining)
+  - location: 25 (remaining gas: 1039988.414 units remaining)
     [ 63 ]
-  - location: 26 (remaining gas: 1039986.779 units remaining)
+  - location: 26 (remaining gas: 1039988.404 units remaining)
     [ (Right 63) ]
-  - location: 17 (remaining gas: 1039986.764 units remaining)
+  - location: 17 (remaining gas: 1039988.394 units remaining)
     [ (Right 63) ]
-  - location: 28 (remaining gas: 1039986.749 units remaining)
+  - location: 28 (remaining gas: 1039988.384 units remaining)
     [ (Some (Right 63)) ]
-  - location: 29 (remaining gas: 1039986.734 units remaining)
+  - location: 29 (remaining gas: 1039988.374 units remaining)
     [ {}
       (Some (Right 63)) ]
-  - location: 31 (remaining gas: 1039986.719 units remaining)
+  - location: 31 (remaining gas: 1039988.364 units remaining)
     [ (Pair {} (Some (Right 63))) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 42 63)-(Some (Right 21))].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 42 63)-(Some (Right 21))].out
index dcd8ebdc09389da01dbfad69caf82569b6a85b91..47e92ca342939e8b26ec0b170b7dd489b8197830 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 42 63)-(Some (Right 21))].out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_contract_input_output[xor.tz-None-Right (Pair 42 63)-(Some (Right 21))].out	
@@ -7,26 +7,26 @@ emitted operations
 big_map diff
   
 trace
-  - location: 16 (remaining gas: 1039986.879 units remaining)
+  - location: 16 (remaining gas: 1039988.479 units remaining)
     [ (Pair (Right (Pair 42 63)) None) ]
-  - location: 16 (remaining gas: 1039986.869 units remaining)
+  - location: 16 (remaining gas: 1039988.469 units remaining)
     [ (Right (Pair 42 63)) ]
-  - location: 17 (remaining gas: 1039986.859 units remaining)
+  - location: 17 (remaining gas: 1039988.459 units remaining)
     [ (Pair 42 63) ]
-  - location: 24 (remaining gas: 1039986.849 units remaining)
+  - location: 24 (remaining gas: 1039988.449 units remaining)
     [ 42
       63 ]
-  - location: 25 (remaining gas: 1039986.794 units remaining)
+  - location: 25 (remaining gas: 1039988.414 units remaining)
     [ 21 ]
-  - location: 26 (remaining gas: 1039986.779 units remaining)
+  - location: 26 (remaining gas: 1039988.404 units remaining)
     [ (Right 21) ]
-  - location: 17 (remaining gas: 1039986.764 units remaining)
+  - location: 17 (remaining gas: 1039988.394 units remaining)
     [ (Right 21) ]
-  - location: 28 (remaining gas: 1039986.749 units remaining)
+  - location: 28 (remaining gas: 1039988.384 units remaining)
     [ (Some (Right 21)) ]
-  - location: 29 (remaining gas: 1039986.734 units remaining)
+  - location: 29 (remaining gas: 1039988.374 units remaining)
     [ {}
       (Some (Right 21)) ]
-  - location: 31 (remaining gas: 1039986.719 units remaining)
+  - location: 31 (remaining gas: 1039988.364 units remaining)
     [ (Pair {} (Some (Right 21))) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_hash_consistency_michelson_cli.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_hash_consistency_michelson_cli.out
index f42ab066bc66a6c76206b6f9efb2e63577d27a7d..eb6a3b6d2a37a82a5a96d6df4eb49a26e8b41b58 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_hash_consistency_michelson_cli.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_hash_consistency_michelson_cli.out
@@ -6,7 +6,7 @@ Raw Script-expression-ID-Hash: 0x95a69fcbbf773989333dc9b31e246575812dbea19d25089
 Ledger Blake2b hash: B5B7PuGGVUrdHUW9Df8wPNJQRuUmx56aH1XVpvbUZvW7
 Raw Sha256 hash: 0x538634a0f81b55f1c946c1207a25c262479566d20bd3d5cd2cdbb2940fc45774
 Raw Sha512 hash: 0x49d5c19c2da4ee74f85225c95625a4b77b94724f4285b436b9d4be27d40491354bdc8e9d8a3d9b2857e5fb59b172605edd02fc4b61ce3cd3f84aa11ed1731ff6
-Gas remaining: 1039997.927 units remaining
+Gas remaining: 1039997.197 units remaining
 storage
   0x95a69fcbbf773989333dc9b31e246575812dbea19d25089f83a2aeeea16ab4bc
 emitted operations
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_level.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_level.out
index f505a3c29a847cc95f7db34400993b783e1eb288..b5659395ed3df34123e943b334cee4871eeaff3c 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_level.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_level.out
@@ -7,15 +7,15 @@ emitted operations
 big_map diff
   
 trace
-  - location: 7 (remaining gas: 1039994.913 units remaining)
+  - location: 7 (remaining gas: 1039995.553 units remaining)
     [ (Pair Unit 9999999) ]
-  - location: 7 (remaining gas: 1039994.903 units remaining)
+  - location: 7 (remaining gas: 1039995.543 units remaining)
     [  ]
-  - location: 8 (remaining gas: 1039994.888 units remaining)
+  - location: 8 (remaining gas: 1039995.533 units remaining)
     [ 10 ]
-  - location: 9 (remaining gas: 1039994.873 units remaining)
+  - location: 9 (remaining gas: 1039995.523 units remaining)
     [ {}
       10 ]
-  - location: 11 (remaining gas: 1039994.858 units remaining)
+  - location: 11 (remaining gas: 1039995.513 units remaining)
     [ (Pair {} 10) ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_now.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_now.out
index 92143a5a9cc15c5cd6e1963ebdd7970b3969da6e..bbfbf4054996071269e4705b858a7e54f813ed0c 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_now.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_now.out
@@ -7,15 +7,15 @@ emitted operations
 big_map diff
   
 trace
-  - location: 7 (remaining gas: 1039994.813 units remaining)
+  - location: 7 (remaining gas: 1039994.723 units remaining)
     [ (Pair Unit "2017-07-13T09:19:01Z") ]
-  - location: 7 (remaining gas: 1039994.803 units remaining)
+  - location: 7 (remaining gas: 1039994.713 units remaining)
     [  ]
-  - location: 8 (remaining gas: 1039994.788 units remaining)
+  - location: 8 (remaining gas: 1039994.703 units remaining)
     [ "2021-10-13T10:16:52Z" ]
-  - location: 9 (remaining gas: 1039994.773 units remaining)
+  - location: 9 (remaining gas: 1039994.693 units remaining)
     [ {}
       "2021-10-13T10:16:52Z" ]
-  - location: 11 (remaining gas: 1039994.758 units remaining)
+  - location: 11 (remaining gas: 1039994.683 units remaining)
     [ (Pair {} "2021-10-13T10:16:52Z") ]
 
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_packunpack.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_packunpack.out
index cac5b28548b2867ec1881256dad7439d5f833b4b..0fc5b70c2b266009721551ae706debd236980814 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_packunpack.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_opcodes.TestContractOpcodes::test_packunpack.out
@@ -7,53 +7,53 @@ emitted operations
 big_map diff
   
 trace
-  - location: 15 (remaining gas: 1039978.456 units remaining)
+  - location: 15 (remaining gas: 1039979.256 units remaining)
     [ (Pair (Pair (Pair (Pair "toto" { 3 ; 7 ; 9 ; 1 }) { 1 ; 2 ; 3 })
                   0x05070707070100000004746f746f020000000800030007000900010200000006000100020003)
             Unit) ]
-  - location: 15 (remaining gas: 1039978.446 units remaining)
+  - location: 15 (remaining gas: 1039979.246 units remaining)
     [ (Pair (Pair (Pair "toto" { 3 ; 7 ; 9 ; 1 }) { 1 ; 2 ; 3 })
             0x05070707070100000004746f746f020000000800030007000900010200000006000100020003) ]
-  - location: 16 (remaining gas: 1039978.436 units remaining)
+  - location: 16 (remaining gas: 1039979.236 units remaining)
     [ (Pair (Pair "toto" { 3 ; 7 ; 9 ; 1 }) { 1 ; 2 ; 3 })
       0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 ]
-  - location: 17 (remaining gas: 1039978.421 units remaining)
+  - location: 17 (remaining gas: 1039979.226 units remaining)
     [ 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 ]
-  - location: 19 (remaining gas: 1039978.411 units remaining)
+  - location: 19 (remaining gas: 1039979.216 units remaining)
     [ 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003
       0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 ]
-  - location: 17 (remaining gas: 1039978.381 units remaining)
+  - location: 17 (remaining gas: 1039979.196 units remaining)
     [ (Pair (Pair "toto" { 3 ; 7 ; 9 ; 1 }) { 1 ; 2 ; 3 })
       0x05070707070100000004746f746f020000000800030007000900010200000006000100020003
       0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 ]
-  - location: 20 (remaining gas: 1039975.941 units remaining)
+  - location: 20 (remaining gas: 1039976.756 units remaining)
     [ 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003
       0x05070707070100000004746f746f020000000800030007000900010200000006000100020003
       0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 ]
-  - location: 23 (remaining gas: 1039975.906 units remaining)
+  - location: 23 (remaining gas: 1039976.721 units remaining)
     [ 0
       0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 ]
-  - location: 24 (remaining gas: 1039975.891 units remaining)
+  - location: 24 (remaining gas: 1039976.711 units remaining)
     [ True
       0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 ]
-  - location: 25 (remaining gas: 1039975.881 units remaining)
+  - location: 25 (remaining gas: 1039976.701 units remaining)
     [ 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 ]
-  - location: 25 (remaining gas: 1039975.866 units remaining)
+  - location: 25 (remaining gas: 1039976.691 units remaining)
     [ 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003 ]
-  - location: 31 (remaining gas: 1039973.128 units remaining)
+  - location: 31 (remaining gas: 1039973.953 units remaining)
     [ (Some (Pair (Pair "toto" { 3 ; 7 ; 9 ; 1 }) { 1 ; 2 ; 3 })) ]
-  - location: 40 (remaining gas: 1039973.118 units remaining)
+  - location: 40 (remaining gas: 1039973.943 units remaining)
     [ (Pair (Pair "toto" { 3 ; 7 ; 9 ; 1 }) { 1 ; 2 ; 3 }) ]
-  - location: 40 (remaining gas: 1039973.103 units remaining)
+  - location: 40 (remaining gas: 1039973.933 units remaining)
     [ (Pair (Pair "toto" { 3 ; 7 ; 9 ; 1 }) { 1 ; 2 ; 3 }) ]
-  - location: 46 (remaining gas: 1039973.093 units remaining)
+  - location: 46 (remaining gas: 1039973.923 units remaining)
     [  ]
-  - location: 47 (remaining gas: 1039973.083 units remaining)
+  - location: 47 (remaining gas: 1039973.913 units remaining)
     [ Unit ]
-  - location: 48 (remaining gas: 1039973.068 units remaining)
+  - location: 48 (remaining gas: 1039973.903 units remaining)
     [ {}
       Unit ]
-  - location: 50 (remaining gas: 1039973.053 units remaining)
+  - location: 50 (remaining gas: 1039973.893 units remaining)
     [ (Pair {} Unit) ]
 
 Runtime error in contract [CONTRACT_HASH]:
@@ -68,38 +68,38 @@ At line 4 characters 14 to 26,
 script reached FAILWITH instruction
 with Unit
 trace
-  - location: 15 (remaining gas: 1039978.456 units remaining)
+  - location: 15 (remaining gas: 1039979.256 units remaining)
     [ (Pair (Pair (Pair (Pair "toto" { 3 ; 7 ; 9 ; 1 }) { 1 ; 2 ; 3 })
                   0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004)
             Unit) ]
-  - location: 15 (remaining gas: 1039978.446 units remaining)
+  - location: 15 (remaining gas: 1039979.246 units remaining)
     [ (Pair (Pair (Pair "toto" { 3 ; 7 ; 9 ; 1 }) { 1 ; 2 ; 3 })
             0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004) ]
-  - location: 16 (remaining gas: 1039978.436 units remaining)
+  - location: 16 (remaining gas: 1039979.236 units remaining)
     [ (Pair (Pair "toto" { 3 ; 7 ; 9 ; 1 }) { 1 ; 2 ; 3 })
       0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004 ]
-  - location: 17 (remaining gas: 1039978.421 units remaining)
+  - location: 17 (remaining gas: 1039979.226 units remaining)
     [ 0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004 ]
-  - location: 19 (remaining gas: 1039978.411 units remaining)
+  - location: 19 (remaining gas: 1039979.216 units remaining)
     [ 0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004
       0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004 ]
-  - location: 17 (remaining gas: 1039978.381 units remaining)
+  - location: 17 (remaining gas: 1039979.196 units remaining)
     [ (Pair (Pair "toto" { 3 ; 7 ; 9 ; 1 }) { 1 ; 2 ; 3 })
       0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004
       0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004 ]
-  - location: 20 (remaining gas: 1039975.941 units remaining)
+  - location: 20 (remaining gas: 1039976.756 units remaining)
     [ 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003
       0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004
       0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004 ]
-  - location: 23 (remaining gas: 1039975.906 units remaining)
+  - location: 23 (remaining gas: 1039976.721 units remaining)
     [ -1
       0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004 ]
-  - location: 24 (remaining gas: 1039975.891 units remaining)
+  - location: 24 (remaining gas: 1039976.711 units remaining)
     [ False
       0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004 ]
-  - location: 25 (remaining gas: 1039975.881 units remaining)
+  - location: 25 (remaining gas: 1039976.701 units remaining)
     [ 0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004 ]
-  - location: 29 (remaining gas: 1039975.871 units remaining)
+  - location: 29 (remaining gas: 1039976.691 units remaining)
     [ Unit
       0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004 ]
 Fatal error:
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_add_liquidity.out b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_add_liquidity.out
index 6c341efec4dde433637f05e245e9710b1c4c0eb7..072a18c520fb2089f4c81caf6ea0d9bdf421e1e0 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_add_liquidity.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_add_liquidity.out
@@ -1,7 +1,7 @@
 tests_alpha/test_liquidity_baking.py::TestAddApproveTransferRemove::test_add_liquidity
 
 Node is bootstrapped.
-Estimated gas: 9883.730 units (will add 100 for safety)
+Estimated gas: 8526.831 units (will add 100 for safety)
 Estimated storage: 141 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -12,13 +12,13 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [CONTRACT_HASH]
-    Fee to the baker: ꜩ0.001354
+    Fee to the baker: ꜩ0.001218
     Expected counter: [EXPECTED_COUNTER]
-    Gas limit: 9984
+    Gas limit: 8627
     Storage limit: 161 bytes
     Balance updates:
-      [CONTRACT_HASH] ... -ꜩ0.001354
-      payload fees(the block proposer) ....... +ꜩ0.001354
+      [CONTRACT_HASH] ... -ꜩ0.001218
+      payload fees(the block proposer) ....... +ꜩ0.001218
     Transaction:
       Amount: ꜩ9001
       From: [CONTRACT_HASH]
@@ -34,7 +34,7 @@ This sequence of operations was run:
           0x0115eb0104481a6d7921160bc982c5e0a561cd8a3a00 }
       Storage size: 4633 bytes
       Paid storage size diff: 3 bytes
-      Consumed gas: 5091.529
+      Consumed gas: 3787.849
       Balance updates:
         [CONTRACT_HASH] ... -ꜩ0.00075
         storage fees ........................... +ꜩ0.00075
@@ -58,7 +58,7 @@ This sequence of operations was run:
           Set map(0)[0x01d496def47a3be89f5d54c6e6bb13cc6645d6e16600] to 721
         Storage size: 2263 bytes
         Paid storage size diff: 68 bytes
-        Consumed gas: 3097.176
+        Consumed gas: 3065.689
         Balance updates:
           [CONTRACT_HASH] ... -ꜩ0.017
           storage fees ........................... +ꜩ0.017
@@ -75,7 +75,7 @@ This sequence of operations was run:
           Set map(2)[0x000002298c03ed7d454a101eb7022bc95f7e5f41ac78] to 72007
         Storage size: 2048 bytes
         Paid storage size diff: 70 bytes
-        Consumed gas: 1695.025
+        Consumed gas: 1673.293
         Balance updates:
           [CONTRACT_HASH] ... -ꜩ0.0175
           storage fees ........................... +ꜩ0.0175
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_approval.out b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_approval.out
index 859d237f03396446e170190238244418000ed056..e71a2041bf7f8a44e36353e422d34a50742aeee5 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_approval.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_approval.out
@@ -1,7 +1,7 @@
 tests_alpha/test_liquidity_baking.py::TestAddApproveTransferRemove::test_approval
 
 Node is bootstrapped.
-Estimated gas: 2377.168 units (will add 100 for safety)
+Estimated gas: 1683.146 units (will add 100 for safety)
 Estimated storage: 68 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -12,13 +12,13 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [CONTRACT_HASH]
-    Fee to the baker: ꜩ0.000555
+    Fee to the baker: ꜩ0.000486
     Expected counter: [EXPECTED_COUNTER]
-    Gas limit: 2478
+    Gas limit: 1784
     Storage limit: 88 bytes
     Balance updates:
-      [CONTRACT_HASH] ... -ꜩ0.000555
-      payload fees(the block proposer) ....... +ꜩ0.000555
+      [CONTRACT_HASH] ... -ꜩ0.000486
+      payload fees(the block proposer) ....... +ꜩ0.000486
     Transaction:
       Amount: ꜩ0
       From: [CONTRACT_HASH]
@@ -33,7 +33,7 @@ This sequence of operations was run:
               0x0000e7670f32038107a59a2b9cfefae36ea21f5aa63c)] to 1000
       Storage size: 2116 bytes
       Paid storage size diff: 68 bytes
-      Consumed gas: 2377.168
+      Consumed gas: 1683.146
       Balance updates:
         [CONTRACT_HASH] ... -ꜩ0.017
         storage fees ........................... +ꜩ0.017
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_approved_transfer.out b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_approved_transfer.out
index 43b37978175a81e3242e7ccc034f54ae48e6e634..5a3a7887bba1fc227c763813bd1f666d93b7e083 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_approved_transfer.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_approved_transfer.out
@@ -1,7 +1,7 @@
 tests_alpha/test_liquidity_baking.py::TestAddApproveTransferRemove::test_approved_transfer
 
 Node is bootstrapped.
-Estimated gas: 4368.320 units (will add 100 for safety)
+Estimated gas: 3050.833 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -12,13 +12,13 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [CONTRACT_HASH]
-    Fee to the baker: ꜩ0.000804
+    Fee to the baker: ꜩ0.000673
     Expected counter: [EXPECTED_COUNTER]
-    Gas limit: 4469
+    Gas limit: 3151
     Storage limit: 0 bytes
     Balance updates:
-      [CONTRACT_HASH] ... -ꜩ0.000804
-      payload fees(the block proposer) ....... +ꜩ0.000804
+      [CONTRACT_HASH] ... -ꜩ0.000673
+      payload fees(the block proposer) ....... +ꜩ0.000673
     Transaction:
       Amount: ꜩ0
       From: [CONTRACT_HASH]
@@ -36,6 +36,6 @@ This sequence of operations was run:
         Set map(2)[0x000002298c03ed7d454a101eb7022bc95f7e5f41ac78] to 71007
         Set map(2)[0x0000e7670f32038107a59a2b9cfefae36ea21f5aa63c] to 1000
       Storage size: 2116 bytes
-      Consumed gas: 4368.320
+      Consumed gas: 3050.833
 
 Injected block at minimal timestamp
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_call_approve1.out b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_call_approve1.out
index aafc2045db4345bf901d784f7765f5af5bd25a69..953e360baef1d75783ac980652b26bebf51e1255 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_call_approve1.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_call_approve1.out
@@ -1,7 +1,7 @@
 tests_alpha/test_liquidity_baking.py::TestAddApproveTransferRemove::test_call_approve1
 
 Node is bootstrapped.
-Estimated gas: 2377.244 units (will add 100 for safety)
+Estimated gas: 1683.222 units (will add 100 for safety)
 Estimated storage: 71 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -12,13 +12,13 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [CONTRACT_HASH]
-    Fee to the baker: ꜩ0.000558
+    Fee to the baker: ꜩ0.000489
     Expected counter: [EXPECTED_COUNTER]
-    Gas limit: 2478
+    Gas limit: 1784
     Storage limit: 91 bytes
     Balance updates:
-      [CONTRACT_HASH] ... -ꜩ0.000558
-      payload fees(the block proposer) ....... +ꜩ0.000558
+      [CONTRACT_HASH] ... -ꜩ0.000489
+      payload fees(the block proposer) ....... +ꜩ0.000489
     Transaction:
       Amount: ꜩ0
       From: [CONTRACT_HASH]
@@ -33,7 +33,7 @@ This sequence of operations was run:
               0x01d496def47a3be89f5d54c6e6bb13cc6645d6e16600)] to 1000000000
       Storage size: 2053 bytes
       Paid storage size diff: 71 bytes
-      Consumed gas: 2377.244
+      Consumed gas: 1683.222
       Balance updates:
         [CONTRACT_HASH] ... -ꜩ0.01775
         storage fees ........................... +ꜩ0.01775
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_call_approve2.out b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_call_approve2.out
index c697c412973e801b4abd57e56e7c1dac6b8ff3c9..8d00499bded6e5f21cc1bdff0ddaafb059d8f56a 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_call_approve2.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_call_approve2.out
@@ -1,7 +1,7 @@
 tests_alpha/test_liquidity_baking.py::TestAddApproveTransferRemove::test_call_approve2
 
 Node is bootstrapped.
-Estimated gas: 2377.244 units (will add 100 for safety)
+Estimated gas: 1683.222 units (will add 100 for safety)
 Estimated storage: 71 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -12,13 +12,13 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [CONTRACT_HASH]
-    Fee to the baker: ꜩ0.000558
+    Fee to the baker: ꜩ0.000489
     Expected counter: [EXPECTED_COUNTER]
-    Gas limit: 2478
+    Gas limit: 1784
     Storage limit: 91 bytes
     Balance updates:
-      [CONTRACT_HASH] ... -ꜩ0.000558
-      payload fees(the block proposer) ....... +ꜩ0.000558
+      [CONTRACT_HASH] ... -ꜩ0.000489
+      payload fees(the block proposer) ....... +ꜩ0.000489
     Transaction:
       Amount: ꜩ0
       From: [CONTRACT_HASH]
@@ -33,7 +33,7 @@ This sequence of operations was run:
               0x01d496def47a3be89f5d54c6e6bb13cc6645d6e16600)] to 1000000000
       Storage size: 2124 bytes
       Paid storage size diff: 71 bytes
-      Consumed gas: 2377.244
+      Consumed gas: 1683.222
       Balance updates:
         [CONTRACT_HASH] ... -ꜩ0.01775
         storage fees ........................... +ꜩ0.01775
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_call_approve3.out b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_call_approve3.out
index 7cfa8f6be507c82f93ec7972b835633d747fa1ce..8444907b6ed1aea02477f06f5657e2628add8d92 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_call_approve3.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_call_approve3.out
@@ -1,7 +1,7 @@
 tests_alpha/test_liquidity_baking.py::TestAddApproveTransferRemove::test_call_approve3
 
 Node is bootstrapped.
-Estimated gas: 2377.244 units (will add 100 for safety)
+Estimated gas: 1683.222 units (will add 100 for safety)
 Estimated storage: 71 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -12,13 +12,13 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [CONTRACT_HASH]
-    Fee to the baker: ꜩ0.000558
+    Fee to the baker: ꜩ0.000489
     Expected counter: [EXPECTED_COUNTER]
-    Gas limit: 2478
+    Gas limit: 1784
     Storage limit: 91 bytes
     Balance updates:
-      [CONTRACT_HASH] ... -ꜩ0.000558
-      payload fees(the block proposer) ....... +ꜩ0.000558
+      [CONTRACT_HASH] ... -ꜩ0.000489
+      payload fees(the block proposer) ....... +ꜩ0.000489
     Transaction:
       Amount: ꜩ0
       From: [CONTRACT_HASH]
@@ -33,7 +33,7 @@ This sequence of operations was run:
               0x01d496def47a3be89f5d54c6e6bb13cc6645d6e16600)] to 1000000000
       Storage size: 2195 bytes
       Paid storage size diff: 71 bytes
-      Consumed gas: 2377.244
+      Consumed gas: 1683.222
       Balance updates:
         [CONTRACT_HASH] ... -ꜩ0.01775
         storage fees ........................... +ꜩ0.01775
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_call_mint_or_burn.out b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_call_mint_or_burn.out
index 1fc2cd7e5b86a6d4802435f424f8c91a7be8722c..1f9629edfaacb55d225a142412cb6ca8cf9d94d4 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_call_mint_or_burn.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_call_mint_or_burn.out
@@ -1,7 +1,7 @@
 tests_alpha/test_liquidity_baking.py::TestAddApproveTransferRemove::test_call_mint_or_burn
 
 Node is bootstrapped.
-Estimated gas: 4518.622 units (will add 100 for safety)
+Estimated gas: 3188.500 units (will add 100 for safety)
 Estimated storage: 71 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -12,13 +12,13 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [CONTRACT_HASH]
-    Fee to the baker: ꜩ0.000774
+    Fee to the baker: ꜩ0.000641
     Expected counter: [EXPECTED_COUNTER]
-    Gas limit: 4619
+    Gas limit: 3289
     Storage limit: 91 bytes
     Balance updates:
-      [CONTRACT_HASH] ... -ꜩ0.000774
-      payload fees(the block proposer) ....... +ꜩ0.000774
+      [CONTRACT_HASH] ... -ꜩ0.000641
+      payload fees(the block proposer) ....... +ꜩ0.000641
     Transaction:
       Amount: ꜩ0
       From: [CONTRACT_HASH]
@@ -32,7 +32,7 @@ This sequence of operations was run:
         Set map(0)[0x000002298c03ed7d454a101eb7022bc95f7e5f41ac78] to 100000000
       Storage size: 1982 bytes
       Paid storage size diff: 71 bytes
-      Consumed gas: 4519.306
+      Consumed gas: 3189.184
       Balance updates:
         [CONTRACT_HASH] ... -ꜩ0.01775
         storage fees ........................... +ꜩ0.01775
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_remove_liquidity.out b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_remove_liquidity.out
index 60f287e1ce240856ed020eb0a35784e5deb1d577..eb871abe59cba49c3bdf85da6c792ce091359cf9 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_remove_liquidity.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_remove_liquidity.out
@@ -1,7 +1,7 @@
 tests_alpha/test_liquidity_baking.py::TestAddApproveTransferRemove::test_remove_liquidity
 
 Node is bootstrapped.
-Estimated gas: 8595.186 units (will add 100 for safety)
+Estimated gas: 7972.902 units (will add 100 for safety)
 Estimated storage: 67 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -12,13 +12,13 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [CONTRACT_HASH]
-    Fee to the baker: ꜩ0.001222
+    Fee to the baker: ꜩ0.00116
     Expected counter: [EXPECTED_COUNTER]
-    Gas limit: 8696
+    Gas limit: 8073
     Storage limit: 87 bytes
     Balance updates:
-      [CONTRACT_HASH] ... -ꜩ0.001222
-      payload fees(the block proposer) ....... +ꜩ0.001222
+      [CONTRACT_HASH] ... -ꜩ0.00116
+      payload fees(the block proposer) ....... +ꜩ0.00116
     Transaction:
       Amount: ꜩ0
       From: [CONTRACT_HASH]
@@ -33,7 +33,7 @@ This sequence of operations was run:
           0x01e927f00ef734dfc85919635e9afc9166c83ef9fc00 ;
           0x0115eb0104481a6d7921160bc982c5e0a561cd8a3a00 }
       Storage size: 4633 bytes
-      Consumed gas: 2920.156
+      Consumed gas: 2281.561
     Internal operations:
       Transaction:
         Amount: ꜩ0
@@ -47,7 +47,7 @@ This sequence of operations was run:
         Updated big_maps:
           Unset map(2)[0x0000e7670f32038107a59a2b9cfefae36ea21f5aa63c]
         Storage size: 2048 bytes
-        Consumed gas: 1875.099
+        Consumed gas: 1873.367
       Transaction:
         Amount: ꜩ0
         From: [CONTRACT_HASH]
@@ -63,7 +63,7 @@ This sequence of operations was run:
           Set map(0)[0x0000e7670f32038107a59a2b9cfefae36ea21f5aa63c] to 10
         Storage size: 2330 bytes
         Paid storage size diff: 67 bytes
-        Consumed gas: 2379.931
+        Consumed gas: 2367.974
         Balance updates:
           [CONTRACT_HASH] ... -ꜩ0.01675
           storage fees ........................... +ꜩ0.01675
@@ -72,7 +72,7 @@ This sequence of operations was run:
         From: [CONTRACT_HASH]
         To: [CONTRACT_HASH]
         This transaction was successfully applied
-        Consumed gas: 1420
+        Consumed gas: 1450
         Balance updates:
           [CONTRACT_HASH] ... -ꜩ125.105747
           [CONTRACT_HASH] ... +ꜩ125.105747
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_add_liquidity.out b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_add_liquidity.out
index bf6e975dd8e5bb71e4c558e7f35b75d6daf03d03..11f376e47a688d4dc91b3ee67124d70f63e47e76 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_add_liquidity.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_add_liquidity.out
@@ -1,7 +1,7 @@
 tests_alpha/test_liquidity_baking.py::TestTrades::test_add_liquidity
 
 Node is bootstrapped.
-Estimated gas: 9883.730 units (will add 100 for safety)
+Estimated gas: 8526.831 units (will add 100 for safety)
 Estimated storage: 141 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -12,13 +12,13 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [CONTRACT_HASH]
-    Fee to the baker: ꜩ0.001354
+    Fee to the baker: ꜩ0.001218
     Expected counter: [EXPECTED_COUNTER]
-    Gas limit: 9984
+    Gas limit: 8627
     Storage limit: 161 bytes
     Balance updates:
-      [CONTRACT_HASH] ... -ꜩ0.001354
-      payload fees(the block proposer) ....... +ꜩ0.001354
+      [CONTRACT_HASH] ... -ꜩ0.001218
+      payload fees(the block proposer) ....... +ꜩ0.001218
     Transaction:
       Amount: ꜩ9001
       From: [CONTRACT_HASH]
@@ -34,7 +34,7 @@ This sequence of operations was run:
           0x0115eb0104481a6d7921160bc982c5e0a561cd8a3a00 }
       Storage size: 4633 bytes
       Paid storage size diff: 3 bytes
-      Consumed gas: 5091.529
+      Consumed gas: 3787.849
       Balance updates:
         [CONTRACT_HASH] ... -ꜩ0.00075
         storage fees ........................... +ꜩ0.00075
@@ -58,7 +58,7 @@ This sequence of operations was run:
           Set map(0)[0x01d496def47a3be89f5d54c6e6bb13cc6645d6e16600] to 721
         Storage size: 2263 bytes
         Paid storage size diff: 68 bytes
-        Consumed gas: 3097.176
+        Consumed gas: 3065.689
         Balance updates:
           [CONTRACT_HASH] ... -ꜩ0.017
           storage fees ........................... +ꜩ0.017
@@ -75,7 +75,7 @@ This sequence of operations was run:
           Set map(2)[0x000002298c03ed7d454a101eb7022bc95f7e5f41ac78] to 72007
         Storage size: 2048 bytes
         Paid storage size diff: 70 bytes
-        Consumed gas: 1695.025
+        Consumed gas: 1673.293
         Balance updates:
           [CONTRACT_HASH] ... -ꜩ0.0175
           storage fees ........................... +ꜩ0.0175
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_buy_tok.out b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_buy_tok.out
index 8b0d852194af4cbbc3e34d9a0a51d28f3857b4df..4072b33b4984326bf03ff61d8fa5de38d79008d2 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_buy_tok.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_buy_tok.out
@@ -1,7 +1,7 @@
 tests_alpha/test_liquidity_baking.py::TestTrades::test_buy_tok
 
 Node is bootstrapped.
-Estimated gas: 6207.028 units (will add 100 for safety)
+Estimated gas: 5568.103 units (will add 100 for safety)
 Estimated storage: 326 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -12,13 +12,13 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [CONTRACT_HASH]
-    Fee to the baker: ꜩ0.000978
+    Fee to the baker: ꜩ0.000914
     Expected counter: [EXPECTED_COUNTER]
-    Gas limit: 6308
+    Gas limit: 5669
     Storage limit: 346 bytes
     Balance updates:
-      [CONTRACT_HASH] ... -ꜩ0.000978
-      payload fees(the block proposer) ....... +ꜩ0.000978
+      [CONTRACT_HASH] ... -ꜩ0.000914
+      payload fees(the block proposer) ....... +ꜩ0.000914
     Transaction:
       Amount: ꜩ9001
       From: [CONTRACT_HASH]
@@ -34,7 +34,7 @@ This sequence of operations was run:
           0x0115eb0104481a6d7921160bc982c5e0a561cd8a3a00 }
       Storage size: 4634 bytes
       Paid storage size diff: 1 bytes
-      Consumed gas: 2407.093
+      Consumed gas: 1750.125
       Balance updates:
         [CONTRACT_HASH] ... -ꜩ0.00025
         storage fees ........................... +ꜩ0.00025
@@ -56,7 +56,7 @@ This sequence of operations was run:
           Set map(0)[0x0000e7670f32038107a59a2b9cfefae36ea21f5aa63c] to 360
         Storage size: 2331 bytes
         Paid storage size diff: 68 bytes
-        Consumed gas: 2379.935
+        Consumed gas: 2367.978
         Balance updates:
           [CONTRACT_HASH] ... -ꜩ0.017
           storage fees ........................... +ꜩ0.017
@@ -65,7 +65,7 @@ This sequence of operations was run:
         From: [CONTRACT_HASH]
         To: [CONTRACT_HASH]
         This transaction was successfully applied
-        Consumed gas: 1420
+        Consumed gas: 1450
         Balance updates:
           [CONTRACT_HASH] ... -ꜩ9.001
           [CONTRACT_HASH] ... +ꜩ9.001
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_call_approve1.out b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_call_approve1.out
index 5aeb323a1116504391b7771564f14550d78deea3..82625aed70d1687c119e833c34f1664308bbce75 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_call_approve1.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_call_approve1.out
@@ -1,7 +1,7 @@
 tests_alpha/test_liquidity_baking.py::TestTrades::test_call_approve1
 
 Node is bootstrapped.
-Estimated gas: 2377.244 units (will add 100 for safety)
+Estimated gas: 1683.222 units (will add 100 for safety)
 Estimated storage: 71 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -12,13 +12,13 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [CONTRACT_HASH]
-    Fee to the baker: ꜩ0.000558
+    Fee to the baker: ꜩ0.000489
     Expected counter: [EXPECTED_COUNTER]
-    Gas limit: 2478
+    Gas limit: 1784
     Storage limit: 91 bytes
     Balance updates:
-      [CONTRACT_HASH] ... -ꜩ0.000558
-      payload fees(the block proposer) ....... +ꜩ0.000558
+      [CONTRACT_HASH] ... -ꜩ0.000489
+      payload fees(the block proposer) ....... +ꜩ0.000489
     Transaction:
       Amount: ꜩ0
       From: [CONTRACT_HASH]
@@ -33,7 +33,7 @@ This sequence of operations was run:
               0x01d496def47a3be89f5d54c6e6bb13cc6645d6e16600)] to 1000000000
       Storage size: 2053 bytes
       Paid storage size diff: 71 bytes
-      Consumed gas: 2377.244
+      Consumed gas: 1683.222
       Balance updates:
         [CONTRACT_HASH] ... -ꜩ0.01775
         storage fees ........................... +ꜩ0.01775
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_call_approve2.out b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_call_approve2.out
index d63593dabe5a5f298b4d1544c1f7253026a2e2c0..4f9f0399a960c1dc7d9289edb1a3711268e85f0b 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_call_approve2.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_call_approve2.out
@@ -1,7 +1,7 @@
 tests_alpha/test_liquidity_baking.py::TestTrades::test_call_approve2
 
 Node is bootstrapped.
-Estimated gas: 2377.244 units (will add 100 for safety)
+Estimated gas: 1683.222 units (will add 100 for safety)
 Estimated storage: 71 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -12,13 +12,13 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [CONTRACT_HASH]
-    Fee to the baker: ꜩ0.000558
+    Fee to the baker: ꜩ0.000489
     Expected counter: [EXPECTED_COUNTER]
-    Gas limit: 2478
+    Gas limit: 1784
     Storage limit: 91 bytes
     Balance updates:
-      [CONTRACT_HASH] ... -ꜩ0.000558
-      payload fees(the block proposer) ....... +ꜩ0.000558
+      [CONTRACT_HASH] ... -ꜩ0.000489
+      payload fees(the block proposer) ....... +ꜩ0.000489
     Transaction:
       Amount: ꜩ0
       From: [CONTRACT_HASH]
@@ -33,7 +33,7 @@ This sequence of operations was run:
               0x01d496def47a3be89f5d54c6e6bb13cc6645d6e16600)] to 1000000000
       Storage size: 2124 bytes
       Paid storage size diff: 71 bytes
-      Consumed gas: 2377.244
+      Consumed gas: 1683.222
       Balance updates:
         [CONTRACT_HASH] ... -ꜩ0.01775
         storage fees ........................... +ꜩ0.01775
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_call_approve3.out b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_call_approve3.out
index 6e34c7523d6947f656cb55a7617237a874e8e296..88196ec7f548117d21ac0c92151d91e522dadc67 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_call_approve3.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_call_approve3.out
@@ -1,7 +1,7 @@
 tests_alpha/test_liquidity_baking.py::TestTrades::test_call_approve3
 
 Node is bootstrapped.
-Estimated gas: 2377.244 units (will add 100 for safety)
+Estimated gas: 1683.222 units (will add 100 for safety)
 Estimated storage: 71 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -12,13 +12,13 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [CONTRACT_HASH]
-    Fee to the baker: ꜩ0.000558
+    Fee to the baker: ꜩ0.000489
     Expected counter: [EXPECTED_COUNTER]
-    Gas limit: 2478
+    Gas limit: 1784
     Storage limit: 91 bytes
     Balance updates:
-      [CONTRACT_HASH] ... -ꜩ0.000558
-      payload fees(the block proposer) ....... +ꜩ0.000558
+      [CONTRACT_HASH] ... -ꜩ0.000489
+      payload fees(the block proposer) ....... +ꜩ0.000489
     Transaction:
       Amount: ꜩ0
       From: [CONTRACT_HASH]
@@ -33,7 +33,7 @@ This sequence of operations was run:
               0x01d496def47a3be89f5d54c6e6bb13cc6645d6e16600)] to 1000000000
       Storage size: 2195 bytes
       Paid storage size diff: 71 bytes
-      Consumed gas: 2377.244
+      Consumed gas: 1683.222
       Balance updates:
         [CONTRACT_HASH] ... -ꜩ0.01775
         storage fees ........................... +ꜩ0.01775
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_call_mint_or_burn.out b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_call_mint_or_burn.out
index e8c3e919cd29305d58a5483159fbdb7fec4809f7..354adbe591d4ecb98ba78561f53e5a13a20882f3 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_call_mint_or_burn.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_call_mint_or_burn.out
@@ -1,7 +1,7 @@
 tests_alpha/test_liquidity_baking.py::TestTrades::test_call_mint_or_burn
 
 Node is bootstrapped.
-Estimated gas: 4518.622 units (will add 100 for safety)
+Estimated gas: 3188.500 units (will add 100 for safety)
 Estimated storage: 71 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -12,13 +12,13 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [CONTRACT_HASH]
-    Fee to the baker: ꜩ0.000774
+    Fee to the baker: ꜩ0.000641
     Expected counter: [EXPECTED_COUNTER]
-    Gas limit: 4619
+    Gas limit: 3289
     Storage limit: 91 bytes
     Balance updates:
-      [CONTRACT_HASH] ... -ꜩ0.000774
-      payload fees(the block proposer) ....... +ꜩ0.000774
+      [CONTRACT_HASH] ... -ꜩ0.000641
+      payload fees(the block proposer) ....... +ꜩ0.000641
     Transaction:
       Amount: ꜩ0
       From: [CONTRACT_HASH]
@@ -32,7 +32,7 @@ This sequence of operations was run:
         Set map(0)[0x000002298c03ed7d454a101eb7022bc95f7e5f41ac78] to 100000000
       Storage size: 1982 bytes
       Paid storage size diff: 71 bytes
-      Consumed gas: 4519.306
+      Consumed gas: 3189.184
       Balance updates:
         [CONTRACT_HASH] ... -ꜩ0.01775
         storage fees ........................... +ꜩ0.01775
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_sell_tok.out b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_sell_tok.out
index 26eb5380491698b406da1b10cb1855e8c2d0d1c0..e4463c8b023c556b4810f07e85f05466bf067262 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_sell_tok.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_sell_tok.out
@@ -1,7 +1,7 @@
 tests_alpha/test_liquidity_baking.py::TestTrades::test_sell_tok
 
 Node is bootstrapped.
-Estimated gas: 8525.424 units (will add 100 for safety)
+Estimated gas: 7916.814 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -12,13 +12,13 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [CONTRACT_HASH]
-    Fee to the baker: ꜩ0.001208
+    Fee to the baker: ꜩ0.001147
     Expected counter: [EXPECTED_COUNTER]
-    Gas limit: 8626
+    Gas limit: 8017
     Storage limit: 0 bytes
     Balance updates:
-      [CONTRACT_HASH] ... -ꜩ0.001208
-      payload fees(the block proposer) ....... +ꜩ0.001208
+      [CONTRACT_HASH] ... -ꜩ0.001147
+      payload fees(the block proposer) ....... +ꜩ0.001147
     Transaction:
       Amount: ꜩ0
       From: [CONTRACT_HASH]
@@ -33,7 +33,7 @@ This sequence of operations was run:
           0x01e927f00ef734dfc85919635e9afc9166c83ef9fc00 ;
           0x0115eb0104481a6d7921160bc982c5e0a561cd8a3a00 }
       Storage size: 4633 bytes
-      Consumed gas: 2408.212
+      Consumed gas: 1751.089
     Internal operations:
       Transaction:
         Amount: ꜩ0
@@ -51,13 +51,13 @@ This sequence of operations was run:
           Unset map(0)[0x0000dac9f52543da1aed0bc1d6b46bf7c10db7014cd6]
           Set map(0)[0x01d496def47a3be89f5d54c6e6bb13cc6645d6e16600] to 461
         Storage size: 2331 bytes
-        Consumed gas: 3277.212
+        Consumed gas: 3265.725
       Transaction:
         Amount: ꜩ3891.966034
         From: [CONTRACT_HASH]
         To: [CONTRACT_HASH]
         This transaction was successfully applied
-        Consumed gas: 1420
+        Consumed gas: 1450
         Balance updates:
           [CONTRACT_HASH] ... -ꜩ3891.966034
           [CONTRACT_HASH] ... +ꜩ3891.966034
@@ -66,7 +66,7 @@ This sequence of operations was run:
         From: [CONTRACT_HASH]
         To: [CONTRACT_HASH]
         This transaction was successfully applied
-        Consumed gas: 1420
+        Consumed gas: 1450
         Balance updates:
           [CONTRACT_HASH] ... -ꜩ3.895862
           [CONTRACT_HASH] ... +ꜩ3.895862
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_transfer.out b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_transfer.out
index 18a5cec83b7e70feefa8751356b63c366e18dfa1..76fe5b38eb7e99e74ffc8d5e4ab1de1bf5e1f912 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_transfer.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_transfer.out
@@ -1,7 +1,7 @@
 tests_alpha/test_liquidity_baking.py::TestTrades::test_transfer
 
 Node is bootstrapped.
-Estimated gas: 3681.235 units (will add 100 for safety)
+Estimated gas: 2383.278 units (will add 100 for safety)
 Estimated storage: 68 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -12,13 +12,13 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [CONTRACT_HASH]
-    Fee to the baker: ꜩ0.000736
+    Fee to the baker: ꜩ0.000606
     Expected counter: [EXPECTED_COUNTER]
-    Gas limit: 3782
+    Gas limit: 2484
     Storage limit: 88 bytes
     Balance updates:
-      [CONTRACT_HASH] ... -ꜩ0.000736
-      payload fees(the block proposer) ....... +ꜩ0.000736
+      [CONTRACT_HASH] ... -ꜩ0.000606
+      payload fees(the block proposer) ....... +ꜩ0.000606
     Transaction:
       Amount: ꜩ0
       From: [CONTRACT_HASH]
@@ -35,7 +35,7 @@ This sequence of operations was run:
         Set map(0)[0x0000e7670f32038107a59a2b9cfefae36ea21f5aa63c] to 260
       Storage size: 2399 bytes
       Paid storage size diff: 68 bytes
-      Consumed gas: 3681.235
+      Consumed gas: 2383.278
       Balance updates:
         [CONTRACT_HASH] ... -ꜩ0.017
         storage fees ........................... +ꜩ0.017
diff --git a/tests_python/tests_alpha/test_contract.py b/tests_python/tests_alpha/test_contract.py
index 15d011faf98a3c41485ca02b4a4c89fde2261659..a004f160c78dc1b3a5ed29da606650743d294708 100644
--- a/tests_python/tests_alpha/test_contract.py
+++ b/tests_python/tests_alpha/test_contract.py
@@ -156,7 +156,7 @@ class TestManager:
         utils.bake(client, bake_for='bootstrap5')
         new_balance = client.get_mutez_balance('manager')
         new_balance_bootstrap = client.get_mutez_balance('bootstrap2')
-        fee = 0.000585
+        fee = 0.000587
         fee_mutez = utils.mutez_of_tez(fee)
         assert balance - amount_mutez == new_balance
         assert (
@@ -180,7 +180,7 @@ class TestManager:
         new_balance = client.get_mutez_balance('manager')
         new_balance_dest = client.get_mutez_balance('manager2')
         new_balance_bootstrap = client.get_mutez_balance('bootstrap2')
-        fee = 0.000787
+        fee = 0.000731
         fee_mutez = utils.mutez_of_tez(fee)
         assert balance - amount_mutez == new_balance
         assert balance_dest + amount_mutez == new_balance_dest
diff --git a/tests_python/tests_alpha/test_multiple_transfers.py b/tests_python/tests_alpha/test_multiple_transfers.py
index cf2309464f54d92250c0c5e0dcf586974ae90f53..39c1fad2b2e61a260e6be03dfb4f7d15cd5d98c6 100644
--- a/tests_python/tests_alpha/test_multiple_transfers.py
+++ b/tests_python/tests_alpha/test_multiple_transfers.py
@@ -119,8 +119,8 @@ class TestMultipleTransfers:
         new_balance_bootstrap3 = client.get_mutez_balance('bootstrap3')
 
         if payer == source:
-            fee_first_transfer = 394
-            fee_second_transfer = 298
+            fee_first_transfer = 397
+            fee_second_transfer = 301
             source_fee_mutez = fee_first_transfer + fee_second_transfer
         else:
             source_fee_mutez = 0
diff --git a/tezt/_regressions/hash_data/good.out b/tezt/_regressions/hash_data/good.out
index 3b3bfe101d8a324bf6654624481677a2e831dbd2..60893658e3446e5c08d72b726fbc0033fb96e9a5 100644
--- a/tezt/_regressions/hash_data/good.out
+++ b/tezt/_regressions/hash_data/good.out
@@ -160,7 +160,7 @@ Raw Script-expression-ID-Hash: 0x698c356a1846c517db5b16f7a8ff507c3eb4aaa46c316a6
 Ledger Blake2b hash: 871oxBK1GsehvbFAwL4bBF4w22oBKfxom746gk7wnr8d
 Raw Sha256 hash: 0xa5f6f6520cfa43309e72f6745efcbebc1edd1486ab219421e349c8000ddfe485
 Raw Sha512 hash: 0x4618bdd8850b8707c52bbf7f64526f8d83e59ccb3f2f1067ca33b5c470c709be21dc9242db15d5428af7b13dfb77353ab39d9367e2a6a12986e95aaf2d4285a7
-Gas remaining: 1039338.887 units remaining
+Gas remaining: 1039992.117 units remaining
 
 ./tezos-client --mode mockup hash data '"[CONTRACT_HASH]%entrypoint"' of type address
 Raw packed data: 0x050a00000020011d23c1d3d2f8a4ea5e8784b8f7ecf2ad304c0fe600656e747279706f696e74
@@ -169,7 +169,7 @@ Raw Script-expression-ID-Hash: 0x31241f23ec93014cd7b7cfe1e0a21517bfd0f08b38e348d
 Ledger Blake2b hash: 4JpvZAMQiWdgASBEyfLJB45oCrsFocB5ApSNa99DbRPZ
 Raw Sha256 hash: 0xf1c661a1663f788977e3508c6fe3c85346a34101d76b1d47783839ed2d756303
 Raw Sha512 hash: 0x781bd064edc01ff80b436682932dd2f0550a6dbf26be32ac434c6386235f4b4c5bb4610b9fad23374d606dcf853a7e16fcce4e3c20fd796e116adb587cdddcbd
-Gas remaining: 1039338.556 units remaining
+Gas remaining: 1039991.786 units remaining
 
 ./tezos-client --mode mockup hash data '"[PUBLIC_KEY_HASH]"' of type address
 Raw packed data: 0x050a00000016000002298c03ed7d454a101eb7022bc95f7e5f41ac78
@@ -178,7 +178,7 @@ Raw Script-expression-ID-Hash: 0x644beb3894b35023de5b76a4c054a32eb7a818b2a83a1b0
 Ledger Blake2b hash: 7kWuwaa65KxeAcBTC9U9TvSn4d7eo4hzmTReXrFU6QA1
 Raw Sha256 hash: 0x690cf3688186dafd5f78765b514f62ebf98804ed4732d3e9504d1e5d10f62c64
 Raw Sha512 hash: 0x9fe6e4a006013a541dde89aeef0db58a39c1b6d06f12554c8d01dc67dff183602d4e5d4a04ac37088d8e7e7836d08f044b279bc70a752b3ad3f1ed0131a9ea03
-Gas remaining: 1039338.887 units remaining
+Gas remaining: 1039992.117 units remaining
 
 ./tezos-client --mode mockup hash data '"[PUBLIC_KEY_HASH]"' of type address
 Raw packed data: 0x050a000000160001e5c6d1f726796e98b2bad2a819a36f742b2fe25b
@@ -187,7 +187,7 @@ Raw Script-expression-ID-Hash: 0x102dff270630ac032e24ae0a62b478930f56f4f5a27c9c3
 Ledger Blake2b hash: 26ACmTEYpcjnxbUcXQZxYQgWbig1zpHXpmjKecLqMJEH
 Raw Sha256 hash: 0xc7016dde1b3b0a15dbfc476de05480386d8781f996769b0113bcf8d3a0f73502
 Raw Sha512 hash: 0x8446a69748c9e209bbd9e2d7ec652b3edd1516905b2ef11008993c27d239a237b3372c26854b8a1d393aa504478de76560a9fdd96fef24faff8483851814c6c7
-Gas remaining: 1039338.887 units remaining
+Gas remaining: 1039992.117 units remaining
 
 ./tezos-client --mode mockup hash data '"[PUBLIC_KEY_HASH]"' of type address
 Raw packed data: 0x050a0000001600026c9b3ad59e0f8bdc2bd2011675825f9f547131da
@@ -196,7 +196,7 @@ Raw Script-expression-ID-Hash: 0x85e36142a913e3c8d6fb5a77aaad753b01ebe40096bf460
 Ledger Blake2b hash: A1eKYfrX11WNdtxr3QeEzEpY95epaJtJhmeTQEhw3BTg
 Raw Sha256 hash: 0x1520063584bffabc0cc4d64d1d9f35c205ee403789653fef4465fad7da23a484
 Raw Sha512 hash: 0xe8fa1be3ab9fc177a731fdea29e3242831ccea70db15fa5f0dd8f592794261c9e49b51311e0b5387a81472c77edd87cba3afa6207e36ef0bce7f30b0c03bacb0
-Gas remaining: 1039338.887 units remaining
+Gas remaining: 1039992.117 units remaining
 
 ./tezos-client --mode mockup hash data 0 of type bls12_381_fr
 Raw packed data: 0x050a000000200000000000000000000000000000000000000000000000000000000000000000
@@ -205,7 +205,7 @@ Raw Script-expression-ID-Hash: 0xe68feee8b6ba14292b006b585748c4bd4757955f04320ef
 Ledger Blake2b hash: GX24pFg5TqeFyCjH3dpXHP3tWZs8ZMm4MVo61DQnXRzo
 Raw Sha256 hash: 0xc928f798bdcab5fc59c9c06f348c2b1dd1d846ef8d2694ff3359a7fa98e5aaf1
 Raw Sha512 hash: 0x56d50c63bacfbac2102091e99071b824150d2c61cbfba9b65a9bad467f1e364a3e1286b0c5de1e7084c7dd3d27a29c19ecbac42d4f5d7797c003b75063f688b4
-Gas remaining: 1039998.226 units remaining
+Gas remaining: 1039998.256 units remaining
 
 ./tezos-client --mode mockup hash data 1 of type bls12_381_fr
 Raw packed data: 0x050a000000200100000000000000000000000000000000000000000000000000000000000000
@@ -214,7 +214,7 @@ Raw Script-expression-ID-Hash: 0x152ad70bf1a27b6885d3085953411591cbeccd289c0c9fa
 Ledger Blake2b hash: 2RdT5REqvvzsKNsc2wkGeVcve9j8srXqAqbz6ZPECHi3
 Raw Sha256 hash: 0x251c21e3c764b0993d4e49a7939ebc0192c9af7f6fbb5073f1035ea17a2cbe22
 Raw Sha512 hash: 0x31a063e0701b89ff1a19364d44c39c7ba28fbeb20b95e5a12be432fcc419666fcf030ed6349e3bca6f7446989b5cb9fb3b4425c4eff01ca1993efca695db199b
-Gas remaining: 1039998.226 units remaining
+Gas remaining: 1039998.256 units remaining
 
 ./tezos-client --mode mockup hash data 0x01 of type bls12_381_fr
 Raw packed data: 0x050a000000200100000000000000000000000000000000000000000000000000000000000000
@@ -223,7 +223,7 @@ Raw Script-expression-ID-Hash: 0x152ad70bf1a27b6885d3085953411591cbeccd289c0c9fa
 Ledger Blake2b hash: 2RdT5REqvvzsKNsc2wkGeVcve9j8srXqAqbz6ZPECHi3
 Raw Sha256 hash: 0x251c21e3c764b0993d4e49a7939ebc0192c9af7f6fbb5073f1035ea17a2cbe22
 Raw Sha512 hash: 0x31a063e0701b89ff1a19364d44c39c7ba28fbeb20b95e5a12be432fcc419666fcf030ed6349e3bca6f7446989b5cb9fb3b4425c4eff01ca1993efca695db199b
-Gas remaining: 1039998.226 units remaining
+Gas remaining: 1039998.256 units remaining
 
 ./tezos-client --mode mockup hash data 0x0001 of type bls12_381_fr
 Raw packed data: 0x050a000000200001000000000000000000000000000000000000000000000000000000000000
@@ -232,7 +232,7 @@ Raw Script-expression-ID-Hash: 0x1b460a4d53d8b7029da22adfcaa257555be45259e348069
 Ledger Blake2b hash: 2qTxCogJudjrxMBHHvtNsurx1dc1P9Gx1JPUbBaJXDre
 Raw Sha256 hash: 0xe7038c6478963c7e52c61c9590b774280cfacf0547adc4943a26a608bdb0f277
 Raw Sha512 hash: 0x70e7340161a29e3dc08258b154fc797e2ea407ed35dcaf7782e0ad693906c75d15fd68887f2b03375f5c869c9912c390d020b47aee1ca6d20c5ac714c45b678e
-Gas remaining: 1039998.226 units remaining
+Gas remaining: 1039998.256 units remaining
 
 ./tezos-client --mode mockup hash data 0x0572cbea904d67468808c8eb50a9450c9721db309128012543902d0ac358a62ae28f75bb8f1c7c42c39a8c5529bf0f4e166a9d8cabc673a322fda673779d8e3822ba3ecb8670e461f73bb9021d5fd76a4c56d9d4cd16bd1bba86881979749d28 of type bls12_381_g1
 Raw packed data: 0x050a000000600572cbea904d67468808c8eb50a9450c9721db309128012543902d0ac358a62ae28f75bb8f1c7c42c39a8c5529bf0f4e166a9d8cabc673a322fda673779d8e3822ba3ecb8670e461f73bb9021d5fd76a4c56d9d4cd16bd1bba86881979749d28
@@ -241,7 +241,7 @@ Raw Script-expression-ID-Hash: 0xab8f542bd84f792908f266964e5329c1532fd6e932de8c3
 Ledger Blake2b hash: CYhUfj7xreN4aQ1vV8YWApwu8o1Yuhuv9JrHKdFivGuN
 Raw Sha256 hash: 0xeb0effa0878f7c1dfba8a579b282f45ae24715eebc01929bad29dcd9ab44d4da
 Raw Sha512 hash: 0x918f9b3b2b615817b4108beca643225a11796825fb00a9126c950f59afbf95364b11ac468150e6fd458b01d1ad3d77ccb0c08a2849e9262e66058014c41cd487
-Gas remaining: 1039927.840 units remaining
+Gas remaining: 1039938.540 units remaining
 
 ./tezos-client --mode mockup hash data 0x0a4edef9c1ed7f729f520e47730a124fd70662a904ba1074728114d1031e1572c6c886f6b57ec72a6178288c47c335771638533957d540a9d2370f17cc7ed5863bc0b995b8825e0ee1ea1e1e4d00dbae81f14b0bf3611b78c952aacab827a0530f6d4552fa65dd2638b361543f887136a43253d9c66c411697003f7a13c308f5422e1aa0a59c8967acdefd8b6e36ccf30468fb440d82b0630aeb8dca2b5256789a66da69bf91009cbfe6bd221e47aa8ae88dece9764bf3bd999d95d71e4c9899 of type bls12_381_g2
 Raw packed data: 0x050a000000c00a4edef9c1ed7f729f520e47730a124fd70662a904ba1074728114d1031e1572c6c886f6b57ec72a6178288c47c335771638533957d540a9d2370f17cc7ed5863bc0b995b8825e0ee1ea1e1e4d00dbae81f14b0bf3611b78c952aacab827a0530f6d4552fa65dd2638b361543f887136a43253d9c66c411697003f7a13c308f5422e1aa0a59c8967acdefd8b6e36ccf30468fb440d82b0630aeb8dca2b5256789a66da69bf91009cbfe6bd221e47aa8ae88dece9764bf3bd999d95d71e4c9899
@@ -250,7 +250,7 @@ Raw Script-expression-ID-Hash: 0xc0d91f9ad81185f09853efcfc5951eca5c19f9b983808d8
 Ledger Blake2b hash: DyoJaUpE63MSnYEmW1pBQCK4DjLCURe2My2snWkmyC9S
 Raw Sha256 hash: 0xa160577bd9510066d5aa8043d4ce365f03a4f5057516d951c380a521c04fddd8
 Raw Sha512 hash: 0xb0ce4a3348adff71470fc470d700b28fd991a91d4013cc6d89bd34a2f1c05f9d0be5cfe64f6b5d79fdbc27eb3e84be520e4e2d864d6b6649722b22061bbfbd7b
-Gas remaining: 1039915.966 units remaining
+Gas remaining: 1039920.266 units remaining
 
 ./tezos-client --mode mockup hash data 0x of type bytes
 Raw packed data: 0x050a00000000
@@ -331,7 +331,7 @@ Raw Script-expression-ID-Hash: 0xf0147b0fcd9ed958297e3e663f25d0427f7f70576f22047
 Ledger Blake2b hash: HAAxipLZ7LdX9GLgN7p1bX9KneQ82FcCsss3YicsKaAS
 Raw Sha256 hash: 0x077e8b5d0b528d84284d773f8cc36da052248bb96c341d68d51b86e0ce098262
 Raw Sha512 hash: 0x7553bc601c56a361eb537e2bcba685ae6fbf3b68003bd9426db318352db433445aee770bab94631ce5bdf29b948caf1665e208c9be33d8b70fa67d2839d4a16a
-Gas remaining: 1039998.839 units remaining
+Gas remaining: 1039998.999 units remaining
 
 ./tezos-client --mode mockup hash data '{ PUSH nat 1; ADD }' of type 'lambda nat nat'
 Raw packed data: 0x0502000000080743036200010312
@@ -340,7 +340,7 @@ Raw Script-expression-ID-Hash: 0x42a0dcc26c782dcc094ba725e4bcc4f8710c72203a895b5
 Ledger Blake2b hash: 5V6BBTaoBmSdwu8pv5xNMNBwm1mQGdPJ8e8N3s22Gcwp
 Raw Sha256 hash: 0x113616e40fd9fcf4cb73a9cf9c57fc0ab1853fa4432b9ca975b472d0173bc007
 Raw Sha512 hash: 0x2256250f59e3c1c708eae9aa4d6f7d2dafdf82cb12b872db8320048c0dab3e225e96e846e284382fcfc832b83f0bf3ee3945fc6936357b2c29d96f29ba90315a
-Gas remaining: 1039997.116 units remaining
+Gas remaining: 1039997.276 units remaining
 
 ./tezos-client --mode mockup hash data '{}' of type 'list unit'
 Raw packed data: 0x050200000000
@@ -574,7 +574,7 @@ Raw Script-expression-ID-Hash: 0x73bb27e87ad251d54484fc93a59fac977e3e1af83dfaaa3
 Ledger Blake2b hash: 8nmQbgYU3gU2uTXAoJ77miKgQicBLCYYWtnoLzvF5k7Q
 Raw Sha256 hash: 0x883ec8d70eeb0beb91bb34dbb5a9a49ffdbe79fd99d8a5fe2b5b508381597bce
 Raw Sha512 hash: 0x2b7e8c38c164c6fd93d454fc2ac07122c45616cc616e2789bfb77cc023ef005cf97c8fb8e7c38565d52d0a5fd941a5be0e26e0fd323261069445b89f7ba6086a
-Gas remaining: 1039999.381 units remaining
+Gas remaining: 1039998.651 units remaining
 
 ./tezos-client --mode mockup hash data 1571659294 of type timestamp
 Raw packed data: 0x05009ef8ecda0b
diff --git a/tezt/_regressions/run_views.out b/tezt/_regressions/run_views.out
index 79fa8a0efa0085bea7371d8ca44bd3bbcb3e6e61..e5a184579103b6faa7395f6bba06f99524ad9139 100644
--- a/tezt/_regressions/run_views.out
+++ b/tezt/_regressions/run_views.out
@@ -14,20 +14,20 @@ view "calls_count" unit nat { CDR ; SIZE };
 view "last_caller" unit (option address) { CDR ; IF_CONS { DIP { DROP } ; SOME } { NONE address } };
 ' --init '{}' --burn-cap 1
 Node is bootstrapped.
-Estimated gas: 1428.389 units (will add 100 for safety)
+Estimated gas: 1426.629 units (will add 100 for safety)
 Estimated storage: 409 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
-Operation hash is 'opMEqaWvCQxSydDPwdqpsCwjnCmgiLhpouq5LovBLGCvMVpgCpk'
+Operation hash is 'oow4SAcGS9xTtTqPKayDoSUrkfkNQRoPKE1pN1JuviFG2YrF6GY'
 NOT waiting for the operation to be included.
 Use command
-  tezos-client wait for opMEqaWvCQxSydDPwdqpsCwjnCmgiLhpouq5LovBLGCvMVpgCpk to be included --confirmations 1 --branch BLockGenesisGenesisGenesisGenesisGenesisCCCCCeZiLHU
+  tezos-client wait for oow4SAcGS9xTtTqPKayDoSUrkfkNQRoPKE1pN1JuviFG2YrF6GY to be included --confirmations 1 --branch BLockGenesisGenesisGenesisGenesisGenesisCCCCCeZiLHU
 and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx
     Fee to the baker: ꜩ0.000532
     Expected counter: 1
-    Gas limit: 1529
+    Gas limit: 1527
     Storage limit: 429 bytes
     Balance updates:
       tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx ... -ꜩ0.000532
@@ -48,17 +48,17 @@ This sequence of operations was run:
         No delegate for this contract
         This origination was successfully applied
         Originated contracts:
-          KT1TLT2cXZCtenEAXzkndiAQGJXWenkwThRv
+          KT1LfQjDNgPpdwMHbhzyQcD8GTE2L4rwxxpN
         Storage size: 152 bytes
         Paid storage size diff: 152 bytes
-        Consumed gas: 1428.389
+        Consumed gas: 1426.629
         Balance updates:
           tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx ... -ꜩ0.038
           storage fees ........................... +ꜩ0.038
           tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx ... -ꜩ0.06425
           storage fees ........................... +ꜩ0.06425
 
-New contract KT1TLT2cXZCtenEAXzkndiAQGJXWenkwThRv originated.
+New contract KT1LfQjDNgPpdwMHbhzyQcD8GTE2L4rwxxpN originated.
 Contract memorized as register_calls.
 
 ./tezos-client --mode mockup --base-dir '<masked>' --wait none originate contract check_caller transferring 0 from bootstrap1 running '
@@ -89,24 +89,24 @@ code {
      }
    ' --init None --burn-cap 1
 Node is bootstrapped.
-Estimated gas: 1450.510 units (will add 100 for safety)
+Estimated gas: 1449.230 units (will add 100 for safety)
 Estimated storage: 465 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
-Operation hash is 'ooToBC9P3HGdhPJ1Dhq9gdQFF79cYzJMiYXgvo86DMCMvMknJXg'
+Operation hash is 'onrV7eJG7EJRrVp6BLHozvqDM2nNTrYHWmNNMh1AxvHsAmF6wYP'
 NOT waiting for the operation to be included.
 Use command
-  tezos-client wait for ooToBC9P3HGdhPJ1Dhq9gdQFF79cYzJMiYXgvo86DMCMvMknJXg to be included --confirmations 1 --branch BLockGenesisGenesisGenesisGenesisGenesisCCCCCeZiLHU
+  tezos-client wait for onrV7eJG7EJRrVp6BLHozvqDM2nNTrYHWmNNMh1AxvHsAmF6wYP to be included --confirmations 1 --branch BLockGenesisGenesisGenesisGenesisGenesisCCCCCeZiLHU
 and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx
-    Fee to the baker: ꜩ0.000591
+    Fee to the baker: ꜩ0.00059
     Expected counter: 2
-    Gas limit: 1551
+    Gas limit: 1550
     Storage limit: 485 bytes
     Balance updates:
-      tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx ... -ꜩ0.000591
-      payload fees(the block proposer) ....... +ꜩ0.000591
+      tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx ... -ꜩ0.00059
+      payload fees(the block proposer) ....... +ꜩ0.00059
     Origination:
       From: tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx
       Credit: ꜩ0
@@ -131,122 +131,122 @@ This sequence of operations was run:
         No delegate for this contract
         This origination was successfully applied
         Originated contracts:
-          KT1LvTWVW1cc4DeSPCseMsiPdDDkTKvMrNZb
+          KT1RdnquZZf4Y4ZDJvaEuY4cbam3xor3CffU
         Storage size: 208 bytes
         Paid storage size diff: 208 bytes
-        Consumed gas: 1450.510
+        Consumed gas: 1449.230
         Balance updates:
           tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx ... -ꜩ0.052
           storage fees ........................... +ꜩ0.052
           tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx ... -ꜩ0.06425
           storage fees ........................... +ꜩ0.06425
 
-New contract KT1LvTWVW1cc4DeSPCseMsiPdDDkTKvMrNZb originated.
+New contract KT1RdnquZZf4Y4ZDJvaEuY4cbam3xor3CffU originated.
 Contract memorized as check_caller.
 
-./tezos-client --mode mockup --base-dir '<masked>' --wait none transfer 1 from bootstrap1 to KT1LvTWVW1cc4DeSPCseMsiPdDDkTKvMrNZb --burn-cap 1 --arg '"KT1TLT2cXZCtenEAXzkndiAQGJXWenkwThRv"'
+./tezos-client --mode mockup --base-dir '<masked>' --wait none transfer 1 from bootstrap1 to KT1RdnquZZf4Y4ZDJvaEuY4cbam3xor3CffU --burn-cap 1 --arg '"KT1LfQjDNgPpdwMHbhzyQcD8GTE2L4rwxxpN"'
 Node is bootstrapped.
-Estimated gas: 4888.778 units (will add 100 for safety)
+Estimated gas: 4418.891 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
-Operation hash is 'ooKWNQj6RVsDFCJvsHjGrXsUzUS1jecE3iZFN3zNd6HP9aBKzo8'
+Operation hash is 'opKVxALX6z77kHy3Tft1d16KCmivKgyyVcVm9hXuauAs5Mx2FsS'
 NOT waiting for the operation to be included.
 Use command
-  tezos-client wait for ooKWNQj6RVsDFCJvsHjGrXsUzUS1jecE3iZFN3zNd6HP9aBKzo8 to be included --confirmations 1 --branch BLockGenesisGenesisGenesisGenesisGenesisCCCCCeZiLHU
+  tezos-client wait for opKVxALX6z77kHy3Tft1d16KCmivKgyyVcVm9hXuauAs5Mx2FsS to be included --confirmations 1 --branch BLockGenesisGenesisGenesisGenesisGenesisCCCCCeZiLHU
 and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx
-    Fee to the baker: ꜩ0.000795
+    Fee to the baker: ꜩ0.000748
     Expected counter: 3
-    Gas limit: 4989
+    Gas limit: 4519
     Storage limit: 0 bytes
     Balance updates:
-      tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx ... -ꜩ0.000795
-      payload fees(the block proposer) ....... +ꜩ0.000795
+      tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx ... -ꜩ0.000748
+      payload fees(the block proposer) ....... +ꜩ0.000748
     Transaction:
       Amount: ꜩ1
       From: tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx
-      To: KT1LvTWVW1cc4DeSPCseMsiPdDDkTKvMrNZb
-      Parameter: "KT1TLT2cXZCtenEAXzkndiAQGJXWenkwThRv"
+      To: KT1RdnquZZf4Y4ZDJvaEuY4cbam3xor3CffU
+      Parameter: "KT1LfQjDNgPpdwMHbhzyQcD8GTE2L4rwxxpN"
       This transaction was successfully applied
       Updated storage: None
       Storage size: 208 bytes
-      Consumed gas: 4889.576
+      Consumed gas: 4419.689
       Balance updates:
         tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx ... -ꜩ1
-        KT1LvTWVW1cc4DeSPCseMsiPdDDkTKvMrNZb ... +ꜩ1
+        KT1RdnquZZf4Y4ZDJvaEuY4cbam3xor3CffU ... +ꜩ1
 
 
-./tezos-client --mode mockup --base-dir '<masked>' --wait none transfer 1 from bootstrap1 to KT1TLT2cXZCtenEAXzkndiAQGJXWenkwThRv --burn-cap 1
+./tezos-client --mode mockup --base-dir '<masked>' --wait none transfer 1 from bootstrap1 to KT1LfQjDNgPpdwMHbhzyQcD8GTE2L4rwxxpN --burn-cap 1
 Node is bootstrapped.
-Estimated gas: 2068.289 units (will add 100 for safety)
+Estimated gas: 2116.892 units (will add 100 for safety)
 Estimated storage: 27 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
-Operation hash is 'ont8dBoUoexyjc6TFAWPjK4vYwyYHPqY6aoQkuEqs2Y9PjAbLzQ'
+Operation hash is 'oo5Hb4Qf1q4TuPb67SMwDftAmVejtrJVxU9XA12tPf7pNDp8b2C'
 NOT waiting for the operation to be included.
 Use command
-  tezos-client wait for ont8dBoUoexyjc6TFAWPjK4vYwyYHPqY6aoQkuEqs2Y9PjAbLzQ to be included --confirmations 1 --branch BLockGenesisGenesisGenesisGenesisGenesisCCCCCeZiLHU
+  tezos-client wait for oo5Hb4Qf1q4TuPb67SMwDftAmVejtrJVxU9XA12tPf7pNDp8b2C to be included --confirmations 1 --branch BLockGenesisGenesisGenesisGenesisGenesisCCCCCeZiLHU
 and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx
-    Fee to the baker: ꜩ0.000467
+    Fee to the baker: ꜩ0.000472
     Expected counter: 4
-    Gas limit: 2169
+    Gas limit: 2217
     Storage limit: 47 bytes
     Balance updates:
-      tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx ... -ꜩ0.000467
-      payload fees(the block proposer) ....... +ꜩ0.000467
+      tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx ... -ꜩ0.000472
+      payload fees(the block proposer) ....... +ꜩ0.000472
     Transaction:
       Amount: ꜩ1
       From: tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx
-      To: KT1TLT2cXZCtenEAXzkndiAQGJXWenkwThRv
+      To: KT1LfQjDNgPpdwMHbhzyQcD8GTE2L4rwxxpN
       This transaction was successfully applied
       Updated storage: { 0x000002298c03ed7d454a101eb7022bc95f7e5f41ac78 }
       Storage size: 179 bytes
       Paid storage size diff: 27 bytes
-      Consumed gas: 2069.201
+      Consumed gas: 2117.804
       Balance updates:
         tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx ... -ꜩ0.00675
         storage fees ........................... +ꜩ0.00675
         tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx ... -ꜩ1
-        KT1TLT2cXZCtenEAXzkndiAQGJXWenkwThRv ... +ꜩ1
+        KT1LfQjDNgPpdwMHbhzyQcD8GTE2L4rwxxpN ... +ꜩ1
 
 
-./tezos-client --mode mockup --base-dir '<masked>' --wait none transfer 1 from bootstrap1 to KT1LvTWVW1cc4DeSPCseMsiPdDDkTKvMrNZb --burn-cap 1 --arg '"KT1TLT2cXZCtenEAXzkndiAQGJXWenkwThRv"'
+./tezos-client --mode mockup --base-dir '<masked>' --wait none transfer 1 from bootstrap1 to KT1RdnquZZf4Y4ZDJvaEuY4cbam3xor3CffU --burn-cap 1 --arg '"KT1LfQjDNgPpdwMHbhzyQcD8GTE2L4rwxxpN"'
 Node is bootstrapped.
-Estimated gas: 6201.785 units (will add 100 for safety)
+Estimated gas: 4422.148 units (will add 100 for safety)
 Estimated storage: 27 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
-Operation hash is 'ooFASM67gHgN4XhEL3aSdGGyocUQtLecdh1iiVqGAFJ6r3YYpE5'
+Operation hash is 'onu8BqYeBJKc2KGG4UxNC7NAt1HDXj7FixJThwTVL3HZeGRkuhg'
 NOT waiting for the operation to be included.
 Use command
-  tezos-client wait for ooFASM67gHgN4XhEL3aSdGGyocUQtLecdh1iiVqGAFJ6r3YYpE5 to be included --confirmations 1 --branch BLockGenesisGenesisGenesisGenesisGenesisCCCCCeZiLHU
+  tezos-client wait for onu8BqYeBJKc2KGG4UxNC7NAt1HDXj7FixJThwTVL3HZeGRkuhg to be included --confirmations 1 --branch BLockGenesisGenesisGenesisGenesisGenesisCCCCCeZiLHU
 and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx
-    Fee to the baker: ꜩ0.000927
+    Fee to the baker: ꜩ0.000749
     Expected counter: 5
-    Gas limit: 6302
+    Gas limit: 4523
     Storage limit: 47 bytes
     Balance updates:
-      tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx ... -ꜩ0.000927
-      payload fees(the block proposer) ....... +ꜩ0.000927
+      tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx ... -ꜩ0.000749
+      payload fees(the block proposer) ....... +ꜩ0.000749
     Transaction:
       Amount: ꜩ1
       From: tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx
-      To: KT1LvTWVW1cc4DeSPCseMsiPdDDkTKvMrNZb
-      Parameter: "KT1TLT2cXZCtenEAXzkndiAQGJXWenkwThRv"
+      To: KT1RdnquZZf4Y4ZDJvaEuY4cbam3xor3CffU
+      Parameter: "KT1LfQjDNgPpdwMHbhzyQcD8GTE2L4rwxxpN"
       This transaction was successfully applied
       Updated storage: (Some 0x000002298c03ed7d454a101eb7022bc95f7e5f41ac78)
       Storage size: 235 bytes
       Paid storage size diff: 27 bytes
-      Consumed gas: 6202.583
+      Consumed gas: 4422.946
       Balance updates:
         tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx ... -ꜩ0.00675
         storage fees ........................... +ꜩ0.00675
         tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx ... -ꜩ1
-        KT1LvTWVW1cc4DeSPCseMsiPdDDkTKvMrNZb ... +ꜩ1
+        KT1RdnquZZf4Y4ZDJvaEuY4cbam3xor3CffU ... +ꜩ1
 
diff --git a/tezt/_regressions/sc_rollup_inbox.out b/tezt/_regressions/sc_rollup_inbox.out
index 8fa144917b821d75de3515628cbd4cacbc320b37..8630fcd245c38c2f09e034343e88a15dbaab1cd9 100644
--- a/tezt/_regressions/sc_rollup_inbox.out
+++ b/tezt/_regressions/sc_rollup_inbox.out
@@ -32,7 +32,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1620.756 units (will add 100 for safety)
+Estimated gas: 1650.756 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -43,16 +43,16 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.00045
+    Fee to the baker: ꜩ0.000453
     Expected counter: 2
-    Gas limit: 1721
+    Gas limit: 1751
     Storage limit: 0 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.00045
-      payload fees(the block proposer) ....... +ꜩ0.00045
+      [PUBLIC_KEY_HASH] ... -ꜩ0.000453
+      payload fees(the block proposer) ....... +ꜩ0.000453
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1620.884
+      Consumed gas: 1650.884
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 3
@@ -69,7 +69,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE", "CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1620.948 units (will add 100 for safety)
+Estimated gas: 1650.948 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -80,16 +80,16 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.000458
+    Fee to the baker: ꜩ0.000461
     Expected counter: 3
-    Gas limit: 1721
+    Gas limit: 1751
     Storage limit: 0 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.000458
-      payload fees(the block proposer) ....... +ꜩ0.000458
+      [PUBLIC_KEY_HASH] ... -ꜩ0.000461
+      payload fees(the block proposer) ....... +ꜩ0.000461
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1621.076
+      Consumed gas: 1651.076
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 4
@@ -107,7 +107,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE", "CAFEBABE", "CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1621.140 units (will add 100 for safety)
+Estimated gas: 1651.140 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -118,16 +118,16 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.000466
+    Fee to the baker: ꜩ0.000469
     Expected counter: 4
-    Gas limit: 1722
+    Gas limit: 1752
     Storage limit: 0 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.000466
-      payload fees(the block proposer) ....... +ꜩ0.000466
+      [PUBLIC_KEY_HASH] ... -ꜩ0.000469
+      payload fees(the block proposer) ....... +ꜩ0.000469
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1621.140
+      Consumed gas: 1651.140
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 5
@@ -145,7 +145,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE", "CAFEBABE", "CAFEBABE", "CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1621.140 units (will add 100 for safety)
+Estimated gas: 1651.140 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -156,16 +156,16 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.000474
+    Fee to the baker: ꜩ0.000477
     Expected counter: 5
-    Gas limit: 1722
+    Gas limit: 1752
     Storage limit: 0 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.000474
-      payload fees(the block proposer) ....... +ꜩ0.000474
+      [PUBLIC_KEY_HASH] ... -ꜩ0.000477
+      payload fees(the block proposer) ....... +ꜩ0.000477
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1621.268
+      Consumed gas: 1651.268
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 6
@@ -184,7 +184,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE", "CAFEBABE", "CAFEBABE", "CAFEBABE", "CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1621.332 units (will add 100 for safety)
+Estimated gas: 1651.332 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -195,16 +195,16 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.000482
+    Fee to the baker: ꜩ0.000485
     Expected counter: 6
-    Gas limit: 1722
+    Gas limit: 1752
     Storage limit: 0 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.000482
-      payload fees(the block proposer) ....... +ꜩ0.000482
+      [PUBLIC_KEY_HASH] ... -ꜩ0.000485
+      payload fees(the block proposer) ....... +ꜩ0.000485
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1621.332
+      Consumed gas: 1651.332
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 7
@@ -223,7 +223,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE", "CAFEBABE", "CAFEBABE", "CAFEBABE", "CAFEBABE", "CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1621.332 units (will add 100 for safety)
+Estimated gas: 1651.332 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -234,16 +234,16 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.00049
+    Fee to the baker: ꜩ0.000493
     Expected counter: 7
-    Gas limit: 1722
+    Gas limit: 1752
     Storage limit: 0 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.00049
-      payload fees(the block proposer) ....... +ꜩ0.00049
+      [PUBLIC_KEY_HASH] ... -ꜩ0.000493
+      payload fees(the block proposer) ....... +ꜩ0.000493
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1621.332
+      Consumed gas: 1651.332
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 8
@@ -262,7 +262,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE", "CAFEBABE", "CAFEBABE", "CAFEBABE", "CAFEBABE", "CAFEBABE", "CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1621.332 units (will add 100 for safety)
+Estimated gas: 1651.332 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -273,16 +273,16 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.000498
+    Fee to the baker: ꜩ0.000501
     Expected counter: 8
-    Gas limit: 1722
+    Gas limit: 1752
     Storage limit: 0 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.000498
-      payload fees(the block proposer) ....... +ꜩ0.000498
+      [PUBLIC_KEY_HASH] ... -ꜩ0.000501
+      payload fees(the block proposer) ....... +ꜩ0.000501
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1621.332
+      Consumed gas: 1651.332
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 9
@@ -301,7 +301,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE", "CAFEBABE", "CAFEBABE", "CAFEBABE", "CAFEBABE", "CAFEBABE", "CAFEBABE", "CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1621.332 units (will add 100 for safety)
+Estimated gas: 1651.332 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -312,16 +312,16 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.000506
+    Fee to the baker: ꜩ0.000509
     Expected counter: 9
-    Gas limit: 1722
+    Gas limit: 1752
     Storage limit: 0 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.000506
-      payload fees(the block proposer) ....... +ꜩ0.000506
+      [PUBLIC_KEY_HASH] ... -ꜩ0.000509
+      payload fees(the block proposer) ....... +ꜩ0.000509
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1621.460
+      Consumed gas: 1651.460
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 10
@@ -341,7 +341,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE", "CAFEBABE", "CAFEBABE", "CAFEBABE", "CAFEBABE", "CAFEBABE", "CAFEBABE", "CAFEBABE", "CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1621.524 units (will add 100 for safety)
+Estimated gas: 1651.524 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -352,16 +352,16 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.000514
+    Fee to the baker: ꜩ0.000517
     Expected counter: 10
-    Gas limit: 1722
+    Gas limit: 1752
     Storage limit: 0 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.000514
-      payload fees(the block proposer) ....... +ꜩ0.000514
+      [PUBLIC_KEY_HASH] ... -ꜩ0.000517
+      payload fees(the block proposer) ....... +ꜩ0.000517
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1621.524
+      Consumed gas: 1651.524
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 11
@@ -381,7 +381,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE", "CAFEBABE", "CAFEBABE", "CAFEBABE", "CAFEBABE", "CAFEBABE", "CAFEBABE", "CAFEBABE", "CAFEBABE", "CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1621.524 units (will add 100 for safety)
+Estimated gas: 1651.524 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -392,16 +392,16 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.000522
+    Fee to the baker: ꜩ0.000525
     Expected counter: 11
-    Gas limit: 1722
+    Gas limit: 1752
     Storage limit: 0 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.000522
-      payload fees(the block proposer) ....... +ꜩ0.000522
+      [PUBLIC_KEY_HASH] ... -ꜩ0.000525
+      payload fees(the block proposer) ....... +ꜩ0.000525
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1621.524
+      Consumed gas: 1651.524
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 12
diff --git a/tezt/_regressions/sc_rollup_inbox_of_rollup_node_basic.out b/tezt/_regressions/sc_rollup_inbox_of_rollup_node_basic.out
index 03664423af4a5609cd98f094eeb66ba72e3bd009..3de4b4d4c95306e6044d8676db92ef2d84cd0411 100644
--- a/tezt/_regressions/sc_rollup_inbox_of_rollup_node_basic.out
+++ b/tezt/_regressions/sc_rollup_inbox_of_rollup_node_basic.out
@@ -32,7 +32,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1620.756 units (will add 100 for safety)
+Estimated gas: 1650.756 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -43,16 +43,16 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.00045
+    Fee to the baker: ꜩ0.000453
     Expected counter: 2
-    Gas limit: 1721
+    Gas limit: 1751
     Storage limit: 0 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.00045
-      payload fees(the block proposer) ....... +ꜩ0.00045
+      [PUBLIC_KEY_HASH] ... -ꜩ0.000453
+      payload fees(the block proposer) ....... +ꜩ0.000453
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1620.884
+      Consumed gas: 1650.884
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 3
@@ -69,7 +69,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE", "CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1620.948 units (will add 100 for safety)
+Estimated gas: 1650.948 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -80,16 +80,16 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.000458
+    Fee to the baker: ꜩ0.000461
     Expected counter: 3
-    Gas limit: 1721
+    Gas limit: 1751
     Storage limit: 0 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.000458
-      payload fees(the block proposer) ....... +ꜩ0.000458
+      [PUBLIC_KEY_HASH] ... -ꜩ0.000461
+      payload fees(the block proposer) ....... +ꜩ0.000461
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1621.076
+      Consumed gas: 1651.076
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 4
diff --git a/tezt/_regressions/sc_rollup_inbox_of_rollup_node_handles_chain_reorg.out b/tezt/_regressions/sc_rollup_inbox_of_rollup_node_handles_chain_reorg.out
index ea6b410d7f030a2a4139040e52cc6137c6198be5..98fe0bdfa379ea8b0449c7dc93708ff60f98a554 100644
--- a/tezt/_regressions/sc_rollup_inbox_of_rollup_node_handles_chain_reorg.out
+++ b/tezt/_regressions/sc_rollup_inbox_of_rollup_node_handles_chain_reorg.out
@@ -32,7 +32,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1620.756 units (will add 100 for safety)
+Estimated gas: 1650.756 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -43,16 +43,16 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.00045
+    Fee to the baker: ꜩ0.000453
     Expected counter: 2
-    Gas limit: 1721
+    Gas limit: 1751
     Storage limit: 0 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.00045
-      payload fees(the block proposer) ....... +ꜩ0.00045
+      [PUBLIC_KEY_HASH] ... -ꜩ0.000453
+      payload fees(the block proposer) ....... +ꜩ0.000453
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1620.884
+      Consumed gas: 1650.884
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 3
@@ -69,7 +69,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1620.948 units (will add 100 for safety)
+Estimated gas: 1650.948 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -80,16 +80,16 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.00045
+    Fee to the baker: ꜩ0.000453
     Expected counter: 3
-    Gas limit: 1721
+    Gas limit: 1751
     Storage limit: 0 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.00045
-      payload fees(the block proposer) ....... +ꜩ0.00045
+      [PUBLIC_KEY_HASH] ... -ꜩ0.000453
+      payload fees(the block proposer) ....... +ꜩ0.000453
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1621.076
+      Consumed gas: 1651.076
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 4
@@ -107,7 +107,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1620.948 units (will add 100 for safety)
+Estimated gas: 1650.948 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -118,16 +118,16 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.00045
+    Fee to the baker: ꜩ0.000453
     Expected counter: 3
-    Gas limit: 1721
+    Gas limit: 1751
     Storage limit: 0 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.00045
-      payload fees(the block proposer) ....... +ꜩ0.00045
+      [PUBLIC_KEY_HASH] ... -ꜩ0.000453
+      payload fees(the block proposer) ....... +ꜩ0.000453
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1621.076
+      Consumed gas: 1651.076
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 4
@@ -145,7 +145,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1621.140 units (will add 100 for safety)
+Estimated gas: 1651.140 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -156,16 +156,16 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.00045
+    Fee to the baker: ꜩ0.000453
     Expected counter: 4
-    Gas limit: 1722
+    Gas limit: 1752
     Storage limit: 0 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.00045
-      payload fees(the block proposer) ....... +ꜩ0.00045
+      [PUBLIC_KEY_HASH] ... -ꜩ0.000453
+      payload fees(the block proposer) ....... +ꜩ0.000453
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1621.140
+      Consumed gas: 1651.140
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 5
diff --git a/tezt/_regressions/sc_rollup_inbox_of_rollup_node_stops.out b/tezt/_regressions/sc_rollup_inbox_of_rollup_node_stops.out
index fd2dbb40da2eaaf99066e0aa853cf3015c814674..3d6d4fdb5ede4ace918680860d1aa8067ac88a05 100644
--- a/tezt/_regressions/sc_rollup_inbox_of_rollup_node_stops.out
+++ b/tezt/_regressions/sc_rollup_inbox_of_rollup_node_stops.out
@@ -32,7 +32,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1620.756 units (will add 100 for safety)
+Estimated gas: 1650.756 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -43,16 +43,16 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.00045
+    Fee to the baker: ꜩ0.000453
     Expected counter: 2
-    Gas limit: 1721
+    Gas limit: 1751
     Storage limit: 0 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.00045
-      payload fees(the block proposer) ....... +ꜩ0.00045
+      [PUBLIC_KEY_HASH] ... -ꜩ0.000453
+      payload fees(the block proposer) ....... +ꜩ0.000453
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1620.884
+      Consumed gas: 1650.884
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 3
@@ -69,7 +69,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE", "CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1620.948 units (will add 100 for safety)
+Estimated gas: 1650.948 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -80,16 +80,16 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.000458
+    Fee to the baker: ꜩ0.000461
     Expected counter: 3
-    Gas limit: 1721
+    Gas limit: 1751
     Storage limit: 0 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.000458
-      payload fees(the block proposer) ....... +ꜩ0.000458
+      [PUBLIC_KEY_HASH] ... -ꜩ0.000461
+      payload fees(the block proposer) ....... +ꜩ0.000461
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1621.076
+      Consumed gas: 1651.076
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 4
@@ -107,7 +107,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1621.140 units (will add 100 for safety)
+Estimated gas: 1651.140 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -118,16 +118,16 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.00045
+    Fee to the baker: ꜩ0.000453
     Expected counter: 4
-    Gas limit: 1722
+    Gas limit: 1752
     Storage limit: 0 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.00045
-      payload fees(the block proposer) ....... +ꜩ0.00045
+      [PUBLIC_KEY_HASH] ... -ꜩ0.000453
+      payload fees(the block proposer) ....... +ꜩ0.000453
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1621.140
+      Consumed gas: 1651.140
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 5
@@ -145,7 +145,7 @@ This sequence of operations was run:
 
 ./tezos-client --wait none send sc rollup message 'text:["CAFEBABE", "CAFEBABE"]' from bootstrap1 to '[SC_ROLLUP_HASH]'
 Node is bootstrapped.
-Estimated gas: 1621.140 units (will add 100 for safety)
+Estimated gas: 1651.140 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -156,16 +156,16 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.000458
+    Fee to the baker: ꜩ0.000461
     Expected counter: 5
-    Gas limit: 1722
+    Gas limit: 1752
     Storage limit: 0 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.000458
-      payload fees(the block proposer) ....... +ꜩ0.000458
+      [PUBLIC_KEY_HASH] ... -ꜩ0.000461
+      payload fees(the block proposer) ....... +ꜩ0.000461
     Add a message to the inbox of the smart contract rollup at address [SC_ROLLUP_HASH]
       This operation sending a message to a smart contract rollup was successfully applied
-      Consumed gas: 1621.268
+      Consumed gas: 1651.268
       Resulting inbox state: 
          rollup = [SC_ROLLUP_HASH]
          level = 6
diff --git a/tezt/_regressions/tx_rollup_batch_encoding.out b/tezt/_regressions/tx_rollup_batch_encoding.out
index b45b1758bd6a4fb47b3015e870d43894ae463b62..6c68f55b83c20fbdda22249d1ca1e4f9f12ccb56 100644
--- a/tezt/_regressions/tx_rollup_batch_encoding.out
+++ b/tezt/_regressions/tx_rollup_batch_encoding.out
@@ -2,7 +2,7 @@ tx_rollup_batch_encoding.out
 
 ./tezos-client --wait none originate tx rollup from '[PUBLIC_KEY_HASH]' --burn-cap 9999999 --storage-limit 60000
 Node is bootstrapped.
-Estimated gas: 1410.112 units (will add 100 for safety)
+Estimated gas: 1420.112 units (will add 100 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
 NOT waiting for the operation to be included.
@@ -12,26 +12,26 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.000378
+    Fee to the baker: ꜩ0.000379
     Expected counter: 1
-    Gas limit: 1511
+    Gas limit: 1521
     Storage limit: 60000 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.000378
-      payload fees(the block proposer) ....... +ꜩ0.000378
+      [PUBLIC_KEY_HASH] ... -ꜩ0.000379
+      payload fees(the block proposer) ....... +ꜩ0.000379
     Tx rollup origination:
       From: [PUBLIC_KEY_HASH]
       This tx rollup origination operation was successfully applied
       Balance updates:
         [PUBLIC_KEY_HASH] ... -ꜩ15
         storage fees ........................... +ꜩ15
-      Consumed gas: 1410.112
+      Consumed gas: 1420.112
       Originated tx rollup: [TX_ROLLUP_HASH]
 
 
 ./tezos-client --wait none submit tx rollup batch 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebfc0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedfe0e1e2e3e4e5e6e7e8e9eaebecedeeeff0f1f2f3f4f5f6f7f8f9fafbfcfdfeff to '[TX_ROLLUP_HASH]' from '[PUBLIC_KEY_HASH]'
 Node is bootstrapped.
-Estimated gas: 2689.447 units (will add 100 for safety)
+Estimated gas: 2709.447 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -42,17 +42,17 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.000784
+    Fee to the baker: ꜩ0.000786
     Expected counter: 2
-    Gas limit: 2790
+    Gas limit: 2810
     Storage limit: 0 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.000784
-      payload fees(the block proposer) ....... +ꜩ0.000784
+      [PUBLIC_KEY_HASH] ... -ꜩ0.000786
+      payload fees(the block proposer) ....... +ꜩ0.000786
     Tx rollup transaction:[TX_ROLLUP_HASH], 256 bytes, From: [PUBLIC_KEY_HASH]
       This tx rollup submit operation was successfully applied
       Balance updates:
         
-      Consumed gas: 2689.447
+      Consumed gas: 2709.447
 
 "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebfc0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedfe0e1e2e3e4e5e6e7e8e9eaebecedeeeff0f1f2f3f4f5f6f7f8f9fafbfcfdfeff"
diff --git a/tezt/_regressions/tx_rollup_finalize_commitment_future.out b/tezt/_regressions/tx_rollup_finalize_commitment_future.out
index 361c0820f40ad334b0b6c5b206822a134a5adbe3..abe813dc0981f5e4ba9125000cb3a3ed3397904f 100644
--- a/tezt/_regressions/tx_rollup_finalize_commitment_future.out
+++ b/tezt/_regressions/tx_rollup_finalize_commitment_future.out
@@ -2,7 +2,7 @@ tx_rollup_finalize_commitment_future.out
 
 ./tezos-client --wait none originate tx rollup from '[PUBLIC_KEY_HASH]' --burn-cap 9999999 --storage-limit 60000
 Node is bootstrapped.
-Estimated gas: 1410.112 units (will add 100 for safety)
+Estimated gas: 1420.112 units (will add 100 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
 NOT waiting for the operation to be included.
@@ -12,26 +12,26 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.000378
+    Fee to the baker: ꜩ0.000379
     Expected counter: 1
-    Gas limit: 1511
+    Gas limit: 1521
     Storage limit: 60000 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.000378
-      payload fees(the block proposer) ....... +ꜩ0.000378
+      [PUBLIC_KEY_HASH] ... -ꜩ0.000379
+      payload fees(the block proposer) ....... +ꜩ0.000379
     Tx rollup origination:
       From: [PUBLIC_KEY_HASH]
       This tx rollup origination operation was successfully applied
       Balance updates:
         [PUBLIC_KEY_HASH] ... -ꜩ15
         storage fees ........................... +ꜩ15
-      Consumed gas: 1410.112
+      Consumed gas: 1420.112
       Originated tx rollup: [TX_ROLLUP_HASH]
 
 
 ./tezos-client --wait none submit tx rollup batch 626c6f62 to '[TX_ROLLUP_HASH]' from '[PUBLIC_KEY_HASH]'
 Node is bootstrapped.
-Estimated gas: 2564.880 units (will add 100 for safety)
+Estimated gas: 2584.880 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -42,18 +42,18 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.00052
+    Fee to the baker: ꜩ0.000522
     Expected counter: 2
-    Gas limit: 2665
+    Gas limit: 2685
     Storage limit: 0 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.00052
-      payload fees(the block proposer) ....... +ꜩ0.00052
+      [PUBLIC_KEY_HASH] ... -ꜩ0.000522
+      payload fees(the block proposer) ....... +ꜩ0.000522
     Tx rollup transaction:[TX_ROLLUP_HASH], 4 bytes, From: [PUBLIC_KEY_HASH]
       This tx rollup submit operation was successfully applied
       Balance updates:
         
-      Consumed gas: 2564.880
+      Consumed gas: 2584.880
 
 
 ./tezos-client --wait none submit tx rollup finalize commitment to '[TX_ROLLUP_HASH]' from '[PUBLIC_KEY_HASH]'
diff --git a/tezt/_regressions/tx_rollup_finalize_commitment_no_batch.out b/tezt/_regressions/tx_rollup_finalize_commitment_no_batch.out
index 8791e629dfa9fcc3cfa0f058cbd231ecb3ace825..d1ff05c89a03ca6c939760d94e79dbee87444893 100644
--- a/tezt/_regressions/tx_rollup_finalize_commitment_no_batch.out
+++ b/tezt/_regressions/tx_rollup_finalize_commitment_no_batch.out
@@ -2,7 +2,7 @@ tx_rollup_finalize_commitment_no_batch.out
 
 ./tezos-client --wait none originate tx rollup from '[PUBLIC_KEY_HASH]' --burn-cap 9999999 --storage-limit 60000
 Node is bootstrapped.
-Estimated gas: 1410.112 units (will add 100 for safety)
+Estimated gas: 1420.112 units (will add 100 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
 NOT waiting for the operation to be included.
@@ -12,20 +12,20 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.000378
+    Fee to the baker: ꜩ0.000379
     Expected counter: 1
-    Gas limit: 1511
+    Gas limit: 1521
     Storage limit: 60000 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.000378
-      payload fees(the block proposer) ....... +ꜩ0.000378
+      [PUBLIC_KEY_HASH] ... -ꜩ0.000379
+      payload fees(the block proposer) ....... +ꜩ0.000379
     Tx rollup origination:
       From: [PUBLIC_KEY_HASH]
       This tx rollup origination operation was successfully applied
       Balance updates:
         [PUBLIC_KEY_HASH] ... -ꜩ15
         storage fees ........................... +ꜩ15
-      Consumed gas: 1410.112
+      Consumed gas: 1420.112
       Originated tx rollup: [TX_ROLLUP_HASH]
 
 
diff --git a/tezt/_regressions/tx_rollup_finalize_commitment_no_commitment.out b/tezt/_regressions/tx_rollup_finalize_commitment_no_commitment.out
index 005aa87ac1055384d79175ddd5285643411b6b1e..6f806402dc66a00eaf6cf06f86c46c3e05597848 100644
--- a/tezt/_regressions/tx_rollup_finalize_commitment_no_commitment.out
+++ b/tezt/_regressions/tx_rollup_finalize_commitment_no_commitment.out
@@ -2,7 +2,7 @@ tx_rollup_finalize_commitment_no_commitment.out
 
 ./tezos-client --wait none originate tx rollup from '[PUBLIC_KEY_HASH]' --burn-cap 9999999 --storage-limit 60000
 Node is bootstrapped.
-Estimated gas: 1410.112 units (will add 100 for safety)
+Estimated gas: 1420.112 units (will add 100 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
 NOT waiting for the operation to be included.
@@ -12,26 +12,26 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.000378
+    Fee to the baker: ꜩ0.000379
     Expected counter: 1
-    Gas limit: 1511
+    Gas limit: 1521
     Storage limit: 60000 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.000378
-      payload fees(the block proposer) ....... +ꜩ0.000378
+      [PUBLIC_KEY_HASH] ... -ꜩ0.000379
+      payload fees(the block proposer) ....... +ꜩ0.000379
     Tx rollup origination:
       From: [PUBLIC_KEY_HASH]
       This tx rollup origination operation was successfully applied
       Balance updates:
         [PUBLIC_KEY_HASH] ... -ꜩ15
         storage fees ........................... +ꜩ15
-      Consumed gas: 1410.112
+      Consumed gas: 1420.112
       Originated tx rollup: [TX_ROLLUP_HASH]
 
 
 ./tezos-client --wait none submit tx rollup batch 626c6f62 to '[TX_ROLLUP_HASH]' from '[PUBLIC_KEY_HASH]'
 Node is bootstrapped.
-Estimated gas: 2564.880 units (will add 100 for safety)
+Estimated gas: 2584.880 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -42,18 +42,18 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.00052
+    Fee to the baker: ꜩ0.000522
     Expected counter: 2
-    Gas limit: 2665
+    Gas limit: 2685
     Storage limit: 0 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.00052
-      payload fees(the block proposer) ....... +ꜩ0.00052
+      [PUBLIC_KEY_HASH] ... -ꜩ0.000522
+      payload fees(the block proposer) ....... +ꜩ0.000522
     Tx rollup transaction:[TX_ROLLUP_HASH], 4 bytes, From: [PUBLIC_KEY_HASH]
       This tx rollup submit operation was successfully applied
       Balance updates:
         
-      Consumed gas: 2564.880
+      Consumed gas: 2584.880
 
 
 ./tezos-client --wait none submit tx rollup finalize commitment to '[TX_ROLLUP_HASH]' from '[PUBLIC_KEY_HASH]'
diff --git a/tezt/_regressions/tx_rollup_finalize_too_recent_commitment.out b/tezt/_regressions/tx_rollup_finalize_too_recent_commitment.out
index ca235c85e471e05592f7899df3f73e2003d74a83..ecad502ccbe14b831fb55fc0fad1ba98624ad7c9 100644
--- a/tezt/_regressions/tx_rollup_finalize_too_recent_commitment.out
+++ b/tezt/_regressions/tx_rollup_finalize_too_recent_commitment.out
@@ -2,7 +2,7 @@ tx_rollup_finalize_too_recent_commitment.out
 
 ./tezos-client --wait none originate tx rollup from '[PUBLIC_KEY_HASH]' --burn-cap 9999999 --storage-limit 60000
 Node is bootstrapped.
-Estimated gas: 1410.112 units (will add 100 for safety)
+Estimated gas: 1420.112 units (will add 100 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
 NOT waiting for the operation to be included.
@@ -12,26 +12,26 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.000378
+    Fee to the baker: ꜩ0.000379
     Expected counter: 1
-    Gas limit: 1511
+    Gas limit: 1521
     Storage limit: 60000 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.000378
-      payload fees(the block proposer) ....... +ꜩ0.000378
+      [PUBLIC_KEY_HASH] ... -ꜩ0.000379
+      payload fees(the block proposer) ....... +ꜩ0.000379
     Tx rollup origination:
       From: [PUBLIC_KEY_HASH]
       This tx rollup origination operation was successfully applied
       Balance updates:
         [PUBLIC_KEY_HASH] ... -ꜩ15
         storage fees ........................... +ꜩ15
-      Consumed gas: 1410.112
+      Consumed gas: 1420.112
       Originated tx rollup: [TX_ROLLUP_HASH]
 
 
 ./tezos-client --wait none submit tx rollup batch 626c6f62 to '[TX_ROLLUP_HASH]' from '[PUBLIC_KEY_HASH]'
 Node is bootstrapped.
-Estimated gas: 2564.880 units (will add 100 for safety)
+Estimated gas: 2584.880 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -42,23 +42,23 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.00052
+    Fee to the baker: ꜩ0.000522
     Expected counter: 2
-    Gas limit: 2665
+    Gas limit: 2685
     Storage limit: 0 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.00052
-      payload fees(the block proposer) ....... +ꜩ0.00052
+      [PUBLIC_KEY_HASH] ... -ꜩ0.000522
+      payload fees(the block proposer) ....... +ꜩ0.000522
     Tx rollup transaction:[TX_ROLLUP_HASH], 4 bytes, From: [PUBLIC_KEY_HASH]
       This tx rollup submit operation was successfully applied
       Balance updates:
         
-      Consumed gas: 2564.880
+      Consumed gas: 2584.880
 
 
 ./tezos-client --wait none submit tx rollup commitment 0 '[TX_ROLLUP_INBOX_HASH]'  '[TX_ROLLUP_MESSAGE_RESULT_HASH]' to '[TX_ROLLUP_HASH]' from '[PUBLIC_KEY_HASH]'
 Node is bootstrapped.
-Estimated gas: 3663.146 units (will add 100 for safety)
+Estimated gas: 3818.146 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -69,20 +69,20 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.000694
+    Fee to the baker: ꜩ0.000709
     Expected counter: 3
-    Gas limit: 3764
+    Gas limit: 3919
     Storage limit: 0 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.000694
-      payload fees(the block proposer) ....... +ꜩ0.000694
+      [PUBLIC_KEY_HASH] ... -ꜩ0.000709
+      payload fees(the block proposer) ....... +ꜩ0.000709
     Tx rollup commitment:[TX_ROLLUP_HASH], commitment 0 : messages = [TX_ROLLUP_MESSAGE_RESULT_HASH] predecessor  for inbox with merkle root [TX_ROLLUP_INBOX_HASH]
       From: [PUBLIC_KEY_HASH]
       This tx rollup commit operation was successfully applied
       Balance updates:
         [PUBLIC_KEY_HASH] ....................................................... -ꜩ10000
         Frozen_bonds([PUBLIC_KEY_HASH],[TX_ROLLUP_HASH]) ... +ꜩ10000
-      Consumed gas: 3663.146
+      Consumed gas: 3818.146
 
 
 ./tezos-client --wait none submit tx rollup finalize commitment to '[TX_ROLLUP_HASH]' from '[PUBLIC_KEY_HASH]'
diff --git a/tezt/_regressions/tx_rollup_limit_empty_batch.out b/tezt/_regressions/tx_rollup_limit_empty_batch.out
index a4960678140d15567319fbc3919200cc01385b87..739d6def5a5fe929137860ed28424c5d728f2d77 100644
--- a/tezt/_regressions/tx_rollup_limit_empty_batch.out
+++ b/tezt/_regressions/tx_rollup_limit_empty_batch.out
@@ -2,7 +2,7 @@ tx_rollup_limit_empty_batch.out
 
 ./tezos-client --wait none originate tx rollup from '[PUBLIC_KEY_HASH]' --burn-cap 9999999 --storage-limit 60000
 Node is bootstrapped.
-Estimated gas: 1410.112 units (will add 100 for safety)
+Estimated gas: 1420.112 units (will add 100 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
 NOT waiting for the operation to be included.
@@ -12,26 +12,26 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.000378
+    Fee to the baker: ꜩ0.000379
     Expected counter: 1
-    Gas limit: 1511
+    Gas limit: 1521
     Storage limit: 60000 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.000378
-      payload fees(the block proposer) ....... +ꜩ0.000378
+      [PUBLIC_KEY_HASH] ... -ꜩ0.000379
+      payload fees(the block proposer) ....... +ꜩ0.000379
     Tx rollup origination:
       From: [PUBLIC_KEY_HASH]
       This tx rollup origination operation was successfully applied
       Balance updates:
         [PUBLIC_KEY_HASH] ... -ꜩ15
         storage fees ........................... +ꜩ15
-      Consumed gas: 1410.112
+      Consumed gas: 1420.112
       Originated tx rollup: [TX_ROLLUP_HASH]
 
 
 ./tezos-client --wait none submit tx rollup batch  to '[TX_ROLLUP_HASH]' from '[PUBLIC_KEY_HASH]'
 Node is bootstrapped.
-Estimated gas: 2560.871 units (will add 100 for safety)
+Estimated gas: 2580.871 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -42,16 +42,16 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.000516
+    Fee to the baker: ꜩ0.000518
     Expected counter: 2
-    Gas limit: 2661
+    Gas limit: 2681
     Storage limit: 0 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.000516
-      payload fees(the block proposer) ....... +ꜩ0.000516
+      [PUBLIC_KEY_HASH] ... -ꜩ0.000518
+      payload fees(the block proposer) ....... +ꜩ0.000518
     Tx rollup transaction:[TX_ROLLUP_HASH], 0 bytes, From: [PUBLIC_KEY_HASH]
       This tx rollup submit operation was successfully applied
       Balance updates:
         
-      Consumed gas: 2560.871
+      Consumed gas: 2580.871
 
diff --git a/tezt/_regressions/tx_rollup_limit_maximum_size_batch.out b/tezt/_regressions/tx_rollup_limit_maximum_size_batch.out
index 2f8863bac18d42ddfb62a04ebb985b936e0da517..3dc0452a8ed2a66e31eb8f9095cc4a693801f416 100644
--- a/tezt/_regressions/tx_rollup_limit_maximum_size_batch.out
+++ b/tezt/_regressions/tx_rollup_limit_maximum_size_batch.out
@@ -2,7 +2,7 @@ tx_rollup_limit_maximum_size_batch.out
 
 ./tezos-client --wait none originate tx rollup from '[PUBLIC_KEY_HASH]' --burn-cap 9999999 --storage-limit 60000
 Node is bootstrapped.
-Estimated gas: 1410.112 units (will add 100 for safety)
+Estimated gas: 1420.112 units (will add 100 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
 NOT waiting for the operation to be included.
@@ -12,26 +12,26 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.000378
+    Fee to the baker: ꜩ0.000379
     Expected counter: 1
-    Gas limit: 1511
+    Gas limit: 1521
     Storage limit: 60000 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.000378
-      payload fees(the block proposer) ....... +ꜩ0.000378
+      [PUBLIC_KEY_HASH] ... -ꜩ0.000379
+      payload fees(the block proposer) ....... +ꜩ0.000379
     Tx rollup origination:
       From: [PUBLIC_KEY_HASH]
       This tx rollup origination operation was successfully applied
       Balance updates:
         [PUBLIC_KEY_HASH] ... -ꜩ15
         storage fees ........................... +ꜩ15
-      Consumed gas: 1410.112
+      Consumed gas: 1420.112
       Originated tx rollup: [TX_ROLLUP_HASH]
 
 
 ./tezos-client --wait none submit tx rollup batch 6262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262 to '[TX_ROLLUP_HASH]' from '[PUBLIC_KEY_HASH]'
 Node is bootstrapped.
-Estimated gas: 5072.121 units (will add 100 for safety)
+Estimated gas: 5092.121 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -42,18 +42,18 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.005767
+    Fee to the baker: ꜩ0.005769
     Expected counter: 2
-    Gas limit: 5173
+    Gas limit: 5193
     Storage limit: 0 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.005767
-      payload fees(the block proposer) ....... +ꜩ0.005767
+      [PUBLIC_KEY_HASH] ... -ꜩ0.005769
+      payload fees(the block proposer) ....... +ꜩ0.005769
     Tx rollup transaction:[TX_ROLLUP_HASH], 5000 bytes, From: [PUBLIC_KEY_HASH]
       This tx rollup submit operation was successfully applied
       Balance updates:
         
-      Consumed gas: 5072.121
+      Consumed gas: 5092.121
 
 
 ./tezos-client --wait none submit tx rollup batch 636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363 to '[TX_ROLLUP_HASH]' from '[PUBLIC_KEY_HASH]'
diff --git a/tezt/_regressions/tx_rollup_limit_maximum_size_inbox.out b/tezt/_regressions/tx_rollup_limit_maximum_size_inbox.out
index 49bb49ca736d714afa6790c1a4ba449fca0fa703..4404abf5443b8790084500337696789a420e353e 100644
--- a/tezt/_regressions/tx_rollup_limit_maximum_size_inbox.out
+++ b/tezt/_regressions/tx_rollup_limit_maximum_size_inbox.out
@@ -2,7 +2,7 @@ tx_rollup_limit_maximum_size_inbox.out
 
 ./tezos-client --wait none originate tx rollup from '[PUBLIC_KEY_HASH]' --burn-cap 9999999 --storage-limit 60000
 Node is bootstrapped.
-Estimated gas: 1410.112 units (will add 100 for safety)
+Estimated gas: 1420.112 units (will add 100 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
 NOT waiting for the operation to be included.
@@ -12,26 +12,26 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.000378
+    Fee to the baker: ꜩ0.000379
     Expected counter: 1
-    Gas limit: 1511
+    Gas limit: 1521
     Storage limit: 60000 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.000378
-      payload fees(the block proposer) ....... +ꜩ0.000378
+      [PUBLIC_KEY_HASH] ... -ꜩ0.000379
+      payload fees(the block proposer) ....... +ꜩ0.000379
     Tx rollup origination:
       From: [PUBLIC_KEY_HASH]
       This tx rollup origination operation was successfully applied
       Balance updates:
         [PUBLIC_KEY_HASH] ... -ꜩ15
         storage fees ........................... +ꜩ15
-      Consumed gas: 1410.112
+      Consumed gas: 1420.112
       Originated tx rollup: [TX_ROLLUP_HASH]
 
 
 ./tezos-client --wait none submit tx rollup batch 6161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161 to '[TX_ROLLUP_HASH]' from bootstrap1
 Node is bootstrapped.
-Estimated gas: 5072.121 units (will add 100 for safety)
+Estimated gas: 5092.121 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -42,23 +42,23 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.005767
+    Fee to the baker: ꜩ0.005769
     Expected counter: 2
-    Gas limit: 5173
+    Gas limit: 5193
     Storage limit: 0 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.005767
-      payload fees(the block proposer) ....... +ꜩ0.005767
+      [PUBLIC_KEY_HASH] ... -ꜩ0.005769
+      payload fees(the block proposer) ....... +ꜩ0.005769
     Tx rollup transaction:[TX_ROLLUP_HASH], 5000 bytes, From: [PUBLIC_KEY_HASH]
       This tx rollup submit operation was successfully applied
       Balance updates:
         
-      Consumed gas: 5072.121
+      Consumed gas: 5092.121
 
 
 ./tezos-client --wait none submit tx rollup batch 6161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161 to '[TX_ROLLUP_HASH]' from bootstrap2
 Node is bootstrapped.
-Estimated gas: 5072.121 units (will add 100 for safety)
+Estimated gas: 5092.121 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -69,23 +69,23 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.005767
+    Fee to the baker: ꜩ0.005769
     Expected counter: 1
-    Gas limit: 5173
+    Gas limit: 5193
     Storage limit: 0 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.005767
-      payload fees(the block proposer) ....... +ꜩ0.005767
+      [PUBLIC_KEY_HASH] ... -ꜩ0.005769
+      payload fees(the block proposer) ....... +ꜩ0.005769
     Tx rollup transaction:[TX_ROLLUP_HASH], 5000 bytes, From: [PUBLIC_KEY_HASH]
       This tx rollup submit operation was successfully applied
       Balance updates:
         
-      Consumed gas: 5072.121
+      Consumed gas: 5092.121
 
 
 ./tezos-client --wait none submit tx rollup batch 6161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161 to '[TX_ROLLUP_HASH]' from bootstrap3
 Node is bootstrapped.
-Estimated gas: 5072.121 units (will add 100 for safety)
+Estimated gas: 5092.121 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -96,23 +96,23 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.005767
+    Fee to the baker: ꜩ0.005769
     Expected counter: 1
-    Gas limit: 5173
+    Gas limit: 5193
     Storage limit: 0 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.005767
-      payload fees(the block proposer) ....... +ꜩ0.005767
+      [PUBLIC_KEY_HASH] ... -ꜩ0.005769
+      payload fees(the block proposer) ....... +ꜩ0.005769
     Tx rollup transaction:[TX_ROLLUP_HASH], 5000 bytes, From: [PUBLIC_KEY_HASH]
       This tx rollup submit operation was successfully applied
       Balance updates:
         
-      Consumed gas: 5072.121
+      Consumed gas: 5092.121
 
 
 ./tezos-client --wait none submit tx rollup batch 6161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161 to '[TX_ROLLUP_HASH]' from bootstrap4
 Node is bootstrapped.
-Estimated gas: 5072.121 units (will add 100 for safety)
+Estimated gas: 5092.121 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -123,23 +123,23 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.005767
+    Fee to the baker: ꜩ0.005769
     Expected counter: 1
-    Gas limit: 5173
+    Gas limit: 5193
     Storage limit: 0 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.005767
-      payload fees(the block proposer) ....... +ꜩ0.005767
+      [PUBLIC_KEY_HASH] ... -ꜩ0.005769
+      payload fees(the block proposer) ....... +ꜩ0.005769
     Tx rollup transaction:[TX_ROLLUP_HASH], 5000 bytes, From: [PUBLIC_KEY_HASH]
       This tx rollup submit operation was successfully applied
       Balance updates:
         
-      Consumed gas: 5072.121
+      Consumed gas: 5092.121
 
 
 ./tezos-client --wait none submit tx rollup batch 6161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161 to '[TX_ROLLUP_HASH]' from bootstrap5
 Node is bootstrapped.
-Estimated gas: 5072.121 units (will add 100 for safety)
+Estimated gas: 5092.121 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -150,24 +150,24 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.005767
+    Fee to the baker: ꜩ0.005769
     Expected counter: 1
-    Gas limit: 5173
+    Gas limit: 5193
     Storage limit: 0 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.005767
-      payload fees(the block proposer) ....... +ꜩ0.005767
+      [PUBLIC_KEY_HASH] ... -ꜩ0.005769
+      payload fees(the block proposer) ....... +ꜩ0.005769
     Tx rollup transaction:[TX_ROLLUP_HASH], 5000 bytes, From: [PUBLIC_KEY_HASH]
       This tx rollup submit operation was successfully applied
       Balance updates:
         
-      Consumed gas: 5072.121
+      Consumed gas: 5092.121
 
 
 ./tezos-client --wait none submit tx rollup batch 6161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161 to '[TX_ROLLUP_HASH]' from bootstrap6
 Node is bootstrapped.
 Estimated storage: no bytes added
-Estimated gas: 5072.121 units (will add 100 for safety)
+Estimated gas: 5092.121 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -192,24 +192,24 @@ This sequence of operations was run:
       Consumed gas: 1000
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.005671
+    Fee to the baker: ꜩ0.005673
     Expected counter: 2
-    Gas limit: 5173
+    Gas limit: 5193
     Storage limit: 0 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.005671
-      payload fees(the block proposer) ....... +ꜩ0.005671
+      [PUBLIC_KEY_HASH] ... -ꜩ0.005673
+      payload fees(the block proposer) ....... +ꜩ0.005673
     Tx rollup transaction:[TX_ROLLUP_HASH], 5000 bytes, From: [PUBLIC_KEY_HASH]
       This tx rollup submit operation was successfully applied
       Balance updates:
         
-      Consumed gas: 5072.121
+      Consumed gas: 5092.121
 
 
 ./tezos-client --wait none submit tx rollup batch 6161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161 to '[TX_ROLLUP_HASH]' from bootstrap7
 Node is bootstrapped.
 Estimated storage: no bytes added
-Estimated gas: 5072.121 units (will add 100 for safety)
+Estimated gas: 5092.121 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -234,24 +234,24 @@ This sequence of operations was run:
       Consumed gas: 1000
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.005671
+    Fee to the baker: ꜩ0.005673
     Expected counter: 2
-    Gas limit: 5173
+    Gas limit: 5193
     Storage limit: 0 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.005671
-      payload fees(the block proposer) ....... +ꜩ0.005671
+      [PUBLIC_KEY_HASH] ... -ꜩ0.005673
+      payload fees(the block proposer) ....... +ꜩ0.005673
     Tx rollup transaction:[TX_ROLLUP_HASH], 5000 bytes, From: [PUBLIC_KEY_HASH]
       This tx rollup submit operation was successfully applied
       Balance updates:
         
-      Consumed gas: 5072.121
+      Consumed gas: 5092.121
 
 
 ./tezos-client --wait none submit tx rollup batch 6161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161 to '[TX_ROLLUP_HASH]' from bootstrap8
 Node is bootstrapped.
 Estimated storage: no bytes added
-Estimated gas: 5072.121 units (will add 100 for safety)
+Estimated gas: 5092.121 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -276,24 +276,24 @@ This sequence of operations was run:
       Consumed gas: 1000
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.005671
+    Fee to the baker: ꜩ0.005673
     Expected counter: 2
-    Gas limit: 5173
+    Gas limit: 5193
     Storage limit: 0 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.005671
-      payload fees(the block proposer) ....... +ꜩ0.005671
+      [PUBLIC_KEY_HASH] ... -ꜩ0.005673
+      payload fees(the block proposer) ....... +ꜩ0.005673
     Tx rollup transaction:[TX_ROLLUP_HASH], 5000 bytes, From: [PUBLIC_KEY_HASH]
       This tx rollup submit operation was successfully applied
       Balance updates:
         
-      Consumed gas: 5072.121
+      Consumed gas: 5092.121
 
 
 ./tezos-client --wait none submit tx rollup batch 6161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161 to '[TX_ROLLUP_HASH]' from bootstrap9
 Node is bootstrapped.
 Estimated storage: no bytes added
-Estimated gas: 5072.121 units (will add 100 for safety)
+Estimated gas: 5092.121 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -318,24 +318,24 @@ This sequence of operations was run:
       Consumed gas: 1000
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.005671
+    Fee to the baker: ꜩ0.005673
     Expected counter: 2
-    Gas limit: 5173
+    Gas limit: 5193
     Storage limit: 0 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.005671
-      payload fees(the block proposer) ....... +ꜩ0.005671
+      [PUBLIC_KEY_HASH] ... -ꜩ0.005673
+      payload fees(the block proposer) ....... +ꜩ0.005673
     Tx rollup transaction:[TX_ROLLUP_HASH], 5000 bytes, From: [PUBLIC_KEY_HASH]
       This tx rollup submit operation was successfully applied
       Balance updates:
         
-      Consumed gas: 5072.121
+      Consumed gas: 5092.121
 
 
 ./tezos-client --wait none submit tx rollup batch 6161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161 to '[TX_ROLLUP_HASH]' from bootstrap10
 Node is bootstrapped.
 Estimated storage: no bytes added
-Estimated gas: 5072.121 units (will add 100 for safety)
+Estimated gas: 5092.121 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -360,24 +360,24 @@ This sequence of operations was run:
       Consumed gas: 1000
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.005671
+    Fee to the baker: ꜩ0.005673
     Expected counter: 2
-    Gas limit: 5173
+    Gas limit: 5193
     Storage limit: 0 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.005671
-      payload fees(the block proposer) ....... +ꜩ0.005671
+      [PUBLIC_KEY_HASH] ... -ꜩ0.005673
+      payload fees(the block proposer) ....... +ꜩ0.005673
     Tx rollup transaction:[TX_ROLLUP_HASH], 5000 bytes, From: [PUBLIC_KEY_HASH]
       This tx rollup submit operation was successfully applied
       Balance updates:
         
-      Consumed gas: 5072.121
+      Consumed gas: 5092.121
 
 
 ./tezos-client --wait none submit tx rollup batch 6161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161 to '[TX_ROLLUP_HASH]' from bootstrap11
 Node is bootstrapped.
 Estimated storage: no bytes added
-Estimated gas: 5072.121 units (will add 100 for safety)
+Estimated gas: 5092.121 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -402,24 +402,24 @@ This sequence of operations was run:
       Consumed gas: 1000
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.005671
+    Fee to the baker: ꜩ0.005673
     Expected counter: 2
-    Gas limit: 5173
+    Gas limit: 5193
     Storage limit: 0 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.005671
-      payload fees(the block proposer) ....... +ꜩ0.005671
+      [PUBLIC_KEY_HASH] ... -ꜩ0.005673
+      payload fees(the block proposer) ....... +ꜩ0.005673
     Tx rollup transaction:[TX_ROLLUP_HASH], 5000 bytes, From: [PUBLIC_KEY_HASH]
       This tx rollup submit operation was successfully applied
       Balance updates:
         
-      Consumed gas: 5072.121
+      Consumed gas: 5092.121
 
 
 ./tezos-client --wait none submit tx rollup batch 6161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161 to '[TX_ROLLUP_HASH]' from bootstrap12
 Node is bootstrapped.
 Estimated storage: no bytes added
-Estimated gas: 5072.121 units (will add 100 for safety)
+Estimated gas: 5092.121 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -444,24 +444,24 @@ This sequence of operations was run:
       Consumed gas: 1000
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.005671
+    Fee to the baker: ꜩ0.005673
     Expected counter: 2
-    Gas limit: 5173
+    Gas limit: 5193
     Storage limit: 0 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.005671
-      payload fees(the block proposer) ....... +ꜩ0.005671
+      [PUBLIC_KEY_HASH] ... -ꜩ0.005673
+      payload fees(the block proposer) ....... +ꜩ0.005673
     Tx rollup transaction:[TX_ROLLUP_HASH], 5000 bytes, From: [PUBLIC_KEY_HASH]
       This tx rollup submit operation was successfully applied
       Balance updates:
         
-      Consumed gas: 5072.121
+      Consumed gas: 5092.121
 
 
 ./tezos-client --wait none submit tx rollup batch 6161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161 to '[TX_ROLLUP_HASH]' from bootstrap13
 Node is bootstrapped.
 Estimated storage: no bytes added
-Estimated gas: 5072.121 units (will add 100 for safety)
+Estimated gas: 5092.121 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -486,24 +486,24 @@ This sequence of operations was run:
       Consumed gas: 1000
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.005671
+    Fee to the baker: ꜩ0.005673
     Expected counter: 2
-    Gas limit: 5173
+    Gas limit: 5193
     Storage limit: 0 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.005671
-      payload fees(the block proposer) ....... +ꜩ0.005671
+      [PUBLIC_KEY_HASH] ... -ꜩ0.005673
+      payload fees(the block proposer) ....... +ꜩ0.005673
     Tx rollup transaction:[TX_ROLLUP_HASH], 5000 bytes, From: [PUBLIC_KEY_HASH]
       This tx rollup submit operation was successfully applied
       Balance updates:
         
-      Consumed gas: 5072.121
+      Consumed gas: 5092.121
 
 
 ./tezos-client --wait none submit tx rollup batch 6161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161 to '[TX_ROLLUP_HASH]' from bootstrap14
 Node is bootstrapped.
 Estimated storage: no bytes added
-Estimated gas: 5072.121 units (will add 100 for safety)
+Estimated gas: 5092.121 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -528,24 +528,24 @@ This sequence of operations was run:
       Consumed gas: 1000
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.005671
+    Fee to the baker: ꜩ0.005673
     Expected counter: 2
-    Gas limit: 5173
+    Gas limit: 5193
     Storage limit: 0 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.005671
-      payload fees(the block proposer) ....... +ꜩ0.005671
+      [PUBLIC_KEY_HASH] ... -ꜩ0.005673
+      payload fees(the block proposer) ....... +ꜩ0.005673
     Tx rollup transaction:[TX_ROLLUP_HASH], 5000 bytes, From: [PUBLIC_KEY_HASH]
       This tx rollup submit operation was successfully applied
       Balance updates:
         
-      Consumed gas: 5072.121
+      Consumed gas: 5092.121
 
 
 ./tezos-client --wait none submit tx rollup batch 6161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161 to '[TX_ROLLUP_HASH]' from bootstrap15
 Node is bootstrapped.
 Estimated storage: no bytes added
-Estimated gas: 5072.121 units (will add 100 for safety)
+Estimated gas: 5092.121 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -570,24 +570,24 @@ This sequence of operations was run:
       Consumed gas: 1000
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.005671
+    Fee to the baker: ꜩ0.005673
     Expected counter: 2
-    Gas limit: 5173
+    Gas limit: 5193
     Storage limit: 0 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.005671
-      payload fees(the block proposer) ....... +ꜩ0.005671
+      [PUBLIC_KEY_HASH] ... -ꜩ0.005673
+      payload fees(the block proposer) ....... +ꜩ0.005673
     Tx rollup transaction:[TX_ROLLUP_HASH], 5000 bytes, From: [PUBLIC_KEY_HASH]
       This tx rollup submit operation was successfully applied
       Balance updates:
         
-      Consumed gas: 5072.121
+      Consumed gas: 5092.121
 
 
 ./tezos-client --wait none submit tx rollup batch 6161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161 to '[TX_ROLLUP_HASH]' from bootstrap16
 Node is bootstrapped.
 Estimated storage: no bytes added
-Estimated gas: 5072.121 units (will add 100 for safety)
+Estimated gas: 5092.121 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -612,24 +612,24 @@ This sequence of operations was run:
       Consumed gas: 1000
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.005671
+    Fee to the baker: ꜩ0.005673
     Expected counter: 2
-    Gas limit: 5173
+    Gas limit: 5193
     Storage limit: 0 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.005671
-      payload fees(the block proposer) ....... +ꜩ0.005671
+      [PUBLIC_KEY_HASH] ... -ꜩ0.005673
+      payload fees(the block proposer) ....... +ꜩ0.005673
     Tx rollup transaction:[TX_ROLLUP_HASH], 5000 bytes, From: [PUBLIC_KEY_HASH]
       This tx rollup submit operation was successfully applied
       Balance updates:
         
-      Consumed gas: 5072.121
+      Consumed gas: 5092.121
 
 
 ./tezos-client --wait none submit tx rollup batch 6161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161 to '[TX_ROLLUP_HASH]' from bootstrap17
 Node is bootstrapped.
 Estimated storage: no bytes added
-Estimated gas: 5072.121 units (will add 100 for safety)
+Estimated gas: 5092.121 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -654,24 +654,24 @@ This sequence of operations was run:
       Consumed gas: 1000
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.005671
+    Fee to the baker: ꜩ0.005673
     Expected counter: 2
-    Gas limit: 5173
+    Gas limit: 5193
     Storage limit: 0 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.005671
-      payload fees(the block proposer) ....... +ꜩ0.005671
+      [PUBLIC_KEY_HASH] ... -ꜩ0.005673
+      payload fees(the block proposer) ....... +ꜩ0.005673
     Tx rollup transaction:[TX_ROLLUP_HASH], 5000 bytes, From: [PUBLIC_KEY_HASH]
       This tx rollup submit operation was successfully applied
       Balance updates:
         
-      Consumed gas: 5072.121
+      Consumed gas: 5092.121
 
 
 ./tezos-client --wait none submit tx rollup batch 6161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161 to '[TX_ROLLUP_HASH]' from bootstrap18
 Node is bootstrapped.
 Estimated storage: no bytes added
-Estimated gas: 5072.121 units (will add 100 for safety)
+Estimated gas: 5092.121 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -696,24 +696,24 @@ This sequence of operations was run:
       Consumed gas: 1000
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.005671
+    Fee to the baker: ꜩ0.005673
     Expected counter: 2
-    Gas limit: 5173
+    Gas limit: 5193
     Storage limit: 0 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.005671
-      payload fees(the block proposer) ....... +ꜩ0.005671
+      [PUBLIC_KEY_HASH] ... -ꜩ0.005673
+      payload fees(the block proposer) ....... +ꜩ0.005673
     Tx rollup transaction:[TX_ROLLUP_HASH], 5000 bytes, From: [PUBLIC_KEY_HASH]
       This tx rollup submit operation was successfully applied
       Balance updates:
         
-      Consumed gas: 5072.121
+      Consumed gas: 5092.121
 
 
 ./tezos-client --wait none submit tx rollup batch 6161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161 to '[TX_ROLLUP_HASH]' from bootstrap19
 Node is bootstrapped.
 Estimated storage: no bytes added
-Estimated gas: 5072.121 units (will add 100 for safety)
+Estimated gas: 5092.121 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -738,24 +738,24 @@ This sequence of operations was run:
       Consumed gas: 1000
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.005671
+    Fee to the baker: ꜩ0.005673
     Expected counter: 2
-    Gas limit: 5173
+    Gas limit: 5193
     Storage limit: 0 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.005671
-      payload fees(the block proposer) ....... +ꜩ0.005671
+      [PUBLIC_KEY_HASH] ... -ꜩ0.005673
+      payload fees(the block proposer) ....... +ꜩ0.005673
     Tx rollup transaction:[TX_ROLLUP_HASH], 5000 bytes, From: [PUBLIC_KEY_HASH]
       This tx rollup submit operation was successfully applied
       Balance updates:
         
-      Consumed gas: 5072.121
+      Consumed gas: 5092.121
 
 
 ./tezos-client --wait none submit tx rollup batch 6161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161 to '[TX_ROLLUP_HASH]' from bootstrap20
 Node is bootstrapped.
 Estimated storage: no bytes added
-Estimated gas: 5072.121 units (will add 100 for safety)
+Estimated gas: 5092.121 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -780,18 +780,18 @@ This sequence of operations was run:
       Consumed gas: 1000
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.005671
+    Fee to the baker: ꜩ0.005673
     Expected counter: 2
-    Gas limit: 5173
+    Gas limit: 5193
     Storage limit: 0 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.005671
-      payload fees(the block proposer) ....... +ꜩ0.005671
+      [PUBLIC_KEY_HASH] ... -ꜩ0.005673
+      payload fees(the block proposer) ....... +ꜩ0.005673
     Tx rollup transaction:[TX_ROLLUP_HASH], 5000 bytes, From: [PUBLIC_KEY_HASH]
       This tx rollup submit operation was successfully applied
       Balance updates:
         
-      Consumed gas: 5072.121
+      Consumed gas: 5092.121
 
 
 ./tezos-client rpc get '/chains/main/blocks/head/context/tx_rollup/[TX_ROLLUP_HASH]/inbox/0'
diff --git a/tezt/_regressions/tx_rollup_rpc_commitment.out b/tezt/_regressions/tx_rollup_rpc_commitment.out
index bf2d3cdc2faf2af6e6c0c31c4433d2b8f21e81ab..38c057cc1ce425f7c7cf95598cb0fe3b72d1032a 100644
--- a/tezt/_regressions/tx_rollup_rpc_commitment.out
+++ b/tezt/_regressions/tx_rollup_rpc_commitment.out
@@ -2,7 +2,7 @@ tx_rollup_rpc_commitment.out
 
 ./tezos-client --wait none originate tx rollup from '[PUBLIC_KEY_HASH]' --burn-cap 9999999 --storage-limit 60000
 Node is bootstrapped.
-Estimated gas: 1410.112 units (will add 100 for safety)
+Estimated gas: 1420.112 units (will add 100 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
 NOT waiting for the operation to be included.
@@ -12,26 +12,26 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.000378
+    Fee to the baker: ꜩ0.000379
     Expected counter: 1
-    Gas limit: 1511
+    Gas limit: 1521
     Storage limit: 60000 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.000378
-      payload fees(the block proposer) ....... +ꜩ0.000378
+      [PUBLIC_KEY_HASH] ... -ꜩ0.000379
+      payload fees(the block proposer) ....... +ꜩ0.000379
     Tx rollup origination:
       From: [PUBLIC_KEY_HASH]
       This tx rollup origination operation was successfully applied
       Balance updates:
         [PUBLIC_KEY_HASH] ... -ꜩ15
         storage fees ........................... +ꜩ15
-      Consumed gas: 1410.112
+      Consumed gas: 1420.112
       Originated tx rollup: [TX_ROLLUP_HASH]
 
 
 ./tezos-client --wait none submit tx rollup batch 626c6f62 to '[TX_ROLLUP_HASH]' from '[PUBLIC_KEY_HASH]'
 Node is bootstrapped.
-Estimated gas: 2564.880 units (will add 100 for safety)
+Estimated gas: 2584.880 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -42,23 +42,23 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.00052
+    Fee to the baker: ꜩ0.000522
     Expected counter: 2
-    Gas limit: 2665
+    Gas limit: 2685
     Storage limit: 0 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.00052
-      payload fees(the block proposer) ....... +ꜩ0.00052
+      [PUBLIC_KEY_HASH] ... -ꜩ0.000522
+      payload fees(the block proposer) ....... +ꜩ0.000522
     Tx rollup transaction:[TX_ROLLUP_HASH], 4 bytes, From: [PUBLIC_KEY_HASH]
       This tx rollup submit operation was successfully applied
       Balance updates:
         
-      Consumed gas: 2564.880
+      Consumed gas: 2584.880
 
 
 ./tezos-client --wait none submit tx rollup commitment 0 '[TX_ROLLUP_INBOX_HASH]'  '[TX_ROLLUP_MESSAGE_RESULT_HASH]' to '[TX_ROLLUP_HASH]' from '[PUBLIC_KEY_HASH]'
 Node is bootstrapped.
-Estimated gas: 3663.146 units (will add 100 for safety)
+Estimated gas: 3818.146 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -69,20 +69,20 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.000694
+    Fee to the baker: ꜩ0.000709
     Expected counter: 3
-    Gas limit: 3764
+    Gas limit: 3919
     Storage limit: 0 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.000694
-      payload fees(the block proposer) ....... +ꜩ0.000694
+      [PUBLIC_KEY_HASH] ... -ꜩ0.000709
+      payload fees(the block proposer) ....... +ꜩ0.000709
     Tx rollup commitment:[TX_ROLLUP_HASH], commitment 0 : messages = [TX_ROLLUP_MESSAGE_RESULT_HASH] predecessor  for inbox with merkle root [TX_ROLLUP_INBOX_HASH]
       From: [PUBLIC_KEY_HASH]
       This tx rollup commit operation was successfully applied
       Balance updates:
         [PUBLIC_KEY_HASH] ....................................................... -ꜩ10000
         Frozen_bonds([PUBLIC_KEY_HASH],[TX_ROLLUP_HASH]) ... +ꜩ10000
-      Consumed gas: 3663.146
+      Consumed gas: 3818.146
 
 
 ./tezos-client rpc get '/chains/main/blocks/head/context/tx_rollup/[TX_ROLLUP_HASH]/commitment/0'
diff --git a/tezt/_regressions/tx_rollup_rpc_inbox.out b/tezt/_regressions/tx_rollup_rpc_inbox.out
index e8ab507225e8b7d54a3971ea6dd9bd700710a1f7..ef624ab76faa5b4d8b30fcad11b8bf9f8e9c0c81 100644
--- a/tezt/_regressions/tx_rollup_rpc_inbox.out
+++ b/tezt/_regressions/tx_rollup_rpc_inbox.out
@@ -2,7 +2,7 @@ tx_rollup_rpc_inbox.out
 
 ./tezos-client --wait none originate tx rollup from '[PUBLIC_KEY_HASH]' --burn-cap 9999999 --storage-limit 60000
 Node is bootstrapped.
-Estimated gas: 1410.112 units (will add 100 for safety)
+Estimated gas: 1420.112 units (will add 100 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
 NOT waiting for the operation to be included.
@@ -12,26 +12,26 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.000378
+    Fee to the baker: ꜩ0.000379
     Expected counter: 1
-    Gas limit: 1511
+    Gas limit: 1521
     Storage limit: 60000 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.000378
-      payload fees(the block proposer) ....... +ꜩ0.000378
+      [PUBLIC_KEY_HASH] ... -ꜩ0.000379
+      payload fees(the block proposer) ....... +ꜩ0.000379
     Tx rollup origination:
       From: [PUBLIC_KEY_HASH]
       This tx rollup origination operation was successfully applied
       Balance updates:
         [PUBLIC_KEY_HASH] ... -ꜩ15
         storage fees ........................... +ꜩ15
-      Consumed gas: 1410.112
+      Consumed gas: 1420.112
       Originated tx rollup: [TX_ROLLUP_HASH]
 
 
 ./tezos-client --wait none submit tx rollup batch 626c6f62 to '[TX_ROLLUP_HASH]' from '[PUBLIC_KEY_HASH]'
 Node is bootstrapped.
-Estimated gas: 2564.880 units (will add 100 for safety)
+Estimated gas: 2584.880 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -42,18 +42,18 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.00052
+    Fee to the baker: ꜩ0.000522
     Expected counter: 2
-    Gas limit: 2665
+    Gas limit: 2685
     Storage limit: 0 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.00052
-      payload fees(the block proposer) ....... +ꜩ0.00052
+      [PUBLIC_KEY_HASH] ... -ꜩ0.000522
+      payload fees(the block proposer) ....... +ꜩ0.000522
     Tx rollup transaction:[TX_ROLLUP_HASH], 4 bytes, From: [PUBLIC_KEY_HASH]
       This tx rollup submit operation was successfully applied
       Balance updates:
         
-      Consumed gas: 2564.880
+      Consumed gas: 2584.880
 
 
 ./tezos-client rpc get '/chains/main/blocks/head/context/tx_rollup/[TX_ROLLUP_HASH]/inbox/0'
diff --git a/tezt/_regressions/tx_rollup_rpc_pending_bonded_commitments.out b/tezt/_regressions/tx_rollup_rpc_pending_bonded_commitments.out
index 9650080464f5edfd4d6ecd06262eda98acae3b66..a231f6137713871d34952fd07309a17ea42a2d1a 100644
--- a/tezt/_regressions/tx_rollup_rpc_pending_bonded_commitments.out
+++ b/tezt/_regressions/tx_rollup_rpc_pending_bonded_commitments.out
@@ -2,7 +2,7 @@ tx_rollup_rpc_pending_bonded_commitments.out
 
 ./tezos-client --wait none originate tx rollup from '[PUBLIC_KEY_HASH]' --burn-cap 9999999 --storage-limit 60000
 Node is bootstrapped.
-Estimated gas: 1410.112 units (will add 100 for safety)
+Estimated gas: 1420.112 units (will add 100 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
 NOT waiting for the operation to be included.
@@ -12,26 +12,26 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.000378
+    Fee to the baker: ꜩ0.000379
     Expected counter: 1
-    Gas limit: 1511
+    Gas limit: 1521
     Storage limit: 60000 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.000378
-      payload fees(the block proposer) ....... +ꜩ0.000378
+      [PUBLIC_KEY_HASH] ... -ꜩ0.000379
+      payload fees(the block proposer) ....... +ꜩ0.000379
     Tx rollup origination:
       From: [PUBLIC_KEY_HASH]
       This tx rollup origination operation was successfully applied
       Balance updates:
         [PUBLIC_KEY_HASH] ... -ꜩ15
         storage fees ........................... +ꜩ15
-      Consumed gas: 1410.112
+      Consumed gas: 1420.112
       Originated tx rollup: [TX_ROLLUP_HASH]
 
 
 ./tezos-client --wait none submit tx rollup batch 626c6f62 to '[TX_ROLLUP_HASH]' from '[PUBLIC_KEY_HASH]'
 Node is bootstrapped.
-Estimated gas: 2564.880 units (will add 100 for safety)
+Estimated gas: 2584.880 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -42,23 +42,23 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.00052
+    Fee to the baker: ꜩ0.000522
     Expected counter: 2
-    Gas limit: 2665
+    Gas limit: 2685
     Storage limit: 0 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.00052
-      payload fees(the block proposer) ....... +ꜩ0.00052
+      [PUBLIC_KEY_HASH] ... -ꜩ0.000522
+      payload fees(the block proposer) ....... +ꜩ0.000522
     Tx rollup transaction:[TX_ROLLUP_HASH], 4 bytes, From: [PUBLIC_KEY_HASH]
       This tx rollup submit operation was successfully applied
       Balance updates:
         
-      Consumed gas: 2564.880
+      Consumed gas: 2584.880
 
 
 ./tezos-client --wait none submit tx rollup commitment 0 '[TX_ROLLUP_INBOX_HASH]'  '[TX_ROLLUP_MESSAGE_RESULT_HASH]' to '[TX_ROLLUP_HASH]' from '[PUBLIC_KEY_HASH]'
 Node is bootstrapped.
-Estimated gas: 3663.146 units (will add 100 for safety)
+Estimated gas: 3818.146 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -69,20 +69,20 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.000694
+    Fee to the baker: ꜩ0.000709
     Expected counter: 3
-    Gas limit: 3764
+    Gas limit: 3919
     Storage limit: 0 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.000694
-      payload fees(the block proposer) ....... +ꜩ0.000694
+      [PUBLIC_KEY_HASH] ... -ꜩ0.000709
+      payload fees(the block proposer) ....... +ꜩ0.000709
     Tx rollup commitment:[TX_ROLLUP_HASH], commitment 0 : messages = [TX_ROLLUP_MESSAGE_RESULT_HASH] predecessor  for inbox with merkle root [TX_ROLLUP_INBOX_HASH]
       From: [PUBLIC_KEY_HASH]
       This tx rollup commit operation was successfully applied
       Balance updates:
         [PUBLIC_KEY_HASH] ....................................................... -ꜩ10000
         Frozen_bonds([PUBLIC_KEY_HASH],[TX_ROLLUP_HASH]) ... +ꜩ10000
-      Consumed gas: 3663.146
+      Consumed gas: 3818.146
 
 
 ./tezos-client rpc get '/chains/main/blocks/head/context/tx_rollup/[TX_ROLLUP_HASH]/pending_bonded_commitments/[PUBLIC_KEY_HASH]'
diff --git a/tezt/_regressions/tx_rollup_rpc_state.out b/tezt/_regressions/tx_rollup_rpc_state.out
index 81383f13ef3c323c342ac6ee14ec01fc771f143f..1370fdb3245c582881d81c1bc33de350f4d7cbb8 100644
--- a/tezt/_regressions/tx_rollup_rpc_state.out
+++ b/tezt/_regressions/tx_rollup_rpc_state.out
@@ -2,7 +2,7 @@ tx_rollup_rpc_state.out
 
 ./tezos-client --wait none originate tx rollup from '[PUBLIC_KEY_HASH]' --burn-cap 9999999 --storage-limit 60000
 Node is bootstrapped.
-Estimated gas: 1410.112 units (will add 100 for safety)
+Estimated gas: 1420.112 units (will add 100 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
 NOT waiting for the operation to be included.
@@ -12,20 +12,20 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.000378
+    Fee to the baker: ꜩ0.000379
     Expected counter: 1
-    Gas limit: 1511
+    Gas limit: 1521
     Storage limit: 60000 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.000378
-      payload fees(the block proposer) ....... +ꜩ0.000378
+      [PUBLIC_KEY_HASH] ... -ꜩ0.000379
+      payload fees(the block proposer) ....... +ꜩ0.000379
     Tx rollup origination:
       From: [PUBLIC_KEY_HASH]
       This tx rollup origination operation was successfully applied
       Balance updates:
         [PUBLIC_KEY_HASH] ... -ꜩ15
         storage fees ........................... +ꜩ15
-      Consumed gas: 1410.112
+      Consumed gas: 1420.112
       Originated tx rollup: [TX_ROLLUP_HASH]
 
 
diff --git a/tezt/tests/manager_operations.ml b/tezt/tests/manager_operations.ml
index 76ad402460f8e4ede9bf9ed10dbe189f9cc6343f..4f074fad56e04cf752a635e75f00d4f2b14eca04 100644
--- a/tezt/tests/manager_operations.ml
+++ b/tezt/tests/manager_operations.ml
@@ -861,7 +861,7 @@ module Deserialisation = struct
   (* Gas to execute call to noop contract without deserialization *)
   let gas_to_execute_rest_noop = function
     | Protocol.Hangzhou | Ithaca -> 2049
-    | Alpha -> 2050
+    | Alpha -> 2109
 
   let inject_call_with_bytes ?(source = Constant.bootstrap5) ?protocol ~contract
       ~size_kB ~gas_limit client =
@@ -935,7 +935,7 @@ module Deserialisation = struct
       ~__FILE__
       ~title:
         "Smart contract call that would succeed if we did not account \
-         deserializtion gas correctly"
+         deserialization gas correctly"
       ~tags:["precheck"; "gas"; "deserialization"; "lazy_expr"]
     @@ fun protocol ->
     let* nodes = Helpers.init ~protocol () in