diff --git a/vmtests.json b/vmtests.json
index 9f46d1c7d..4398e398b 100644
--- a/vmtests.json
+++ b/vmtests.json
@@ -3,14 +3,10 @@
         "callcreates" : [
             {
                 "data" : [
-                    0,
-                    0,
-                    0,
-                    0
                 ],
                 "destination" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-                "gasLimit" : 9776,
-                "value" : 4
+                "gasLimit" : 9792,
+                "value" : 74
             }
         ],
         "env" : {
@@ -20,7 +16,6 @@
             "currentGasLimit" : "1000000",
             "currentNumber" : "0",
             "currentTimestamp" : 1,
-            "gasLimit" : null,
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "exec" : [
@@ -34,77 +29,68 @@
                 "value" : "1000000000000000000"
             }
         ],
-        "gas" : 9954,
+        "gas" : 9971,
         "out" : [
         ],
         "post" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : 999999999999999992,
+                "balance" : 999999999999999852,
+                "code" : [
+                    96,
+                    0,
+                    96,
+                    0,
+                    96,
+                    0,
+                    96,
+                    0,
+                    96,
+                    74,
+                    51,
+                    96,
+                    200,
+                    92,
+                    3,
+                    241
+                ],
                 "nonce" : 1,
                 "storage" : {
                 }
             },
             "cd1722f3947def4cf144679da39c4c32bdc35681" : {
-                "balance" : 4,
+                "balance" : 74,
+                "code" : [
+                ],
                 "nonce" : 0,
                 "storage" : {
                 }
-            },
-            "code" : [
-            ]
+            }
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : 1000000000000000000,
+                "code" : [
+                    96,
+                    0,
+                    96,
+                    0,
+                    96,
+                    0,
+                    96,
+                    0,
+                    96,
+                    74,
+                    51,
+                    96,
+                    200,
+                    92,
+                    3,
+                    241
+                ],
                 "nonce" : 0,
                 "storage" : {
                 }
