diff --git a/VMTests/vmArithmeticTest.json b/VMTests/vmArithmeticTest.json
index edc91436d..ad3846cf9 100644
--- a/VMTests/vmArithmeticTest.json
+++ b/VMTests/vmArithmeticTest.json
@@ -2142,28 +2142,29 @@
         "exec" : {
             "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "code" : "0x62126af4605016600057",
+            "code" : "0x62126af460500b600055",
             "data" : "0x",
             "gas" : "10000",
             "gasPrice" : "100000000000000",
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "0",
+        "gas" : "9696",
         "out" : "0x",
         "post" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "1000000000000000000",
-                "code" : "0x62126af4605016600057",
+                "code" : "0x62126af460500b600055",
                 "nonce" : "0",
                 "storage" : {
+                    "0x" : "0x126af4"
                 }
             }
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "1000000000000000000",
-                "code" : "0x62126af4605016600057",
+                "code" : "0x62126af460500b600055",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -2355,28 +2356,29 @@
         "exec" : {
             "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "code" : "0x60ff68f0000000000000000116600057",
+            "code" : "0x60ff68f000000000000000010b600055",
             "data" : "0x",
             "gas" : "10000",
             "gasPrice" : "100000000000000",
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "0",
+        "gas" : "9696",
         "out" : "0x",
         "post" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "1000000000000000000",
-                "code" : "0x60ff68f0000000000000000116600057",
+                "code" : "0x60ff68f000000000000000010b600055",
                 "nonce" : "0",
                 "storage" : {
+                    "0x" : "0xff"
                 }
             }
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "1000000000000000000",
-                "code" : "0x60ff68f0000000000000000116600057",
+                "code" : "0x60ff68f000000000000000010b600055",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -2439,28 +2441,29 @@
         "exec" : {
             "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "code" : "0x62122f6a600016600057",
+            "code" : "0x62122f6a60000b600055",
             "data" : "0x",
             "gas" : "10000",
             "gasPrice" : "100000000000000",
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "9995",
+        "gas" : "9696",
         "out" : "0x",
         "post" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "1000000000000000000",
-                "code" : "0x62122f6a600016600057",
+                "code" : "0x62122f6a60000b600055",
                 "nonce" : "0",
                 "storage" : {
+                    "0x" : "0x6a"
                 }
             }
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "1000000000000000000",
-                "code" : "0x62122f6a600016600057",
+                "code" : "0x62122f6a60000b600055",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -2481,28 +2484,29 @@
         "exec" : {
             "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "code" : "0x62126af4600116600057",
+            "code" : "0x62126af460010b600055",
             "data" : "0x",
             "gas" : "10000",
             "gasPrice" : "100000000000000",
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "9995",
+        "gas" : "9696",
         "out" : "0x",
         "post" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "1000000000000000000",
-                "code" : "0x62126af4600116600057",
+                "code" : "0x62126af460010b600055",
                 "nonce" : "0",
                 "storage" : {
+                    "0x" : "0x6af4"
                 }
             }
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "1000000000000000000",
-                "code" : "0x62126af4600116600057",
+                "code" : "0x62126af460010b600055",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -2523,28 +2527,29 @@
         "exec" : {
             "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "code" : "0x6212faf4600116600057",
+            "code" : "0x6212faf460010b600055",
             "data" : "0x",
             "gas" : "10000",
             "gasPrice" : "100000000000000",
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "9995",
+        "gas" : "9696",
         "out" : "0x",
         "post" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "1000000000000000000",
-                "code" : "0x6212faf4600116600057",
+                "code" : "0x6212faf460010b600055",
                 "nonce" : "0",
                 "storage" : {
+                    "0x" : "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaf4"
                 }
             }
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "1000000000000000000",
-                "code" : "0x6212faf4600116600057",
+                "code" : "0x6212faf460010b600055",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -2565,28 +2570,29 @@
         "exec" : {
             "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "code" : "0x66f000000000000161ffff16600057",
+            "code" : "0x66f000000000000161ffff0b600055",
             "data" : "0x",
             "gas" : "10000",
             "gasPrice" : "100000000000000",
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "0",
+        "gas" : "9696",
         "out" : "0x",
         "post" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "1000000000000000000",
-                "code" : "0x66f000000000000161ffff16600057",
+                "code" : "0x66f000000000000161ffff0b600055",
                 "nonce" : "0",
                 "storage" : {
+                    "0x" : "0xf0000000000001"
                 }
             }
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "1000000000000000000",
-                "code" : "0x66f000000000000161ffff16600057",
+                "code" : "0x66f000000000000161ffff0b600055",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -2607,28 +2613,29 @@
         "exec" : {
             "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "code" : "0x62122ff4600016600057",
+            "code" : "0x62122ff460000b600055",
             "data" : "0x",
             "gas" : "10000",
             "gasPrice" : "100000000000000",
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "9995",
+        "gas" : "9696",
         "out" : "0x",
         "post" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "1000000000000000000",
-                "code" : "0x62122ff4600016600057",
+                "code" : "0x62122ff460000b600055",
                 "nonce" : "0",
                 "storage" : {
+                    "0x" : "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff4"
                 }
             }
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "1000000000000000000",
-                "code" : "0x62122ff4600016600057",
+                "code" : "0x62122ff460000b600055",
                 "nonce" : "0",
                 "storage" : {
                 }