diff --git a/test/cmdlineTests/evm_to_wasm/output b/test/cmdlineTests/evm_to_wasm/output
index 1c31f9488..2832ed7b7 100644
--- a/test/cmdlineTests/evm_to_wasm/output
+++ b/test/cmdlineTests/evm_to_wasm/output
@@ -15,37 +15,37 @@ object "object" {
         function main()
         {
             let _1 := 0
-            mstore_internal(_1, _1, _1, _1, _1)
-            mstore_internal(32, _1, _1, _1, 1)
-            eth.storageStore(_1, 32)
+            mstore_internal(0:i64, _1, _1, _1, _1)
+            mstore_internal(32:i64, _1, _1, _1, 1)
+            eth.storageStore(0:i64, 32:i64)
         }
-        function endian_swap_16(x) -> y
+        function endian_swap_16(x:i64) -> y:i64
         {
-            y := i64.or(i64.and(i64.shl(x, 8), 0xff00), i64.and(i64.shr_u(x, 8), 0xff))
+            y := i64.or(i64.and(i64.shl(x, 8:i64), 0xff00:i64), i64.and(i64.shr_u(x, 8:i64), 0xff:i64))
         }
-        function endian_swap_32(x) -> y
+        function endian_swap_32(x:i64) -> y:i64
         {
-            let hi := i64.shl(endian_swap_16(x), 16)
-            y := i64.or(hi, endian_swap_16(i64.shr_u(x, 16)))
+            let hi:i64 := i64.shl(endian_swap_16(x), 16:i64)
+            y := i64.or(hi, endian_swap_16(i64.shr_u(x, 16:i64)))
         }
-        function endian_swap(x) -> y
+        function endian_swap(x:i64) -> y:i64
         {
-            let hi := i64.shl(endian_swap_32(x), 32)
-            y := i64.or(hi, endian_swap_32(i64.shr_u(x, 32)))
+            let hi:i64 := i64.shl(endian_swap_32(x), 32:i64)
+            y := i64.or(hi, endian_swap_32(i64.shr_u(x, 32:i64)))
         }
-        function mstore_internal(pos, y1, y2, y3, y4)
+        function mstore_internal(pos:i64, y1:i64, y2:i64, y3:i64, y4:i64)
         {
             i64.store(pos, endian_swap(y1))
-            i64.store(i64.add(pos, 8), endian_swap(y2))
-            i64.store(i64.add(pos, 16), endian_swap(y3))
-            i64.store(i64.add(pos, 24), endian_swap(y4))
+            i64.store(i64.add(pos, 8:i64), endian_swap(y2))
+            i64.store(i64.add(pos, 16:i64), endian_swap(y3))
+            i64.store(i64.add(pos, 24:i64), endian_swap(y4))
         }
     }
 }
 
 
 Binary representation:
-0061736d0100000001160460000060017e017e60057e7e7e7e7e0060027f7f0002190108657468657265756d0c73746f7261676553746f7265000303060500010101020503010001060100071102066d656d6f72790200046d61696e00010ab501052801017e420021002000200020002000200010054220200020002000420110052000a74220a710000b1c01017e20004208864280fe0383200042088842ff018384210120010b1b01027e20001002421086210220022000421088100284210120010b1b01027e20001003422086210220022000422088100384210120010b3501007e2000a720011004370300200042087ca720021004370300200042107ca720031004370300200042187ca7200410043703000b
+0061736d0100000001160460000060017e017e60057e7e7e7e7e0060027f7f0002190108657468657265756d0c73746f7261676553746f7265000303060500010101020503010001060100071102066d656d6f72790200046d61696e00010ab501052801017e420021004200200020002000200010054220200020002000420110054200a74220a710000b1c01017e20004208864280fe0383200042088842ff018384210120010b1b01027e20001002421086210220022000421088100284210120010b1b01027e20001003422086210220022000422088100384210120010b3501007e2000a720011004370300200042087ca720021004370300200042107ca720031004370300200042187ca7200410043703000b
 
 Text representation:
 (module
@@ -56,9 +56,9 @@ Text representation:
 (func $main
     (local $_1 i64)
     (local.set $_1 (i64.const 0))
-    (call $mstore_internal (local.get $_1) (local.get $_1) (local.get $_1) (local.get $_1) (local.get $_1))
+    (call $mstore_internal (i64.const 0) (local.get $_1) (local.get $_1) (local.get $_1) (local.get $_1))
     (call $mstore_internal (i64.const 32) (local.get $_1) (local.get $_1) (local.get $_1) (i64.const 1))
-    (call $eth.storageStore (i32.wrap_i64 (local.get $_1)) (i32.wrap_i64 (i64.const 32)))
+    (call $eth.storageStore (i32.wrap_i64 (i64.const 0)) (i32.wrap_i64 (i64.const 32)))
 )
 
 (func $endian_swap_16
diff --git a/test/cmdlineTests/standard_eWasm_requested/output.json b/test/cmdlineTests/standard_eWasm_requested/output.json
index 11e7bb252..0652b99e4 100644
--- a/test/cmdlineTests/standard_eWasm_requested/output.json
+++ b/test/cmdlineTests/standard_eWasm_requested/output.json
@@ -10,21 +10,23 @@
     (local $p i64)
     (local $r i64)
     (local $hi i64)
-    (local $y i64)
     (local $hi_1 i64)
+    (local $y i64)
+    (local $hi_2 i64)
     (local $_2 i64)
     (local.set $_1 (i64.const 0))
     (local.set $p (call $u256_to_i32 (local.get $_1) (local.get $_1) (local.get $_1) (i64.const 64)))
     (local.set $r (i64.add (local.get $p) (i64.const 64)))
     (if (i64.ne (i64.extend_i32_u (i64.lt_u (local.get $r) (local.get $p))) (i64.const 0)) (then
         (unreachable)))
-    (local.set $hi (i64.shl (i64.or (i64.shl (i64.or (i64.and (i64.shl (local.get $_1) (i64.const 8)) (i64.const 65280)) (i64.and (i64.shr_u (local.get $_1) (i64.const 8)) (i64.const 255))) (i64.const 16)) (call $endian_swap_16 (i64.shr_u (local.get $_1) (i64.const 16)))) (i64.const 32)))
-    (local.set $y (i64.or (local.get $hi) (call $endian_swap_32 (i64.shr_u (local.get $_1) (i64.const 32)))))
+    (local.set $hi (i64.shl (call $endian_swap_16 (local.get $_1)) (i64.const 16)))
+    (local.set $hi_1 (i64.shl (i64.or (local.get $hi) (call $endian_swap_16 (i64.shr_u (local.get $_1) (i64.const 16)))) (i64.const 32)))
+    (local.set $y (i64.or (local.get $hi_1) (call $endian_swap_32 (i64.shr_u (local.get $_1) (i64.const 32)))))
     (i64.store (i32.wrap_i64 (local.get $r)) (local.get $y))
     (i64.store (i32.wrap_i64 (i64.add (local.get $r) (i64.const 8))) (local.get $y))
     (i64.store (i32.wrap_i64 (i64.add (local.get $r) (i64.const 16))) (local.get $y))
-    (local.set $hi_1 (i64.shl (call $endian_swap_32 (i64.const 128)) (i64.const 32)))
-    (i64.store (i32.wrap_i64 (i64.add (local.get $r) (i64.const 24))) (i64.or (local.get $hi_1) (call $endian_swap_32 (i64.shr_u (i64.const 128) (i64.const 32)))))
+    (local.set $hi_2 (i64.shl (call $endian_swap_32 (i64.const 128)) (i64.const 32)))
+    (i64.store (i32.wrap_i64 (i64.add (local.get $r) (i64.const 24))) (i64.or (local.get $hi_2) (call $endian_swap_32 (i64.shr_u (i64.const 128) (i64.const 32)))))
     (local.set $_2 (datasize \"C_2_deployed\"))
     (call $eth.codeCopy (i32.wrap_i64 (call $to_internal_i32ptr (local.get $_1) (local.get $_1) (local.get $_1) (local.get $_1))) (i32.wrap_i64 (call $u256_to_i32 (local.get $_1) (local.get $_1) (local.get $_1) (dataoffset \"C_2_deployed\"))) (i32.wrap_i64 (call $u256_to_i32 (local.get $_1) (local.get $_1) (local.get $_1) (local.get $_2))))
     (call $eth.finish (i32.wrap_i64 (call $to_internal_i32ptr (local.get $_1) (local.get $_1) (local.get $_1) (local.get $_1))) (i32.wrap_i64 (call $u256_to_i32 (local.get $_1) (local.get $_1) (local.get $_1) (local.get $_2))))
@@ -37,9 +39,9 @@
     (param $x4 i64)
     (result i64)
     (local $v i64)
-    (if (i64.ne (i64.extend_i32_u (i64.ne (local.get $v) (i64.or (i64.or (local.get $x1) (local.get $x2)) (local.get $x3)))) (i64.const 0)) (then
+    (if (i64.ne (i64.extend_i32_u (i64.ne (i64.const 0) (i64.or (i64.or (local.get $x1) (local.get $x2)) (local.get $x3)))) (i64.const 0)) (then
         (unreachable)))
-    (if (i64.ne (i64.extend_i32_u (i64.ne (local.get $v) (i64.shr_u (local.get $x4) (i64.const 32)))) (i64.const 0)) (then
+    (if (i64.ne (i64.extend_i32_u (i64.ne (i64.const 0) (i64.shr_u (local.get $x4) (i64.const 32)))) (i64.const 0)) (then
         (unreachable)))
     (local.set $v (local.get $x4))
     (local.get $v)