-            },
-            "code" : [
-                96,
-                0,
-                96,
-                0,
-                96,
-                0,
-                96,
-                0,
-                96,
-                2,
-                96,
-                2,
-                96,
-                8,
-                3,
-                96,
-                2,
-                96,
-                3,
-                6,
-                96,
-                2,
-                96,
-                2,
-                4,
-                96,
-                4,
-                96,
-                4,
-                96,
-                4,
-                2,
-                96,
-                2,
-                96,
-                2,
-                1,
-                51,
-                96,
-                200,
-                92,
-                3,
-                241
-            ]
+            }
         }
     },
     "boolean" : {
@@ -145,7 +131,6 @@
             "currentGasLimit" : "1000000",
             "currentNumber" : "0",
             "currentTimestamp" : 1,
-            "gasLimit" : null,
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "exec" : [
@@ -165,260 +150,446 @@
         "post" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : 999999999999999918,
+                "code" : [
+                    96,
+                    1,
+                    96,
+                    1,
+                    16,
+                    15,
+                    96,
+                    26,
+                    89,
+                    96,
+                    0,
+                    96,
+                    0,
+                    96,
+                    0,
+                    96,
+                    0,
+                    96,
+                    2,
+                    51,
+                    96,
+                    200,
+                    92,
+                    3,
+                    241,
+                    80,
+                    96,
+                    0,
+                    96,
+                    1,
+                    16,
+                    15,
+                    96,
+                    52,
+                    89,
+                    96,
+                    0,
+                    96,
+                    0,
+                    96,
+                    0,
+                    96,
+                    0,
+                    96,
+                    3,
+                    51,
+                    96,
+                    200,
+                    92,
+                    3,
+                    241,
+                    80,
+                    96,
+                    1,
+                    96,
+                    0,
+                    16,
+                    15,
+                    96,
+                    78,
+                    89,
+                    96,
+                    0,
+                    96,
+                    0,
+                    96,
+                    0,
+                    96,
+                    0,
+                    96,
+                    4,
+                    51,
+                    96,
+                    200,
+                    92,
+                    3,
+                    241,
+                    80,
+                    96,
+                    0,
+                    96,
+                    0,
+                    16,
+                    15,
+                    96,
+                    104,
+                    89,
+                    96,
+                    0,
+                    96,
+                    0,
+                    96,
+                    0,
+                    96,
+                    0,
+                    96,
+                    5,
+                    51,
+                    96,
+                    200,
+                    92,
+                    3,
+                    241,
+                    80,
+                    96,
+                    1,
+                    96,
+                    1,
+                    17,
+                    15,
+                    96,
+                    130,
+                    89,
+                    96,
+                    0,
+                    96,
+                    0,
+                    96,
+                    0,
+                    96,
+                    0,
+                    96,
+                    12,
+                    51,
+                    96,
+                    200,
+                    92,
+                    3,
+                    241,
+                    80,
+                    96,
+                    0,
+                    96,
+                    1,
+                    17,
+                    15,
+                    96,
+                    156,
+                    89,
+                    96,
+                    0,
+                    96,
+                    0,
+                    96,
+                    0,
+                    96,
+                    0,
+                    96,
+                    13,
+                    51,
+                    96,
+                    200,
+                    92,
+                    3,
+                    241,
+                    80,
+                    96,
+                    1,
+                    96,
+                    0,
+                    17,
+                    15,
+                    96,
+                    182,
+                    89,
+                    96,
+                    0,
+                    96,
+                    0,
+                    96,
+                    0,
+                    96,
+                    0,
+                    96,
+                    14,
+                    51,
+                    96,
+                    200,
+                    92,
+                    3,
+                    241,
+                    80,
+                    96,
+                    0,
+                    96,
+                    0,
+                    17,
+                    15,
+                    96,
+                    208,
+                    89,
+                    96,
+                    0,
+                    96,
+                    0,
+                    96,
+                    0,
+                    96,
+                    0,
+                    96,
+                    15,
+                    51,
+                    96,
+                    200,
+                    92,
+                    3,
+                    241,
+                    80
+                ],
                 "nonce" : 4,
                 "storage" : {
                 }
             },
             "cd1722f3947def4cf144679da39c4c32bdc35681" : {
                 "balance" : 41,
+                "code" : [
+                ],
                 "nonce" : 0,
                 "storage" : {
                 }
-            },
-            "code" : [
-            ]
+            }
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : 1000000000000000000,
+                "code" : [
+                    96,
+                    1,
+                    96,
+                    1,
+                    16,
+                    15,
+                    96,
+                    26,
+                    89,
+                    96,
+                    0,
+                    96,
+                    0,
+                    96,
+                    0,
+                    96,
+                    0,
+                    96,
+                    2,
+                    51,
+                    96,
+                    200,
+                    92,
+                    3,
+                    241,
+                    80,
+                    96,
+                    0,
+                    96,
+                    1,
+                    16,
+                    15,
+                    96,
+                    52,
+                    89,
+                    96,
+                    0,
+                    96,
+                    0,
+                    96,
+                    0,
+                    96,
+                    0,
+                    96,
+                    3,
+                    51,
+                    96,
+                    200,
+                    92,
+                    3,
+                    241,
+                    80,
+                    96,
+                    1,
+                    96,
+                    0,
+                    16,
+                    15,
+                    96,
+                    78,
+                    89,
+                    96,
+                    0,
+                    96,
+                    0,
+                    96,
+                    0,
+                    96,
+                    0,
+                    96,
+                    4,
+                    51,
+                    96,
+                    200,
+                    92,
+                    3,
+                    241,
+                    80,
+                    96,
+                    0,
+                    96,
+                    0,
+                    16,
+                    15,
+                    96,
+                    104,
+                    89,
+                    96,
+                    0,
+                    96,
+                    0,
+                    96,
+                    0,
+                    96,
+                    0,
+                    96,
+                    5,
+                    51,
+                    96,
+                    200,
+                    92,
+                    3,
+                    241,
+                    80,
+                    96,
+                    1,
+                    96,
+                    1,
+                    17,
+                    15,
+                    96,
+                    130,
+                    89,
+                    96,
+                    0,
+                    96,
+                    0,
+                    96,
+                    0,
+                    96,
+                    0,
+                    96,
+                    12,
+                    51,
+                    96,
+                    200,
+                    92,
+                    3,
+                    241,
+                    80,
+                    96,
+                    0,
+                    96,
+                    1,
+                    17,
+                    15,
+                    96,
+                    156,
+                    89,
+                    96,
+                    0,
+                    96,
+                    0,
+                    96,
+                    0,
+                    96,
+                    0,
+                    96,
+                    13,
+                    51,
+                    96,
+                    200,
+                    92,
+                    3,
+                    241,
+                    80,
+                    96,
+                    1,
+                    96,
+                    0,
+                    17,
+                    15,
+                    96,
+                    182,
+                    89,
+                    96,
+                    0,
+                    96,
+                    0,
+                    96,
+                    0,
+                    96,
+                    0,
+                    96,
+                    14,
+                    51,
+                    96,
+                    200,
+                    92,
+                    3,
+                    241,
+                    80,
+                    96,
+                    0,
+                    96,
+                    0,
+                    17,
+                    15,
+                    96,
+                    208,
+                    89,
+                    96,
+                    0,
+                    96,
+                    0,
+                    96,
+                    0,
+                    96,
+                    0,
+                    96,
+                    15,
+                    51,
+                    96,
+                    200,
+                    92,
+                    3,
+                    241,
+                    80
+                ],
                 "nonce" : 0,
                 "storage" : {
                 }
-            },
-            "code" : [
-                96,
-                1,
-                96,
-                1,
-                16,
-                15,
-                99,
-                0,
-                0,
-                0,
-                29,
-                89,
-                96,
-                0,
-                96,
-                0,
-                96,
-                0,
-                96,
-                0,
-                96,
-                2,
-                51,
-                96,
-                200,
-                92,
-                3,
-                241,
-                80,
-                96,
-                0,
-                96,
-                1,
-                16,
-                15,
-                99,
-                0,
-                0,
-                0,
-                58,
-                89,
-                96,
-                0,
-                96,
-                0,
-                96,
-                0,
-                96,
-                0,
-                96,
-                3,
-                51,
-                96,
-                200,
-                92,
-                3,
-                241,
-                80,
-                96,
-                1,
-                96,
-                0,
-                16,
-                15,
-                99,
-                0,
-                0,
-                0,
-                87,
-                89,
-                96,
-                0,
-                96,
-                0,
-                96,
-                0,
-                96,
-                0,
-                96,
-                4,
-                51,
-                96,
-                200,
-                92,
-                3,
-                241,
-                80,
-                96,
-                0,
-                96,
-                0,
-                16,
-                15,
-                99,
-                0,
-                0,
-                0,
-                116,
-                89,
-                96,
-                0,
-                96,
-                0,
-                96,
-                0,
-                96,
-                0,
-                96,
-                5,
-                51,
-                96,
-                200,
-                92,
-                3,
-                241,
-                80,
-                96,
-                1,
-                96,
-                1,
-                17,
-                15,
-                99,
-                0,
-                0,
-                0,
-                145,
-                89,
-                96,
-                0,
-                96,
-                0,
-                96,
-                0,
-                96,
-                0,
-                96,
-                12,
-                51,
-                96,
-                200,
-                92,
-                3,
-                241,
-                80,
-                96,
-                0,
-                96,
-                1,
-                17,
-                15,
-                99,
-                0,
-                0,
-                0,
-                174,
-                89,
-                96,
-                0,
-                96,
-                0,
-                96,
-                0,
-                96,
-                0,
-                96,
-                13,
-                51,
-                96,
-                200,
-                92,
-                3,
-                241,
-                80,
-                96,
-                1,
-                96,
-                0,
-                17,
-                15,
-                99,
-                0,
-                0,
-                0,
-                203,
-                89,
-                96,
-                0,
-                96,
-                0,
-                96,
-                0,
-                96,
-                0,
-                96,
-                14,
-                51,
-                96,
-                200,
-                92,
-                3,
-                241,
-                80,
-                96,
-                0,
-                96,
-                0,
-                17,
-                15,
-                99,
-                0,
-                0,
-                0,
-                232,
-                89,
-                96,
-                0,
-                96,
-                0,
-                96,
-                0,
-                96,
-                0,
-                96,
-                15,
-                51,
-                96,
-                200,
-                92,
-                3,
-                241,
-                80
-            ]
+            }
         }
     },
     "mktx" : {
@@ -438,7 +609,6 @@
             "currentGasLimit" : "1000000",
             "currentNumber" : "0",
             "currentTimestamp" : 1,
-            "gasLimit" : null,
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "exec" : [
@@ -458,51 +628,76 @@
         "post" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : 0,
+                "code" : [
+                    96,
+                    0,
+                    96,
+                    0,
+                    96,
+                    0,
+                    96,
+                    0,
+                    103,
+                    6,
+                    240,
+                    91,
+                    89,
+                    211,
+                    178,
+                    0,
+                    0,
+                    51,
+                    96,
+                    200,
+                    92,
+                    3,
+                    241
+                ],
                 "nonce" : 1,
                 "storage" : {
                 }
             },
             "cd1722f3947def4cf144679da39c4c32bdc35681" : {
                 "balance" : 500000000000000000,
+                "code" : [
+                ],
                 "nonce" : 0,
                 "storage" : {
                 }
-            },
-            "code" : [
-            ]
+            }
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : 1000000000000000000,
+                "code" : [
+                    96,
+                    0,
+                    96,
+                    0,
+                    96,
+                    0,
+                    96,
+                    0,
+                    103,
+                    6,
+                    240,
+                    91,
+                    89,
+                    211,
+                    178,
+                    0,
+                    0,
+                    51,
+                    96,
+                    200,
+                    92,
+                    3,
+                    241
+                ],
                 "nonce" : 0,
                 "storage" : {
                 }
-            },
-            "code" : [
-                96,
-                0,
-                96,
-                0,
-                96,
-                0,
-                96,
-                0,
-                103,
-                6,
-                240,
-                91,
-                89,
-                211,
-                178,
-                0,
-                0,
-                51,
-                96,
-                200,
-                92,
-                3,
-                241
-            ]
+            }
         }
     },
     "suicide" : {
@@ -515,7 +710,6 @@
             "currentGasLimit" : "1000000",
             "currentNumber" : "0",
             "currentTimestamp" : 1,
-            "gasLimit" : null,
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "exec" : [
@@ -535,24 +729,24 @@
         "post" : {
             "cd1722f3947def4cf144679da39c4c32bdc35681" : {
                 "balance" : 1000000000000000000,
+                "code" : [
+                ],
                 "nonce" : 0,
                 "storage" : {
                 }
-            },
-            "code" : [
-            ]
+            }
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : 1000000000000000000,
+                "code" : [
+                    51,
+                    255
+                ],
                 "nonce" : 0,
                 "storage" : {
                 }
-            },
-            "code" : [
-                51,
-                255
-            ]
+            }
         }
     }
 }
\ No newline at end of file